back to Browser Router and changed .yml file

arositen · May 20, 2024 · 2a3a29d · 2a3a29d
1 parent d0da2a5
commit 2a3a29d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -4,22 +4,21 @@ name: Deploy static content to Pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["main"]
+    branches: ['main']
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
 permissions:
   contents: read
   pages: write
   id-token: write
 
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+# Allow one concurrent deployment
 concurrency:
-  group: "pages"
-  cancel-in-progress: false
+  group: 'pages'
+  cancel-in-progress: true
 
 jobs:
   # Single deploy job since we're just deploying
@@ -31,13 +30,22 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm ci
+      - name: Build
+        run: npm run build
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v4
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          # Upload entire repository
-          path: '.'
+          # Upload dist folder
+          path: './dist'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4
diff --git a/index.html b/index.html
@@ -10,7 +10,7 @@
 
 <body>
   <div id="root"></div>
-  <script type="module" src="/src/main.tsx"></script>
+  <script type="module" src="/Gumball/src/main.tsx"></script>
 </body>
 
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gumball",
-  "homepage": "https://arositen.github.io/Gumball/#",
+  "homepage": "https://arositen.github.io/Gumball/",
   "private": true,
   "version": "0.0.0",
   "type": "module",

diff --git a/src/main.tsx b/src/main.tsx
@@ -1,15 +1,15 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
-import App from './App.tsx'
-import './index.css'
-import { HashRouter } from "react-router-dom";
+import App from '@/App.tsx'
+import '@/index.css'
+import { BrowserRouter } from "react-router-dom";
 import ScrollToTop from '@/utils/ScrollToTop';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <HashRouter>
+    <BrowserRouter>
       <ScrollToTop />
       <App />
-    </HashRouter>
+    </BrowserRouter>
   </React.StrictMode>,
 )
diff --git a/vite.config.ts b/vite.config.ts
@@ -5,8 +5,8 @@ import path from 'path';
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
-  base: '/Gumball/#',
+  base: '/Gumball/',
   resolve: {
-    alias: [{ find: "@", replacement: path.resolve(__dirname, "/Gumball/#/src") }]
+    alias: [{ find: "@", replacement: path.resolve(__dirname, "src") }]
   }
 })