Merge branch 'main' into feat/##330-api

SCBJ-7 · Feb 29, 2024 · f391c5a · f391c5a
2 parents 06cc120 + 5c9d858
commit f391c5a
Show file tree

Hide file tree

Showing 14 changed files with 1,063 additions and 57 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -10,6 +10,7 @@ jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
     env:
+      VITE_BASE_URL: "${{secrets.VITE_BASE_URL}}"
       VITE_APIKEY: "${{secrets.VITE_APIKEY}}"
       VITE_AUTH_DOMAIN: "${{secrets.VITE_AUTH_DOMAIN}}"
       VITE_PROJECT_ID: "${{secrets.VITE_PROJECT_ID}}"
@@ -27,3 +28,4 @@ jobs:
           firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_PERCENTHOTEL }}"
           channelId: live
           projectId: percenthotel
+        secrets: inherit
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -8,6 +8,7 @@ jobs:
     if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
     runs-on: ubuntu-latest
     env:
+      VITE_BASE_URL: "${{secrets.VITE_BASE_URL}}"
       VITE_APIKEY: "${{secrets.VITE_APIKEY}}"
       VITE_AUTH_DOMAIN: "${{secrets.VITE_AUTH_DOMAIN}}"
       VITE_PROJECT_ID: "${{secrets.VITE_PROJECT_ID}}"
@@ -24,3 +25,4 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_PERCENTHOTEL }}"
           projectId: percenthotel
+        secrets: inherit
diff --git a/firebase.json b/firebase.json
@@ -1,11 +1,7 @@
 {
   "hosting": {
     "public": "dist",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ],
+    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
     "rewrites": [
       {
         "source": "**",