Merge pull request 'dev' (#4) from dev into master

Reviewed-on: #4

.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
@@ -60,9 +66,31 @@ jobs:
           docker build \
             -t $REGISTRY/hospitality-api:${TAG} \
             -f src/Hospitality.Backend/Dockerfile \
-            src/Hospitality.Backend
+            .
+      # - name: Build API (${{ env.TAG }})
+      #   run: |
+      #     docker build \
+      #       -t $REGISTRY/hospitality-api:${TAG} \
+      #       -f src/Hospitality.Backend/Dockerfile \
+      #       src/Hospitality.Backend
 
       - 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-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:
@@ -30,8 +32,13 @@ services:
       - db
     networks:
       - hospitality-dev-net
-    # ports:
+      - edge
-    #   - "5005:8080"
+    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"
 
   web:
     image: gitea.theriise.net/steinhelge/hospitality-frontend:dev
@@ -41,18 +48,13 @@ services:
       - api
     networks:
       - hospitality-dev-net
-    ports:
+      - edge
-      - "8085:80"
+    labels:
-    # Eller via Traefik, samme mønster som over:
+      - "traefik.enable=true"
-    # networks:
+      - "traefik.docker.network=edge"
-    #   - hospitality-dev-net
+      - "traefik.http.routers.hospitality-dev.rule=Host(`hospitality-dev.theriise.net`)"
-    #   - edge
+      - "traefik.http.routers.hospitality-dev.entrypoints=websecure"
-    # labels:
+      - "traefik.http.routers.hospitality-dev.tls=true"
-    #   - "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"
 
 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:
@@ -31,9 +33,13 @@ services:
       - db
     networks:
       - hospitality-net
-    # Hvis du vil nå API direkte uten Traefik:
+      - edge
-    # ports:
+    labels:
-    #   - "5004:8080"
+      - "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"
 
   web:
     image: gitea.theriise.net/steinhelge/hospitality-frontend:latest
@@ -43,19 +49,13 @@ services:
       - api
     networks:
       - hospitality-net
-    # Ekstern tilgang (uten Traefik):
+      - edge
-    ports:
+    labels:
-      - "8084:80"
+      - "traefik.enable=true"
-    # Hvis du vil kjøre via Traefik i stedet:
+      - "traefik.docker.network=edge"
-    # networks:
+      - "traefik.http.routers.hospitality.rule=Host(`hospitality.theriise.net`)"
-    #   - hospitality-net
+      - "traefik.http.routers.hospitality.entrypoints=websecure"
-    #   - edge
+      - "traefik.http.routers.hospitality.tls=true"
-    # 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"
 
 volumes:
   hospitality-db-data:

src/hospitality-web/nginx.conf

@@ -0,0 +1,17 @@
+server {
+    listen 80;
+    server_name localhost;
+    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,