diff --git a/Makefile b/Makefile index 9e494ed..42b90d6 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ .SHELLFLAGS := -ec prod: - docker compose down + docker compose --env-file .env -f ./compose.yaml -f ./.docker-compose-files/compose.prod.yaml down docker compose --env-file .env -f ./compose.yaml -f ./.docker-compose-files/compose.prod.yaml up -d --build docker compose exec web python manage.py collectstatic --noinput docker compose exec web python manage.py check --deploy docker compose exec web python manage.py migrate dev: - docker compose down + docker compose -f ./compose.yaml -f ./.docker-compose-files/compose.dev.yaml down docker compose -f ./compose.yaml -f ./.docker-compose-files/compose.dev.yaml up --build -d docker compose exec web python manage.py collectstatic --noinput docker compose exec -it web sh diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index e25a967..8c1ef85 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -2,21 +2,40 @@ This document contains the wanted feature list and their current state. -## Basic Pages +## Basic Templates +- [] Nav-bar ~ Adjust based on permission status +- [] Low-bar ~ KVK etc. +- [] Basic page layout + +## Pages + +### Must - [] Homepage -- [] Boards -- [] Committee page -- [] Contact page -- [] Donator page/Friends of Quatsh -- [] Membership page +- [] Signups +- [] Contact +- [] Contribution-Cost -## Main Features +### Should +- [] Login page +- [] Gallery +- [] Boards + +### Could +- [] Committee page +- [] Donator page/Friends of Quatsh + +## Features - [] Signup form with email SMTP link. - [] Gallery - [] Login page +## Security + +- [] SSL implementation +- [] ACME SSL certificate + ## Extra's - [] Allow google-workspace login with SSO? @@ -24,3 +43,18 @@ This document contains the wanted feature list and their current state. - [] Add [Celery](https://docs.celeryq.dev/en/stable/index.html#) for async background-[task](https://docs.djangoproject.com/en/6.0/topics/tasks/) completion. - [] Setup SMTP with automatic switching to in-mem email saving OR print to stdout when in DEBUG mode. - [] Split-Storage setup for authenticated-only file access, such as private gallery pictures. + +## Priority List + +- [] General layout template +- [] Nav-bar +- [] Homepage +- [] Lower-bar ~ KVK +- [] Signups page +- [] Calender (Google calender) +- [] Gallery +- [] CCP page +- [] Contact page +- [] Boards +- [] Committee page +- [] Donator page/Friends of Quatsh diff --git a/docs/installation_faq.md b/docs/installation_faq.md index c0734f9..3774119 100644 --- a/docs/installation_faq.md +++ b/docs/installation_faq.md @@ -20,3 +20,12 @@ After running this command a Django Migration has to be run to remake the tables ``` shell docker exec quatsh-website-web-1 python manage.py migrate ``` + +## Make - errors + +If you see an error looking as follows docker isn't actually running. +``` +PS C:\*\Quatsh-Website> docker compose ls +error during connect: Get "http://%2F%2F.%2Fpipe%2FdockerDesktopLinuxEngine/v1.50/containers/json?filters=%7B%22label%22%3A%7B%22com.docker.compose.config-hash%22%3Atrue%2C%22com.docker.compose.project%22%3Atrue%7D%7D": open //./pipe/dockerDesktopLinuxEngine: The system cannot find the file specified. +``` +