diff --git a/SciPost_v1/__settings.py b/SciPost_v1/__settings.py
deleted file mode 100644
index 9c9c14867438a7d096c4c664dcf8975f8434dd0d..0000000000000000000000000000000000000000
--- a/SciPost_v1/__settings.py
+++ /dev/null
@@ -1,236 +0,0 @@
-"""
-Django settings for SciPost_v1 project.
-
-Generated by 'django-admin startproject' using Django 1.8.5.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.8/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.8/ref/settings/
-"""
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os
-import json
-
-from django.utils.translation import ugettext_lazy as _
-
-
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-host_settings_path = os.path.join(os.path.dirname(BASE_DIR), "scipost-host-settings.json")
-host_settings = json.load(open(host_settings_path))
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = host_settings["SECRET_KEY"]
-
-CERTFILE = host_settings["CERTFILE"]
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = host_settings["DEBUG"]
-
-# Emails for server error reporting
-ADMINS = host_settings["ADMINS"]
-MANAGERS = host_settings["MANAGERS"]
-
-ALLOWED_HOSTS = host_settings["ALLOWED_HOSTS"]
-
-# Secure proxy SSL header and secure cookies
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
-SESSION_COOKIE_SECURE = host_settings["SESSION_COOKIE_SECURE"]
-CSRF_COOKIE_SECURE = host_settings["CSRF_COOKIE_SECURE"]
-
-AUTHENTICATION_BACKENDS = (
- 'django.contrib.auth.backends.ModelBackend',
- 'guardian.backends.ObjectPermissionBackend'
- )
-
-LOGIN_URL = '/login/'
-
-GUARDIAN_RENDER_403 = True
-
-# Session expire at browser close
-SESSION_EXPIRE_AT_BROWSER_CLOSE = True
-
-# Wsgi scheme
-os.environ['wsgi.url_scheme'] = 'https'
-
-# Application definition
-
-INSTALLED_APPS = (
- 'django.contrib.admin',
- 'django.contrib.admindocs',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'django_countries',
- 'django_extensions',
- 'django_mathjax',
- 'captcha',
- 'crispy_forms',
- 'guardian',
- 'haystack',
- 'rest_framework',
- 'sphinxdoc',
- 'commentaries',
- 'comments',
- 'journals',
- 'scipost',
- 'submissions',
- 'theses',
- 'webpack_loader'
-)
-
-HAYSTACK_CONNECTIONS = {
- 'default': {
- 'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
- 'PATH': host_settings['HAYSTACK_PATH'],
- },
-}
-
-SPHINXDOC_BASE_TEMPLATE = 'scipost/base.html'
-SPHINXDOC_PROTECTED_PROJECTS = {
- 'scipost': ['scipost.can_view_docs_scipost'],
-}
-
-CAPTCHA_CHALLENGE_FUNCT = 'captcha.helpers.math_challenge'
-CAPTCHA_LETTER_ROTATION = (-15, 15)
-CAPTCHA_NOISE_FUNCTIONS = ('captcha.helpers.noise_dots',)
-
-SHELL_PLUS_POST_IMPORTS = (
- ('theses.factories', ('ThesisLinkFactory')),
- ('comments.factories', ('CommentFactory')),
- ('submissions.factories', ('SubmissionFactory', 'EICassignedSubmissionFactory')),
- ('commentaries.factories',
- ('EmptyCommentaryFactory',
- 'VettedCommentaryFactory',
- 'UnvettedCommentaryFactory',
- 'UnpublishedVettedCommentaryFactory',)),
-)
-
-MATHJAX_ENABLED = True
-MATHJAX_CONFIG_DATA = {
- "tex2jax": {
- "inlineMath": [['$', '$'], ['\\(', '\\)']],
- "processEscapes": True
- }
- }
-
-MIDDLEWARE_CLASSES = (
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.locale.LocaleMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- 'django.middleware.clickjacking.XFrameOptionsMiddleware',
- 'django.middleware.security.SecurityMiddleware',
-)
-
-ROOT_URLCONF = 'SciPost_v1.urls'
-
-TEMPLATES = [
- {
- 'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join(BASE_DIR, 'templates')],
- 'APP_DIRS': True,
- 'OPTIONS': {
- 'context_processors': [
- 'django.template.context_processors.debug',
- 'django.template.context_processors.request',
- 'django.template.context_processors.i18n',
- 'django.template.context_processors.media',
- 'django.contrib.auth.context_processors.auth',
- 'django.contrib.messages.context_processors.messages',
- 'scipost.context_processors.searchform',
- ],
- },
- },
-]
-
-WSGI_APPLICATION = 'SciPost_v1.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': host_settings["DB_NAME"],
- 'USER': host_settings["DB_USER"],
- 'PASSWORD': host_settings["DB_PWD"],
- 'HOST': '127.0.0.1',
- 'PORT': '5432',
- }
-}
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.8/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-LANGUAGES = (
- ('en', _('English')),
-)
-LOCALE_PATHS = (
- os.path.join(BASE_DIR, 'locale'),
-)
-TIME_ZONE = 'CET'
-
-USE_I18N = True
-
-USE_L10N = False
-DATE_FORMAT = 'Y-m-d'
-DATETIME_FORMAT = 'Y-m-d H:i'
-
-USE_TZ = True
-
-# MEDIA
-MEDIA_ROOT = host_settings['MEDIA_ROOT']
-MEDIA_URL = host_settings['MEDIA_URL']
-MAX_UPLOAD_SIZE = "1310720" # Default max attachment size in Bytes
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.8/howto/static-files/
-
-STATIC_URL = host_settings["STATIC_URL"]
-STATIC_ROOT = host_settings["STATIC_ROOT"]
-STATICFILES_DIRS = (
- os.path.join(BASE_DIR, 'static_bundles'),
-)
-
-# Webpack handling the static bundles
-WEBPACK_LOADER = {
- 'DEFAULT': {
- 'CACHE': not DEBUG,
- 'BUNDLE_DIR_NAME': host_settings["STATIC_ROOT"] + 'bundles/',
- 'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats.json'),
- 'POLL_INTERVAL': 0.1,
- 'TIMEOUT': None,
- 'IGNORE': ['.+\.hot-update.js', '.+\.map']
- }
-}
-
-# Email
-EMAIL_BACKEND = host_settings["EMAIL_BACKEND"]
-EMAIL_FILE_PATH = host_settings["EMAIL_FILE_PATH"]
-EMAIL_HOST = host_settings["EMAIL_HOST"]
-EMAIL_HOST_USER = host_settings["EMAIL_HOST_USER"]
-EMAIL_HOST_PASSWORD = host_settings["EMAIL_HOST_PASSWORD"]
-DEFAULT_FROM_EMAIL = host_settings["DEFAULT_FROM_EMAIL"]
-SERVER_EMAIL = host_settings["SERVER_EMAIL"]
-
-
-# Own settings
-JOURNALS_DIR = host_settings["JOURNALS_DIR"]
-
-CROSSREF_LOGIN_ID = host_settings["CROSSREF_LOGIN_ID"]
-CROSSREF_LOGIN_PASSWORD = host_settings["CROSSREF_LOGIN_PASSWORD"]
diff --git a/SciPost_v1/settings/base.py b/SciPost_v1/settings/base.py
index d454b4c5416d1a6d186483c141e1d21ebbf6aed8..ec132d3dd4453c2710cf181d9fbda302e98005c3 100644
--- a/SciPost_v1/settings/base.py
+++ b/SciPost_v1/settings/base.py
@@ -233,6 +233,6 @@ CROSSREF_LOGIN_ID = ''
CROSSREF_LOGIN_PASSWORD = ''
# Google reCaptcha
-RECAPTCHA_PUBLIC_KEY = get_secret("GOOGLE_RECAPTCHA_PUBLIC_KEY")
-RECAPTCHA_PRIVATE_KEY = get_secret("GOOGLE_RECAPTCHA_PRIVATE_KEY")
+RECAPTCHA_PUBLIC_KEY = ''
+RECAPTCHA_PRIVATE_KEY = ''
NOCAPTCHA = True
diff --git a/SciPost_v1/settings/production.py b/SciPost_v1/settings/production.py
index 8f7644123f9e5aef19caa640b73dd60bd8934a06..eca480636f82799460b375205fe268077e53affd 100644
--- a/SciPost_v1/settings/production.py
+++ b/SciPost_v1/settings/production.py
@@ -3,18 +3,20 @@ from .base import *
# THE MAIN THING HERE
DEBUG = False
CERTFILE = get_secret("CERTFILE")
+ALLOWED_HOSTS = ['www.scipost.org', 'scipost.org']
# Static and media
STATIC_URL = 'https://scipost.org/static/'
STATIC_ROOT = '/home/jscaux/webapps/scipost_static/'
MEDIA_URL = 'https://scipost.org/media/'
MEDIA_ROOT = '/home/jscaux/webapps/scipost_media/'
-WEBPACK_LOADER = {
- 'DEFAULT': {
- 'CACHE': True,
- 'BUNDLE_DIR_NAME': '/home/jscaux/webapps/scipost_static/bundles/',
- }
-}
+
+# Recaptcha
+RECAPTCHA_PUBLIC_KEY = get_secret("GOOGLE_RECAPTCHA_PUBLIC_KEY")
+RECAPTCHA_PRIVATE_KEY = get_secret("GOOGLE_RECAPTCHA_PRIVATE_KEY")
+
+WEBPACK_LOADER['DEFAULT']['CACHE'] = True
+WEBPACK_LOADER['DEFAULT']['BUNDLE_DIR_NAME'] = '/home/jscaux/webapps/scipost_static/bundles/'
# Error reporting
ADMINS = MANAGERS = (('J.S.Caux', 'J.S.Caux@uva.nl'), )
@@ -26,7 +28,7 @@ CSRF_COOKIE_SECURE = True
# Email
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = get_secret("EMAIL_HOST_USER")
+EMAIL_HOST = get_secret("EMAIL_HOST")
EMAIL_HOST_USER = get_secret("EMAIL_HOST_USER")
EMAIL_HOST_PASSWORD = get_secret("EMAIL_HOST_PASSWORD")
diff --git a/SciPost_v1/settings/staging_release.py b/SciPost_v1/settings/staging_release.py
index 08399d3bd352d3c427703c7f9e6f0e3bcab52d15..74bfb6ed80ee434084ee0fd36f6bc9f1813af50c 100644
--- a/SciPost_v1/settings/staging_release.py
+++ b/SciPost_v1/settings/staging_release.py
@@ -5,18 +5,20 @@ from .base import *
# THE MAIN THING HERE
DEBUG = False
+ALLOWED_HOSTS = ['jdewit.webfactional.com']
+
+# Recaptcha
+RECAPTCHA_PUBLIC_KEY = get_secret("GOOGLE_RECAPTCHA_PUBLIC_KEY")
+RECAPTCHA_PRIVATE_KEY = get_secret("GOOGLE_RECAPTCHA_PRIVATE_KEY")
# Static and media
STATIC_URL = '/static/'
STATIC_ROOT = '/home/jdewit/webapps/scipost_static/'
MEDIA_URL = '/media/'
MEDIA_ROOT = '/home/jdewit/webapps/scipost_media/'
-WEBPACK_LOADER = {
- 'DEFAULT': {
- 'CACHE': True,
- 'BUNDLE_DIR_NAME': '/home/jdewit/webapps/scipost_static/bundles/',
- }
-}
+
+WEBPACK_LOADER['DEFAULT']['CACHE'] = True
+WEBPACK_LOADER['DEFAULT']['BUNDLE_DIR_NAME'] = '/home/jdewit/webapps/scipost_static/bundles/'
# Error reporting
ADMINS = MANAGERS = (('J. de Wit', 'jorrandewit@outlook.com'), )
diff --git a/scipost/static/scipost/assets/config/preconfig.scss b/scipost/static/scipost/assets/config/preconfig.scss
index e19eda442bfb4966be75761eb61a333ea5bf16fd..f42196c54f4b213910ad48974fb68c15c601b79a 100644
--- a/scipost/static/scipost/assets/config/preconfig.scss
+++ b/scipost/static/scipost/assets/config/preconfig.scss
@@ -6,11 +6,12 @@
//
$grid-gutter-width-base: 20px;
$container-max-widths: (
- sm: 546px,
- md: 738px,
- lg: 962px,
- xl: 1170px
+ sm: 768px,
+ md: 992px,
+ lg: 1200px,
+ xl: 1240px
);
+
.row {
margin-bottom: 1rem;
}