sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/rojabo

Browse Source
This commit is contained in:
Sander Roosendaal
2022-04-13 12:50:10 +02:00
parent 62f3d373cf 1fd2e3b111
commit 2b4179360d
72 changed files with 2292 additions and 1924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
rowsandall_app/settings.py
View File

@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
# -*- coding: utf-8 -*-
import os
from YamJam import yamjam
#from django.utils.translation import ugettext_lazy as _
# from django.utils.translation import ugettext_lazy as _
# Read configuration (passwords, keys, secrets) from YamJam configuration
# You have to create your own config.yaml in the project directory
@@ -20,8 +20,6 @@ CFG = yamjam()['rowsandallapp']
DEFAULT_CHARSET = 'UTF-8'
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -39,10 +37,10 @@ TESTING = False
ALLOWED_HOSTS = CFG['allowed_hosts']
#OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = 'oauth2_provider.AccessToken'
#OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application'
#OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = 'oauth2_provider.RefreshToken'
#OAUTH2_PROVIDER_ACCESS_TOKEN_EXPIRE_SECONDS = 3600
# OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = 'oauth2_provider.AccessToken'
# OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application'
# OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = 'oauth2_provider.RefreshToken'
# OAUTH2_PROVIDER_ACCESS_TOKEN_EXPIRE_SECONDS = 3600
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
@@ -51,20 +49,20 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
INSTALLED_APPS = [
'rowers',
'survey',
# 'cvkbrno',
# 'cvkbrno',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
# 'suit',
# 'suit_rq',
# 'suit',
# 'suit_rq',
'leaflet',
'django_rq',
# 'django_rq_dashboard',
# 'translation_manager',
# 'django_mailbox',
# 'django_rq_dashboard',
# 'translation_manager',
# 'django_mailbox',
'rest_framework',
'datetimewidget',
'rest_framework_swagger',
@@ -91,12 +89,12 @@ MIDDLEWARE = [
'django.middleware.common.CommonMiddleware',
'django.middleware.common.BrokenLinkEmailsMiddleware',
'django.middleware.gzip.GZipMiddleware',
# 'htmlmin.middleware.HtmlMinifyMiddleware',
# 'htmlmin.middleware.MarkRequestMiddleware',
# 'htmlmin.middleware.HtmlMinifyMiddleware',
# 'htmlmin.middleware.MarkRequestMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
# 'django.middleware.locale.LocaleMiddleware',
# 'django.middleware.locale.LocaleMiddleware',
'corsheaders.middleware.CorsMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -106,14 +104,14 @@ MIDDLEWARE = [
'tz_detect.middleware.TimezoneMiddleware',
'rowers.middleware.SurveyMiddleWare',
'rowers.middleware.GDPRMiddleWare',
# 'rowers.middleware.PowerTimeFitnessMetricMiddleWare',
# 'rowers.middleware.PowerTimeFitnessMetricMiddleWare',
'rowers.middleware.RowerPlanMiddleWare',
]
ROOT_URLCONF = 'rowsandall_app.urls'
HTML_MINIFY = True
#EXCLUDE_FROM_MINIFYING = ('^rowers/flexall',
# EXCLUDE_FROM_MINIFYING = ('^rowers/flexall',
# '^rowers/list-workouts',
# '^rowers/list-graphs',
# '^admin/',
@@ -124,7 +122,7 @@ APPEND_SLASH = True
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR,'templates')],
'DIRS': [os.path.join(BASE_DIR, 'templates')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
@@ -132,19 +130,18 @@ TEMPLATES = [
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'django.template.context_processors.i18n',
# 'context_processors.google_analytics',
'django.template.context_processors.i18n',
# 'context_processors.google_analytics',
'context_processors.warning_message',
'rowers.context_processors.braintree_merchant',
],
'libraries' : {
'libraries': {
'staticfiles': 'django.templatetags.static',
}
# 'loaders': [
# 'django.template.loaders.app_directories.Loader',
# ],
# 'loaders': [
# 'django.template.loaders.app_directories.Loader',
# ],
},
},
]
@@ -177,8 +174,8 @@ DATABASES = {
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
},
'TEST': {
'CHARSET': 'utf8',
'COLLATION': 'utf8_general_ci',
'CHARSET': 'utf8',
'COLLATION': 'utf8_general_ci',
},
}
@@ -192,9 +189,9 @@ AUTH_PASSWORD_VALIDATORS = [
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
'OPTIONS': {
'min_length': 9,
}
'OPTIONS': {
'min_length': 9,
}
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
@@ -203,7 +200,7 @@ AUTH_PASSWORD_VALIDATORS = [
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
{
'NAME': 'rowers.validator.LettersAndDigitsValidator',
'NAME': 'rowers.validator.LettersAndDigitsValidator',
}
]
@@ -217,11 +214,11 @@ USE_I18N = True
USE_L10N = False
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
'%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
'%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
'%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
'%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
'%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
'%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
'%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
'%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
]
DATE_FORMAT = 'Y-m-d'
@@ -229,12 +226,12 @@ DATE_FORMAT = 'Y-m-d'
USE_TZ = True
TIME_ZONE = 'UTC'
TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT')
TZ_DETECT_COUNTRIES = ('US', 'DE', 'GB', 'CZ', 'FR', 'IT')
LOCALE_PATHS = (
os.path.join(BASE_DIR, 'locale'),
# os.path.join(BASE_DIR, 'cvkbrno/locale'),
)
# os.path.join(BASE_DIR, 'cvkbrno/locale'),
)
LANGUAGE_CODE = 'en-us'
@@ -244,19 +241,16 @@ LANGUAGE_COOKIE_NAME = 'wm_lang'
# https://docs.djangoproject.com/en/1.9/howto/static-files/
STATIC_URL = '/static/'
#STATIC_ROOT = BASE_DIR
# STATIC_ROOT = BASE_DIR
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static/plots'),]
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static/plots'), ]
# os.path.join(BASE_DIR, 'static'),
MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
# user authentication
# user authentication
LOGIN_REDIRECT_URL = '/rowers/list-workouts/'
LOGIN_URL = '/login/'
@@ -268,18 +262,18 @@ LOGOUT_REDIRECT_URL = '/'
PROGRESS_CACHE_SECRET = CFG['progress_cache_secret']
try:
UPLOAD_SERVICE_URL = CFG['upload_service_url']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
UPLOAD_SERVICE_URL = "http://localhost:8000/rowers/workout/api/upload/"
try:
UPLOAD_SERVICE_SECRET = CFG['upload_service_secret']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
UPLOAD_SERVICE_SECRET = "FoYezZWLSyfAVimumpHEeYsJjsNCerxV"
# Concept 2
C2_CLIENT_ID = CFG['c2_client_id']
C2_CLIENT_SECRET = CFG['c2_client_secret']
C2_REDIRECT_URI = CFG['c2_callback']
#C2_REDIRECT_URI = "http://localhost:8000/call_back"
# C2_REDIRECT_URI = "http://localhost:8000/call_back"
# Strava
@@ -322,8 +316,8 @@ UNDERARMOUR_CLIENT_ID = CFG['underarmour_client_name']
UNDERARMOUR_CLIENT_SECRET = CFG['underarmour_client_secret']
UNDERARMOUR_CLIENT_KEY = CFG['underarmour_client_key']
UNDERARMOUR_REDIRECT_URI = CFG['underarmour_callback']
#UNDERARMOUR_REDIRECT_URI = "http://rowsandall.com/underarmour_callback"
#UNDERARMOUR_REDIRECT_URI = "http://localhost:8000/underarmour_callback"
# UNDERARMOUR_REDIRECT_URI = "http://rowsandall.com/underarmour_callback"
# UNDERARMOUR_REDIRECT_URI = "http://localhost:8000/underarmour_callback"
# TrainingPeaks
TP_CLIENT_ID = CFG["tp_client_id"]
@@ -355,56 +349,56 @@ RQ_QUEUES = {
'HOST': 'localhost',
'PORT': 6379,
'DB': 0,
# 'PASSWORD': 'some-password',
# 'PASSWORD': 'some-password',
'DEFAULT_TIMEOUT': 360,
},
'low': {
'HOST': 'localhost',
'PORT': 6379,
'DB': 0,
# 'PASSWORD': 'some-password',
# 'PASSWORD': 'some-password',
'DEFAULT_TIMEOUT': 360,
},
'high': {
'HOST': 'localhost',
'PORT': 6379,
'DB': 0,
# 'PASSWORD': 'some-password',
# 'PASSWORD': 'some-password',
'DEFAULT_TIMEOUT': 360,
},
}
#SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
#SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
# SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
# SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
SESSION_ENGINE = "django.contrib.sessions.backends.cache"
SESSION_SAVE_EVERY_REQUEST = True
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
# admin stuff for error reporting
SERVER_EMAIL='admin@rowsandall.com'
ADMINS = [('Sander','roosendaalsander@gmail.com')]
SERVER_EMAIL = 'admin@rowsandall.com'
ADMINS = [('Sander', 'roosendaalsander@gmail.com')]
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': 'localhost:11211',
'TIMEOUT': 900,
}
}
}
CACHE_MIDDLEWARE_ALIAS = 'default'
CACHE_MIDDLEWARE_SECONDS = 900
# email stuff
#EMAIL_BACKEND = CFG['email_backend']
#EMAIL_HOST = CFG['email_host']
#EMAIL_PORT = CFG['email_port']
#EMAIL_HOST_USER = CFG['email_host_user']
#EMAIL_HOST_PASSWORD = CFG['email_host_password']
#EMAIL_USE_TLS = CFG['email_use_tls']
#DEFAULT_FROM_EMAIL = 'admin@rowsandall.com'
# EMAIL_BACKEND = CFG['email_backend']
# EMAIL_HOST = CFG['email_host']
# EMAIL_PORT = CFG['email_port']
# EMAIL_HOST_USER = CFG['email_host_user']
# EMAIL_HOST_PASSWORD = CFG['email_host_password']
# EMAIL_USE_TLS = CFG['email_use_tls']
# DEFAULT_FROM_EMAIL = 'admin@rowsandall.com'
EMAIL_BACKEND = 'django_ses.SESBackend'
@@ -413,7 +407,7 @@ AWS_SES_REGION_ENDPOINT = CFG['aws_smtp']
AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id']
AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
AWS_ACCESS_KEY_ID = CFG['aws_access_key_id']
AWS_ACCESS_KEY_ID = CFG['aws_access_key_id']
AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
EMAIL_HOST = CFG['aws_smtp']
@@ -441,7 +435,7 @@ OAUTH2_PROVIDER = {
'APPLICATION_MODEL': 'oauth2_provider.Application',
'REFRESH_TOKEN_MODEL': 'oauth2_provider.RefreshToken',
'ACCESS_TOKEN_EXPIRE_SECONDS': 36000,
#'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore'
# 'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore'
}
@@ -452,38 +446,38 @@ REST_FRAMEWORK = {
# or allow read-only access for unauthenticated users.
'DEFAULT_PERMISSION_CLASSES': [
'rest_framework.permissions.IsAuthenticated'
# 'rest_framework.permissions.DjangoModelPermissions'
# 'rest_framework.permissions.DjangoModelPermissions'
],
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.BasicAuthentication',
# 'rest_framework.authentication.SessionAuthentication',
# 'rest_framework.authentication.TokenAuthentication',
# 'rest_framework.authentication.SessionAuthentication',
# 'rest_framework.authentication.TokenAuthentication',
'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
),
'PAGE_SIZE': 20,
'DEFAULT_PAGINATION_CLASS':'rest_framework.pagination.LimitOffsetPagination',
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
}
SWAGGER_SETTINGS = {
'SECURITY_DEFINITIONS': {
'basic': {
'type':'basic'
},
'type': 'basic'
},
'oauth2': {
'type':'oauth2',
'authorizationUrl':'/rowers/o/authorize',
'type': 'oauth2',
'authorizationUrl': '/rowers/o/authorize',
'flow': 'implicit',
},
'api_key': {
},
'api_key': {
'type': 'apiKey',
'in': 'header',
'name': 'Authorization'
},
},
},
'SHOW_REQUEST_HEADERS': True,
'USE_SESSION_AUTH': True,
'JSON_EDITOR': True,
}
}
# Analytics
@@ -517,75 +511,75 @@ except KeyError:
try:
BRAINTREE_MERCHANT_ID = CFG['braintree_merchant_id']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
BRAINTREE_MERCHANT_ID = ''
try:
BRAINTREE_MERCHANT_ACCOUNT_ID = CFG['braintree_merchant_account_id']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
BRAINTREE_MERCHANT_ACCOUNT_ID = 'rowsandallEUR'
try:
BRAINTREE_PUBLIC_KEY = CFG['braintree_public_key']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
BRAINTREE_PUBLIC_KEY = ''
try:
BRAINTREE_PRIVATE_KEY = CFG['braintree_private_key']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
BRAINTREE_PRIVATE_KEY = ''
try:
BRAINTREE_SANDBOX_MERCHANT_ID = CFG['braintree_sandbox_merchant_id']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
BRAINTREE_SANDBOX_MERCHANT_ID = ''
try:
BRAINTREE_SANDBOX_PUBLIC_KEY = CFG['braintree_sandbox_public_key']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
BRAINTREE_SANDBOX_PUBLIC_KEY = ''
try:
BRAINTREE_SANDBOX_PRIVATE_KEY = CFG['braintree_sandbox_private_key']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
BRAINTREE_SANDBOX_PRIVATE_KEY = ''
try:
PAYMENT_PROCESSING_ON = CFG['payment_processing_on']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
PAYMENT_PROCESSING_ON = False
try:
FAKTUROID_API_KEY = CFG['fakturoid_api_key']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
FAKTUROID_API_KEY = ''
try:
FAKTUROID_EMAIL = CFG['fakturoid_email']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
FAKTUROID_EMAIL = ''
try:
FAKTUROID_SLUG = CFG['fakturoid_slug']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
FAKTUROID_SLUG = ''
# ID obfuscation
try:
OPAQUE_SECRET_KEY = CFG['opaque_secret_key']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
OPAQUE_SECRET_KEY = 0xa193443a
# Celery or RQ
try:
CELERY = CFG['use_celery']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
CELERY = False
try:
WORKOUTS_FIT_TOKEN = CFG['workouts_fit_token']
WORKOUTS_FIT_URL = CFG['workouts_fit_url']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
WORKOUTS_FIT_TOKEN = 'aapnootmies'
WORKOUTS_FIT_URL = 'http://localhost:50053/tojson'
@@ -594,10 +588,15 @@ except KeyError: # pragma: no cover
try:
RECAPTCHA_SITE_KEY = CFG['recaptcha_site_key']
RECAPTCHA_SITE_SECRET = CFG['recaptcha_site_secret']
except KeyError: # pragma: no cover
except KeyError: # pragma: no cover
RECAPTCHA_SITE_KEY = ''
RECAPTCHA_SITE_SECRET = ''
GEOIP_PATH = STATIC_ROOT
TAGGIT_CASE_INSENSITIVE = True
try:
MYLOGGING = CFG['logging']
except KeyError:
MYLOGGING = {}