From 378c1ef1c092c669ade2755156dbc27f869bdee1 Mon Sep 17 00:00:00 2001
From: jamiefeiss <jamie.feiss@gmail.com>
Date: Fri, 21 Apr 2023 16:39:23 +1000
Subject: [PATCH 1/3] Added configuring base URL from env var for both static
 site & docker

---
 .env                 |  2 +-
 docker_entrypoint.sh |  9 ++++++-
 env.d.ts             |  1 +
 index.html           | 40 +++++++++++++++++++++++----
 vite.config.ts       | 64 +++++++++++++++++++++++---------------------
 5 files changed, 79 insertions(+), 37 deletions(-)

diff --git a/.env b/.env
index 8a4566f..48dad1a 100644
--- a/.env
+++ b/.env
@@ -27,4 +27,4 @@ VITE_MAP_SEARCH_PROPS_DS_LABEL=http://purl.org/dc/terms/title
 ## LOCAL DEV ENVIRONMENT
 ## ---------------------------------------
 VITE_API_BASE_URL=http://localhost:8000
-
+VITE_BASE_URL=/
diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh
index bef4085..93b58b5 100644
--- a/docker_entrypoint.sh
+++ b/docker_entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
+# insert env vars in index.js
 INDEX_FILE=/app/assets/index.*.js;
-
 grep "=" .env | while read -r line; do # loop over VITE_ env vars
     left=`echo $line | awk -F "=" '{print $1}'`; # env var name
     right=`echo $line | awk -F "=" '{print $2}'`; # default value
@@ -13,4 +13,11 @@ grep "=" .env | while read -r line; do # loop over VITE_ env vars
     fi
 done
 
+# insert base url in index.html
+if (declare -p "VITE_BASE_URL" &>/dev/null)
+then
+    sed -i "s|BASE_URL = \"/\"|BASE_URL = \"$VITE_BASE_URL\"|g" /app/index.html
+    cp /app/index.html /app/404.html
+fi
+
 nginx -g 'daemon off;';
\ No newline at end of file
diff --git a/env.d.ts b/env.d.ts
index b10c65f..17fc3eb 100644
--- a/env.d.ts
+++ b/env.d.ts
@@ -3,6 +3,7 @@ interface ImportMetaEnv {
     readonly VITE_SIDENAV: string; // true | false
     readonly VITE_ENABLED_PREZS: string; // CatPrez | SpacePrez | VocPrez comma separated
     readonly VITE_API_BASE_URL: string;
+    readonly VITE_BASE_URL: string;
     readonly VITE_MAP_SETTINGS_API_KEY: string;
     readonly VITE_MAP_SETTINGS_OPTIONS_CENTER_LAT: number;
     readonly VITE_MAP_SETTINGS_OPTIONS_CENTER_LNG: number;
diff --git a/index.html b/index.html
index ad7ead7..f4a4a29 100644
--- a/index.html
+++ b/index.html
@@ -6,8 +6,8 @@
     <link rel="icon" href="/theme/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Prez</title>
-    <script src="https://kit.fontawesome.com/5660b8b2a9.js" crossorigin="anonymous"></script>
-    <link href="https://unpkg.com/@triply/yasgui/build/yasgui.min.css" rel="stylesheet" type="text/css" />
+    <script class="external" src="https://kit.fontawesome.com/5660b8b2a9.js" crossorigin="anonymous"></script>
+    <link class="external" href="https://unpkg.com/@triply/yasgui/build/yasgui.min.css" rel="stylesheet" type="text/css" />
     <link rel="stylesheet" href="/style.css">
     <link rel="stylesheet" href="/theme/theme.css">
 </head>
@@ -17,7 +17,38 @@
     <div id="app"></div>
     <footer id="footer"></footer>
     <script>
-        fetch("/theme/header.html")
+        var BASE_URL = "/";
+
+        const files = [
+            "/@vite/client",
+            "/theme/favicon.ico",
+            "/style.css",
+            "/theme/theme.css",
+            "/assets/*.js",
+            "/assets/*.css"
+        ];
+
+        const headScriptElements = document.querySelectorAll("head > script:not(.external)");
+        const headLinkElements = document.querySelectorAll("head > link:not(.external)");
+
+        function modifyPaths(elementArray, attr) {
+            elementArray.forEach(element => {
+                const url = new URL(element[attr]);
+                const file = files.find(f => new RegExp(`.*${f.replace("/", "\/").replace("*", ".*")}$`).test(url.pathname));
+                const baseUrl = url.pathname.replace(new RegExp(`${file.replace("/", "\/").replace("*", ".*")}`), "") + "/";
+                if (BASE_URL === "/" && baseUrl !== "/") { // vite dev server/build -> change BASE_URL
+                    BASE_URL = baseUrl;
+                } else if (BASE_URL !== "/" && baseUrl == "/") { // docker container -> change path prefix
+                    url.pathname = BASE_URL + url.pathname.slice(1);
+                    element[attr] = url.toString();
+                }
+            });
+        }
+
+        modifyPaths(headScriptElements, "src");
+        modifyPaths(headLinkElements, "href");
+        
+        fetch(`${BASE_URL}header.html`)
             .then(response => {
                 if (response.ok) {
                     return response.text();
@@ -26,8 +57,7 @@
             .then(text => {
                 document.querySelector("#header").innerHTML = text;
             });
-        
-        fetch("/theme/footer.html")
+        fetch(`${BASE_URL}footer.html`)
             .then(response => {
                 if (response.ok) {
                     return response.text();
diff --git a/vite.config.ts b/vite.config.ts
index 3302260..bef1d5f 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,40 +1,44 @@
 import { fileURLToPath, URL } from "node:url";
 
-import { defineConfig } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import vue from "@vitejs/plugin-vue";
 import VueTypeImports from "vite-plugin-vue-type-imports";
 import pluginRewriteAll from "vite-plugin-rewrite-all";
 
 // https://vitejs.dev/config/
-export default defineConfig({
-    plugins: [vue(), VueTypeImports(), pluginRewriteAll(),],
-    resolve: {
-        alias: {
-            "@": fileURLToPath(new URL("./src", import.meta.url))
-        }
-    },
-    build: {
-        target: "es2020",
-    },
-    optimizeDeps: {
-        esbuildOptions: {
+export default defineConfig(({ mode }) => {
+    process.env = {...process.env, ...loadEnv(mode, process.cwd())};
+
+    return {
+        plugins: [vue(), VueTypeImports(), pluginRewriteAll(),],
+        resolve: {
+            alias: {
+                "@": fileURLToPath(new URL("./src", import.meta.url))
+            }
+        },
+        build: {
             target: "es2020",
         },
-        include: [
-            "@fawmi/vue-google-maps",
-            "fast-deep-equal",
-        ]
-    },
-    css: {
-        preprocessorOptions: {
-            scss: {
-                additionalData: `
-                    @import "@/assets/sass/variables.scss";
-                    @import "@/assets/sass/mixins.scss";
-                    @import "@/assets/sass/transitions.scss";
-                `
+        optimizeDeps: {
+            esbuildOptions: {
+                target: "es2020",
+            },
+            include: [
+                "@fawmi/vue-google-maps",
+                "fast-deep-equal",
+            ]
+        },
+        css: {
+            preprocessorOptions: {
+                scss: {
+                    additionalData: `
+                        @import "@/assets/sass/variables.scss";
+                        @import "@/assets/sass/mixins.scss";
+                        @import "@/assets/sass/transitions.scss";
+                    `
+                }
             }
-        }
-    },
-    base: process.env.GH_PAGES_DEMO ? "/prez-ui/" : "/",
-});
+        },
+        base: process.env.GH_PAGES_DEMO ? "/prez-ui/" : (process.env.VITE_BASE_URL || "/"),
+    };
+});
\ No newline at end of file

From 6c74d8f2ab43a567c0118ebb6cc6ceeeb23a185f Mon Sep 17 00:00:00 2001
From: Alejandro Villar <avillar@ogc.org>
Date: Thu, 1 Jun 2023 12:51:37 +0200
Subject: [PATCH 2/3] Fix base URL for Vite assets

---
 Dockerfile           |  2 +-
 docker_entrypoint.sh |  1 +
 index.html           | 29 -----------------------------
 vite.config.ts       |  2 +-
 4 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 090370e..2f2034d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ COPY package*.json ./
 RUN npm install
 COPY . ./
 RUN rm .env
-RUN CI=false npm run build
+RUN CI=false VITE_DYNAMIC_BASE_URL=1 npm run build
 
 FROM nginx:alpine AS prod
 RUN apk add --no-cache bash
diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh
index 93b58b5..0451e57 100644
--- a/docker_entrypoint.sh
+++ b/docker_entrypoint.sh
@@ -17,6 +17,7 @@ done
 if (declare -p "VITE_BASE_URL" &>/dev/null)
 then
     sed -i "s|BASE_URL = \"/\"|BASE_URL = \"$VITE_BASE_URL\"|g" /app/index.html
+    sed -i "s|/@BASE_URL@/|$VITE_BASE_URL|g" /app/index.html ${INDEX_FILE}
     cp /app/index.html /app/404.html
 fi
 
diff --git a/index.html b/index.html
index f4a4a29..5ff79fa 100644
--- a/index.html
+++ b/index.html
@@ -19,35 +19,6 @@
     <script>
         var BASE_URL = "/";
 
-        const files = [
-            "/@vite/client",
-            "/theme/favicon.ico",
-            "/style.css",
-            "/theme/theme.css",
-            "/assets/*.js",
-            "/assets/*.css"
-        ];
-
-        const headScriptElements = document.querySelectorAll("head > script:not(.external)");
-        const headLinkElements = document.querySelectorAll("head > link:not(.external)");
-
-        function modifyPaths(elementArray, attr) {
-            elementArray.forEach(element => {
-                const url = new URL(element[attr]);
-                const file = files.find(f => new RegExp(`.*${f.replace("/", "\/").replace("*", ".*")}$`).test(url.pathname));
-                const baseUrl = url.pathname.replace(new RegExp(`${file.replace("/", "\/").replace("*", ".*")}`), "") + "/";
-                if (BASE_URL === "/" && baseUrl !== "/") { // vite dev server/build -> change BASE_URL
-                    BASE_URL = baseUrl;
-                } else if (BASE_URL !== "/" && baseUrl == "/") { // docker container -> change path prefix
-                    url.pathname = BASE_URL + url.pathname.slice(1);
-                    element[attr] = url.toString();
-                }
-            });
-        }
-
-        modifyPaths(headScriptElements, "src");
-        modifyPaths(headLinkElements, "href");
-        
         fetch(`${BASE_URL}header.html`)
             .then(response => {
                 if (response.ok) {
diff --git a/vite.config.ts b/vite.config.ts
index bef1d5f..22e598a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -39,6 +39,6 @@ export default defineConfig(({ mode }) => {
                 }
             }
         },
-        base: process.env.GH_PAGES_DEMO ? "/prez-ui/" : (process.env.VITE_BASE_URL || "/"),
+        base: process.env.GH_PAGES_DEMO ? "/prez-ui/" : (process.env.VITE_DYNAMIC_BASE_URL ? '/@BASE_URL@/' : (process.env.VITE_BASE_URL || "/")),
     };
 });
\ No newline at end of file

From 2f174287b242c1d4ec7f5188e81d860cfb73df8b Mon Sep 17 00:00:00 2001
From: jamiefeiss <jamie.feiss@gmail.com>
Date: Fri, 2 Jun 2023 12:47:33 +1000
Subject: [PATCH 3/3] Fixed theme header & footer path

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 5ff79fa..21e78ef 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
     <script>
         var BASE_URL = "/";
 
-        fetch(`${BASE_URL}header.html`)
+        fetch(`${BASE_URL}theme/header.html`)
             .then(response => {
                 if (response.ok) {
                     return response.text();
@@ -28,7 +28,7 @@
             .then(text => {
                 document.querySelector("#header").innerHTML = text;
             });
-        fetch(`${BASE_URL}footer.html`)
+        fetch(`${BASE_URL}theme/footer.html`)
             .then(response => {
                 if (response.ok) {
                     return response.text();