From 6d90986e8fd7252285c3aacf2583323e6b1c55db Mon Sep 17 00:00:00 2001 From: Niko Abeler Date: Tue, 13 Jun 2023 21:14:02 +0200 Subject: [PATCH] deployment + todos --- .dockerignore | 160 ++++++++++++++++++++++++++ Dockerfile | 3 + TODO.md | 9 ++ guild/urls.py | 4 +- guild_journal/settings/development.py | 2 +- guild_journal/settings/production.py | 8 +- 6 files changed, 181 insertions(+), 5 deletions(-) create mode 100644 .dockerignore create mode 100644 TODO.md diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..6769e21 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,160 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 43fbea9..2a98393 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM python:3.11-alpine +ENV PYTHONUNBUFFERED 1 + + WORKDIR /app COPY requirements.txt . diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..ba3d390 --- /dev/null +++ b/TODO.md @@ -0,0 +1,9 @@ + +- Better character selection in session edit/create +- Bigger default summary input +- Preview Markdown in summary input +- add player to charater in session list and edit/create + - {{charater}} ({{player}}) +- add list of npcs +- status of character + - alive, dead, retired, unknown \ No newline at end of file diff --git a/guild/urls.py b/guild/urls.py index 17280af..79eccc6 100644 --- a/guild/urls.py +++ b/guild/urls.py @@ -7,9 +7,9 @@ from django.contrib.auth import views as auth_views urlpatterns = [ path("", views.HomeView.as_view(), name="home"), - path("acounnt/login/", auth_views.LoginView.as_view(next_page="/"), name="login"), + path("accounts/login/", auth_views.LoginView.as_view(next_page="/"), name="login"), path( - "account/logout/", + "accounts/logout/", auth_views.LogoutView.as_view( template_name="registration/logout.html", ), diff --git a/guild_journal/settings/development.py b/guild_journal/settings/development.py index fc6adeb..90a837f 100644 --- a/guild_journal/settings/development.py +++ b/guild_journal/settings/development.py @@ -8,7 +8,7 @@ SECRET_KEY = "django-insecure-e*p%e)pwf+-ntt4wpn-^^7-0yq)!cjo*om18vy77-=*c0jjfqa # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["*"] # Database diff --git a/guild_journal/settings/production.py b/guild_journal/settings/production.py index 6a82ed6..9916afd 100644 --- a/guild_journal/settings/production.py +++ b/guild_journal/settings/production.py @@ -1,3 +1,4 @@ +import os from pathlib import Path BASE_DIR = Path(__file__).resolve().parent.parent.parent @@ -6,9 +7,12 @@ BASE_DIR = Path(__file__).resolve().parent.parent.parent SECRET_KEY = "django-insecure-e*p%e)pwf+-ntt4wpn-^^7-0yq)!cjo*om18vy77-=*c0jjfqa" # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True -ALLOWED_HOSTS = ["*"] +ALLOWED_HOSTS = os.environ.get("DJANGO_HOST").split(",") +CSRF_TRUSTED_ORIGINS = [ + "https://" + host for host in os.environ.get("DJANGO_HOST").split(",") +] # Database