diff --git a/drohnenfuehrer/docker-compose.yml b/drohnenfuehrer/docker-compose.yml index e41e0e9..bb7d685 100644 --- a/drohnenfuehrer/docker-compose.yml +++ b/drohnenfuehrer/docker-compose.yml @@ -20,9 +20,9 @@ services: build: ./backend container_name: drohnenfuehrer-backend restart: unless-stopped - # Port 5001 only bound to localhost + # Port 5011 only bound to localhost ports: - - "127.0.0.1:5001:5000" + - "127.0.0.1:5011:5000" environment: - NODE_ENV=production - MONGO_URI=mongodb://drohnenfuehrer:${MONGO_PASSWORD}@mongo:27017/drohnenfuehrer?authSource=admin diff --git a/drohnenfuehrer/frontend/public/manifest.json b/drohnenfuehrer/frontend/public/manifest.json index 775553e..a80d635 100644 --- a/drohnenfuehrer/frontend/public/manifest.json +++ b/drohnenfuehrer/frontend/public/manifest.json @@ -20,8 +20,8 @@ "purpose": "any maskable" } ], - "start_url": "/", - "scope": "/", + "start_url": "/drohnenfuehrer/", + "scope": "/drohnenfuehrer/", "display": "standalone", "orientation": "portrait", "theme_color": "#2d6a2d", diff --git a/nachsuche/docker-compose.yml b/nachsuche/docker-compose.yml index b1ea619..27fb6b9 100644 --- a/nachsuche/docker-compose.yml +++ b/nachsuche/docker-compose.yml @@ -22,9 +22,9 @@ services: build: ./backend container_name: nachsuche-backend restart: unless-stopped - # Port 5000 only bound to localhost - accessible by host nginx, NOT from external IPs + # Port 5010 only bound to localhost - accessible by host nginx, NOT from external IPs ports: - - "127.0.0.1:5000:5000" + - "127.0.0.1:5010:5000" environment: - NODE_ENV=production - MONGO_URI=mongodb://nachsuche:${MONGO_PASSWORD}@mongo:27017/nachsuche?authSource=admin diff --git a/nachsuche/frontend/public/manifest.json b/nachsuche/frontend/public/manifest.json index 33bc12c..027b3ac 100644 --- a/nachsuche/frontend/public/manifest.json +++ b/nachsuche/frontend/public/manifest.json @@ -20,8 +20,8 @@ "purpose": "any maskable" } ], - "start_url": "/", - "scope": "/", + "start_url": "/nachsuche/", + "scope": "/nachsuche/", "display": "standalone", "orientation": "portrait", "theme_color": "#2d6a2d", diff --git a/portal/Dockerfile b/portal/Dockerfile index 9e067a6..0836c95 100644 --- a/portal/Dockerfile +++ b/portal/Dockerfile @@ -4,6 +4,6 @@ FROM nginx:alpine COPY extra8002.conf /etc/nginx/conf.d/default.conf # Portal-Seiten (statischer Webroot) -COPY index.html manifest.json sw.js offline.html /usr/share/nginx/html/portal/ +COPY index.html manifest.json sw.js offline.html icon-192.png icon-512.png /usr/share/nginx/html/portal/ EXPOSE 80 diff --git a/portal/docker-compose.yml b/portal/docker-compose.yml index ba8a0b6..32a7176 100644 --- a/portal/docker-compose.yml +++ b/portal/docker-compose.yml @@ -4,6 +4,6 @@ services: container_name: jagd-portal restart: unless-stopped ports: - - "80:80" + - "8090:80" extra_hosts: - "host.docker.internal:host-gateway" diff --git a/portal/extra8002.conf b/portal/extra8002.conf index 2757edb..cf6e321 100644 --- a/portal/extra8002.conf +++ b/portal/extra8002.conf @@ -17,6 +17,7 @@ server { location = /manifest.json { add_header Cache-Control "no-cache, no-store, must-revalidate"; + add_header Content-Type "application/manifest+json"; expires 0; } @@ -24,7 +25,7 @@ server { # Nachsuche (/nachsuche/) # ────────────────────────────────────────────── location /nachsuche/api/ { - proxy_pass http://host.docker.internal:5000/api/; + proxy_pass http://host.docker.internal:5010/api/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -49,7 +50,7 @@ server { # Drohnenführer (/drohnenfuehrer/) # ────────────────────────────────────────────── location /drohnenfuehrer/api/ { - proxy_pass http://host.docker.internal:5001/api/; + proxy_pass http://host.docker.internal:5011/api/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -74,7 +75,7 @@ server { # Stöberhunde (/stoeberhunde/) # ────────────────────────────────────────────── location /stoeberhunde/api/ { - proxy_pass http://host.docker.internal:5002/api/; + proxy_pass http://host.docker.internal:5012/api/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/portal/icon-192.png b/portal/icon-192.png new file mode 100644 index 0000000..63580c3 Binary files /dev/null and b/portal/icon-192.png differ diff --git a/portal/icon-512.png b/portal/icon-512.png new file mode 100644 index 0000000..2c686aa Binary files /dev/null and b/portal/icon-512.png differ diff --git a/portal/index.html b/portal/index.html index e2e47e4..648c74c 100644 --- a/portal/index.html +++ b/portal/index.html @@ -11,13 +11,17 @@ Jagd Apps Heidekreis +
-

🦌 Jagd Apps Heidekreis

+

Logo Jagd Apps Heidekreis

Wählen Sie Ihre App

@@ -190,7 +74,6 @@ › -
🚁
@@ -199,7 +82,6 @@
› -
🐾
@@ -213,51 +95,63 @@
Jägerschaft Fallingbostel e.V.
diff --git a/portal/manifest.json b/portal/manifest.json index 74cbc93..883c36c 100644 --- a/portal/manifest.json +++ b/portal/manifest.json @@ -3,9 +3,28 @@ "name": "Jagd Apps Heidekreis", "icons": [ { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" + "src": "icon-192.png?v=2", + "sizes": "192x192", + "type": "image/png", + "purpose": "any" + }, + { + "src": "icon-192.png?v=2", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icon-512.png?v=2", + "sizes": "512x512", + "type": "image/png", + "purpose": "any" + }, + { + "src": "icon-512.png?v=2", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" } ], "start_url": "/", diff --git a/portal/sw.js b/portal/sw.js index 72327d6..56cb5bb 100644 --- a/portal/sw.js +++ b/portal/sw.js @@ -1,5 +1,5 @@ // Service Worker: Offline-Fallback für Portal-Selektor -const CACHE_NAME = 'portal-offline-v1'; +const CACHE_NAME = 'portal-offline-v2'; self.addEventListener('install', event => { event.waitUntil( diff --git a/stoeberhunde/docker-compose.yml b/stoeberhunde/docker-compose.yml index 0018d0a..38afce2 100644 --- a/stoeberhunde/docker-compose.yml +++ b/stoeberhunde/docker-compose.yml @@ -20,9 +20,9 @@ services: build: ./backend container_name: stoeberhunde-backend restart: unless-stopped - # Port 5002 only bound to localhost + # Port 5012 only bound to localhost ports: - - "127.0.0.1:5002:5000" + - "127.0.0.1:5012:5000" environment: - NODE_ENV=production - MONGO_URI=mongodb://stoeberhunde:${MONGO_PASSWORD}@mongo:27017/stoeberhunde?authSource=admin diff --git a/stoeberhunde/frontend/public/manifest.json b/stoeberhunde/frontend/public/manifest.json index 630900c..3889622 100644 --- a/stoeberhunde/frontend/public/manifest.json +++ b/stoeberhunde/frontend/public/manifest.json @@ -20,8 +20,8 @@ "purpose": "any maskable" } ], - "start_url": "/", - "scope": "/", + "start_url": "/stoeberhunde/", + "scope": "/stoeberhunde/", "display": "standalone", "orientation": "portrait", "theme_color": "#2d6a2d",