add test nginx config and update admin page for logout

Author: johnnzhou

Makefile

@@ -1,5 +1,7 @@
 # Name of the Docker container
 DOCKER_IMAGE=node:22-slim
+VIS_DOCKER_IMAGE_NAME_PREFIX=ghcr.io/local-connectivity-lab
+VIS_DOCKER_IMAGE_NAME=ccn-coverage-vis
 include .env
 
 # The current directory (mapped to the container)
@@ -14,8 +16,9 @@ clean:
 
 .PHONY: build
 build:
-	@echo "Create docker container"
-	docker build -t ccn-coverage-vis .
+	@echo "Create docker container for $(VIS_DOCKER_IMAGE_NAME)"
+
+	docker build -t $(VIS_DOCKER_IMAGE_NAME_PREFIX)/$(VIS_DOCKER_IMAGE_NAME) -f vis.dockerfile .
 
 # The target for development
 .PHONY: dev

configs/nginx.conf

@@ -34,23 +34,50 @@ server {
     gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml application/javascript;
     gzip_disable "MSIE [1-6]\.";
 
-    # Caching settings for static assets
-    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
-        root /usr/share/nginx/html;
+    # Root directory for the site
+    root /usr/share/nginx/html;
+
+    # API and secure endpoints
+    location ~ ^/(api|secure)/ {
+        proxy_pass http://api:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_cache_bypass $http_upgrade;
+        
+        # Timeout settings
+        proxy_connect_timeout 60s;
+        proxy_send_timeout 60s;
+        proxy_read_timeout 60s;
+    }
+
+    # Handle requests to /admin/assets/ - KEY FIX HERE
+    location ^~ /admin/assets/ {
+        # Rewrite requests from /admin/assets/ to /assets/
+        rewrite ^/admin/assets/(.*) /assets/$1 last;
+    }
+
+    # Static assets caching
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
         expires 1y;
         add_header Cache-Control "public, max-age=31536000, immutable";
         try_files $uri =404;
     }
 
+    # Handle all routes for the SPA
     location / {
-        root /usr/share/nginx/html;
+        index index.html;
         try_files $uri $uri/ /index.html;
     }
 
     # Error pages
     error_page 404 /index.html;
     error_page 500 502 503 504 /50x.html;
     location = /50x.html {
-        root /usr/share/nginx/html;
+        try_files $uri =404;
     }
 }

docker-compose.yaml

@@ -15,7 +15,8 @@ services:
     ports:
       - 443:443
     depends_on:
-      - cert-generator
+      cert-generator:
+        condition: service_completed_successfully
 
 volumes:
   certs:

src/admin/AdminPortal.tsx

@@ -83,7 +83,7 @@ const logout = () => {
         console.log(`Unable to logout: ${error}`);
         return;
       }
-      window.open('/', '_self');
+      window.location.href = '/login';
     })
     .catch(err => {
       console.log(`Error occurred while logging out: ${err}`);

vis.dockerfile

@@ -6,18 +6,16 @@ COPY package*.json ./
 COPY tsconfig.json ./
 COPY scripts/setup.sh ./scripts/
 
-RUN chmod +x ./scripts/setup.sh
-RUN ./scripts/setup.sh
-
-RUN npm ci
+RUN chmod +x ./scripts/setup.sh && \
+    ./scripts/setup.sh && \
+    npm ci && \
+    npm cache clean --force
 
 COPY . .
 
-RUN npm run build
-
-RUN npm prune --production
+RUN npm run build && npm prune --production
 
-FROM nginx:stable
+FROM nginx:stable-alpine
 
 COPY --from=build /usr/src/app/build /usr/share/nginx/html
 COPY configs/nginx.conf /etc/nginx/conf.d/default.conf