Merge branch 'static-file-handling-in-dev-and-prod' into newb

princekhunt · Jun 14, 2024 · d6e1e09 · d6e1e09
2 parents f37fb70 + c5b394e
commit d6e1e09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/PrivatePing/settings/base.py b/PrivatePing/settings/base.py
@@ -91,8 +91,4 @@
 LOGIN_REDIRECT_URL = "/"
 LOGOUT_REDIRECT_URL = "/"
 
-# STATICFILES_DIRS = [
-#     os.path.join(BASE_DIR, '../assets/static')
-# ]
-STATIC_ROOT = os.path.join(BASE_DIR, '../assets/')
 STATIC_URL = '/static/'
diff --git a/PrivatePing/settings/development.py b/PrivatePing/settings/development.py
@@ -23,7 +23,7 @@
 SECRET_KEY = env('SECRET_KEY')
 SECRET_ADMIN_URL = env('SECRET_ADMIN_URL')
 ALLOWED_HOSTS = ['localhost']
-DEBUG = False
+DEBUG = True
 
 CHANNEL_LAYERS = {
     "default": {
@@ -42,4 +42,8 @@
 
 DOMAIN = "http://localhost:8000"
 
-CSRF_TRUSTED_ORIGINS = ["http://localhost:8000"]
+CSRF_TRUSTED_ORIGINS = ["http://localhost:8000"]
+
+STATICFILES_DIRS = [
+     os.path.join(BASE_DIR, '../assets/')
+ ]