snake case for canister names; fix CI

civicteam · May 13, 2024 · d3d600d · d3d600d
1 parent 230c57a
commit d3d600d
Show file tree

Hide file tree

Showing 42 changed files with 95 additions and 92 deletions.
diff --git a/.github/workflows/ci-local.yaml b/.github/workflows/ci-local.yaml
@@ -47,17 +47,16 @@ jobs:
       run: |
         dfx start --clean --background
         dfx canister create --all
-    - name: Deploy Civic Canister
-      run: src/civic_canister_backend/deploy-civic.sh
     - name: Set env variables
       run: |
-        export VITE_LOCAL_CIVIC_FRONTEND_CANISTER_ID=$(dfx canister id civic-canister-frontend)
+        export VITE_LOCAL_CIVIC_FRONTEND_CANISTER_ID=$(dfx canister id civic_canister_frontend)
         export VITE_LOCAL_INTERNET_IDENTITY_CANISTER_ID=$(dfx canister id internet_identity)
         export VITE_LOCAL_CIVIC_BACKEND_CANISTER_ID=$(dfx canister id civic_canister_backend)
+        export VITE_LOCAL_RELYING_FRONTEND_CANISTER_ID=$(dfx canister id relying_canister_frontend)
     - name: Deploy Canisters
       run: |
-        dfx deploy internet_identity
-        dfx deploy civic-canister-frontend
+        dfx deploy
+        src/civic_canister_backend/deploy-civic.sh
     - name: Run tests
       run: |
         chmod +x ic-test-state-machine

diff --git a/.github/workflows/ci-main.yaml b/.github/workflows/ci-main.yaml
@@ -1,64 +1,64 @@
-name: CI Build and Test (Mainnet setup)
+# name: CI Build and Test (Mainnet setup)
 
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
+# on:
+#   push:
+#     branches: [ "main" ]
+#   pull_request:
+#     branches: [ "main" ]
 
-env:
-  CARGO_TERM_COLOR: always
+# env:
+#   CARGO_TERM_COLOR: always
 
-jobs:
+# jobs:
 
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        include: 
-          - os: ubuntu-latest
-            file_suffix: "-linux"
-          - os: macos-latest
-            file_suffix: "-mac"
+#   build:
+#     runs-on: ${{ matrix.os }}
+#     strategy:
+#       matrix:
+#         os: [ubuntu-latest, macos-latest]
+#         include: 
+#           - os: ubuntu-latest
+#             file_suffix: "-linux"
+#           - os: macos-latest
+#             file_suffix: "-mac"
 
-    steps:
-    - name: Check out repository code
-      uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-    - name: Set up environment
-      run: |
-        echo "Setting up on ${{ matrix.os }}"
-        mv ic-test-machine-binaries/ic-test-state-machine${{ matrix.file_suffix }} ic-test-state-machine
+#     steps:
+#     - name: Check out repository code
+#       uses: actions/checkout@v4
+#       with:
+#         submodules: 'recursive'
+#     - name: Set up environment
+#       run: |
+#         echo "Setting up on ${{ matrix.os }}"
+#         mv ic-test-machine-binaries/ic-test-state-machine${{ matrix.file_suffix }} ic-test-state-machine
 
-    - name: Install dfx  
-      uses: dfinity/setup-dfx@main
-    - name: Confirm successful installation
-      run: dfx --version
-    - name: Install Rust target
-      run: rustup target add wasm32-unknown-unknown
-    - name: Install dependencies
-      run: |
-        npm install 
-        cargo install ic-wasm
-    - name: Create canisters and start local ICP replica
-      run: |
-        dfx start --clean --background
-        dfx canister create --all
-    - name: Deploy Civic Canister
-      run: src/civic_canister_backend/deploy-civic.sh --network ic
-    - name: Set env variables
-      run: |
-        # export VITE_LOCAL_CIVIC_FRONTEND_CANISTER_ID=$(dfx canister id civic-canister-frontend)
-        # export VITE_LOCAL_INTERNET_IDENTITY_CANISTER_ID=$(dfx canister id internet_identity)
-        # export VITE_LOCAL_CIVIC_BACKEND_CANISTER_ID=$(dfx canister id civic_canister_backend)
-    - name: Deploy Canisters
-      run: |
-        dfx deploy internet_identity
-        dfx deploy civic-canister-frontend
-    - name: Run tests
-      run: |
-        chmod +x ic-test-state-machine
-        cargo test --test integration_tests
-    - run: echo "🐧 This job's status is ${{ job.status }}."
+#     - name: Install dfx  
+#       uses: dfinity/setup-dfx@main
+#     - name: Confirm successful installation
+#       run: dfx --version
+#     - name: Install Rust target
+#       run: rustup target add wasm32-unknown-unknown
+#     - name: Install dependencies
+#       run: |
+#         npm install 
+#         cargo install ic-wasm
+#     - name: Create canisters and start local ICP replica
+#       run: |
+#         dfx start --clean --background
+#         dfx canister create --all
+#     - name: Deploy Civic Canister
+#       run: src/civic_canister_backend/deploy-civic.sh --network ic
+#     - name: Set env variables
+#       run: |
+#         # export VITE_LOCAL_CIVIC_FRONTEND_CANISTER_ID=$(dfx canister id civic_canister_frontend)
+#         # export VITE_LOCAL_INTERNET_IDENTITY_CANISTER_ID=$(dfx canister id internet_identity)
+#         # export VITE_LOCAL_CIVIC_BACKEND_CANISTER_ID=$(dfx canister id civic_canister_backend)
+#     - name: Deploy Canisters
+#       run: |
+#         dfx deploy internet_identity
+#         dfx deploy civic_canister_frontend
+#     - name: Run tests
+#       run: |
+#         chmod +x ic-test-state-machine
+#         cargo test --test integration_tests
+#     - run: echo "🐧 This job's status is ${{ job.status }}."
diff --git a/dfx.json b/dfx.json
@@ -20,16 +20,20 @@
       "type": "rust"
     },
 
-    "civic-canister-frontend": {
-      "source": ["src/civic-canister-frontend/dist"],
+    "civic_canister_frontend": {
+      "source": [
+        "src/civic_canister_frontend/dist"
+      ],
       "type": "assets",
-      "workspace": "civic-canister-frontend"
+      "workspace": "civic_canister_frontend"
     },
 
-    "relying-canister-frontend": {
-      "source": ["src/relying-canister-frontend/dist"],
+    "relying_canister_frontend": {
+      "source": [
+        "src/relying_canister_frontend/dist"
+      ],
       "type": "assets",
-      "workspace": "relying-canister-frontend"
+      "workspace": "relying_canister_frontend"
     }
   },
   "defaults": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
   },
   "type": "module",
   "workspaces": [
-    "src/civic-canister-frontend",
-    "src/relying-canister-frontend"
+    "src/civic_canister_frontend",
+    "src/relying_canister_frontend"
   ]
 }
diff --git a/src/civic-canister-frontend/.env.local b/src/civic-canister-frontend/.env.local
diff --git a/src/civic_canister_backend/deploy-civic.sh b/src/civic_canister_backend/deploy-civic.sh
@@ -77,7 +77,7 @@ cd "$SCRIPTS_DIR/.."
 DFX_NETWORK="${DFX_NETWORK:-local}"
 II_CANISTER_ID="${II_CANISTER_ID:-$(dfx canister id internet_identity --network "$DFX_NETWORK")}"
 ISSUER_CANISTER_ID="${ISSUER_CANISTER_ID:-$(dfx canister id civic_canister_backend --network "$DFX_NETWORK")}"
-CIVIC_FRONTEND_CANISTER_ID="${CIVIC_FRONTEND_CANISTER_ID:-$(dfx canister id civic-canister-frontend --network "$DFX_NETWORK")}"
+CIVIC_FRONTEND_CANISTER_ID="${CIVIC_FRONTEND_CANISTER_ID:-$(dfx canister id civic_canister_frontend --network "$DFX_NETWORK")}"
 if [ "$DFX_NETWORK" = "local" ]; then
   REPLICA_SERVER_PORT=$(dfx info webserver-port)
   ISSUER_DERIVATION_ORIGIN="http://${ISSUER_CANISTER_ID}.localhost:${REPLICA_SERVER_PORT}"

diff --git a/src/civic_canister_frontend/.env.local b/src/civic_canister_frontend/.env.local
@@ -0,0 +1,4 @@
+VITE_LOCAL_INTERNET_IDENTITY_CANISTER_ID=avqkn-guaaa-aaaaa-qaaea-cai
+VITE_LOCAL_CIVIC_FRONTEND_CANISTER_ID=by6od-j4aaa-aaaaa-qaadq-cai
+VITE_LOCAL_CIVIC_BACKEND_CANISTER_ID=b77ix-eeaaa-aaaaa-qaada-cai
+VITE_LOCAL_HOST=localhost:4943
diff --git a/src/civic-canister-frontend/index.html → src/civic_canister_frontend/index.html b/src/civic-canister-frontend/index.html → src/civic_canister_frontend/index.html
diff --git a/src/civic-canister-frontend/package.json → src/civic_canister_frontend/package.json b/src/civic-canister-frontend/package.json → src/civic_canister_frontend/package.json
@@ -22,7 +22,7 @@
     "vite-plugin-environment": "^1.1.3",
     "vitest": "^0.32.2"
   },
-  "name": "civic-canister-frontend",
+  "name": "civic_canister_frontend",
   "private": true,
   "scripts": {
     "build": "tsc && vite build",
@@ -34,4 +34,4 @@
   },
   "type": "module",
   "version": "0.0.0"
-}
+}
diff --git a/...canister-frontend/public/.ic-assets.json5 → ...canister_frontend/public/.ic-assets.json5 b/...canister-frontend/public/.ic-assets.json5 → ...canister_frontend/public/.ic-assets.json5
diff --git a/...ivic-canister-frontend/public/favicon.ico → ...ivic_canister_frontend/public/favicon.ico b/...ivic-canister-frontend/public/favicon.ico → ...ivic_canister_frontend/public/favicon.ico
diff --git a/src/civic-canister-frontend/public/logo2.svg → src/civic_canister_frontend/public/logo2.svg b/src/civic-canister-frontend/public/logo2.svg → src/civic_canister_frontend/public/logo2.svg
diff --git a/src/civic-canister-frontend/src/App.tsx → src/civic_canister_frontend/src/App.tsx b/src/civic-canister-frontend/src/App.tsx → src/civic_canister_frontend/src/App.tsx
diff --git a/src/civic-canister-frontend/src/config.ts → src/civic_canister_frontend/src/config.ts b/src/civic-canister-frontend/src/config.ts → src/civic_canister_frontend/src/config.ts
diff --git a/src/civic-canister-frontend/src/index.scss → src/civic_canister_frontend/src/index.scss b/src/civic-canister-frontend/src/index.scss → src/civic_canister_frontend/src/index.scss
diff --git a/src/civic-canister-frontend/src/main.jsx → src/civic_canister_frontend/src/main.jsx b/src/civic-canister-frontend/src/main.jsx → src/civic_canister_frontend/src/main.jsx
diff --git a/...frontend/src/service/CredentialService.ts → ...frontend/src/service/CredentialService.ts b/...frontend/src/service/CredentialService.ts → ...frontend/src/service/CredentialService.ts
diff --git a/...-frontend/src/service/PrincipalService.ts → ..._frontend/src/service/PrincipalService.ts b/...-frontend/src/service/PrincipalService.ts → ..._frontend/src/service/PrincipalService.ts
diff --git a/...civic-canister-frontend/src/setupTests.js → ...civic_canister_frontend/src/setupTests.js b/...civic-canister-frontend/src/setupTests.js → ...civic_canister_frontend/src/setupTests.js
diff --git a/...-canister-frontend/src/tests/App.test.jsx → ..._canister_frontend/src/tests/App.test.jsx b/...-canister-frontend/src/tests/App.test.jsx → ..._canister_frontend/src/tests/App.test.jsx
diff --git a/...civic-canister-frontend/src/vite-env.d.ts → ...civic_canister_frontend/src/vite-env.d.ts b/...civic-canister-frontend/src/vite-env.d.ts → ...civic_canister_frontend/src/vite-env.d.ts
diff --git a/src/civic-canister-frontend/tsconfig.json → src/civic_canister_frontend/tsconfig.json b/src/civic-canister-frontend/tsconfig.json → src/civic_canister_frontend/tsconfig.json
diff --git a/src/civic-canister-frontend/vite.config.js → src/civic_canister_frontend/vite.config.js b/src/civic-canister-frontend/vite.config.js → src/civic_canister_frontend/vite.config.js
diff --git a/src/relying-canister-frontend/.env.local b/src/relying-canister-frontend/.env.local
diff --git a/src/relying_canister_frontend/.env.local b/src/relying_canister_frontend/.env.local
@@ -0,0 +1,4 @@
+VITE_LOCAL_HOST=localhost:4943
+VITE_LOCAL_INTERNET_IDENTITY_CANISTER_ID=avqkn-guaaa-aaaaa-qaaea-cai
+VITE_LOCAL_RELYING_FRONTEND_CANISTER_ID=asrmz-lmaaa-aaaaa-qaaeq-cai
+VITE_LOCAL_CIVIC_BACKEND_CANISTER_ID=b77ix-eeaaa-aaaaa-qaada-cai
diff --git a/src/relying-canister-frontend/index.html → src/relying_canister_frontend/index.html b/src/relying-canister-frontend/index.html → src/relying_canister_frontend/index.html
diff --git a/src/relying-canister-frontend/package.json → src/relying_canister_frontend/package.json b/src/relying-canister-frontend/package.json → src/relying_canister_frontend/package.json
@@ -23,7 +23,7 @@
     "vite-plugin-environment": "^1.1.3",
     "vitest": "^0.32.2"
   },
-  "name": "relying-canister-frontend",
+  "name": "relying_canister_frontend",
   "private": true,
   "scripts": {
     "build": "tsc && vite build",
@@ -35,4 +35,4 @@
   },
   "type": "module",
   "version": "0.0.0"
-}
+}
diff --git a/...canister-frontend/public/.ic-assets.json5 → ...canister_frontend/public/.ic-assets.json5 b/...canister-frontend/public/.ic-assets.json5 → ...canister_frontend/public/.ic-assets.json5
diff --git a/...ying-canister-frontend/public/favicon.ico → ...ying_canister_frontend/public/favicon.ico b/...ying-canister-frontend/public/favicon.ico → ...ying_canister_frontend/public/favicon.ico
diff --git a/...elying-canister-frontend/public/logo2.svg → ...elying_canister_frontend/public/logo2.svg b/...elying-canister-frontend/public/logo2.svg → ...elying_canister_frontend/public/logo2.svg
diff --git a/src/relying-canister-frontend/src/App.tsx → src/relying_canister_frontend/src/App.tsx b/src/relying-canister-frontend/src/App.tsx → src/relying_canister_frontend/src/App.tsx
diff --git a/src/relying-canister-frontend/src/config.ts → src/relying_canister_frontend/src/config.ts b/src/relying-canister-frontend/src/config.ts → src/relying_canister_frontend/src/config.ts
diff --git a/src/relying-canister-frontend/src/index.scss → src/relying_canister_frontend/src/index.scss b/src/relying-canister-frontend/src/index.scss → src/relying_canister_frontend/src/index.scss
diff --git a/src/relying-canister-frontend/src/main.jsx → src/relying_canister_frontend/src/main.jsx b/src/relying-canister-frontend/src/main.jsx → src/relying_canister_frontend/src/main.jsx
diff --git a/...frontend/src/service/CredentialService.ts → ...frontend/src/service/CredentialService.ts b/...frontend/src/service/CredentialService.ts → ...frontend/src/service/CredentialService.ts
diff --git a/...-frontend/src/service/PrincipalService.ts → ..._frontend/src/service/PrincipalService.ts b/...-frontend/src/service/PrincipalService.ts → ..._frontend/src/service/PrincipalService.ts
diff --git a/...lying-canister-frontend/src/setupTests.js → ...lying_canister_frontend/src/setupTests.js b/...lying-canister-frontend/src/setupTests.js → ...lying_canister_frontend/src/setupTests.js
diff --git a/...-canister-frontend/src/tests/App.test.jsx → ..._canister_frontend/src/tests/App.test.jsx b/...-canister-frontend/src/tests/App.test.jsx → ..._canister_frontend/src/tests/App.test.jsx
diff --git a/...lying-canister-frontend/src/vite-env.d.ts → ...lying_canister_frontend/src/vite-env.d.ts b/...lying-canister-frontend/src/vite-env.d.ts → ...lying_canister_frontend/src/vite-env.d.ts
diff --git a/src/relying-canister-frontend/tsconfig.json → src/relying_canister_frontend/tsconfig.json b/src/relying-canister-frontend/tsconfig.json → src/relying_canister_frontend/tsconfig.json
diff --git a/src/relying-canister-frontend/vite.config.js → src/relying_canister_frontend/vite.config.js b/src/relying-canister-frontend/vite.config.js → src/relying_canister_frontend/vite.config.js