Merge pull request #753 from haqq-network/dev

release
haqq-network · Mar 27, 2024 · 5cc5f60 · 5cc5f60
2 parents feb5636 + 4e9bfc4
commit 5cc5f60
Show file tree

Hide file tree

Showing 740 changed files with 7,186 additions and 8,270 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -15,50 +15,35 @@
             "depConstraints": [
               {
                 "sourceTag": "shell",
-                "onlyDependOnLibsWithTags": [
-                  "shell-lib-*",
-                  "data-access-falconer",
-                  "sentry"
-                ]
+                "onlyDependOnLibsWithTags": ["shell-lib-*", "data-access"]
               },
               {
                 "sourceTag": "shell-lib-*",
-                "onlyDependOnLibsWithTags": [
-                  "shell-lib-*",
-                  "data-access-falconer"
-                ]
+                "onlyDependOnLibsWithTags": ["shell-lib-*", "data-access"]
               },
               {
                 "sourceTag": "islamic",
-                "onlyDependOnLibsWithTags": [
-                  "islamic-lib-*",
-                  "data-access-falconer"
-                ]
+                "onlyDependOnLibsWithTags": ["islamic-lib-*", "data-access"]
               },
               {
                 "sourceTag": "islamic-lib-*",
-                "onlyDependOnLibsWithTags": [
-                  "islamic-lib-*",
-                  "data-access-falconer"
-                ]
+                "onlyDependOnLibsWithTags": ["islamic-lib-*", "data-access"]
               },
               {
                 "sourceTag": "haqq",
-                "onlyDependOnLibsWithTags": [
-                  "haqq-lib-*",
-                  "data-access-falconer"
-                ]
+                "onlyDependOnLibsWithTags": ["haqq-lib-*", "data-access"]
               },
               {
                 "sourceTag": "haqq-lib-*",
-                "onlyDependOnLibsWithTags": [
-                  "haqq-lib-*",
-                  "data-access-falconer"
-                ]
+                "onlyDependOnLibsWithTags": ["haqq-lib-*", "data-access"]
               },
               {
                 "sourceTag": "vesting",
-                "onlyDependOnLibsWithTags": ["shell-lib-*", "sentry"]
+                "onlyDependOnLibsWithTags": ["shell-lib-*", "data-access"]
+              },
+              {
+                "sourceTag": "data-access",
+                "onlyDependOnLibsWithTags": ["data-access"]
               }
             ]
           }

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,27 +39,26 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
-  build:
-    name: Build
-    runs-on:
-      - ubuntu
-      - self-hosted
-    if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
-    needs: test-and-lint
-    env:
-      FALCONER_ENDPOINT: ${{ secrets.FALCONER_ENDPOINT }}
-      TURNSTILE_SITEKEY: ${{ secrets.TURNSTILE_SITEKEY }}
-      NX_AIRDROP_ENDPOINT: ${{ secrets.NX_AIRDROP_ENDPOINT }}
-    timeout-minutes: 15
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-      - name: Setup dependencies
-        run: yarn install --immutable
-      - name: Build
-        run: yarn nx run-many --target=build --parallel=3
+  # build:
+  #   name: Build
+  #   runs-on:
+  #     - ubuntu
+  #     - self-hosted
+  #   if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
+  #   needs: test-and-lint
+  #   env:
+  #     FALCONER_ENDPOINT: ${{ secrets.FALCONER_ENDPOINT }}
+  #     TURNSTILE_SITEKEY: ${{ secrets.TURNSTILE_SITEKEY }}
+  #   timeout-minutes: 15
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version-file: .nvmrc
+  #         cache: yarn
+  #     - name: Setup dependencies
+  #       run: yarn install --immutable
+  #     - name: Build
+  #       run: yarn nx run-many --target=build --parallel=3
diff --git a/.github/workflows/preview-vercel-haqq-website.yml b/.github/workflows/preview-vercel-haqq-website.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on:
       - ubuntu
       - self-hosted
+    if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
       VERCEL_PROJECT_ID: ${{ secrets.VERCEL_HAQQ_WEBSITE_PROJECT_ID }}
@@ -33,6 +34,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./apps/haqq-website --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
diff --git a/.github/workflows/preview-vercel-islamic-website.yml b/.github/workflows/preview-vercel-islamic-website.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on:
       - ubuntu
       - self-hosted
+    if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
       VERCEL_PROJECT_ID: ${{ secrets.VERCEL_ISLAMIC_WEBSITE_PROJECT_ID }}
@@ -33,6 +34,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./apps/islamic-website --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
diff --git a/.github/workflows/preview-vercel-shell.yml b/.github/workflows/preview-vercel-shell.yml
@@ -14,9 +14,10 @@ jobs:
     runs-on:
       - ubuntu
       - self-hosted
+    if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
-      VERCEL_PROJECT_ID: ${{ secrets.VERCEL_SHELL_PROJECT_ID }}
+      VERCEL_PROJECT_ID: ${{ secrets.VERCEL_SHELL_PROJECT_ID_NEXT }}
       NX_SKIP_NX_CACHE: true
       GIT_COMMIT_SHA: ${{ github.sha }}
     timeout-minutes: 15
@@ -33,6 +34,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./apps/shell --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
       - name: Deploy Project Artifacts to Vercel
-        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
+        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
diff --git a/.github/workflows/preview-vercel-storybook.yml b/.github/workflows/preview-vercel-storybook.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on:
       - ubuntu
       - self-hosted
+    if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
       VERCEL_PROJECT_ID: ${{ secrets.VERCEL_STORYBOOK_PROJECT_ID }}
@@ -33,6 +34,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./libs/storybook--host --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
diff --git a/.github/workflows/preview-vercel-vesting.yml b/.github/workflows/preview-vercel-vesting.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on:
       - ubuntu
       - self-hosted
+    if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
       VERCEL_PROJECT_ID: ${{ secrets.VERCEL_VESTING_PROJECT_ID }}
@@ -33,6 +34,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./apps/vesting --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
diff --git a/.github/workflows/production-vercel-haqq-website.yml b/.github/workflows/production-vercel-haqq-website.yml
@@ -30,6 +30,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./apps/haqq-website --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
diff --git a/.github/workflows/production-vercel-islamic-website.yml b/.github/workflows/production-vercel-islamic-website.yml
@@ -30,6 +30,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./apps/islamic-website --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
diff --git a/.github/workflows/production-vercel-shell.yml b/.github/workflows/production-vercel-shell.yml
@@ -13,7 +13,7 @@ jobs:
       - self-hosted
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
-      VERCEL_PROJECT_ID: ${{ secrets.VERCEL_SHELL_PROJECT_ID }}
+      VERCEL_PROJECT_ID: ${{ secrets.VERCEL_SHELL_PROJECT_ID_NEXT }}
       NX_SKIP_NX_CACHE: true
       GIT_COMMIT_SHA: ${{ github.sha }}
     timeout-minutes: 15
@@ -30,6 +30,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./apps/shell --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
       - name: Deploy Project Artifacts to Vercel
-        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
+        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-next.json
diff --git a/.github/workflows/production-vercel-storybook.yml b/.github/workflows/production-vercel-storybook.yml
@@ -30,6 +30,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./libs/storybook--host --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
diff --git a/.github/workflows/production-vercel-vesting.yml b/.github/workflows/production-vercel-vesting.yml
@@ -30,6 +30,6 @@ jobs:
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
       - name: Build Project Artifacts
-        run: vercel build ./apps/vesting --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} --local-config vercel-react.json