test: #171, #181, #109, #180, #225, #97, #28, #80, #90, #156, #113, #194, #203

.github/vva-be-config.json → .github/backend-config.json

@@ -8,7 +8,7 @@
   },
   "fakedbsyncconfig" : {
       "host"     : "localhost",
-      "dbname"   : "vva",
+      "dbname"   : "govtool",
       "user"     : "postgres",
       "password" : "MTnk8lsuMM41RgAh1y2WTAUdObsb",
       "port"     : 5432

.github/workflows/build-and-deploy.yml

@@ -117,15 +117,15 @@ jobs:
       DBSYNC_POSTGRES_DB: "cexplorer"
       DBSYNC_POSTGRES_USER: "postgres"
       DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
-      FAKEDBSYNC_POSTGRES_DB: "vva"
+      FAKEDBSYNC_POSTGRES_DB: "govtool"
       FAKEDBSYNC_POSTGRES_USER: "test"
       FAKEDBSYNC_POSTGRES_PASSWORD: "test"
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
       NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
-      TRAEFIK_LE_EMAIL: "admin+vva@binarapps.com"
+      TRAEFIK_LE_EMAIL: "admin+govtool@binarapps.com"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -191,15 +191,15 @@ jobs:
       DBSYNC_POSTGRES_DB: "cexplorer"
       DBSYNC_POSTGRES_USER: "postgres"
       DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
-      FAKEDBSYNC_POSTGRES_DB: "vva"
+      FAKEDBSYNC_POSTGRES_DB: "govtool"
       FAKEDBSYNC_POSTGRES_USER: "test"
       FAKEDBSYNC_POSTGRES_PASSWORD: "test"
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
       NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
-      TRAEFIK_LE_EMAIL: "admin+vva@binarapps.com"
+      TRAEFIK_LE_EMAIL: "admin+govtool@binarapps.com"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -246,8 +246,6 @@ jobs:
           curl -X POST -u "admin:$GRAFANA_ADMIN_PASSWORD" https://$DOMAIN/grafana/api/admin/provisioning/dashboards/reload
           curl -X POST -u "admin:$GRAFANA_ADMIN_PASSWORD" https://$DOMAIN/grafana/api/admin/provisioning/notifications/reload
       - name: Notify on Slack
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEPLOY_NOTIFY_SLACK_WEBHOOK_URL }}
         run: |
           if [[ "${{ inputs.environment }}" == "staging" ]]; then export DOMAIN=staging.govtool.byron.network; fi;
           if [[ "${{ inputs.environment }}" == "beta" ]]; then export DOMAIN=sanchogov.tools; fi;

.github/workflows/frontend_sonar_scan.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   execute_sonar_scanner:
-    name: Execute sonar-scanner on vva-fe
+    name: Execute sonar-scanner on govtool frontend
     runs-on: ubuntu-latest
     permissions: read-all
     steps:
@@ -26,4 +26,4 @@ jobs:
       # - uses: sonarsource/sonarqube-quality-gate-action@master
       #   timeout-minutes: 5
       #   env:
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/lighthouse.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-    
+
       - name: Install dependencies
         run: npm install
         working-directory: ./govtool/frontend
@@ -27,7 +27,7 @@ jobs:
         with:
           path: |
             ~/.npm
-          key: ${{ runner.os }}-npm-${{ hashFiles('govtool/frontend/package-lock.json', 'tests/vva-fe/package-lock.json') }}
+          key: ${{ runner.os }}-npm-${{ hashFiles('govtool/frontend/package-lock.json', 'tests/govtool-frontend/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-npm-
 
@@ -45,7 +45,6 @@ jobs:
         run: |
             lhci assert  --preset "lighthouse:recommended"
 
-
       - name: Publish reports
         working-directory: ./govtool/frontend
         if: github.repository_owner == 'IntersectMBO'
@@ -56,4 +55,4 @@ jobs:
               -d "@./lighthouseci/$(ls ./.lighthouseci |grep 'lhr.*\.json' | head -n 1)" \
               -H "commit-hash: $(git rev-parse HEAD)" \
               -H "secret-token: ${{ secrets.METRICS_SERVER_SECRET_TOKEN }}" \
-              -H 'Content-Type: application/json' || echo "Metric Upload error ignored ..."
+              -H 'Content-Type: application/json' || echo "Metric Upload error ignored ..."

.github/workflows/test_backend.yml

@@ -4,8 +4,8 @@ on:
   push:
     paths:
     - .github/workflows/test_backend.yml
-  #     - src/vva-be
-  #     - tests/vva-be
+  #     - govtool/backend
+  #     - tests/govtool-backend
 
   schedule:
     - cron: '0 0 * * *'
@@ -18,23 +18,23 @@ on:
         options:
           - "sanchogov.tools/api"
           - "staging.govtool.byron.network/api"
-          - "vva-sanchonet.cardanoapi.io/api"
+          - "govtool-sanchonet.cardanoapi.io/api"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
         - name: Checkout code
           uses: actions/checkout@v4
-  
+
         - name: Set up Python
           uses: actions/setup-python@v4
           with:
             python-version: 3.11.4
             cache: 'pip'
 
         - name: Run Backend Test
-          working-directory: tests/vva-be
+          working-directory: tests/govtool-backend
           run: |
             python -m pip install --upgrade pip
             pip install -r requirements.txt

.github/workflows/test_integration_cypress.yml

@@ -22,13 +22,13 @@ on:
         options:
           - "sanchogov.tools"
           - "staging.govtool.byron.network"
-          - "vva-sanchonet.cardanoapi.io"
+          - "govtool-sanchonet.cardanoapi.io"
 
 jobs:
   cypress-tests:
     defaults:
       run:
-        working-directory: ./tests/vva-fe
+        working-directory: ./tests/govtool-frontend
     runs-on: ubuntu-latest
     env: 
       NODE_OPTIONS: --max_old_space_size=4096
@@ -50,15 +50,15 @@ jobs:
           path: |
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key:
-            ${{ runner.os }}-yarn-${{hashFiles('tests/vva-fe/yarn.lock') }}
+            ${{ runner.os }}-yarn-${{hashFiles('tests/govtool-frontend/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 
       - name: Cypress run
         uses: cypress-io/github-action@v6
         with:
           record: true
-          working-directory: ./tests/vva-fe
+          working-directory: ./tests/govtool-frontend
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           # pass GitHub token to allow accurately detecting a build vs a re-run build
@@ -69,4 +69,3 @@ jobs:
           CYPRESS_kuberApiKey: ${{secrets.KUBER_API_KEY}}
           CYPRESS_faucetApiUrl: https://faucet.${{inputs.network || 'sanchonet'}}.world.dev.cardano.org
           CYPRESS_faucetApiKey: ${{ secrets.FAUCET_API_KEY }}
-

.gitignore

@@ -131,3 +131,8 @@ infra/terraform/.terraform*
 # local env files
 .env
 .envrc
+
+# local docker-compose files
+scripts/govtool/dev-postgres_db
+scripts/govtool/dev-postgres_user
+scripts/govtool/dev-postgres_password

CHANGELOG.md

@@ -9,35 +9,28 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
 ## [Unreleased]
-
-### Added
--
+- Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)
+- Vitest unit tests added for utils functions [Issue 81](https://github.com/IntersectMBO/govtool/issues/81)
+- i18next library added to FE [Issue 80](https://github.com/IntersectMBO/govtool/issues/80)
 
 ### Fixed
+- Fix copy for maintenance page [Issue 180](https://github.com/IntersectMBO/govtool/issues/180)
+- Fix misleading metadata hash text [Issue 90](https://github.com/IntersectMBO/govtool/issues/90)
 - Fixed vote calculation problems related to NoConfidence DRep [Issue 59](https://github.com/IntersectMBO/govtool/issues/59)
 - Fixed ada-holder/get-current-delegation error when delegated to NoConfidence or AlwaysAbstain dreps. [Issue 82](https://github.com/IntersectMBO/govtool/issues/82)
+- Fixed deployment scripts to address [Issue 171](https://github.com/IntersectMBO/govtool/issues/171).
 
 ### Changed
+- Update Cardano-Serialization-Lib to 12.0.0-alpha.16 [Issue 156](https://github.com/IntersectMBO/govtool/issues/156)
 - Changed and improved working conventions docs, PR template and codeowners file, addressing [Issue 88](https://github.com/IntersectMBO/govtool/issues/88).
-
-### Removed
--
-
-## [sancho-v1.0.1](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.1) 2023-12-XX
-
-### Added
--
-
-### Fixed
--
-
-### Changed
-- Changed Node version from 8.7.1-pre to 8.7.2 and Db-sync version from sancho-2-3-0 to sancho-3-0-0.
+- Changed Node version from 8.7.1-pre to 8.8.0-pre and DbSync version from sancho-2-3-0 to sancho-4-0-0-fix-config, addressing also [Issue 181](https://github.com/IntersectMBO/govtool/issues/181).
+- Reorganized repository to fit new conventions [Issue 85](https://github.com/IntersectMBO/govtool/issues/85).
+- Renamed project from VVA to GovTool [Issue 97](https://github.com/IntersectMBO/govtool/issues/97).
 - (`docs/update-working-conventions`) Addressing [Issue 25](https://github.com/IntersectMBO/govtool/issues/25) changed working conventions documentation to improve intended flows.
 
 ### Removed
 -
 
 ## [sancho-v1.0.0](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.0) 2023-12-17
 
-- Import code to new repository
+- Import code to new repository

CODEOWNERS

@@ -1,21 +1,21 @@
 # GovTool Project Codeowners
 
 # These owners will be the default owners for everything in the repository.
-* @Ryun1 @kickloop
+* @kickloop @MSzalowski
 
 # Frontend assets templates
-govtool/frontend/*                                                          @Sworzen1 @JanJaroszczak @kickloop
-*.tsx                                                                       @Sworzen1 @JanJaroszczak @kickloop
-*.ts                                                                        @Sworzen1 @JanJaroszczak @kickloop
-*.css                                                                       @Sworzen1 @JanJaroszczak @kickloop
+govtool/frontend/*                                                          @MSzalowski @Sworzen1 @JanJaroszczak @kickloop
+*.tsx                                                                       @MSzalowski @Sworzen1 @JanJaroszczak @kickloop
+*.ts                                                                        @MSzalowski @Sworzen1 @JanJaroszczak @kickloop
+*.css                                                                       @MSzalowski @Sworzen1 @JanJaroszczak @kickloop
 
 # Backend
-govtool/backend/*                                                           @jankun4 @kickloop
+govtool/backend/*                                                           @MSzalowski @jankun4 @kickloop
 
 # DevOps
-.github/workflows/*                                                         @adgud @kickloop
-config/govtool/*                                                            @adgud @kickloop
-infra/terraform/*                                                           @adgud @kickloop
+.github/workflows/*                                                         @placek @adgud @kickloop
+config/govtool/*                                                            @placek @adgud @kickloop
+infra/terraform/*                                                           @placek @adgud @kickloop
 
 # Testing
 gov-action-loader/*                                                         @IntersectMBO/govtool-test @kickloop

README.md

@@ -21,8 +21,8 @@ The SanchoNet GovTool is currently open for beta testing and can be accessed at
 Learn more; [docs.sanchogov.tools](https://docs.sanchogov.tools/).
 
 ## 📍 Navigation
-- [GovTool Backend](./src/vva-be/README.md)
-- [GovTool Frontend](./src/vva-fe/README.md)
+- [GovTool Backend](./govtool/backend/README.md)
+- [GovTool Frontend](./govtool/frontend/README.md)
 - [Documentation](./docs/)
 - [Tests](./tests/)
 
@@ -45,4 +45,4 @@ Frontend is able to connect to Cardano wallets over the [CIP-30](https://github.
 
 ## 🤝 Contributing
 Thanks for considering contributing and helping us on creating GovTool! 😎
-Please checkout our [Contributing Documentation](./CONTRIBUTING.md).
+Please checkout our [Contributing Documentation](./CONTRIBUTING.md).

docs/operations/DEPLOY.md

@@ -20,7 +20,7 @@ AWS is configured with Terraform, but the account needs to be bootstrapped befor
 This has to be done only once per AWS account.
 
 1. Configure AWS CLI with `aws configure` (if you are using a configuration profile, use `aws --profile MYPROFILE configure` and then `export AWS_PROFILE=MYPROFILE`).
-1. Execute `./src/terraform/bootstrap-aws-account.sh` script.
+1. Execute `./infra/terraform/bootstrap-aws-account.sh` script.
 
 ### Infrastructure setup
 
@@ -29,7 +29,7 @@ This has to be done only once per AWS account.
 1. Run `terraform plan` to view changes that would be performed to infrastructure.
 1. Take note of the outputs - they contain ECR repo URLs and app domains.
 
-Note: the Terraform code configures the EC2 instance using `src/terraform/modules/vva-ec2/user_data.sh`. This script is only executed on instance creation.
+Note: the Terraform code configures the EC2 instance using `infra/terraform/modules/govtool-ec2/user_data.sh`. This script is only executed on instance creation.
 
 ## Application deployment
 
@@ -52,3 +52,19 @@ Alternatively you can type `make all instance=$INSTANCE cardano_network=$CARDANO
 
 View the app at `https://${ENVIRONMENT}-${INSTANCE}.govtool.byron.network`.
 Keep in mind that after initial deployment on a new environment, it will take some time for the Cardano node to get in sync.
+
+## Aftermatch
+
+After performing a deploy from a local machine, it is crucial to carefully track
+the application's accessibility and functionality to ensure no unintended
+changes, such as the accidental activation of BasicAuth[^1], have occurred.
+
+Additionally, verifying that all configuration files and environment variables,
+particularly those related to environment-specific settings like database
+connections or external service endpoints, are correctly generated and applied
+is essential for maintaining the intended behavior of the application across
+different environments. This includes a thorough check of environment variables
+to confirm they are correctly set and aligned with the specific needs of the
+deployed environment.
+
+[^1]: https://github.com/IntersectMBO/govtool/discussions/174

govtool/backend/README.md

@@ -3,7 +3,7 @@
 This is a backend application of GovTool project.
 
 ## Prerequisites
-In order to run `vva-be` your host machine will need access to the `cardano-db-sync` postgres database. To have this database running locally you'll need:
+In order to run `backend` your host machine will need access to the `cardano-db-sync` postgres database. To have this database running locally you'll need:
 * `cardano-node`
 * `cardano-db-sync`
 * PostgreSQL database
@@ -24,10 +24,10 @@ Due to problems with openapi3 package it's hard to build this project with plain
 
 1. Get [Nix](https://nixos.org/download).
 
-2. Enter `src/vva-be` directory:
+2. Enter `govtool/backend` directory:
 
     ```sh
-    cd src/vva-be
+    cd govtool/backend
     ```
 
 3. Allow broken nix packages
@@ -54,3 +54,5 @@ Due to problems with openapi3 package it's hard to build this project with plain
     ```sh
     cabal run vva-be -- --config <YOUR CONFIG FILE> start-app
     ```
+> [!WARNING]
+> In the context of our ongoing project enhancements, it is assumed that the executable previously known as 'vva-be' should be now officially renamed to 'govtool-backend'. This change is necessary for aligning with the updated branding and functional scope of the application and it has to be implemented in the near future as a chore and refactoring ticket. Make sure that the documentation matches the actual name of the executable.

govtool/backend/src/VVA/API.hs

@@ -46,6 +46,7 @@ type VVAApi =
                     :> QueryParam "sort" GovernanceActionSortMode
                     :> QueryParam "page" Natural
                     :> QueryParam "pageSize" Natural
+                    :> QueryParam "drepId" HexText
                     :> Get '[JSON] ListProposalsResponse
     :<|> "proposal" :> "get" :> Capture "proposalId" GovActionId :> QueryParam "drepId" HexText :> Get '[JSON] GetProposalResponse
     :<|> "epoch" :> "params" :> Get '[JSON] GetCurrentEpochParamsResponse
@@ -175,13 +176,26 @@ listProposals
   -> Maybe GovernanceActionSortMode
   -> Maybe Natural
   -> Maybe Natural
+  -> Maybe HexText
   -> m ListProposalsResponse
-listProposals selectedTypes sortMode mPage mPageSize = do
+listProposals selectedTypes sortMode mPage mPageSize mDrepRaw = do
   let page = (fromIntegral $ fromMaybe 0 mPage) :: Int
       pageSize = (fromIntegral $ fromMaybe 10 mPageSize) :: Int
 
+  -- proposals that the provided Drep has already voted on should be filtered out
+  proposalsToRemove <- case mDrepRaw of
+    Nothing -> return []
+    Just drepId ->
+      map (voteParamsProposalId . voteResponseVote)
+        <$> getVotes drepId [] Nothing
+
   CacheEnv {proposalListCache} <- asks vvaCache
   mappedAndSortedProposals <-
+    filter
+      ( \ProposalResponse {proposalResponseId} ->
+          proposalResponseId `notElem` proposalsToRemove
+      )
+      <$>
     mapSortAndFilterProposals selectedTypes sortMode
     <$> cacheRequest proposalListCache () Proposal.listProposals