Merge pull request #30 from hcp-uw/website-routing-fix

Fix website routing issues

Author: SamShin

package.json

@@ -7,7 +7,7 @@
     "update-types": "npx supabase gen types --lang=typescript --project-id \"$PROJECT_REF\" > src/database.types.ts",
     "dev": "vite",
     "build": "CI=false && tsc -b && vite build",
-    "build-for-vergil": "cross-env BUILD_FOR_VERGIL=true && tsc -b && vite build",
+    "build-for-vergil": "cross-env BUILD_FOR_VERGIL=true && tsc -b && vite build --mode vergil",
     "serve": "vite preview",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",
@@ -55,4 +55,4 @@
     "vite": "^5.3.4",
     "vite-plugin-singlefile": "^2.0.2"
   }
-}
+}

src/App.tsx

@@ -1,5 +1,5 @@
 import { ChakraProvider } from '@chakra-ui/react';
-import { HashRouter as Router, Route, Routes } from 'react-router-dom';
+import { HashRouter, BrowserRouter, Route, Routes } from 'react-router-dom';
 import { MembersPage } from './pages/MembersPage';
 import { LeadTeamsPage } from './pages/LeadTeamsPage';
 import { ProjectTeamsPage } from './pages/ProjectTeamsPage';
@@ -13,6 +13,8 @@ import Layout from './components/Layout';
 import theme from './theme';
 import LandingPage from './pages/LandingPage';
 
+const Router = import.meta.env.VITE_USE_HASH_ROUTER ? HashRouter : BrowserRouter;
+
 function App() {
   return (
     <ChakraProvider theme={theme}>

vercel.json

@@ -0,0 +1,8 @@
+{
+    "rewrites": [
+        {
+            "source": "/(.*)",
+            "destination": "/"
+        }
+    ]
+}

vite.config.ts

@@ -6,9 +6,16 @@ import tailwindcss from '@tailwindcss/vite'
 let plugins = [react(), viteSingleFile()]
 
 // https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [
-    tailwindcss(),
-  ],
-  base: '/'
-})
+export default defineConfig(({ mode }) => {
+  const isVergil = mode === 'vergil';
+
+  return {
+    plugins: [
+      tailwindcss(),
+    ],
+    base: isVergil ? '/hcpuw/' : '/',
+    define: {
+      'import.meta.env.VITE_USE_HASH_ROUTER': isVergil,
+    },
+  };
+})