nginx

Author: HugeFrog24

docker-compose.yml

@@ -22,14 +22,13 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./frontend/dist:/var/www/html
+      - ./frontend/public:/var/www/html
       - ./media:/var/www/media
     depends_on:
       - django-dev
+      - frontend-dev
     networks:
       - app_network
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
 
   django:
     image: ghcr.io/${OWNER_LC}/tibiknini:latest
@@ -201,8 +200,6 @@ services:
       - DOMAIN_NAME=nginx-dev
     networks:
       - app_network
-    depends_on:
-      - nginx-dev
 
   redis:
     image: redis:7-alpine

frontend/app/old-app/components/BlogPostDetail.jsx

@@ -21,6 +21,7 @@ import UserContext from "./contexts/UserContext";
 import {REDIRECT_REASONS} from "./constants/Constants";
 import BlogPostComments from "./BlogPostComments";
 import api from "../utils/api";
+import { getApiUrl } from "../../env.server";
 
 const BlogPostDetail = ({ post }) => {
     const navigate = useNavigate();
@@ -73,9 +74,19 @@ const BlogPostDetail = ({ post }) => {
         }
 
         try {
-            const response = await api.post(`/blog/posts/id/${post.id}/like/`);
-            setLikesCount(response.data.likes_count);
-            setIsLiked(response.data.is_liked);
+            const apiUrl = getApiUrl();
+            const response = await fetch(`${apiUrl}/api/blog/posts/id/${post.id}/like/`, {
+                method: 'POST',
+                credentials: 'include'
+            });
+            
+            if (!response.ok) {
+                throw new Error('Failed to like post');
+            }
+            
+            const data = await response.json();
+            setLikesCount(data.likes_count);
+            setIsLiked(data.is_liked);
         } catch (error) {
             console.error('Error liking post:', error);
             toast.error('Failed to like post');
@@ -153,4 +164,4 @@ const BlogPostDetail = ({ post }) => {
     );
 };
 
-export default BlogPostDetail;
+export default BlogPostDetail;

nginx/nginx.conf.dev

@@ -1,26 +1,30 @@
 server {
     server_name localhost 89.111.174.61;
+    listen 80;
 
-    location /django-static/ {
-        alias /var/www/staticfiles/;
+    # Static files from public directory
+    location /build/ {
+        alias /var/www/html/build/;
+        add_header Cache-Control "public, max-age=31536000, immutable";
     }
 
-    location /static/ {
-        alias /var/www/html/static/;
+    # Other static files (favicon, manifest, etc)
+    location ~* \.(ico|png|json|txt)$ {
+        root /var/www/html;
+        try_files $uri =404;
+        add_header Cache-Control "public, max-age=31536000";
     }
 
-    # Serve the main index.html file for the ReactJS frontend
-    location / {
-        root /var/www/html;
-        try_files $uri /index.html;
+    location /django-static/ {
+        alias /var/www/staticfiles/;
     }
 
     location /admin/ {
-      proxy_pass http://django-dev:8000;
-      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_pass http://django-dev:8000;
+        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;
     }
 
     location /api/ {
@@ -43,53 +47,23 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    # Vite dev server proxy
-    location /ws {
-        proxy_pass http://host.docker.internal:5173;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
-    }
-
-    # Serve static files from Vite
-    location /@fs/ {
-        proxy_pass http://host.docker.internal:5173;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
-    }
-
-    location /@vite/ {
-        proxy_pass http://host.docker.internal:5173;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
-    }
-
-    location /node_modules/ {
-        proxy_pass http://host.docker.internal:5173;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
+    location /media/ {
+        alias /var/www/media/;
     }
 
-    location /src/ {
-        proxy_pass http://host.docker.internal:5173;
+    # All other requests go to Remix
+    location / {
+        proxy_pass http://frontend-dev: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;
+        
+        # Prevent redirect loops
+        proxy_redirect off;
     }
-
-    location /media/ {
-        alias /var/www/media/;
-    }
-}
-
-server {
-    server_name localhost;
-
-    listen 80;
-    return 301 https://$host$request_uri;
 }