Compare commits
No commits in common. "6940e2558d31a5f1b3325c672713695df79e2cc2" and "ed86d5f932f8685a826a9de55acd907f88c46fd3" have entirely different histories.
6940e2558d
...
ed86d5f932
|
|
@ -3,7 +3,7 @@ default_language_version:
|
|||
exclude: ^.*\b(migrations)\b.*$
|
||||
repos:
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v4.5.0
|
||||
rev: v4.4.0
|
||||
hooks:
|
||||
- id: check-ast
|
||||
- id: check-merge-conflict
|
||||
|
|
@ -16,13 +16,13 @@ repos:
|
|||
- id: end-of-file-fixer
|
||||
- id: trailing-whitespace
|
||||
- repo: https://github.com/charliermarsh/ruff-pre-commit
|
||||
rev: 'v0.1.11'
|
||||
rev: 'v0.0.292'
|
||||
hooks:
|
||||
- id: ruff
|
||||
args:
|
||||
- --fix
|
||||
- repo: https://github.com/asottile/reorder_python_imports
|
||||
rev: v3.12.0
|
||||
rev: v3.11.0
|
||||
hooks:
|
||||
- id: reorder-python-imports
|
||||
args:
|
||||
|
|
@ -30,7 +30,7 @@ repos:
|
|||
- --application-directories=.:src
|
||||
exclude: migrations/
|
||||
- repo: https://github.com/asottile/pyupgrade
|
||||
rev: v3.15.0
|
||||
rev: v3.13.0
|
||||
hooks:
|
||||
- id: pyupgrade
|
||||
args:
|
||||
|
|
@ -51,10 +51,10 @@ repos:
|
|||
hooks:
|
||||
- id: add-trailing-comma
|
||||
- repo: https://github.com/hadialqattan/pycln
|
||||
rev: v2.4.0
|
||||
rev: v2.2.2
|
||||
hooks:
|
||||
- id: pycln
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 23.12.1
|
||||
rev: 23.9.1
|
||||
hooks:
|
||||
- id: black
|
||||
|
|
|
|||
105
pyproject.toml
105
pyproject.toml
|
|
@ -1,105 +0,0 @@
|
|||
[build-system]
|
||||
requires = ["hatchling", "hatch-vcs"]
|
||||
build-backend = "hatchling.build"
|
||||
|
||||
[project]
|
||||
name = "membersystem"
|
||||
description = ''
|
||||
readme = "README.md"
|
||||
requires-python = ">=3.11"
|
||||
keywords = []
|
||||
authors = [
|
||||
{ name = "Víðir Valberg Guðmundsson", email = "valberg@orn.li" },
|
||||
]
|
||||
dependencies = [
|
||||
"Django==5.0.1",
|
||||
"django-money==3.4.1",
|
||||
"django-allauth==0.60.0",
|
||||
"psycopg[binary]==3.1.16",
|
||||
"environs[django]==10.0.0",
|
||||
"uvicorn==0.25.0",
|
||||
"whitenoise==6.6.0",
|
||||
"django-zen-queries==2.1.0",
|
||||
"django-registries==0.0.3",
|
||||
]
|
||||
dynamic = ["version"]
|
||||
|
||||
[tool.hatch.version]
|
||||
source = "vcs"
|
||||
|
||||
[tool.hatch.envs.default]
|
||||
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 = ["4.2", "5.0"]
|
||||
|
||||
[tool.hatch.envs.tests.overrides]
|
||||
matrix.django.dependencies = [
|
||||
{ value = "django~={matrix:django}" },
|
||||
]
|
||||
matrix.python.dependencies = [
|
||||
{ value = "typing_extensions==4.5.0", if = ["3.10"]},
|
||||
]
|
||||
|
||||
[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 = "pip-compile --output-file requirements/base.txt pyproject.toml"
|
||||
server = "./src/manage.py runserver"
|
||||
migrate = "./src/manage.py migrate"
|
||||
makemigrations = "./src/manage.py makemigrations"
|
||||
createsuperuser = "./src/manage.py createsuperuser"
|
||||
shell = "./src/manage.py shell"
|
||||
|
||||
[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 = "tests.settings"
|
||||
|
||||
[[tool.mypy.overrides]]
|
||||
module = "tests.*"
|
||||
allow_untyped_defs = true
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
Django==5.0.1
|
||||
django-money==3.4.1
|
||||
django-allauth==0.60.0
|
||||
psycopg[binary]==3.1.16
|
||||
environs[django]==10.0.0
|
||||
uvicorn==0.25.0
|
||||
whitenoise==6.6.0
|
||||
Django==4.2.5
|
||||
django-money==3.3.0
|
||||
django-allauth==0.57.0
|
||||
psycopg[binary]==3.1.12
|
||||
environs[django]==9.5
|
||||
uvicorn==0.23.2
|
||||
whitenoise==6.5.0
|
||||
django-zen-queries==2.1.0
|
||||
|
|
|
|||
|
|
@ -2,97 +2,89 @@
|
|||
# This file is autogenerated by pip-compile with Python 3.11
|
||||
# by the following command:
|
||||
#
|
||||
# pip-compile --output-file=requirements/base.txt pyproject.toml
|
||||
# pip-compile --output-file=requirements/base.txt requirements/base.in
|
||||
#
|
||||
asgiref==3.7.2
|
||||
# via django
|
||||
babel==2.14.0
|
||||
babel==2.12.1
|
||||
# via py-moneyed
|
||||
certifi==2023.11.17
|
||||
certifi==2022.9.24
|
||||
# via requests
|
||||
cffi==1.16.0
|
||||
cffi==1.15.1
|
||||
# via cryptography
|
||||
charset-normalizer==3.3.2
|
||||
charset-normalizer==2.1.1
|
||||
# via requests
|
||||
click==8.1.7
|
||||
click==7.1.2
|
||||
# via uvicorn
|
||||
cryptography==41.0.7
|
||||
cryptography==38.0.3
|
||||
# via pyjwt
|
||||
defusedxml==0.7.1
|
||||
# via python3-openid
|
||||
dj-database-url==2.1.0
|
||||
dj-database-url==1.0.0
|
||||
# via environs
|
||||
dj-email-url==1.0.6
|
||||
# via environs
|
||||
django==5.0.1
|
||||
django==4.2.5
|
||||
# via
|
||||
# -r requirements/base.in
|
||||
# dj-database-url
|
||||
# django-allauth
|
||||
# django-money
|
||||
# django-registries
|
||||
# django-zen-queries
|
||||
# membersystem (pyproject.toml)
|
||||
django-allauth==0.60.0
|
||||
# via membersystem (pyproject.toml)
|
||||
django-cache-url==3.4.5
|
||||
django-allauth==0.57.0
|
||||
# via -r requirements/base.in
|
||||
django-cache-url==3.4.2
|
||||
# via environs
|
||||
django-money==3.4.1
|
||||
# via membersystem (pyproject.toml)
|
||||
django-registries==0.0.3
|
||||
# via membersystem (pyproject.toml)
|
||||
django-money==3.3.0
|
||||
# via -r requirements/base.in
|
||||
django-zen-queries==2.1.0
|
||||
# via membersystem (pyproject.toml)
|
||||
environs[django]==10.0.0
|
||||
# via
|
||||
# environs
|
||||
# membersystem (pyproject.toml)
|
||||
# via -r requirements/base.in
|
||||
environs[django]==9.5.0
|
||||
# via -r requirements/base.in
|
||||
h11==0.14.0
|
||||
# via uvicorn
|
||||
idna==3.6
|
||||
idna==3.4
|
||||
# via requests
|
||||
marshmallow==3.20.1
|
||||
marshmallow==3.19.0
|
||||
# via environs
|
||||
oauthlib==3.2.2
|
||||
# via requests-oauthlib
|
||||
packaging==23.2
|
||||
packaging==21.3
|
||||
# via marshmallow
|
||||
psycopg[binary]==3.1.16
|
||||
# via
|
||||
# membersystem (pyproject.toml)
|
||||
# psycopg
|
||||
psycopg-binary==3.1.16
|
||||
psycopg[binary]==3.1.12
|
||||
# via -r requirements/base.in
|
||||
psycopg-binary==3.1.12
|
||||
# via psycopg
|
||||
py-moneyed==3.0
|
||||
# via django-money
|
||||
pycparser==2.21
|
||||
# via cffi
|
||||
pyjwt[crypto]==2.8.0
|
||||
# via
|
||||
# django-allauth
|
||||
# pyjwt
|
||||
python-dotenv==1.0.0
|
||||
pyjwt[crypto]==2.6.0
|
||||
# via django-allauth
|
||||
pyparsing==3.0.9
|
||||
# via packaging
|
||||
python-dotenv==0.21.0
|
||||
# via environs
|
||||
python3-openid==3.2.0
|
||||
# via django-allauth
|
||||
requests==2.31.0
|
||||
requests==2.28.1
|
||||
# via
|
||||
# django-allauth
|
||||
# requests-oauthlib
|
||||
requests-oauthlib==1.3.1
|
||||
# via django-allauth
|
||||
sqlparse==0.4.4
|
||||
sqlparse==0.4.3
|
||||
# via django
|
||||
typing-extensions==4.9.0
|
||||
typing-extensions==4.8.0
|
||||
# via
|
||||
# dj-database-url
|
||||
# psycopg
|
||||
# py-moneyed
|
||||
urllib3==2.1.0
|
||||
urllib3==1.26.12
|
||||
# via requests
|
||||
uvicorn==0.25.0
|
||||
# via membersystem (pyproject.toml)
|
||||
whitenoise==6.6.0
|
||||
# via membersystem (pyproject.toml)
|
||||
uvicorn==0.23.2
|
||||
# via -r requirements/base.in
|
||||
whitenoise==6.5.0
|
||||
# via -r requirements/base.in
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
# setuptools
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
-r test.txt
|
||||
|
||||
django-browser-reload==1.12.1
|
||||
django-browser-reload==1.11.0
|
||||
django-debug-toolbar==4.2.0
|
||||
django-extensions==3.2.3
|
||||
django-stubs==4.2.7
|
||||
ipython==8.19.0
|
||||
mypy==1.8.0
|
||||
django-stubs==1.12.0
|
||||
ipython==8.6.0
|
||||
mypy==1.5.1
|
||||
|
|
|
|||
|
|
@ -8,32 +8,33 @@ asgiref==3.7.2
|
|||
# via
|
||||
# -r requirements/test.txt
|
||||
# django
|
||||
# django-browser-reload
|
||||
asttokens==2.4.1
|
||||
asttokens==2.1.0
|
||||
# via stack-data
|
||||
babel==2.14.0
|
||||
babel==2.12.1
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# py-moneyed
|
||||
certifi==2023.11.17
|
||||
backcall==0.2.0
|
||||
# via ipython
|
||||
certifi==2022.9.24
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# requests
|
||||
cffi==1.16.0
|
||||
cffi==1.15.1
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# cryptography
|
||||
charset-normalizer==3.3.2
|
||||
charset-normalizer==2.1.1
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# requests
|
||||
click==8.1.7
|
||||
click==7.1.2
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# uvicorn
|
||||
coverage==7.4.0
|
||||
coverage==7.3.1
|
||||
# via -r requirements/test.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==38.0.3
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# pyjwt
|
||||
|
|
@ -43,7 +44,7 @@ defusedxml==0.7.1
|
|||
# via
|
||||
# -r requirements/test.txt
|
||||
# python3-openid
|
||||
dj-database-url==2.1.0
|
||||
dj-database-url==1.0.0
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# environs
|
||||
|
|
@ -51,7 +52,7 @@ dj-email-url==1.0.6
|
|||
# via
|
||||
# -r requirements/test.txt
|
||||
# environs
|
||||
django==5.0.1
|
||||
django==4.2.5
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# dj-database-url
|
||||
|
|
@ -63,11 +64,11 @@ django==5.0.1
|
|||
# django-stubs
|
||||
# django-stubs-ext
|
||||
# django-zen-queries
|
||||
django-allauth==0.60.0
|
||||
django-allauth==0.57.0
|
||||
# via -r requirements/test.txt
|
||||
django-browser-reload==1.12.1
|
||||
django-browser-reload==1.11.0
|
||||
# via -r requirements/dev.in
|
||||
django-cache-url==3.4.5
|
||||
django-cache-url==3.4.2
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# environs
|
||||
|
|
@ -75,61 +76,65 @@ django-debug-toolbar==4.2.0
|
|||
# via -r requirements/dev.in
|
||||
django-extensions==3.2.3
|
||||
# via -r requirements/dev.in
|
||||
django-money==3.4.1
|
||||
django-money==3.3.0
|
||||
# via -r requirements/test.txt
|
||||
django-stubs==4.2.7
|
||||
django-stubs==1.12.0
|
||||
# via -r requirements/dev.in
|
||||
django-stubs-ext==4.2.7
|
||||
django-stubs-ext==0.7.0
|
||||
# via django-stubs
|
||||
django-zen-queries==2.1.0
|
||||
# via -r requirements/test.txt
|
||||
environs[django]==10.0.0
|
||||
environs[django]==9.5.0
|
||||
# via -r requirements/test.txt
|
||||
executing==2.0.1
|
||||
executing==1.2.0
|
||||
# via stack-data
|
||||
h11==0.14.0
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# uvicorn
|
||||
idna==3.6
|
||||
idna==3.4
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# requests
|
||||
ipython==8.19.0
|
||||
ipython==8.6.0
|
||||
# via -r requirements/dev.in
|
||||
jedi==0.19.1
|
||||
jedi==0.18.1
|
||||
# via ipython
|
||||
lxml==5.0.1
|
||||
lxml==4.9.1
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# unittest-xml-reporting
|
||||
marshmallow==3.20.1
|
||||
marshmallow==3.19.0
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# environs
|
||||
matplotlib-inline==0.1.6
|
||||
# via ipython
|
||||
mypy==1.8.0
|
||||
# via -r requirements/dev.in
|
||||
mypy==1.5.1
|
||||
# via
|
||||
# -r requirements/dev.in
|
||||
# django-stubs
|
||||
mypy-extensions==1.0.0
|
||||
# via mypy
|
||||
oauthlib==3.2.2
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# requests-oauthlib
|
||||
packaging==23.2
|
||||
packaging==21.3
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# marshmallow
|
||||
parso==0.8.3
|
||||
# via jedi
|
||||
pexpect==4.9.0
|
||||
pexpect==4.8.0
|
||||
# via ipython
|
||||
prompt-toolkit==3.0.43
|
||||
pickleshare==0.7.5
|
||||
# via ipython
|
||||
psycopg[binary]==3.1.16
|
||||
prompt-toolkit==3.0.32
|
||||
# via ipython
|
||||
psycopg[binary]==3.1.12
|
||||
# via -r requirements/test.txt
|
||||
psycopg-binary==3.1.16
|
||||
psycopg-binary==3.1.12
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# psycopg
|
||||
|
|
@ -145,13 +150,17 @@ pycparser==2.21
|
|||
# via
|
||||
# -r requirements/test.txt
|
||||
# cffi
|
||||
pygments==2.17.2
|
||||
pygments==2.13.0
|
||||
# via ipython
|
||||
pyjwt[crypto]==2.8.0
|
||||
pyjwt[crypto]==2.6.0
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# django-allauth
|
||||
python-dotenv==1.0.0
|
||||
pyparsing==3.0.9
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# packaging
|
||||
python-dotenv==0.21.0
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# environs
|
||||
|
|
@ -159,7 +168,7 @@ python3-openid==3.2.0
|
|||
# via
|
||||
# -r requirements/test.txt
|
||||
# django-allauth
|
||||
requests==2.31.0
|
||||
requests==2.28.1
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# django-allauth
|
||||
|
|
@ -170,27 +179,28 @@ requests-oauthlib==1.3.1
|
|||
# django-allauth
|
||||
six==1.16.0
|
||||
# via asttokens
|
||||
sqlparse==0.4.4
|
||||
sqlparse==0.4.3
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# django
|
||||
# django-debug-toolbar
|
||||
stack-data==0.6.3
|
||||
stack-data==0.6.1
|
||||
# via ipython
|
||||
tblib==3.0.0
|
||||
tblib==2.0.0
|
||||
# via -r requirements/test.txt
|
||||
traitlets==5.14.1
|
||||
tomli==2.0.1
|
||||
# via django-stubs
|
||||
traitlets==5.5.0
|
||||
# via
|
||||
# ipython
|
||||
# matplotlib-inline
|
||||
types-pytz==2023.3.1.1
|
||||
types-pytz==2022.6.0.1
|
||||
# via django-stubs
|
||||
types-pyyaml==6.0.12.12
|
||||
types-pyyaml==6.0.12.2
|
||||
# via django-stubs
|
||||
typing-extensions==4.9.0
|
||||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# dj-database-url
|
||||
# django-stubs
|
||||
# django-stubs-ext
|
||||
# mypy
|
||||
|
|
@ -198,15 +208,15 @@ typing-extensions==4.9.0
|
|||
# py-moneyed
|
||||
unittest-xml-reporting==3.2.0
|
||||
# via -r requirements/test.txt
|
||||
urllib3==2.1.0
|
||||
urllib3==1.26.12
|
||||
# via
|
||||
# -r requirements/test.txt
|
||||
# requests
|
||||
uvicorn==0.25.0
|
||||
uvicorn==0.23.2
|
||||
# via -r requirements/test.txt
|
||||
wcwidth==0.2.13
|
||||
wcwidth==0.2.5
|
||||
# via prompt-toolkit
|
||||
whitenoise==6.6.0
|
||||
whitenoise==6.5.0
|
||||
# via -r requirements/test.txt
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
-r base.txt
|
||||
|
||||
coverage==7.4.0
|
||||
tblib==3.0.0
|
||||
coverage==7.3.1
|
||||
tblib==2.0.0
|
||||
unittest-xml-reporting==3.2.0
|
||||
|
|
|
|||
|
|
@ -8,29 +8,29 @@ asgiref==3.7.2
|
|||
# via
|
||||
# -r requirements/base.txt
|
||||
# django
|
||||
babel==2.14.0
|
||||
babel==2.12.1
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# py-moneyed
|
||||
certifi==2023.11.17
|
||||
certifi==2022.9.24
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# requests
|
||||
cffi==1.16.0
|
||||
cffi==1.15.1
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# cryptography
|
||||
charset-normalizer==3.3.2
|
||||
charset-normalizer==2.1.1
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# requests
|
||||
click==8.1.7
|
||||
click==7.1.2
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# uvicorn
|
||||
coverage==7.4.0
|
||||
coverage==7.3.1
|
||||
# via -r requirements/test.in
|
||||
cryptography==41.0.7
|
||||
cryptography==38.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyjwt
|
||||
|
|
@ -38,7 +38,7 @@ defusedxml==0.7.1
|
|||
# via
|
||||
# -r requirements/base.txt
|
||||
# python3-openid
|
||||
dj-database-url==2.1.0
|
||||
dj-database-url==1.0.0
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# environs
|
||||
|
|
@ -46,36 +46,36 @@ dj-email-url==1.0.6
|
|||
# via
|
||||
# -r requirements/base.txt
|
||||
# environs
|
||||
django==5.0.1
|
||||
django==4.2.5
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# dj-database-url
|
||||
# django-allauth
|
||||
# django-money
|
||||
# django-zen-queries
|
||||
django-allauth==0.60.0
|
||||
django-allauth==0.57.0
|
||||
# via -r requirements/base.txt
|
||||
django-cache-url==3.4.5
|
||||
django-cache-url==3.4.2
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# environs
|
||||
django-money==3.4.1
|
||||
django-money==3.3.0
|
||||
# via -r requirements/base.txt
|
||||
django-zen-queries==2.1.0
|
||||
# via -r requirements/base.txt
|
||||
environs[django]==10.0.0
|
||||
environs[django]==9.5.0
|
||||
# via -r requirements/base.txt
|
||||
h11==0.14.0
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# uvicorn
|
||||
idna==3.6
|
||||
idna==3.4
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# requests
|
||||
lxml==5.0.1
|
||||
lxml==4.9.1
|
||||
# via unittest-xml-reporting
|
||||
marshmallow==3.20.1
|
||||
marshmallow==3.19.0
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# environs
|
||||
|
|
@ -83,13 +83,13 @@ oauthlib==3.2.2
|
|||
# via
|
||||
# -r requirements/base.txt
|
||||
# requests-oauthlib
|
||||
packaging==23.2
|
||||
packaging==21.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# marshmallow
|
||||
psycopg[binary]==3.1.16
|
||||
psycopg[binary]==3.1.12
|
||||
# via -r requirements/base.txt
|
||||
psycopg-binary==3.1.16
|
||||
psycopg-binary==3.1.12
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# psycopg
|
||||
|
|
@ -101,11 +101,15 @@ pycparser==2.21
|
|||
# via
|
||||
# -r requirements/base.txt
|
||||
# cffi
|
||||
pyjwt[crypto]==2.8.0
|
||||
pyjwt[crypto]==2.6.0
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# django-allauth
|
||||
python-dotenv==1.0.0
|
||||
pyparsing==3.0.9
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# packaging
|
||||
python-dotenv==0.21.0
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# environs
|
||||
|
|
@ -113,7 +117,7 @@ python3-openid==3.2.0
|
|||
# via
|
||||
# -r requirements/base.txt
|
||||
# django-allauth
|
||||
requests==2.31.0
|
||||
requests==2.28.1
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# django-allauth
|
||||
|
|
@ -122,27 +126,26 @@ requests-oauthlib==1.3.1
|
|||
# via
|
||||
# -r requirements/base.txt
|
||||
# django-allauth
|
||||
sqlparse==0.4.4
|
||||
sqlparse==0.4.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# django
|
||||
tblib==3.0.0
|
||||
tblib==2.0.0
|
||||
# via -r requirements/test.in
|
||||
typing-extensions==4.9.0
|
||||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# dj-database-url
|
||||
# psycopg
|
||||
# py-moneyed
|
||||
unittest-xml-reporting==3.2.0
|
||||
# via -r requirements/test.in
|
||||
urllib3==2.1.0
|
||||
urllib3==1.26.12
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# requests
|
||||
uvicorn==0.25.0
|
||||
uvicorn==0.23.2
|
||||
# via -r requirements/base.txt
|
||||
whitenoise==6.6.0
|
||||
whitenoise==6.5.0
|
||||
# via -r requirements/base.txt
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
{% block content %}
|
||||
|
||||
<div class="content-view">
|
||||
<h1>
|
||||
{{ member.username }}
|
||||
</h1>
|
||||
|
|
@ -40,6 +39,5 @@
|
|||
{% else %}
|
||||
{% trans "No memberships" %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@ def members_admin_detail(request, member_id):
|
|||
context = {
|
||||
"member": member,
|
||||
"subscription_periods": subscription_periods,
|
||||
"base_path": "admin-members",
|
||||
}
|
||||
|
||||
return render(
|
||||
|
|
|
|||
|
|
@ -8,38 +8,29 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="description" content="">
|
||||
<title>{% block head_title %}{% endblock %} – {{ site.name }}</title>
|
||||
<link rel="stylesheet" href="{% static "fonts/inter.css" %}">
|
||||
<link rel="stylesheet" href="{% static "css/style.css" %}">
|
||||
<link rel="stylesheet" href="{% static "/fonts/inter.css" %}">
|
||||
<link rel="stylesheet" href="{% static "/css/style.css" %}">
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<h1> data.coop membersystem </h1>
|
||||
<a class="logout" href="{% url "account_logout" %}">Log out</a>
|
||||
</header>
|
||||
</header
|
||||
<main>
|
||||
<aside>
|
||||
<div>
|
||||
<figure></figure>
|
||||
<h2>{{ user }}</h2>
|
||||
|
||||
{% if current_membership %}
|
||||
<dl>
|
||||
<dt>Membership</dt>
|
||||
<dd>
|
||||
Active
|
||||
</dd>
|
||||
<dd>{% if current_membership %} Active {% endif %}</dd>
|
||||
|
||||
<dt>Period</dt>
|
||||
<dd>
|
||||
Until {{ current_period.upper }} <span class="time_remaining">({{ current_period.upper|timeuntil }})</span>
|
||||
</dd>
|
||||
<dd>{% if current_membership %} Until {{ current_period.upper }} <span class="time_remaining">({{ current_period.upper|timeuntil }})</span>{% endif %}</dd>
|
||||
|
||||
<dt>Membership type</dt>
|
||||
<dd>Normal member</dd>
|
||||
</dl>
|
||||
{% else %}
|
||||
Your membership status will be displayed here in the future.
|
||||
{% endif %}
|
||||
</div>
|
||||
</aside>
|
||||
<nav>
|
||||
|
|
@ -50,13 +41,11 @@
|
|||
</a>
|
||||
</li>
|
||||
|
||||
{% comment %}
|
||||
<li>
|
||||
<a href="/services" class="{% active_path "services" "current" %}">
|
||||
Services
|
||||
</a>
|
||||
</li>
|
||||
{% endcomment %}
|
||||
|
||||
<li>
|
||||
<a href="{% url "account_email" %}" class="{% active_path "account_email" "current" %}">
|
||||
|
|
|
|||
|
|
@ -7,22 +7,11 @@
|
|||
{% block content %}
|
||||
<div class="content-view">
|
||||
<h2>Welcome {{ user }}!</h2>
|
||||
<p>
|
||||
This is the new member area.
|
||||
</p>
|
||||
<p>
|
||||
It is very much under construction.
|
||||
</p>
|
||||
|
||||
{% comment %}
|
||||
<hr>
|
||||
<br>
|
||||
<div class="infobox">
|
||||
<p>
|
||||
To get started we need you to verify your email!
|
||||
To get you started we need to verify your email!
|
||||
</p>
|
||||
<button>Verify email</button>
|
||||
</div>
|
||||
{% endcomment %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="content-view">
|
||||
Coming soon!
|
||||
</div>
|
||||
|
||||
{% comment %}
|
||||
<div class="content-view">
|
||||
<h2>Services you subscribe to</h2>
|
||||
<div class="services">
|
||||
|
|
@ -58,5 +52,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endcomment %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
|
||||
{% block content %}
|
||||
|
||||
<div class="content-view">
|
||||
|
||||
<h1>
|
||||
{{ entity_name_plural|capfirst }} <small class="text-muted">{{ total_count }}</small>
|
||||
</h1>
|
||||
|
|
@ -50,6 +48,7 @@
|
|||
</table>
|
||||
|
||||
{% if is_paginated %}
|
||||
<nav>
|
||||
<ul class="pagination justify-content-center">
|
||||
|
||||
{% if not page.has_previous %}
|
||||
|
|
@ -102,9 +101,8 @@
|
|||
{% endif %}
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -5,17 +5,9 @@ register = template.Library()
|
|||
|
||||
|
||||
@register.simple_tag(takes_context=True)
|
||||
def active_path(context, path_name, class_name) -> str | None:
|
||||
"""Return the given class name if the current path matches the given path name."""
|
||||
|
||||
def active_path(context, path_name, class_name):
|
||||
path = reverse(path_name)
|
||||
request_path = context.get("request").path
|
||||
|
||||
# Check if the current path matches the given path name.
|
||||
is_path = path == request_path
|
||||
|
||||
# Check if the current path is a sub-path of the given path name.
|
||||
is_base_path = "base_path" in context and reverse(context["base_path"]) == path
|
||||
|
||||
if is_path or is_base_path:
|
||||
if path == request_path or ("basepath" in context and context["basepath"] == path):
|
||||
return class_name
|
||||
|
|
|
|||
Loading…
Reference in a new issue