Skip to content
Snippets Groups Projects

Refactor

Merged Jan Maximilian Michal requested to merge refactor into master
2 files
+ 18
15
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -10,6 +10,7 @@ For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.10/ref/settings/
"""
import datetime
import os
from django.contrib.messages import constants as messages
@@ -39,11 +40,14 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'django_extensions',
'compressor',
'core',
'rest_framework',
'corsheaders',
]
MIDDLEWARE = [
'corsheaders.middleware.CorsMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
@@ -71,6 +75,7 @@ TEMPLATES = [
},
]
WSGI_APPLICATION = 'grady.wsgi.application'
@@ -88,21 +93,6 @@ DATABASES = {
},
}
# Password validation
# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/1.10/topics/i18n/
@@ -116,7 +106,9 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.10/howto/static-files/
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'node_modules'),
)
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
@@ -145,5 +137,74 @@ COMPRESS_OFFLINE = True
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'compressor.finders.CompressorFinder',
)
AUTH_USER_MODEL = 'core.UserAccount'
AUTH_PASSWORD_VALIDATORS = []
CORS_ORIGIN_WHITELIST = (
'localhost:8080'
)
REST_FRAMEWORK = {
'DEFAULT_PERMISSION_CLASSES': (
'rest_framework.permissions.IsAuthenticated',
),
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
'rest_framework.authentication.SessionAuthentication',
'rest_framework.authentication.BasicAuthentication',
),
}
JWT_AUTH = {
'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=600),
}
LOGGING = {
"version": 1,
"disable_existing_loggers": False,
"formatters": {
'django.server': {
'datefmt': '%d/%b/%Y %H:%M:%S',
'format': '[%(asctime)s] %(levelname)-10s %(name)-20s %(message)s',
},
'core': {
'datefmt': '%d/%b/%Y %H:%M:%S',
'format': '[%(asctime)s] %(levelname)-10s %(name)-20s "%(message)s"',
},
},
'filters': {
'require_debug_true': {
'()': 'django.utils.log.RequireDebugTrue',
},
},
'handlers': {
'console': {
'level': 'DEBUG',
'filters': ['require_debug_true'],
'class': 'logging.StreamHandler',
'formatter': 'core'
},
'django': {
'level': 'INFO',
'class': 'logging.StreamHandler',
'formatter': 'django.server'
},
'mail_admins': { # TODO: configuration
'level': 'ERROR',
'class': 'django.utils.log.AdminEmailHandler',
}
},
'loggers': {
'django': {
'handlers': ['django'],
},
'django.request': {
'handlers': ['django'],
},
'core': {
'handlers': ['console', 'mail_admins'],
'level': 'DEBUG',
}
}
}
Loading