Skip to content

Commit 8f684cc

Browse files
sanjaypinnasanjaypinna
authored
Merge pull request #274 from CivicDataLab/dev
Bring main to latest
2 parents f62d7af + b045982 commit 8f684cc

File tree

251 files changed

+34388
-6665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+34388
-6665
lines changed

‎.github/workflows/deploy-Dataspace-dev.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Update DataSpace Dev
2+
3+
on:
4+
push:
5+
branches: ['dev']
6+
env:
7+
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
8+
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
9+
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
10+
NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
11+
NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
12+
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
13+
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
14+
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
15+
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
16+
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
17+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
18+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
19+
BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
20+
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
21+
22+
jobs:
23+
deploy:
24+
runs-on: ubuntu-latest
25+
26+
steps:
27+
- name: Checkout code
28+
uses: actions/checkout@v4
29+
30+
- name: Install dependencies
31+
run: npm install
32+
33+
- name: Generate
34+
run: npm run generate
35+
36+
- name: Build
37+
run: npm run build
38+
39+
- name: Rename .next to .next2
40+
run: mv .next .next2
41+
42+
- name: Rename public to public2
43+
run: mv public public2
44+
45+
- name: Send .next2 to EC2
46+
uses: appleboy/scp-action@master
47+
with:
48+
host: ${{ secrets.EC2_HOST_DEV_DS }}
49+
username: ${{ secrets.EC2_USERNAME_DS }}
50+
key: ${{ secrets.EC2_PRIVATE_KEY }}
51+
source: .next2
52+
target: DataExchange/DataExFrontend
53+
54+
- name: Send public2 to EC2
55+
uses: appleboy/scp-action@master
56+
with:
57+
host: ${{ secrets.EC2_HOST_DEV_DS }}
58+
username: ${{ secrets.EC2_USERNAME_DS }}
59+
key: ${{ secrets.EC2_PRIVATE_KEY }}
60+
source: public2
61+
target: DataExchange/DataExFrontend
62+
63+
- name: Update with new Build
64+
uses: appleboy/[email protected]
65+
with:
66+
host: ${{ secrets.EC2_HOST_DEV_DS }}
67+
username: ${{ secrets.EC2_USERNAME_DS }}
68+
key: ${{ secrets.EC2_PRIVATE_KEY }}
69+
script: rm -rf DataExchange/DataExFrontend/.next; rm -rf DataExchange/DataExFrontend/public; mv DataExchange/DataExFrontend/.next2 DataExchange/DataExFrontend/.next; mv DataExchange/DataExFrontend/public2 DataExchange/DataExFrontend/public; /home/ubuntu/.nvm/versions/node/v20.11.1/bin/pm2 restart dataspace

‎.github/workflows/deploy-Dataspace.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Update DataSpace Prod
2+
3+
on:
4+
push:
5+
branches: ['main']
6+
env:
7+
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
8+
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
9+
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
10+
NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL_DS}}
11+
NEXT_PUBLIC_NEXTAUTH_URL: ${{secrets.NEXT_PUBLIC_NEXTAUTH_URL_DS}}
12+
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
13+
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
14+
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
15+
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DS}}
16+
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DS}}
17+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
18+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DS}}
19+
BACKEND_URL: ${{secrets.BACKEND_URL}}
20+
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL}}
21+
22+
jobs:
23+
deploy:
24+
runs-on: ubuntu-latest
25+
26+
steps:
27+
- name: Checkout code
28+
uses: actions/checkout@v4
29+
30+
- name: Install dependencies
31+
run: npm install
32+
33+
- name: Generate
34+
run: npm run generate
35+
36+
- name: Build
37+
run: npm run build
38+
39+
- name: Rename .next to .next2
40+
run: mv .next .next2
41+
42+
- name: Rename public to public2
43+
run: mv public public2
44+
45+
- name: Send .next2 to EC2
46+
uses: appleboy/scp-action@master
47+
with:
48+
host: ${{ secrets.EC2_HOST_DS }}
49+
username: ${{ secrets.EC2_USERNAME_DS }}
50+
key: ${{ secrets.EC2_PRIVATE_KEY }}
51+
source: .next2
52+
target: DataExchange/DataExFrontend
53+
54+
- name: Send public2 to EC2
55+
uses: appleboy/scp-action@master
56+
with:
57+
host: ${{ secrets.EC2_HOST_DS }}
58+
username: ${{ secrets.EC2_USERNAME_DS }}
59+
key: ${{ secrets.EC2_PRIVATE_KEY }}
60+
source: public2
61+
target: DataExchange/DataExFrontend
62+
63+
- name: Update with new Build
64+
uses: appleboy/[email protected]
65+
with:
66+
host: ${{ secrets.EC2_HOST_DS }}
67+
username: ${{ secrets.EC2_USERNAME_DS }}
68+
key: ${{ secrets.EC2_PRIVATE_KEY }}
69+
script: rm -rf DataExchange/DataExFrontend/.next; rm -rf DataExchange/DataExFrontend/public; mv DataExchange/DataExFrontend/.next2 DataExchange/DataExFrontend/.next; mv DataExchange/DataExFrontend/public2 DataExchange/DataExFrontend/public; /home/ubuntu/.nvm/versions/node/v20.11.1/bin/pm2 restart dataspace

‎.github/workflows/deploy-IDS-Dataspace.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Update IDS-DRR Dataspace
2+
3+
on:
4+
push:
5+
branches: ['dev']
6+
env:
7+
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
8+
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
9+
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
10+
NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL}}
11+
NEXT_PUBLIC_NEXTAUTH_URL: ${{secrets.NEXT_PUBLIC_NEXTAUTH_URL}}
12+
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
13+
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
14+
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
15+
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL}}
16+
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL}}
17+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL}}
18+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL}}
19+
BACKEND_URL: ${{secrets.BACKEND_URL}}
20+
21+
jobs:
22+
deploy:
23+
runs-on: ubuntu-latest
24+
25+
steps:
26+
- name: Checkout code
27+
uses: actions/checkout@v4
28+
29+
- name: Install dependencies
30+
run: npm install
31+
32+
- name: Generate
33+
run: npm run generate
34+
35+
- name: Build
36+
run: npm run build
37+
38+
- name: Rename .next to .next2
39+
run: mv .next .next2
40+
41+
- name: Send .next2 to EC2
42+
uses: appleboy/scp-action@master
43+
with:
44+
host: ${{ secrets.EC2_HOST }}
45+
username: ${{ secrets.EC2_USERNAME }}
46+
key: ${{ secrets.EC2_PRIVATE_KEY }}
47+
source: .next2
48+
target: DataExchange/DataExFrontend
49+
- name: Update with new Build
50+
uses: appleboy/[email protected]
51+
with:
52+
host: ${{ secrets.EC2_HOST }}
53+
username: ${{ secrets.EC2_USERNAME }}
54+
key: ${{ secrets.EC2_PRIVATE_KEY }}
55+
script: rm -rf DataExchange/DataExFrontend/.next; mv DataExchange/DataExFrontend/.next2 DataExchange/DataExFrontend/.next; /home/ubuntu/.nvm/versions/node/v18.17.0/bin/pm2 restart DataExFrontend

‎.github/workflows/pre-merge.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ env:
99
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
1010
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
1111
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
12-
NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL}}
12+
NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL_DS}}
13+
NEXT_PUBLIC_NEXTAUTH_URL: ${{secrets.NEXT_PUBLIC_NEXTAUTH_URL_DS}}
1314
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
1415
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
1516
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
16-
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL}}
17-
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL}}
17+
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DS}}
18+
BACKEND_URL: ${{secrets.BACKEND_URL_DS}}
19+
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DS}}
20+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
21+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DS}}
22+
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL}}
23+
1824

1925
jobs:
2026
build:
@@ -25,7 +31,7 @@ jobs:
2531
node-version: [20.x]
2632

2733
env:
28-
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL}}
34+
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DS}}
2935

3036
steps:
3137
- uses: actions/checkout@v4

‎app/[locale]/(user)/about-us/components/Initiatives.tsx‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
import React from 'react';
2+
import Image from 'next/image';
3+
import { Divider, Text } from 'opub-ui';
4+
5+
const Initiatives = () => {
6+
const IntiativesList = [
7+
{
8+
name: 'Climate Action',
9+
image: '/About/ca.png',
10+
description:
11+
'Asia is the world’s most disaster-prone region, with 80% of extreme weather events caused by floods and storms. To help better prepare Asia for climate change, we are actively working with frontline workers, government agencies and other stakeholders to strengthen climate action and disaster risk reduction. These efforts are spread across all our initiatives, including projects like Green budgeting, Disaster Modelling and Citizen-led Disaster Reporting.',
12+
},
13+
{
14+
name: 'Digital Public Goods',
15+
image: '/About/dpg.png',
16+
description:
17+
'We are co-creating people-centric Digital Public Goods (DPGs), especially Open Data Platforms, Data Exchanges, Data Science Models and Citizen-led Apps for improving participatory data-driven governance and attain the Sustainable Development Goals (SDGs) and do no harm by adhering to privacy practices and applicable laws. DPGs and Digital Public Infrastructure (DPI) are critical enablers of digital transformation and are helping to improve public service delivery at scale.',
18+
},
19+
{
20+
name: 'Law and Justice',
21+
image: '/About/l&j.png',
22+
description:
23+
'To better understand implementation of laws, judicial reforms and attainment of human rights, its essential to track timely data of our courts, police, correctional homes, legal aid and other institutions. We have co-created Justice Hub - a crowdsourcing open data platform to help various stakeholders publish, consume and analyse legal data in India. We are also working to publish and analyse data to improve child protection in the country.',
24+
},
25+
{
26+
name: 'Open Contracting India',
27+
image: '/About/oci.png',
28+
description:
29+
'Demystifying public finance helps in understanding government’s fiscal and development priorities, supports equitable public policymaking and enables citizen trust. We are working at the national, sub-national and local level to help publish, standardise and analyse public finance data at Open Budgets India and other platforms, for data-driven decision-making and citizen participation. We also collaborate with various stakeholders to set best practices for green and inclusive budgeting for our sustainable future.',
30+
},
31+
{
32+
name: 'Public Finance',
33+
image: '/About/pf.png',
34+
description:
35+
'Demystifying public finance helps in understanding government’s fiscal and development priorities, supports equitable public policymaking and enables citizen trust. We are working at the national, sub-national and local level to help publish, standardise and analyse public finance data at Open Budgets India and other platforms, for data-driven decision-making and citizen participation. We also collaborate with various stakeholders to set best practices for green and inclusive budgeting for our sustainable future.',
36+
},
37+
{
38+
name: 'Urban Development',
39+
image: '/About/ud.png',
40+
description:
41+
'With rapid urbanisation, cities are becoming constantly evolving complex clusters, presenting new challenges and opportunities of economic development, infrastructure growth, migration and sustainability. To better understand and shape the development of our cities, we are opening-up crucial urban data and building the capacity of urban governments and local stakeholders. We are co-creating solutions like - city data platforms, citizen-led disaster reporting platforms, data science models for effective urban service delivery and more.',
42+
},
43+
];
44+
return (
45+
<div className="container py-5 lg:py-10">
46+
<div className="flex flex-col gap-5 lg:gap-10">
47+
<div>
48+
<Text variant="heading2xl">Our Initiatives</Text>
49+
</div>
50+
<div className=" grid w-fit gap-10 md:grid-cols-2 lg:grid-cols-3">
51+
{IntiativesList.map((item, index) => (
52+
<div key={index} className=" rounded-4 p-7 shadow-card ">
53+
<div className="flex flex-col items-center gap-5">
54+
<Image
55+
src={item.image}
56+
alt={'initiative logo'}
57+
width={328}
58+
height={200}
59+
className=" h-full w-full"
60+
priority
61+
/>
62+
<Text variant="headingLg">{item.name}</Text>
63+
<div className="flex flex-col gap-2 border-t-2 border-solid border-greyExtralight">
64+
<Text className="pt-3 text-[#545456]">
65+
{item.description}
66+
</Text>
67+
</div>
68+
</div>
69+
</div>
70+
))}
71+
</div>
72+
</div>
73+
</div>
74+
);
75+
};
76+
77+
export default Initiatives;

‎app/[locale]/(user)/about-us/page.tsx‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
import React from 'react';
2+
import Image from 'next/image';
3+
import { Text } from 'opub-ui';
4+
5+
import BreadCrumbs from '@/components/BreadCrumbs';
6+
import Initiatives from './components/Initiatives';
7+
8+
const About = () => {
9+
return (
10+
<main>
11+
<BreadCrumbs
12+
data={[
13+
{ href: '/', label: 'Home' },
14+
{ href: '#', label: 'About' },
15+
]}
16+
/>
17+
<div className="container py-5 lg:py-10 mb-5">
18+
<div className=" flex flex-wrap justify-center gap-14 lg:flex-nowrap ">
19+
<div className="flex flex-col gap-6">
20+
<Text variant="heading2xl">About us</Text>
21+
<Text
22+
variant="headingLg"
23+
fontWeight="regular"
24+
className=" leading-5"
25+
>
26+
CivicDataLab (CDL) works at the intersection of data, technology,
27+
design and social science to strengthen access to public
28+
information, evidence-based decision-making and citizen
29+
participation in governance. CDL harnesses the potential of open
30+
knowledge movements to strengthen the data-for-public-good
31+
ecosystem and enable citizens to engage in matters of public
32+
reform. We work closely with governments, non-profits,
33+
think-tanks, media houses and universities to enhance their data
34+
and technology capacity to better data-driven decision-making at
35+
scale.
36+
</Text>
37+
</div>
38+
<Image
39+
src={'/about-us-illustration.svg'}
40+
alt={'about-us-illustration'}
41+
width={536}
42+
height={350}
43+
className=" w-full"
44+
priority
45+
/>
46+
</div>
47+
</div>
48+
<div className="bg-primaryBlue">
49+
<div className=" container flex flex-col gap-6 py-5 lg:py-10">
50+
<div>
51+
<Text variant="headingLg" fontWeight="regular" color="onBgDefault">
52+
Our current areas of expertise include digital public goods &
53+
infrastructure (DPGs & DPI), climate change, public finance, urban
54+
development, open contracting and law & justice. We have
55+
co-created digital public goods like open data platforms, data
56+
exchanges, data science models and citizen-led apps for improving
57+
participatory data-driven governance in India and other countries.
58+
</Text>
59+
</div>
60+
<div>
61+
<Text variant="headingLg" fontWeight="regular" color="onBgDefault">
62+
In the last five years, we have collected, cleaned and published
63+
nearly 30,000+ public interest datasets and are catering to an
64+
active user base of more than a million citizens. Some of our
65+
publicly available open data initiatives include Open Budgets
66+
India, Justice Hub, Open Contracting India, Open City, CogniCity
67+
among others. We have co-created digital public goods with
68+
National Informatics Center (NIC), Ministry of Electronic &
69+
Information Technology (MeitY) and the Government of Assam.
70+
Additionally, we actively build capacity for a diverse group of
71+
partners working to enhance social impact, situated in India,
72+
Indonesia, Philippines, Thailand, Panama and Scotland.
73+
</Text>
74+
</div>
75+
</div>
76+
</div>
77+
<div>
78+
<Initiatives />
79+
</div>
80+
</main>
81+
);
82+
};
83+
84+
export default About;

0 commit comments

Comments
 (0)