feat/user-permissions

.github/workflows/merge.yaml

@@ -129,11 +129,11 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
           outputs: type=docker,dest=/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar
           build-args: |
-            NEXT_PUBLIC_API_URL=${{ secrets.PROD_NEXT_PUBLIC_API_URL }}
-            NEXT_PUBLIC_USERSNAP_SPACE_API_KEY=${{ secrets.PROD_NEXT_PUBLIC_USERSNAP_SPACE_API_KEY }}
-            NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY=${{ secrets.PROD_NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY }}
-            NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS=${{ secrets.PROD_NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS }}
-            NEXT_PUBLIC_IS_MAINNET=${{ secrets.PROD_NEXT_PUBLIC_IS_MAINNET }}
+            NEXT_PUBLIC_API_URL=${{ secrets.QA_NEXT_PUBLIC_API_URL }}
+            NEXT_PUBLIC_USERSNAP_SPACE_API_KEY=${{ secrets.QA_NEXT_PUBLIC_USERSNAP_SPACE_API_KEY }}
+            NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY=${{ secrets.QA_NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY }}
+            NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS=${{ secrets.QA_NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS }}
+            NEXT_PUBLIC_IS_MAINNET=${{ secrets.QA_NEXT_PUBLIC_IS_MAINNET }}
 
       - name: Scan Docker image with Dockle
         id: dockle
@@ -160,6 +160,14 @@ jobs:
           rm -rf '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'
           docker push ${{ steps.image_lowercase.outputs.lowercase }}:${{ env.TAG }}
 
+      - name: Add tag as a PR comment
+        uses: ubie-oss/[email protected]
+        id: comment-to-merged-pr
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          message: |-
+            This PR is in the tag: ${{ env.TAG }} , for ${{ matrix.name }} service
+
       - name: Deploy with Qovery
         if: github.ref == 'refs/heads/develop'
         env:

.github/workflows/pr.yaml

@@ -117,22 +117,20 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
           outputs: type=docker,dest=/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar
           build-args: |
-            NEXT_PUBLIC_API_URL=${{ secrets.PROD_NEXT_PUBLIC_API_URL }}
-            NEXT_PUBLIC_USERSNAP_SPACE_API_KEY=${{ secrets.PROD_NEXT_PUBLIC_USERSNAP_SPACE_API_KEY }}
-            NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY=${{ secrets.PROD_NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY }}
-            NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS=${{ secrets.PROD_NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS }}
-            NEXT_PUBLIC_IS_MAINNET=${{ secrets.PROD_NEXT_PUBLIC_IS_MAINNET }}
-
+            NEXT_PUBLIC_API_URL=${{ secrets.DEV_NEXT_PUBLIC_API_URL }}
+            NEXT_PUBLIC_USERSNAP_GLOBAL_API_KEY=${{ secrets.DEV_NEXT_PUBLIC_USERSNAP_GLOBAL_API_KEY }}
+            NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY=${{ secrets.DEV_NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY }}
+
       - name: Scan Docker image with Dockle
         id: dockle
         run: |
-          wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
-          tar zxf dockle_0.4.14_Linux-64bit.tar.gz
-          sudo mv dockle /usr/local/bin
+            wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
+            tar zxf dockle_0.4.14_Linux-64bit.tar.gz
+            sudo mv dockle /usr/local/bin
 
-          dockle --exit-code 1 --exit-level fatal --format json --input '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
-          rm -rf '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar'
-          cat ${{ matrix.workdir }}/dockle_scan_output.json
+            dockle --exit-code 1 --exit-level fatal --format json --input '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
+            rm -rf '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar'
+            cat ${{ matrix.workdir }}/dockle_scan_output.json
 
           echo "outcome=success" >> $GITHUB_OUTPUT
 

docker-compose.yaml

@@ -8,7 +8,7 @@ services:
     ports:
       - "1337:1337"
     networks:
-      - cc
+      - bloxico_local
     depends_on:
       - psql
       - cache
@@ -21,20 +21,25 @@ services:
       dockerfile: Dockerfile
     container_name: worker
     restart: unless-stopped
-    ports:
-      - "3002:3002"
     networks:
-      - cc
+      - bloxico_local
 
   ipfs:
     build:
       context: ./ipfs-service
       dockerfile: Dockerfile
     container_name: ipfs-service
+    ports:
+      - "3001:3001"
+      - "4001:4001"
+      - "4002:4002"
+      - "4003:4003"
+      - "5001:5001"
+      - "8080:8080"
     volumes:
       - ipfs_data:/ipfs/datastore
     networks:
-      - cc
+      - bloxico_local
     extra_hosts:
       - "host.docker.internal:host-gateway"
     depends_on:
@@ -46,8 +51,8 @@ services:
     container_name: postgres
     environment:
       POSTGRES_DB: cc-portal
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: BEdev24
+      POSTGRES_PASSWORD: bedev.bloxico24
     volumes:
       - "psql-data:/var/lib/postgresql/data/"
     ports:
@@ -60,25 +65,22 @@ services:
       while ! pg_isready -q -h postgres -p 5432; do 
         sleep 1; 
       done; 
-      PGUSER=postgres PGPASSWORD=postgres psql -U postgres -d cc-portal -c "CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";"; 
+      PGUSER=BEdev24 PGPASSWORD=bedev.bloxico24 psql -U BEdev24 -d cc-portal -c "CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";"; 
       wait $pid
       '
     networks:
-      - cc
+      - bloxico_local
 
   cache:
     image: redis/redis-stack:latest
     container_name: cache
     restart: always
-    environment:
-      - REDIS_PASSWORD=your-redis-password
-    command: redis-server --requirepass ${REDIS_PASSWORD}
     ports:
-      - '6379:6379'
+      - "6379:6379"
     volumes:
       - cache:/data
     networks:
-      - cc
+      - bloxico_local
 
   s3:
     image: minio/minio
@@ -87,28 +89,36 @@ services:
       - "9000:9000"
       - "9001:9001"
     environment:
-      MINIO_ROOT_USER: minio
-      MINIO_ROOT_PASSWORD: minio123
+      MINIO_ROOT_USER: bloxico
+      MINIO_ROOT_PASSWORD: bloxico2
     command: ["server", "/data", "--console-address", ":9001"]
     volumes:
       - s3_data:/data
     networks:
-      - cc
+      - bloxico_local
 
   frontend:
     build:
       context: ./frontend
       dockerfile: Dockerfile
     container_name: frontend
+    networks:
+      - bloxico_local
+
+  proxy:
+    build:
+      context: ./proxy
+      dockerfile: Dockerfile
+    container_name: proxy
     ports:
-      - "3000:3000"
+      - "80:80"
     networks:
-      - cc
+      - bloxico_local
 
 volumes:
   cache:
   s3_data:
   ipfs_data:
   psql-data:
 networks:
-  cc:
+  bloxico_local:

frontend/messages/en.json

@@ -15,9 +15,11 @@
     "title": "Interim Constitution",
     "drawer": {
       "compare": "Compare",
-      "latestRevisions": "Latest Revisions",
-      "tableOfContents": "Content",
-      "latest": "Latest"
+      "versionHistory": "Version History",
+      "tableOfContents": "Contents",
+      "latest": "Latest",
+      "uploadNewVersion": "Upload new version",
+      "backToContents": "Back to contents"
     }
   },
   "Members": {

frontend/src/components/organisms/Constitution/TOCAccordion.tsx

@@ -4,7 +4,7 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Box
+  Box,
 } from "@mui/material";
 import { Children, useEffect, useState } from "react";
 import { TocNested } from "./TOCNested";
@@ -35,9 +35,9 @@ export const TocAccordion = ({ children }) => {
               sx={{
                 boxShadow: "none",
                 "&:before": {
-                  display: "none"
+                  display: "none",
                 },
-                width: "100%"
+                width: "100%",
               }}
               disableGutters
             >
@@ -49,9 +49,9 @@ export const TocAccordion = ({ children }) => {
                   padding: 0,
                   "& a": {
                     "&:active": {
-                      pointerEvents: "none" // disables the href activation on click but keep tooltip showing
-                    }
-                  }
+                      pointerEvents: "none", // disables the href activation on click but keep tooltip showing
+                    },
+                  },
                 }}
               >
                 {child.props.children[0]}
@@ -69,9 +69,9 @@ export const TocAccordion = ({ children }) => {
                       minHeight: "56px",
                       margin: "0",
                       "&:a": {
-                        margin: "auto"
-                      }
-                    }
+                        margin: "auto",
+                      },
+                    },
                   }}
                 >
                   {Array.isArray(child.props.children[1]?.props.children)
@@ -98,8 +98,8 @@ export const TocAccordion = ({ children }) => {
 
                 "& li": {
                   display: "flex",
-                  alignItems: "center"
-                }
+                  alignItems: "center",
+                },
               }}
             >
               {child}
@@ -111,8 +111,8 @@ export const TocAccordion = ({ children }) => {
                 padding: 0,
                 height: "56px",
                 "& li": {
-                  minHeight: "56px"
-                }
+                  minHeight: "56px",
+                },
               }}
             >
               {child}

frontend/src/components/organisms/VotesTable/VotesTableRow.tsx

@@ -19,7 +19,7 @@ export const VotesTableRow = ({
   votes,
   disabled,
   actionTitle,
-  onActionClick,
+  onActionClick
 }: Props) => {
   const t = useTranslations("LatestUpdates");
   const {