From d19feb8bc14e88e3085027d5bae1a3845618df29 Mon Sep 17 00:00:00 2001
From: "Torsten Schulz (local)" <tsschulz@gmx.net>
Date: Mon, 1 Dec 2025 09:47:16 +0100
Subject: [PATCH] Update daemon socket URL and enhance message rendering in
 frontend

- Changed the default value for `VITE_DAEMON_SOCKET` in `deploy-frontend.sh` and `update-frontend.sh` to use the `/ws/` path.
- Updated the message rendering logic in `MessagesDialog.vue` to utilize a new `formatBody` method for improved translation handling.
- Added a new translation for "overproduction" in both English and German localization files.
---
 deploy-frontend.sh                            |  2 +-
 .../components/falukant/MessagesDialog.vue    | 22 ++++++++++++++++++-
 frontend/src/i18n/locales/de/falukant.json    |  3 ++-
 frontend/src/i18n/locales/en/falukant.json    |  3 ++-
 frontend/src/store/index.js                   |  5 ++---
 update-frontend.sh                            |  2 +-
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/deploy-frontend.sh b/deploy-frontend.sh
index c4e820e..53cd5e9 100755
--- a/deploy-frontend.sh
+++ b/deploy-frontend.sh
@@ -26,7 +26,7 @@ fi
 # 5. Frontend neu bauen – VITE_* aus Environment übernehmen oder Defaults setzen
 echo "Baue Frontend neu..."
 export VITE_API_BASE_URL=${VITE_API_BASE_URL:-https://www.your-part.de}
-export VITE_DAEMON_SOCKET=${VITE_DAEMON_SOCKET:-wss://www.your-part.de:4551}
+export VITE_DAEMON_SOCKET=${VITE_DAEMON_SOCKET:-wss://www.your-part.de/ws/}
 export VITE_CHAT_WS_URL=${VITE_CHAT_WS_URL:-wss://www.your-part.de:1235}
 
 echo "VITE_API_BASE_URL=$VITE_API_BASE_URL"
diff --git a/frontend/src/components/falukant/MessagesDialog.vue b/frontend/src/components/falukant/MessagesDialog.vue
index 3ea1987..eff9fde 100644
--- a/frontend/src/components/falukant/MessagesDialog.vue
+++ b/frontend/src/components/falukant/MessagesDialog.vue
@@ -11,7 +11,7 @@
   >
     <ul class="messages">
       <li v-for="n in messages" :key="n.id" :class="{ unread: !n.shown }">
-        <div class="body">{{ $t('falukant.notifications.' + n.tr) }}</div>
+        <div class="body">{{ formatBody(n) }}</div>
         <div class="footer">
           <span>{{ formatDate(n.createdAt) }}</span>
         </div>
@@ -116,6 +116,26 @@ export default {
       try {
         return new Date(dt).toLocaleString();
       } catch { return dt; }
+    },
+    formatBody(n) {
+      let key = n.tr;
+      let params = {};
+      if (typeof key === 'string') {
+        const trimmed = key.trim();
+        if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
+          try {
+            const parsed = JSON.parse(trimmed);
+            if (parsed && parsed.tr) {
+              key = parsed.tr;
+              params = { ...parsed };
+              delete params.tr;
+            }
+          } catch (e) {
+            // Fallback: ignore parse error and use raw key
+          }
+        }
+      }
+      return this.$t('falukant.notifications.' + key, params);
     }
   },
   computed: {
diff --git a/frontend/src/i18n/locales/de/falukant.json b/frontend/src/i18n/locales/de/falukant.json
index 4b9d6dc..4c5e655 100644
--- a/frontend/src/i18n/locales/de/falukant.json
+++ b/frontend/src/i18n/locales/de/falukant.json
@@ -15,7 +15,8 @@
             "empty": "Keine Nachrichten vorhanden."
         },
         "notifications": {
-            "notify_election_created": "Es wurde eine neue Wahl ausgeschrieben."
+            "notify_election_created": "Es wurde eine neue Wahl ausgeschrieben.",
+            "production.overproduction": "Überproduktion: Deine Produktion liegt {value}% über dem Bedarf."
         },
         "health": {
             "amazing": "Super",
diff --git a/frontend/src/i18n/locales/en/falukant.json b/frontend/src/i18n/locales/en/falukant.json
index 8dbec2c..b25dda4 100644
--- a/frontend/src/i18n/locales/en/falukant.json
+++ b/frontend/src/i18n/locales/en/falukant.json
@@ -6,7 +6,8 @@
             "empty": "No messages."
         },
         "notifications": {
-            "notify_election_created": "A new election has been scheduled."
+            "notify_election_created": "A new election has been scheduled.",
+            "production.overproduction": "Overproduction: your production is {value}% above demand."
         },
         "statusbar": {
             "age": "Age",
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 5fd145b..71a3ad5 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -270,10 +270,9 @@ const store = createStore({
       
       // Wenn Umgebungsvariable nicht gesetzt ist oder leer, verwende Fallback-Logik
       if (!daemonUrl || (typeof daemonUrl === 'string' && daemonUrl.trim() === '')) {
-        // Fallback: basierend auf Protokoll und Hostname (dynamisch generiert, keine hardcodierten Werte)
+        // Fallback: gleiche Origin + Pfad /ws/ (Apache/Proxy routet intern auf Port 4551)
         const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-        const port = '4551';
-        daemonUrl = `${protocol}//${hostname}:${port}`;
+        daemonUrl = `${protocol}//${hostname}/ws/`;
         console.log('[Daemon] Verwende Fallback basierend auf Hostname und Protokoll');
       } else {
         console.log('[Daemon] Verwende Umgebungsvariable');
diff --git a/update-frontend.sh b/update-frontend.sh
index bb84a84..8d4bc32 100755
--- a/update-frontend.sh
+++ b/update-frontend.sh
@@ -37,7 +37,7 @@ fi
 # 5. Frontend neu bauen – VITE_* aus Environment übernehmen oder Defaults setzen
 echo "Baue Frontend neu..."
 export VITE_API_BASE_URL=${VITE_API_BASE_URL:-https://www.your-part.de}
-export VITE_DAEMON_SOCKET=${VITE_DAEMON_SOCKET:-wss://www.your-part.de:4551}
+export VITE_DAEMON_SOCKET=${VITE_DAEMON_SOCKET:-wss://www.your-part.de/ws/}
 export VITE_CHAT_WS_URL=${VITE_CHAT_WS_URL:-wss://www.your-part.de:1235}
 
 echo "VITE_API_BASE_URL=$VITE_API_BASE_URL"