Untracked redundant files, implemented OOBE wizard

Author: HugeFrog24

.github/workflows/deploy.yml

@@ -19,20 +19,25 @@ jobs:
         OWNER: '${{ github.repository_owner }}'
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Collect static files
+      run: |
+        cd backend
+        python manage.py collectstatic --noinput
+
     - name: Build and push Django image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v6
       with:
-        context: ./tibiknini
-        file: ./tibiknini/Dockerfile
+        context: ./backend
+        file: ./backend/Dockerfile
         push: true
         tags: ghcr.io/${{ env.OWNER_LC }}/tibiknini:latest
 
@@ -43,7 +48,7 @@ jobs:
         npm run build -- --prod
 
     - name: Build and push NGINX image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ./nginx/Dockerfile

.gitignore

@@ -1,3 +1,6 @@
+# Ignore Django collected static files
+# These are generated during deployment and should not be version controlled
+/backend/staticfiles/
 dumps/
 secrets/
 .env.prod

backend/.env.example

@@ -12,6 +12,11 @@ RUN pip install -r /usr/src/app/requirements.txt
 # copy our project code
 COPY . /usr/src/app/
 
+# Collect static files during build time
+# This ensures that static files are available when the container starts,
+# and prevents issues with empty volumes when the container is first run
+RUN python manage.py collectstatic --noinput
+
 # expose the port 8000
 EXPOSE 8000
 

backend/Dockerfile

@@ -1,10 +1,9 @@
 from django.contrib.auth import views as auth_views
 from django.urls import include, path
-from rest_framework.permissions import AllowAny
 
 from core.views import PrivacyPolicyView, TermsOfServiceView
 
-from .views import NavbarItemList, ReCaptchaLoginView, set_csrf_token
+from .views import NavbarItemList, ReCaptchaLoginView, set_csrf_token, SetupView
 
 app_name = 'api'
 
@@ -20,4 +19,6 @@
     path('set-csrf-token/', set_csrf_token, name='set_csrf_token'),
     path('auth/login/', ReCaptchaLoginView.as_view(), name='login'),
     path('auth/logout/', auth_views.LogoutView.as_view(), name='logout'),
+
+    path('setup/', SetupView.as_view(), name='setup'),
 ]

backend/api/urls.py

@@ -10,6 +10,15 @@
 from .serializers import NavbarItemSerializer
 from .utils.recaptcha import verify_recaptcha
 
+import os
+from django.conf import settings
+from django.core.management import call_command
+from django.contrib.auth import get_user_model
+from django.db import transaction
+from users.models import Profile  # Import the Profile model
+from users.managers import CustomUserManager  # Import the custom manager
+
+User = get_user_model()
 
 @ensure_csrf_cookie
 def set_csrf_token(request):
@@ -22,7 +31,6 @@ class NavbarItemList(generics.ListAPIView):
     queryset = NavbarItem.objects.all()
     serializer_class = NavbarItemSerializer
 
-
 class ReCaptchaLoginView(APIView):
     def post(self, request, *args, **kwargs):
         username = request.data.get('username')
@@ -40,4 +48,51 @@ def post(self, request, *args, **kwargs):
             return JsonResponse({'detail': 'Successfully logged in.'})
         else:
             return JsonResponse({'detail': 'Invalid login credentials.'}, status=status.HTTP_400_BAD_REQUEST)
-        
+
+class SetupView(APIView):
+    def post(self, request, *args, **kwargs):
+        db_host = request.data.get('db_host')
+        db_port = request.data.get('db_port')
+        db_name = request.data.get('db_name')
+        db_user = request.data.get('db_user')
+        db_password = request.data.get('db_password')
+        admin_username = request.data.get('admin_username')
+        admin_email = request.data.get('admin_email')
+        admin_password = request.data.get('admin_password')
+
+        # Write database settings to .env file
+        env_path = os.path.join(settings.BASE_DIR, '.env')
+        with open(env_path, 'a') as f:
+            f.write(f'DATABASE_URL=postgres://{db_user}:{db_password}@{db_host}:{db_port}/{db_name}\n')
+
+        try:
+            # Run migrations
+            call_command('migrate')
+
+            with transaction.atomic():
+                # Use the custom manager to create the superuser
+                User.objects.create_superuser(
+                    username=admin_username,
+                    email=admin_email,
+                    password=admin_password
+                )
+
+            # Create setup complete flag in the media directory
+            setup_flag_path = os.path.join(settings.MEDIA_ROOT, 'setup_complete.txt')
+            with open(setup_flag_path, 'w') as f:
+                f.write('Setup complete')
+
+            return JsonResponse({'detail': 'Setup complete'}, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            # If an error occurs, remove the added database settings
+            with open(env_path, 'r') as f:
+                lines = f.readlines()
+            with open(env_path, 'w') as f:
+                f.writelines(lines[:-1])  # Remove the last line
+
+            # Log the full error for debugging
+            import logging
+            logging.error(f"Error during setup: {str(e)}", exc_info=True)
+
+            return JsonResponse({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)

backend/api/views.py

@@ -0,0 +1,16 @@
+import os
+from django.http import JsonResponse
+from django.conf import settings
+
+class SetupMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        setup_flag_path = os.path.join(settings.MEDIA_ROOT, 'setup_complete.txt')
+        if not os.path.exists(setup_flag_path):
+            if request.path.startswith('/api/setup') or request.path.startswith('/static') or request.path.startswith('/django-static'):
+                return self.get_response(request)
+            return JsonResponse({'detail': 'Setup required'}, status=503)
+        response = self.get_response(request)
+        return response

backend/backend/middleware.py

@@ -75,6 +75,7 @@ def get_secret(secret_name, default=None):
 ]
 
 MIDDLEWARE = [
+    'backend.middleware.SetupMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -154,7 +155,14 @@ def get_secret(secret_name, default=None):
     "http://localhost",
     "http://127.0.0.1",
 ]
-CSRF_TRUSTED_ORIGINS = ["127.0.0.1", "localhost", f"https://*.{os.getenv('DOMAIN_NAME')}"]
+CSRF_TRUSTED_ORIGINS = [
+    "http://127.0.0.1",
+    "https://127.0.0.1",
+    "http://localhost",
+    "https://localhost",
+    f"https://*.{os.getenv('DOMAIN_NAME')}"
+]
+
 SESSION_COOKIE_HTTPONLY = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
@@ -174,7 +182,7 @@ def get_secret(secret_name, default=None):
 EMAIL_HOST_USER = get_secret('email_host_user')
 EMAIL_HOST_PASSWORD = get_secret('email_host_password')
 
-RECAPTCHA_SECRET_KEY = os.getenv('RECAPTCHA_SECRET_KEY')
+RECAPTCHA_SECRET_KEY = get_secret('recaptcha_secret_key')
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field

backend/backend/settings.py

@@ -0,0 +1 @@
+Setup complete