Move dist so that it isn't included in frontend_vue hash check (#538)

thinkst · Jul 23, 2024 · ae84819 · ae84819
1 parent ef41a50
commit ae84819
Show file tree

Hide file tree

Showing 189 changed files with 7 additions and 1,099 deletions.
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
@@ -34,7 +34,7 @@ jobs:
       uses: actions/cache@v3
       id: cache-frontend-dist
       with:
-        path: frontend_vue/dist
+        path: dist
         key: frontend-dist-${{ hashFiles('frontend_vue/**') }}
 
     - uses: actions/setup-node@v3.5.1
@@ -81,7 +81,7 @@ jobs:
       run: |
         git config --global user.name "Frontend Github Action"
         git config --global user.email "max@thinkst.com"
-        git add -f frontend_vue/dist
+        git add -f dist
         git commit -am "Add Frontend Dist"
         git push
 

diff --git a/frontend/app.py b/frontend/app.py
@@ -202,7 +202,7 @@
     version=canarytokens.__version__,
 )
 
-vue_index = Jinja2Templates(directory="../frontend_vue/dist/")
+vue_index = Jinja2Templates(directory="../dist/")
 
 
 if frontend_settings.NEW_UI:
@@ -242,7 +242,7 @@ def index(request: Request):
     try:
         app.mount(
             "/nest",
-            StaticFiles(directory="../frontend_vue/dist/", html=True),
+            StaticFiles(directory="../dist/", html=True),
             name="Vue Frontend Dist",
         )
     except RuntimeError:

diff --git a/frontend_vue/dist/assets/ActivatedToken-10ESZM19.js b/frontend_vue/dist/assets/ActivatedToken-10ESZM19.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-1UF_3fPl.js b/frontend_vue/dist/assets/ActivatedToken-1UF_3fPl.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-BQJXLfUA.js b/frontend_vue/dist/assets/ActivatedToken-BQJXLfUA.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-BT9Iyuju.js b/frontend_vue/dist/assets/ActivatedToken-BT9Iyuju.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-Bnpkbx4I.js b/frontend_vue/dist/assets/ActivatedToken-Bnpkbx4I.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-BzWNH92V.js b/frontend_vue/dist/assets/ActivatedToken-BzWNH92V.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-CCWp0YQu.js b/frontend_vue/dist/assets/ActivatedToken-CCWp0YQu.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-CydnN99P.js b/frontend_vue/dist/assets/ActivatedToken-CydnN99P.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-D8p5SB0x.js b/frontend_vue/dist/assets/ActivatedToken-D8p5SB0x.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DHrcq8mV.js b/frontend_vue/dist/assets/ActivatedToken-DHrcq8mV.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DPlirmdh.js b/frontend_vue/dist/assets/ActivatedToken-DPlirmdh.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DQ-BnltK.js b/frontend_vue/dist/assets/ActivatedToken-DQ-BnltK.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DQ-sYD00.js b/frontend_vue/dist/assets/ActivatedToken-DQ-sYD00.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DYkXJjlU.js b/frontend_vue/dist/assets/ActivatedToken-DYkXJjlU.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DmX7MTpL.js b/frontend_vue/dist/assets/ActivatedToken-DmX7MTpL.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DrE0vz5u.js b/frontend_vue/dist/assets/ActivatedToken-DrE0vz5u.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DtG5cmlN.js b/frontend_vue/dist/assets/ActivatedToken-DtG5cmlN.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-DyTKJWDs.js b/frontend_vue/dist/assets/ActivatedToken-DyTKJWDs.js
diff --git a/frontend_vue/dist/assets/ActivatedToken-P6Bmw1ap.js b/frontend_vue/dist/assets/ActivatedToken-P6Bmw1ap.js