Skip to content

Commit 568d838

Browse files
committed
Merge branch 'dev' into 19-when-coming-first-to-the-model-sections-tab-the-registered-tab-is-not-highlighted-but-when-redirection-from-active-and-approved-tabs-then-it-shows-the-highlight-check-image-1-and-2-for-compariso
2 parents 915cf88 + 3d1f0eb commit 568d838

20 files changed

Lines changed: 467 additions & 196 deletions

File tree

app/[locale]/(user)/aimodels/[modelId]/components/Metadata/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export default function Metadata({ data }: MetadataProps) {
108108

109109
<div className="flex flex-col gap-8">
110110
{/* Organization Logo */}
111-
<div className="hidden rounded-2 border-1 border-solid border-greyExtralight p-2 lg:block">
111+
<div className="hidden rounded-2 border-1 border-solid border-greyExtralight bg-white p-2 lg:block">
112112
<Link href={getPublisherURL()}>
113113
<Image
114114
height={140}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ const Metadata = ({ data, setOpen }: { data: any; setOpen?: any }) => {
127127
</div>
128128
<div className="h-0.5 bg-baseGraySlateSolid9 w-full" ></div>
129129
<div className=" flex flex-col gap-8">
130-
<div className="hidden rounded-2 p-2 lg:block">
130+
<div className="hidden rounded-2 border-1 border-solid border-greyExtralight bg-white p-2 lg:block">
131131
<Image
132132
height={180}
133133
width={120}

app/[locale]/(user)/components/Content.tsx

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
'use client';
22

3+
import { graphql } from '@/gql';
4+
import { useQuery } from '@tanstack/react-query';
35
import Image from 'next/image';
46
import Link from 'next/link';
57
import { useRouter } from 'next/navigation';
6-
import { graphql } from '@/gql';
7-
import { useQuery } from '@tanstack/react-query';
8-
import { SearchInput, Spinner, Tag, Text } from 'opub-ui';
8+
import { SearchInput, Spinner, Text } from 'opub-ui';
99

10+
import { useTourTrigger } from '@/hooks/use-tour-trigger';
1011
import { GraphQL } from '@/lib/api';
1112
import { cn } from '@/lib/utils';
1213
import Styles from '../page.module.scss';
13-
import { useTourTrigger } from '@/hooks/use-tour-trigger';
1414

1515
const statsInfo: any = graphql(`
1616
query StatsList {
@@ -24,14 +24,6 @@ const statsInfo: any = graphql(`
2424
}
2525
`);
2626

27-
// const tagsInfo: any = graphql(`
28-
// query TagsData {
29-
// tags {
30-
// id
31-
// value
32-
// }
33-
// }
34-
// `);
3527

3628
export const Content = () => {
3729
const router = useRouter();
@@ -42,9 +34,6 @@ export const Content = () => {
4234
const Stats: { data: any; isLoading: any } = useQuery([`statsDetails`], () =>
4335
GraphQL(statsInfo, {}, [])
4436
);
45-
// const Tags: { data: any; isLoading: any } = useQuery([`tagDetails`], () =>
46-
// GraphQL(tagsInfo, {}, [])
47-
// );
4837

4938
const handleSearch = (value: string) => {
5039
if (value) {
@@ -68,38 +57,24 @@ export const Content = () => {
6857
count: Stats?.data?.stats?.totalPublishers,
6958
link: '/publishers',
7059
},
71-
// {
72-
// label: 'Users',
73-
// count: Stats?.data?.stats?.totalUsers,
74-
// },
7560
{
7661
label: 'Organizations',
7762
count: Stats?.data?.stats?.totalOrganizations,
7863
link: '/publishers',
7964
},
8065
];
8166

82-
const Sectors = [
83-
'Public Finance',
84-
'Law And Justice',
85-
'Climate Action',
86-
'Urban Development',
87-
'Gender',
88-
'Coastal',
89-
'Disaster Risk Reduction',
90-
'Child Rights'
91-
];
9267

9368
return (
94-
<main className="py-6 md:px-6 md:py-10 lg:py-16 ">
95-
<div className=" flex justify-around gap-8 px-4 md:px-8 lg:px-18">
69+
<main className="container py-10 md:px-8 lg:py-20">
70+
<div className="flex justify-around gap-8 px-4 md:px-12 lg:px-12">
9671
<div className="flex flex-col gap-11 lg:w-[60%]">
9772
<div className="flex flex-col gap-2">
9873
<Text variant="heading3xl" color="onBgDefault" className='text-textOnBGDefault1'>
99-
Discover datasets, AI use cases, and civic knowledge
74+
An Open-Source Platform for Collaborative Data-Driven Change
10075
</Text>
10176
<Text variant="headingLg" color="onBgDefault" className='text-textOnBGDefault2'>
102-
Open data and insights for public decision-making.
77+
Share datasets, knowledge resources, and AI use-cases for data changemakers.
10378
</Text>
10479
</div>
10580
<div className="w-full" data-tour="search-bar">
@@ -133,7 +108,7 @@ export const Content = () => {
133108
: undefined
134109
}
135110
>
136-
<div className="flex h-[100px] flex-col text-start justify-center rounded-[8px] bg-surfaceStats px-10 py-10 text-center">
111+
<div className="flex h-[100px] flex-col justify-center rounded-[8px] bg-surfaceStats px-10 py-10 text-center">
137112
<Text variant="heading3xl" className="text-primaryBlue">
138113
{item.count}
139114
</Text>

app/[locale]/(user)/components/Datasets.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ const Datasets = () => {
145145
},
146146
]}
147147
variation={'collapsed'}
148-
iconColor="warning"
148+
iconColor="metadata"
149149
href={`/datasets/${item.id}`}
150150
// type={[
151151
// {

app/[locale]/(user)/components/UseCases.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const UseCasesListingPage = () => {
182182
]}
183183
imageUrl={`${process.env.NEXT_PUBLIC_BACKEND_URL}/${item.logo?.path.replace('/code/files/', '')}`}
184184
description={item.summary}
185-
iconColor="warning"
185+
iconColor="metadata"
186186
variation={'collapsed'}
187187
type={[
188188
{

app/[locale]/(user)/components/datasets.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.List {
22
> * {
3-
min-height: 340px;
3+
min-height: 320px;
44
max-height: fit-content;
55
@media screen and (max-width: 1280px) {
66
min-height: 380px;
@@ -14,7 +14,7 @@
1414
}
1515
.UseCaseList {
1616
> * {
17-
min-height: 520px;
17+
min-height: 500px;
1818
max-height: fit-content;
1919
@media screen and (max-width: 1120px) {
2020
min-height: 520px;

app/[locale]/(user)/datasets/[datasetIdentifier]/components/Metadata/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
116116
</div>
117117
<Divider />
118118
<div className=" flex flex-col gap-8">
119-
<div className=" hidden rounded-2 border-1 border-solid border-greyExtralight p-2 lg:block">
119+
<div className=" hidden rounded-2 border-1 border-solid border-greyExtralight bg-white p-2 lg:block">
120120
<Link href={getPublisherURL(data)}>
121121
<Image
122122
height={140}

0 commit comments

Comments
 (0)