Merge branch 'master' into StudentEval

.gitignore

@@ -361,7 +361,8 @@ MigrationBackup/
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
-/venv/
+venv*
+.venv-main*
 
 
 Reskreen/server_config.py

Reskreen/settings.py

@@ -1,4 +1,4 @@
-"""
+"""
 Django settings for Reskreen project.
 
 Generated by 'django-admin startproject' using Django 4.0.
@@ -21,11 +21,10 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
 
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-j4jd&+4j^t_=@zr(#q@n!8e*58vkql6&_6w-t14ju8pw%ei%^s'
+
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = cfg_dev_mode
 
 
 ALLOWED_HOSTS = ["rh.ambulance-clerc.ch"]
@@ -55,6 +54,8 @@ INSTALLED_APPS = [
     'django_summernote',    
 ]
 
+LANGUAGE_CODE = 'fr-CH'
+
 if not cfg_dev_mode:
     INSTALLED_APPS.append('nextcloud.apps.NextcloudConfig')
 
@@ -103,6 +104,7 @@ DATA_UPLOAD_MAX_NUMBER_FIELDS = 2500
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -110,6 +112,8 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django_autologin.middleware.AutomaticLoginMiddleware',
+    'language.DefaultLanguageMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
 ]
 
 ROOT_URLCONF = 'Reskreen.urls'
@@ -201,11 +205,12 @@ USE_L10N = False
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
 
-STATIC_URL = 'static/'
+STATIC_URL = '/static/'
 
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, "static"),
 ]
+STATIC_ROOT = "/var/www/reskreen/static"
 
 
 # Default primary key field type
@@ -378,6 +383,11 @@ JAZZMIN_UI_TWEAKS = {
     },
 }
 
+
+# Simplified static file serving.
+# https://pypi.org/project/whitenoise/
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+
 if cfg_dev_mode:
     NEXTCLOUD_HOST = "cloud.ambulance-clerc.ch"
 else:

requirements.txt

@@ -1,5 +1,5 @@
 arabic-reshaper==2.1.3
-asgiref==3.4.1
+asgiref==3.7.2
 asn1crypto==1.5.1
 Brotli==1.0.9
 caldav==0.9.1
@@ -10,17 +10,15 @@ click==8.1.3
 colorama==0.4.4
 cryptography==37.0.1
 cssselect2==0.4.1
-Django==4.0
-django-admin-rangefilter==0.8.3
-django-baton==2.2.3
-fonttools==4.29.1
+Django
+django-admin-rangefilter
 fpdf==1.7.2
 future==0.18.2
 html5lib==1.1
 icalendar==4.0.9
 idna==3.3
-lxml==4.8.0
-mysqlclient==2.1.0
+lxml
+# mysqlclient==2.1.0
 oscrypto==1.3.0
 pdfkit==1.0.0
 Pillow==9.0.1
@@ -57,3 +55,6 @@ zopfli==0.1.9
 django-autologin
 django-summernote
 django-jazzmin
+django-default-language
+gunicorn
+whitenoise