1859: Changed to fixed base path /admin

tuj · tuj · commit cf1e09eeafa5 · 2024-08-01T08:48:48.000+02:00
diff --git a/.docker/vhost.conf b/.docker/vhost.conf
@@ -9,7 +9,7 @@ server {
         proxy_pass         http://node:3000;
     }
 
-    location /ws {
+    location /admin/ws {
         proxy_pass http://node:3000;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-- Fixed configurable base path.
+- Fixed base path to /admin in vite setup.
 - Changed from vite CJS to ESM.
 - Removed array spread.
 - Fixed HMR setup.
diff --git a/index.html b/index.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <link id="base_path" href="/" />
     <meta charset="utf-8" />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
diff --git a/infrastructure/itkdev/Dockerfile b/infrastructure/itkdev/Dockerfile
@@ -13,11 +13,9 @@ RUN mkdir -p ${APP_PATH} \
 
 WORKDIR ${APP_PATH}
 
-ARG APP_BASE_PATH=/admin/
-
 # Build it.
 RUN yarn install \
-    && BASE_PATH=${APP_BASE_PATH} yarn build
+    && yarn build
 
 # Remove fixtures
 RUN rm -rf public/fixtures
diff --git a/infrastructure/os2display/Dockerfile b/infrastructure/os2display/Dockerfile
@@ -13,11 +13,9 @@ RUN mkdir -p ${APP_PATH} \
 
 WORKDIR ${APP_PATH}
 
-ARG APP_BASE_PATH=/admin/
-
 # Build it.
 RUN yarn install \
-    && BASE_PATH=${APP_BASE_PATH} yarn build
+    && yarn build
 
 # Remove fixtures
 RUN rm -rf public/fixtures
diff --git a/package.json b/package.json
@@ -53,9 +53,9 @@
     "lint:scss:fix": "stylelint --fix \"./src/**/*.scss\"",
     "check-coding-standards": "yarn lint:js && yarn lint:scss",
     "apply-coding-standards": "yarn lint:js:fix && yarn lint:scss:fix",
-    "start": "vite --host 0.0.0.0",
-    "build": "vite build --base=$BASE_PATH",
-    "preview": "vite preview"
+    "start": "vite --host 0.0.0.0 --base=/admin",
+    "build": "vite build --base=/admin",
+    "preview": "vite preview --base=/admin"
   },
   "eslintConfig": {
     "extends": [
diff --git a/src/app.jsx b/src/app.jsx
@@ -42,7 +42,6 @@ import ActivationCodeActivate from "./components/activation-code/activation-code
 import ConfigLoader from "./config-loader";
 import "react-toastify/dist/ReactToastify.css";
 import "./app.scss";
-import { BASE_PATH } from "./variables";
 
 /**
  * App component.
@@ -142,7 +141,7 @@ function App() {
   }, []);
 
   useEffect(() => {
-    fetch(`${BASE_PATH}access-config.json`)
+    fetch("/admin/access-config.json")
       .then((response) => response.json())
       .then((jsonData) => {
         setAccessConfig(jsonData);
diff --git a/src/config-loader.js b/src/config-loader.js
@@ -1,5 +1,3 @@
-import { BASE_PATH } from "./variables";
-
 let configData = null;
 let activePromise = null;
 
@@ -13,7 +11,7 @@ const ConfigLoader = {
       if (configData !== null) {
         resolve(configData);
       } else {
-        fetch(`${BASE_PATH}config.json`)
+        fetch("/admin/config.json")
           .then((response) => response.json())
           .then((data) => {
             configData = data;
diff --git a/src/index.jsx b/src/index.jsx
@@ -4,14 +4,13 @@ import { createRoot } from "react-dom/client";
 import { Provider } from "react-redux";
 import { store } from "./redux/store";
 import App from "./app";
-import { BASE_PATH } from "./variables";
 
 const container = document.getElementById("root");
 const root = createRoot(container);
 
 root.render(
   <Provider store={store}>
-    <BrowserRouter basename={BASE_PATH}>
+    <BrowserRouter basename="/admin">
       <App />
     </BrowserRouter>
   </Provider>
diff --git a/src/variables.js b/src/variables.js

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ server {`
`9`	`9`	`proxy_pass http://node:3000;`
`10`	`10`	`}`
`11`	`11`
`12`		`- location /ws {`
	`12`	`+ location /admin/ws {`
`13`	`13`	`proxy_pass http://node:3000;`
`14`	`14`	`proxy_http_version 1.1;`
`15`	`15`	`proxy_set_header Upgrade $http_upgrade;`