changes

SafeExamBrowser · Aug 27, 2024 · 817443c · 817443c
1 parent c7b2996
commit 817443c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/client/index.html b/client/index.html
@@ -6,7 +6,6 @@
     <link rel="icon" href="/img/seb-logo-no-border.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>SEB Screen Proctoring</title>
-    <!-- <base href="%VITE_BASE_PATH%" /> -->
 </head>
 
 <body>

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -14,6 +14,7 @@
     "@vueuse/core": "^10.9.0",
     "axios": "^1.6.8",
     "date-fns-tz": "^3.1.3",
+    "dotenv": "^16.4.5",
     "install": "^0.13.0",
     "npm": "^10.7.0",
     "pinia": "^2.1.7",
@@ -37,8 +38,8 @@
     "eslint-plugin-vue": "^9.26.0",
     "typescript": "^5.4.5",
     "vite": "^5.2.11",
+    "vite-envs": "^4.4.1",
     "vite-plugin-vuetify": "^2.0.3",
-    "vue-tsc": "^2.0.18",
-    "vite-envs": "^4.4.1"
+    "vue-tsc": "^2.0.18"
   }
 }
diff --git a/client/src/vite-env.d.ts b/client/src/vite-env.d.ts
@@ -9,13 +9,13 @@ declare module '*.vue' {
 type ImportMetaEnv = {
   // Auto-generated by `npx vite-envs update-types` and hot-reloaded by the `vite-env` plugin
   // You probably want to add `/src/vite-env.d.ts` to your .prettierignore
-  VITE_SERVER_URL: string
-  VITE_SERVER_PORT: string
+  VITE_BASE_PATH: string
   BASE_URL: string
   MODE: string
   DEV: boolean
   PROD: boolean
-  VITE_BASE_PATH: string
+  VITE_SERVER_URL: string
+  VITE_SERVER_PORT: string
   // @user-defined-start
   /*
    *  You can use this section to explicitly extend the type definition of `import.meta.env`

diff --git a/client/vite.config.mts b/client/vite.config.mts
@@ -4,14 +4,18 @@ import vuetify, { transformAssetUrls } from "vite-plugin-vuetify";
 import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
 import { gitTagPlugin } from "./src/plugins/vite-plugin-git-tag";
 import { viteEnvs } from "vite-envs";
+import dotenv from "dotenv";
 
 // Utilities
 import { defineConfig, loadEnv } from "vite";
 import { fileURLToPath, URL } from "node:url";
 
+dotenv.config();
 
 export default ({ mode }) => {
-    process.env = {...process.env, ...loadEnv(mode, process.cwd())};
+    // const env = loadEnv(mode, process.cwd());
+
+    console.log(process.env.VITE_BASE_PATH)
 
     return defineConfig({
 
@@ -33,13 +37,13 @@ export default ({ mode }) => {
                 declarationFile: ".env.declaration"
             })
 
-            // gitTagPlugin()
 
+            // gitTagPlugin()
         ],
 
-        // base: (process.env.VITE_BASE_PATH || "") + "/",    
-        base: "/sps-gui-test/",   
-
+        //@ts-ignore
+        // base: (import.meta.env.VITE_BASE_PATH || "") + "/",    
+        base: process.env.VITE_BASE_PATH || "",  
 
         define: { 
             "process.env": {},