fix mock url

groovelauncher · Jan 17, 2025 · 824022f · 824022f
1 parent 20ce466
commit 824022f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -24,21 +24,13 @@ jobs:
       - name: Install dependencies
         run: npm install
 
-      # Set up directories and copy files
-      - name: Build the project, setup directories and copy files
-        run: |
-          mkdir -p pagespublic/www
-          npm run build:production
-          cp -r www/* pagespublic/www
-
-      # Create redirect index.html
-      - name: Create redirect index.html
-        run: |
-          echo '<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0; url=https://groovelauncher.github.io/www"><title>Redirecting...</title></head><body><p>If you are not redirected automatically, follow this <a href="https://groovelauncher.github.io/www">link</a>.</p></body></html>' > ./pagespublic/index.html
+      # Build the project
+      - name: Build the project
+        run: npm run build:production
 
       # Deploy to GitHub Pages
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           personal_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-          publish_dir: ./pagespublic
+          publish_dir: ./www
diff --git a/src/script.js b/src/script.js
@@ -194,7 +194,7 @@ if (!!localStorage.getItem("accentColor")) GrooveBoard.backendMethods.setAccentC
 startUpSequence([
     (next) => {
         if (GrooveBoard.backendMethods.setupNeeded()) {
-            location.href = !GrooveMockInstance ? '/assets/welcome.html' : '/www/welcome.html'
+            location.href = new URL("./welcome.html",location).href
         } else {
             next()
         }

diff --git a/src/welcome.js b/src/welcome.js
@@ -265,7 +265,7 @@ document.querySelector("#page-readme button.right-btn").addEventListener("flowCl
             goToPage(7)
 
             setTimeout(() => {
-                location.href = !GrooveMockInstance ? '/assets/index.html' : '/www'
+                location.href = new URL("./",location).href
             }, 500);
         }