fix public / assets vue shit

msi-se · Jan 18, 2024 · f283d55 · f283d55
1 parent f8b241a
commit f283d55
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -34,7 +34,18 @@ services:
     environment:
       - VITE_TENANT=default
       - VITE_TENANT_CLIENT_ID=e9fdb985-9173-4e01-9d73-ac2d60d1dc8e
-      - VITE_TENANT_LOGO=src/assets/default-logo.png
+      - VITE_TENANT_LOGO=/default-logo.png
+      - VITE_TENANT_BACKGROUNDCOLOR=#FFFFFF
+      - VITE_BACKEND_URL=http://localhost/api
+  frontend-adac:
+    build:
+      context: ./frontend
+    ports:
+      - "5174:3000"
+    environment:
+      - VITE_TENANT=adac
+      - VITE_TENANT_CLIENT_ID=e9fdb985-9173-4e01-9d73-ac2d60d1dc8e
+      - VITE_TENANT_LOGO=/adac-logo.png
       - VITE_TENANT_BACKGROUNDCOLOR=#FFFF00
       - VITE_BACKEND_URL=http://localhost/api
   pin-service:

diff --git a/frontend/src/assets/adac-logo.png → frontend/public/adac-logo.png b/frontend/src/assets/adac-logo.png → frontend/public/adac-logo.png
diff --git a/frontend/src/assets/default-logo.png → frontend/public/default-logo.png b/frontend/src/assets/default-logo.png → frontend/public/default-logo.png
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -50,7 +50,7 @@ let username = computed(() => {
 
 let tenantBackgroundColor = ref(TENANT_BACKGROUNDCOLOR || '#ffffff')
 
-console.log('TENANT: ' + TENANT + ' PATH: ' + PATH, 'TENANT_BACKGROUNDCOLOR: ' + TENANT_BACKGROUNDCOLOR)
+console.log('TENANT: ' + TENANT + ' PATH: ' + PATH, 'TENANT_BACKGROUNDCOLOR: ' + TENANT_BACKGROUNDCOLOR, 'TENANT_LOGO: ' + TENANT_LOGO)
 
 console.log(document.cookie)
 </script>

diff --git a/frontend/src/js/config.js b/frontend/src/js/config.js
@@ -3,7 +3,7 @@ const BACKEND_URL = import.meta.env.VITE_BACKEND_URL;
 const TENANT = import.meta.env.VITE_TENANT || 'default';
 const TENANT_CLIENT_ID = import.meta.env.VITE_TENANT_CLIENT_ID;
 
-const TENANT_LOGO = import.meta.env.VITE_TENANT_LOGO || 'src/assets/default-logo.png';
+const TENANT_LOGO = import.meta.env.VITE_TENANT_LOGO || 'public/default-logo.png';
 const TENANT_BACKGROUNDCOLOR = import.meta.env.VITE_TENANT_BACKGROUNDCOLOR;
 
 const PATH = TENANT == 'default' ? '' : `/${TENANT}`;