Intermediate commit

Author: Yosef-AlSabbah

account/management/commands/create_superuser.py

@@ -0,0 +1,64 @@
+from django.contrib.auth import get_user_model
+from django.core.management.base import BaseCommand
+
+from account.models import Profile
+
+User = get_user_model()
+
+
+class Command(BaseCommand):
+    help = 'Create a superuser with default credentials ([email protected] / admin) and activated status and profile'
+
+    def handle(self, *args, **options):
+        email = '[email protected]'
+        username = 'admin'
+        password = 'admin'
+        first_name = 'Admin'
+        last_name = 'User'
+
+        # Check if user already exists
+        if User.objects.filter(email=email).exists():
+            self.stdout.write(
+                self.style.ERROR(f'User with email "{email}" already exists.')
+            )
+            return
+
+        if User.objects.filter(username=username).exists():
+            self.stdout.write(
+                self.style.ERROR(f'User with username "{username}" already exists.')
+            )
+            return
+
+        try:
+            # Create superuser
+            user = User.objects.create_superuser(
+                email=email,
+                username=username,
+                password=password,
+                first_name=first_name,
+                last_name=last_name,
+                is_active=True  # Ensure user is activated
+            )
+
+            # Create profile for the user
+            profile, created = Profile.objects.get_or_create(
+                user=user,
+                defaults={'balance': 0.0}
+            )
+
+            self.stdout.write(
+                self.style.SUCCESS(
+                    f'Successfully created superuser "{username}" with email "{email}"'
+                )
+            )
+            self.stdout.write(
+                self.style.SUCCESS(f'User is active: {user.is_active}')
+            )
+            self.stdout.write(
+                self.style.SUCCESS(f'Profile created: {created}')
+            )
+
+        except Exception as e:
+            self.stdout.write(
+                self.style.ERROR(f'Error creating superuser: {str(e)}')
+            )

config/nginx/default.conf

@@ -0,0 +1,41 @@
+# upstream for Uvicorn
+upstream uvicorn_app {
+    server web:8000;
+}
+
+server {
+    listen 80;
+    server_name www.ecommerce.com ecommerce.com;
+    error_log stderr warn;
+    access_log /dev/stdout main;
+
+    # Static files - must come before the general / location
+    location /static/ {
+        alias /code/staticfiles/;
+        expires 30d;
+        add_header Cache-Control "public, immutable";
+        try_files $uri $uri/ =404;
+    }
+
+    # Media files
+    location /media/ {
+        alias /code/media/;
+        expires 30d;
+        add_header Cache-Control "public";
+        try_files $uri $uri/ =404;
+    }
+
+    # All other requests go to Django
+    location / {
+        proxy_pass http://uvicorn_app;
+        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;
+
+        # WebSocket support
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+}

config/nginx/default.conf.template

@@ -9,6 +9,23 @@ server {
     error_log stderr warn;
     access_log /dev/stdout main;
 
+    # Static files - must come before the general / location
+    location /static/ {
+        alias /code/staticfiles/;
+        expires 30d;
+        add_header Cache-Control "public, immutable";
+        try_files $uri $uri/ =404;
+    }
+
+    # Media files
+    location /media/ {
+        alias /code/media/;
+        expires 30d;
+        add_header Cache-Control "public";
+        try_files $uri $uri/ =404;
+    }
+
+    # All other requests go to Django
     location / {
         proxy_pass http://uvicorn_app;
         proxy_set_header Host $host;
@@ -21,12 +38,4 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
     }
-
-    location /static/ {
-        alias /code/static/;
-    }
-
-    location /media/ {
-        alias /code/media/;
-    }
 }

create_dirs.py

@@ -0,0 +1,4 @@
+import os
+
+os.makedirs('P:/0_Programming/ecommerce_api/account/management/commands', exist_ok=True)
+os.makedirs('P:/0_Programming/ecommerce_api/shop/management/commands', exist_ok=True)

docker-compose.yml

@@ -43,10 +43,12 @@ services:
     build: .
     container_name: backend
     command: [ "./wait-for-it.sh", "database:5432", "--",
-               "sh", "-c", "python manage.py migrate && uvicorn ecommerce_api.asgi:application --host 0.0.0.0 --port 8000 --reload" ]
+               "sh", "-c", "python manage.py migrate && python manage.py collectstatic --noinput && ls -l /code/staticfiles/ && uvicorn ecommerce_api.asgi:application --host 0.0.0.0 --port 8000 --reload" ]
     restart: always
     volumes:
       - .:/code
+      - static_volume:/code/staticfiles
+      - media_volume:/code/media
     ports:
       - "8000:8000"
     env_file:
@@ -61,7 +63,7 @@ services:
     container_name: nginx
     restart: always
     volumes:
-      - ./config/nginx:/etc/nginx/templates
+      - ./config/nginx/default.conf:/etc/nginx/conf.d/default.conf
       - .:/code
     ports:
       - "80:80"
@@ -70,4 +72,6 @@ services:
       - web
 
 volumes:
-  database:
+  database:
+  static_volume:
+  media_volume:

ecommerce_api/settings/base.py

@@ -16,7 +16,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']  # Allow all hosts in development - restrict in production
 
 # CSRF_TRUSTED_ORIGINS = [
 #     'http://localhost:3000'
@@ -161,6 +161,12 @@
 # https://docs.djangoproject.com/en/5.2/howto/static-files/
 
 STATIC_URL = 'static/'
+STATIC_ROOT = BASE_DIR / 'staticfiles'
+
+# Additional locations of static files
+# STATICFILES_DIRS = [
+#     BASE_DIR / 'static',
+# ]
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field

refresh_collation.sql

@@ -0,0 +1 @@
+ALTER DATABASE "Luqta_db" REFRESH COLLATION VERSION;