diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fd2fcb3..ba3ebe6 100644 --- 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 'Redirecting...

If you are not redirected automatically, follow this link.

' > ./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 \ No newline at end of file + publish_dir: ./www \ No newline at end of file diff --git a/src/script.js b/src/script.js index c1a00e6..8d97e22 100644 --- 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 index 193e95f..9f76c33 100644 --- 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); }