Merge pull request #279 from CivicDataLab/dev

merge dev with main

Author: sanjaypinna

.github/workflows/pre-merge.yml

@@ -9,17 +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_DS}}
-  NEXT_PUBLIC_NEXTAUTH_URL: ${{secrets.NEXT_PUBLIC_NEXTAUTH_URL_DS}}
+  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_DS}}
-  BACKEND_URL: ${{secrets.BACKEND_URL_DS}}
-  BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DS}}
+  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_DS}}
-  NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL}}
+  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}}
+  NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}
 
 
 jobs:

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

@@ -13,7 +13,7 @@ import { GraphQL } from '@/lib/api';
 
 const sectorDetails = graphql(`
   query SectorsList {
-    sectors {
+    activeSectors {
       id
       name
       description
@@ -61,7 +61,7 @@ const Sectors = () => {
         </div>
       ) : (
         <div className="mt-12 grid w-full grid-cols-1 gap-6 px-4 md:grid-cols-2 md:px-12 lg:grid-cols-3 lg:px-12">
-          {data?.sectors.map((sectors: any) => (
+          {data?.activeSectors.map((sectors: any) => (
             <Link
               href={`/sectors/${sectors.slug}?size=9&page=1&sort=recent&sectors=${capitalizeWords(sectors.slug)}`}
               key={sectors.id}

app/[locale]/(user)/sectors/page.tsx

@@ -20,7 +20,7 @@ import Styles from '../datasets/dataset.module.scss';
 
 const sectorsListQueryDoc: any = graphql(`
   query SectorsLists($order: SectorOrder, $filters: SectorFilter) {
-    sectors(order: $order, filters: $filters) {
+    activeSectors(order: $order, filters: $filters) {
       id
       name
       description
@@ -185,10 +185,10 @@ const SectorsListingPage = () => {
                 <div className="m-4 flex justify-center">
                   <Spinner />
                 </div>
-              ) : data && data?.sectors?.length > 0 ? (
+              ) : data && data?.activeSectors?.length > 0 ? (
                 <>
                   <div className="grid w-full grid-cols-1 gap-10 md:grid-cols-2 lg:grid-cols-3">
-                    {data?.sectors.map((sectors: any) => (
+                    {data?.activeSectors.map((sectors: any) => (
                       <Link
                         href={`/sectors/${sectors.slug}?sectors=${capitalizeWords(sectors.slug)}`}
                         key={sectors.id}