fix: merge conflicts

SELab-2 · May 13, 2024 · ac76138 · ac76138
2 parents c34a7f7 + 6f6aba3
commit ac76138
Show file tree

Hide file tree

Showing 227 changed files with 7,954 additions and 3,055 deletions.
diff --git a/.dev.env b/.dev.env
@@ -7,13 +7,15 @@ TZ=Europe/Brussels
 DATA_DIR="./data"
 BACKEND_DIR="./backend"
 FRONTEND_DIR="./frontend"
+DOCS_DIR="./docs"
 SSL_DIR="./data/nginx/ssl"
 
 # Redis
 REDIS_PORT=6379
 
 # Django
 DJANGO_SECRET_KEY=""
+DJANGO_ROOT_DIR=""
 DJANGO_DEBUG=True
 DJANGO_DOMAIN_NAME=localhost
 DJANGO_CAS_URL_PREFIX=""

diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,6 @@ frontend/cypress/videos/*
 !data/nginx/nginx.dev.conf
 !data/nginx/nginx.test.conf
 !data/nginx/nginx.prod.conf
+
+docs/.vitepress/dist
+docs/.vitepress/cache
diff --git a/.prod.env b/.prod.env
@@ -7,6 +7,7 @@ TZ=Europe/Brussels
 DATA_DIR="./data"
 BACKEND_DIR="./backend"
 FRONTEND_DIR="./frontend"
+DOCS_DIR="./docs"
 SSL_DIR=""
 
 # Postgress DB
@@ -20,6 +21,7 @@ REDIS_PORT=6379
 
 # Django
 DJANGO_SECRET_KEY=""
+DJANGO_ROOT_DIR=""
 DJANGO_DEBUG=False
 DJANGO_DOMAIN_NAME=""
 DJANGO_CAS_URL_PREFIX=""

diff --git a/backend/.flake8 b/backend/.flake8
@@ -1,15 +1,17 @@
 [flake8]
 
-# Ignore unused imports
-ignore = F401
+# Ignore unused imports; W503 and W504 conflict with each-other
+ignore =    F401
+            W504
+            W503
+            C901
 
 max-line-length = 125
 
 max-complexity = 10
 
-exclude = .git, 
-          __pycache__,
-          .venv,
-          venv,
-          migrations
-
+exclude =   .git,
+            __pycache__,
+            .venv,
+            venv,
+            migrations
diff --git a/backend/api/fixtures/large/large.json b/backend/api/fixtures/large/large.json
diff --git a/backend/api/fixtures/medium/medium.json b/backend/api/fixtures/medium/medium.json