Bring main to latest

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

@@ -0,0 +1,69 @@
+name: Update DataSpace Dev
+
+on:
+  push:
+    branches: ['dev']
+env:
+  KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
+  KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
+  AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
+  NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
+  NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
+  NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
+  END_SESSION_URL: ${{secrets.END_SESSION_URL}}
+  REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
+  NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
+  BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
+  NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
+  NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
+  BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
+  NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Generate
+        run: npm run generate
+
+      - name: Build
+        run: npm run build
+
+      - name: Rename .next to .next2
+        run: mv .next .next2
+
+      - name: Rename public to public2
+        run: mv public public2
+
+      - name: Send .next2 to EC2
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.EC2_HOST_DEV_DS }}
+          username: ${{ secrets.EC2_USERNAME_DS }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          source: .next2
+          target: DataExchange/DataExFrontend
+
+      - name: Send public2 to EC2
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.EC2_HOST_DEV_DS }}
+          username: ${{ secrets.EC2_USERNAME_DS }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          source: public2
+          target: DataExchange/DataExFrontend
+
+      - name: Update with new Build
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.EC2_HOST_DEV_DS }}
+          username: ${{ secrets.EC2_USERNAME_DS }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          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

@@ -0,0 +1,69 @@
+name: Update DataSpace Prod
+
+on:
+  push:
+    branches: ['main']
+env:
+  KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
+  KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
+  AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
+  NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL_DS}}
+  NEXT_PUBLIC_NEXTAUTH_URL: ${{secrets.NEXT_PUBLIC_NEXTAUTH_URL_DS}}
+  NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
+  END_SESSION_URL: ${{secrets.END_SESSION_URL}}
+  REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
+  NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DS}}
+  BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DS}}
+  NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
+  NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DS}}
+  BACKEND_URL: ${{secrets.BACKEND_URL}}
+  NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL}}
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Generate
+        run: npm run generate
+
+      - name: Build
+        run: npm run build
+
+      - name: Rename .next to .next2
+        run: mv .next .next2
+
+      - name: Rename public to public2
+        run: mv public public2  
+
+      - name: Send .next2 to EC2
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.EC2_HOST_DS }}
+          username: ${{ secrets.EC2_USERNAME_DS }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          source: .next2
+          target: DataExchange/DataExFrontend
+
+      - name: Send public2 to EC2
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.EC2_HOST_DS }}
+          username: ${{ secrets.EC2_USERNAME_DS }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          source: public2
+          target: DataExchange/DataExFrontend    
+
+      - name: Update with new Build
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.EC2_HOST_DS }}
+          username: ${{ secrets.EC2_USERNAME_DS }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          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

@@ -0,0 +1,55 @@
+name: Update IDS-DRR Dataspace
+
+on:
+  push:
+    branches: ['dev']
+env:
+  KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
+  KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
+  AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
+  NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL}}
+  NEXT_PUBLIC_NEXTAUTH_URL: ${{secrets.NEXT_PUBLIC_NEXTAUTH_URL}}
+  NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
+  END_SESSION_URL: ${{secrets.END_SESSION_URL}}
+  REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
+  NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL}}
+  BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL}}
+  NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL}}
+  NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL}}
+  BACKEND_URL: ${{secrets.BACKEND_URL}}
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Generate
+        run: npm run generate
+
+      - name: Build
+        run: npm run build
+
+      - name: Rename .next to .next2
+        run: mv .next .next2
+
+      - name: Send .next2 to EC2
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          source: .next2
+          target: DataExchange/DataExFrontend
+      - name: Update with new Build
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          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

@@ -9,12 +9,18 @@ env:
   KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
   KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
   AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
-  NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL}}
+  NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL_DS}}
+  NEXT_PUBLIC_NEXTAUTH_URL: ${{secrets.NEXT_PUBLIC_NEXTAUTH_URL_DS}}
   NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
   END_SESSION_URL: ${{secrets.END_SESSION_URL}}
   REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
-  NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL}}
-  BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL}}
+  NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DS}}
+  BACKEND_URL: ${{secrets.BACKEND_URL_DS}}
+  BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DS}}
+  NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
+  NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DS}}
+  NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL}}
+
 
 jobs:
   build:
@@ -25,7 +31,7 @@ jobs:
         node-version: [20.x]
 
     env:
-      BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL}}
+      BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DS}}
 
     steps:
       - uses: actions/checkout@v4

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

@@ -0,0 +1,77 @@
+import React from 'react';
+import Image from 'next/image';
+import { Divider, Text } from 'opub-ui';
+
+const Initiatives = () => {
+  const IntiativesList = [
+    {
+      name: 'Climate Action',
+      image: '/About/ca.png',
+      description:
+        '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.',
+    },
+    {
+      name: 'Digital Public Goods',
+      image: '/About/dpg.png',
+      description:
+        '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.',
+    },
+    {
+      name: 'Law and Justice',
+      image: '/About/l&j.png',
+      description:
+        '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.',
+    },
+    {
+      name: 'Open Contracting India',
+      image: '/About/oci.png',
+      description:
+        '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.',
+    },
+    {
+      name: 'Public Finance',
+      image: '/About/pf.png',
+      description:
+        '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.',
+    },
+    {
+      name: 'Urban Development',
+      image: '/About/ud.png',
+      description:
+        '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.',
+    },
+  ];
+  return (
+    <div className="container py-5 lg:py-10">
+      <div className="flex flex-col gap-5 lg:gap-10">
+        <div>
+          <Text variant="heading2xl">Our Initiatives</Text>
+        </div>
+        <div className=" grid w-fit gap-10 md:grid-cols-2 lg:grid-cols-3">
+          {IntiativesList.map((item, index) => (
+            <div key={index} className=" rounded-4 p-7 shadow-card ">
+              <div className="flex flex-col items-center gap-5">
+                <Image
+                  src={item.image}
+                  alt={'initiative logo'}
+                  width={328}
+                  height={200}
+                  className=" h-full w-full"
+                  priority
+                />
+                <Text variant="headingLg">{item.name}</Text>
+                <div className="flex flex-col gap-2 border-t-2 border-solid border-greyExtralight">
+                  <Text className="pt-3 text-[#545456]">
+                    {item.description}
+                  </Text>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default Initiatives;

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

@@ -0,0 +1,84 @@
+import React from 'react';
+import Image from 'next/image';
+import { Text } from 'opub-ui';
+
+import BreadCrumbs from '@/components/BreadCrumbs';
+import Initiatives from './components/Initiatives';
+
+const About = () => {
+  return (
+    <main>
+      <BreadCrumbs
+        data={[
+          { href: '/', label: 'Home' },
+          { href: '#', label: 'About' },
+        ]}
+      />
+      <div className="container py-5 lg:py-10 mb-5">
+        <div className=" flex flex-wrap justify-center gap-14 lg:flex-nowrap ">
+          <div className="flex flex-col gap-6">
+            <Text variant="heading2xl">About us</Text>
+            <Text
+              variant="headingLg"
+              fontWeight="regular"
+              className=" leading-5"
+            >
+              CivicDataLab (CDL) works at the intersection of data, technology,
+              design and social science to strengthen access to public
+              information, evidence-based decision-making and citizen
+              participation in governance. CDL harnesses the potential of open
+              knowledge movements to strengthen the data-for-public-good
+              ecosystem and enable citizens to engage in matters of public
+              reform. We work closely with governments, non-profits,
+              think-tanks, media houses and universities to enhance their data
+              and technology capacity to better data-driven decision-making at
+              scale.
+            </Text>
+          </div>
+          <Image
+            src={'/about-us-illustration.svg'}
+            alt={'about-us-illustration'}
+            width={536}
+            height={350}
+            className=" w-full"
+            priority
+          />
+        </div>
+      </div>
+      <div className="bg-primaryBlue">
+        <div className=" container flex flex-col gap-6 py-5 lg:py-10">
+          <div>
+            <Text variant="headingLg" fontWeight="regular" color="onBgDefault">
+              Our current areas of expertise include digital public goods &
+              infrastructure (DPGs & DPI), climate change, public finance, urban
+              development, open contracting and law & justice. We have
+              co-created digital public goods like open data platforms, data
+              exchanges, data science models and citizen-led apps for improving
+              participatory data-driven governance in India and other countries.
+            </Text>
+          </div>
+          <div>
+            <Text variant="headingLg" fontWeight="regular" color="onBgDefault">
+              In the last five years, we have collected, cleaned and published
+              nearly 30,000+ public interest datasets and are catering to an
+              active user base of more than a million citizens. Some of our
+              publicly available open data initiatives include Open Budgets
+              India, Justice Hub, Open Contracting India, Open City, CogniCity
+              among others. We have co-created digital public goods with
+              National Informatics Center (NIC), Ministry of Electronic &
+              Information Technology (MeitY) and the Government of Assam.
+              Additionally, we actively build capacity for a diverse group of
+              partners working to enhance social impact, situated in India,
+              Indonesia, Philippines, Thailand, Panama and Scotland.
+            </Text>
+          </div>
+        </div>
+      </div>
+      <div>
+        <Initiatives />
+      </div>
+    </main>
+  );
+};
+
+export default About;