Skip to content

Commit 3f654ae

Browse files
Merge pull request #333 from CivicDataLab/dev
patch for collaborative
2 parents b3fba7e + 1739c56 commit 3f654ae

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

app/[locale]/(user)/collaboratives/CollaborativesListingClient.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ const CollaborativesListingClient = () => {
181181
name: 'CivicDataLab',
182182
url: `${process.env.NEXT_PUBLIC_PLATFORM_URL}/collaboratives`,
183183
description:
184-
'Explore collaborative data initiatives and partnerships that bring organizations together to create impactful solutions.',
184+
'Solving the world\'s major challenges requires greater access to interoperable data that currently resides in silos. Data Collaboratives bring together government, academia, civil society, philanthropy, and companies to responsibly share and use data for public value. Building on trusted, long-term relationships among stakeholders, we can open access to high-impact datasets and responsible AI use-cases to generate insights for climate action, public health, gender equity, and other major shared problems, thereby advancing progress toward the Sustainable Development Goals. Our goal is to accelerate the formation of Data Collaboratives with shared governance, clear safeguards, and collaborative analytics, allowing stakeholders to harness data and AI for the public good.',
185185
});
186186
return (
187187
<main>
@@ -197,7 +197,7 @@ const CollaborativesListingClient = () => {
197197
<div className="w-full">
198198
<div className=" bg-primaryBlue">
199199
<div className=" container flex flex-col-reverse items-center gap-8 py-10 lg:flex-row ">
200-
<div className="flex flex-col gap-5 lg:w-1/2">
200+
<div className="flex flex-col gap-5 lg:w-3/5">
201201
<Text
202202
variant="heading2xl"
203203
fontWeight="bold"
@@ -211,12 +211,10 @@ const CollaborativesListingClient = () => {
211211
fontWeight="regular"
212212
className="leading-3 lg:leading-5"
213213
>
214-
By Collaboratives we mean a collective effort by several organisations
215-
in any specific sectors that can be applied to address some of the
216-
most pressing concerns from hyper-local to the global level simultaneously.
214+
Solving the world&apos;s major challenges requires greater access to interoperable data that currently resides in silos. Data Collaboratives bring together government, academia, civil society, philanthropy, and companies to responsibly share and use data for public value. Building on trusted, long-term relationships among stakeholders, we can open access to high-impact datasets and responsible AI use-cases to generate insights for climate action, public health, gender equity, and other major shared problems, thereby advancing progress toward the Sustainable Development Goals. Our goal is to accelerate the formation of Data Collaboratives with shared governance, clear safeguards, and collaborative analytics, allowing stakeholders to harness data and AI for the public good.
217215
</Text>
218216
</div>
219-
<div className="flex w-full items-center justify-center lg:w-1/2">
217+
<div className="flex w-full items-center justify-center lg:w-2/5">
220218
<Image
221219
src={'/collaborative.svg'}
222220
alt={'collaborative'}

app/[locale]/(user)/collaboratives/components/Details.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ const PrimaryDetails = ({ data, isLoading }: { data: any; isLoading: any }) => {
108108
</Text>
109109
</div>
110110

111-
<div className="flex flex-col border-x-[1px] border-solid border-tertiaryAccent px-8">
111+
{/* <div className="flex flex-col border-x-[1px] border-solid border-tertiaryAccent px-8">
112112
<Text variant="heading3xl" className="text-secondaryOrange">
113113
{data.collaborativeBySlug.contributors?.length || 0}
114114
</Text>
115115
<Text variant="bodyLg" color="onBgDefault" className="w-24">
116116
Contributors
117117
</Text>
118-
</div>
118+
</div> */}
119119
</div>
120120

121121
<div className=" lg:pr-4">

app/[locale]/dashboard/[entityType]/[entitySlug]/collaboratives/edit/[id]/metadata/page.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ const UpdateCollaborativeMetadata: any = graphql(`
132132
id
133133
code
134134
name
135+
number
135136
}
136137
geographies {
137138
id
@@ -216,7 +217,9 @@ const Metadata = () => {
216217

217218
defaultVal['sdgs'] =
218219
data?.sdgs?.map((sdg: any) => {
219-
const num = String(sdg.number || 0).padStart(2, '0');
220+
const num = sdg.number
221+
? String(sdg.number).padStart(2, '0')
222+
: sdg.code.replace('SDG', '').padStart(2, '0');
220223
return {
221224
label: `${num}. ${sdg.name}`,
222225
value: sdg.id,
@@ -437,7 +440,9 @@ const Metadata = () => {
437440
name="sdgs"
438441
list={
439442
getSDGsList?.data?.sdgs?.map((item: any) => {
440-
const num = String(item.number || 0).padStart(2, '0');
443+
const num = item.number
444+
? String(item.number).padStart(2, '0')
445+
: item.code.replace('SDG', '').padStart(2, '0');
441446
return {
442447
label: `${num}. ${item.name}`,
443448
value: item.id,

app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/[id]/metadata/page.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ const UpdateUseCaseMetadataMutation: any = graphql(`
8585
id
8686
code
8787
name
88+
number
8889
}
8990
}
9091
}
@@ -240,7 +241,9 @@ const Metadata = () => {
240241

241242
defaultVal['sdgs'] =
242243
data?.sdgs?.map((sdg: any) => {
243-
const num = String(sdg.number || 0).padStart(2, '0');
244+
const num = sdg.number
245+
? String(sdg.number).padStart(2, '0')
246+
: sdg.code.replace('SDG', '').padStart(2, '0');
244247
return {
245248
label: `${num}. ${sdg.name}`,
246249
value: sdg.id,
@@ -465,7 +468,9 @@ const Metadata = () => {
465468
name="sdgs"
466469
list={
467470
getSDGsList?.data?.sdgs?.map((item: any) => {
468-
const num = String(item.number || 0).padStart(2, '0');
471+
const num = item.number
472+
? String(item.number).padStart(2, '0')
473+
: item.code.replace('SDG', '').padStart(2, '0');
469474
return {
470475
label: `${num}. ${item.name}`,
471476
value: item.id,

0 commit comments

Comments
 (0)