Merge pull request #23 from SolidLabResearch/development-milestones

Add hotfixes to development-milestones to master also

Author: eliasnijs

solid-watchparty/src/App.jsx

@@ -7,11 +7,13 @@ import LoginPage from './pages/LoginPage';
 import MenuPage from './pages/MenuPage';
 import WatchPage from './pages/WatchPage';
 
+/* config imports */
+import { BASEPATH } from './config'
 
 const router = createBrowserRouter([
-  {path: "/", element: <LoginPage/>},
-  {path: "/menu", element: <MenuPage/>},
-  {path: "/watch", element: <WatchPage/>},
+  {path: (BASEPATH + "/"), element: <LoginPage/>},
+  {path: (BASEPATH + "/menu"), element: <MenuPage/>},
+  {path: (BASEPATH + "/watch"), element: <WatchPage/>},
 ]);
 
 function App() {

solid-watchparty/src/config.js

@@ -1,5 +1,5 @@
+export const BASEPATH = '/solid-watch-party'
 
 /* NOTE(Elias): default POD directory structure related to the watchparty */
 export const ROOMS_ROOT = 'watchparties/myRooms';
 export const MESSAGES_ROOT = 'watchparties/myMessages';
-

solid-watchparty/src/pages/LoginPage.jsx

@@ -6,6 +6,9 @@ import { useLocation } from 'react-router-dom';
 import SWPageWrapper from '../components/SWPageWrapper'
 import SWLoginButton from '../components/SWLoginButton'
 
+/* config imports */
+import { BASEPATH } from '../config.js'
+
 const authOptions = {
   clientName:  "solid-watchparty",
 };
@@ -14,7 +17,7 @@ export default function LoginPage()
 {
   const [oidcIssuer, setOidcIssuer] = useState("http://localhost:3000/");
   const currentLocation = useLocation();
-  const redirectLocation = (currentLocation.state?.from || "/menu");
+  const redirectLocation = (currentLocation.state?.from || `${BASEPATH}/menu`);
   return (
     <SWPageWrapper className="flex justify-center items-center" mustBeAuthenticated={false}>
       <div className="w-1/2">

solid-watchparty/vite.config.js

@@ -4,7 +4,7 @@ import react from '@vitejs/plugin-react'
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
-  base: './',
+  base: '/solid-watch-party/',
   build: {
     outDir: '../dist'
   },