Compare commits
No commits in common. "main" and "master" have entirely different histories.
|
@ -1,10 +0,0 @@
|
||||||
*
|
|
||||||
.*
|
|
||||||
*/.*
|
|
||||||
|
|
||||||
!src/
|
|
||||||
!requirements.txt
|
|
||||||
!requirements/
|
|
||||||
!entrypoint.sh
|
|
||||||
!pyproject.toml
|
|
||||||
!README.md
|
|
20
.drone.yml
20
.drone.yml
|
@ -7,19 +7,27 @@ steps:
|
||||||
- name: docker
|
- name: docker
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
environment:
|
environment:
|
||||||
BUILD: "${DRONE_COMMIT_SHA}"
|
DJANGO_ENV: production
|
||||||
settings:
|
settings:
|
||||||
repo: docker.data.coop/membersystem
|
repo: docker.data.coop/member.data.coop
|
||||||
registry: docker.data.coop
|
registry: docker.data.coop
|
||||||
username:
|
username:
|
||||||
from_secret: DOCKER_USERNAME
|
from_secret: DOCKER_USERNAME
|
||||||
password:
|
password:
|
||||||
from_secret: DOCKER_PASSWORD
|
from_secret: DOCKER_PASSWORD
|
||||||
build_args_from_env:
|
|
||||||
- BUILD
|
|
||||||
tags:
|
tags:
|
||||||
- "${DRONE_BUILD_NUMBER}"
|
- "${DRONE_BUILD_NUMBER}"
|
||||||
- "latest"
|
- "vidir_refactor"
|
||||||
when:
|
when:
|
||||||
branch:
|
branch:
|
||||||
- main
|
- vidir_refactor
|
||||||
|
|
||||||
|
# - name: notify
|
||||||
|
# image: plugins/matrix
|
||||||
|
# settings:
|
||||||
|
# homeserver: https://data.coop
|
||||||
|
# roomid: plKSghHbepWeUEtbHE:data.coop
|
||||||
|
# username:
|
||||||
|
# from_secret: matrix_username
|
||||||
|
# password:
|
||||||
|
# from_secret: matrix_password
|
||||||
|
|
10
.env.example
10
.env.example
|
@ -1,10 +0,0 @@
|
||||||
SECRET_KEY=something-very-random
|
|
||||||
POSTGRES_HOST=postgres
|
|
||||||
POSTGRES_PASSWORD=postgres
|
|
||||||
POSTGRES_PORT=5432
|
|
||||||
DATABASE_URL=postgres://postgres:postgres@postgres:5432/postgres
|
|
||||||
# Use something along the the following if you are not using docker
|
|
||||||
# DATABASE_URL=postgres://postgres:postgres@localhost:5432/datacoop_membersystem
|
|
||||||
DEBUG=True
|
|
||||||
STRIPE_API_KEY=sk_test_
|
|
||||||
STRIPE_ENDPOINT_SECRET=whsec_
|
|
7
.gitignore
vendored
7
.gitignore
vendored
|
@ -5,10 +5,3 @@ db.sqlite3
|
||||||
.pytest_cache
|
.pytest_cache
|
||||||
.idea/
|
.idea/
|
||||||
*.mo
|
*.mo
|
||||||
.env
|
|
||||||
venv/
|
|
||||||
.venv/
|
|
||||||
|
|
||||||
|
|
||||||
# collectstatic
|
|
||||||
src/static/
|
|
||||||
|
|
|
@ -1,37 +1,23 @@
|
||||||
default_language_version:
|
|
||||||
python: python3
|
|
||||||
exclude: ^.*\b(migrations)\b.*$
|
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
- repo: git://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v4.6.0
|
rev: v2.3.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: check-ast
|
- id: trailing-whitespace
|
||||||
- id: check-merge-conflict
|
- id: flake8
|
||||||
- id: check-case-conflict
|
args: [--max-line-length=120, --exclude=*/migrations/*]
|
||||||
- id: detect-private-key
|
- id: check-yaml
|
||||||
- id: check-added-large-files
|
- id: check-added-large-files
|
||||||
- id: check-json
|
- id: debug-statements
|
||||||
- id: check-symlinks
|
- id: end-of-file-fixer
|
||||||
- id: check-toml
|
- id: check-toml
|
||||||
- id: end-of-file-fixer
|
- repo: https://github.com/asottile/reorder_python_imports
|
||||||
- id: trailing-whitespace
|
rev: v1.6.1
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
hooks:
|
||||||
rev: 'v0.5.2'
|
- id: reorder-python-imports
|
||||||
hooks:
|
types: [file, python]
|
||||||
- id: ruff
|
- repo: https://github.com/psf/black
|
||||||
args:
|
rev: stable
|
||||||
- --fix
|
hooks:
|
||||||
- id: ruff-format
|
- id: black
|
||||||
- repo: https://github.com/asottile/pyupgrade
|
language: python
|
||||||
rev: v3.16.0
|
types: [file, python]
|
||||||
hooks:
|
|
||||||
- id: pyupgrade
|
|
||||||
args:
|
|
||||||
- --py311-plus
|
|
||||||
exclude: migrations/
|
|
||||||
- repo: https://github.com/adamchainz/django-upgrade
|
|
||||||
rev: 1.19.0
|
|
||||||
hooks:
|
|
||||||
- id: django-upgrade
|
|
||||||
args:
|
|
||||||
- --target-version=5.0
|
|
||||||
|
|
52
Dockerfile
52
Dockerfile
|
@ -1,33 +1,16 @@
|
||||||
FROM python:3.12-slim-bookworm
|
FROM python:3.9-slim-buster
|
||||||
|
|
||||||
# PYTHONFAULTHANDLER: Propagate tracebacks from all threads.
|
|
||||||
# PYTHONUNBUFFERED: Write terminal output straight to docker (to not confuse Docker Compose).
|
|
||||||
# PYTHONDONTWRITEBYTECODE: Dont write *pyc files at all, making it possible for a 100% read-only container.
|
|
||||||
# PIP_NO_CACHE_DIR: Disable PIP cache, we don't need pip's cache after building the image.
|
|
||||||
# PIP_DISABLE_PIP_VERSION_CHECK: Build the image with the available pip, do not check for updates (faster!)
|
|
||||||
# PIP_DEFAULT_TIMEOUT: Allow for longer timeouts.
|
|
||||||
ENV PYTHONFAULTHANDLER=1 \
|
ENV PYTHONFAULTHANDLER=1 \
|
||||||
PYTHONUNBUFFERED=1 \
|
PYTHONUNBUFFERED=1 \
|
||||||
PYTHONDONTWRITEBYTECODE=1 \
|
PYTHONDONTWRITEBYTECODE=1 \
|
||||||
PIP_NO_CACHE_DIR=1 \
|
PYTHONHASHSEED=random \
|
||||||
|
PIP_NO_CACHE_DIR=off \
|
||||||
PIP_DISABLE_PIP_VERSION_CHECK=on \
|
PIP_DISABLE_PIP_VERSION_CHECK=on \
|
||||||
PIP_DEFAULT_TIMEOUT=100
|
PIP_DEFAULT_TIMEOUT=100 \
|
||||||
ARG BUILD
|
POETRY_VERSION=1.1.4
|
||||||
ENV BUILD=${BUILD}
|
|
||||||
ARG REQUIREMENTS_FILE=requirements.txt
|
|
||||||
|
|
||||||
WORKDIR /app
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y \
|
||||||
RUN groupadd -g 1000 www && useradd -u 1000 -ms /bin/bash -g www www
|
|
||||||
|
|
||||||
# Only copy the requirements file first to leverage Docker cache
|
|
||||||
RUN mkdir requirements/
|
|
||||||
COPY $REQUIREMENTS_FILE $REQUIREMENTS_FILE
|
|
||||||
|
|
||||||
RUN mkdir -p /app/src/static && \
|
|
||||||
chown www:www /app/src/static && \
|
|
||||||
apt-get update && \
|
|
||||||
apt-get install -y \
|
|
||||||
binutils \
|
binutils \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
build-essential \
|
build-essential \
|
||||||
|
@ -38,13 +21,24 @@ RUN mkdir -p /app/src/static && \
|
||||||
libgdk-pixbuf2.0-0 \
|
libgdk-pixbuf2.0-0 \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
shared-mime-info \
|
shared-mime-info \
|
||||||
gettext && \
|
gettext \
|
||||||
pip install --no-cache-dir -r $REQUIREMENTS_FILE
|
&& pip install "poetry==$POETRY_VERSION"
|
||||||
|
|
||||||
# Copy the rest of the application
|
WORKDIR /app
|
||||||
COPY . .
|
|
||||||
|
|
||||||
RUN django-admin compilemessages
|
COPY poetry.lock pyproject.toml /app/
|
||||||
|
|
||||||
|
ARG DJANGO_ENV
|
||||||
|
|
||||||
|
RUN poetry export -f requirements.txt $(test "$DJANGO_ENV" != production && echo "--dev") | pip install -r /dev/stdin
|
||||||
|
|
||||||
|
RUN groupadd -g 1000 www
|
||||||
|
RUN useradd -u 1000 -ms /bin/bash -g www www
|
||||||
|
COPY --chown=www:www ./ /app/
|
||||||
|
RUN mkdir /app/src/static && chown www:www /app/src/static
|
||||||
|
|
||||||
|
ARG BUILD
|
||||||
|
ENV BUILD ${BUILD}
|
||||||
|
|
||||||
ENTRYPOINT ["./entrypoint.sh"]
|
ENTRYPOINT ["./entrypoint.sh"]
|
||||||
|
|
||||||
|
|
56
Makefile
56
Makefile
|
@ -1,29 +1,39 @@
|
||||||
.PHONY: run makemigrations migrate createsuperuser shell manage_command build requirements
|
DOCKER_COMPOSE = COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose
|
||||||
DOCKER_COMPOSE = COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose
|
DOCKER_RUN = ${DOCKER_COMPOSE} run -e UID=`id -u` -e GID=`id -g`
|
||||||
DOCKER_RUN = ${DOCKER_COMPOSE} run -u `id -u`
|
MANAGE = ${DOCKER_RUN} backend python /app/src/manage.py
|
||||||
MANAGE_EXEC = python /app/src/manage.py
|
|
||||||
MANAGE_COMMAND = ${DOCKER_RUN} app ${MANAGE_EXEC}
|
lint:
|
||||||
|
poetry run pre-commit run --all
|
||||||
|
|
||||||
run:
|
run:
|
||||||
${DOCKER_COMPOSE} up
|
${DOCKER_COMPOSE} up --build
|
||||||
|
|
||||||
makemigrations:
|
|
||||||
${MANAGE_COMMAND} makemigrations ${ARGS}
|
|
||||||
|
|
||||||
migrate:
|
|
||||||
${MANAGE_COMMAND} migrate ${ARGS}
|
|
||||||
|
|
||||||
createsuperuser:
|
|
||||||
${MANAGE_COMMAND} createsuperuser
|
|
||||||
|
|
||||||
shell:
|
|
||||||
${MANAGE_COMMAND} shell
|
|
||||||
|
|
||||||
manage_command:
|
|
||||||
${MANAGE_COMMAND} ${ARGS}
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
${DOCKER_COMPOSE} build
|
${DOCKER_COMPOSE} build
|
||||||
|
|
||||||
requirements:
|
makemessages:
|
||||||
hatch run requirements
|
${MANAGE} makemessages -a
|
||||||
|
|
||||||
|
makemigrations:
|
||||||
|
${MANAGE} makemigrations ${EXTRA_ARGS}
|
||||||
|
|
||||||
|
migrate:
|
||||||
|
${MANAGE} migrate ${EXTRA_ARGS}
|
||||||
|
|
||||||
|
createsuperuser:
|
||||||
|
${MANAGE} createsuperuser
|
||||||
|
|
||||||
|
shell:
|
||||||
|
${MANAGE} shell
|
||||||
|
|
||||||
|
manage_command:
|
||||||
|
${MANAGE} ${COMMAND}
|
||||||
|
|
||||||
|
test:
|
||||||
|
${DOCKER_RUN} backend pytest src/
|
||||||
|
|
||||||
|
add_dependency:
|
||||||
|
${DOCKER_RUN} backend poetry add --lock ${DEPENDENCY}
|
||||||
|
|
||||||
|
add_dev_dependency:
|
||||||
|
${DOCKER_RUN} backend poetry add -D --lock ${DEPENDENCY}
|
||||||
|
|
106
README.md
106
README.md
|
@ -1,105 +1,35 @@
|
||||||
# data.coop member system
|
# member.data.coop
|
||||||
|
|
||||||
## Development setup
|
## Development requirements
|
||||||
|
|
||||||
There are two ways to setup the development environment.
|
|
||||||
|
|
||||||
- Using the Docker Compose setup provided in this repository.
|
|
||||||
- Using [hatch](https://hatch.pypa.io/) in your host OS.
|
|
||||||
|
|
||||||
### Using Docker Compose
|
|
||||||
|
|
||||||
Working with the Docker Compose setup is made easy with the `Makefile` provided in the repository.
|
|
||||||
|
|
||||||
#### Requirements
|
|
||||||
|
|
||||||
- Docker
|
- Docker
|
||||||
- docker compose plugin
|
- Docker compose
|
||||||
|
- pre-commit (preferred for contributions)
|
||||||
|
|
||||||
#### Setup
|
## Start local server
|
||||||
|
|
||||||
1. Setup .env file
|
Given that the requirements above are installed, it should be as easy as:
|
||||||
|
|
||||||
An example .env file is provided in the repository. You can copy it to .env file using the following command:
|
$ make migrate
|
||||||
|
|
||||||
```bash
|
This will setup the database. Next run:
|
||||||
cp .env.example .env
|
|
||||||
```
|
|
||||||
|
|
||||||
The default values in the .env file are suitable for the docker-compose setup.
|
$ make run
|
||||||
|
|
||||||
2. Migrate
|
This will build the docker image and start the member system on http://localhost:8000.
|
||||||
|
|
||||||
```bash
|
You can create a superuser by running:
|
||||||
make migrate
|
|
||||||
```
|
|
||||||
|
|
||||||
3. Run the development server
|
$ make createsuperuser
|
||||||
|
|
||||||
```bash
|
Make migrations:
|
||||||
make run
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Building and running other things
|
$ make makemigrations
|
||||||
|
|
||||||
```bash
|
Make messages:
|
||||||
# Build the containers
|
|
||||||
make build
|
|
||||||
|
|
||||||
# Create a superuser
|
$ make makemessages
|
||||||
make createsuperuser
|
|
||||||
|
|
||||||
# Create Django migrations (after this, maybe you need to change file permissions in volume)
|
Running tests:
|
||||||
make makemigrations
|
|
||||||
```
|
|
||||||
|
|
||||||
### Using hatch
|
$ make test
|
||||||
|
|
||||||
#### Requirements
|
|
||||||
|
|
||||||
- Python 3.12 or higher
|
|
||||||
- [hatch](https://hatch.pypa.io/) (Recommended way to install is using `pipx install hatch`)
|
|
||||||
- A running PostgreSQL server
|
|
||||||
|
|
||||||
#### Setup
|
|
||||||
|
|
||||||
1. Setup .env file
|
|
||||||
|
|
||||||
An example .env file is provided in the repository. You can copy it to .env file using the following command:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cp .env.example .env
|
|
||||||
```
|
|
||||||
|
|
||||||
Edit the .env file and set the values for the environment variables, especially the database variables.
|
|
||||||
|
|
||||||
2. Run migrate
|
|
||||||
|
|
||||||
```bash
|
|
||||||
hatch run dev:migrate
|
|
||||||
```
|
|
||||||
|
|
||||||
3. Run the development server
|
|
||||||
|
|
||||||
```bash
|
|
||||||
hatch run dev:server
|
|
||||||
```
|
|
||||||
|
|
||||||
### Updating requirements
|
|
||||||
|
|
||||||
We use hatch-pip-compile. That means we have a set of loosely defined `dependencies` in `pyproject.toml` and then we can keep the exactly pinned version in our `requirements.txt` (auto-generated).
|
|
||||||
|
|
||||||
To generate `requirements.txt` and `requirements/requirements-dev.txt`, run the following command:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Build requirements.txt etc
|
|
||||||
make requirements
|
|
||||||
|
|
||||||
# Build Docker image with new Python requirements
|
|
||||||
make build
|
|
||||||
```
|
|
||||||
|
|
||||||
## Important notes
|
|
||||||
|
|
||||||
* This project uses [django-zen-queries](https://github.com/dabapps/django-zen-queries), which will sometimes raise a `QueriesDisabledError` in your templates. You can find a difference of opinion about that, but you can find a difference of opinion about many things, right?
|
|
||||||
* If a linting error annoys you, please feel free to strike back by adding a `noqa` to the line that has displeased the linter and move on with life.
|
|
||||||
|
|
|
@ -1,20 +1,23 @@
|
||||||
---
|
version: '3.7'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
|
||||||
|
backend:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
args:
|
dockerfile: Dockerfile
|
||||||
- REQUIREMENTS_FILE=requirements/requirements-dev.txt
|
user: $UID:$GID
|
||||||
command: python /app/src/manage.py runserver 0.0.0.0:8000
|
command: python /app/src/manage.py runserver 0.0.0.0:8000
|
||||||
tty: true
|
tty: true
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/app/
|
- ./:/app/
|
||||||
depends_on:
|
links:
|
||||||
|
- redis
|
||||||
- postgres
|
- postgres
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- env
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:13-alpine
|
image: postgres:13-alpine
|
||||||
|
@ -23,8 +26,12 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- 5432:5432
|
- 5432:5432
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- env
|
||||||
|
|
||||||
|
redis:
|
||||||
|
image: redis:latest
|
||||||
|
ports:
|
||||||
|
- "6379:6379"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres_data:
|
postgres_data:
|
||||||
...
|
|
||||||
|
|
7
env
Normal file
7
env
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
SECRET_KEY=something-very-random
|
||||||
|
POSTGRES_HOST=postgres
|
||||||
|
POSTGRES_PASSWORD=postgres
|
||||||
|
POSTGRES_PORT=5432
|
||||||
|
DATABASE_URL=postgres://postgres:postgres@postgres:5432/postgres
|
||||||
|
DEBUG=True
|
||||||
|
DJANGO_ENV=all
|
908
poetry.lock
generated
Normal file
908
poetry.lock
generated
Normal file
|
@ -0,0 +1,908 @@
|
||||||
|
[[package]]
|
||||||
|
name = "appdirs"
|
||||||
|
version = "1.4.4"
|
||||||
|
description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "asgiref"
|
||||||
|
version = "3.3.1"
|
||||||
|
description = "ASGI specs, helper code, and adapters"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.5"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
tests = ["pytest", "pytest-asyncio"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "atomicwrites"
|
||||||
|
version = "1.4.0"
|
||||||
|
description = "Atomic file writes."
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "attrs"
|
||||||
|
version = "20.3.0"
|
||||||
|
description = "Classes Without Boilerplate"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"]
|
||||||
|
docs = ["furo", "sphinx", "zope.interface"]
|
||||||
|
tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
|
||||||
|
tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "certifi"
|
||||||
|
version = "2020.12.5"
|
||||||
|
description = "Python package for providing Mozilla's CA Bundle."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cffi"
|
||||||
|
version = "1.14.5"
|
||||||
|
description = "Foreign Function Interface for Python calling C code."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
pycparser = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cfgv"
|
||||||
|
version = "3.2.0"
|
||||||
|
description = "Validate configuration and produce human readable error messages."
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6.1"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "chardet"
|
||||||
|
version = "4.0.0"
|
||||||
|
description = "Universal encoding detector for Python 2 and 3"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "click"
|
||||||
|
version = "7.1.2"
|
||||||
|
description = "Composable command line interface toolkit"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "colorama"
|
||||||
|
version = "0.4.4"
|
||||||
|
description = "Cross-platform colored terminal text."
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cryptography"
|
||||||
|
version = "3.4.6"
|
||||||
|
description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
cffi = ">=1.12"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
|
||||||
|
docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
|
||||||
|
pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
|
||||||
|
sdist = ["setuptools-rust (>=0.11.4)"]
|
||||||
|
ssh = ["bcrypt (>=3.1.5)"]
|
||||||
|
test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "defusedxml"
|
||||||
|
version = "0.6.0"
|
||||||
|
description = "XML bomb protection for Python stdlib modules"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "distlib"
|
||||||
|
version = "0.3.1"
|
||||||
|
description = "Distribution utilities"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dj-database-url"
|
||||||
|
version = "0.5.0"
|
||||||
|
description = "Use Database URLs in your Django Application."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dj-email-url"
|
||||||
|
version = "1.0.2"
|
||||||
|
description = "Use an URL to configure email backend settings in your Django Application."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "django"
|
||||||
|
version = "3.1.7"
|
||||||
|
description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
asgiref = ">=3.2.10,<4"
|
||||||
|
pytz = "*"
|
||||||
|
sqlparse = ">=0.2.2"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
argon2 = ["argon2-cffi (>=16.1.0)"]
|
||||||
|
bcrypt = ["bcrypt"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "django-allauth"
|
||||||
|
version = "0.44.0"
|
||||||
|
description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
Django = ">=2.0"
|
||||||
|
pyjwt = {version = ">=1.7", extras = ["crypto"]}
|
||||||
|
python3-openid = ">=3.0.8"
|
||||||
|
requests = "*"
|
||||||
|
requests-oauthlib = ">=0.3.0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "django-cache-url"
|
||||||
|
version = "3.2.3"
|
||||||
|
description = "Use Cache URLs in your Django application."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "django-debug-toolbar"
|
||||||
|
version = "3.2"
|
||||||
|
description = "A configurable set of panels that display various debug information about the current request/response."
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
Django = ">=2.2"
|
||||||
|
sqlparse = ">=0.2.0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "django-money"
|
||||||
|
version = "1.3.1"
|
||||||
|
description = "Adds support for using money and currency fields in django models and forms. Uses py-moneyed as the money implementation."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.5"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
Django = ">=1.11"
|
||||||
|
py-moneyed = ">=0.8,<1.0"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
exchange = ["certifi"]
|
||||||
|
test = ["pytest (>=3.1.0)", "pytest-django", "pytest-pythonpath", "pytest-cov", "mixer"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "environs"
|
||||||
|
version = "9.3.1"
|
||||||
|
description = "simplified environment variable parsing"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
dj-database-url = {version = "*", optional = true, markers = "extra == \"django\""}
|
||||||
|
dj-email-url = {version = "*", optional = true, markers = "extra == \"django\""}
|
||||||
|
django-cache-url = {version = "*", optional = true, markers = "extra == \"django\""}
|
||||||
|
marshmallow = ">=2.7.0"
|
||||||
|
python-dotenv = "*"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
dev = ["pytest", "dj-database-url", "dj-email-url", "django-cache-url", "flake8 (==3.8.4)", "flake8-bugbear (==20.11.1)", "mypy (==0.800)", "pre-commit (>=2.4,<3.0)", "tox"]
|
||||||
|
django = ["dj-database-url", "dj-email-url", "django-cache-url"]
|
||||||
|
lint = ["flake8 (==3.8.4)", "flake8-bugbear (==20.11.1)", "mypy (==0.800)", "pre-commit (>=2.4,<3.0)"]
|
||||||
|
tests = ["pytest", "dj-database-url", "dj-email-url", "django-cache-url"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "filelock"
|
||||||
|
version = "3.0.12"
|
||||||
|
description = "A platform independent file lock."
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "h11"
|
||||||
|
version = "0.12.0"
|
||||||
|
description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "identify"
|
||||||
|
version = "2.0.0"
|
||||||
|
description = "File identification library for Python"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6.1"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
license = ["editdistance"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "idna"
|
||||||
|
version = "2.10"
|
||||||
|
description = "Internationalized Domain Names in Applications (IDNA)"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "marshmallow"
|
||||||
|
version = "3.10.0"
|
||||||
|
description = "A lightweight library for converting complex datatypes to and from native Python datatypes."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.5"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
dev = ["pytest", "pytz", "simplejson", "mypy (==0.790)", "flake8 (==3.8.4)", "flake8-bugbear (==20.11.1)", "pre-commit (>=2.4,<3.0)", "tox"]
|
||||||
|
docs = ["sphinx (==3.3.1)", "sphinx-issues (==1.2.0)", "alabaster (==0.7.12)", "sphinx-version-warning (==1.1.2)", "autodocsumm (==0.2.2)"]
|
||||||
|
lint = ["mypy (==0.790)", "flake8 (==3.8.4)", "flake8-bugbear (==20.11.1)", "pre-commit (>=2.4,<3.0)"]
|
||||||
|
tests = ["pytest", "pytz", "simplejson"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "more-itertools"
|
||||||
|
version = "8.7.0"
|
||||||
|
description = "More routines for operating on iterables, beyond itertools"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nodeenv"
|
||||||
|
version = "1.5.0"
|
||||||
|
description = "Node.js virtual environment builder"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "oauthlib"
|
||||||
|
version = "3.1.0"
|
||||||
|
description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
rsa = ["cryptography"]
|
||||||
|
signals = ["blinker"]
|
||||||
|
signedtoken = ["cryptography", "pyjwt (>=1.0.0)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "packaging"
|
||||||
|
version = "20.9"
|
||||||
|
description = "Core utilities for Python packages"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
pyparsing = ">=2.0.2"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pluggy"
|
||||||
|
version = "0.13.1"
|
||||||
|
description = "plugin and hook calling mechanisms for python"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
dev = ["pre-commit", "tox"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pre-commit"
|
||||||
|
version = "2.10.1"
|
||||||
|
description = "A framework for managing and maintaining multi-language pre-commit hooks."
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6.1"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
cfgv = ">=2.0.0"
|
||||||
|
identify = ">=1.0.0"
|
||||||
|
nodeenv = ">=0.11.1"
|
||||||
|
pyyaml = ">=5.1"
|
||||||
|
toml = "*"
|
||||||
|
virtualenv = ">=20.0.8"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "psycopg2"
|
||||||
|
version = "2.8.6"
|
||||||
|
description = "psycopg2 - Python-PostgreSQL Database Adapter"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "py"
|
||||||
|
version = "1.10.0"
|
||||||
|
description = "library with cross-python path, ini-parsing, io, code, log facilities"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "py-moneyed"
|
||||||
|
version = "0.8.0"
|
||||||
|
description = "Provides Currency and Money classes for use in your Python code."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
tests = ["pytest (>=2.3.0)", "tox (>=1.6.0)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pycparser"
|
||||||
|
version = "2.20"
|
||||||
|
description = "C parser in Python"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pyjwt"
|
||||||
|
version = "2.0.1"
|
||||||
|
description = "JSON Web Token implementation in Python"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.6"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
cryptography = {version = ">=3.3.1,<4.0.0", optional = true, markers = "extra == \"crypto\""}
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
crypto = ["cryptography (>=3.3.1,<4.0.0)"]
|
||||||
|
dev = ["sphinx", "sphinx-rtd-theme", "zope.interface", "cryptography (>=3.3.1,<4.0.0)", "pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)", "mypy", "pre-commit"]
|
||||||
|
docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"]
|
||||||
|
tests = ["pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pyparsing"
|
||||||
|
version = "2.4.7"
|
||||||
|
description = "Python parsing module"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pytest"
|
||||||
|
version = "5.4.3"
|
||||||
|
description = "pytest: simple powerful testing with Python"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.5"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
|
||||||
|
attrs = ">=17.4.0"
|
||||||
|
colorama = {version = "*", markers = "sys_platform == \"win32\""}
|
||||||
|
more-itertools = ">=4.0.0"
|
||||||
|
packaging = "*"
|
||||||
|
pluggy = ">=0.12,<1.0"
|
||||||
|
py = ">=1.5.0"
|
||||||
|
wcwidth = "*"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
checkqa-mypy = ["mypy (==v0.761)"]
|
||||||
|
testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pytest-django"
|
||||||
|
version = "3.10.0"
|
||||||
|
description = "A Django plugin for pytest."
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
pytest = ">=3.6"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
docs = ["sphinx", "sphinx-rtd-theme"]
|
||||||
|
testing = ["django", "django-configurations (>=2.0)", "six"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "python-dotenv"
|
||||||
|
version = "0.15.0"
|
||||||
|
description = "Add .env support to your django/flask apps in development and deployments"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
cli = ["click (>=5.0)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "python3-openid"
|
||||||
|
version = "3.2.0"
|
||||||
|
description = "OpenID support for modern servers and consumers."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
defusedxml = "*"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
mysql = ["mysql-connector-python"]
|
||||||
|
postgresql = ["psycopg2"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pytz"
|
||||||
|
version = "2021.1"
|
||||||
|
description = "World timezone definitions, modern and historical"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pyyaml"
|
||||||
|
version = "5.4.1"
|
||||||
|
description = "YAML parser and emitter for Python"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "requests"
|
||||||
|
version = "2.25.1"
|
||||||
|
description = "Python HTTP for Humans."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
certifi = ">=2017.4.17"
|
||||||
|
chardet = ">=3.0.2,<5"
|
||||||
|
idna = ">=2.5,<3"
|
||||||
|
urllib3 = ">=1.21.1,<1.27"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
|
||||||
|
socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "requests-oauthlib"
|
||||||
|
version = "1.3.0"
|
||||||
|
description = "OAuthlib authentication support for Requests."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
oauthlib = ">=3.0.0"
|
||||||
|
requests = ">=2.0.0"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
rsa = ["oauthlib[signedtoken] (>=3.0.0)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "six"
|
||||||
|
version = "1.15.0"
|
||||||
|
description = "Python 2 and 3 compatibility utilities"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sqlparse"
|
||||||
|
version = "0.4.1"
|
||||||
|
description = "A non-validating SQL parser."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "toml"
|
||||||
|
version = "0.10.2"
|
||||||
|
description = "Python Library for Tom's Obvious, Minimal Language"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "urllib3"
|
||||||
|
version = "1.26.3"
|
||||||
|
description = "HTTP library with thread-safe connection pooling, file post, and more."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
brotli = ["brotlipy (>=0.6.0)"]
|
||||||
|
secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
|
||||||
|
socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "uvicorn"
|
||||||
|
version = "0.13.4"
|
||||||
|
description = "The lightning-fast ASGI server."
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
click = ">=7.0.0,<8.0.0"
|
||||||
|
h11 = ">=0.8"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
standard = ["websockets (>=8.0.0,<9.0.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "httptools (>=0.1.0,<0.2.0)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "virtualenv"
|
||||||
|
version = "20.4.2"
|
||||||
|
description = "Virtual Python Environment builder"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
|
||||||
|
|
||||||
|
[package.dependencies]
|
||||||
|
appdirs = ">=1.4.3,<2"
|
||||||
|
distlib = ">=0.3.1,<1"
|
||||||
|
filelock = ">=3.0.0,<4"
|
||||||
|
six = ">=1.9.0,<2"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)"]
|
||||||
|
testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)", "xonsh (>=0.9.16)"]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wcwidth"
|
||||||
|
version = "0.2.5"
|
||||||
|
description = "Measures the displayed width of unicode strings in a terminal"
|
||||||
|
category = "dev"
|
||||||
|
optional = false
|
||||||
|
python-versions = "*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "whitenoise"
|
||||||
|
version = "5.2.0"
|
||||||
|
description = "Radically simplified static file serving for WSGI applications"
|
||||||
|
category = "main"
|
||||||
|
optional = false
|
||||||
|
python-versions = ">=3.5, <4"
|
||||||
|
|
||||||
|
[package.extras]
|
||||||
|
brotli = ["brotli"]
|
||||||
|
|
||||||
|
[metadata]
|
||||||
|
lock-version = "1.1"
|
||||||
|
python-versions = "^3.9"
|
||||||
|
content-hash = "273466dbd53a484027b72a712aba600936507cd2d528c9a245464637c0c54207"
|
||||||
|
|
||||||
|
[metadata.files]
|
||||||
|
appdirs = [
|
||||||
|
{file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
|
||||||
|
{file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
|
||||||
|
]
|
||||||
|
asgiref = [
|
||||||
|
{file = "asgiref-3.3.1-py3-none-any.whl", hash = "sha256:5ee950735509d04eb673bd7f7120f8fa1c9e2df495394992c73234d526907e17"},
|
||||||
|
{file = "asgiref-3.3.1.tar.gz", hash = "sha256:7162a3cb30ab0609f1a4c95938fd73e8604f63bdba516a7f7d64b83ff09478f0"},
|
||||||
|
]
|
||||||
|
atomicwrites = [
|
||||||
|
{file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"},
|
||||||
|
{file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
|
||||||
|
]
|
||||||
|
attrs = [
|
||||||
|
{file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"},
|
||||||
|
{file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"},
|
||||||
|
]
|
||||||
|
certifi = [
|
||||||
|
{file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
|
||||||
|
{file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"},
|
||||||
|
]
|
||||||
|
cffi = [
|
||||||
|
{file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"},
|
||||||
|
{file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"},
|
||||||
|
{file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"},
|
||||||
|
{file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"},
|
||||||
|
{file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"},
|
||||||
|
{file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"},
|
||||||
|
{file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"},
|
||||||
|
{file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"},
|
||||||
|
{file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"},
|
||||||
|
{file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"},
|
||||||
|
{file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"},
|
||||||
|
{file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"},
|
||||||
|
{file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"},
|
||||||
|
{file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"},
|
||||||
|
{file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"},
|
||||||
|
{file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"},
|
||||||
|
{file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"},
|
||||||
|
{file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"},
|
||||||
|
{file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"},
|
||||||
|
{file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"},
|
||||||
|
{file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"},
|
||||||
|
{file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"},
|
||||||
|
{file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"},
|
||||||
|
{file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"},
|
||||||
|
{file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"},
|
||||||
|
{file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"},
|
||||||
|
{file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"},
|
||||||
|
{file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"},
|
||||||
|
{file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"},
|
||||||
|
{file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"},
|
||||||
|
{file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"},
|
||||||
|
{file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"},
|
||||||
|
{file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"},
|
||||||
|
{file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"},
|
||||||
|
{file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"},
|
||||||
|
{file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"},
|
||||||
|
{file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"},
|
||||||
|
]
|
||||||
|
cfgv = [
|
||||||
|
{file = "cfgv-3.2.0-py2.py3-none-any.whl", hash = "sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d"},
|
||||||
|
{file = "cfgv-3.2.0.tar.gz", hash = "sha256:cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"},
|
||||||
|
]
|
||||||
|
chardet = [
|
||||||
|
{file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
|
||||||
|
{file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
|
||||||
|
]
|
||||||
|
click = [
|
||||||
|
{file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"},
|
||||||
|
{file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"},
|
||||||
|
]
|
||||||
|
colorama = [
|
||||||
|
{file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
|
||||||
|
{file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
|
||||||
|
]
|
||||||
|
cryptography = [
|
||||||
|
{file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"},
|
||||||
|
{file = "cryptography-3.4.6-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:4169a27b818de4a1860720108b55a2801f32b6ae79e7f99c00d79f2a2822eeb7"},
|
||||||
|
{file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"},
|
||||||
|
{file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"},
|
||||||
|
{file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"},
|
||||||
|
{file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"},
|
||||||
|
{file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"},
|
||||||
|
{file = "cryptography-3.4.6-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:066bc53f052dfeda2f2d7c195cf16fb3e5ff13e1b6b7415b468514b40b381a5b"},
|
||||||
|
{file = "cryptography-3.4.6-pp36-pypy36_pp73-manylinux2014_x86_64.whl", hash = "sha256:600cf9bfe75e96d965509a4c0b2b183f74a4fa6f5331dcb40fb7b77b7c2484df"},
|
||||||
|
{file = "cryptography-3.4.6-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:0923ba600d00718d63a3976f23cab19aef10c1765038945628cd9be047ad0336"},
|
||||||
|
{file = "cryptography-3.4.6-pp37-pypy37_pp73-manylinux2014_x86_64.whl", hash = "sha256:9e98b452132963678e3ac6c73f7010fe53adf72209a32854d55690acac3f6724"},
|
||||||
|
{file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"},
|
||||||
|
]
|
||||||
|
defusedxml = [
|
||||||
|
{file = "defusedxml-0.6.0-py2.py3-none-any.whl", hash = "sha256:6687150770438374ab581bb7a1b327a847dd9c5749e396102de3fad4e8a3ef93"},
|
||||||
|
{file = "defusedxml-0.6.0.tar.gz", hash = "sha256:f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5"},
|
||||||
|
]
|
||||||
|
distlib = [
|
||||||
|
{file = "distlib-0.3.1-py2.py3-none-any.whl", hash = "sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb"},
|
||||||
|
{file = "distlib-0.3.1.zip", hash = "sha256:edf6116872c863e1aa9d5bb7cb5e05a022c519a4594dc703843343a9ddd9bff1"},
|
||||||
|
]
|
||||||
|
dj-database-url = [
|
||||||
|
{file = "dj-database-url-0.5.0.tar.gz", hash = "sha256:4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163"},
|
||||||
|
{file = "dj_database_url-0.5.0-py2.py3-none-any.whl", hash = "sha256:851785365761ebe4994a921b433062309eb882fedd318e1b0fcecc607ed02da9"},
|
||||||
|
]
|
||||||
|
dj-email-url = [
|
||||||
|
{file = "dj-email-url-1.0.2.tar.gz", hash = "sha256:838fd4ded9deba53ae757debef431e25fa7fca31d3948b3c4808ccdc84fab2b7"},
|
||||||
|
{file = "dj_email_url-1.0.2-py2.py3-none-any.whl", hash = "sha256:15148141c6ef123636e4ca3663e95231ed94ca5ed267e91977e5a4397be8b34c"},
|
||||||
|
]
|
||||||
|
django = [
|
||||||
|
{file = "Django-3.1.7-py3-none-any.whl", hash = "sha256:baf099db36ad31f970775d0be5587cc58a6256a6771a44eb795b554d45f211b8"},
|
||||||
|
{file = "Django-3.1.7.tar.gz", hash = "sha256:32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7"},
|
||||||
|
]
|
||||||
|
django-allauth = [
|
||||||
|
{file = "django-allauth-0.44.0.tar.gz", hash = "sha256:e51af457466022f52154d74c8523ac69375120fad2acce6e239635d85e610b25"},
|
||||||
|
]
|
||||||
|
django-cache-url = [
|
||||||
|
{file = "django-cache-url-3.2.3.tar.gz", hash = "sha256:c1d45626ae8a206267c1263aa7a3461e2e186be2e939bcbd8c660e25851ddac8"},
|
||||||
|
{file = "django_cache_url-3.2.3-py2.py3-none-any.whl", hash = "sha256:5514ca3a2075c6b956b3d0a5c540654d32b004e76340d7bdabf6661135b5f218"},
|
||||||
|
]
|
||||||
|
django-debug-toolbar = [
|
||||||
|
{file = "django-debug-toolbar-3.2.tar.gz", hash = "sha256:84e2607d900dbd571df0a2acf380b47c088efb787dce9805aefeb407341961d2"},
|
||||||
|
{file = "django_debug_toolbar-3.2-py3-none-any.whl", hash = "sha256:9e5a25d0c965f7e686f6a8ba23613ca9ca30184daa26487706d4829f5cfb697a"},
|
||||||
|
]
|
||||||
|
django-money = [
|
||||||
|
{file = "django-money-1.3.1.tar.gz", hash = "sha256:a363ce16a23e403befdafa9895b2f538a10f9d390b160f12140094a6dfd55246"},
|
||||||
|
{file = "django_money-1.3.1-py3-none-any.whl", hash = "sha256:3b8fc751c8ae27cf877b8f3770ade1b63af97ee49a32ac08a6a1bc6d8d59f089"},
|
||||||
|
]
|
||||||
|
environs = [
|
||||||
|
{file = "environs-9.3.1-py2.py3-none-any.whl", hash = "sha256:2da44b7c30114415aa858577fa6396ee326fc76a0a60f0f15e8260ba554f19dc"},
|
||||||
|
{file = "environs-9.3.1.tar.gz", hash = "sha256:3f6def554abb5455141b540e6e0b72fda3853404f2b0d31658aab1bf95410db3"},
|
||||||
|
]
|
||||||
|
filelock = [
|
||||||
|
{file = "filelock-3.0.12-py3-none-any.whl", hash = "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"},
|
||||||
|
{file = "filelock-3.0.12.tar.gz", hash = "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59"},
|
||||||
|
]
|
||||||
|
h11 = [
|
||||||
|
{file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"},
|
||||||
|
{file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
|
||||||
|
]
|
||||||
|
identify = [
|
||||||
|
{file = "identify-2.0.0-py2.py3-none-any.whl", hash = "sha256:9cdd81e5d2b6e76c3006d5226316dd947bd6324fbeebb881bec489202fa09d3a"},
|
||||||
|
{file = "identify-2.0.0.tar.gz", hash = "sha256:b99aa309329c4fea679463eb35d169f3fbe13e66e9dd6162ad1856cbeb03dcbd"},
|
||||||
|
]
|
||||||
|
idna = [
|
||||||
|
{file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
|
||||||
|
{file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"},
|
||||||
|
]
|
||||||
|
marshmallow = [
|
||||||
|
{file = "marshmallow-3.10.0-py2.py3-none-any.whl", hash = "sha256:eca81d53aa4aafbc0e20566973d0d2e50ce8bf0ee15165bb799bec0df1e50177"},
|
||||||
|
{file = "marshmallow-3.10.0.tar.gz", hash = "sha256:4ab2fdb7f36eb61c3665da67a7ce281c8900db08d72ba6bf0e695828253581f7"},
|
||||||
|
]
|
||||||
|
more-itertools = [
|
||||||
|
{file = "more-itertools-8.7.0.tar.gz", hash = "sha256:c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713"},
|
||||||
|
{file = "more_itertools-8.7.0-py3-none-any.whl", hash = "sha256:5652a9ac72209ed7df8d9c15daf4e1aa0e3d2ccd3c87f8265a0673cd9cbc9ced"},
|
||||||
|
]
|
||||||
|
nodeenv = [
|
||||||
|
{file = "nodeenv-1.5.0-py2.py3-none-any.whl", hash = "sha256:5304d424c529c997bc888453aeaa6362d242b6b4631e90f3d4bf1b290f1c84a9"},
|
||||||
|
{file = "nodeenv-1.5.0.tar.gz", hash = "sha256:ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"},
|
||||||
|
]
|
||||||
|
oauthlib = [
|
||||||
|
{file = "oauthlib-3.1.0-py2.py3-none-any.whl", hash = "sha256:df884cd6cbe20e32633f1db1072e9356f53638e4361bef4e8b03c9127c9328ea"},
|
||||||
|
{file = "oauthlib-3.1.0.tar.gz", hash = "sha256:bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889"},
|
||||||
|
]
|
||||||
|
packaging = [
|
||||||
|
{file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"},
|
||||||
|
{file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"},
|
||||||
|
]
|
||||||
|
pluggy = [
|
||||||
|
{file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},
|
||||||
|
{file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
|
||||||
|
]
|
||||||
|
pre-commit = [
|
||||||
|
{file = "pre_commit-2.10.1-py2.py3-none-any.whl", hash = "sha256:16212d1fde2bed88159287da88ff03796863854b04dc9f838a55979325a3d20e"},
|
||||||
|
{file = "pre_commit-2.10.1.tar.gz", hash = "sha256:399baf78f13f4de82a29b649afd74bef2c4e28eb4f021661fc7f29246e8c7a3a"},
|
||||||
|
]
|
||||||
|
psycopg2 = [
|
||||||
|
{file = "psycopg2-2.8.6-cp27-cp27m-win32.whl", hash = "sha256:068115e13c70dc5982dfc00c5d70437fe37c014c808acce119b5448361c03725"},
|
||||||
|
{file = "psycopg2-2.8.6-cp27-cp27m-win_amd64.whl", hash = "sha256:d160744652e81c80627a909a0e808f3c6653a40af435744de037e3172cf277f5"},
|
||||||
|
{file = "psycopg2-2.8.6-cp34-cp34m-win32.whl", hash = "sha256:b8cae8b2f022efa1f011cc753adb9cbadfa5a184431d09b273fb49b4167561ad"},
|
||||||
|
{file = "psycopg2-2.8.6-cp34-cp34m-win_amd64.whl", hash = "sha256:f22ea9b67aea4f4a1718300908a2fb62b3e4276cf00bd829a97ab5894af42ea3"},
|
||||||
|
{file = "psycopg2-2.8.6-cp35-cp35m-win32.whl", hash = "sha256:26e7fd115a6db75267b325de0fba089b911a4a12ebd3d0b5e7acb7028bc46821"},
|
||||||
|
{file = "psycopg2-2.8.6-cp35-cp35m-win_amd64.whl", hash = "sha256:00195b5f6832dbf2876b8bf77f12bdce648224c89c880719c745b90515233301"},
|
||||||
|
{file = "psycopg2-2.8.6-cp36-cp36m-win32.whl", hash = "sha256:a49833abfdede8985ba3f3ec641f771cca215479f41523e99dace96d5b8cce2a"},
|
||||||
|
{file = "psycopg2-2.8.6-cp36-cp36m-win_amd64.whl", hash = "sha256:f974c96fca34ae9e4f49839ba6b78addf0346777b46c4da27a7bf54f48d3057d"},
|
||||||
|
{file = "psycopg2-2.8.6-cp37-cp37m-win32.whl", hash = "sha256:6a3d9efb6f36f1fe6aa8dbb5af55e067db802502c55a9defa47c5a1dad41df84"},
|
||||||
|
{file = "psycopg2-2.8.6-cp37-cp37m-win_amd64.whl", hash = "sha256:56fee7f818d032f802b8eed81ef0c1232b8b42390df189cab9cfa87573fe52c5"},
|
||||||
|
{file = "psycopg2-2.8.6-cp38-cp38-win32.whl", hash = "sha256:ad2fe8a37be669082e61fb001c185ffb58867fdbb3e7a6b0b0d2ffe232353a3e"},
|
||||||
|
{file = "psycopg2-2.8.6-cp38-cp38-win_amd64.whl", hash = "sha256:56007a226b8e95aa980ada7abdea6b40b75ce62a433bd27cec7a8178d57f4051"},
|
||||||
|
{file = "psycopg2-2.8.6-cp39-cp39-win32.whl", hash = "sha256:2c93d4d16933fea5bbacbe1aaf8fa8c1348740b2e50b3735d1b0bf8154cbf0f3"},
|
||||||
|
{file = "psycopg2-2.8.6-cp39-cp39-win_amd64.whl", hash = "sha256:d5062ae50b222da28253059880a871dc87e099c25cb68acf613d9d227413d6f7"},
|
||||||
|
{file = "psycopg2-2.8.6.tar.gz", hash = "sha256:fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543"},
|
||||||
|
]
|
||||||
|
py = [
|
||||||
|
{file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
|
||||||
|
{file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
|
||||||
|
]
|
||||||
|
py-moneyed = [
|
||||||
|
{file = "py-moneyed-0.8.0.tar.gz", hash = "sha256:ec73795171919d537880a33c44d07fcdf0a5225e8368684fe02f0e75a6404742"},
|
||||||
|
{file = "py_moneyed-0.8.0-py2.py3-none-any.whl", hash = "sha256:c6691b914a5e4b5b2335cf113620479a52cc82988c0e143435a7c5c7d60cd4ad"},
|
||||||
|
]
|
||||||
|
pycparser = [
|
||||||
|
{file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
|
||||||
|
{file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"},
|
||||||
|
]
|
||||||
|
pyjwt = [
|
||||||
|
{file = "PyJWT-2.0.1-py3-none-any.whl", hash = "sha256:b70b15f89dc69b993d8a8d32c299032d5355c82f9b5b7e851d1a6d706dffe847"},
|
||||||
|
{file = "PyJWT-2.0.1.tar.gz", hash = "sha256:a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7"},
|
||||||
|
]
|
||||||
|
pyparsing = [
|
||||||
|
{file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
|
||||||
|
{file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
|
||||||
|
]
|
||||||
|
pytest = [
|
||||||
|
{file = "pytest-5.4.3-py3-none-any.whl", hash = "sha256:5c0db86b698e8f170ba4582a492248919255fcd4c79b1ee64ace34301fb589a1"},
|
||||||
|
{file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"},
|
||||||
|
]
|
||||||
|
pytest-django = [
|
||||||
|
{file = "pytest-django-3.10.0.tar.gz", hash = "sha256:4de6dbd077ed8606616958f77655fed0d5e3ee45159475671c7fa67596c6dba6"},
|
||||||
|
{file = "pytest_django-3.10.0-py2.py3-none-any.whl", hash = "sha256:c33e3d3da14d8409b125d825d4e74da17bb252191bf6fc3da6856e27a8b73ea4"},
|
||||||
|
]
|
||||||
|
python-dotenv = [
|
||||||
|
{file = "python-dotenv-0.15.0.tar.gz", hash = "sha256:587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"},
|
||||||
|
{file = "python_dotenv-0.15.0-py2.py3-none-any.whl", hash = "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e"},
|
||||||
|
]
|
||||||
|
python3-openid = [
|
||||||
|
{file = "python3-openid-3.2.0.tar.gz", hash = "sha256:33fbf6928f401e0b790151ed2b5290b02545e8775f982485205a066f874aaeaf"},
|
||||||
|
{file = "python3_openid-3.2.0-py3-none-any.whl", hash = "sha256:6626f771e0417486701e0b4daff762e7212e820ca5b29fcc0d05f6f8736dfa6b"},
|
||||||
|
]
|
||||||
|
pytz = [
|
||||||
|
{file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"},
|
||||||
|
{file = "pytz-2021.1.tar.gz", hash = "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da"},
|
||||||
|
]
|
||||||
|
pyyaml = [
|
||||||
|
{file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"},
|
||||||
|
{file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"},
|
||||||
|
{file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"},
|
||||||
|
{file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"},
|
||||||
|
{file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"},
|
||||||
|
{file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"},
|
||||||
|
{file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"},
|
||||||
|
{file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"},
|
||||||
|
{file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"},
|
||||||
|
{file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"},
|
||||||
|
{file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"},
|
||||||
|
{file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"},
|
||||||
|
{file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"},
|
||||||
|
{file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"},
|
||||||
|
{file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"},
|
||||||
|
{file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"},
|
||||||
|
{file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"},
|
||||||
|
{file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"},
|
||||||
|
{file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"},
|
||||||
|
{file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"},
|
||||||
|
{file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"},
|
||||||
|
]
|
||||||
|
requests = [
|
||||||
|
{file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"},
|
||||||
|
{file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"},
|
||||||
|
]
|
||||||
|
requests-oauthlib = [
|
||||||
|
{file = "requests-oauthlib-1.3.0.tar.gz", hash = "sha256:b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a"},
|
||||||
|
{file = "requests_oauthlib-1.3.0-py2.py3-none-any.whl", hash = "sha256:7f71572defaecd16372f9006f33c2ec8c077c3cfa6f5911a9a90202beb513f3d"},
|
||||||
|
{file = "requests_oauthlib-1.3.0-py3.7.egg", hash = "sha256:fa6c47b933f01060936d87ae9327fead68768b69c6c9ea2109c48be30f2d4dbc"},
|
||||||
|
]
|
||||||
|
six = [
|
||||||
|
{file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"},
|
||||||
|
{file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"},
|
||||||
|
]
|
||||||
|
sqlparse = [
|
||||||
|
{file = "sqlparse-0.4.1-py3-none-any.whl", hash = "sha256:017cde379adbd6a1f15a61873f43e8274179378e95ef3fede90b5aa64d304ed0"},
|
||||||
|
{file = "sqlparse-0.4.1.tar.gz", hash = "sha256:0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8"},
|
||||||
|
]
|
||||||
|
toml = [
|
||||||
|
{file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
|
||||||
|
{file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
|
||||||
|
]
|
||||||
|
urllib3 = [
|
||||||
|
{file = "urllib3-1.26.3-py2.py3-none-any.whl", hash = "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80"},
|
||||||
|
{file = "urllib3-1.26.3.tar.gz", hash = "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"},
|
||||||
|
]
|
||||||
|
uvicorn = [
|
||||||
|
{file = "uvicorn-0.13.4-py3-none-any.whl", hash = "sha256:7587f7b08bd1efd2b9bad809a3d333e972f1d11af8a5e52a9371ee3a5de71524"},
|
||||||
|
{file = "uvicorn-0.13.4.tar.gz", hash = "sha256:3292251b3c7978e8e4a7868f4baf7f7f7bb7e40c759ecc125c37e99cdea34202"},
|
||||||
|
]
|
||||||
|
virtualenv = [
|
||||||
|
{file = "virtualenv-20.4.2-py2.py3-none-any.whl", hash = "sha256:2be72df684b74df0ea47679a7df93fd0e04e72520022c57b479d8f881485dbe3"},
|
||||||
|
{file = "virtualenv-20.4.2.tar.gz", hash = "sha256:147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d"},
|
||||||
|
]
|
||||||
|
wcwidth = [
|
||||||
|
{file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
|
||||||
|
{file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"},
|
||||||
|
]
|
||||||
|
whitenoise = [
|
||||||
|
{file = "whitenoise-5.2.0-py2.py3-none-any.whl", hash = "sha256:05d00198c777028d72d8b0bbd234db605ef6d60e9410125124002518a48e515d"},
|
||||||
|
{file = "whitenoise-5.2.0.tar.gz", hash = "sha256:05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7"},
|
||||||
|
]
|
183
pyproject.toml
183
pyproject.toml
|
@ -1,166 +1,25 @@
|
||||||
[build-system]
|
[tool.poetry]
|
||||||
requires = ["hatchling"]
|
|
||||||
build-backend = "hatchling.build"
|
|
||||||
|
|
||||||
[project]
|
|
||||||
name = "membersystem"
|
name = "membersystem"
|
||||||
description = ''
|
version = "0.1.0"
|
||||||
readme = "README.md"
|
description = ""
|
||||||
requires-python = ">=3.11"
|
authors = ["Your Name <you@example.com>"]
|
||||||
keywords = []
|
|
||||||
authors = [
|
|
||||||
{ name = "Víðir Valberg Guðmundsson", email = "valberg@orn.li" },
|
|
||||||
]
|
|
||||||
dependencies = [
|
|
||||||
"Django~=5.1",
|
|
||||||
"django-allauth~=0.63",
|
|
||||||
"django-money~=3.5",
|
|
||||||
"django-oauth-toolkit~=2.4",
|
|
||||||
"django-registries==0.0.3",
|
|
||||||
"django-view-decorator==0.0.4",
|
|
||||||
"django-oauth-toolkit~=2.4",
|
|
||||||
"django-ratelimit~=4.1",
|
|
||||||
"django-zen-queries~=2.1",
|
|
||||||
"django_stubs_ext~=5.0",
|
|
||||||
"environs[django]>=11,<12",
|
|
||||||
"psycopg[binary]~=3.2",
|
|
||||||
"stripe~=10.5",
|
|
||||||
"uvicorn~=0.30",
|
|
||||||
"whitenoise~=6.7",
|
|
||||||
]
|
|
||||||
version = "0.0.1"
|
|
||||||
|
|
||||||
[tool.hatch.build.targets.wheel]
|
[tool.poetry.dependencies]
|
||||||
packages = ["src"]
|
python = "^3.9"
|
||||||
|
Django = "^3.1"
|
||||||
|
django-money = "^1.3"
|
||||||
|
django-allauth = "^0.44.0"
|
||||||
|
psycopg2 = "^2.8.6"
|
||||||
|
environs = {extras = ["django"], version = "^9.3.1"}
|
||||||
|
uvicorn = "^0.13.4"
|
||||||
|
whitenoise = "^5.2.0"
|
||||||
|
|
||||||
[tool.hatch.env]
|
[tool.poetry.dev-dependencies]
|
||||||
requires = ["hatch-pip-compile"]
|
pre-commit = "^2.9.3"
|
||||||
|
pytest = "^5.1"
|
||||||
|
pytest-django = "^3.5"
|
||||||
|
django-debug-toolbar = "^3.2"
|
||||||
|
|
||||||
[tool.hatch.envs.default]
|
[build-system]
|
||||||
type = "pip-compile"
|
requires = ["poetry>=0.12"]
|
||||||
pip-compile-resolver = "uv"
|
build-backend = "poetry.masonry.api"
|
||||||
|
|
||||||
[tool.hatch.envs.dev]
|
|
||||||
type = "pip-compile"
|
|
||||||
pip-compile-resolver = "uv"
|
|
||||||
dependencies = [
|
|
||||||
"coverage[toml]==7.3.0",
|
|
||||||
"pytest==7.2.2",
|
|
||||||
"pytest-cov",
|
|
||||||
"pytest-django==4.5.2",
|
|
||||||
"mypy==1.1.1",
|
|
||||||
"django-stubs==1.16.0",
|
|
||||||
"pip-tools==7.3.0",
|
|
||||||
"django-debug-toolbar==4.2.0",
|
|
||||||
"django-browser-reload==1.7.0",
|
|
||||||
"model-bakery==1.17.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[tool.hatch.envs.tests.matrix]]
|
|
||||||
python = ["3.12"]
|
|
||||||
django = ["5.1"]
|
|
||||||
|
|
||||||
[tool.hatch.envs.tests.overrides]
|
|
||||||
matrix.django.dependencies = [
|
|
||||||
{ value = "django~={matrix:django}" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.hatch.envs.default.scripts]
|
|
||||||
cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=src --cov=tests --cov=append {args}"
|
|
||||||
no-cov = "cov --no-cov {args}"
|
|
||||||
typecheck = "mypy --config-file=pyproject.toml ."
|
|
||||||
requirements = "hatch env run --env default -- python --version; hatch env run --env dev -- python --version"
|
|
||||||
server = "./src/manage.py runserver 0.0.0.0:8000"
|
|
||||||
migrate = "./src/manage.py migrate"
|
|
||||||
makemigrations = "./src/manage.py makemigrations"
|
|
||||||
createsuperuser = "./src/manage.py createsuperuser"
|
|
||||||
shell = "./src/manage.py shell"
|
|
||||||
# You need to install Stripe CLI from here to run this: https://github.com/stripe/stripe-cli/releases
|
|
||||||
stripe_cli = "stripe listen --forward-to 0.0.0.0:8000/order/stripe/webhook/"
|
|
||||||
|
|
||||||
[tool.pytest.ini_options]
|
|
||||||
DJANGO_SETTINGS_MODULE="tests.settings"
|
|
||||||
addopts = "--reuse-db"
|
|
||||||
norecursedirs = "build dist docs .eggs/* *.egg-info htmlcov .git"
|
|
||||||
python_files = "test*.py"
|
|
||||||
testpaths = "tests"
|
|
||||||
pythonpath = ". tests"
|
|
||||||
|
|
||||||
[tool.coverage.run]
|
|
||||||
branch = true
|
|
||||||
parallel = true
|
|
||||||
|
|
||||||
[tool.coverage.report]
|
|
||||||
exclude_lines = [
|
|
||||||
"no cov",
|
|
||||||
"if __name__ == .__main__.:",
|
|
||||||
"if TYPE_CHECKING:",
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.mypy]
|
|
||||||
mypy_path = "src/"
|
|
||||||
exclude = [
|
|
||||||
"venv/",
|
|
||||||
"dist/",
|
|
||||||
"docs/",
|
|
||||||
]
|
|
||||||
namespace_packages = false
|
|
||||||
show_error_codes = true
|
|
||||||
strict = true
|
|
||||||
warn_unreachable = true
|
|
||||||
follow_imports = "normal"
|
|
||||||
plugins = ["mypy_django_plugin.main"]
|
|
||||||
|
|
||||||
[tool.django-stubs]
|
|
||||||
django_settings_module = "project.settings"
|
|
||||||
|
|
||||||
[[tool.mypy.overrides]]
|
|
||||||
module = "tests.*"
|
|
||||||
allow_untyped_defs = true
|
|
||||||
|
|
||||||
[tool.ruff]
|
|
||||||
target-version = "py312"
|
|
||||||
extend-exclude = [
|
|
||||||
".git",
|
|
||||||
"__pycache__",
|
|
||||||
"manage.py",
|
|
||||||
"asgi.py",
|
|
||||||
"wsgi.py",
|
|
||||||
]
|
|
||||||
line-length = 120
|
|
||||||
|
|
||||||
[tool.ruff.lint]
|
|
||||||
select = ["ALL"]
|
|
||||||
ignore = [
|
|
||||||
"G004", # Logging statement uses f-string
|
|
||||||
"ANN101", # Missing type annotation for `self` in method
|
|
||||||
"ANN102", # Missing type annotation for `cls` in classmethod
|
|
||||||
"EM101", # Exception must not use a string literal, assign to variable first
|
|
||||||
"EM102", # Exception must not use a f-string literal, assign to variable first
|
|
||||||
"COM812", # missing-trailing-comma (https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules)
|
|
||||||
"ISC001", # single-line-implicit-string-concatenation (https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules)
|
|
||||||
"D100", # Missing docstring in public module
|
|
||||||
"D101", # Missing docstring in public class
|
|
||||||
"D102", # Missing docstring in public method
|
|
||||||
"D105", # Missing docstring in magic method
|
|
||||||
"D106", # Missing docstring in public nested class
|
|
||||||
"D107", # Missing docstring in `__init__`
|
|
||||||
"FIX", # TODO, FIXME, XXX
|
|
||||||
"TD", # TODO, FIXME, XXX
|
|
||||||
"ANN002", # Missing type annotation for `*args`
|
|
||||||
"ANN003", # Missing type annotation for `**kwargs`
|
|
||||||
"FBT001", # Misbehaves: Boolean-typed positional argument in function definition
|
|
||||||
"FBT002", # Misbehaves: Boolean-typed positional argument in function definition
|
|
||||||
"TRY003", # Avoid specifying long messages outside the exception class
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.ruff.lint.isort]
|
|
||||||
force-single-line = true
|
|
||||||
|
|
||||||
[tool.ruff.lint.per-file-ignores]
|
|
||||||
"tests.py" = [
|
|
||||||
"S101", # Use of assert
|
|
||||||
"SLF001", # Private member access
|
|
||||||
"D100", # Docstrings
|
|
||||||
"D103", # Docstrings
|
|
||||||
]
|
|
||||||
|
|
116
requirements.txt
116
requirements.txt
|
@ -1,116 +0,0 @@
|
||||||
#
|
|
||||||
# This file is autogenerated by hatch-pip-compile with Python 3.12
|
|
||||||
#
|
|
||||||
# - django-allauth~=0.63
|
|
||||||
# - django-money~=3.5
|
|
||||||
# - django-oauth-toolkit~=2.4
|
|
||||||
# - django-ratelimit~=4.1
|
|
||||||
# - django-registries==0.0.3
|
|
||||||
# - django-stubs-ext~=5.0
|
|
||||||
# - django-view-decorator==0.0.4
|
|
||||||
# - django-zen-queries~=2.1
|
|
||||||
# - django<5.2,>=5.1b1
|
|
||||||
# - environs[django]<12,>=11
|
|
||||||
# - psycopg[binary]~=3.2
|
|
||||||
# - stripe~=10.5
|
|
||||||
# - uvicorn~=0.30
|
|
||||||
# - whitenoise~=6.7
|
|
||||||
#
|
|
||||||
|
|
||||||
asgiref==3.8.1
|
|
||||||
# via django
|
|
||||||
babel==2.15.0
|
|
||||||
# via py-moneyed
|
|
||||||
certifi==2024.7.4
|
|
||||||
# via requests
|
|
||||||
cffi==1.16.0
|
|
||||||
# via cryptography
|
|
||||||
charset-normalizer==3.3.2
|
|
||||||
# via requests
|
|
||||||
click==8.1.7
|
|
||||||
# via uvicorn
|
|
||||||
cryptography==43.0.0
|
|
||||||
# via jwcrypto
|
|
||||||
dj-database-url==2.2.0
|
|
||||||
# via environs
|
|
||||||
dj-email-url==1.0.6
|
|
||||||
# via environs
|
|
||||||
django==5.1rc1
|
|
||||||
# via
|
|
||||||
# hatch.envs.default
|
|
||||||
# dj-database-url
|
|
||||||
# django-allauth
|
|
||||||
# django-money
|
|
||||||
# django-oauth-toolkit
|
|
||||||
# django-registries
|
|
||||||
# django-stubs-ext
|
|
||||||
# django-view-decorator
|
|
||||||
# django-zen-queries
|
|
||||||
django-allauth==0.63.6
|
|
||||||
# via hatch.envs.default
|
|
||||||
django-cache-url==3.4.5
|
|
||||||
# via environs
|
|
||||||
django-money==3.5.3
|
|
||||||
# via hatch.envs.default
|
|
||||||
django-oauth-toolkit==2.4.0
|
|
||||||
# via hatch.envs.default
|
|
||||||
django-ratelimit==4.1.0
|
|
||||||
# via hatch.envs.default
|
|
||||||
django-registries==0.0.3
|
|
||||||
# via hatch.envs.default
|
|
||||||
django-stubs-ext==5.0.4
|
|
||||||
# via hatch.envs.default
|
|
||||||
django-view-decorator==0.0.4
|
|
||||||
# via hatch.envs.default
|
|
||||||
django-zen-queries==2.1.0
|
|
||||||
# via hatch.envs.default
|
|
||||||
environs==11.0.0
|
|
||||||
# via hatch.envs.default
|
|
||||||
h11==0.14.0
|
|
||||||
# via uvicorn
|
|
||||||
idna==3.7
|
|
||||||
# via requests
|
|
||||||
jwcrypto==1.5.6
|
|
||||||
# via django-oauth-toolkit
|
|
||||||
marshmallow==3.21.3
|
|
||||||
# via environs
|
|
||||||
oauthlib==3.2.2
|
|
||||||
# via django-oauth-toolkit
|
|
||||||
packaging==24.1
|
|
||||||
# via marshmallow
|
|
||||||
psycopg==3.2.1
|
|
||||||
# via hatch.envs.default
|
|
||||||
psycopg-binary==3.2.1
|
|
||||||
# via psycopg
|
|
||||||
py-moneyed==3.0
|
|
||||||
# via django-money
|
|
||||||
pycparser==2.22
|
|
||||||
# via cffi
|
|
||||||
python-dotenv==1.0.1
|
|
||||||
# via environs
|
|
||||||
pytz==2024.1
|
|
||||||
# via django-oauth-toolkit
|
|
||||||
requests==2.32.3
|
|
||||||
# via
|
|
||||||
# django-oauth-toolkit
|
|
||||||
# stripe
|
|
||||||
setuptools==72.1.0
|
|
||||||
# via django-money
|
|
||||||
sqlparse==0.5.1
|
|
||||||
# via django
|
|
||||||
stripe==10.6.0
|
|
||||||
# via hatch.envs.default
|
|
||||||
typing-extensions==4.12.2
|
|
||||||
# via
|
|
||||||
# dj-database-url
|
|
||||||
# django-stubs-ext
|
|
||||||
# jwcrypto
|
|
||||||
# psycopg
|
|
||||||
# py-moneyed
|
|
||||||
# stripe
|
|
||||||
urllib3==2.2.2
|
|
||||||
# via requests
|
|
||||||
uvicorn==0.30.5
|
|
||||||
# via hatch.envs.default
|
|
||||||
whitenoise==6.7.0
|
|
||||||
# via hatch.envs.default
|
|
|
@ -1,192 +0,0 @@
|
||||||
#
|
|
||||||
# This file is autogenerated by hatch-pip-compile with Python 3.12
|
|
||||||
#
|
|
||||||
# - coverage[toml]==7.3.0
|
|
||||||
# - pytest==7.2.2
|
|
||||||
# - pytest-cov
|
|
||||||
# - pytest-django==4.5.2
|
|
||||||
# - mypy==1.1.1
|
|
||||||
# - django-stubs==1.16.0
|
|
||||||
# - pip-tools==7.3.0
|
|
||||||
# - django-debug-toolbar==4.2.0
|
|
||||||
# - django-browser-reload==1.7.0
|
|
||||||
# - model-bakery==1.17.0
|
|
||||||
# - django-allauth~=0.63
|
|
||||||
# - django-money~=3.5
|
|
||||||
# - django-oauth-toolkit~=2.4
|
|
||||||
# - django-ratelimit~=4.1
|
|
||||||
# - django-registries==0.0.3
|
|
||||||
# - django-stubs-ext~=5.0
|
|
||||||
# - django-view-decorator==0.0.4
|
|
||||||
# - django-zen-queries~=2.1
|
|
||||||
# - django<5.2,>=5.1b1
|
|
||||||
# - environs[django]<12,>=11
|
|
||||||
# - psycopg[binary]~=3.2
|
|
||||||
# - stripe~=10.5
|
|
||||||
# - uvicorn~=0.30
|
|
||||||
# - whitenoise~=6.7
|
|
||||||
#
|
|
||||||
|
|
||||||
asgiref==3.8.1
|
|
||||||
# via django
|
|
||||||
attrs==23.2.0
|
|
||||||
# via pytest
|
|
||||||
babel==2.15.0
|
|
||||||
# via py-moneyed
|
|
||||||
build==1.2.1
|
|
||||||
# via pip-tools
|
|
||||||
certifi==2024.7.4
|
|
||||||
# via requests
|
|
||||||
cffi==1.16.0
|
|
||||||
# via cryptography
|
|
||||||
charset-normalizer==3.3.2
|
|
||||||
# via requests
|
|
||||||
click==8.1.7
|
|
||||||
# via
|
|
||||||
# pip-tools
|
|
||||||
# uvicorn
|
|
||||||
coverage==7.3.0
|
|
||||||
# via
|
|
||||||
# hatch.envs.dev
|
|
||||||
# pytest-cov
|
|
||||||
cryptography==43.0.0
|
|
||||||
# via jwcrypto
|
|
||||||
dj-database-url==2.2.0
|
|
||||||
# via environs
|
|
||||||
dj-email-url==1.0.6
|
|
||||||
# via environs
|
|
||||||
django==5.1rc1
|
|
||||||
# via
|
|
||||||
# hatch.envs.dev
|
|
||||||
# dj-database-url
|
|
||||||
# django-allauth
|
|
||||||
# django-browser-reload
|
|
||||||
# django-debug-toolbar
|
|
||||||
# django-money
|
|
||||||
# django-oauth-toolkit
|
|
||||||
# django-registries
|
|
||||||
# django-stubs
|
|
||||||
# django-stubs-ext
|
|
||||||
# django-view-decorator
|
|
||||||
# django-zen-queries
|
|
||||||
# model-bakery
|
|
||||||
django-allauth==0.63.6
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-browser-reload==1.7.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-cache-url==3.4.5
|
|
||||||
# via environs
|
|
||||||
django-debug-toolbar==4.2.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-money==3.5.3
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-oauth-toolkit==2.4.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-ratelimit==4.1.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-registries==0.0.3
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-stubs==1.16.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-stubs-ext==5.0.4
|
|
||||||
# via
|
|
||||||
# hatch.envs.dev
|
|
||||||
# django-stubs
|
|
||||||
django-view-decorator==0.0.4
|
|
||||||
# via hatch.envs.dev
|
|
||||||
django-zen-queries==2.1.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
environs==11.0.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
h11==0.14.0
|
|
||||||
# via uvicorn
|
|
||||||
idna==3.7
|
|
||||||
# via requests
|
|
||||||
iniconfig==2.0.0
|
|
||||||
# via pytest
|
|
||||||
jwcrypto==1.5.6
|
|
||||||
# via django-oauth-toolkit
|
|
||||||
marshmallow==3.21.3
|
|
||||||
# via environs
|
|
||||||
model-bakery==1.17.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
mypy==1.1.1
|
|
||||||
# via
|
|
||||||
# hatch.envs.dev
|
|
||||||
# django-stubs
|
|
||||||
mypy-extensions==1.0.0
|
|
||||||
# via mypy
|
|
||||||
oauthlib==3.2.2
|
|
||||||
# via django-oauth-toolkit
|
|
||||||
packaging==24.1
|
|
||||||
# via
|
|
||||||
# build
|
|
||||||
# marshmallow
|
|
||||||
# pytest
|
|
||||||
pip==24.2
|
|
||||||
# via pip-tools
|
|
||||||
pip-tools==7.3.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
pluggy==1.5.0
|
|
||||||
# via pytest
|
|
||||||
psycopg==3.2.1
|
|
||||||
# via hatch.envs.dev
|
|
||||||
psycopg-binary==3.2.1
|
|
||||||
# via psycopg
|
|
||||||
py-moneyed==3.0
|
|
||||||
# via django-money
|
|
||||||
pycparser==2.22
|
|
||||||
# via cffi
|
|
||||||
pyproject-hooks==1.1.0
|
|
||||||
# via build
|
|
||||||
pytest==7.2.2
|
|
||||||
# via
|
|
||||||
# hatch.envs.dev
|
|
||||||
# pytest-cov
|
|
||||||
# pytest-django
|
|
||||||
pytest-cov==5.0.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
pytest-django==4.5.2
|
|
||||||
# via hatch.envs.dev
|
|
||||||
python-dotenv==1.0.1
|
|
||||||
# via environs
|
|
||||||
pytz==2024.1
|
|
||||||
# via django-oauth-toolkit
|
|
||||||
requests==2.32.3
|
|
||||||
# via
|
|
||||||
# django-oauth-toolkit
|
|
||||||
# stripe
|
|
||||||
setuptools==72.1.0
|
|
||||||
# via
|
|
||||||
# django-money
|
|
||||||
# pip-tools
|
|
||||||
sqlparse==0.5.1
|
|
||||||
# via
|
|
||||||
# django
|
|
||||||
# django-debug-toolbar
|
|
||||||
stripe==10.6.0
|
|
||||||
# via hatch.envs.dev
|
|
||||||
tomli==2.0.1
|
|
||||||
# via django-stubs
|
|
||||||
types-pytz==2024.1.0.20240417
|
|
||||||
# via django-stubs
|
|
||||||
types-pyyaml==6.0.12.20240724
|
|
||||||
# via django-stubs
|
|
||||||
typing-extensions==4.12.2
|
|
||||||
# via
|
|
||||||
# dj-database-url
|
|
||||||
# django-stubs
|
|
||||||
# django-stubs-ext
|
|
||||||
# jwcrypto
|
|
||||||
# mypy
|
|
||||||
# psycopg
|
|
||||||
# py-moneyed
|
|
||||||
# stripe
|
|
||||||
urllib3==2.2.2
|
|
||||||
# via requests
|
|
||||||
uvicorn==0.30.5
|
|
||||||
# via hatch.envs.dev
|
|
||||||
wheel==0.43.0
|
|
||||||
# via pip-tools
|
|
||||||
whitenoise==6.7.0
|
|
||||||
# via hatch.envs.dev
|
|
|
@ -1 +0,0 @@
|
||||||
"""Accounting app."""
|
|
|
@ -1,94 +1,31 @@
|
||||||
"""Admin for the accounting app."""
|
|
||||||
|
|
||||||
from django import forms
|
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.contrib import messages
|
|
||||||
from django.db.models import QuerySet
|
|
||||||
from django.http import HttpRequest
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from membership.emails import OrderEmail
|
|
||||||
|
|
||||||
from . import models
|
from . import models
|
||||||
|
|
||||||
|
|
||||||
class OrderProductInline(admin.TabularInline):
|
|
||||||
"""Administer contents of an order inline."""
|
|
||||||
|
|
||||||
model = models.OrderProduct
|
|
||||||
|
|
||||||
|
|
||||||
class OrderAdminForm(forms.ModelForm):
|
|
||||||
"""Special Form for the OrderAdmin so we don't need to require the account field."""
|
|
||||||
|
|
||||||
account = forms.ModelChoiceField(
|
|
||||||
required=False,
|
|
||||||
queryset=models.Account.objects.all(),
|
|
||||||
help_text=_("Leave empty to auto-choose the member's own account or to create one."),
|
|
||||||
)
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
model = models.Order
|
|
||||||
exclude = () # noqa: DJ006
|
|
||||||
|
|
||||||
def clean(self): # noqa: ANN201
|
|
||||||
cd = super().clean()
|
|
||||||
if not cd["account"] and cd["member"]:
|
|
||||||
try:
|
|
||||||
cd["account"] = models.Account.objects.get_or_create(owner=cd["member"])[0]
|
|
||||||
except models.Account.MultipleObjectsReturned:
|
|
||||||
cd["account"] = models.Account.objects.filter(owner=cd["member"]).first()
|
|
||||||
return cd
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.Order)
|
@admin.register(models.Order)
|
||||||
class OrderAdmin(admin.ModelAdmin):
|
class OrderAdmin(admin.ModelAdmin):
|
||||||
"""Admin for the Order model."""
|
|
||||||
|
|
||||||
inlines = (OrderProductInline,)
|
list_display = ("who", "description", "created", "is_paid")
|
||||||
form = OrderAdminForm
|
|
||||||
|
|
||||||
actions = ("send_order",)
|
def who(self, instance):
|
||||||
|
return instance.user.get_full_name()
|
||||||
|
|
||||||
list_display = ("member", "description", "created", "is_paid", "total_with_vat")
|
who.short_description = _("Customer")
|
||||||
search_fields = ("member__email", "membership__membership_type__name", "description")
|
|
||||||
list_filter = ("is_paid", "membership__membership_type")
|
|
||||||
|
|
||||||
@admin.action(description="Send order link to selected unpaid orders")
|
|
||||||
def send_order(self, request: HttpRequest, queryset: QuerySet[models.Order]) -> None:
|
|
||||||
for order in queryset:
|
|
||||||
if order.is_paid:
|
|
||||||
messages.error(
|
|
||||||
request,
|
|
||||||
f"Order pk={order.id} is already marked paid, not sending email to: {order.member.email}",
|
|
||||||
)
|
|
||||||
continue
|
|
||||||
email = OrderEmail(order, request)
|
|
||||||
email.send()
|
|
||||||
messages.success(request, f"Sent an order for order pk={order.id} link to: {order.member.email}")
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.Payment)
|
@admin.register(models.Payment)
|
||||||
class PaymentAdmin(admin.ModelAdmin):
|
class PaymentAdmin(admin.ModelAdmin):
|
||||||
"""Admin for the Payment model."""
|
|
||||||
|
|
||||||
list_display = ("order__member", "description", "order_id", "created")
|
list_display = ("who", "description", "order_id", "created")
|
||||||
|
|
||||||
@admin.display(description=_("Order ID"))
|
def who(self, instance):
|
||||||
def order_id(self, instance: models.Payment) -> int:
|
return instance.order.user.get_full_name()
|
||||||
"""Return the ID of the order."""
|
|
||||||
|
who.short_description = _("Customer")
|
||||||
|
|
||||||
|
def order_id(self, instance):
|
||||||
return instance.order.id
|
return instance.order.id
|
||||||
|
|
||||||
|
order_id.short_description = _("Order ID")
|
||||||
@admin.register(models.Product)
|
|
||||||
class ProductAdmin(admin.ModelAdmin):
|
|
||||||
list_display = ("name", "price", "vat")
|
|
||||||
|
|
||||||
|
|
||||||
class TransactionInline(admin.TabularInline):
|
|
||||||
model = models.Transaction
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(models.Account)
|
|
||||||
class AccountAdmin(admin.ModelAdmin):
|
|
||||||
list_display = ("owner", "balance")
|
|
||||||
inlines = (TransactionInline,)
|
|
||||||
|
|
|
@ -1,13 +1,5 @@
|
||||||
"""Accounting app configuration."""
|
|
||||||
|
|
||||||
from django.apps import AppConfig
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
class AccountingConfig(AppConfig):
|
class AccountingConfig(AppConfig):
|
||||||
"""Accounting app config."""
|
|
||||||
|
|
||||||
name = "accounting"
|
name = "accounting"
|
||||||
|
|
||||||
def ready(self) -> None:
|
|
||||||
"""Implicitly connect a signal handlers decorated with @receiver."""
|
|
||||||
from . import signals # noqa: F401
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ from django.db import models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
initial = True
|
initial = True
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
@ -98,7 +99,9 @@ class Migration(migrations.Migration):
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"vat",
|
"vat",
|
||||||
djmoney.models.fields.MoneyField(decimal_places=2, max_digits=16, verbose_name="VAT"),
|
djmoney.models.fields.MoneyField(
|
||||||
|
decimal_places=2, max_digits=16, verbose_name="VAT"
|
||||||
|
),
|
||||||
),
|
),
|
||||||
("is_paid", models.BooleanField(default=False, verbose_name="is paid")),
|
("is_paid", models.BooleanField(default=False, verbose_name="is paid")),
|
||||||
(
|
(
|
||||||
|
|
|
@ -1,41 +0,0 @@
|
||||||
# Generated by Django 5.0.1 on 2024-01-14 11:14
|
|
||||||
|
|
||||||
import djmoney.models.fields
|
|
||||||
from django.db import migrations
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [
|
|
||||||
("accounting", "0001_initial"),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name="order",
|
|
||||||
name="price_currency",
|
|
||||||
field=djmoney.models.fields.CurrencyField(
|
|
||||||
choices=[("DKK", "DKK")], default=None, editable=False, max_length=3
|
|
||||||
),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name="order",
|
|
||||||
name="vat_currency",
|
|
||||||
field=djmoney.models.fields.CurrencyField(
|
|
||||||
choices=[("DKK", "DKK")], default=None, editable=False, max_length=3
|
|
||||||
),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name="payment",
|
|
||||||
name="amount_currency",
|
|
||||||
field=djmoney.models.fields.CurrencyField(
|
|
||||||
choices=[("DKK", "DKK")], default=None, editable=False, max_length=3
|
|
||||||
),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name="transaction",
|
|
||||||
name="amount_currency",
|
|
||||||
field=djmoney.models.fields.CurrencyField(
|
|
||||||
choices=[("DKK", "DKK")], default=None, editable=False, max_length=3
|
|
||||||
),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,19 +0,0 @@
|
||||||
# Generated by Django 5.0.6 on 2024-07-14 22:16
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('accounting', '0002_alter_order_price_currency_alter_order_vat_currency_and_more'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='payment',
|
|
||||||
name='stripe_charge_id',
|
|
||||||
field=models.CharField(blank=True, default='', max_length=255),
|
|
||||||
preserve_default=False,
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,78 +0,0 @@
|
||||||
# Generated by Django 5.0.7 on 2024-07-21 14:12
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
import djmoney.models.fields
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('accounting', '0003_alter_payment_stripe_charge_id'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='PaymentType',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('modified', models.DateTimeField(auto_now=True, verbose_name='modified')),
|
|
||||||
('created', models.DateTimeField(auto_now_add=True, verbose_name='oprettet')),
|
|
||||||
('name', models.CharField(max_length=1024, verbose_name='description')),
|
|
||||||
('description', models.TextField(blank=True, max_length=2048)),
|
|
||||||
('enabled', models.BooleanField(default=True)),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'abstract': False,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Product',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('modified', models.DateTimeField(auto_now=True, verbose_name='modified')),
|
|
||||||
('created', models.DateTimeField(auto_now_add=True, verbose_name='oprettet')),
|
|
||||||
('name', models.CharField(max_length=512)),
|
|
||||||
('price_currency', djmoney.models.fields.CurrencyField(choices=[('DKK', 'DKK')], default=None, editable=False, max_length=3)),
|
|
||||||
('price', djmoney.models.fields.MoneyField(decimal_places=2, max_digits=16)),
|
|
||||||
('vat_currency', djmoney.models.fields.CurrencyField(choices=[('DKK', 'DKK')], default=None, editable=False, max_length=3)),
|
|
||||||
('vat', djmoney.models.fields.MoneyField(decimal_places=2, max_digits=16)),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'abstract': False,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='payment',
|
|
||||||
name='external_transaction_id',
|
|
||||||
field=models.CharField(blank=True, default='', max_length=255),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='payment',
|
|
||||||
name='stripe_charge_id',
|
|
||||||
field=models.CharField(blank=True, default='', max_length=255),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='payment',
|
|
||||||
name='payment_type',
|
|
||||||
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, to='accounting.paymenttype'),
|
|
||||||
preserve_default=False,
|
|
||||||
),
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='OrderProduct',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('modified', models.DateTimeField(auto_now=True, verbose_name='modified')),
|
|
||||||
('created', models.DateTimeField(auto_now_add=True, verbose_name='oprettet')),
|
|
||||||
('price_currency', djmoney.models.fields.CurrencyField(choices=[('DKK', 'DKK')], default=None, editable=False, max_length=3)),
|
|
||||||
('price', djmoney.models.fields.MoneyField(decimal_places=2, max_digits=16)),
|
|
||||||
('vat_currency', djmoney.models.fields.CurrencyField(choices=[('DKK', 'DKK')], default=None, editable=False, max_length=3)),
|
|
||||||
('vat', djmoney.models.fields.MoneyField(decimal_places=2, max_digits=16)),
|
|
||||||
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ordered_products', to='accounting.order')),
|
|
||||||
('product', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ordered_products', to='accounting.product')),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'abstract': False,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,40 +0,0 @@
|
||||||
# Generated by Django 5.0.7 on 2024-07-21 14:53
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('accounting', '0004_paymenttype_product_payment_external_transaction_id_and_more'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='order',
|
|
||||||
name='price',
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='order',
|
|
||||||
name='price_currency',
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='order',
|
|
||||||
name='vat',
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='order',
|
|
||||||
name='vat_currency',
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='orderproduct',
|
|
||||||
name='order',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='order_products', to='accounting.order'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='orderproduct',
|
|
||||||
name='product',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='order_products', to='accounting.product'),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,25 +0,0 @@
|
||||||
# Generated by Django 5.0.7 on 2024-07-21 15:17
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('accounting', '0005_remove_order_price_remove_order_price_currency_and_more'),
|
|
||||||
('membership', '0006_waitinglistentry_alter_membership_options'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='account',
|
|
||||||
name='owner',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='membership.member'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='order',
|
|
||||||
name='user',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='membership.member'),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,42 +0,0 @@
|
||||||
# Generated by Django 5.1b1 on 2024-08-01 10:50
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('accounting', '0006_alter_account_owner_alter_order_user'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterModelOptions(
|
|
||||||
name='orderproduct',
|
|
||||||
options={'verbose_name': 'ordered product', 'verbose_name_plural': 'ordered products'},
|
|
||||||
),
|
|
||||||
migrations.RenameField(
|
|
||||||
model_name='order',
|
|
||||||
old_name='user',
|
|
||||||
new_name='member',
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='payment',
|
|
||||||
name='stripe_charge_id',
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='orderproduct',
|
|
||||||
name='quantity',
|
|
||||||
field=models.PositiveSmallIntegerField(default=1),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='orderproduct',
|
|
||||||
name='order',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='accounting.order'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='orderproduct',
|
|
||||||
name='product',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='accounting.product'),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,20 +1,14 @@
|
||||||
"""Models for the accounting app."""
|
|
||||||
|
|
||||||
from hashlib import md5
|
from hashlib import md5
|
||||||
from typing import Self
|
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib import admin
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models.aggregates import Sum
|
from django.db.models.aggregates import Sum
|
||||||
from django.utils.translation import gettext as _
|
from django.utils.translation import gettext as _
|
||||||
from django.utils.translation import pgettext_lazy
|
from django.utils.translation import pgettext_lazy
|
||||||
from djmoney.models.fields import MoneyField
|
from djmoney.models.fields import MoneyField
|
||||||
from djmoney.money import Money
|
|
||||||
|
|
||||||
|
|
||||||
class CreatedModifiedAbstract(models.Model):
|
class CreatedModifiedAbstract(models.Model):
|
||||||
"""Abstract model to track creation and modification of objects."""
|
|
||||||
|
|
||||||
modified = models.DateTimeField(auto_now=True, verbose_name=_("modified"))
|
modified = models.DateTimeField(auto_now=True, verbose_name=_("modified"))
|
||||||
created = models.DateTimeField(auto_now_add=True, verbose_name=_("created"))
|
created = models.DateTimeField(auto_now_add=True, verbose_name=_("created"))
|
||||||
|
@ -24,34 +18,26 @@ class CreatedModifiedAbstract(models.Model):
|
||||||
|
|
||||||
|
|
||||||
class Account(CreatedModifiedAbstract):
|
class Account(CreatedModifiedAbstract):
|
||||||
"""An account for a user.
|
"""
|
||||||
|
|
||||||
This is the model where we can give access to several users, such that they
|
This is the model where we can give access to several users, such that they
|
||||||
can decide which account to use to pay for something.
|
can decide which account to use to pay for something.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
owner = models.ForeignKey("membership.Member", on_delete=models.PROTECT)
|
owner = models.ForeignKey("auth.User", on_delete=models.PROTECT)
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"Account of {self.owner}"
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def balance(self) -> Money:
|
def balance(self):
|
||||||
"""Return the balance of the account."""
|
|
||||||
return self.transactions.all().aggregate(Sum("amount")).get("amount", 0)
|
return self.transactions.all().aggregate(Sum("amount")).get("amount", 0)
|
||||||
|
|
||||||
|
|
||||||
class Transaction(CreatedModifiedAbstract):
|
class Transaction(CreatedModifiedAbstract):
|
||||||
"""A transaction.
|
"""
|
||||||
|
|
||||||
Tracks in and outgoing events of an account. When an order is received, an
|
Tracks in and outgoing events of an account. When an order is received, an
|
||||||
amount is subtracted, when a payment is received, an amount is added.
|
amount is subtracted, when a payment is received, an amount is added.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
account = models.ForeignKey(
|
account = models.ForeignKey(
|
||||||
Account,
|
Account, on_delete=models.PROTECT, related_name="transactions"
|
||||||
on_delete=models.PROTECT,
|
|
||||||
related_name="transactions",
|
|
||||||
)
|
)
|
||||||
amount = MoneyField(
|
amount = MoneyField(
|
||||||
verbose_name=_("amount"),
|
verbose_name=_("amount"),
|
||||||
|
@ -61,149 +47,76 @@ class Transaction(CreatedModifiedAbstract):
|
||||||
)
|
)
|
||||||
description = models.CharField(max_length=1024, verbose_name=_("description"))
|
description = models.CharField(max_length=1024, verbose_name=_("description"))
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"Transaction of {self.amount} for {self.account}"
|
|
||||||
|
|
||||||
|
|
||||||
class Order(CreatedModifiedAbstract):
|
class Order(CreatedModifiedAbstract):
|
||||||
"""An order.
|
"""
|
||||||
|
Scoped out: Contents of invoices will have to be tracked either here or in
|
||||||
We assemble the order from a number of products. Once an order is paid, the contents should be
|
a separate Invoice model. This is undecided because we are not generating
|
||||||
considered locked.
|
invoices at the moment.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
member = models.ForeignKey("membership.Member", on_delete=models.PROTECT)
|
user = models.ForeignKey("auth.User", on_delete=models.PROTECT)
|
||||||
account = models.ForeignKey(Account, on_delete=models.PROTECT)
|
account = models.ForeignKey(Account, on_delete=models.PROTECT)
|
||||||
|
|
||||||
description = models.CharField(max_length=1024, verbose_name=_("description"))
|
description = models.CharField(max_length=1024, verbose_name=_("description"))
|
||||||
|
|
||||||
|
price = MoneyField(
|
||||||
|
verbose_name=_("price (excl. VAT)"), max_digits=16, decimal_places=2
|
||||||
|
)
|
||||||
|
vat = MoneyField(verbose_name=_("VAT"), max_digits=16, decimal_places=2)
|
||||||
|
|
||||||
is_paid = models.BooleanField(default=False, verbose_name=_("is paid"))
|
is_paid = models.BooleanField(default=False, verbose_name=_("is paid"))
|
||||||
|
|
||||||
class Meta:
|
@property
|
||||||
verbose_name = pgettext_lazy("accounting", "Order")
|
def total(self):
|
||||||
verbose_name_plural = pgettext_lazy("accounting", "Orders")
|
return self.price + self.vat
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"Order ID {self.display_id}"
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def total(self) -> Money:
|
def display_id(self):
|
||||||
"""Return the total price of the order (excl VAT)."""
|
|
||||||
return sum(item.price * item.quantity for item in self.items.all())
|
|
||||||
|
|
||||||
@property
|
|
||||||
def total_vat(self) -> Money:
|
|
||||||
"""Return the total VAT of the order."""
|
|
||||||
return sum(item.vat * item.quantity for item in self.items.all())
|
|
||||||
|
|
||||||
@property
|
|
||||||
@admin.display(
|
|
||||||
ordering=None,
|
|
||||||
description="Total (incl. VAT)",
|
|
||||||
boolean=False,
|
|
||||||
)
|
|
||||||
def total_with_vat(self) -> Money:
|
|
||||||
"""Return the TOTAL amount WITH VAT."""
|
|
||||||
return self.total + self.total_vat
|
|
||||||
|
|
||||||
@property
|
|
||||||
def display_id(self) -> str:
|
|
||||||
"""Return an id for the order."""
|
|
||||||
return str(self.id).zfill(6)
|
return str(self.id).zfill(6)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def payment_token(self) -> str:
|
def payment_token(self):
|
||||||
"""Return a token for the payment."""
|
|
||||||
pk = str(self.pk).encode("utf-8")
|
pk = str(self.pk).encode("utf-8")
|
||||||
x = md5() # noqa: S324
|
x = md5()
|
||||||
x.update(pk)
|
x.update(pk)
|
||||||
extra_hash = (settings.SECRET_KEY + "blah").encode("utf-8")
|
extra_hash = (settings.SECRET_KEY + "blah").encode("utf-8")
|
||||||
x.update(extra_hash)
|
x.update(extra_hash)
|
||||||
return x.hexdigest()
|
return x.hexdigest()
|
||||||
|
|
||||||
|
|
||||||
class Product(CreatedModifiedAbstract):
|
|
||||||
"""A generic product, for instance a membership or a service fee."""
|
|
||||||
|
|
||||||
name = models.CharField(max_length=512)
|
|
||||||
price = MoneyField(max_digits=16, decimal_places=2)
|
|
||||||
vat = MoneyField(max_digits=16, decimal_places=2)
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return self.name
|
|
||||||
|
|
||||||
|
|
||||||
class OrderProduct(CreatedModifiedAbstract):
|
|
||||||
"""When a product is ordered, we store the product on the order.
|
|
||||||
|
|
||||||
This includes pricing information.
|
|
||||||
"""
|
|
||||||
|
|
||||||
order = models.ForeignKey(Order, on_delete=models.CASCADE, related_name="items")
|
|
||||||
product = models.ForeignKey(Product, on_delete=models.PROTECT)
|
|
||||||
price = MoneyField(max_digits=16, decimal_places=2)
|
|
||||||
vat = MoneyField(max_digits=16, decimal_places=2)
|
|
||||||
quantity = models.PositiveSmallIntegerField(default=1)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("ordered product")
|
verbose_name = pgettext_lazy("accounting term", "Order")
|
||||||
verbose_name_plural = _("ordered products")
|
verbose_name_plural = pgettext_lazy("accounting term", "Orders")
|
||||||
|
|
||||||
def __str__(self) -> str:
|
def __str__(self):
|
||||||
return f"{self.product.name}"
|
return "Order ID {id}".format(id=self.display_id)
|
||||||
|
|
||||||
@property
|
|
||||||
def total_with_vat(self) -> Money:
|
|
||||||
"""Total price of this item."""
|
|
||||||
return (self.price + self.vat) * self.quantity
|
|
||||||
|
|
||||||
|
|
||||||
class Payment(CreatedModifiedAbstract):
|
class Payment(CreatedModifiedAbstract):
|
||||||
"""A payment is a transaction that is made to pay for an order."""
|
|
||||||
|
|
||||||
amount = MoneyField(max_digits=16, decimal_places=2)
|
amount = MoneyField(max_digits=16, decimal_places=2)
|
||||||
order = models.ForeignKey(Order, on_delete=models.PROTECT)
|
order = models.ForeignKey(Order, on_delete=models.PROTECT)
|
||||||
|
|
||||||
description = models.CharField(max_length=1024, verbose_name=_("description"))
|
description = models.CharField(max_length=1024, verbose_name=_("description"))
|
||||||
|
|
||||||
payment_type = models.ForeignKey("PaymentType", on_delete=models.PROTECT)
|
stripe_charge_id = models.CharField(max_length=255, null=True, blank=True)
|
||||||
external_transaction_id = models.CharField(max_length=255, default="", blank=True)
|
|
||||||
|
@property
|
||||||
|
def display_id(self):
|
||||||
|
return str(self.id).zfill(6)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_order(cls, order):
|
||||||
|
return cls.objects.create(
|
||||||
|
order=order,
|
||||||
|
user=order.user,
|
||||||
|
amount=order.total,
|
||||||
|
description=order.description,
|
||||||
|
)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "Payment ID {id}".format(id=self.display_id)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("payment")
|
verbose_name = _("payment")
|
||||||
verbose_name_plural = _("payments")
|
verbose_name_plural = _("payments")
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"Payment ID {self.display_id}"
|
|
||||||
|
|
||||||
@property
|
|
||||||
def display_id(self) -> str:
|
|
||||||
"""Return an id for the payment."""
|
|
||||||
return str(self.id).zfill(6)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_order(cls, order: Order, payment_type: "PaymentType") -> Self:
|
|
||||||
"""Create a payment from an order."""
|
|
||||||
return cls.objects.create(
|
|
||||||
order=order,
|
|
||||||
user=order.user,
|
|
||||||
amount=order.total + order.total_vat,
|
|
||||||
description=order.description,
|
|
||||||
payment_type=payment_type,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class PaymentType(CreatedModifiedAbstract):
|
|
||||||
"""Types of payments available in the system.
|
|
||||||
|
|
||||||
- bank transfer
|
|
||||||
- card payment (specific provider)
|
|
||||||
"""
|
|
||||||
|
|
||||||
name = models.CharField(max_length=1024, verbose_name=_("description"))
|
|
||||||
description = models.TextField(max_length=2048, blank=True)
|
|
||||||
|
|
||||||
enabled = models.BooleanField(default=True)
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"{self.name}"
|
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
"""Loaded with the AppConfig.ready() method."""
|
|
||||||
|
|
||||||
from django.core.mail import mail_admins
|
|
||||||
from django.db.models.signals import post_save
|
|
||||||
from django.dispatch import receiver
|
|
||||||
from django.utils import timezone
|
|
||||||
from membership.models import Membership
|
|
||||||
|
|
||||||
from . import models
|
|
||||||
|
|
||||||
|
|
||||||
# method for updating
|
|
||||||
@receiver(post_save, sender=models.Payment)
|
|
||||||
def check_total_amount(sender: models.Payment, instance: models.Payment, **kwargs: dict) -> None: # noqa: ARG001
|
|
||||||
"""Check that we receive Payments with the correct amount."""
|
|
||||||
if instance.amount != instance.order.total_with_vat:
|
|
||||||
mail_admins(
|
|
||||||
"Payment received: wrong amount",
|
|
||||||
f"Please check payment ID {instance.pk}",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@receiver(post_save, sender=models.Payment)
|
|
||||||
def mark_order_paid(sender: models.Payment, instance: models.Payment, **kwargs: dict) -> None: # noqa: ARG001
|
|
||||||
"""Mark an order as paid when payment is received."""
|
|
||||||
instance.order.is_paid = True
|
|
||||||
instance.order.save()
|
|
||||||
|
|
||||||
|
|
||||||
@receiver(post_save, sender=models.Order)
|
|
||||||
def activate_membership(sender: models.Order, instance: models.Order, **kwargs: dict) -> None: # noqa: ARG001
|
|
||||||
"""Mark a membership as activated when its order is marked as paid."""
|
|
||||||
if instance.is_paid:
|
|
||||||
Membership.objects.filter(order=instance, activated=False, activated_on=None).update(
|
|
||||||
activated=True, activated_on=timezone.now()
|
|
||||||
)
|
|
|
@ -1,18 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}
|
|
||||||
{% trans "Payment cancelled" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div class="content-view">
|
|
||||||
<h2>{% trans "Payment canceled" %}</h2>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<a href="{% order:detail order_id=order.id %}">{% trans "Return to order page" %}</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
|
@ -1,49 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}
|
|
||||||
{% trans "Order" context "accounting" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div class="content-view">
|
|
||||||
<h2>Order: {{ order.id }}</h2>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
{% trans "Ordered" context "accounting" %}: {{ order.created }}<br>
|
|
||||||
{% trans "Status" context "accounting" %}: {{ order.is_paid|yesno:_("paid,unpaid") }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<table class="table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>{% trans "Item" context "accounting" %}</th>
|
|
||||||
<th>{% trans "Quantity" %}</th>
|
|
||||||
<th>{% trans "Price" %}</th>
|
|
||||||
<th>{% trans "VAT" %}</th>
|
|
||||||
<th>{% trans "Total" %}</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{% for item in order.items.all %}
|
|
||||||
<tr>
|
|
||||||
<td>{{ item.product.name }}</td>
|
|
||||||
<td>{{ item.quantity }}</td>
|
|
||||||
<td>{{ item.price }}</td>
|
|
||||||
<td>{{ item.vat }}</td>
|
|
||||||
<td>{{ item.total_with_vat }}</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<h2>{% trans "Total price" %}: {{ order.total_with_vat }}</h2>
|
|
||||||
|
|
||||||
{% if not order.is_paid %}
|
|
||||||
<p>
|
|
||||||
<a href="{% url "order:pay" order_id=order.pk %}" class="button">{% trans "Pay now" %}</a>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
|
@ -1,20 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}
|
|
||||||
{% trans "Payment received" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div class="content-view">
|
|
||||||
<h2>{% trans "Payment received" %}</h2>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
{% blocktrans trimmed with order.id as order_id %}
|
|
||||||
Thanks fellow member! We received your payment for Order {{ order_id }}. We're adding more features to the site, so expect to see a confirmation email (receipt) for the order soon.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
|
@ -8,8 +8,8 @@ from . import models
|
||||||
# do stuff
|
# do stuff
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db()
|
@pytest.mark.django_db
|
||||||
def test_balance() -> None:
|
def test_balance():
|
||||||
user = User.objects.create_user("test", "lala@adas.com", "1234")
|
user = User.objects.create_user("test", "lala@adas.com", "1234")
|
||||||
account = models.Account.objects.create(owner=user)
|
account = models.Account.objects.create(owner=user)
|
||||||
assert account.balance == 0
|
assert account.balance == 0
|
||||||
|
|
|
@ -1,177 +0,0 @@
|
||||||
"""Views for the membership app."""
|
|
||||||
|
|
||||||
import stripe
|
|
||||||
from django.conf import settings
|
|
||||||
from django.contrib.sites.models import Site
|
|
||||||
from django.core.mail import mail_admins
|
|
||||||
from django.db import transaction
|
|
||||||
from django.http import HttpRequest
|
|
||||||
from django.http import HttpResponse
|
|
||||||
from django.shortcuts import get_object_or_404
|
|
||||||
from django.shortcuts import redirect
|
|
||||||
from django.shortcuts import render
|
|
||||||
from django.urls import reverse
|
|
||||||
from django.views.decorators.csrf import csrf_exempt
|
|
||||||
from django_view_decorator import namespaced_decorator_factory
|
|
||||||
from djmoney.money import Money
|
|
||||||
|
|
||||||
from . import models
|
|
||||||
|
|
||||||
order_view = namespaced_decorator_factory(namespace="order", base_path="order")
|
|
||||||
|
|
||||||
stripe.api_key = settings.STRIPE_API_KEY
|
|
||||||
|
|
||||||
|
|
||||||
@order_view(
|
|
||||||
paths="<int:order_id>/",
|
|
||||||
name="detail",
|
|
||||||
login_required=True,
|
|
||||||
)
|
|
||||||
def order_detail(request: HttpRequest, order_id: int) -> HttpResponse:
|
|
||||||
"""View to show the details of a member."""
|
|
||||||
user = request.user # People just need to login to pay something, not necessarily be a member
|
|
||||||
order = models.Order.objects.get(pk=order_id, member=user)
|
|
||||||
|
|
||||||
context = {
|
|
||||||
"order": order,
|
|
||||||
}
|
|
||||||
|
|
||||||
return render(
|
|
||||||
request=request,
|
|
||||||
template_name="accounting/order/detail.html",
|
|
||||||
context=context,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@order_view(
|
|
||||||
paths="<int:order_id>/pay/",
|
|
||||||
name="pay",
|
|
||||||
login_required=True,
|
|
||||||
)
|
|
||||||
def order_pay(request: HttpRequest, order_id: int) -> HttpResponse:
|
|
||||||
"""Create a Stripe session and redirects to Stripe Checkout."""
|
|
||||||
user = request.user # People just need to login to pay something, not necessarily be a member
|
|
||||||
order = models.Order.objects.get(pk=order_id, member=user)
|
|
||||||
current_site = Site.objects.get_current(request)
|
|
||||||
base_domain = f"https://{current_site.domain}"
|
|
||||||
if settings.DEBUG:
|
|
||||||
f"http://{current_site.domain}"
|
|
||||||
|
|
||||||
try:
|
|
||||||
line_items = []
|
|
||||||
for item in order.items.all():
|
|
||||||
line_items.append( # noqa: PERF401
|
|
||||||
{
|
|
||||||
"price_data": {
|
|
||||||
"currency": item.total_with_vat.currency,
|
|
||||||
"unit_amount": int((item.price + item.vat).amount * 100),
|
|
||||||
"product_data": {
|
|
||||||
"name": item.product.name,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"quantity": item.quantity,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
checkout_session = stripe.checkout.Session.create(
|
|
||||||
line_items=line_items,
|
|
||||||
metadata={"order_id": order.id},
|
|
||||||
mode="payment",
|
|
||||||
success_url=base_domain + reverse("order:success", kwargs={"order_id": order.id}),
|
|
||||||
cancel_url=base_domain + "/cancel",
|
|
||||||
)
|
|
||||||
except Exception as e:
|
|
||||||
mail_admins("Error in checkout", str(e))
|
|
||||||
raise
|
|
||||||
|
|
||||||
# TODO: Redirect with status=303
|
|
||||||
return redirect(checkout_session.url)
|
|
||||||
|
|
||||||
|
|
||||||
@transaction.atomic
|
|
||||||
@order_view(
|
|
||||||
paths="<int:order_id>/pay/success/",
|
|
||||||
name="success",
|
|
||||||
login_required=True,
|
|
||||||
)
|
|
||||||
def success(request: HttpRequest, order_id: int) -> HttpResponse:
|
|
||||||
"""Create a Stripe session and redirects to Stripe Checkout.
|
|
||||||
|
|
||||||
From Stripe docs: When you have a webhook endpoint set up to listen for checkout.session.completed events and
|
|
||||||
you set a success_url, Checkout waits for your server to respond to the webhook event delivery before redirecting
|
|
||||||
your customer. If you use this approach, make sure your server responds to checkout.session.completed events as
|
|
||||||
quickly as possible.
|
|
||||||
"""
|
|
||||||
user = request.user # People just need to login to pay something, not necessarily be a member
|
|
||||||
order = get_object_or_404(models.Order, pk=order_id, member=user)
|
|
||||||
|
|
||||||
context = {
|
|
||||||
"order": order,
|
|
||||||
}
|
|
||||||
|
|
||||||
return render(
|
|
||||||
request=request,
|
|
||||||
template_name="accounting/order/success.html",
|
|
||||||
context=context,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@transaction.atomic
|
|
||||||
@order_view(
|
|
||||||
paths="<int:order_id>/pay/cancel/",
|
|
||||||
name="cancel",
|
|
||||||
login_required=True,
|
|
||||||
)
|
|
||||||
def cancel(request: HttpRequest, order_id: int) -> HttpResponse:
|
|
||||||
"""Page to display when a payment is canceled."""
|
|
||||||
user = request.user # People just need to login to pay something, not necessarily be a member
|
|
||||||
order = models.Order.objects.get(pk=order_id, member=user)
|
|
||||||
|
|
||||||
context = {
|
|
||||||
"order": order,
|
|
||||||
}
|
|
||||||
|
|
||||||
return render(
|
|
||||||
request=request,
|
|
||||||
template_name="accounting/order/cancel.html",
|
|
||||||
context=context,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@transaction.atomic
|
|
||||||
@order_view(
|
|
||||||
paths="stripe/webhook/",
|
|
||||||
name="webhook",
|
|
||||||
)
|
|
||||||
@csrf_exempt
|
|
||||||
def stripe_webhook(request: HttpRequest) -> HttpResponse:
|
|
||||||
"""Handle Stripe webhook.
|
|
||||||
|
|
||||||
https://docs.stripe.com/metadata/use-cases
|
|
||||||
"""
|
|
||||||
payload = request.body
|
|
||||||
sig_header = request.headers["stripe-signature"]
|
|
||||||
event = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
event = stripe.Webhook.construct_event(payload, sig_header, settings.STRIPE_ENDPOINT_SECRET)
|
|
||||||
except ValueError:
|
|
||||||
# Invalid payload
|
|
||||||
return HttpResponse(status=400)
|
|
||||||
except stripe.error.SignatureVerificationError:
|
|
||||||
# Invalid signature
|
|
||||||
return HttpResponse(status=400)
|
|
||||||
|
|
||||||
if event["type"] == "checkout.session.completed" or event["type"] == "checkout.session.async_payment_succeeded":
|
|
||||||
# Order is marked paid via signals, Membership is activated via signals.
|
|
||||||
order_id = event["data"]["object"]["metadata"]["order_id"]
|
|
||||||
order = get_object_or_404(models.Order, pk=order_id)
|
|
||||||
if not models.Payment.objects.filter(order=order).exists():
|
|
||||||
models.Payment.objects.create(
|
|
||||||
order=order,
|
|
||||||
amount=Money(event["data"]["object"]["amount_total"] / 100.0, event["data"]["object"]["currency"]),
|
|
||||||
description="Paid via Stripe",
|
|
||||||
payment_type=models.PaymentType.objects.get_or_create(name="Stripe")[0],
|
|
||||||
external_transaction_id=event["id"],
|
|
||||||
)
|
|
||||||
|
|
||||||
return HttpResponse(status=200)
|
|
|
@ -10,6 +10,6 @@ if __name__ == "__main__":
|
||||||
raise ImportError(
|
raise ImportError(
|
||||||
"Couldn't import Django. Are you sure it's installed and "
|
"Couldn't import Django. Are you sure it's installed and "
|
||||||
"available on your PYTHONPATH environment variable? Did you "
|
"available on your PYTHONPATH environment variable? Did you "
|
||||||
"forget to activate a virtual environment?",
|
"forget to activate a virtual environment?"
|
||||||
)
|
)
|
||||||
execute_from_command_line(sys.argv)
|
execute_from_command_line(sys.argv)
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
"""Membership application.
|
"""
|
||||||
|
Membership application
|
||||||
|
======================
|
||||||
|
|
||||||
This application's domain relate to organizational structures and
|
This application's domain relate to organizational structures and
|
||||||
implementation of statutes, policies etc.
|
implementation of statutes, policies etc.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -1,168 +1,14 @@
|
||||||
"""Admin configuration for membership app."""
|
|
||||||
|
|
||||||
from collections.abc import Callable
|
|
||||||
|
|
||||||
from accounting.models import Account
|
|
||||||
from accounting.models import Order
|
|
||||||
from accounting.models import OrderProduct
|
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.contrib import messages
|
|
||||||
from django.contrib.admin import ModelAdmin
|
|
||||||
from django.contrib.auth.admin import UserAdmin
|
|
||||||
from django.contrib.auth.models import User
|
|
||||||
from django.db import transaction
|
|
||||||
from django.db.models import QuerySet
|
|
||||||
from django.http import HttpRequest
|
|
||||||
from django.http import HttpResponse
|
|
||||||
from django.utils.text import slugify
|
|
||||||
|
|
||||||
from .emails import InviteEmail
|
|
||||||
from .models import Member
|
|
||||||
from .models import Membership
|
from .models import Membership
|
||||||
from .models import MembershipType
|
from .models import MembershipType
|
||||||
from .models import SubscriptionPeriod
|
|
||||||
from .models import WaitingListEntry
|
|
||||||
|
|
||||||
# Do not use existing user admin
|
|
||||||
admin.site.unregister(User)
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(Membership)
|
@admin.register(Membership)
|
||||||
class MembershipAdmin(admin.ModelAdmin):
|
class MembershipAdmin(admin.ModelAdmin):
|
||||||
"""Admin for Membership model."""
|
pass
|
||||||
|
|
||||||
list_display = ("user", "period", "membership_type", "activated", "revoked")
|
|
||||||
list_filter = ("period", "membership_type", "activated", "revoked")
|
|
||||||
search_fields = ("membership_type__name", "user__email", "user__first_name", "user__last_name")
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(MembershipType)
|
@admin.register(MembershipType)
|
||||||
class MembershipTypeAdmin(admin.ModelAdmin):
|
class MembershipTypeAdmin(admin.ModelAdmin):
|
||||||
"""Admin for MembershipType model."""
|
pass
|
||||||
|
|
||||||
|
|
||||||
@admin.register(SubscriptionPeriod)
|
|
||||||
class SubscriptionPeriodAdmin(admin.ModelAdmin):
|
|
||||||
"""Admin for SubscriptionPeriod model."""
|
|
||||||
|
|
||||||
|
|
||||||
class MembershipInlineAdmin(admin.TabularInline):
|
|
||||||
"""Inline admin."""
|
|
||||||
|
|
||||||
model = Membership
|
|
||||||
|
|
||||||
|
|
||||||
def decorate_ensure_membership_type_exists(membership_type: MembershipType, label: str) -> Callable:
|
|
||||||
"""Generate an admin action for given membership type and label."""
|
|
||||||
|
|
||||||
@admin.action(description=label)
|
|
||||||
def admin_action(modeladmin: ModelAdmin, request: HttpRequest, queryset: QuerySet) -> HttpResponse: # noqa: ARG001
|
|
||||||
return ensure_membership_type_exists(request, queryset, membership_type)
|
|
||||||
|
|
||||||
return admin_action
|
|
||||||
|
|
||||||
|
|
||||||
@transaction.atomic
|
|
||||||
def ensure_membership_type_exists(
|
|
||||||
request: HttpRequest,
|
|
||||||
queryset: QuerySet[Member],
|
|
||||||
membership_type: MembershipType,
|
|
||||||
) -> HttpResponse:
|
|
||||||
"""Inner function that ensures that a membership exists for a given queryset of Member objects."""
|
|
||||||
for member in queryset:
|
|
||||||
if member.memberships.filter(membership_type=membership_type).current():
|
|
||||||
messages.info(request, f"{member} already has a membership {membership_type}")
|
|
||||||
else:
|
|
||||||
# Get the default account of the member. We don't really know what to do if a person owns multiple accounts.
|
|
||||||
account, __ = Account.objects.get_or_create(owner=member)
|
|
||||||
# Create an Order for the products in the membership
|
|
||||||
order = Order.objects.create(member=member, account=account, description=membership_type.name)
|
|
||||||
# Add stuff to the order
|
|
||||||
for product in membership_type.products.all():
|
|
||||||
OrderProduct.objects.create(order=order, product=product, price=product.price, vat=product.vat)
|
|
||||||
# Create the Membership
|
|
||||||
Membership.objects.create(
|
|
||||||
membership_type=membership_type,
|
|
||||||
user=member,
|
|
||||||
period=SubscriptionPeriod.objects.current(),
|
|
||||||
order=order,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Associate the order with that membership
|
|
||||||
messages.success(request, f"{member} has ordered a '{membership_type}' (unpaid)")
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(Member)
|
|
||||||
class MemberAdmin(UserAdmin):
|
|
||||||
"""Member admin is actually an admin for User objects."""
|
|
||||||
|
|
||||||
inlines = (MembershipInlineAdmin,)
|
|
||||||
actions: list[str | Callable] = ["send_invite"] # noqa: RUF012
|
|
||||||
list_display = ("email", "current_membership", "username", "is_staff", "is_active", "date_joined")
|
|
||||||
|
|
||||||
@admin.display(description="membership")
|
|
||||||
def current_membership(self, instance: Member) -> Membership | None:
|
|
||||||
return instance.memberships.current()
|
|
||||||
|
|
||||||
def get_actions(self, request: HttpRequest) -> dict:
|
|
||||||
"""Populate actions with dynamic data (MembershipType)."""
|
|
||||||
current_period = SubscriptionPeriod.objects.current()
|
|
||||||
|
|
||||||
super_dict = super().get_actions(request)
|
|
||||||
|
|
||||||
if current_period:
|
|
||||||
for i, mtype in enumerate(MembershipType.objects.filter(active=True)):
|
|
||||||
action_label = f"Ensure membership {mtype.name}, {current_period.period}, {mtype.total_including_vat}"
|
|
||||||
action_func = decorate_ensure_membership_type_exists(mtype, action_label)
|
|
||||||
# Django ModelAdmin uses the non-unique __name__ property, so we need to suffix it to make it unique
|
|
||||||
action_func.__name__ += f"_{i}"
|
|
||||||
self.actions.append(action_func)
|
|
||||||
|
|
||||||
return super_dict
|
|
||||||
|
|
||||||
@admin.action(description="Send invite email to selected inactive accounts")
|
|
||||||
def send_invite(self, request: HttpRequest, queryset: QuerySet[Member]) -> None:
|
|
||||||
for member in queryset:
|
|
||||||
if member.is_active:
|
|
||||||
messages.error(
|
|
||||||
request,
|
|
||||||
f"Computer says no! This member will not receive an invite because the account is marked "
|
|
||||||
f"as active: {member.email}. That means the member has probably created a password and a username "
|
|
||||||
f"already, please tell them to use the password reminder function.",
|
|
||||||
)
|
|
||||||
continue
|
|
||||||
if not member.memberships.current():
|
|
||||||
messages.error(
|
|
||||||
request,
|
|
||||||
f"Computer says no! This member will not receive an invite because it has no current "
|
|
||||||
f"membership: {member.email}. You need to create a current membership before sending the invite.",
|
|
||||||
)
|
|
||||||
continue
|
|
||||||
membership = member.memberships.current()
|
|
||||||
email = InviteEmail(membership, request)
|
|
||||||
email.send()
|
|
||||||
messages.success(request, f"Sent an invitation to: {member.email}")
|
|
||||||
|
|
||||||
|
|
||||||
@admin.register(WaitingListEntry)
|
|
||||||
class WaitingListEntryAdmin(admin.ModelAdmin):
|
|
||||||
"""Admin for WaitingList model."""
|
|
||||||
|
|
||||||
list_display = ("email", "member")
|
|
||||||
actions = ("create_member",)
|
|
||||||
|
|
||||||
@admin.action(description="Create member account for entries")
|
|
||||||
def create_member(self, request: HttpRequest, queryset: QuerySet[WaitingListEntry]) -> None:
|
|
||||||
"""Create a user account for this entry.
|
|
||||||
|
|
||||||
Note that actions can soon be made available from the edit page, too:
|
|
||||||
https://github.com/django/django/pull/16012
|
|
||||||
"""
|
|
||||||
for entry in queryset:
|
|
||||||
member = Member.objects.create_user(email=entry.email, username=slugify(entry.email), is_active=False)
|
|
||||||
entry.member = member
|
|
||||||
entry.save()
|
|
||||||
messages.info(
|
|
||||||
request,
|
|
||||||
f"Added user for {entry.email} - ensure they have a membership and send an invite email.",
|
|
||||||
)
|
|
||||||
|
|
|
@ -1,16 +1,5 @@
|
||||||
"""Membership app configuration."""
|
|
||||||
|
|
||||||
from django.apps import AppConfig
|
from django.apps import AppConfig
|
||||||
from django.db.models.signals import post_migrate
|
|
||||||
|
|
||||||
|
|
||||||
class MembershipConfig(AppConfig):
|
class MembershipConfig(AppConfig):
|
||||||
"""Membership app config."""
|
|
||||||
|
|
||||||
name = "membership"
|
name = "membership"
|
||||||
|
|
||||||
def ready(self) -> None:
|
|
||||||
"""Ready method."""
|
|
||||||
from .permissions import persist_permissions
|
|
||||||
|
|
||||||
post_migrate.connect(persist_permissions, sender=self)
|
|
||||||
|
|
|
@ -1,128 +0,0 @@
|
||||||
"""Send email to members, using templates and contexts for the emails.
|
|
||||||
|
|
||||||
* We keep everything as plain text for now.
|
|
||||||
* Notice that emails can be multilingual
|
|
||||||
* Generally, an email consists of templates (for body and subject) and a get_context() method.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from accounting.models import Order
|
|
||||||
from django.contrib import messages
|
|
||||||
from django.contrib.auth.tokens import default_token_generator
|
|
||||||
from django.contrib.sites.shortcuts import get_current_site
|
|
||||||
from django.core.mail.message import EmailMessage
|
|
||||||
from django.http import HttpRequest
|
|
||||||
from django.template import loader
|
|
||||||
from django.utils import translation
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
|
|
||||||
from .models import Membership
|
|
||||||
|
|
||||||
|
|
||||||
class BaseEmail(EmailMessage):
|
|
||||||
"""Send emails via templated body and subjects.
|
|
||||||
|
|
||||||
This base class is extended for all email functionality.
|
|
||||||
Because all emails are sent to the Member object, we can keep them gathered here, even when they are generated by
|
|
||||||
other apps (like the accounting app).
|
|
||||||
"""
|
|
||||||
|
|
||||||
template = "membership/email/base.txt"
|
|
||||||
# Optional: Set to a template path for subject
|
|
||||||
template_subject = None
|
|
||||||
default_subject = "SET SUBJECT HERE"
|
|
||||||
|
|
||||||
def __init__(self, request: HttpRequest, *args, **kwargs) -> None:
|
|
||||||
self.context = kwargs.pop("context", {})
|
|
||||||
self.user = kwargs.pop("user", None)
|
|
||||||
if self.user:
|
|
||||||
kwargs["to"] = [self.user.email]
|
|
||||||
self.context["user"] = self.user
|
|
||||||
self.context["recipient_name"] = self.user.get_display_name()
|
|
||||||
|
|
||||||
# Necessary to set request before instantiating body and subject
|
|
||||||
self.request = request
|
|
||||||
kwargs.setdefault("subject", self.get_subject())
|
|
||||||
kwargs.setdefault("body", self.get_body())
|
|
||||||
|
|
||||||
super().__init__(*args, **kwargs)
|
|
||||||
|
|
||||||
def get_context_data(self) -> dict:
|
|
||||||
"""Resolve common context for sending emails.
|
|
||||||
|
|
||||||
When overwriting, remember to call this via super().
|
|
||||||
"""
|
|
||||||
c = self.context
|
|
||||||
site = get_current_site(self.request)
|
|
||||||
c["request"] = self.request
|
|
||||||
c["domain"] = site.domain
|
|
||||||
c["site_name"] = site.name
|
|
||||||
c["protocol"] = "https" # if self.request and not self.request.is_secure() else "https"
|
|
||||||
return c
|
|
||||||
|
|
||||||
def get_body(self) -> str:
|
|
||||||
"""Build the email body from template and context."""
|
|
||||||
if self.user and self.user.language_code:
|
|
||||||
with translation.override(self.user.language_code):
|
|
||||||
body = loader.render_to_string(self.template, self.get_context_data())
|
|
||||||
else:
|
|
||||||
body = loader.render_to_string(self.template, self.get_context_data())
|
|
||||||
return body
|
|
||||||
|
|
||||||
def get_subject(self) -> str:
|
|
||||||
"""Build the email subject from template or self.default_subject."""
|
|
||||||
if self.user and self.user.language_code:
|
|
||||||
with translation.override(self.user.language_code):
|
|
||||||
if self.template_subject:
|
|
||||||
subject = loader.render_to_string(self.template_subject, self.get_context_data()).strip()
|
|
||||||
else:
|
|
||||||
subject = str(self.default_subject)
|
|
||||||
elif self.template_subject:
|
|
||||||
subject = loader.render_to_string(self.template_subject, self.get_context_data()).strip()
|
|
||||||
else:
|
|
||||||
subject = str(self.default_subject)
|
|
||||||
return subject
|
|
||||||
|
|
||||||
def send_with_feedback(self, *, success_msg: str | None = None, no_message: bool = False) -> None:
|
|
||||||
"""Send email, possibly adding feedback via django.contrib.messages."""
|
|
||||||
if not success_msg:
|
|
||||||
success_msg = _("Email successfully sent to {}").format(", ".join(self.to))
|
|
||||||
try:
|
|
||||||
self.send(fail_silently=False)
|
|
||||||
if not no_message:
|
|
||||||
messages.success(self.request, success_msg)
|
|
||||||
except RuntimeError:
|
|
||||||
messages.error(self.request, _("Not sent, something wrong with the mail server."))
|
|
||||||
|
|
||||||
|
|
||||||
class InviteEmail(BaseEmail):
|
|
||||||
template = "membership/emails/invite.txt"
|
|
||||||
default_subject = _("Invite to data.coop membership")
|
|
||||||
|
|
||||||
def __init__(self, membership: Membership, request: HttpRequest, *args, **kwargs) -> None:
|
|
||||||
self.membership = membership
|
|
||||||
kwargs["user"] = membership.user
|
|
||||||
kwargs["from_email"] = "kasserer@data.coop"
|
|
||||||
super().__init__(request, *args, **kwargs)
|
|
||||||
|
|
||||||
def get_context_data(self) -> dict:
|
|
||||||
c = super().get_context_data()
|
|
||||||
c["membership"] = self.membership
|
|
||||||
c["token"] = default_token_generator.make_token(self.membership.user)
|
|
||||||
c["referral_code"] = self.membership.referral_code
|
|
||||||
return c
|
|
||||||
|
|
||||||
|
|
||||||
class OrderEmail(BaseEmail):
|
|
||||||
template = "membership/emails/order.txt"
|
|
||||||
default_subject = _("Your data.coop order and payment")
|
|
||||||
|
|
||||||
def __init__(self, order: Order, request: HttpRequest, *args, **kwargs) -> None:
|
|
||||||
self.order = order
|
|
||||||
kwargs["user"] = order.member
|
|
||||||
kwargs["from_email"] = "kasserer@data.coop"
|
|
||||||
super().__init__(request, *args, **kwargs)
|
|
||||||
|
|
||||||
def get_context_data(self) -> dict:
|
|
||||||
c = super().get_context_data()
|
|
||||||
c["order"] = self.order
|
|
||||||
return c
|
|
|
@ -1,39 +0,0 @@
|
||||||
from allauth.account.adapter import get_adapter as get_allauth_adapter
|
|
||||||
from allauth.account.forms import SetPasswordForm
|
|
||||||
from django import forms
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
|
|
||||||
|
|
||||||
class InviteForm(SetPasswordForm):
|
|
||||||
"""Create a new password for a user account that is created through an invite."""
|
|
||||||
|
|
||||||
username = forms.CharField(
|
|
||||||
label=_("Username"),
|
|
||||||
widget=forms.TextInput(attrs={"placeholder": _("Username"), "autocomplete": "username"}),
|
|
||||||
)
|
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs) -> None:
|
|
||||||
self.membership = kwargs.pop("membership")
|
|
||||||
kwargs["user"] = self.membership.user
|
|
||||||
super().__init__(*args, **kwargs)
|
|
||||||
|
|
||||||
def clean_username(self) -> str:
|
|
||||||
"""Clean the username value.
|
|
||||||
|
|
||||||
Taken from the allauth Signup form - we should consider that data can be leaked here.
|
|
||||||
"""
|
|
||||||
value = self.cleaned_data["username"]
|
|
||||||
# The allauth adapter ensures the username is unique.
|
|
||||||
return get_allauth_adapter().clean_username(value)
|
|
||||||
|
|
||||||
def save(self) -> None:
|
|
||||||
"""Save instance to db.
|
|
||||||
|
|
||||||
Note: You can hack a re-activation of a deactivated account
|
|
||||||
by getting a valid token before deactivation (from the reset password form).
|
|
||||||
We can block this by also setting Membership.revoked=False when deactivating someone's account.
|
|
||||||
"""
|
|
||||||
self.user.username = self.cleaned_data["username"]
|
|
||||||
self.user.is_active = True
|
|
||||||
self.user.save()
|
|
||||||
super().save()
|
|
|
@ -7,6 +7,7 @@ from django.db import models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
initial = True
|
initial = True
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
|
|
@ -1,61 +0,0 @@
|
||||||
# Generated by Django 4.1 on 2023-01-02 21:05
|
|
||||||
|
|
||||||
import django.contrib.postgres.constraints
|
|
||||||
import django.contrib.postgres.fields.ranges
|
|
||||||
from django.db import migrations
|
|
||||||
from django.db import models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [
|
|
||||||
("membership", "0001_initial"),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name="SubscriptionPeriod",
|
|
||||||
fields=[
|
|
||||||
(
|
|
||||||
"id",
|
|
||||||
models.AutoField(
|
|
||||||
auto_created=True,
|
|
||||||
primary_key=True,
|
|
||||||
serialize=False,
|
|
||||||
verbose_name="ID",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"modified",
|
|
||||||
models.DateTimeField(auto_now=True, verbose_name="modified"),
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"created",
|
|
||||||
models.DateTimeField(auto_now_add=True, verbose_name="created"),
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"period",
|
|
||||||
django.contrib.postgres.fields.ranges.DateRangeField(verbose_name="period"),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name="membership",
|
|
||||||
name="period",
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name="membership",
|
|
||||||
name="created",
|
|
||||||
field=models.DateTimeField(auto_now_add=True, verbose_name="created"),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name="membershiptype",
|
|
||||||
name="created",
|
|
||||||
field=models.DateTimeField(auto_now_add=True, verbose_name="created"),
|
|
||||||
),
|
|
||||||
migrations.AddConstraint(
|
|
||||||
model_name="subscriptionperiod",
|
|
||||||
constraint=django.contrib.postgres.constraints.ExclusionConstraint(
|
|
||||||
expressions=[("period", "&&")], name="exclude_overlapping_periods"
|
|
||||||
),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,23 +0,0 @@
|
||||||
# Generated by Django 4.1 on 2023-01-02 21:05
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations
|
|
||||||
from django.db import models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [
|
|
||||||
("membership", "0002_subscriptionperiod_remove_membership_period_and_more"),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name="membership",
|
|
||||||
name="period",
|
|
||||||
field=models.ForeignKey(
|
|
||||||
null=True,
|
|
||||||
on_delete=django.db.models.deletion.PROTECT,
|
|
||||||
to="membership.subscriptionperiod",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,22 +0,0 @@
|
||||||
# Generated by Django 4.1 on 2023-01-02 21:06
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations
|
|
||||||
from django.db import models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [
|
|
||||||
("membership", "0003_membership_period"),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name="membership",
|
|
||||||
name="period",
|
|
||||||
field=models.ForeignKey(
|
|
||||||
on_delete=django.db.models.deletion.PROTECT,
|
|
||||||
to="membership.subscriptionperiod",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,23 +0,0 @@
|
||||||
# Generated by Django 4.1.5 on 2023-09-16 14:09
|
|
||||||
|
|
||||||
from django.db import migrations
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [
|
|
||||||
("auth", "0012_alter_user_first_name_max_length"),
|
|
||||||
("membership", "0004_alter_membership_period"),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name="Member",
|
|
||||||
fields=[],
|
|
||||||
options={
|
|
||||||
"proxy": True,
|
|
||||||
"indexes": [],
|
|
||||||
"constraints": [],
|
|
||||||
},
|
|
||||||
bases=("auth.user",),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,32 +0,0 @@
|
||||||
# Generated by Django 5.0.7 on 2024-07-20 20:45
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('membership', '0005_member'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='WaitingListEntry',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('modified', models.DateTimeField(auto_now=True, verbose_name='modified')),
|
|
||||||
('created', models.DateTimeField(auto_now_add=True, verbose_name='created')),
|
|
||||||
('email', models.EmailField(max_length=254)),
|
|
||||||
('geography', models.CharField(blank=True, default='', verbose_name='geography')),
|
|
||||||
('comment', models.TextField(blank=True)),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'verbose_name': 'waiting list entry',
|
|
||||||
'verbose_name_plural': 'waiting list entries',
|
|
||||||
},
|
|
||||||
),
|
|
||||||
migrations.AlterModelOptions(
|
|
||||||
name='membership',
|
|
||||||
options={'verbose_name': 'medlemskab', 'verbose_name_plural': 'medlemskaber'},
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,62 +0,0 @@
|
||||||
# Generated by Django 5.1b1 on 2024-08-01 10:50
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.conf import settings
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('accounting', '0007_alter_orderproduct_options_rename_user_order_member_and_more'),
|
|
||||||
('membership', '0006_waitinglistentry_alter_membership_options'),
|
|
||||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membership',
|
|
||||||
name='activated',
|
|
||||||
field=models.BooleanField(default=False, help_text='Membership was activated.', verbose_name='activated'),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membership',
|
|
||||||
name='activated_on',
|
|
||||||
field=models.DateTimeField(blank=True, null=True),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membership',
|
|
||||||
name='order',
|
|
||||||
field=models.ForeignKey(blank=True, help_text='The order filled in for paying this membership.', null=True, on_delete=django.db.models.deletion.PROTECT, to='accounting.order', verbose_name='order'),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membership',
|
|
||||||
name='revoked',
|
|
||||||
field=models.BooleanField(default=False, help_text='Membership has explicitly been revoked. Revoking a membership is not associated with regular expiration of the membership period.', verbose_name='revoked'),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membership',
|
|
||||||
name='revoked_on',
|
|
||||||
field=models.DateTimeField(blank=True, null=True),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membership',
|
|
||||||
name='revoked_reason',
|
|
||||||
field=models.TextField(blank=True),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membershiptype',
|
|
||||||
name='active',
|
|
||||||
field=models.BooleanField(default=True),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membershiptype',
|
|
||||||
name='products',
|
|
||||||
field=models.ManyToManyField(to='accounting.product'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='membership',
|
|
||||||
name='user',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to=settings.AUTH_USER_MODEL),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,19 +0,0 @@
|
||||||
# Generated by Django 5.1b1 on 2024-08-04 10:26
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('membership', '0007_membership_activated_membership_activated_on_and_more'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='membership',
|
|
||||||
name='membership_type',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to='membership.membershiptype', verbose_name='membership type'),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,32 +0,0 @@
|
||||||
# Generated by Django 5.1rc1 on 2024-08-07 22:32
|
|
||||||
|
|
||||||
import uuid
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
def create_uuid(apps, schema_editor):
|
|
||||||
Membership = apps.get_model('membership', 'Membership')
|
|
||||||
for membership in Membership.objects.all():
|
|
||||||
membership.referral_code = uuid.uuid4()
|
|
||||||
membership.save()
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('membership', '0008_alter_membership_membership_type'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='membership',
|
|
||||||
name='referral_code',
|
|
||||||
field=models.UUIDField(blank=True, null=True, default=uuid.uuid4, editable=False),
|
|
||||||
),
|
|
||||||
migrations.RunPython(create_uuid),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='membership',
|
|
||||||
name='referral_code',
|
|
||||||
field=models.UUIDField(unique=True, default=uuid.uuid4, editable=False),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,19 +0,0 @@
|
||||||
# Generated by Django 5.1rc1 on 2024-08-14 08:05
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('membership', '0009_membership_referral_code'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='waitinglistentry',
|
|
||||||
name='member',
|
|
||||||
field=models.ForeignKey(help_text='Once a member account is generated (use the admin action), this field will be marked.', null=True, blank=True, on_delete=django.db.models.deletion.CASCADE, to='membership.member', verbose_name='has member'),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -1,247 +1,76 @@
|
||||||
"""Models for the membership app."""
|
from typing import Optional
|
||||||
|
|
||||||
import uuid
|
from django.contrib.postgres.fields import DateTimeRangeField
|
||||||
from typing import ClassVar
|
|
||||||
from typing import Self
|
|
||||||
|
|
||||||
from django.contrib.auth.models import User
|
|
||||||
from django.contrib.auth.models import UserManager
|
|
||||||
from django.contrib.postgres.constraints import ExclusionConstraint
|
|
||||||
from django.contrib.postgres.fields import DateRangeField
|
|
||||||
from django.contrib.postgres.fields import RangeOperators
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.translation import gettext as _
|
from django.utils.translation import gettext as _
|
||||||
from djmoney.money import Money
|
|
||||||
from utils.mixins import CreatedModifiedAbstract
|
|
||||||
|
|
||||||
|
|
||||||
class NoSubscriptionPeriodFoundError(Exception):
|
class CreatedModifiedAbstract(models.Model):
|
||||||
"""Raised when no subscription period is found."""
|
|
||||||
|
|
||||||
|
modified = models.DateTimeField(auto_now=True, verbose_name=_("modified"))
|
||||||
class Member(User):
|
created = models.DateTimeField(auto_now_add=True, verbose_name=_("created"))
|
||||||
"""Proxy model for the User model to add some convenience methods."""
|
|
||||||
|
|
||||||
class QuerySet(models.QuerySet):
|
|
||||||
"""QuerySet for the Member model."""
|
|
||||||
|
|
||||||
def annotate_membership(self) -> Self:
|
|
||||||
"""Annotate whether the user has an active membership."""
|
|
||||||
from .selectors import get_current_subscription_period
|
|
||||||
|
|
||||||
current_subscription_period = get_current_subscription_period()
|
|
||||||
|
|
||||||
if not current_subscription_period:
|
|
||||||
raise NoSubscriptionPeriodFoundError
|
|
||||||
|
|
||||||
return self.annotate(
|
|
||||||
active_membership=models.Exists(
|
|
||||||
Membership.objects.filter(
|
|
||||||
user=models.OuterRef("pk"),
|
|
||||||
period=current_subscription_period.id,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
objects = UserManager.from_queryset(QuerySet)()
|
|
||||||
|
|
||||||
def get_display_name(self) -> str:
|
|
||||||
"""Choose how to display the user in emails and UI and ultimately to other users.
|
|
||||||
|
|
||||||
It's crucial that we currently don't have a good solution for this.
|
|
||||||
We should allow the user to define their own nick.
|
|
||||||
"""
|
|
||||||
return self.username
|
|
||||||
|
|
||||||
@property
|
|
||||||
def language_code(self) -> str:
|
|
||||||
"""Returns the user's preferred language code.
|
|
||||||
|
|
||||||
We don't have an actual setting for this... because this is a proxy table.
|
|
||||||
"""
|
|
||||||
return "da-dk"
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
proxy = True
|
abstract = True
|
||||||
|
|
||||||
|
|
||||||
class SubscriptionPeriod(CreatedModifiedAbstract):
|
class Membership(CreatedModifiedAbstract):
|
||||||
"""A subscription period.
|
"""
|
||||||
|
Tracks that a user has membership of a given type for a given period.
|
||||||
Denotes a period for which members should pay their membership fee for.
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
class QuerySet(models.QuerySet):
|
class QuerySet(models.QuerySet):
|
||||||
"""QuerySet for the Membership model."""
|
def for_user(self, user):
|
||||||
|
return self.filter(user=user)
|
||||||
|
|
||||||
def _current(self) -> Self:
|
def _current(self):
|
||||||
"""Filter memberships for the current period."""
|
|
||||||
return self.filter(period__contains=timezone.now())
|
return self.filter(period__contains=timezone.now())
|
||||||
|
|
||||||
def current(self) -> "Membership | None":
|
def current(self) -> Optional["Membership"]:
|
||||||
"""Get the current membership."""
|
|
||||||
try:
|
try:
|
||||||
return self._current().get()
|
return self._current().get()
|
||||||
except self.model.DoesNotExist:
|
except self.model.DoesNotExist:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
objects = QuerySet.as_manager()
|
def previous(self):
|
||||||
|
|
||||||
period = DateRangeField(verbose_name=_("period"))
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
constraints: ClassVar = [
|
|
||||||
ExclusionConstraint(
|
|
||||||
name="exclude_overlapping_periods",
|
|
||||||
expressions=[
|
|
||||||
("period", RangeOperators.OVERLAPS),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"{self.period.lower} - {self.period.upper or _('next general assembly')}"
|
|
||||||
|
|
||||||
|
|
||||||
class Membership(CreatedModifiedAbstract):
|
|
||||||
"""A membership.
|
|
||||||
|
|
||||||
Tracks that a user has membership of a given type for a given period.
|
|
||||||
"""
|
|
||||||
|
|
||||||
class QuerySet(models.QuerySet):
|
|
||||||
"""QuerySet for the Membership model."""
|
|
||||||
|
|
||||||
def for_member(self, member: Member) -> Self:
|
|
||||||
"""Filter memberships for a given member."""
|
|
||||||
return self.filter(user=member)
|
|
||||||
|
|
||||||
def active(self) -> Self:
|
|
||||||
"""Get only activated, non-revoked memberships (may have expired so use also current())."""
|
|
||||||
return self.filter(activated=True, revoked=False)
|
|
||||||
|
|
||||||
def _current(self) -> Self:
|
|
||||||
"""Filter memberships for the current period."""
|
|
||||||
return self.filter(period__period__contains=timezone.now())
|
|
||||||
|
|
||||||
def current(self) -> "Membership | None":
|
|
||||||
"""Get the current membership."""
|
|
||||||
return self._current().first()
|
|
||||||
|
|
||||||
def previous(self) -> list["Membership"]:
|
|
||||||
"""Get previous memberships."""
|
|
||||||
# A naïve way to get previous by just excluding the current. This
|
# A naïve way to get previous by just excluding the current. This
|
||||||
# means that there must be some protection against "future"
|
# means that there must be some protection against "future"
|
||||||
# memberships.
|
# memberships.
|
||||||
return list(self.all().difference(self._current()))
|
return self.all().difference(self._current())
|
||||||
|
|
||||||
objects = QuerySet.as_manager()
|
objects = QuerySet.as_manager()
|
||||||
|
|
||||||
user = models.ForeignKey("auth.User", on_delete=models.PROTECT, related_name="memberships")
|
|
||||||
|
|
||||||
# This code is used for inviting a user to create an account for this membership.
|
|
||||||
referral_code = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
|
|
||||||
|
|
||||||
membership_type = models.ForeignKey(
|
|
||||||
"membership.MembershipType",
|
|
||||||
related_name="memberships",
|
|
||||||
verbose_name=_("membership type"),
|
|
||||||
on_delete=models.PROTECT,
|
|
||||||
)
|
|
||||||
|
|
||||||
period = models.ForeignKey(
|
|
||||||
"membership.SubscriptionPeriod",
|
|
||||||
on_delete=models.PROTECT,
|
|
||||||
)
|
|
||||||
|
|
||||||
order = models.ForeignKey(
|
|
||||||
"accounting.Order",
|
|
||||||
null=True,
|
|
||||||
blank=True,
|
|
||||||
verbose_name=_("order"),
|
|
||||||
help_text=_("The order filled in for paying this membership."),
|
|
||||||
on_delete=models.PROTECT,
|
|
||||||
)
|
|
||||||
|
|
||||||
activated = models.BooleanField(
|
|
||||||
default=False, verbose_name=_("activated"), help_text=_("Membership was activated.")
|
|
||||||
)
|
|
||||||
activated_on = models.DateTimeField(null=True, blank=True)
|
|
||||||
|
|
||||||
revoked = models.BooleanField(
|
|
||||||
default=False,
|
|
||||||
verbose_name=_("revoked"),
|
|
||||||
help_text=_(
|
|
||||||
"Membership has explicitly been revoked. Revoking a membership is not associated with regular expiration "
|
|
||||||
"of the membership period."
|
|
||||||
),
|
|
||||||
)
|
|
||||||
revoked_reason = models.TextField(blank=True)
|
|
||||||
revoked_on = models.DateTimeField(null=True, blank=True)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("membership")
|
verbose_name = _("membership")
|
||||||
verbose_name_plural = _("memberships")
|
verbose_name_plural = _("memberships")
|
||||||
|
|
||||||
def __str__(self) -> str:
|
user = models.ForeignKey("auth.User", on_delete=models.PROTECT)
|
||||||
|
|
||||||
|
membership_type = models.ForeignKey(
|
||||||
|
"membership.MembershipType",
|
||||||
|
related_name="memberships",
|
||||||
|
verbose_name=_("subscription type"),
|
||||||
|
on_delete=models.PROTECT,
|
||||||
|
)
|
||||||
|
|
||||||
|
period = DateTimeRangeField(help_text=_("The duration this subscription is for. "))
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
return f"{self.user} - {self.period}"
|
return f"{self.user} - {self.period}"
|
||||||
|
|
||||||
|
|
||||||
class MembershipType(CreatedModifiedAbstract):
|
class MembershipType(CreatedModifiedAbstract):
|
||||||
"""A membership type.
|
"""
|
||||||
|
|
||||||
Models membership types. Currently only a name, but will in the future
|
Models membership types. Currently only a name, but will in the future
|
||||||
possibly contain more information like fees.
|
possibly contain more information like fees.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
name = models.CharField(verbose_name=_("name"), max_length=64)
|
|
||||||
|
|
||||||
products = models.ManyToManyField("accounting.Product")
|
|
||||||
|
|
||||||
active = models.BooleanField(default=True)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("membership type")
|
verbose_name = _("membership type")
|
||||||
verbose_name_plural = _("membership types")
|
verbose_name_plural = _("membership types")
|
||||||
|
|
||||||
def __str__(self) -> str:
|
name = models.CharField(verbose_name=_("name"), max_length=64)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
def create_membership(self, user: User) -> Membership:
|
|
||||||
"""Create a current membership for this type."""
|
|
||||||
from .selectors import get_current_subscription_period
|
|
||||||
|
|
||||||
return Membership.objects.create(
|
|
||||||
membership_type=self,
|
|
||||||
user=user,
|
|
||||||
period=get_current_subscription_period(),
|
|
||||||
)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def total_including_vat(self) -> Money:
|
|
||||||
"""Calculate the total price of this membership (including VAT)."""
|
|
||||||
return sum(product.price + product.vat for product in self.products.all())
|
|
||||||
|
|
||||||
|
|
||||||
class WaitingListEntry(CreatedModifiedAbstract):
|
|
||||||
"""People who for some reason could want to be added to a waiting list and invited to join later."""
|
|
||||||
|
|
||||||
email = models.EmailField()
|
|
||||||
geography = models.CharField(verbose_name=_("geography"), blank=True, default="")
|
|
||||||
comment = models.TextField(blank=True)
|
|
||||||
member = models.ForeignKey(
|
|
||||||
Member,
|
|
||||||
null=True,
|
|
||||||
blank=True,
|
|
||||||
verbose_name=_("has member"),
|
|
||||||
help_text=_("Once a member account is generated (use the admin action), this field will be marked."),
|
|
||||||
on_delete=models.CASCADE,
|
|
||||||
)
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return self.email
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
verbose_name = _("waiting list entry")
|
|
||||||
verbose_name_plural = _("waiting list entries")
|
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
"""Permissions for the membership app."""
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
|
|
||||||
from django.contrib.auth.models import Permission as DjangoPermission
|
|
||||||
from django.contrib.contenttypes.models import ContentType
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
|
|
||||||
PERMISSIONS = []
|
|
||||||
|
|
||||||
|
|
||||||
def persist_permissions(*args, **kwargs) -> None: # type: ignore[no-untyped-def] # noqa: ARG001
|
|
||||||
"""Persist all permissions."""
|
|
||||||
for permission in PERMISSIONS:
|
|
||||||
permission.persist_permission()
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class Permission:
|
|
||||||
"""Dataclass to define a permission."""
|
|
||||||
|
|
||||||
name: str
|
|
||||||
codename: str
|
|
||||||
app_label: str
|
|
||||||
model: str
|
|
||||||
|
|
||||||
def __post_init__(self, *args, **kwargs) -> None:
|
|
||||||
"""Post init method."""
|
|
||||||
PERMISSIONS.append(self)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def path(self) -> str:
|
|
||||||
"""Return the path of the permission."""
|
|
||||||
return f"{self.app_label}.{self.codename}"
|
|
||||||
|
|
||||||
def persist_permission(self) -> None:
|
|
||||||
"""Persist the permission."""
|
|
||||||
content_type, _ = ContentType.objects.get_or_create(
|
|
||||||
app_label=self.app_label,
|
|
||||||
model=self.model,
|
|
||||||
)
|
|
||||||
DjangoPermission.objects.get_or_create(
|
|
||||||
content_type=content_type,
|
|
||||||
codename=self.codename,
|
|
||||||
defaults={"name": self.name},
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
ADMINISTRATE_MEMBERS = Permission(
|
|
||||||
name=_("Can administrate members"),
|
|
||||||
codename="administrate_members",
|
|
||||||
app_label="membership",
|
|
||||||
model="membership",
|
|
||||||
)
|
|
|
@ -1,73 +0,0 @@
|
||||||
"""Selectors for the membership app."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import contextlib
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
from django.db.models import Exists
|
|
||||||
from django.db.models import OuterRef
|
|
||||||
from django.utils import timezone
|
|
||||||
|
|
||||||
from membership.models import Member
|
|
||||||
from membership.models import Membership
|
|
||||||
from membership.models import SubscriptionPeriod
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.db.models.query import QuerySet
|
|
||||||
|
|
||||||
|
|
||||||
def get_subscription_periods(member: Member | None = None) -> list[SubscriptionPeriod]:
|
|
||||||
"""Get all subscription periods."""
|
|
||||||
subscription_periods = SubscriptionPeriod.objects.prefetch_related(
|
|
||||||
"membership_set",
|
|
||||||
"membership_set__user",
|
|
||||||
).all()
|
|
||||||
|
|
||||||
if member:
|
|
||||||
subscription_periods = subscription_periods.annotate(
|
|
||||||
membership_exists=Exists(
|
|
||||||
Membership.objects.filter(
|
|
||||||
user=member,
|
|
||||||
period=OuterRef("pk"),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
).filter(membership_exists=True)
|
|
||||||
|
|
||||||
return list(subscription_periods)
|
|
||||||
|
|
||||||
|
|
||||||
def get_current_subscription_period() -> SubscriptionPeriod | None:
|
|
||||||
"""Get the current subscription period."""
|
|
||||||
with contextlib.suppress(SubscriptionPeriod.DoesNotExist):
|
|
||||||
return SubscriptionPeriod.objects.prefetch_related(
|
|
||||||
"membership_set",
|
|
||||||
"membership_set__user",
|
|
||||||
).get(period__contains=timezone.now())
|
|
||||||
|
|
||||||
|
|
||||||
def get_memberships(
|
|
||||||
*,
|
|
||||||
member: Member | None = None,
|
|
||||||
period: SubscriptionPeriod | None = None,
|
|
||||||
) -> Membership.QuerySet:
|
|
||||||
"""Get memberships."""
|
|
||||||
memberships = Membership.objects.select_related("membership_type").all()
|
|
||||||
|
|
||||||
if member:
|
|
||||||
memberships = memberships.for_member(member=member)
|
|
||||||
|
|
||||||
if period:
|
|
||||||
memberships = memberships.filter(period=period)
|
|
||||||
|
|
||||||
return memberships
|
|
||||||
|
|
||||||
|
|
||||||
def get_members() -> QuerySet[Member]:
|
|
||||||
"""Get all members."""
|
|
||||||
return Member.objects.all().annotate_membership().order_by("username")
|
|
||||||
|
|
||||||
|
|
||||||
def get_member(*, member_id: int) -> Member:
|
|
||||||
"""Get a member by id."""
|
|
||||||
return get_members().get(id=member_id)
|
|
|
@ -1,9 +0,0 @@
|
||||||
{% load i18n %}{% block greeting %}{% blocktrans %}Dear {{ recipient_name }},{% endblocktrans %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}{% endblock %}
|
|
||||||
|
|
||||||
|
|
||||||
{% trans "Cooperatively yours," %}
|
|
||||||
{{ site_name }}
|
|
||||||
|
|
||||||
{{ protocol }}://{{ domain }}
|
|
|
@ -1,7 +0,0 @@
|
||||||
{% extends "membership/emails/base.txt" %}{% load i18n %}
|
|
||||||
|
|
||||||
{% block content %}{% url 'member:membership-invite' token=token referral_code=referral_code as invite_url %}{% blocktrans %}Here is your secret URL for creating an account with us:
|
|
||||||
|
|
||||||
{{ protocol }}://{{ domain }}{{ invite_url }}
|
|
||||||
|
|
||||||
If you did not request this account, get in touch with us.{% endblocktrans %}{% endblock %}
|
|
|
@ -1,17 +0,0 @@
|
||||||
{% extends "membership/emails/base.txt" %}{% load i18n %}
|
|
||||||
|
|
||||||
{% block content %}{% url 'order:detail' order_id=order.id as order_url %}{% blocktrans %}You have an order in our system, which you can pay here:
|
|
||||||
|
|
||||||
{{ protocol }}://{{ domain }}{{ order_url }}
|
|
||||||
|
|
||||||
We used to handle membership stuff in a spreadsheet and via bank transfers. This is now all handled with our custom-made membership system. We hope you like it.
|
|
||||||
|
|
||||||
If you received this email and no longer want a membership, you can ignore it. But please let us know by writing board@data.coop, so we can erase any personal data we have about your previous membership.
|
|
||||||
|
|
||||||
Dansk:
|
|
||||||
|
|
||||||
Hej! Så kører medlemsystemet endeligt! Det er mega-fedt, fordi vi længe har haft besvær med manuelle procedurer. Nu har vi flyttet medlemsdata over på member.data.coop, og betalingen fungerer. Vi kan dermed fremover arbejde stille og roligt på at integrere systemet, så man kan styre sine services via medlemssystemet.
|
|
||||||
|
|
||||||
Hvis du ikke længere vil være medlem, kan du ignorere mailen her; men du må meget gerne informere os via board@data.coop, så vi kan slette evt. personlige data og services, du har kørende på dit tidligere medlemskab.
|
|
||||||
|
|
||||||
{% endblocktrans %}{% endblock %}
|
|
|
@ -1,21 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}
|
|
||||||
{% trans "Membership" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div class="content-view">
|
|
||||||
<h2>{% trans "Create account" %}</h2>
|
|
||||||
<p>{% trans "Congratulations! You've been invited to create an account with us:" %}</p>
|
|
||||||
<p>Email: <strong>{{ membership.user.email }}</strong></p>
|
|
||||||
<form method="POST">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form.as_p }}
|
|
||||||
<button type="submit" class="btn">{% trans "Create account" %}</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
|
@ -1,45 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}
|
|
||||||
{% trans "Member detail" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div class="content-view">
|
|
||||||
<h1>
|
|
||||||
{{ member.username }}
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<h3>{% trans "Membership" %}</h3>
|
|
||||||
|
|
||||||
{% if subscription_periods %}
|
|
||||||
<table class="table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>{% trans "Start" %}</th>
|
|
||||||
<th>{% trans "End" %}</th>
|
|
||||||
<th>{% trans "Has membership" %}</th>
|
|
||||||
<th>{% trans "Actions" %}</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{% for period in subscription_periods %}
|
|
||||||
<tr {% if not period.period.upper %}class="table-active"{% endif %}>
|
|
||||||
<td>{{ period.period.lower }}</td>
|
|
||||||
<td>{{ period.period.upper }}</td>
|
|
||||||
<td>{{ period.membership_exists }}</td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
{% else %}
|
|
||||||
{% trans "No memberships" %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
|
|
@ -1,63 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}
|
|
||||||
{% trans "Membership" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div class="content-view">
|
|
||||||
<h2>Membership settings</h2>
|
|
||||||
{% if not current_membership %}
|
|
||||||
<p>{% trans "You do not have an active membership!" %}</p>
|
|
||||||
|
|
||||||
<p>{% trans "You can become a member by depositing the membership fee to our bank account." %}</p>
|
|
||||||
|
|
||||||
<ul>
|
|
||||||
<li>Reg. 8401 (Merkur)</li>
|
|
||||||
<li>Kontonr. 1016866</li>
|
|
||||||
<li>Tekst på overførslen: Your email</li>
|
|
||||||
</ul>
|
|
||||||
{% else %}
|
|
||||||
<p>{% trans "You are a member!" %}</p>
|
|
||||||
|
|
||||||
{% trans "next general assembly" as next_general_assembly %}
|
|
||||||
<p>{% trans "Period" %}: {{ current_period.lower|date:"SHORT_DATE_FORMAT" }} to {{ current_period.upper|date:"SHORT_DATE_FORMAT"|default:next_general_assembly }}</p>
|
|
||||||
<p>{% trans "Type" %}: {{ current_membership.membership_type }}</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="content-view">
|
|
||||||
<h2>Profile settings</h2>
|
|
||||||
<form>
|
|
||||||
<div>
|
|
||||||
<label for="username">
|
|
||||||
Username
|
|
||||||
</label>
|
|
||||||
<input id="username" type="text" value="{{user}}" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label for="first_name">
|
|
||||||
First name
|
|
||||||
</label>
|
|
||||||
<input id="first_name" type="text" value="{{user.first_name}}" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label for="last_name">
|
|
||||||
Last name
|
|
||||||
</label>
|
|
||||||
<input id="last_name" type="text" value="{{user.last_name}}" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button>Update Profile</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="view-list">
|
|
||||||
<h2>Email settings</h2>
|
|
||||||
<button>Update Email</button>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
22
src/membership/templates/membership_overview.html
Normal file
22
src/membership/templates/membership_overview.html
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
{% extends "base.html" %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
{% if not current_membership %}
|
||||||
|
<p>{% trans "You do not have an active membership!" %}</p>
|
||||||
|
|
||||||
|
<p>{% trans "You can become a member by depositing the membership fee to our bank account." %}</p>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li>Reg. 8401 (Merkur)</li>
|
||||||
|
<li>Kontonr. 1016866</li>
|
||||||
|
<li>Tekst på overførslen: Your email</li>
|
||||||
|
</ul>
|
||||||
|
{% else %}
|
||||||
|
<p>{% trans "You are a member!" %}</p>
|
||||||
|
|
||||||
|
<p>{% trans "Period" %}: {{ current_membership.period.lower|date:"SHORT_DATE_FORMAT" }} to {{ current_membership.period.upper|date:"SHORT_DATE_FORMAT" }}</p>
|
||||||
|
<p>{% trans "Type" %}: {{ current_membership.membership_type }}</p>
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
|
@ -1,169 +1,18 @@
|
||||||
"""Views for the membership app."""
|
from django.contrib.auth.decorators import login_required
|
||||||
|
from django.shortcuts import render
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
from django.contrib import messages
|
|
||||||
from django.contrib.auth.tokens import default_token_generator
|
|
||||||
from django.http import HttpResponseForbidden
|
|
||||||
from django.shortcuts import get_object_or_404
|
|
||||||
from django.shortcuts import redirect
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
from django_ratelimit.decorators import ratelimit
|
|
||||||
from django_view_decorator import namespaced_decorator_factory
|
|
||||||
from utils.view_utils import RenderConfig
|
|
||||||
from utils.view_utils import RowAction
|
|
||||||
from utils.view_utils import render
|
|
||||||
|
|
||||||
from .forms import InviteForm
|
|
||||||
from .models import Membership
|
from .models import Membership
|
||||||
from .permissions import ADMINISTRATE_MEMBERS
|
|
||||||
from .selectors import get_member
|
|
||||||
from .selectors import get_members
|
|
||||||
from .selectors import get_memberships
|
|
||||||
from .selectors import get_subscription_periods
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from django.http import HttpRequest
|
|
||||||
from django.http import HttpResponse
|
|
||||||
|
|
||||||
member_view = namespaced_decorator_factory(namespace="member", base_path="membership")
|
|
||||||
|
|
||||||
|
|
||||||
@member_view(
|
@login_required
|
||||||
paths="",
|
def membership_overview(request):
|
||||||
name="membership-overview",
|
memberships = Membership.objects.for_user(request.user)
|
||||||
login_required=True,
|
|
||||||
)
|
|
||||||
def membership_overview(request: HttpRequest) -> HttpResponse:
|
|
||||||
"""View to show the membership overview."""
|
|
||||||
memberships = get_memberships(member=request.user)
|
|
||||||
current_membership = memberships.current()
|
current_membership = memberships.current()
|
||||||
previous_memberships = memberships.previous()
|
previous_memberships = memberships.previous()
|
||||||
|
|
||||||
current_period = current_membership.period.period if current_membership else None
|
context = dict(
|
||||||
|
current_membership=current_membership,
|
||||||
context = {
|
previous_memberships=previous_memberships,
|
||||||
"current_membership": current_membership,
|
|
||||||
"current_period": current_period,
|
|
||||||
"previous_memberships": previous_memberships,
|
|
||||||
}
|
|
||||||
|
|
||||||
return render(
|
|
||||||
request=request,
|
|
||||||
template_name="membership/membership_overview.html",
|
|
||||||
context=context,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
return render(request, "membership_overview.html", context)
|
||||||
admin_members_view = namespaced_decorator_factory(
|
|
||||||
namespace="admin-members",
|
|
||||||
base_path="admin",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@admin_members_view(
|
|
||||||
paths="members/",
|
|
||||||
name="list",
|
|
||||||
login_required=True,
|
|
||||||
permissions=[ADMINISTRATE_MEMBERS.path],
|
|
||||||
)
|
|
||||||
def members_admin(request: HttpRequest) -> HttpResponse:
|
|
||||||
"""View to list all members."""
|
|
||||||
users = get_members()
|
|
||||||
|
|
||||||
render_config = RenderConfig(
|
|
||||||
entity_name="member",
|
|
||||||
entity_name_plural="members",
|
|
||||||
paginate_by=20,
|
|
||||||
objects=users,
|
|
||||||
columns=[
|
|
||||||
("username", _("Username")),
|
|
||||||
("first_name", _("First name")),
|
|
||||||
("last_name", _("Last name")),
|
|
||||||
("email", _("Email")),
|
|
||||||
("active_membership", _("Active membership")),
|
|
||||||
],
|
|
||||||
row_actions=[
|
|
||||||
RowAction(
|
|
||||||
label=_("View"),
|
|
||||||
url_name="admin-members:detail",
|
|
||||||
url_kwargs={"member_id": "id"},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
return render_config.render_list(
|
|
||||||
request=request,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@admin_members_view(
|
|
||||||
paths="<int:member_id>/",
|
|
||||||
name="detail",
|
|
||||||
login_required=True,
|
|
||||||
permissions=[ADMINISTRATE_MEMBERS.path],
|
|
||||||
)
|
|
||||||
def members_admin_detail(request: HttpRequest, member_id: int) -> HttpResponse:
|
|
||||||
"""View to show the details of a member."""
|
|
||||||
member = get_member(member_id=member_id)
|
|
||||||
subscription_periods = get_subscription_periods(member=member)
|
|
||||||
|
|
||||||
context = {
|
|
||||||
"member": member,
|
|
||||||
"subscription_periods": subscription_periods,
|
|
||||||
"base_path": "admin-members:list",
|
|
||||||
}
|
|
||||||
|
|
||||||
return render(
|
|
||||||
request=request,
|
|
||||||
template_name="membership/members_admin_detail.html",
|
|
||||||
context=context,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@ratelimit(group="membership", key="ip", rate="10/d", method="ALL", block=True)
|
|
||||||
@member_view(
|
|
||||||
paths="invite/<str:referral_code>/<str:token>/",
|
|
||||||
name="membership-invite",
|
|
||||||
login_required=False,
|
|
||||||
)
|
|
||||||
def invite(request: HttpRequest, referral_code: str, token: str) -> HttpResponse:
|
|
||||||
"""View to invite a member to create a membership.
|
|
||||||
|
|
||||||
The token belongs to a non-active Member object. If the token is valid,
|
|
||||||
the caller is allowed to create a membership.
|
|
||||||
|
|
||||||
We ratelimit this view so it's not possible to brute-force tokens.
|
|
||||||
"""
|
|
||||||
if request.user.is_authenticated:
|
|
||||||
return HttpResponseForbidden("You're already logged in. So you cannot receive an invite.")
|
|
||||||
|
|
||||||
# Firstly, we get the membership by the referral code.
|
|
||||||
membership = get_object_or_404(Membership, referral_code=referral_code, user__is_active=False, revoked=False)
|
|
||||||
|
|
||||||
token_valid = default_token_generator.check_token(membership.user, token)
|
|
||||||
|
|
||||||
if not token_valid:
|
|
||||||
raise HttpResponseForbidden("Token not valid - maybe it expired?")
|
|
||||||
|
|
||||||
if request.method == "POST":
|
|
||||||
form = InviteForm(membership=membership, data=request.POST)
|
|
||||||
if form.is_valid():
|
|
||||||
form.save()
|
|
||||||
messages.info(request, _("Password is set for your account and you can now login."))
|
|
||||||
return redirect("account_login")
|
|
||||||
else:
|
|
||||||
form = InviteForm(membership=membership)
|
|
||||||
|
|
||||||
context = {
|
|
||||||
"token": token,
|
|
||||||
"membership": membership,
|
|
||||||
"form": form,
|
|
||||||
}
|
|
||||||
return render(
|
|
||||||
request=request,
|
|
||||||
template_name="membership/invite.html",
|
|
||||||
context=context,
|
|
||||||
)
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
"""data.coop member system."""
|
|
7
src/project/context_processors.py
Normal file
7
src/project/context_processors.py
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
"""Context processors for the membersystem app."""
|
||||||
|
from django.contrib.sites.shortcuts import get_current_site
|
||||||
|
|
||||||
|
|
||||||
|
def current_site(request):
|
||||||
|
"""Include the current site in the context."""
|
||||||
|
return {"site": get_current_site(request)}
|
|
@ -1,13 +1,8 @@
|
||||||
"""Settings for the project."""
|
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
import django_stubs_ext
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from environs import Env
|
from environs import Env
|
||||||
|
|
||||||
django_stubs_ext.monkeypatch()
|
|
||||||
|
|
||||||
env = Env()
|
env = Env()
|
||||||
env.read_env()
|
env.read_env()
|
||||||
|
|
||||||
|
@ -21,18 +16,13 @@ SECRET_KEY = env.str("SECRET_KEY", default="something-very-secret")
|
||||||
DEBUG = env.bool("DEBUG", default=False)
|
DEBUG = env.bool("DEBUG", default=False)
|
||||||
|
|
||||||
ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["*"])
|
ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["*"])
|
||||||
CSRF_TRUSTED_ORIGINS = env.list(
|
|
||||||
"CSRF_TRUSTED_ORIGINS",
|
|
||||||
default=["http://localhost:8000"],
|
|
||||||
)
|
|
||||||
|
|
||||||
ADMINS = [tuple(x.split(":")) for x in env.list("DJANGO_ADMINS", default=[])]
|
ADMINS = [tuple(x.split(":")) for x in env.list("DJANGO_ADMINS", default=[])]
|
||||||
|
|
||||||
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
|
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
DJANGO_APPS = [
|
INSTALLED_APPS = [
|
||||||
"django.contrib.admin",
|
"django.contrib.admin",
|
||||||
"django.contrib.auth",
|
"django.contrib.auth",
|
||||||
"django.contrib.contenttypes",
|
"django.contrib.contenttypes",
|
||||||
|
@ -40,26 +30,14 @@ DJANGO_APPS = [
|
||||||
"django.contrib.messages",
|
"django.contrib.messages",
|
||||||
"django.contrib.staticfiles",
|
"django.contrib.staticfiles",
|
||||||
"django.contrib.sites",
|
"django.contrib.sites",
|
||||||
]
|
"debug_toolbar",
|
||||||
|
|
||||||
THIRD_PARTY_APPS = [
|
|
||||||
"allauth",
|
"allauth",
|
||||||
"allauth.account",
|
"allauth.account",
|
||||||
"django_view_decorator",
|
|
||||||
]
|
|
||||||
|
|
||||||
LOCAL_APPS = [
|
|
||||||
"utils",
|
"utils",
|
||||||
"accounting",
|
"accounting",
|
||||||
"membership",
|
"membership",
|
||||||
]
|
]
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
|
||||||
*DJANGO_APPS,
|
|
||||||
*THIRD_PARTY_APPS,
|
|
||||||
*LOCAL_APPS,
|
|
||||||
]
|
|
||||||
|
|
||||||
DATABASES = {"default": env.dj_db_url("DATABASE_URL")}
|
DATABASES = {"default": env.dj_db_url("DATABASE_URL")}
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
|
@ -71,7 +49,7 @@ MIDDLEWARE = [
|
||||||
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
||||||
"django.contrib.messages.middleware.MessageMiddleware",
|
"django.contrib.messages.middleware.MessageMiddleware",
|
||||||
"django.middleware.clickjacking.XFrameOptionsMiddleware",
|
"django.middleware.clickjacking.XFrameOptionsMiddleware",
|
||||||
"allauth.account.middleware.AccountMiddleware",
|
"debug_toolbar.middleware.DebugToolbarMiddleware",
|
||||||
]
|
]
|
||||||
|
|
||||||
ROOT_URLCONF = "project.urls"
|
ROOT_URLCONF = "project.urls"
|
||||||
|
@ -87,12 +65,10 @@ TEMPLATES = [
|
||||||
"django.template.context_processors.request",
|
"django.template.context_processors.request",
|
||||||
"django.contrib.auth.context_processors.auth",
|
"django.contrib.auth.context_processors.auth",
|
||||||
"django.contrib.messages.context_processors.messages",
|
"django.contrib.messages.context_processors.messages",
|
||||||
],
|
"project.context_processors.current_site",
|
||||||
"builtins": [
|
]
|
||||||
"django.templatetags.i18n",
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
},
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
AUTHENTICATION_BACKENDS = (
|
AUTHENTICATION_BACKENDS = (
|
||||||
|
@ -103,7 +79,13 @@ AUTHENTICATION_BACKENDS = (
|
||||||
WSGI_APPLICATION = "project.wsgi.application"
|
WSGI_APPLICATION = "project.wsgi.application"
|
||||||
|
|
||||||
|
|
||||||
AUTH_PASSWORD_VALIDATORS = []
|
AUTH_PASSWORD_VALIDATORS = [
|
||||||
|
{
|
||||||
|
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator" # noqa
|
||||||
|
},
|
||||||
|
{"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"}, # noqa
|
||||||
|
{"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"}, # noqa
|
||||||
|
]
|
||||||
|
|
||||||
LANGUAGE_CODE = "da-dk"
|
LANGUAGE_CODE = "da-dk"
|
||||||
|
|
||||||
|
@ -111,6 +93,7 @@ TIME_ZONE = "Europe/Copenhagen"
|
||||||
|
|
||||||
USE_I18N = True
|
USE_I18N = True
|
||||||
|
|
||||||
|
USE_L10N = True
|
||||||
|
|
||||||
USE_TZ = True
|
USE_TZ = True
|
||||||
|
|
||||||
|
@ -123,11 +106,9 @@ SITE_ID = 1
|
||||||
LOGIN_REDIRECT_URL = "/"
|
LOGIN_REDIRECT_URL = "/"
|
||||||
|
|
||||||
EMAIL_BACKEND = env.str(
|
EMAIL_BACKEND = env.str(
|
||||||
"EMAIL_BACKEND",
|
"EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend"
|
||||||
default="django.core.mail.backends.console.EmailBackend",
|
|
||||||
)
|
)
|
||||||
DEFAULT_FROM_EMAIL = env.str("DEFAULT_FROM_EMAIL", default="")
|
DEFAULT_FROM_EMAIL = env.str("DEFAULT_FROM_EMAIL", default="")
|
||||||
SERVER_EMAIL = env.str("SERVER_EMAIL", default=DEFAULT_FROM_EMAIL)
|
|
||||||
# Parse email URLs, e.g. "smtp://"
|
# Parse email URLs, e.g. "smtp://"
|
||||||
email = env.dj_email_url("EMAIL_URL", default="smtp://")
|
email = env.dj_email_url("EMAIL_URL", default="smtp://")
|
||||||
EMAIL_HOST = email["EMAIL_HOST"]
|
EMAIL_HOST = email["EMAIL_HOST"]
|
||||||
|
@ -159,42 +140,3 @@ ACCOUNT_AUTHENTICATION_METHOD = "email"
|
||||||
ACCOUNT_EMAIL_REQUIRED = True
|
ACCOUNT_EMAIL_REQUIRED = True
|
||||||
ACCOUNT_SIGNUP_PASSWORD_ENTER_TWICE = False
|
ACCOUNT_SIGNUP_PASSWORD_ENTER_TWICE = False
|
||||||
ACCOUNT_USERNAME_REQUIRED = False
|
ACCOUNT_USERNAME_REQUIRED = False
|
||||||
|
|
||||||
# Logging
|
|
||||||
# We want to log everything to stdout in docker
|
|
||||||
LOGGING = {
|
|
||||||
"version": 1,
|
|
||||||
"disable_existing_loggers": False,
|
|
||||||
"handlers": {
|
|
||||||
"console": {
|
|
||||||
"level": "DEBUG",
|
|
||||||
"class": "logging.StreamHandler",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"loggers": {
|
|
||||||
"": {
|
|
||||||
"handlers": ["console"],
|
|
||||||
"level": "DEBUG",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
STRIPE_API_KEY = env.str("STRIPE_API_KEY")
|
|
||||||
STRIPE_ENDPOINT_SECRET = env.str("STRIPE_ENDPOINT_SECRET")
|
|
||||||
|
|
||||||
# The number of seconds a password reset link is valid for (default: 3 days).
|
|
||||||
# We've extended this to 7 days because invites then last for 1 week.
|
|
||||||
PASSWORD_RESET_TIMEOUT = 60 * 60 * 24 * 7
|
|
||||||
|
|
||||||
if DEBUG:
|
|
||||||
INSTALLED_APPS += ["debug_toolbar", "django_browser_reload"]
|
|
||||||
MIDDLEWARE += [
|
|
||||||
"debug_toolbar.middleware.DebugToolbarMiddleware",
|
|
||||||
"django_browser_reload.middleware.BrowserReloadMiddleware",
|
|
||||||
]
|
|
||||||
# Always show DDT in development for any IP, not just 127.0.0.1 or
|
|
||||||
# settings.INTERNAL_IPS. This is useful in a docker setup where the
|
|
||||||
# requesting IP isn't static.
|
|
||||||
DEBUG_TOOLBAR_CONFIG = {
|
|
||||||
"SHOW_TOOLBAR_CALLBACK": lambda _x: DEBUG,
|
|
||||||
}
|
|
||||||
|
|
7
src/project/static/css/bootstrap.min.css
vendored
Normal file
7
src/project/static/css/bootstrap.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
src/project/static/css/bootstrap.min.css.map
Normal file
1
src/project/static/css/bootstrap.min.css.map
Normal file
File diff suppressed because one or more lines are too long
|
@ -1,67 +0,0 @@
|
||||||
html.dark body {
|
|
||||||
--splash: #5b47e0;
|
|
||||||
background: var(--dark-dark);
|
|
||||||
color: var(--medium-dust)
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark h1,
|
|
||||||
html.dark h2,
|
|
||||||
html.dark h3,
|
|
||||||
html.dark h4,
|
|
||||||
html.dark h5,
|
|
||||||
html.dark h6,
|
|
||||||
html.dark footer,
|
|
||||||
html.dark nav ol li a {
|
|
||||||
color: var(--medium-dust);
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark nav ol li a:not(.current):hover {
|
|
||||||
border-color: var(--medium-dust);
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark header,
|
|
||||||
html.dark main aside,
|
|
||||||
html.dark nav {
|
|
||||||
background: #1d1d1d;
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark nav {
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark hr {
|
|
||||||
border-color: var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark main aside div,
|
|
||||||
html.dark article div.content-view {
|
|
||||||
background: var(--dark-twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark article table tbody {
|
|
||||||
background: var(--dark-twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark article table tbody tr:nth-child(2n+1) {
|
|
||||||
background: var(--dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark article table tbody tr:nth-child(2n+1) td {
|
|
||||||
border-top: 1px solid var(--dark-dark);
|
|
||||||
border-bottom: 1px solid var(--dark-dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark article table tbody tr:last-child td {
|
|
||||||
border-bottom: var(--half-space) solid var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
html.dark form>div>input[type="text"],
|
|
||||||
html.dark form>div>input[type="password"],
|
|
||||||
html.dark input[type="email"] {
|
|
||||||
border: 2px solid var(--twilight);
|
|
||||||
border-radius: 6px;
|
|
||||||
padding: 8px;
|
|
||||||
background: var(--dark-dark);
|
|
||||||
width: 100%;
|
|
||||||
color: var(--light-dust);
|
|
||||||
}
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,564 +0,0 @@
|
||||||
/* Reset */
|
|
||||||
*,
|
|
||||||
*::before,
|
|
||||||
*::after {
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
line-height: 1.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
img,
|
|
||||||
picture,
|
|
||||||
video,
|
|
||||||
canvas,
|
|
||||||
svg {
|
|
||||||
display: block;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
input,
|
|
||||||
button,
|
|
||||||
textarea,
|
|
||||||
select {
|
|
||||||
font: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
p,
|
|
||||||
h1,
|
|
||||||
h2,
|
|
||||||
h3,
|
|
||||||
h4,
|
|
||||||
h5,
|
|
||||||
h6 {
|
|
||||||
overflow-wrap: break-word;
|
|
||||||
}
|
|
||||||
|
|
||||||
#root,
|
|
||||||
#__next {
|
|
||||||
isolation: isolate;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Variables */
|
|
||||||
:root {
|
|
||||||
/* Colors */
|
|
||||||
--light: #ffffff;
|
|
||||||
--light-dust: #fefef9;
|
|
||||||
--dust: #f4f1ef;
|
|
||||||
--medium-dust: #dadada;
|
|
||||||
--dark-dust: #bfbfbf;
|
|
||||||
--fade: #878787;
|
|
||||||
--twilight: #4a4a4a;
|
|
||||||
--dark-twilight: #2f2f2f;
|
|
||||||
--dark: #2a2a2a;
|
|
||||||
--dark-dark: #121212;
|
|
||||||
--light-custard: #eee7d5;
|
|
||||||
--custard: #f0dcac;
|
|
||||||
--dark-custard: #d4c7a9;
|
|
||||||
--water: #a8f3f4;
|
|
||||||
--splash: #4b3aba;
|
|
||||||
|
|
||||||
/* Sizes */
|
|
||||||
--space: 12px;
|
|
||||||
--double-space: calc(var(--space) * 2);
|
|
||||||
--half-space: calc(var(--space) / 2);
|
|
||||||
--quarter-space: calc(var(--space) / 4);
|
|
||||||
--outer-space: var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 1380px) {
|
|
||||||
:root {
|
|
||||||
--outer-space: 15%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
html,
|
|
||||||
body {
|
|
||||||
height: 100%;
|
|
||||||
font-size: 1.05em;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1,
|
|
||||||
h2,
|
|
||||||
h3,
|
|
||||||
h4,
|
|
||||||
h5,
|
|
||||||
h6 {
|
|
||||||
font-weight: 600;
|
|
||||||
color: var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
font-weight: 500;
|
|
||||||
color: var(--splash);
|
|
||||||
text-decoration: none;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
margin: var(--double-space) 0;
|
|
||||||
height: 0;
|
|
||||||
border: 0;
|
|
||||||
border-bottom: 1px solid var(--dark-custard);
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
background: var(--custard);
|
|
||||||
font-family: Inter;
|
|
||||||
font-weight: 400;
|
|
||||||
line-height: 1.6;
|
|
||||||
color: var(--dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
header {
|
|
||||||
display: flex;
|
|
||||||
padding: var(--double-space) var(--outer-space);
|
|
||||||
background: var(--light);
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
header>h1 {
|
|
||||||
font-size: 1.44em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#switch-icon {
|
|
||||||
width: 30px;
|
|
||||||
height: 30px;
|
|
||||||
display: inline-block;
|
|
||||||
vertical-align: middle;
|
|
||||||
margin: 0 var(--space);
|
|
||||||
top: -2px;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
#switch-icon #layer1 path {
|
|
||||||
fill: var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
header>div>a#logout {
|
|
||||||
padding: 6px 12px;
|
|
||||||
border-radius: 6px;
|
|
||||||
background: var(--twilight);
|
|
||||||
text-decoration: none;
|
|
||||||
color: var(--dust);
|
|
||||||
transition: background 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
header>div>a#logout:hover {
|
|
||||||
background: var(--splash);
|
|
||||||
color: var(--light);
|
|
||||||
}
|
|
||||||
|
|
||||||
aside {
|
|
||||||
padding: 0 var(--outer-space) var(--double-space) var(--outer-space);
|
|
||||||
background: var(--light);
|
|
||||||
}
|
|
||||||
|
|
||||||
aside>div {
|
|
||||||
background: var(--dust);
|
|
||||||
padding: var(--double-space);
|
|
||||||
border-radius: var(--quarter-space);
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
aside>div>h2 {
|
|
||||||
font-size: 1.22em;
|
|
||||||
margin: 0 0 6px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
aside>div>figure {
|
|
||||||
width: 100px;
|
|
||||||
height: 100px;
|
|
||||||
border: 1px solid var(--dark-dust);
|
|
||||||
float: left;
|
|
||||||
margin-right: var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
aside>div>dl {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
aside>div>dl>dt {
|
|
||||||
float: left;
|
|
||||||
clear: left;
|
|
||||||
margin: 0 var(--double-space) 0 0;
|
|
||||||
width: 180px;
|
|
||||||
font-weight: 600;
|
|
||||||
color: var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
nav {
|
|
||||||
display: block;
|
|
||||||
border-bottom: 1px solid var(--dark-custard);
|
|
||||||
background: var(--light);
|
|
||||||
}
|
|
||||||
|
|
||||||
nav ol {
|
|
||||||
margin: 0 calc(var(--outer-space));
|
|
||||||
padding: 0;
|
|
||||||
list-style-type: none;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav ol li {
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
float: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav>ol>li>a {
|
|
||||||
display: block;
|
|
||||||
padding: var(--half-space) var(--half-space) var(--quarter-space);
|
|
||||||
margin: 0 var(--space);
|
|
||||||
border-bottom: var(--half-space) solid transparent;
|
|
||||||
text-decoration: none;
|
|
||||||
color: var(--dark);
|
|
||||||
cursor: pointer;
|
|
||||||
font-weight: 500;
|
|
||||||
letter-spacing: 0.04em;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav>ol>li:first-child>a {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav ol li a:hover {
|
|
||||||
border-color: rgba(0, 0, 0, 0.6);
|
|
||||||
}
|
|
||||||
|
|
||||||
nav ol li a.current {
|
|
||||||
font-weight: bold;
|
|
||||||
border-color: var(--splash);
|
|
||||||
color: var(--splash);
|
|
||||||
}
|
|
||||||
|
|
||||||
article {
|
|
||||||
padding: var(--double-space) var(--outer-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
article div.content-view {
|
|
||||||
background: var(--dust);
|
|
||||||
padding: var(--double-space);
|
|
||||||
margin-bottom: var(--space);
|
|
||||||
}
|
|
||||||
|
|
||||||
div.content-view>h2 {
|
|
||||||
margin: 0 0 var(--space) 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.services {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: var(--double-space);
|
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.services>div,
|
|
||||||
div.infobox {
|
|
||||||
background: var(--light);
|
|
||||||
padding: var(--double-space);
|
|
||||||
border-radius: 6px;
|
|
||||||
flex: 240px;
|
|
||||||
max-width: 420px;
|
|
||||||
display: flex;
|
|
||||||
flex-flow: column;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.infobox button {
|
|
||||||
margin-top: var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
div.services>div>div.description {
|
|
||||||
margin-bottom: var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
div.services>div>div.description>p {
|
|
||||||
margin-top: var(--half-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
div.services>div>a,
|
|
||||||
a.button,
|
|
||||||
button {
|
|
||||||
display: block;
|
|
||||||
color: var(--light);
|
|
||||||
background: var(--splash);
|
|
||||||
padding: var(--space) var(--double-space);
|
|
||||||
border-radius: var(--quarter-space);
|
|
||||||
opacity: 0.85;
|
|
||||||
cursor: pointer;
|
|
||||||
text-align: center;
|
|
||||||
border: 0;
|
|
||||||
font-weight: 600;
|
|
||||||
text-decoration: none;
|
|
||||||
|
|
||||||
transition: opacity 0.15s;
|
|
||||||
}
|
|
||||||
|
|
||||||
button.small {
|
|
||||||
font-size: 0.78em;
|
|
||||||
padding: var(--half-space) var(--space);
|
|
||||||
}
|
|
||||||
|
|
||||||
div.services>div>a:hover,
|
|
||||||
a.button:hover,
|
|
||||||
button:hover {
|
|
||||||
opacity: 1.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:disabled {
|
|
||||||
opacity: 0.6;
|
|
||||||
background: var(--twilight);
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
|
|
||||||
button.secondary {
|
|
||||||
background: var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
article table {
|
|
||||||
width: 100%;
|
|
||||||
border-spacing: 0;
|
|
||||||
margin: var(--space) 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
article table thead th {
|
|
||||||
background: var(--twilight);
|
|
||||||
color: var(--medium-dust);
|
|
||||||
}
|
|
||||||
|
|
||||||
article table thead th a {
|
|
||||||
color: var(--light);
|
|
||||||
}
|
|
||||||
|
|
||||||
article table thead th:first-child {
|
|
||||||
border-radius: var(--half-space) 0 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
article table thead th:last-child {
|
|
||||||
border-radius: 0 var(--half-space) 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
article table tbody {
|
|
||||||
background: var(--light-dust);
|
|
||||||
}
|
|
||||||
|
|
||||||
article table tbody tr:nth-child(odd) {
|
|
||||||
background: var(--light-custard);
|
|
||||||
}
|
|
||||||
|
|
||||||
article table tbody tr:nth-child(odd) td {
|
|
||||||
border-top: 1px solid var(--dark-custard);
|
|
||||||
border-bottom: 1px solid var(--dark-custard);
|
|
||||||
}
|
|
||||||
|
|
||||||
article table tbody tr:last-child td {
|
|
||||||
border-bottom: var(--half-space) solid var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
article table thead th,
|
|
||||||
article table tbody td {
|
|
||||||
padding: var(--space);
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
article table#user_email_table tbody tr td:first-child {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
form>div {
|
|
||||||
margin: 0 0 var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
form>div>label {
|
|
||||||
display: block;
|
|
||||||
margin: 0 0 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
form>div>input[type="text"],
|
|
||||||
form>div>input[type="password"],
|
|
||||||
input[type="email"] {
|
|
||||||
border: 2px solid var(--twilight);
|
|
||||||
border-radius: 6px;
|
|
||||||
padding: 8px;
|
|
||||||
background: var(--light-dust);
|
|
||||||
width: 100%;
|
|
||||||
color: var(--dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
form fieldset {
|
|
||||||
border: 0;
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
form div.buttonHolder button {
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
#email-add-overlay {
|
|
||||||
display: none;
|
|
||||||
position: fixed;
|
|
||||||
left: 0;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
right: 0;
|
|
||||||
background: rgba(0, 0, 0, 0.8);
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
z-index: 1000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#email-add-overlay .content-view {
|
|
||||||
width: 600px;
|
|
||||||
padding: var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
#email-add-overlay .content-view p {
|
|
||||||
margin: var(--double-space) 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#login {
|
|
||||||
height: 100%;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox {
|
|
||||||
border-radius: var(--space);
|
|
||||||
border: 6px solid white;
|
|
||||||
width: 800px;
|
|
||||||
height: 500px;
|
|
||||||
|
|
||||||
display: flex;
|
|
||||||
flex-flow: row;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox>div {
|
|
||||||
padding: var(--double-space);
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox label {
|
|
||||||
color: var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox>div.login {
|
|
||||||
background: var(--light-dust);
|
|
||||||
display: flex;
|
|
||||||
flex-flow: column;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox>div.signup {
|
|
||||||
background: var(--water);
|
|
||||||
display: flex;
|
|
||||||
flex-flow: column;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox>div:first-child {
|
|
||||||
border-radius: var(--half-space) 0 0 var(--half-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox>div:last-child {
|
|
||||||
border-radius: 0 var(--half-space) var(--half-space) 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox>div:last-child>* {
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox div.new_here {
|
|
||||||
margin-top: var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox div.new_here h2 {
|
|
||||||
margin: var(--double-space) 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox button {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
#loginbox img {
|
|
||||||
padding: 0 var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
footer {
|
|
||||||
margin: var(--space) var(--outer-space);
|
|
||||||
padding: var(--space);
|
|
||||||
border-radius: var(--quarter-space);
|
|
||||||
background: var(--dark);
|
|
||||||
color: var(--dust);
|
|
||||||
font-size: 0.78em;
|
|
||||||
opacity: 0.8;
|
|
||||||
}
|
|
||||||
|
|
||||||
footer a, footer a:visited, footer a:active {
|
|
||||||
color: var(--dust);
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
span.time_remaining {
|
|
||||||
color: var(--fade);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination {
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
list-style: none;
|
|
||||||
padding: var(--half-space) 0;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination>li {
|
|
||||||
margin: 0 var(--half-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination>li:first-child {
|
|
||||||
margin-right: var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination>li:last-child {
|
|
||||||
margin-left: var(--double-space);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination .page-item {
|
|
||||||
border: 1px solid var(--fade);
|
|
||||||
padding: var(--quarter-space) var(--half-space);
|
|
||||||
border-radius: var(--half-space);
|
|
||||||
background: var(--light-dust);
|
|
||||||
font-size: 0.78em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination .page-link {
|
|
||||||
padding: var(--half-space);
|
|
||||||
color: var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination .page-item.active {
|
|
||||||
background: var(--twilight);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination .page-item.active .page-link {
|
|
||||||
color: var(--light-dust);
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination .page-item.disabled {
|
|
||||||
opacity: 0.6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pagination .page-item.disabled .page-link {
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue