config: Adjust Nginx listening address, explicitly set Traefik service ports for dev and prod, and rename the dev connection string key.

Reviewed-on: #3

.gitea/workflows/build.yml

@@ -7,12 +7,11 @@ on:
       - dev
 
 
-env:
-  REGISTRY: gitea.theriise.net/steinhelge
-
 jobs:
   build-and-push:
     runs-on: self-hosted
+    env:
+      REGISTRY: gitea.theriise.net/steinhelge
 
     steps:
       - name: Checkout
@@ -45,7 +44,14 @@ jobs:
       # ---------- Frontend ----------
       - name: Build Frontend (${{ env.TAG }})
         run: |
+          if [ "$TAG" = "dev" ]; then
+            API_URL="https://hospitality-dev-api.theriise.net/api"
+          else
+            API_URL="https://hospitality-api.theriise.net/api"
+          fi
+
           docker build \
+            --build-arg VITE_API_URL=$API_URL \
             -t $REGISTRY/hospitality-frontend:${TAG} \
             -f src/hospitality-web/Dockerfile \
             src/hospitality-web
@@ -57,10 +63,10 @@ jobs:
       # ---------- Backend API ----------
       - name: Build API (${{ env.TAG }})
         run: |
-        docker build \
-          -t $REGISTRY/hospitality-api:${TAG} \
-          -f src/Hospitality.Backend/Dockerfile \
-          .
+          docker build \
+            -t $REGISTRY/hospitality-api:${TAG} \
+            -f src/Hospitality.Backend/Dockerfile \
+            .
       # - name: Build API (${{ env.TAG }})
       #   run: |
       #     docker build \
@@ -71,4 +77,20 @@ jobs:
       - name: Push API (${{ env.TAG }})
         run: |
           docker push $REGISTRY/hospitality-api:${TAG}
+
+      - name: Deploy containers
+        run: |
+          if [ "$TAG" = "dev" ]; then
+            echo "Deploying DEV til /srv/hospitality-dev"
+            cd /srv/hospitality-dev
+            docker compose -p hospitality-dev pull
+            docker compose -p hospitality-dev up -d
+          elif [ "$TAG" = "latest" ]; then
+            echo "Deploying PROD til /srv/hospitality-prod"
+            cd /srv/hospitality-prod
+            docker compose -p hospitality-prod pull
+            docker compose -p hospitality-prod up -d
+          else
+            echo "TAG=$TAG er ikke dev eller latest - skipper auto-deploy."
+          fi
           

src/Hospitality.Backend/Program.cs

@@ -67,7 +67,7 @@ builder.Services.AddCors(options =>
 {
     options.AddPolicy("AllowFrontend", policy =>
     {
-        policy.WithOrigins("http://localhost:5173")
+        policy.SetIsOriginAllowed(origin => true) // Allow any origin
               .AllowAnyHeader()
               .AllowAnyMethod();
     });
@@ -97,7 +97,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-app.UseHttpsRedirection();
+// app.UseHttpsRedirection(); // Disabled because Traefik handles SSL
 
 app.UseCors("AllowFrontend");
 

src/hospitality-web/Dockerfile

@@ -9,6 +9,9 @@ RUN npm ci
 # Kopier resten av koden
 COPY . .
 
+ARG VITE_API_URL
+ENV VITE_API_URL=$VITE_API_URL
+
 # Bygg for produksjon
 RUN npm run build
 
@@ -19,5 +22,8 @@ WORKDIR /usr/share/nginx/html
 # Legg inn bygget frontend
 COPY --from=build /app/dist .
 
+# Kopier custom nginx config for SPA routing
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
 # Nginx server som statisk side
 EXPOSE 80

src/hospitality-web/deploy/docker-compose.dev.yml

@@ -4,6 +4,8 @@ networks:
   hospitality-dev-net:
     name: hospitality-dev-net
     driver: bridge
+  edge:
+    external: true
 
 services:
   db:
@@ -25,13 +27,19 @@ services:
     restart: unless-stopped
     environment:
       ASPNETCORE_URLS: http://0.0.0.0:8080
-      ConnectionStrings__Default: "Host=db;Port=5432;Database=hospitality_dev;Username=hospitality_dev;Password=devpassword"
+      ConnectionStrings__DefaultConnection: "Host=db;Port=5432;Database=hospitality_dev;Username=hospitality_dev;Password=devpassword"
     depends_on:
       - db
     networks:
       - hospitality-dev-net
-    # ports:
-    #   - "5005:8080"
+      - edge
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=edge"
+      - "traefik.http.routers.hospitality-dev-api.rule=Host(`hospitality-dev-api.theriise.net`)"
+      - "traefik.http.routers.hospitality-dev-api.entrypoints=websecure"
+      - "traefik.http.routers.hospitality-dev-api.tls=true"
+      - "traefik.http.services.hospitality-dev-api.loadbalancer.server.port=8080"
 
   web:
     image: gitea.theriise.net/steinhelge/hospitality-frontend:dev
@@ -41,18 +49,14 @@ services:
       - api
     networks:
       - hospitality-dev-net
-    ports:
-      - "8085:80"
-    # Eller via Traefik, samme mønster som over:
-    # networks:
-    #   - hospitality-dev-net
-    #   - edge
-    # labels:
-    #   - "traefik.enable=true"
-    #   - "traefik.docker.network=edge"
-    #   - "traefik.http.routers.hospitality-dev.rule=Host(`hospitality-dev.theriise.net`)"
-    #   - "traefik.http.routers.hospitality-dev.entrypoints=websecure"
-    #   - "traefik.http.routers.hospitality-dev.tls=true"
+      - edge
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=edge"
+      - "traefik.http.routers.hospitality-dev.rule=Host(`hospitality-dev.theriise.net`)"
+      - "traefik.http.routers.hospitality-dev.entrypoints=websecure"
+      - "traefik.http.routers.hospitality-dev.tls=true"
+      - "traefik.http.services.hospitality-dev.loadbalancer.server.port=80"
 
 volumes:
   hospitality-dev-db-data:

src/hospitality-web/deploy/docker-compose.prod.yml

@@ -4,6 +4,8 @@ networks:
   hospitality-net:
     name: hospitality-net
     driver: bridge
+  edge:
+    external: true
 
 services:
   db:
@@ -25,15 +27,19 @@ services:
     restart: unless-stopped
     environment:
       ASPNETCORE_URLS: http://0.0.0.0:8080
-      # ASP.NET Core-style connection string via env:
-      ConnectionStrings__Default: "Host=db;Port=5432;Database=hospitality;Username=hospitality;Password=supersecretpassword"
+      ConnectionStrings__DefaultConnection: "Host=db;Port=5432;Database=hospitality;Username=hospitality;Password=superhemmelig"
     depends_on:
       - db
     networks:
       - hospitality-net
-    # Hvis du vil nå API direkte uten Traefik:
-    # ports:
-    #   - "5004:8080"
+      - edge
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=edge"
+      - "traefik.http.routers.hospitality-api.rule=Host(`hospitality-api.theriise.net`)"
+      - "traefik.http.routers.hospitality-api.entrypoints=websecure"
+      - "traefik.http.routers.hospitality-api.tls=true"
+      - "traefik.http.services.hospitality-api.loadbalancer.server.port=8080"
 
   web:
     image: gitea.theriise.net/steinhelge/hospitality-frontend:latest
@@ -43,19 +49,14 @@ services:
       - api
     networks:
       - hospitality-net
-    # Ekstern tilgang (uten Traefik):
-    ports:
-      - "8084:80"
-    # Hvis du vil kjøre via Traefik i stedet:
-    # networks:
-    #   - hospitality-net
-    #   - edge
-    # labels:
-    #   - "traefik.enable=true"
-    #   - "traefik.docker.network=edge"
-    #   - "traefik.http.routers.hospitality.rule=Host(`hospitality.theriise.net`)"
-    #   - "traefik.http.routers.hospitality.entrypoints=websecure"
-    #   - "traefik.http.routers.hospitality.tls=true"
+      - edge
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=edge"
+      - "traefik.http.routers.hospitality.rule=Host(`hospitality.theriise.net`)"
+      - "traefik.http.routers.hospitality.entrypoints=websecure"
+      - "traefik.http.routers.hospitality.tls=true"
+      - "traefik.http.services.hospitality.loadbalancer.server.port=80"
 
 volumes:
   hospitality-db-data:

src/hospitality-web/nginx.conf

@@ -0,0 +1,17 @@
+server {
+    listen 0.0.0.0:80;
+    server_name _;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # Support for SPA routing
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    # Optional: Cache static assets
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
+        expires 1y;
+        add_header Cache-Control "public, no-transform";
+    }
+}

src/hospitality-web/src/lib/api.ts

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import type { LoginRequest, LoginResponse, UserInfo } from '../types/auth';
 
-const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:5163/api';
+const API_BASE_URL = import.meta.env.VITE_API_URL;
 
 export const api = axios.create({
   baseURL: API_BASE_URL,