Putzlicht 2

6

.woodpecker/build.yml

@@ -1,5 +1,8 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
 
 matrix:
   APP:
@@ -22,8 +25,3 @@ steps:
       repo: ${FORGE_NAME}/${CI_REPO}/${APP}
       auto_tag: true
       dockerfile: apps/${APP}/Dockerfile
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange

.woodpecker/config.yml

@@ -1,23 +1,10 @@
 when:
   event: [tag]
 
-steps:
+depends_on:
-  create_namespace:
+  - namespace
-    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
-    environment:
-      KUBE_CONFIG_CONTENT:
-        from_secret: kube_config
-      NAMESPACE: "homea2"
-    commands:
-      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
-      - export KUBECONFIG=/tmp/kubeconfig
-      - kubectl create namespace $NAMESPACE || echo "Namespace $NAMESPACE already exists"
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
 
+steps:
   apply_configuration:
     image: quay.io/wollud1969/k8s-admin-helper:0.3.4
     environment:
@@ -36,6 +23,4 @@ steps:
         --namespace=$NAMESPACE 
         --dry-run=client -o yaml | kubectl apply -f - 
       - kubectl apply -f deployment/configmap.yaml -n $NAMESPACE
-    when:
-      event: [tag]
 

.woodpecker/deploy.yml

@@ -1,9 +1,13 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
 
 depends_on:
   - build
-  - predeploy
+  - namespace
+  - config
 
 matrix:
   APP:
@@ -26,9 +30,5 @@ steps:
       - export KUBECONFIG=/tmp/kubeconfig
       - echo "Deploying application ${APP} ($IMAGE) to namespace $NAMESPACE"
       - cat deployment/${APP}-deployment.yaml | sed "s,%IMAGE%,$IMAGE,g" | kubectl apply -n $NAMESPACE -f -
-    when:
+    
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
 

.woodpecker/ingress.yml

@@ -1,5 +1,8 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
 
 depends_on:
   - deploy
@@ -15,9 +18,4 @@ steps:
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
       - export KUBECONFIG=/tmp/kubeconfig
       - kubectl apply -f deployment/ingress.yaml -n $NAMESPACE
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
 

.woodpecker/namespace.yml

@@ -0,0 +1,15 @@
+when:
+  event: [tag]
+
+steps:
+  create_namespace:
+    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
+    environment:
+      KUBE_CONFIG_CONTENT:
+        from_secret: kube_config
+      NAMESPACE: "homea2"
+    commands:
+      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
+      - export KUBECONFIG=/tmp/kubeconfig
+      - kubectl create namespace $NAMESPACE || echo "Namespace $NAMESPACE already exists"
+

apps/static/static/manifest.json

@@ -1,43 +0,0 @@
-{
-    "name": "Home Automation",
-    "short_name": "Home",
-    "description": "Smart Home Automation System",
-    "start_url": "/",
-    "display": "standalone",
-    "background_color": "#667eea",
-    "theme_color": "#667eea",
-    "orientation": "portrait",
-    "icons": [
-        {
-            "src": "/static/apple-touch-icon-180x180.png",
-            "sizes": "180x180",
-            "type": "image/png",
-            "purpose": "any maskable"
-        },
-        {
-            "src": "/static/apple-touch-icon-152x152.png",
-            "sizes": "152x152",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/apple-touch-icon-120x120.png",
-            "sizes": "120x120",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/apple-touch-icon-76x76.png",
-            "sizes": "76x76",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/apple-touch-icon-32x32.png",
-            "sizes": "32x32",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/apple-touch-icon-16x16.png",
-            "sizes": "16x16",
-            "type": "image/png"
-        }
-    ]
-}

apps/ui/templates/dashboard.html

@@ -16,7 +16,6 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Dashboard">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="{{ STATIC_BASE }}/manifest.json">
     <style>
         * {
             margin: 0;

apps/ui/templates/device.html

@@ -15,7 +15,6 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Gerät">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="{{ STATIC_BASE }}/manifest.json">
     <style>
         * {
             margin: 0;
@@ -359,6 +358,7 @@
         let deviceData = null;
         let deviceState = {};
         let roomName = '';
+        let deviceStateUnknown = false;
 
         // Device type icons
         const deviceIcons = {
@@ -381,8 +381,19 @@
                 // NEW: Use new endpoints for device info and layout
                 deviceData = await window.apiClient.getDevice(deviceId);
                 console.log("Loaded device data:", deviceData);
-                deviceState = await window.apiClient.getDeviceState(deviceId);
+
-                console.log("Loaded device state:", deviceState);
+                try {
+                    deviceState = await window.apiClient.getDeviceState(deviceId);
+                    console.log("Loaded device state:", deviceState);
+                    if (!deviceState || Object.keys(deviceState).length === 0) {
+                        deviceStateUnknown = true;
+                        deviceState = {};
+                    }
+                } catch (stateError) {
+                    console.warn('No state for device, using unknown state:', stateError);
+                    deviceStateUnknown = true;
+                    deviceState = {};
+                }
                 const layoutInfo = await window.apiClient.getDeviceLayout(deviceId);
                 console.log("Loaded layout info:", layoutInfo);
                 roomName = layoutInfo.room;
@@ -518,6 +529,14 @@
                 }, 0);
             }
 
+            if (deviceStateUnknown) {
+                const hint = document.createElement('div');
+                hint.className = 'device-meta';
+                hint.style.marginTop = '12px';
+                hint.textContent = 'Status unbekannt';
+                card.appendChild(hint);
+            }
+
             container.appendChild(card);
         }
 
@@ -553,6 +572,14 @@
             `;
             card.appendChild(sliderGroup);
 
+            if (deviceStateUnknown) {
+                const hint = document.createElement('div');
+                hint.className = 'device-meta';
+                hint.style.marginTop = '12px';
+                hint.textContent = 'Status unbekannt';
+                card.appendChild(hint);
+            }
+
             container.appendChild(card);
 
             setTimeout(() => {
@@ -581,6 +608,14 @@
             powerGroup.appendChild(powerButton);
             card.appendChild(powerGroup);
 
+            if (deviceStateUnknown) {
+                const hint = document.createElement('div');
+                hint.className = 'device-meta';
+                hint.style.marginTop = '12px';
+                hint.textContent = 'Status unbekannt';
+                card.appendChild(hint);
+            }
+
             container.appendChild(card);
         }
 
@@ -599,6 +634,14 @@
             `;
             card.appendChild(statusDiv);
 
+            if (deviceStateUnknown) {
+                const hint = document.createElement('div');
+                hint.className = 'device-meta';
+                hint.style.marginTop = '12px';
+                hint.textContent = 'Status unbekannt';
+                card.appendChild(hint);
+            }
+
             container.appendChild(card);
         }
 

apps/ui/templates/garage.html

@@ -16,7 +16,6 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Garage">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="{{ STATIC_BASE }}/manifest.json">
     <style>
         * {
             margin: 0;

apps/ui/templates/index.html

@@ -16,7 +16,6 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Home Automation">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="{{ STATIC_BASE }}/manifest.json">
     <style>
         * {
             margin: 0;

apps/ui/templates/room.html

@@ -15,7 +15,6 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="{{ room_name }}">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="{{ STATIC_BASE }}/manifest.json">
     <style>
         * {
             margin: 0;

apps/ui/templates/rooms.html

@@ -16,7 +16,6 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Räume">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="{{ STATIC_BASE }}/manifest.json">
     <style>
         * {
             margin: 0;

config/devices.yaml

@@ -730,8 +730,19 @@ devices:
   features:
     power: true
   topics:
-    set: "shellies/LightKitchenSink/relay/0/command"
+    set: "shellies/shellyplug-s-DED4E4/relay/0/command"
-    state: "shellies/LightKitchenSink/relay/0"
+    state: "shellies/shellyplug-s-DED4E4/relay/0"
+- device_id: putzlicht_kueche
+  name: Putzlicht
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xa4c138563834406c"
+    set: "zigbee2mqtt/0xa4c138563834406c/set"
 - device_id: licht_schrank_esszimmer
   name: Schrank
   type: relay

config/layout.yaml

@@ -123,6 +123,10 @@ rooms:
     title: Küche Spüle
     icon: 💡
     rank: 142
+  - device_id: putzlicht_kueche
+    title: Küche Putzlicht
+    icon: 💡
+    rank: 143
   - device_id: thermostat_kueche
     title: Kueche
     icon: 🌡️

deployment/configmap.yaml

@@ -14,7 +14,7 @@ data:
   # UI specific environment variables
   UI_UI_PORT: "8002"
   UI_API_BASE: "https://homea2-api.hottis.de"
-  UI_STATIC_BASE: "http://homea2-static.hottis.de"
+  UI_STATIC_BASE: "https://homea2-static.hottis.de"
   UI_BASE_PATH: "/"
   
 

deployment/ui-deployment.yaml

@@ -37,6 +37,11 @@ spec:
             configMapKeyRef:
               name: home-automation-environment
               key: UI_API_BASE
+        - name: STATIC_BASE
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: UI_STATIC_BASE
         - name: BASE_PATH
           valueFrom:
             configMapKeyRef: