fix(client): relative paths in frontend

fhswf · Sep 15, 2023 · 133f7e3 · 133f7e3
1 parent 5f1fced
commit 133f7e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -1,9 +1,11 @@
 FROM node:18-bullseye as build
 ARG REACT_APP_GOOGLE_ID=692793330469-6iupo55tt0kelejcie26m4njeckbmnv8.apps.googleusercontent.com
-ARG REACT_APP_URL=/meeting
+ARG REACT_BASE_PATH=/meeting
+ARG REACT_APP_URL=https://www.ki.fh-swf.de/meeting
 ARG REACT_APP_API_URI=https://www.ki.fh-swf.de/meeting/api/v1
 
 ENV REACT_APP_GOOGLE_ID=${REACT_APP_GOOGLE_ID}
+ENV REACT_BASE_PATH=${REACT_BASE_PATH}
 ENV REACT_APP_URL=${REACT_APP_URL}
 ENV REACT_APP_API_URI=${REACT_APP_API_URI}
 

diff --git a/client/src/components/AppNavbar.tsx b/client/src/components/AppNavbar.tsx
@@ -45,7 +45,7 @@ const AppNavbar = () => {
   const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
   const [snack, setSnack] = React.useState<string | null>(null);
 
-  const link = user ? process.env.REACT_APP_URL + "users/" + user.user_url : "";
+  const link = user ? process.env.REACT_APP_URL + "/users/" + user.user_url : "";
 
   console.log("AppNavbar: user=%o", user);
 

diff --git a/client/src/index.tsx b/client/src/index.tsx
@@ -91,7 +91,7 @@ root.render(
       <GoogleOAuthProvider clientId={GOOGLE_ID}>
         <LocalizationProvider dateAdapter={AdapterDateFns}>
           <ThemeProvider theme={theme}>
-            <BrowserRouter basename={process.env.REACT_APP_URL}>
+            <BrowserRouter basename={process.env.REACT_BASE_PATH}>
               <Routes>
                 <Route path="/" element={isAuthenticated() ? (
                   <Navigate to="/app" />