From 33e1ceccf35a07dec691a93722be07bac9f5003b Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Fri, 8 Jan 2021 20:53:09 +0900
Subject: [PATCH] Update settings and move commands, fix #1134 #1135

---
 .../management/commands/create_admin.py            |  0
 .../management/commands/create_role_mapping.py     |  0
 .../management/commands/create_roles.py            |  0
 .../management/commands/wait_for_db.py             |  0
 app/app/settings.py                                | 14 --------------
 5 files changed, 14 deletions(-)
 rename app/{server => api}/management/commands/create_admin.py (100%)
 rename app/{server => api}/management/commands/create_role_mapping.py (100%)
 rename app/{server => api}/management/commands/create_roles.py (100%)
 rename app/{server => api}/management/commands/wait_for_db.py (100%)

diff --git a/app/server/management/commands/create_admin.py b/app/api/management/commands/create_admin.py
similarity index 100%
rename from app/server/management/commands/create_admin.py
rename to app/api/management/commands/create_admin.py
diff --git a/app/server/management/commands/create_role_mapping.py b/app/api/management/commands/create_role_mapping.py
similarity index 100%
rename from app/server/management/commands/create_role_mapping.py
rename to app/api/management/commands/create_role_mapping.py
diff --git a/app/server/management/commands/create_roles.py b/app/api/management/commands/create_roles.py
similarity index 100%
rename from app/server/management/commands/create_roles.py
rename to app/api/management/commands/create_roles.py
diff --git a/app/server/management/commands/wait_for_db.py b/app/api/management/commands/wait_for_db.py
similarity index 100%
rename from app/server/management/commands/wait_for_db.py
rename to app/api/management/commands/wait_for_db.py
diff --git a/app/app/settings.py b/app/app/settings.py
index 0398c362..ee761894 100644
--- a/app/app/settings.py
+++ b/app/app/settings.py
@@ -52,15 +52,12 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'server.apps.ServerConfig',
     'api.apps.ApiConfig',
-    # 'widget_tweaks',
     'rest_framework',
     'rest_framework.authtoken',
     'django_filters',
     'social_django',
     'polymorphic',
-    # 'webpack_loader',
     'corsheaders',
     'drf_yasg'
 ]
@@ -124,17 +121,6 @@ STATICFILES_DIRS = [
 
 STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
 
-WEBPACK_LOADER = {
-    'DEFAULT': {
-        'CACHE': not DEBUG,
-        'BUNDLE_DIR_NAME': 'bundle/',
-        'STATS_FILE': path.join(BASE_DIR, 'server', 'static', 'webpack-stats.json'),
-        'POLL_INTERVAL': 0.1,
-        'TIMEOUT': None,
-        'IGNORE': [r'.*\.hot-update.js', r'.+\.map']
-    }
-}
-
 WSGI_APPLICATION = 'app.wsgi.application'
 
 AUTHENTICATION_BACKENDS = [