Compare commits
272 Commits
1.3.0
...
remove_edi
Author | SHA1 | Date | |
---|---|---|---|
7111431048
|
|||
c2853a3ecc
|
|||
cd90d60475
|
|||
11cea2142a
|
|||
24578b64fe
|
|||
13e607f9a7
|
|||
fc0d8db8e8
|
|||
8acc4f9c5b
|
|||
6b7a96dc06
|
|||
5c5fd5f26a
|
|||
7181b6472c
|
|||
af06d07ee3
|
|||
315e22a8ac
|
|||
19676f8441 | |||
f61cde180f | |||
a53818257c | |||
2d3ea714c4 | |||
832bb48983 | |||
c6b1badf39 | |||
a3ed93c154 | |||
cf503a7b7d | |||
d81df6452a | |||
d9290373b0
|
|||
f8d621e710
|
|||
9992d9c9bd
|
|||
2ae81bb00f
|
|||
993abb4710
|
|||
23502eab85
|
|||
c517d735c7
|
|||
19056f846e
|
|||
0759ad0804
|
|||
228fc2bf5f
|
|||
a5a7041920
|
|||
fbd829f70e
|
|||
4873f25248
|
|||
3578f1707f
|
|||
b74ccb6eaa
|
|||
b0b1bb2d42
|
|||
c40764a02f
|
|||
649351efde
|
|||
698c8966c0
|
|||
7f6584ecf7
|
|||
540f5ee42c
|
|||
1c73268258
|
|||
3063a3d143
|
|||
b589199ca6
|
|||
2fc661dade
|
|||
1f535a6e84
|
|||
a9c1135639
|
|||
58cfaca1a9
|
|||
c1b3493c80
|
|||
a1df8720f5
|
|||
5a852bc2b9
|
|||
8ab9bfeeeb
|
|||
5eee7176d4
|
|||
98c9c1faee
|
|||
645ffa0dad
|
|||
4358708262
|
|||
c738245783
|
|||
57184ceea0
|
|||
c2b9409562
|
|||
e067e65bce
|
|||
b8258e2937
|
|||
9af4c79947
|
|||
d8b8182b91
|
|||
2fd44c1f53
|
|||
c3f99d124c
|
|||
51f5b9fceb
|
|||
973f4416de
|
|||
a84209eb81
|
|||
498cd69328
|
|||
b28c42d945
|
|||
3099f02145
|
|||
74b9d0421c
|
|||
c61adad180
|
|||
298ecb4092
|
|||
020e12e20b
|
|||
6ef56bfed5
|
|||
fda4913c97
|
|||
e85b32e22f
|
|||
2d6d6d24a4
|
|||
00993a85db
|
|||
4f7e708255
|
|||
238e4839e0
|
|||
b0ad806a93
|
|||
453b4fd922
|
|||
bb0d24809e
|
|||
3abd4c4af9
|
|||
2e5e77b4e5
|
|||
e79cf5de7a
|
|||
c15eaca205
|
|||
496c99ccf1
|
|||
992622e8d1
|
|||
cabe36c822
|
|||
d84b67c460
|
|||
1c28950b53
|
|||
b54bcdd9e9
|
|||
9ec6c958c8
|
|||
25deac6ea9
|
|||
a5ac10b20d
|
|||
3de40ccad3
|
|||
6a5dc9b62c
|
|||
b6014a72e0
|
|||
245b47b8b3
|
|||
e33f23c18f
|
|||
33012bc328
|
|||
447bd4820c
|
|||
72e89dae77
|
|||
1cd0a8c0fb
|
|||
a9a430f856
|
|||
0ee4c50a24
|
|||
714f0d97a9
|
|||
d622ddfbf3
|
|||
86fd40cc4a
|
|||
e174850262
|
|||
6328d835ee
|
|||
34d42e2af5
|
|||
e19caf47bf
|
|||
72998ffc02
|
|||
ba44814474
|
|||
86f8fde8fa
|
|||
811fec4b11
|
|||
fe6cf2758c
|
|||
1e1372ca56
|
|||
d91c0bc255
|
|||
a14f5d3ae5
|
|||
4ac13053d5
|
|||
e9311225e7
|
|||
44c70a5ee7
|
|||
cd804f2c77
|
|||
15997bd5af
|
|||
880ea93424
|
|||
dc1a9d5c4f
|
|||
51c25659a9
|
|||
973dda59d2
|
|||
64edca9ffa
|
|||
86e25b84ab
|
|||
edc1d062bc
|
|||
12a517c9fa
|
|||
c1882f66e3
|
|||
1e87e67eb1
|
|||
84552e088b
|
|||
79dc8ae25c
|
|||
cee06e4f64
|
|||
d9b5f0eab2
|
|||
ff28600710
|
|||
7517bf5f37
|
|||
780a04d13f
|
|||
fd04e9fa77
|
|||
18902aedac
|
|||
f9e37e9b1e
|
|||
c747cd1fd8
|
|||
6a5457191a
|
|||
76f6d0c377
|
|||
ae93703c08
|
|||
c55176090c
|
|||
081b8a92de
|
|||
d02a60675f
|
|||
4670568acb
|
|||
4b75a1dea9
|
|||
e2b7ff2e15
|
|||
b94aa49fc3
|
|||
73a92e5636
|
|||
42b28665e1
|
|||
6ba187f8e4
|
|||
a765fd8d00
|
|||
854e3cc54a
|
|||
2d8eb32e90
|
|||
1f1ed79ee5
|
|||
01fd7bad69
|
|||
44f49e5974
|
|||
0cf3411f63
|
|||
aa669710e1
|
|||
242833f886
|
|||
0cdfd3c298
|
|||
a98b4839dd
|
|||
1999f13cf2
|
|||
8466f67c86
|
|||
d9fbb4b896
|
|||
4ff3692606
|
|||
8289c48896
|
|||
d1b9202337
|
|||
fde93cb875
|
|||
d1c3ac6079
|
|||
d921c2d8a6
|
|||
52513e1ed8
|
|||
cb380814a7
|
|||
5ef8c07f30
|
|||
9573c3b8ff
|
|||
c4354a1380
|
|||
a245b6ff0f
|
|||
6329d380b7
|
|||
76fbc39fed
|
|||
4b6734c173
|
|||
b505b5b430
|
|||
87553ebdc5
|
|||
ba4fc0cac5
|
|||
8cb0276215
|
|||
f9a51ee83d
|
|||
c9deba7d65
|
|||
c55fbe86b5
|
|||
0e93993498
|
|||
9fccdfbff0
|
|||
d78139a5b3
|
|||
7dc43fbf77
|
|||
5442926457
|
|||
db4c635260
|
|||
4a1d08d4df
|
|||
c35b539c42 | |||
bbe5e072b2 | |||
6fc2f623dc | |||
9481bd5fef | |||
4083165123 | |||
45bb2681c7 | |||
dbb8ec3f9a | |||
206b5f6d46 | |||
b7e14ecc83 | |||
912e010729 | |||
a485237456 | |||
f5faf92ee0 | |||
07452d8c43 | |||
229a79d266 | |||
c6ed577fe3 | |||
171e4779a3 | |||
79f94e5984 | |||
ccebcb89c6 | |||
fe0a6b39e3 | |||
6a495f951f | |||
c8646d0a0c | |||
f2bb15e669 | |||
c49177d63c | |||
bd8d30eac1 | |||
c44d8bf427 | |||
3f037b4c7c | |||
8783d1fc8e | |||
9a1d24dbfd | |||
4720660cff | |||
e158bc0623 | |||
8982fc5086 | |||
729e1d939b | |||
2b4683e489 | |||
cce810e8cf | |||
62cd17f702 | |||
f31280c682 | |||
a745d16ec3 | |||
ae079e36ec | |||
c8a3212b77 | |||
d211326c3f | |||
270a291f05 | |||
13b750ca92 | |||
015b6db2f7 | |||
667b161fff | |||
5958cbf4a6 | |||
3b37f2c3f0 | |||
4517ff2b5a | |||
884ce13e26 | |||
dd219bae9d | |||
60d29090a1 | |||
1bc3ca057b | |||
c2c0886451 | |||
b0be7b5887 | |||
099d989f16 | |||
a879360ebd | |||
866f2526e6 | |||
ce3c4b55f0 | |||
c52cd822ae | |||
cdc6ca1324 | |||
e7ed349356 | |||
5052ca7dbf | |||
f408bfd927 | |||
666dee33ba | |||
e0b09e051a |
25
.devcontainer/devcontainer.json
Normal file
25
.devcontainer/devcontainer.json
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
"name": "Django Time Tracker",
|
||||||
|
"dockerFile": "../devcontainer.Dockerfile",
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"settings": {
|
||||||
|
"python.pythonPath": "/usr/local/bin/python",
|
||||||
|
"python.defaultInterpreterPath": "/usr/local/bin/python",
|
||||||
|
"terminal.integrated.defaultProfile.linux": "bash"
|
||||||
|
},
|
||||||
|
"extensions": [
|
||||||
|
"ms-python.python",
|
||||||
|
"ms-python.debugpy",
|
||||||
|
"ms-python.vscode-pylance",
|
||||||
|
"ms-azuretools.vscode-docker",
|
||||||
|
"batisteo.vscode-django",
|
||||||
|
"charliermarsh.ruff",
|
||||||
|
"bradlc.vscode-tailwindcss",
|
||||||
|
"EditorConfig.EditorConfig"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"forwardPorts": [8000],
|
||||||
|
"postCreateCommand": "poetry install && poetry run python manage.py migrate && npm install && make dev",
|
||||||
|
}
|
@ -5,4 +5,13 @@
|
|||||||
.venv
|
.venv
|
||||||
.vscode
|
.vscode
|
||||||
node_modules
|
node_modules
|
||||||
src/timetracker/static/*
|
static
|
||||||
|
.drone.yml
|
||||||
|
.editorconfig
|
||||||
|
.gitignore
|
||||||
|
Caddyfile
|
||||||
|
CHANGELOG.md
|
||||||
|
db.sqlite3
|
||||||
|
docker-compose*
|
||||||
|
Dockerfile
|
||||||
|
Makefile
|
||||||
|
@ -5,11 +5,12 @@ name: default
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: test
|
- name: test
|
||||||
image: python:3.10
|
image: python:3.12
|
||||||
commands:
|
commands:
|
||||||
- python -m pip install poetry
|
- python -m pip install poetry
|
||||||
- poetry install
|
- poetry install
|
||||||
- poetry env info
|
- poetry env info
|
||||||
|
- poetry run python manage.py migrate
|
||||||
- poetry run pytest
|
- poetry run pytest
|
||||||
|
|
||||||
- name: build-prod
|
- name: build-prod
|
||||||
|
@ -15,3 +15,6 @@ indent_size = 4
|
|||||||
[**/*.js]
|
[**/*.js]
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.html]
|
||||||
|
insert_final_newline = false
|
||||||
|
36
.github/workflows/build-docker.yml
vendored
Normal file
36
.github/workflows/build-docker.yml
vendored
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
name: Django CI/CD
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths-ignore: [ 'README.md' ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/setup-python@v4
|
||||||
|
with:
|
||||||
|
python-version: 3.12
|
||||||
|
- run: |
|
||||||
|
python -m pip install poetry
|
||||||
|
poetry install
|
||||||
|
poetry env info
|
||||||
|
poetry run python manage.py migrate
|
||||||
|
# PROD=1 poetry run pytest
|
||||||
|
build-and-push:
|
||||||
|
needs: test
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.ref == 'refs/heads/main'
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: docker/setup-buildx-action@v3
|
||||||
|
- uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
registry.kucharczyk.xyz/timetracker:latest
|
||||||
|
registry.kucharczyk.xyz/timetracker:${{ env.VERSION_NUMBER }}
|
||||||
|
env:
|
||||||
|
VERSION_NUMBER: 1.5.1
|
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,9 +1,12 @@
|
|||||||
__pycache__
|
__pycache__
|
||||||
.mypy_cache
|
.mypy_cache
|
||||||
.pytest_cache
|
.pytest_cache
|
||||||
.venv
|
.venv/
|
||||||
node_modules
|
node_modules
|
||||||
package-lock.json
|
package-lock.json
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
/static/
|
/static/
|
||||||
dist/
|
dist/
|
||||||
|
.DS_Store
|
||||||
|
.python-version
|
||||||
|
.direnv
|
||||||
|
11
.vscode/extensions.json
vendored
Normal file
11
.vscode/extensions.json
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"recommendations": [
|
||||||
|
"charliermarsh.ruff",
|
||||||
|
"ms-python.python",
|
||||||
|
"ms-python.vscode-pylance",
|
||||||
|
"ms-python.debugpy",
|
||||||
|
"batisteo.vscode-django",
|
||||||
|
"bradlc.vscode-tailwindcss",
|
||||||
|
"EditorConfig.EditorConfig"
|
||||||
|
]
|
||||||
|
}
|
26
.vscode/settings.json
vendored
26
.vscode/settings.json
vendored
@ -4,8 +4,30 @@
|
|||||||
],
|
],
|
||||||
"python.testing.unittestEnabled": false,
|
"python.testing.unittestEnabled": false,
|
||||||
"python.testing.pytestEnabled": true,
|
"python.testing.pytestEnabled": true,
|
||||||
"python.analysis.typeCheckingMode": "basic",
|
"python.analysis.typeCheckingMode": "strict",
|
||||||
"[python]": {
|
"[python]": {
|
||||||
"editor.defaultFormatter": "ms-python.black-formatter"
|
"editor.defaultFormatter": "charliermarsh.ruff",
|
||||||
|
"editor.formatOnSave": true,
|
||||||
|
"editor.codeActionsOnSave": {
|
||||||
|
"source.fixAll": "explicit",
|
||||||
|
"source.organizeImports": "explicit"
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
"ruff.path": ["/nix/store/jaibb3v0rrnlw5ib54qqq3452yhp1xcb-ruff-0.5.7/bin/ruff"],
|
||||||
|
"tailwind-fold.supportedLanguages": [
|
||||||
|
"html",
|
||||||
|
"typescriptreact",
|
||||||
|
"javascriptreact",
|
||||||
|
"typescript",
|
||||||
|
"javascript",
|
||||||
|
"vue-html",
|
||||||
|
"vue",
|
||||||
|
"php",
|
||||||
|
"markdown",
|
||||||
|
"coffeescript",
|
||||||
|
"svelte",
|
||||||
|
"astro",
|
||||||
|
"erb",
|
||||||
|
"django-html"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
94
CHANGELOG.md
94
CHANGELOG.md
@ -1,3 +1,97 @@
|
|||||||
|
## Unreleased
|
||||||
|
|
||||||
|
## New
|
||||||
|
* Render notes as Markdown
|
||||||
|
* Require login by default
|
||||||
|
* Add stats for dropped purchases, monthly playtimes
|
||||||
|
* Allow deleting purchases
|
||||||
|
* Add all-time stats
|
||||||
|
* Manage purchases
|
||||||
|
* Automatically convert purchase prices
|
||||||
|
|
||||||
|
## Improved
|
||||||
|
* mark refunded purchases red on game overview
|
||||||
|
* increase session count on game overview when starting a new session
|
||||||
|
* game overview:
|
||||||
|
* sort purchases also by date purchased (on top of date released)
|
||||||
|
* improve header format, make it more appealing
|
||||||
|
* ignore manual sessions when calculating session average
|
||||||
|
* stats: improve purchase name consistency
|
||||||
|
* session list: use display name instead of sort name
|
||||||
|
* unify the appearance of game links, and make them expand to full size on hover
|
||||||
|
|
||||||
|
## Fixed
|
||||||
|
* Fix title not being displayed on the Recent sessions page
|
||||||
|
* Avoid errors when displaying game overview with zero sessions
|
||||||
|
|
||||||
|
## 1.5.2 / 2024-01-14 21:27+01:00
|
||||||
|
|
||||||
|
## Improved
|
||||||
|
* game overview:
|
||||||
|
* improve how editions and purchases are displayed
|
||||||
|
* make it possible to end session from overview
|
||||||
|
* add purchase: only allow choosing purchases of selected edition
|
||||||
|
* session list:
|
||||||
|
* starting and ending sessions is much faster/doest not reload the page
|
||||||
|
* listing sessions is much faster
|
||||||
|
|
||||||
|
## 1.5.1 / 2023-11-14 21:10+01:00
|
||||||
|
|
||||||
|
## Improved
|
||||||
|
* Disallow choosing non-game purchase as related purchase
|
||||||
|
* Improve display of purchases
|
||||||
|
|
||||||
|
## 1.5.0 / 2023-11-14 19:27+01:00
|
||||||
|
|
||||||
|
## New
|
||||||
|
* Add stat for finished this year's games
|
||||||
|
* Add purchase types:
|
||||||
|
* Game (previously all of them were this type)
|
||||||
|
* DLC
|
||||||
|
* Season Pass
|
||||||
|
* Battle Pass
|
||||||
|
|
||||||
|
## Fixed
|
||||||
|
* Order purchases by date on game view
|
||||||
|
|
||||||
|
## 1.4.0 / 2023-11-09 21:01+01:00
|
||||||
|
|
||||||
|
### New
|
||||||
|
* More fields are now optional. This is to make it easier to add new items in bulk.
|
||||||
|
* Game: Wikidata ID
|
||||||
|
* Edition: Platform, Year
|
||||||
|
* Purchase: Platform
|
||||||
|
* Platform: Group
|
||||||
|
* Session: Device
|
||||||
|
* New fields:
|
||||||
|
* Game: Year Released
|
||||||
|
* To record original year of release
|
||||||
|
* Upon migration, this will be set to a year of any of the game's edition that has it set
|
||||||
|
* Purchase: Date Finished
|
||||||
|
* Editions are now unique combination of name and platform
|
||||||
|
* Add more stats:
|
||||||
|
* All finished games
|
||||||
|
* All finished 2023 games
|
||||||
|
* All finished games that were purchased this year
|
||||||
|
* Sessions (count)
|
||||||
|
* Days played
|
||||||
|
* Finished (count)
|
||||||
|
* Unfinished (count)
|
||||||
|
* Refunded (count)
|
||||||
|
* Backlog Decrease (count)
|
||||||
|
* New workflow:
|
||||||
|
* Adding Game, Edition, Purchase, and Session in a row is now much faster
|
||||||
|
|
||||||
|
### Improved
|
||||||
|
* game overview: simplify playtime range display
|
||||||
|
* new session: order devices alphabetically
|
||||||
|
* ignore English articles when sorting names
|
||||||
|
* added a new sort_name field that gets automatically created
|
||||||
|
* automatically fill certain values in forms:
|
||||||
|
* new game: name and sort name after typing
|
||||||
|
* new edition: name, sort name, and year when selecting game
|
||||||
|
* new purchase: platform when selecting edition
|
||||||
|
|
||||||
## 1.3.0 / 2023-11-05 15:09+01:00
|
## 1.3.0 / 2023-11-05 15:09+01:00
|
||||||
|
|
||||||
### New
|
### New
|
||||||
|
46
Dockerfile
46
Dockerfile
@ -1,27 +1,45 @@
|
|||||||
FROM node as css
|
FROM python:3.12.0-slim-bullseye
|
||||||
WORKDIR /app
|
|
||||||
COPY . /app
|
|
||||||
RUN npm install && \
|
|
||||||
npx tailwindcss -i ./common/input.css -o ./static/base.css --minify
|
|
||||||
|
|
||||||
FROM python:3.10.9-slim-bullseye
|
ENV VERSION_NUMBER=1.5.2 \
|
||||||
|
PROD=1 \
|
||||||
|
PYTHONUNBUFFERED=1 \
|
||||||
|
PYTHONFAULTHANDLER=1 \
|
||||||
|
PYTHONHASHSEED=random \
|
||||||
|
PYTHONDONTWRITEBYTECODE=1 \
|
||||||
|
PIP_NO_CACHE_DIR=1 \
|
||||||
|
PIP_DISABLE_PIP_VERSION_CHECK=1 \
|
||||||
|
PIP_DEFAULT_TIMEOUT=100 \
|
||||||
|
PIP_ROOT_USER_ACTION=ignore \
|
||||||
|
POETRY_NO_INTERACTION=1 \
|
||||||
|
POETRY_VIRTUALENVS_CREATE=false \
|
||||||
|
POETRY_CACHE_DIR='/var/cache/pypoetry' \
|
||||||
|
POETRY_HOME='/usr/local'
|
||||||
|
|
||||||
ENV VERSION_NUMBER 1.3.0
|
RUN apt-get update && apt-get upgrade -y \
|
||||||
ENV PROD 1
|
&& apt-get install --no-install-recommends -y \
|
||||||
ENV PYTHONUNBUFFERED=1
|
bash \
|
||||||
|
curl \
|
||||||
|
&& curl -sSL 'https://install.python-poetry.org' | python - \
|
||||||
|
&& poetry --version \
|
||||||
|
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
|
||||||
|
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN useradd -m --uid 1000 timetracker
|
RUN useradd -m --uid 1000 timetracker \
|
||||||
|
&& mkdir -p '/var/www/django/static' \
|
||||||
|
&& chown timetracker:timetracker '/var/www/django/static'
|
||||||
WORKDIR /home/timetracker/app
|
WORKDIR /home/timetracker/app
|
||||||
COPY . /home/timetracker/app/
|
COPY . /home/timetracker/app/
|
||||||
RUN chown -R timetracker:timetracker /home/timetracker/app
|
RUN chown -R timetracker:timetracker /home/timetracker/app
|
||||||
COPY --from=css ./app/static/base.css /home/timetracker/app/static/base.css
|
|
||||||
COPY entrypoint.sh /
|
COPY entrypoint.sh /
|
||||||
RUN chmod +x /entrypoint.sh
|
RUN chmod +x /entrypoint.sh
|
||||||
|
|
||||||
|
RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \
|
||||||
|
echo "$PROD" \
|
||||||
|
&& poetry version \
|
||||||
|
&& poetry run pip install -U pip \
|
||||||
|
&& poetry install --only main --no-interaction --no-ansi --sync
|
||||||
|
|
||||||
USER timetracker
|
USER timetracker
|
||||||
ENV PATH="$PATH:/home/timetracker/.local/bin"
|
|
||||||
RUN pip install --no-cache-dir poetry
|
|
||||||
RUN poetry install
|
|
||||||
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
CMD [ "/entrypoint.sh" ]
|
CMD [ "/entrypoint.sh" ]
|
||||||
|
20
Makefile
20
Makefile
@ -3,6 +3,7 @@ all: css migrate
|
|||||||
initialize: npm css migrate sethookdir loadplatforms
|
initialize: npm css migrate sethookdir loadplatforms
|
||||||
|
|
||||||
HTMLFILES := $(shell find games/templates -type f)
|
HTMLFILES := $(shell find games/templates -type f)
|
||||||
|
PYTHON_VERSION = 3.12
|
||||||
|
|
||||||
npm:
|
npm:
|
||||||
npm install
|
npm install
|
||||||
@ -10,17 +11,26 @@ npm:
|
|||||||
css: common/input.css
|
css: common/input.css
|
||||||
npx tailwindcss -i ./common/input.css -o ./games/static/base.css
|
npx tailwindcss -i ./common/input.css -o ./games/static/base.css
|
||||||
|
|
||||||
css-dev: css
|
|
||||||
npx tailwindcss -i ./common/input.css -o ./games/static/base.css --watch
|
|
||||||
|
|
||||||
makemigrations:
|
makemigrations:
|
||||||
poetry run python manage.py makemigrations
|
poetry run python manage.py makemigrations
|
||||||
|
|
||||||
migrate: makemigrations
|
migrate: makemigrations
|
||||||
poetry run python manage.py migrate
|
poetry run python manage.py migrate
|
||||||
|
|
||||||
dev: migrate
|
init:
|
||||||
poetry run python manage.py runserver
|
pyenv install -s $(PYTHON_VERSION)
|
||||||
|
pyenv local $(PYTHON_VERSION)
|
||||||
|
pip install poetry
|
||||||
|
poetry install
|
||||||
|
npm install
|
||||||
|
|
||||||
|
dev:
|
||||||
|
@npx concurrently \
|
||||||
|
--names "Django,Tailwind" \
|
||||||
|
--prefix-colors "blue,green" \
|
||||||
|
"poetry run python -Wa manage.py runserver" \
|
||||||
|
"npx tailwindcss -i ./common/input.css -o ./games/static/base.css --watch"
|
||||||
|
|
||||||
|
|
||||||
caddy:
|
caddy:
|
||||||
caddy run --watch
|
caddy run --watch
|
||||||
|
14
README.md
14
README.md
@ -1,3 +1,15 @@
|
|||||||
# Timetracker
|
# Timetracker
|
||||||
|
|
||||||
A simple game catalogue and play session tracker.
|
A simple game catalogue and play session tracker.
|
||||||
|
|
||||||
|
# Development
|
||||||
|
|
||||||
|
The project uses `pyenv` to manage installed Python versions.
|
||||||
|
If you have `pyenv` installed, you can simply run:
|
||||||
|
|
||||||
|
```
|
||||||
|
make init
|
||||||
|
```
|
||||||
|
|
||||||
|
This will make sure the correct Python version is installed, and it will install all dependencies using `poetry`.
|
||||||
|
Afterwards, you can start the development server using `make dev`.
|
273
common/components.py
Normal file
273
common/components.py
Normal file
@ -0,0 +1,273 @@
|
|||||||
|
from random import choices as random_choices
|
||||||
|
from string import ascii_lowercase
|
||||||
|
from typing import Any, Callable
|
||||||
|
|
||||||
|
from django.template import TemplateDoesNotExist
|
||||||
|
from django.template.defaultfilters import floatformat
|
||||||
|
from django.template.loader import render_to_string
|
||||||
|
from django.urls import NoReverseMatch, reverse
|
||||||
|
from django.utils.safestring import SafeText, mark_safe
|
||||||
|
|
||||||
|
from common.utils import truncate
|
||||||
|
from games.models import Purchase
|
||||||
|
|
||||||
|
HTMLAttribute = tuple[str, str | int | bool]
|
||||||
|
HTMLTag = str
|
||||||
|
|
||||||
|
|
||||||
|
def Component(
|
||||||
|
attributes: list[HTMLAttribute] = [],
|
||||||
|
children: list[HTMLTag] | HTMLTag = [],
|
||||||
|
template: str = "",
|
||||||
|
tag_name: str = "",
|
||||||
|
) -> HTMLTag:
|
||||||
|
if not tag_name and not template:
|
||||||
|
raise ValueError("One of template or tag_name is required.")
|
||||||
|
if isinstance(children, str):
|
||||||
|
children = [children]
|
||||||
|
childrenBlob = "\n".join(children)
|
||||||
|
if len(attributes) == 0:
|
||||||
|
attributesBlob = ""
|
||||||
|
else:
|
||||||
|
attributesList = [f'{name}="{value}"' for name, value in attributes]
|
||||||
|
# make attribute list into a string
|
||||||
|
# and insert space between tag and attribute list
|
||||||
|
attributesBlob = f" {" ".join(attributesList)}"
|
||||||
|
tag: str = ""
|
||||||
|
if tag_name != "":
|
||||||
|
tag = f"<{tag_name}{attributesBlob}>{childrenBlob}</{tag_name}>"
|
||||||
|
elif template != "":
|
||||||
|
tag = render_to_string(
|
||||||
|
template,
|
||||||
|
{name: value for name, value in attributes}
|
||||||
|
| {"slot": mark_safe("\n".join(children))},
|
||||||
|
)
|
||||||
|
return mark_safe(tag)
|
||||||
|
|
||||||
|
|
||||||
|
def randomid(seed: str = "", length: int = 10) -> str:
|
||||||
|
return seed + "".join(random_choices(ascii_lowercase, k=length))
|
||||||
|
|
||||||
|
|
||||||
|
def Popover(
|
||||||
|
popover_content: str,
|
||||||
|
wrapped_content: str = "",
|
||||||
|
wrapped_classes: str = "",
|
||||||
|
children: list[HTMLTag] = [],
|
||||||
|
attributes: list[HTMLAttribute] = [],
|
||||||
|
) -> str:
|
||||||
|
if not wrapped_content and not children:
|
||||||
|
raise ValueError("One of wrapped_content or children is required.")
|
||||||
|
id = randomid()
|
||||||
|
return Component(
|
||||||
|
attributes=attributes
|
||||||
|
+ [
|
||||||
|
("id", id),
|
||||||
|
("wrapped_content", wrapped_content),
|
||||||
|
("popover_content", popover_content),
|
||||||
|
("wrapped_classes", wrapped_classes),
|
||||||
|
],
|
||||||
|
children=children,
|
||||||
|
template="cotton/popover.html",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def PopoverTruncated(
|
||||||
|
input_string: str,
|
||||||
|
popover_content: str = "",
|
||||||
|
popover_if_not_truncated: bool = False,
|
||||||
|
length: int = 30,
|
||||||
|
ellipsis: str = "…",
|
||||||
|
endpart: str = "",
|
||||||
|
) -> str:
|
||||||
|
"""
|
||||||
|
Returns `input_string` truncated after `length` of characters
|
||||||
|
and displays the untruncated text in a popover HTML element.
|
||||||
|
The truncated text ends in `ellipsis`, and optionally
|
||||||
|
an always-visible `endpart` can be specified.
|
||||||
|
`popover_content` can be specified if:
|
||||||
|
1. It needs to be always displayed regardless if text is truncated.
|
||||||
|
2. It needs to differ from `input_string`.
|
||||||
|
"""
|
||||||
|
if (truncated := truncate(input_string, length, ellipsis, endpart)) != input_string:
|
||||||
|
return Popover(
|
||||||
|
wrapped_content=truncated,
|
||||||
|
popover_content=popover_content if popover_content else input_string,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
if popover_content and popover_if_not_truncated:
|
||||||
|
return Popover(
|
||||||
|
wrapped_content=input_string,
|
||||||
|
popover_content=popover_content if popover_content else "",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return input_string
|
||||||
|
|
||||||
|
|
||||||
|
def A(
|
||||||
|
attributes: list[HTMLAttribute] = [],
|
||||||
|
children: list[HTMLTag] | HTMLTag = [],
|
||||||
|
url: str | Callable[..., Any] = "",
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Returns the HTML tag "a".
|
||||||
|
"url" can either be:
|
||||||
|
- URL (string)
|
||||||
|
- path name passed to reverse() (string)
|
||||||
|
- function
|
||||||
|
"""
|
||||||
|
additional_attributes = []
|
||||||
|
if url:
|
||||||
|
if type(url) is str:
|
||||||
|
try:
|
||||||
|
url_result = reverse(url)
|
||||||
|
except NoReverseMatch:
|
||||||
|
url_result = url
|
||||||
|
elif callable(url):
|
||||||
|
url_result = url()
|
||||||
|
else:
|
||||||
|
raise TypeError("'url' is neither str nor function.")
|
||||||
|
additional_attributes = [("href", url_result)]
|
||||||
|
return Component(
|
||||||
|
tag_name="a", attributes=attributes + additional_attributes, children=children
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def Button(
|
||||||
|
attributes: list[HTMLAttribute] = [],
|
||||||
|
children: list[HTMLTag] | HTMLTag = [],
|
||||||
|
size: str = "base",
|
||||||
|
icon: bool = False,
|
||||||
|
color: str = "blue",
|
||||||
|
):
|
||||||
|
return Component(
|
||||||
|
template="cotton/button.html",
|
||||||
|
attributes=attributes + [("size", size), ("icon", icon), ("color", color)],
|
||||||
|
children=children,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def Div(
|
||||||
|
attributes: list[HTMLAttribute] = [],
|
||||||
|
children: list[HTMLTag] | HTMLTag = [],
|
||||||
|
):
|
||||||
|
return Component(tag_name="div", attributes=attributes, children=children)
|
||||||
|
|
||||||
|
|
||||||
|
def Input(
|
||||||
|
type: str = "text",
|
||||||
|
attributes: list[HTMLAttribute] = [],
|
||||||
|
children: list[HTMLTag] | HTMLTag = [],
|
||||||
|
):
|
||||||
|
return Component(
|
||||||
|
tag_name="input", attributes=attributes + [("type", type)], children=children
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def Form(
|
||||||
|
action="",
|
||||||
|
method="get",
|
||||||
|
attributes: list[HTMLAttribute] = [],
|
||||||
|
children: list[HTMLTag] | HTMLTag = [],
|
||||||
|
):
|
||||||
|
return Component(
|
||||||
|
tag_name="form",
|
||||||
|
attributes=attributes + [("action", action), ("method", method)],
|
||||||
|
children=children,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def Icon(
|
||||||
|
name: str,
|
||||||
|
attributes: list[HTMLAttribute] = [],
|
||||||
|
):
|
||||||
|
try:
|
||||||
|
result = Component(template=f"cotton/icon/{name}.html", attributes=attributes)
|
||||||
|
except TemplateDoesNotExist:
|
||||||
|
result = Icon(name="unspecified", attributes=attributes)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def LinkedNameWithPlatformIcon(name: str, game_id: int, platform: str) -> SafeText:
|
||||||
|
link = reverse("view_game", args=[int(game_id)])
|
||||||
|
a_content = Div(
|
||||||
|
[("class", "inline-flex gap-2 items-center")],
|
||||||
|
[
|
||||||
|
Icon(
|
||||||
|
platform.icon,
|
||||||
|
[("title", platform.name)],
|
||||||
|
),
|
||||||
|
PopoverTruncated(name),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
return mark_safe(
|
||||||
|
A(
|
||||||
|
url=link,
|
||||||
|
children=[a_content],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def LinkedPurchase(purchase: Purchase) -> SafeText:
|
||||||
|
link = reverse("view_purchase", args=[int(purchase.id)])
|
||||||
|
link_content = ""
|
||||||
|
popover_content = ""
|
||||||
|
edition_count = purchase.editions.count()
|
||||||
|
popover_if_not_truncated = False
|
||||||
|
if edition_count == 1:
|
||||||
|
link_content += purchase.editions.first().name
|
||||||
|
popover_content = link_content
|
||||||
|
if edition_count > 1:
|
||||||
|
if purchase.name:
|
||||||
|
link_content += f"{purchase.name}"
|
||||||
|
popover_content += f"<h1>{purchase.name}</h1><br>"
|
||||||
|
else:
|
||||||
|
link_content += f"{edition_count} games"
|
||||||
|
popover_if_not_truncated = True
|
||||||
|
popover_content += f"""
|
||||||
|
<ul class="list-disc list-inside">
|
||||||
|
{"".join(f"<li>{edition.name}</li>" for edition in purchase.editions.all())}
|
||||||
|
</ul>
|
||||||
|
"""
|
||||||
|
icon = purchase.platform.icon if edition_count == 1 else "unspecified"
|
||||||
|
if link_content == "":
|
||||||
|
raise ValueError("link_content is empty!!")
|
||||||
|
a_content = Div(
|
||||||
|
[("class", "inline-flex gap-2 items-center")],
|
||||||
|
[
|
||||||
|
Icon(
|
||||||
|
icon,
|
||||||
|
[("title", "Multiple")],
|
||||||
|
),
|
||||||
|
PopoverTruncated(
|
||||||
|
input_string=link_content,
|
||||||
|
popover_content=mark_safe(popover_content),
|
||||||
|
popover_if_not_truncated=popover_if_not_truncated,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
return mark_safe(A(url=link, children=[a_content]))
|
||||||
|
|
||||||
|
|
||||||
|
def NameWithPlatformIcon(name: str, platform: str) -> SafeText:
|
||||||
|
content = Div(
|
||||||
|
[("class", "inline-flex gap-2 items-center")],
|
||||||
|
[
|
||||||
|
Icon(
|
||||||
|
platform.icon,
|
||||||
|
[("title", platform.name)],
|
||||||
|
),
|
||||||
|
PopoverTruncated(name),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
return mark_safe(content)
|
||||||
|
|
||||||
|
|
||||||
|
def PurchasePrice(purchase) -> str:
|
||||||
|
return Popover(
|
||||||
|
popover_content=f"{floatformat(purchase.price)} {purchase.price_currency}",
|
||||||
|
wrapped_content=f"{floatformat(purchase.converted_price)} {purchase.converted_currency}",
|
||||||
|
wrapped_classes="underline decoration-dotted",
|
||||||
|
)
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "IBM Plex Mono";
|
font-family: "IBM Plex Mono";
|
||||||
src: url("fonts/IBMPlexMono-regular.woff2") format("woff2");
|
src: url("fonts/IBMPlexMono-Regular.woff2") format("woff2");
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
@ -23,12 +23,33 @@
|
|||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "IBM Plex Serif";
|
||||||
|
src: url("fonts/IBMPlexSerif-Bold.woff2") format("woff2");
|
||||||
|
font-weight: 700;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "IBM Plex Sans Condensed";
|
||||||
|
src: url("fonts/IBMPlexSansCondensed-Regular.woff2") format("woff2");
|
||||||
|
font-weight: 400;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* a:hover {
|
||||||
|
text-decoration-color: #ff4400;
|
||||||
|
color: rgb(254, 185, 160);
|
||||||
|
transition: all 0.2s ease-out;
|
||||||
|
} */
|
||||||
|
|
||||||
form label {
|
form label {
|
||||||
@apply dark:text-slate-400;
|
@apply dark:text-slate-400;
|
||||||
}
|
}
|
||||||
|
|
||||||
.responsive-table {
|
.responsive-table {
|
||||||
@apply dark:text-white mx-auto;
|
@apply dark:text-white mx-auto table-fixed;
|
||||||
}
|
}
|
||||||
|
|
||||||
.responsive-table tr:nth-child(even) {
|
.responsive-table tr:nth-child(even) {
|
||||||
@ -49,11 +70,20 @@ form label {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@layer utilities {
|
@layer utilities {
|
||||||
|
.min-w-20char {
|
||||||
|
min-width: 20ch;
|
||||||
|
}
|
||||||
.max-w-20char {
|
.max-w-20char {
|
||||||
max-width: 20ch;
|
max-width: 20ch;
|
||||||
}
|
}
|
||||||
|
.min-w-30char {
|
||||||
|
min-width: 30ch;
|
||||||
|
}
|
||||||
|
.max-w-30char {
|
||||||
|
max-width: 30ch;
|
||||||
|
}
|
||||||
.max-w-35char {
|
.max-w-35char {
|
||||||
max-width: 40ch;
|
max-width: 35ch;
|
||||||
}
|
}
|
||||||
.max-w-40char {
|
.max-w-40char {
|
||||||
max-width: 40ch;
|
max-width: 40ch;
|
||||||
@ -66,6 +96,16 @@ textarea {
|
|||||||
@apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
|
@apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
form input:disabled,
|
||||||
|
select:disabled,
|
||||||
|
textarea:disabled {
|
||||||
|
@apply dark:bg-slate-700 dark:text-slate-400;
|
||||||
|
}
|
||||||
|
|
||||||
|
.errorlist {
|
||||||
|
@apply mt-4 mb-1 pl-3 py-2 bg-red-600 text-slate-200 w-[300px];
|
||||||
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 768px) {
|
@media screen and (min-width: 768px) {
|
||||||
form input,
|
form input,
|
||||||
select,
|
select,
|
||||||
@ -86,14 +126,6 @@ textarea {
|
|||||||
@apply mx-1;
|
@apply mx-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
th {
|
|
||||||
@apply text-right;
|
|
||||||
}
|
|
||||||
|
|
||||||
th label {
|
|
||||||
@apply mr-4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.basic-button-container {
|
.basic-button-container {
|
||||||
@apply flex space-x-2 justify-center;
|
@apply flex space-x-2 justify-center;
|
||||||
}
|
}
|
||||||
@ -101,3 +133,39 @@ th label {
|
|||||||
.basic-button {
|
.basic-button {
|
||||||
@apply inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight uppercase rounded shadow-md hover:bg-blue-700 hover:shadow-lg focus:bg-blue-700 focus:shadow-lg focus:outline-none focus:ring-0 active:bg-blue-800 active:shadow-lg transition duration-150 ease-in-out;
|
@apply inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight uppercase rounded shadow-md hover:bg-blue-700 hover:shadow-lg focus:bg-blue-700 focus:shadow-lg focus:outline-none focus:ring-0 active:bg-blue-800 active:shadow-lg transition duration-150 ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.markdown-content ul {
|
||||||
|
list-style-type: disc;
|
||||||
|
list-style-position: inside;
|
||||||
|
padding-left: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.markdown-content ol {
|
||||||
|
list-style-type: decimal;
|
||||||
|
list-style-position: inside;
|
||||||
|
padding-left: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.markdown-content ul,
|
||||||
|
.markdown-content ol {
|
||||||
|
list-style-position: outside;
|
||||||
|
padding-left: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.markdown-content ul ul,
|
||||||
|
.markdown-content ul ol,
|
||||||
|
.markdown-content ol ul,
|
||||||
|
.markdown-content ol ol {
|
||||||
|
list-style-type: circle;
|
||||||
|
margin-top: 0.5em;
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
padding-left: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* .truncate-container {
|
||||||
|
@apply inline-block relative;
|
||||||
|
a {
|
||||||
|
@apply inline-block truncate max-w-20char transition-all group-hover:absolute group-hover:max-w-none group-hover:-top-8 group-hover:-left-6 group-hover:min-w-60 group-hover:px-6 group-hover:py-3.5 group-hover:bg-purple-600 group-hover:rounded-sm group-hover:outline-dashed group-hover:outline-purple-400 group-hover:outline-4;
|
||||||
|
|
||||||
|
}
|
||||||
|
} */
|
||||||
|
106
common/time.py
106
common/time.py
@ -1,12 +1,15 @@
|
|||||||
import re
|
import re
|
||||||
from datetime import datetime, timedelta
|
from datetime import date, datetime, timedelta
|
||||||
from zoneinfo import ZoneInfo
|
|
||||||
|
|
||||||
from django.conf import settings
|
from django.utils import timezone
|
||||||
|
|
||||||
|
from common.utils import generate_split_ranges
|
||||||
|
|
||||||
def now() -> datetime:
|
dateformat: str = "%d/%m/%Y"
|
||||||
return datetime.now(ZoneInfo(settings.TIME_ZONE))
|
datetimeformat: str = "%d/%m/%Y %H:%M"
|
||||||
|
timeformat: str = "%H:%M"
|
||||||
|
durationformat: str = "%2.1H hours"
|
||||||
|
durationformat_manual: str = "%H hours"
|
||||||
|
|
||||||
|
|
||||||
def _safe_timedelta(duration: timedelta | int | None):
|
def _safe_timedelta(duration: timedelta | int | None):
|
||||||
@ -19,7 +22,7 @@ def _safe_timedelta(duration: timedelta | int | None):
|
|||||||
|
|
||||||
|
|
||||||
def format_duration(
|
def format_duration(
|
||||||
duration: timedelta | int | None, format_string: str = "%H hours"
|
duration: timedelta | int | float | None, format_string: str = "%H hours"
|
||||||
) -> str:
|
) -> str:
|
||||||
"""
|
"""
|
||||||
Format timedelta into the specified format_string.
|
Format timedelta into the specified format_string.
|
||||||
@ -44,7 +47,7 @@ def format_duration(
|
|||||||
# timestamps where end is before start
|
# timestamps where end is before start
|
||||||
if seconds_total < 0:
|
if seconds_total < 0:
|
||||||
seconds_total = 0
|
seconds_total = 0
|
||||||
days = hours = minutes = seconds = 0
|
days = hours = hours_float = minutes = seconds = 0
|
||||||
remainder = seconds = seconds_total
|
remainder = seconds = seconds_total
|
||||||
if "%d" in format_string:
|
if "%d" in format_string:
|
||||||
days, remainder = divmod(seconds_total, day_seconds)
|
days, remainder = divmod(seconds_total, day_seconds)
|
||||||
@ -55,7 +58,7 @@ def format_duration(
|
|||||||
minutes, seconds = divmod(remainder, minute_seconds)
|
minutes, seconds = divmod(remainder, minute_seconds)
|
||||||
literals = {
|
literals = {
|
||||||
"d": str(days),
|
"d": str(days),
|
||||||
"H": str(hours),
|
"H": str(hours) if "m" not in format_string else str(hours_float),
|
||||||
"m": str(minutes),
|
"m": str(minutes),
|
||||||
"s": str(seconds),
|
"s": str(seconds),
|
||||||
"r": str(seconds_total),
|
"r": str(seconds_total),
|
||||||
@ -77,3 +80,90 @@ def format_duration(
|
|||||||
rf"%\d*\.?\d*{pattern}", replacement, formatted_string
|
rf"%\d*\.?\d*{pattern}", replacement, formatted_string
|
||||||
)
|
)
|
||||||
return formatted_string
|
return formatted_string
|
||||||
|
|
||||||
|
|
||||||
|
def local_strftime(datetime: datetime, format: str = datetimeformat) -> str:
|
||||||
|
return timezone.localtime(datetime).strftime(format)
|
||||||
|
|
||||||
|
|
||||||
|
def daterange(start: date, end: date, end_inclusive: bool = False) -> list[date]:
|
||||||
|
time_between: timedelta = end - start
|
||||||
|
if (days_between := time_between.days) < 1:
|
||||||
|
raise ValueError("start and end have to be at least 1 day apart.")
|
||||||
|
if end_inclusive:
|
||||||
|
print(f"{end_inclusive=}")
|
||||||
|
print(f"{days_between=}")
|
||||||
|
days_between += 1
|
||||||
|
print(f"{days_between=}")
|
||||||
|
return [start + timedelta(x) for x in range(days_between)]
|
||||||
|
|
||||||
|
|
||||||
|
def streak(datelist: list[date]) -> dict[str, int | tuple[date, date]]:
|
||||||
|
if len(datelist) == 1:
|
||||||
|
return {"days": 1, "dates": (datelist[0], datelist[0])}
|
||||||
|
else:
|
||||||
|
print(f"Processing {len(datelist)} dates.")
|
||||||
|
missing = sorted(
|
||||||
|
set(
|
||||||
|
datelist[0] + timedelta(x)
|
||||||
|
for x in range((datelist[-1] - datelist[0]).days)
|
||||||
|
)
|
||||||
|
- set(datelist)
|
||||||
|
)
|
||||||
|
print(f"{len(missing)} days missing.")
|
||||||
|
datelist_with_missing = sorted(datelist + missing)
|
||||||
|
ranges = list(generate_split_ranges(datelist_with_missing, missing))
|
||||||
|
print(f"{len(ranges)} ranges calculated.")
|
||||||
|
longest_consecutive_days = timedelta(0)
|
||||||
|
longest_range: tuple[date, date] = (date(1970, 1, 1), date(1970, 1, 1))
|
||||||
|
for start, end in ranges:
|
||||||
|
if (current_streak := end - start) > longest_consecutive_days:
|
||||||
|
longest_consecutive_days = current_streak
|
||||||
|
longest_range = (start, end)
|
||||||
|
return {"days": longest_consecutive_days.days + 1, "dates": longest_range}
|
||||||
|
|
||||||
|
|
||||||
|
def streak_bruteforce(datelist: list[date]) -> dict[str, int | tuple[date, date]]:
|
||||||
|
if (datelist_length := len(datelist)) == 0:
|
||||||
|
raise ValueError("Number of dates in the list is 0.")
|
||||||
|
datelist.sort()
|
||||||
|
current_streak = 1
|
||||||
|
current_start = datelist[0]
|
||||||
|
current_end = datelist[0]
|
||||||
|
current_date = datelist[0]
|
||||||
|
highest_streak = 1
|
||||||
|
highest_streak_daterange = (current_start, current_end)
|
||||||
|
|
||||||
|
def update_highest_streak():
|
||||||
|
nonlocal highest_streak, highest_streak_daterange
|
||||||
|
if current_streak > highest_streak:
|
||||||
|
highest_streak = current_streak
|
||||||
|
highest_streak_daterange = (current_start, current_end)
|
||||||
|
|
||||||
|
def reset_streak():
|
||||||
|
nonlocal current_start, current_end, current_streak
|
||||||
|
current_start = current_end = current_date
|
||||||
|
current_streak = 1
|
||||||
|
|
||||||
|
def increment_streak():
|
||||||
|
nonlocal current_end, current_streak
|
||||||
|
current_end = current_date
|
||||||
|
current_streak += 1
|
||||||
|
|
||||||
|
for i, datelist_item in enumerate(datelist, start=1):
|
||||||
|
current_date = datelist_item
|
||||||
|
if current_date == current_start or current_date == current_end:
|
||||||
|
continue
|
||||||
|
if current_date - timedelta(1) != current_end and i != datelist_length:
|
||||||
|
update_highest_streak()
|
||||||
|
reset_streak()
|
||||||
|
elif current_date - timedelta(1) == current_end and i == datelist_length:
|
||||||
|
increment_streak()
|
||||||
|
update_highest_streak()
|
||||||
|
else:
|
||||||
|
increment_streak()
|
||||||
|
return {"days": highest_streak, "dates": highest_streak_daterange}
|
||||||
|
|
||||||
|
|
||||||
|
def available_stats_year_range():
|
||||||
|
return range(datetime.now().year, 1999, -1)
|
||||||
|
83
common/utils.py
Normal file
83
common/utils.py
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
from datetime import date
|
||||||
|
from typing import Any, Generator, TypeVar
|
||||||
|
|
||||||
|
|
||||||
|
def safe_division(numerator: int | float, denominator: int | float) -> int | float:
|
||||||
|
"""
|
||||||
|
Divides without triggering division by zero exception.
|
||||||
|
Returns 0 if denominator is 0.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
return numerator / denominator
|
||||||
|
except ZeroDivisionError:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def safe_getattr(obj: object, attr_chain: str, default: Any | None = None) -> object:
|
||||||
|
"""
|
||||||
|
Safely get the nested attribute from an object.
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
obj (object): The object from which to retrieve the attribute.
|
||||||
|
attr_chain (str): The chain of attributes, separated by dots.
|
||||||
|
default: The default value to return if any attribute in the chain does not exist.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The value of the nested attribute if it exists, otherwise the default value.
|
||||||
|
"""
|
||||||
|
attrs = attr_chain.split(".")
|
||||||
|
for attr in attrs:
|
||||||
|
try:
|
||||||
|
obj = getattr(obj, attr)
|
||||||
|
except AttributeError:
|
||||||
|
return default
|
||||||
|
return obj
|
||||||
|
|
||||||
|
|
||||||
|
def truncate_(input_string: str, length: int = 30, ellipsis: str = "…") -> str:
|
||||||
|
return (
|
||||||
|
(f"{input_string[:length-len(ellipsis)].rstrip()}{ellipsis}")
|
||||||
|
if len(input_string) > length
|
||||||
|
else input_string
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def truncate(
|
||||||
|
input_string: str, length: int = 30, ellipsis: str = "…", endpart: str = ""
|
||||||
|
) -> str:
|
||||||
|
max_content_length = length - len(endpart)
|
||||||
|
if max_content_length < 0:
|
||||||
|
raise ValueError("Length cannot be shorter than the length of endpart.")
|
||||||
|
|
||||||
|
if len(input_string) > max_content_length:
|
||||||
|
return f"{input_string[:max_content_length - len(ellipsis)].rstrip()}{ellipsis}{endpart}"
|
||||||
|
|
||||||
|
return (
|
||||||
|
f"{input_string}{endpart}"
|
||||||
|
if len(input_string) + len(endpart) <= length
|
||||||
|
else f"{input_string[:length - len(ellipsis) - len(endpart)].rstrip()}{ellipsis}{endpart}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
T = TypeVar("T", str, int, date)
|
||||||
|
|
||||||
|
|
||||||
|
def generate_split_ranges(
|
||||||
|
value_list: list[T], split_points: list[T]
|
||||||
|
) -> Generator[tuple[T, T], None, None]:
|
||||||
|
for x in range(0, len(split_points) + 1):
|
||||||
|
if x == 0:
|
||||||
|
start = 0
|
||||||
|
elif x >= len(split_points):
|
||||||
|
start = value_list.index(split_points[x - 1]) + 1
|
||||||
|
else:
|
||||||
|
start = value_list.index(split_points[x - 1]) + 1
|
||||||
|
try:
|
||||||
|
end = value_list.index(split_points[x])
|
||||||
|
except IndexError:
|
||||||
|
end = len(value_list)
|
||||||
|
yield (value_list[start], value_list[end - 1])
|
||||||
|
|
||||||
|
|
||||||
|
def format_float_or_int(number: int | float):
|
||||||
|
return int(number) if float(number).is_integer() else f"{number:03.2f}"
|
24
devcontainer.Dockerfile
Normal file
24
devcontainer.Dockerfile
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
FROM python:3.13-slim
|
||||||
|
|
||||||
|
# Set up environment
|
||||||
|
ENV PYTHONUNBUFFERED=1
|
||||||
|
WORKDIR /workspace
|
||||||
|
|
||||||
|
# Install Poetry
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
curl \
|
||||||
|
make \
|
||||||
|
npm \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
RUN curl -sSL https://install.python-poetry.org | python3 -
|
||||||
|
ENV PATH="/root/.local/bin:$PATH"
|
||||||
|
|
||||||
|
# Copy pyproject.toml and poetry.lock for dependency installation
|
||||||
|
COPY pyproject.toml poetry.lock* ./
|
||||||
|
RUN poetry install --no-root
|
||||||
|
|
||||||
|
# Copy the rest of the application code
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Set up Django development server
|
||||||
|
EXPOSE 8000
|
@ -10,13 +10,14 @@ services:
|
|||||||
- CSRF_TRUSTED_ORIGINS="https://tracker.kucharczyk.xyz"
|
- CSRF_TRUSTED_ORIGINS="https://tracker.kucharczyk.xyz"
|
||||||
user: "1000"
|
user: "1000"
|
||||||
volumes:
|
volumes:
|
||||||
- "static-files:/home/timetracker/app/static"
|
- "static-files:/var/www/django/static"
|
||||||
|
- "$PWD/db.sqlite3:/home/timetracker/app/db.sqlite3"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
frontend:
|
frontend:
|
||||||
image: caddy
|
image: caddy
|
||||||
volumes:
|
volumes:
|
||||||
- "static-files:/usr/share/caddy"
|
- "static-files:/usr/share/caddy:ro"
|
||||||
- "$PWD/Caddyfile:/etc/caddy/Caddyfile"
|
- "$PWD/Caddyfile:/etc/caddy/Caddyfile"
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
@ -26,3 +27,4 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
static-files:
|
static-files:
|
||||||
|
|
||||||
|
|
@ -10,10 +10,14 @@ poetry run python manage.py collectstatic --clear --no-input
|
|||||||
_term() {
|
_term() {
|
||||||
echo "Caught SIGTERM signal!"
|
echo "Caught SIGTERM signal!"
|
||||||
kill -SIGTERM "$gunicorn_pid"
|
kill -SIGTERM "$gunicorn_pid"
|
||||||
|
kill -SIGTERM "$django_q_pid"
|
||||||
}
|
}
|
||||||
trap _term SIGTERM
|
trap _term SIGTERM
|
||||||
|
|
||||||
|
echo "Starting Django-Q cluster"
|
||||||
|
poetry run python manage.py qcluster & django_q_pid=$!
|
||||||
|
|
||||||
echo "Starting app"
|
echo "Starting app"
|
||||||
poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile - & gunicorn_pid=$!
|
poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile - & gunicorn_pid=$!
|
||||||
|
|
||||||
wait "$gunicorn_pid"
|
wait "$gunicorn_pid" "$django_q_pid"
|
||||||
|
@ -1,6 +1,14 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from games.models import Game, Platform, Purchase, Session, Edition, Device
|
from games.models import (
|
||||||
|
Device,
|
||||||
|
Edition,
|
||||||
|
ExchangeRate,
|
||||||
|
Game,
|
||||||
|
Platform,
|
||||||
|
Purchase,
|
||||||
|
Session,
|
||||||
|
)
|
||||||
|
|
||||||
# Register your models here.
|
# Register your models here.
|
||||||
admin.site.register(Game)
|
admin.site.register(Game)
|
||||||
@ -9,3 +17,4 @@ admin.site.register(Platform)
|
|||||||
admin.site.register(Session)
|
admin.site.register(Session)
|
||||||
admin.site.register(Edition)
|
admin.site.register(Edition)
|
||||||
admin.site.register(Device)
|
admin.site.register(Device)
|
||||||
|
admin.site.register(ExchangeRate)
|
||||||
|
@ -1,6 +1,33 @@
|
|||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
from django.apps import AppConfig
|
from django.apps import AppConfig
|
||||||
|
from django.core.management import call_command
|
||||||
|
from django.db.models.signals import post_migrate
|
||||||
|
from django.utils.timezone import now
|
||||||
|
|
||||||
|
|
||||||
class GamesConfig(AppConfig):
|
class GamesConfig(AppConfig):
|
||||||
default_auto_field = "django.db.models.BigAutoField"
|
default_auto_field = "django.db.models.BigAutoField"
|
||||||
name = "games"
|
name = "games"
|
||||||
|
|
||||||
|
def ready(self):
|
||||||
|
post_migrate.connect(schedule_tasks, sender=self)
|
||||||
|
|
||||||
|
|
||||||
|
def schedule_tasks(sender, **kwargs):
|
||||||
|
from django_q.models import Schedule
|
||||||
|
from django_q.tasks import schedule
|
||||||
|
|
||||||
|
if not Schedule.objects.filter(name="Update converted prices").exists():
|
||||||
|
schedule(
|
||||||
|
"games.tasks.convert_prices",
|
||||||
|
name="Update converted prices",
|
||||||
|
schedule_type=Schedule.MINUTES,
|
||||||
|
next_run=now() + timedelta(seconds=30),
|
||||||
|
)
|
||||||
|
|
||||||
|
from games.models import ExchangeRate
|
||||||
|
|
||||||
|
if not ExchangeRate.objects.exists():
|
||||||
|
print("ExchangeRate table is empty. Loading fixture...")
|
||||||
|
call_command("loaddata", "exchangerates.yaml")
|
||||||
|
112
games/fixtures/exchangerates.yaml
Normal file
112
games/fixtures/exchangerates.yaml
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
- model: games.exchangerate
|
||||||
|
pk: 1
|
||||||
|
fields:
|
||||||
|
currency_from: USD
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2024
|
||||||
|
rate: 23.4
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 2
|
||||||
|
fields:
|
||||||
|
currency_from: CNY
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2024
|
||||||
|
rate: 3.267
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 3
|
||||||
|
fields:
|
||||||
|
currency_from: USD
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2019
|
||||||
|
rate: 22.466
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 4
|
||||||
|
fields:
|
||||||
|
currency_from: USD
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2023
|
||||||
|
rate: 22.63
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 5
|
||||||
|
fields:
|
||||||
|
currency_from: USD
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2017
|
||||||
|
rate: 25.819
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 6
|
||||||
|
fields:
|
||||||
|
currency_from: USD
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2013
|
||||||
|
rate: 19.023
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 7
|
||||||
|
fields:
|
||||||
|
currency_from: CNY
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2019
|
||||||
|
rate: 3.295
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 8
|
||||||
|
fields:
|
||||||
|
currency_from: CNY
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2016
|
||||||
|
rate: 3.795
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 9
|
||||||
|
fields:
|
||||||
|
currency_from: CNY
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2015
|
||||||
|
rate: 3.707
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 10
|
||||||
|
fields:
|
||||||
|
currency_from: CNY
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2020
|
||||||
|
rate: 3.26
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 11
|
||||||
|
fields:
|
||||||
|
currency_from: EUR
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2012
|
||||||
|
rate: 25.51
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 12
|
||||||
|
fields:
|
||||||
|
currency_from: EUR
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2010
|
||||||
|
rate: 26.465
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 13
|
||||||
|
fields:
|
||||||
|
currency_from: EUR
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2014
|
||||||
|
rate: 27.52
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 14
|
||||||
|
fields:
|
||||||
|
currency_from: EUR
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2024
|
||||||
|
rate: 25.21
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 15
|
||||||
|
fields:
|
||||||
|
currency_from: EUR
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2022
|
||||||
|
rate: 24.325
|
||||||
|
- model: games.exchangerate
|
||||||
|
pk: 16
|
||||||
|
fields:
|
||||||
|
currency_from: CNY
|
||||||
|
currency_to: CZK
|
||||||
|
year: 2018
|
||||||
|
rate: 3.268
|
112
games/forms.py
112
games/forms.py
@ -1,12 +1,13 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
|
from django.urls import reverse
|
||||||
|
|
||||||
from games.models import Game, Platform, Purchase, Session, Edition, Device
|
from common.utils import safe_getattr
|
||||||
|
from games.models import Device, Edition, Game, Platform, Purchase, Session
|
||||||
|
|
||||||
custom_date_widget = forms.DateInput(attrs={"type": "date"})
|
custom_date_widget = forms.DateInput(attrs={"type": "date"})
|
||||||
custom_datetime_widget = forms.DateTimeInput(
|
custom_datetime_widget = forms.DateTimeInput(
|
||||||
attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M"
|
attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M"
|
||||||
)
|
)
|
||||||
autofocus_select_widget = forms.Select(attrs={"autofocus": "autofocus"})
|
|
||||||
autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
|
autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
|
||||||
|
|
||||||
|
|
||||||
@ -15,10 +16,12 @@ class SessionForm(forms.ModelForm):
|
|||||||
# queryset=Purchase.objects.filter(date_refunded=None).order_by("edition__name")
|
# queryset=Purchase.objects.filter(date_refunded=None).order_by("edition__name")
|
||||||
# )
|
# )
|
||||||
purchase = forms.ModelChoiceField(
|
purchase = forms.ModelChoiceField(
|
||||||
queryset=Purchase.objects.order_by("edition__name"),
|
queryset=Purchase.objects.all(),
|
||||||
widget=autofocus_select_widget,
|
widget=forms.Select(attrs={"autofocus": "autofocus"}),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
device = forms.ModelChoiceField(queryset=Device.objects.order_by("name"))
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
widgets = {
|
widgets = {
|
||||||
"timestamp_start": custom_datetime_widget,
|
"timestamp_start": custom_datetime_widget,
|
||||||
@ -35,56 +38,135 @@ class SessionForm(forms.ModelForm):
|
|||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
class EditionChoiceField(forms.ModelChoiceField):
|
class EditionChoiceField(forms.ModelMultipleChoiceField):
|
||||||
def label_from_instance(self, obj) -> str:
|
def label_from_instance(self, obj) -> str:
|
||||||
return f"{obj.name} ({obj.platform}, {obj.year_released})"
|
return f"{obj.sort_name} ({obj.platform}, {obj.year_released})"
|
||||||
|
|
||||||
|
|
||||||
|
class IncludePlatformSelect(forms.SelectMultiple):
|
||||||
|
def create_option(self, name, value, *args, **kwargs):
|
||||||
|
option = super().create_option(name, value, *args, **kwargs)
|
||||||
|
if platform_id := safe_getattr(value, "instance.platform.id"):
|
||||||
|
option["attrs"]["data-platform"] = platform_id
|
||||||
|
return option
|
||||||
|
|
||||||
|
|
||||||
class PurchaseForm(forms.ModelForm):
|
class PurchaseForm(forms.ModelForm):
|
||||||
edition = EditionChoiceField(
|
def __init__(self, *args, **kwargs):
|
||||||
queryset=Edition.objects.order_by("name"), widget=autofocus_select_widget
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
|
# Automatically update related_purchase <select/>
|
||||||
|
# to only include purchases of the selected edition.
|
||||||
|
related_purchase_by_edition_url = reverse("related_purchase_by_edition")
|
||||||
|
self.fields["editions"].widget.attrs.update(
|
||||||
|
{
|
||||||
|
"hx-trigger": "load, click",
|
||||||
|
"hx-get": related_purchase_by_edition_url,
|
||||||
|
"hx-target": "#id_related_purchase",
|
||||||
|
"hx-swap": "outerHTML",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
editions = EditionChoiceField(
|
||||||
|
queryset=Edition.objects.order_by("sort_name"),
|
||||||
|
widget=IncludePlatformSelect(attrs={"autoselect": "autoselect"}),
|
||||||
)
|
)
|
||||||
platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
|
platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
|
||||||
|
related_purchase = forms.ModelChoiceField(
|
||||||
|
queryset=Purchase.objects.filter(type=Purchase.GAME),
|
||||||
|
required=False,
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
widgets = {
|
widgets = {
|
||||||
"date_purchased": custom_date_widget,
|
"date_purchased": custom_date_widget,
|
||||||
"date_refunded": custom_date_widget,
|
"date_refunded": custom_date_widget,
|
||||||
|
"date_finished": custom_date_widget,
|
||||||
|
"date_dropped": custom_date_widget,
|
||||||
}
|
}
|
||||||
model = Purchase
|
model = Purchase
|
||||||
fields = [
|
fields = [
|
||||||
"edition",
|
"editions",
|
||||||
"platform",
|
"platform",
|
||||||
"date_purchased",
|
"date_purchased",
|
||||||
"date_refunded",
|
"date_refunded",
|
||||||
|
"date_finished",
|
||||||
|
"date_dropped",
|
||||||
|
"infinite",
|
||||||
"price",
|
"price",
|
||||||
"price_currency",
|
"price_currency",
|
||||||
"ownership_type",
|
"ownership_type",
|
||||||
|
"type",
|
||||||
|
"related_purchase",
|
||||||
|
"name",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
def clean(self):
|
||||||
|
cleaned_data = super().clean()
|
||||||
|
purchase_type = cleaned_data.get("type")
|
||||||
|
related_purchase = cleaned_data.get("related_purchase")
|
||||||
|
name = cleaned_data.get("name")
|
||||||
|
|
||||||
|
# Set the type on the instance to use get_type_display()
|
||||||
|
# This is safe because we're not saving the instance.
|
||||||
|
self.instance.type = purchase_type
|
||||||
|
|
||||||
|
if purchase_type != Purchase.GAME:
|
||||||
|
type_display = self.instance.get_type_display()
|
||||||
|
if not related_purchase:
|
||||||
|
self.add_error(
|
||||||
|
"related_purchase",
|
||||||
|
f"{type_display} must have a related purchase.",
|
||||||
|
)
|
||||||
|
if not name:
|
||||||
|
self.add_error("name", f"{type_display} must have a name.")
|
||||||
|
return cleaned_data
|
||||||
|
|
||||||
|
|
||||||
|
class IncludeNameSelect(forms.Select):
|
||||||
|
def create_option(self, name, value, *args, **kwargs):
|
||||||
|
option = super().create_option(name, value, *args, **kwargs)
|
||||||
|
if value:
|
||||||
|
option["attrs"]["data-name"] = value.instance.name
|
||||||
|
option["attrs"]["data-year"] = value.instance.year_released
|
||||||
|
return option
|
||||||
|
|
||||||
|
|
||||||
|
class GameModelChoiceField(forms.ModelChoiceField):
|
||||||
|
def label_from_instance(self, obj):
|
||||||
|
# Use sort_name as the label for the option
|
||||||
|
return obj.sort_name
|
||||||
|
|
||||||
|
|
||||||
class EditionForm(forms.ModelForm):
|
class EditionForm(forms.ModelForm):
|
||||||
game = forms.ModelChoiceField(
|
game = GameModelChoiceField(
|
||||||
queryset=Game.objects.order_by("name"), widget=autofocus_select_widget
|
queryset=Game.objects.order_by("sort_name"),
|
||||||
|
widget=IncludeNameSelect(attrs={"autofocus": "autofocus"}),
|
||||||
|
)
|
||||||
|
platform = forms.ModelChoiceField(
|
||||||
|
queryset=Platform.objects.order_by("name"), required=False
|
||||||
)
|
)
|
||||||
platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Edition
|
model = Edition
|
||||||
fields = ["game", "name", "platform", "year_released", "wikidata"]
|
fields = ["game", "name", "sort_name", "platform", "year_released", "wikidata"]
|
||||||
|
|
||||||
|
|
||||||
class GameForm(forms.ModelForm):
|
class GameForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Game
|
model = Game
|
||||||
fields = ["name", "wikidata"]
|
fields = ["name", "sort_name", "year_released", "wikidata"]
|
||||||
widgets = {"name": autofocus_input_widget}
|
widgets = {"name": autofocus_input_widget}
|
||||||
|
|
||||||
|
|
||||||
class PlatformForm(forms.ModelForm):
|
class PlatformForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Platform
|
model = Platform
|
||||||
fields = ["name", "group"]
|
fields = [
|
||||||
|
"name",
|
||||||
|
"icon",
|
||||||
|
"group",
|
||||||
|
]
|
||||||
widgets = {"name": autofocus_input_widget}
|
widgets = {"name": autofocus_input_widget}
|
||||||
|
|
||||||
|
|
||||||
|
1
games/graphql/mutations/__init__.py
Normal file
1
games/graphql/mutations/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
from .game import Mutation as GameMutation
|
29
games/graphql/mutations/game.py
Normal file
29
games/graphql/mutations/game.py
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import graphene
|
||||||
|
|
||||||
|
from games.graphql.types import Game
|
||||||
|
from games.models import Game as GameModel
|
||||||
|
|
||||||
|
|
||||||
|
class UpdateGameMutation(graphene.Mutation):
|
||||||
|
class Arguments:
|
||||||
|
id = graphene.ID(required=True)
|
||||||
|
name = graphene.String()
|
||||||
|
year_released = graphene.Int()
|
||||||
|
wikidata = graphene.String()
|
||||||
|
|
||||||
|
game = graphene.Field(Game)
|
||||||
|
|
||||||
|
def mutate(self, info, id, name=None, year_released=None, wikidata=None):
|
||||||
|
game_instance = GameModel.objects.get(pk=id)
|
||||||
|
if name is not None:
|
||||||
|
game_instance.name = name
|
||||||
|
if year_released is not None:
|
||||||
|
game_instance.year_released = year_released
|
||||||
|
if wikidata is not None:
|
||||||
|
game_instance.wikidata = wikidata
|
||||||
|
game_instance.save()
|
||||||
|
return UpdateGameMutation(game=game_instance)
|
||||||
|
|
||||||
|
|
||||||
|
class Mutation(graphene.ObjectType):
|
||||||
|
update_game = UpdateGameMutation.Field()
|
6
games/graphql/queries/__init__.py
Normal file
6
games/graphql/queries/__init__.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from .device import Query as DeviceQuery
|
||||||
|
from .edition import Query as EditionQuery
|
||||||
|
from .game import Query as GameQuery
|
||||||
|
from .platform import Query as PlatformQuery
|
||||||
|
from .purchase import Query as PurchaseQuery
|
||||||
|
from .session import Query as SessionQuery
|
11
games/graphql/queries/device.py
Normal file
11
games/graphql/queries/device.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import graphene
|
||||||
|
|
||||||
|
from games.graphql.types import Device
|
||||||
|
from games.models import Device as DeviceModel
|
||||||
|
|
||||||
|
|
||||||
|
class Query(graphene.ObjectType):
|
||||||
|
devices = graphene.List(Device)
|
||||||
|
|
||||||
|
def resolve_devices(self, info, **kwargs):
|
||||||
|
return DeviceModel.objects.all()
|
11
games/graphql/queries/edition.py
Normal file
11
games/graphql/queries/edition.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import graphene
|
||||||
|
|
||||||
|
from games.graphql.types import Edition
|
||||||
|
from games.models import Game as EditionModel
|
||||||
|
|
||||||
|
|
||||||
|
class Query(graphene.ObjectType):
|
||||||
|
editions = graphene.List(Edition)
|
||||||
|
|
||||||
|
def resolve_editions(self, info, **kwargs):
|
||||||
|
return EditionModel.objects.all()
|
18
games/graphql/queries/game.py
Normal file
18
games/graphql/queries/game.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
import graphene
|
||||||
|
|
||||||
|
from games.graphql.types import Game
|
||||||
|
from games.models import Game as GameModel
|
||||||
|
|
||||||
|
|
||||||
|
class Query(graphene.ObjectType):
|
||||||
|
games = graphene.List(Game)
|
||||||
|
game_by_name = graphene.Field(Game, name=graphene.String(required=True))
|
||||||
|
|
||||||
|
def resolve_games(self, info, **kwargs):
|
||||||
|
return GameModel.objects.all()
|
||||||
|
|
||||||
|
def resolve_game_by_name(self, info, name):
|
||||||
|
try:
|
||||||
|
return GameModel.objects.get(name=name)
|
||||||
|
except GameModel.DoesNotExist:
|
||||||
|
return None
|
11
games/graphql/queries/platform.py
Normal file
11
games/graphql/queries/platform.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import graphene
|
||||||
|
|
||||||
|
from games.graphql.types import Platform
|
||||||
|
from games.models import Platform as PlatformModel
|
||||||
|
|
||||||
|
|
||||||
|
class Query(graphene.ObjectType):
|
||||||
|
platforms = graphene.List(Platform)
|
||||||
|
|
||||||
|
def resolve_platforms(self, info, **kwargs):
|
||||||
|
return PlatformModel.objects.all()
|
11
games/graphql/queries/purchase.py
Normal file
11
games/graphql/queries/purchase.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import graphene
|
||||||
|
|
||||||
|
from games.graphql.types import Purchase
|
||||||
|
from games.models import Purchase as PurchaseModel
|
||||||
|
|
||||||
|
|
||||||
|
class Query(graphene.ObjectType):
|
||||||
|
purchases = graphene.List(Purchase)
|
||||||
|
|
||||||
|
def resolve_purchases(self, info, **kwargs):
|
||||||
|
return PurchaseModel.objects.all()
|
11
games/graphql/queries/session.py
Normal file
11
games/graphql/queries/session.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import graphene
|
||||||
|
|
||||||
|
from games.graphql.types import Session
|
||||||
|
from games.models import Session as SessionModel
|
||||||
|
|
||||||
|
|
||||||
|
class Query(graphene.ObjectType):
|
||||||
|
sessions = graphene.List(Session)
|
||||||
|
|
||||||
|
def resolve_sessions(self, info, **kwargs):
|
||||||
|
return SessionModel.objects.all()
|
44
games/graphql/types.py
Normal file
44
games/graphql/types.py
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
from graphene_django import DjangoObjectType
|
||||||
|
|
||||||
|
from games.models import Device as DeviceModel
|
||||||
|
from games.models import Edition as EditionModel
|
||||||
|
from games.models import Game as GameModel
|
||||||
|
from games.models import Platform as PlatformModel
|
||||||
|
from games.models import Purchase as PurchaseModel
|
||||||
|
from games.models import Session as SessionModel
|
||||||
|
|
||||||
|
|
||||||
|
class Game(DjangoObjectType):
|
||||||
|
class Meta:
|
||||||
|
model = GameModel
|
||||||
|
fields = "__all__"
|
||||||
|
|
||||||
|
|
||||||
|
class Edition(DjangoObjectType):
|
||||||
|
class Meta:
|
||||||
|
model = EditionModel
|
||||||
|
fields = "__all__"
|
||||||
|
|
||||||
|
|
||||||
|
class Purchase(DjangoObjectType):
|
||||||
|
class Meta:
|
||||||
|
model = PurchaseModel
|
||||||
|
fields = "__all__"
|
||||||
|
|
||||||
|
|
||||||
|
class Session(DjangoObjectType):
|
||||||
|
class Meta:
|
||||||
|
model = SessionModel
|
||||||
|
fields = "__all__"
|
||||||
|
|
||||||
|
|
||||||
|
class Platform(DjangoObjectType):
|
||||||
|
class Meta:
|
||||||
|
model = PlatformModel
|
||||||
|
fields = "__all__"
|
||||||
|
|
||||||
|
|
||||||
|
class Device(DjangoObjectType):
|
||||||
|
class Meta:
|
||||||
|
model = DeviceModel
|
||||||
|
fields = "__all__"
|
24
games/management/commands/schedule_convert_prices.py
Normal file
24
games/management/commands/schedule_convert_prices.py
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
|
from django.core.management.base import BaseCommand
|
||||||
|
from django.utils.timezone import now
|
||||||
|
from django_q.models import Schedule
|
||||||
|
from django_q.tasks import schedule
|
||||||
|
|
||||||
|
|
||||||
|
class Command(BaseCommand):
|
||||||
|
help = "Manually schedule the next update_converted_prices task"
|
||||||
|
|
||||||
|
def handle(self, *args, **kwargs):
|
||||||
|
if not Schedule.objects.filter(name="Update converted prices").exists():
|
||||||
|
schedule(
|
||||||
|
"games.tasks.convert_prices",
|
||||||
|
name="Update converted prices",
|
||||||
|
schedule_type=Schedule.MINUTES,
|
||||||
|
next_run=now() + timedelta(seconds=30),
|
||||||
|
)
|
||||||
|
self.stdout.write(
|
||||||
|
self.style.SUCCESS("Scheduled the update_converted_prices task.")
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self.stdout.write(self.style.WARNING("Task is already scheduled."))
|
@ -1,7 +1,7 @@
|
|||||||
# Generated by Django 4.1.5 on 2023-01-19 18:30
|
# Generated by Django 4.1.5 on 2023-01-19 18:30
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Generated by Django 4.1.5 on 2023-02-18 16:29
|
# Generated by Django 4.1.5 on 2023-02-18 16:29
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Generated by Django 4.1.5 on 2023-02-18 19:06
|
# Generated by Django 4.1.5 on 2023-02-18 19:06
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Generated by Django 4.1.5 on 2023-02-18 19:59
|
# Generated by Django 4.1.5 on 2023-02-18 19:59
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 11:10
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0015_edition_wikidata_edition_year_released"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="year_released",
|
||||||
|
field=models.IntegerField(blank=True, default=None, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="game",
|
||||||
|
name="wikidata",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=50, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="platform",
|
||||||
|
name="group",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=255, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="session",
|
||||||
|
name="device",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.device",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,141 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 18:14
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
def rename_duplicates(apps, schema_editor):
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
|
||||||
|
duplicates = (
|
||||||
|
Edition.objects.values("name", "platform")
|
||||||
|
.annotate(name_count=models.Count("id"))
|
||||||
|
.filter(name_count__gt=1)
|
||||||
|
)
|
||||||
|
|
||||||
|
for duplicate in duplicates:
|
||||||
|
counter = 1
|
||||||
|
duplicate_editions = Edition.objects.filter(
|
||||||
|
name=duplicate["name"], platform_id=duplicate["platform"]
|
||||||
|
).order_by("id")
|
||||||
|
|
||||||
|
for edition in duplicate_editions[1:]: # Skip the first one
|
||||||
|
edition.name = f"{edition.name} {counter}"
|
||||||
|
edition.save()
|
||||||
|
counter += 1
|
||||||
|
|
||||||
|
|
||||||
|
def update_game_year(apps, schema_editor):
|
||||||
|
Game = apps.get_model("games", "Game")
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
|
||||||
|
for game in Game.objects.filter(year__isnull=True):
|
||||||
|
# Try to get the first related edition with a non-null year_released
|
||||||
|
edition = Edition.objects.filter(game=game, year_released__isnull=False).first()
|
||||||
|
if edition:
|
||||||
|
# If an edition is found, update the game's year
|
||||||
|
game.year = edition.year_released
|
||||||
|
game.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
replaces = [
|
||||||
|
("games", "0016_alter_edition_platform_alter_edition_year_released_and_more"),
|
||||||
|
("games", "0017_alter_device_type_alter_purchase_platform"),
|
||||||
|
("games", "0018_auto_20231106_1825"),
|
||||||
|
("games", "0019_alter_edition_unique_together"),
|
||||||
|
("games", "0020_game_year"),
|
||||||
|
("games", "0021_auto_20231106_1909"),
|
||||||
|
("games", "0022_rename_year_game_year_released"),
|
||||||
|
]
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0015_edition_wikidata_edition_year_released"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="year_released",
|
||||||
|
field=models.IntegerField(blank=True, default=None, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="game",
|
||||||
|
name="wikidata",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=50, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="platform",
|
||||||
|
name="group",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=255, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="session",
|
||||||
|
name="device",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.device",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="device",
|
||||||
|
name="type",
|
||||||
|
field=models.CharField(
|
||||||
|
choices=[
|
||||||
|
("pc", "PC"),
|
||||||
|
("co", "Console"),
|
||||||
|
("ha", "Handheld"),
|
||||||
|
("mo", "Mobile"),
|
||||||
|
("sbc", "Single-board computer"),
|
||||||
|
("un", "Unknown"),
|
||||||
|
],
|
||||||
|
default="un",
|
||||||
|
max_length=3,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.RunPython(
|
||||||
|
code=rename_duplicates,
|
||||||
|
),
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name="edition",
|
||||||
|
unique_together={("name", "platform")},
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="game",
|
||||||
|
name="year",
|
||||||
|
field=models.IntegerField(blank=True, default=None, null=True),
|
||||||
|
),
|
||||||
|
migrations.RunPython(
|
||||||
|
code=update_game_year,
|
||||||
|
),
|
||||||
|
migrations.RenameField(
|
||||||
|
model_name="game",
|
||||||
|
old_name="year",
|
||||||
|
new_name="year_released",
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,41 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 16:53
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0016_alter_edition_platform_alter_edition_year_released_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="device",
|
||||||
|
name="type",
|
||||||
|
field=models.CharField(
|
||||||
|
choices=[
|
||||||
|
("pc", "PC"),
|
||||||
|
("co", "Console"),
|
||||||
|
("ha", "Handheld"),
|
||||||
|
("mo", "Mobile"),
|
||||||
|
("sbc", "Single-board computer"),
|
||||||
|
("un", "Unknown"),
|
||||||
|
],
|
||||||
|
default="un",
|
||||||
|
max_length=3,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
34
games/migrations/0018_auto_20231106_1825.py
Normal file
34
games/migrations/0018_auto_20231106_1825.py
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 17:25
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
def rename_duplicates(apps, schema_editor):
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
|
||||||
|
duplicates = (
|
||||||
|
Edition.objects.values("name", "platform")
|
||||||
|
.annotate(name_count=models.Count("id"))
|
||||||
|
.filter(name_count__gt=1)
|
||||||
|
)
|
||||||
|
|
||||||
|
for duplicate in duplicates:
|
||||||
|
counter = 1
|
||||||
|
duplicate_editions = Edition.objects.filter(
|
||||||
|
name=duplicate["name"], platform_id=duplicate["platform"]
|
||||||
|
).order_by("id")
|
||||||
|
|
||||||
|
for edition in duplicate_editions[1:]: # Skip the first one
|
||||||
|
edition.name = f"{edition.name} {counter}"
|
||||||
|
edition.save()
|
||||||
|
counter += 1
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0017_alter_device_type_alter_purchase_platform"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(rename_duplicates),
|
||||||
|
]
|
17
games/migrations/0019_alter_edition_unique_together.py
Normal file
17
games/migrations/0019_alter_edition_unique_together.py
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 17:26
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0018_auto_20231106_1825"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name="edition",
|
||||||
|
unique_together={("name", "platform")},
|
||||||
|
),
|
||||||
|
]
|
18
games/migrations/0020_game_year.py
Normal file
18
games/migrations/0020_game_year.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 18:05
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0019_alter_edition_unique_together"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="game",
|
||||||
|
name="year",
|
||||||
|
field=models.IntegerField(blank=True, default=None, null=True),
|
||||||
|
),
|
||||||
|
]
|
24
games/migrations/0021_auto_20231106_1909.py
Normal file
24
games/migrations/0021_auto_20231106_1909.py
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
def update_game_year(apps, schema_editor):
|
||||||
|
Game = apps.get_model("games", "Game")
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
|
||||||
|
for game in Game.objects.filter(year__isnull=True):
|
||||||
|
# Try to get the first related edition with a non-null year_released
|
||||||
|
edition = Edition.objects.filter(game=game, year_released__isnull=False).first()
|
||||||
|
if edition:
|
||||||
|
# If an edition is found, update the game's year
|
||||||
|
game.year = edition.year_released
|
||||||
|
game.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0020_game_year"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(update_game_year),
|
||||||
|
]
|
18
games/migrations/0022_rename_year_game_year_released.py
Normal file
18
games/migrations/0022_rename_year_game_year_released.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 18:12
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0021_auto_20231106_1909"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RenameField(
|
||||||
|
model_name="game",
|
||||||
|
old_name="year",
|
||||||
|
new_name="year_released",
|
||||||
|
),
|
||||||
|
]
|
21
games/migrations/0023_purchase_date_finished.py
Normal file
21
games/migrations/0023_purchase_date_finished.py
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 18:24
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
(
|
||||||
|
"games",
|
||||||
|
"0016_alter_edition_platform_alter_edition_year_released_and_more_squashed_0022_rename_year_game_year_released",
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="date_finished",
|
||||||
|
field=models.DateField(blank=True, null=True),
|
||||||
|
),
|
||||||
|
]
|
39
games/migrations/0024_edition_sort_name.py
Normal file
39
games/migrations/0024_edition_sort_name.py
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-09 09:32
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
def create_sort_name(apps, schema_editor):
|
||||||
|
Edition = apps.get_model(
|
||||||
|
"games", "Edition"
|
||||||
|
) # Replace 'your_app_name' with the actual name of your app
|
||||||
|
|
||||||
|
for edition in Edition.objects.all():
|
||||||
|
name = edition.name
|
||||||
|
# Check for articles at the beginning of the name and move them to the end
|
||||||
|
if name.lower().startswith("the "):
|
||||||
|
sort_name = f"{name[4:]}, The"
|
||||||
|
elif name.lower().startswith("a "):
|
||||||
|
sort_name = f"{name[2:]}, A"
|
||||||
|
elif name.lower().startswith("an "):
|
||||||
|
sort_name = f"{name[3:]}, An"
|
||||||
|
else:
|
||||||
|
sort_name = name
|
||||||
|
# Save the sort_name back to the database
|
||||||
|
edition.sort_name = sort_name
|
||||||
|
edition.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0023_purchase_date_finished"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="edition",
|
||||||
|
name="sort_name",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=255, null=True),
|
||||||
|
),
|
||||||
|
migrations.RunPython(create_sort_name),
|
||||||
|
]
|
39
games/migrations/0025_game_sort_name.py
Normal file
39
games/migrations/0025_game_sort_name.py
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-09 09:32
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
def create_sort_name(apps, schema_editor):
|
||||||
|
Game = apps.get_model(
|
||||||
|
"games", "Game"
|
||||||
|
) # Replace 'your_app_name' with the actual name of your app
|
||||||
|
|
||||||
|
for game in Game.objects.all():
|
||||||
|
name = game.name
|
||||||
|
# Check for articles at the beginning of the name and move them to the end
|
||||||
|
if name.lower().startswith("the "):
|
||||||
|
sort_name = f"{name[4:]}, The"
|
||||||
|
elif name.lower().startswith("a "):
|
||||||
|
sort_name = f"{name[2:]}, A"
|
||||||
|
elif name.lower().startswith("an "):
|
||||||
|
sort_name = f"{name[3:]}, An"
|
||||||
|
else:
|
||||||
|
sort_name = name
|
||||||
|
# Save the sort_name back to the database
|
||||||
|
game.sort_name = sort_name
|
||||||
|
game.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0024_edition_sort_name"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="game",
|
||||||
|
name="sort_name",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=255, null=True),
|
||||||
|
),
|
||||||
|
migrations.RunPython(create_sort_name),
|
||||||
|
]
|
27
games/migrations/0026_purchase_type.py
Normal file
27
games/migrations/0026_purchase_type.py
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-14 08:35
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0025_game_sort_name"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="type",
|
||||||
|
field=models.CharField(
|
||||||
|
choices=[
|
||||||
|
("game", "Game"),
|
||||||
|
("dlc", "DLC"),
|
||||||
|
("season_pass", "Season Pass"),
|
||||||
|
("battle_pass", "Battle Pass"),
|
||||||
|
],
|
||||||
|
default="game",
|
||||||
|
max_length=255,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
25
games/migrations/0027_purchase_related_purchase.py
Normal file
25
games/migrations/0027_purchase_related_purchase.py
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-14 08:41
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0026_purchase_type"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="related_purchase",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.SET_NULL,
|
||||||
|
to="games.purchase",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
26
games/migrations/0028_purchase_name.py
Normal file
26
games/migrations/0028_purchase_name.py
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-14 11:05
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
from games.models import Purchase
|
||||||
|
|
||||||
|
|
||||||
|
def null_game_name(apps, schema_editor):
|
||||||
|
Purchase.objects.filter(type=Purchase.GAME).update(name=None)
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0027_purchase_related_purchase"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="name",
|
||||||
|
field=models.CharField(
|
||||||
|
blank=True, default="Unknown Name", max_length=255, null=True
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.RunPython(null_game_name),
|
||||||
|
]
|
26
games/migrations/0029_alter_purchase_related_purchase.py
Normal file
26
games/migrations/0029_alter_purchase_related_purchase.py
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-14 21:19
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0028_purchase_name"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="related_purchase",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.SET_NULL,
|
||||||
|
related_name="related_purchases",
|
||||||
|
to="games.purchase",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
18
games/migrations/0030_alter_purchase_name.py
Normal file
18
games/migrations/0030_alter_purchase_name.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-15 12:04
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0029_alter_purchase_related_purchase"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="name",
|
||||||
|
field=models.CharField(blank=True, default="", max_length=255, null=True),
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,44 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-15 13:51
|
||||||
|
|
||||||
|
import django.utils.timezone
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0030_alter_purchase_name"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="device",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(default=django.utils.timezone.now),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="edition",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(default=django.utils.timezone.now),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="game",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(default=django.utils.timezone.now),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="platform",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(default=django.utils.timezone.now),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(default=django.utils.timezone.now),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="session",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(default=django.utils.timezone.now),
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,52 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-15 18:02
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0031_device_created_at_edition_created_at_game_created_at_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name="session",
|
||||||
|
options={"get_latest_by": "timestamp_start"},
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="session",
|
||||||
|
name="modified_at",
|
||||||
|
field=models.DateTimeField(auto_now=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="device",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(auto_now_add=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(auto_now_add=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="game",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(auto_now_add=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="platform",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(auto_now_add=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(auto_now_add=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="session",
|
||||||
|
name="created_at",
|
||||||
|
field=models.DateTimeField(auto_now_add=True),
|
||||||
|
),
|
||||||
|
]
|
17
games/migrations/0033_alter_edition_unique_together.py
Normal file
17
games/migrations/0033_alter_edition_unique_together.py
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Generated by Django 4.2.7 on 2023-11-28 13:43
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0032_alter_session_options_session_modified_at_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name="edition",
|
||||||
|
unique_together={("name", "platform", "year_released")},
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,23 @@
|
|||||||
|
# Generated by Django 4.2.7 on 2024-01-03 21:27
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0033_alter_edition_unique_together"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="date_dropped",
|
||||||
|
field=models.DateField(blank=True, null=True),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="infinite",
|
||||||
|
field=models.BooleanField(default=False),
|
||||||
|
),
|
||||||
|
]
|
25
games/migrations/0035_alter_session_device.py
Normal file
25
games/migrations/0035_alter_session_device.py
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
# Generated by Django 5.1 on 2024-08-11 15:50
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0034_purchase_date_dropped_purchase_infinite"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="session",
|
||||||
|
name="device",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.SET_DEFAULT,
|
||||||
|
to="games.device",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
19
games/migrations/0036_alter_edition_platform.py
Normal file
19
games/migrations/0036_alter_edition_platform.py
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 5.1 on 2024-08-11 16:48
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('games', '0035_alter_session_device'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='edition',
|
||||||
|
name='platform',
|
||||||
|
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='games.platform'),
|
||||||
|
),
|
||||||
|
]
|
26
games/migrations/0037_platform_icon.py
Normal file
26
games/migrations/0037_platform_icon.py
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
# Generated by Django 5.1.1 on 2024-09-14 07:05
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
from django.utils.text import slugify
|
||||||
|
|
||||||
|
|
||||||
|
def update_empty_icons(apps, schema_editor):
|
||||||
|
Platform = apps.get_model("games", "Platform")
|
||||||
|
for platform in Platform.objects.filter(icon=""):
|
||||||
|
platform.icon = slugify(platform.name)
|
||||||
|
platform.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0036_alter_edition_platform"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="platform",
|
||||||
|
name="icon",
|
||||||
|
field=models.SlugField(blank=True),
|
||||||
|
),
|
||||||
|
migrations.RunPython(update_empty_icons),
|
||||||
|
]
|
18
games/migrations/0038_alter_purchase_price.py
Normal file
18
games/migrations/0038_alter_purchase_price.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.1 on 2024-10-04 09:23
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('games', '0037_platform_icon'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='purchase',
|
||||||
|
name='price',
|
||||||
|
field=models.FloatField(default=0),
|
||||||
|
),
|
||||||
|
]
|
18
games/migrations/0039_alter_device_type.py
Normal file
18
games/migrations/0039_alter_device_type.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.2 on 2024-11-09 22:38
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('games', '0038_alter_purchase_price'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='device',
|
||||||
|
name='type',
|
||||||
|
field=models.CharField(choices=[('PC', 'PC'), ('Console', 'Console'), ('Handheld', 'Handheld'), ('Mobile', 'Mobile'), ('Single-board computer', 'Single-board computer'), ('Unknown', 'Unknown')], default='Unknown', max_length=255),
|
||||||
|
),
|
||||||
|
]
|
33
games/migrations/0040_migrate_device_types.py
Normal file
33
games/migrations/0040_migrate_device_types.py
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
# Generated by Django 5.1.2 on 2024-11-09 22:39
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
def update_device_types(apps, schema_editor):
|
||||||
|
Device = apps.get_model("games", "Device")
|
||||||
|
|
||||||
|
# Mapping of short names to long names
|
||||||
|
type_map = {
|
||||||
|
"pc": "PC",
|
||||||
|
"co": "Console",
|
||||||
|
"ha": "Handheld",
|
||||||
|
"mo": "Mobile",
|
||||||
|
"sbc": "Single-board computer",
|
||||||
|
"un": "Unknown",
|
||||||
|
}
|
||||||
|
|
||||||
|
# Loop through all devices and update the type field
|
||||||
|
for device in Device.objects.all():
|
||||||
|
if device.type in type_map:
|
||||||
|
device.type = type_map[device.type]
|
||||||
|
device.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0039_alter_device_type"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(update_device_types),
|
||||||
|
]
|
@ -0,0 +1,36 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2024-11-10 15:14
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('games', '0040_migrate_device_types'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='purchase',
|
||||||
|
name='converted_currency',
|
||||||
|
field=models.CharField(max_length=3, null=True),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='purchase',
|
||||||
|
name='converted_price',
|
||||||
|
field=models.FloatField(null=True),
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='ExchangeRate',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('currency_from', models.CharField(max_length=255)),
|
||||||
|
('currency_to', models.CharField(max_length=255)),
|
||||||
|
('year', models.PositiveIntegerField()),
|
||||||
|
('rate', models.FloatField()),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'unique_together': {('currency_from', 'currency_to', 'year')},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
18
games/migrations/0042_purchase_editions_temp.py
Normal file
18
games/migrations/0042_purchase_editions_temp.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-01-07 20:14
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('games', '0041_purchase_converted_currency_purchase_converted_price_and_more'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='purchase',
|
||||||
|
name='editions_temp',
|
||||||
|
field=models.ManyToManyField(blank=True, related_name='temp_purchases', to='games.edition'),
|
||||||
|
),
|
||||||
|
]
|
23
games/migrations/0043_auto_20250107_2117.py
Normal file
23
games/migrations/0043_auto_20250107_2117.py
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-01-07 20:17
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
def migrate_edition_to_editions_temp(apps, schema_editor):
|
||||||
|
Purchase = apps.get_model("games", "Purchase")
|
||||||
|
for purchase in Purchase.objects.all():
|
||||||
|
if purchase.edition:
|
||||||
|
purchase.editions_temp.add(purchase.edition)
|
||||||
|
purchase.save()
|
||||||
|
else:
|
||||||
|
print(f"No edition found for Purchase {purchase.id}")
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0042_purchase_editions_temp"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(migrate_edition_to_editions_temp),
|
||||||
|
]
|
18
games/migrations/0044_auto_20250107_2132.py
Normal file
18
games/migrations/0044_auto_20250107_2132.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-01-07 20:32
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0043_auto_20250107_2117"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(model_name="purchase", name="edition"),
|
||||||
|
migrations.RenameField(
|
||||||
|
model_name="purchase",
|
||||||
|
old_name="editions_temp",
|
||||||
|
new_name="editions",
|
||||||
|
),
|
||||||
|
]
|
18
games/migrations/0045_alter_purchase_editions.py
Normal file
18
games/migrations/0045_alter_purchase_editions.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-01-07 20:37
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('games', '0044_auto_20250107_2132'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='purchase',
|
||||||
|
name='editions',
|
||||||
|
field=models.ManyToManyField(blank=True, related_name='purchases', to='games.edition'),
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,28 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-01-08 20:06
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0045_alter_purchase_editions"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="game",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.SET_DEFAULT,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name="game",
|
||||||
|
unique_together={("name", "platform", "year_released")},
|
||||||
|
),
|
||||||
|
]
|
61
games/migrations/0047_auto_20250119_2129.py
Normal file
61
games/migrations/0047_auto_20250119_2129.py
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-01-19 20:29
|
||||||
|
|
||||||
|
from django.db import connection, migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
def recreate_games(apps, schema_editor):
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
Game = apps.get_model("games", "Game")
|
||||||
|
Purchase = apps.get_model("games", "Purchase")
|
||||||
|
|
||||||
|
with connection.cursor() as cursor:
|
||||||
|
print("Create table games_gametemp")
|
||||||
|
cursor.execute(
|
||||||
|
"CREATE TABLE games_gametemp AS SELECT * FROM games_game WHERE 1=0;"
|
||||||
|
)
|
||||||
|
|
||||||
|
for edition in Edition.objects.all():
|
||||||
|
print(f"Re-create edition with ID {edition.id}")
|
||||||
|
cursor.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO games_gametemp (
|
||||||
|
id, name, sort_name, year_released, platform_id, wikidata, created_at
|
||||||
|
)
|
||||||
|
VALUES (%s, %s, %s, %s, %s, %s, %s)
|
||||||
|
""",
|
||||||
|
[
|
||||||
|
edition.id, # Reuse the Edition ID
|
||||||
|
edition.name,
|
||||||
|
edition.sort_name,
|
||||||
|
edition.year_released,
|
||||||
|
edition.platform_id,
|
||||||
|
Game.objects.get(id=edition.game.id).wikidata,
|
||||||
|
edition.created_at,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
print("Turn foreign keys off")
|
||||||
|
cursor.execute("PRAGMA foreign_keys = OFF;")
|
||||||
|
print("Drop table games_game")
|
||||||
|
cursor.execute("DROP TABLE games_game;")
|
||||||
|
print("Drop table games_edition")
|
||||||
|
cursor.execute("DROP TABLE games_edition;")
|
||||||
|
print("Rename table games_gametemp to games_game")
|
||||||
|
# cursor.execute("ALTER TABLE games_gametemp RENAME TO games_game;")
|
||||||
|
cursor.execute("CREATE TABLE games_game AS SELECT * FROM games_gametemp;")
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0046_game_platform_alter_game_unique_together"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(recreate_games),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="editions",
|
||||||
|
field=models.ManyToManyField(
|
||||||
|
blank=True, related_name="purchases", to="games.game"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
241
games/models.py
241
games/models.py
@ -1,30 +1,90 @@
|
|||||||
from datetime import datetime, timedelta
|
from datetime import timedelta
|
||||||
from typing import Any
|
|
||||||
from zoneinfo import ZoneInfo
|
from django.core.exceptions import ValidationError
|
||||||
|
from django.db import models
|
||||||
|
from django.db.models import F, Sum
|
||||||
|
from django.template.defaultfilters import slugify
|
||||||
|
from django.utils import timezone
|
||||||
|
|
||||||
from common.time import format_duration
|
from common.time import format_duration
|
||||||
from django.conf import settings
|
|
||||||
from django.db import models
|
|
||||||
from django.db.models import F, Manager, Sum
|
class Platform(models.Model):
|
||||||
|
name = models.CharField(max_length=255)
|
||||||
|
group = models.CharField(max_length=255, null=True, blank=True, default=None)
|
||||||
|
icon = models.SlugField(blank=True)
|
||||||
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
if not self.icon:
|
||||||
|
self.icon = slugify(self.name)
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
def get_sentinel_platform():
|
||||||
|
return Platform.objects.get_or_create(
|
||||||
|
name="Unspecified", icon="unspecified", group="Unspecified"
|
||||||
|
)[0]
|
||||||
|
|
||||||
|
|
||||||
class Game(models.Model):
|
class Game(models.Model):
|
||||||
|
class Meta:
|
||||||
|
unique_together = [["name", "platform", "year_released"]]
|
||||||
|
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
wikidata = models.CharField(max_length=50)
|
sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
|
||||||
|
year_released = models.IntegerField(null=True, blank=True, default=None)
|
||||||
|
platform = models.ForeignKey(
|
||||||
|
Platform, on_delete=models.SET_DEFAULT, null=True, blank=True, default=None
|
||||||
|
)
|
||||||
|
wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
|
||||||
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
|
session_average: float | int | timedelta | None
|
||||||
|
session_count: int | None
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
class Edition(models.Model):
|
class Edition(models.Model):
|
||||||
game = models.ForeignKey("Game", on_delete=models.CASCADE)
|
class Meta:
|
||||||
|
unique_together = [["name", "platform", "year_released"]]
|
||||||
|
|
||||||
|
game = models.ForeignKey(Game, on_delete=models.CASCADE)
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
|
sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
|
||||||
year_released = models.IntegerField(default=datetime.today().year)
|
platform = models.ForeignKey(
|
||||||
|
Platform, on_delete=models.SET_DEFAULT, null=True, blank=True, default=None
|
||||||
|
)
|
||||||
|
year_released = models.IntegerField(null=True, blank=True, default=None)
|
||||||
wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
|
wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
|
||||||
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.sort_name
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
if self.platform is None:
|
||||||
|
self.platform = get_sentinel_platform()
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
class PurchaseQueryset(models.QuerySet):
|
||||||
|
def refunded(self):
|
||||||
|
return self.filter(date_refunded__isnull=False)
|
||||||
|
|
||||||
|
def not_refunded(self):
|
||||||
|
return self.filter(date_refunded__isnull=True)
|
||||||
|
|
||||||
|
def finished(self):
|
||||||
|
return self.filter(date_finished__isnull=False)
|
||||||
|
|
||||||
|
def games_only(self):
|
||||||
|
return self.filter(type=Purchase.GAME)
|
||||||
|
|
||||||
|
|
||||||
class Purchase(models.Model):
|
class Purchase(models.Model):
|
||||||
@ -46,30 +106,83 @@ class Purchase(models.Model):
|
|||||||
(DEMO, "Demo"),
|
(DEMO, "Demo"),
|
||||||
(PIRATED, "Pirated"),
|
(PIRATED, "Pirated"),
|
||||||
]
|
]
|
||||||
|
GAME = "game"
|
||||||
|
DLC = "dlc"
|
||||||
|
SEASONPASS = "season_pass"
|
||||||
|
BATTLEPASS = "battle_pass"
|
||||||
|
TYPES = [
|
||||||
|
(GAME, "Game"),
|
||||||
|
(DLC, "DLC"),
|
||||||
|
(SEASONPASS, "Season Pass"),
|
||||||
|
(BATTLEPASS, "Battle Pass"),
|
||||||
|
]
|
||||||
|
|
||||||
edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
|
objects = PurchaseQueryset().as_manager()
|
||||||
platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
|
|
||||||
|
editions = models.ManyToManyField(Game, related_name="purchases", blank=True)
|
||||||
|
platform = models.ForeignKey(
|
||||||
|
Platform, on_delete=models.CASCADE, default=None, null=True, blank=True
|
||||||
|
)
|
||||||
date_purchased = models.DateField()
|
date_purchased = models.DateField()
|
||||||
date_refunded = models.DateField(blank=True, null=True)
|
date_refunded = models.DateField(blank=True, null=True)
|
||||||
price = models.IntegerField(default=0)
|
date_finished = models.DateField(blank=True, null=True)
|
||||||
|
date_dropped = models.DateField(blank=True, null=True)
|
||||||
|
infinite = models.BooleanField(default=False)
|
||||||
|
price = models.FloatField(default=0)
|
||||||
price_currency = models.CharField(max_length=3, default="USD")
|
price_currency = models.CharField(max_length=3, default="USD")
|
||||||
|
converted_price = models.FloatField(null=True)
|
||||||
|
converted_currency = models.CharField(max_length=3, null=True)
|
||||||
ownership_type = models.CharField(
|
ownership_type = models.CharField(
|
||||||
max_length=2, choices=OWNERSHIP_TYPES, default=DIGITAL
|
max_length=2, choices=OWNERSHIP_TYPES, default=DIGITAL
|
||||||
)
|
)
|
||||||
|
type = models.CharField(max_length=255, choices=TYPES, default=GAME)
|
||||||
|
name = models.CharField(max_length=255, default="", null=True, blank=True)
|
||||||
|
related_purchase = models.ForeignKey(
|
||||||
|
"self",
|
||||||
|
on_delete=models.SET_NULL,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
blank=True,
|
||||||
|
related_name="related_purchases",
|
||||||
|
)
|
||||||
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def first_edition(self):
|
||||||
|
return self.editions.first()
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
platform_info = self.platform
|
additional_info = [
|
||||||
if self.platform != self.edition.platform:
|
self.get_type_display() if self.type != Purchase.GAME else "",
|
||||||
platform_info = f"{self.edition.platform} version on {self.platform}"
|
(
|
||||||
return f"{self.edition} ({platform_info}, {self.edition.year_released}, {self.get_ownership_type_display()})"
|
f"{self.first_edition.platform} version on {self.platform}"
|
||||||
|
if self.platform != self.first_edition.platform
|
||||||
|
else self.platform
|
||||||
|
),
|
||||||
|
self.first_edition.year_released,
|
||||||
|
self.get_ownership_type_display(),
|
||||||
|
]
|
||||||
|
return f"{self.first_edition} ({', '.join(filter(None, map(str, additional_info)))})"
|
||||||
|
|
||||||
|
def is_game(self):
|
||||||
|
return self.type == self.GAME
|
||||||
|
|
||||||
class Platform(models.Model):
|
def save(self, *args, **kwargs):
|
||||||
name = models.CharField(max_length=255)
|
if self.type != Purchase.GAME and not self.related_purchase:
|
||||||
group = models.CharField(max_length=255)
|
raise ValidationError(
|
||||||
|
f"{self.get_type_display()} must have a related purchase."
|
||||||
def __str__(self):
|
)
|
||||||
return self.name
|
if self.pk is not None:
|
||||||
|
# Retrieve the existing instance from the database
|
||||||
|
existing_purchase = Purchase.objects.get(pk=self.pk)
|
||||||
|
# If price has changed, reset converted fields
|
||||||
|
if (
|
||||||
|
existing_purchase.price != self.price
|
||||||
|
or existing_purchase.price_currency != self.price_currency
|
||||||
|
):
|
||||||
|
self.converted_price = None
|
||||||
|
self.converted_currency = None
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class SessionQuerySet(models.QuerySet):
|
class SessionQuerySet(models.QuerySet):
|
||||||
@ -82,32 +195,56 @@ class SessionQuerySet(models.QuerySet):
|
|||||||
)
|
)
|
||||||
return result["duration"]
|
return result["duration"]
|
||||||
|
|
||||||
|
def calculated_duration_formatted(self):
|
||||||
|
return format_duration(self.calculated_duration_unformatted())
|
||||||
|
|
||||||
|
def calculated_duration_unformatted(self):
|
||||||
|
result = self.aggregate(duration=Sum(F("duration_calculated")))
|
||||||
|
return result["duration"]
|
||||||
|
|
||||||
|
def without_manual(self):
|
||||||
|
return self.exclude(duration_calculated__iexact=0)
|
||||||
|
|
||||||
|
def only_manual(self):
|
||||||
|
return self.filter(duration_calculated__iexact=0)
|
||||||
|
|
||||||
|
|
||||||
class Session(models.Model):
|
class Session(models.Model):
|
||||||
purchase = models.ForeignKey("Purchase", on_delete=models.CASCADE)
|
class Meta:
|
||||||
|
get_latest_by = "timestamp_start"
|
||||||
|
|
||||||
|
purchase = models.ForeignKey(Purchase, on_delete=models.CASCADE)
|
||||||
timestamp_start = models.DateTimeField()
|
timestamp_start = models.DateTimeField()
|
||||||
timestamp_end = models.DateTimeField(blank=True, null=True)
|
timestamp_end = models.DateTimeField(blank=True, null=True)
|
||||||
duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
|
duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
|
||||||
duration_calculated = models.DurationField(blank=True, null=True)
|
duration_calculated = models.DurationField(blank=True, null=True)
|
||||||
device = models.ForeignKey("Device", on_delete=models.CASCADE, null=True)
|
device = models.ForeignKey(
|
||||||
|
"Device",
|
||||||
|
on_delete=models.SET_DEFAULT,
|
||||||
|
null=True,
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
)
|
||||||
note = models.TextField(blank=True, null=True)
|
note = models.TextField(blank=True, null=True)
|
||||||
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
modified_at = models.DateTimeField(auto_now=True)
|
||||||
|
|
||||||
objects = SessionQuerySet.as_manager()
|
objects = SessionQuerySet.as_manager()
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
mark = ", manual" if self.duration_manual != None else ""
|
mark = ", manual" if self.is_manual() else ""
|
||||||
return f"{str(self.purchase)} {str(self.timestamp_start.date())} ({self.duration_formatted()}{mark})"
|
return f"{str(self.purchase)} {str(self.timestamp_start.date())} ({self.duration_formatted()}{mark})"
|
||||||
|
|
||||||
def finish_now(self):
|
def finish_now(self):
|
||||||
self.timestamp_end = datetime.now(ZoneInfo(settings.TIME_ZONE))
|
self.timestamp_end = timezone.now()
|
||||||
|
|
||||||
def start_now():
|
def start_now():
|
||||||
self.timestamp_start = datetime.now(ZoneInfo(settings.TIME_ZONE))
|
self.timestamp_start = timezone.now()
|
||||||
|
|
||||||
def duration_seconds(self) -> timedelta:
|
def duration_seconds(self) -> timedelta:
|
||||||
manual = timedelta(0)
|
manual = timedelta(0)
|
||||||
calculated = timedelta(0)
|
calculated = timedelta(0)
|
||||||
if not self.duration_manual in (None, 0, timedelta(0)):
|
if self.is_manual() and isinstance(self.duration_manual, timedelta):
|
||||||
manual = self.duration_manual
|
manual = self.duration_manual
|
||||||
if self.timestamp_end != None and self.timestamp_start != None:
|
if self.timestamp_end != None and self.timestamp_start != None:
|
||||||
calculated = self.timestamp_end - self.timestamp_start
|
calculated = self.timestamp_end - self.timestamp_start
|
||||||
@ -117,33 +254,61 @@ class Session(models.Model):
|
|||||||
result = format_duration(self.duration_seconds(), "%02.0H:%02.0m")
|
result = format_duration(self.duration_seconds(), "%02.0H:%02.0m")
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
def is_manual(self) -> bool:
|
||||||
|
return not self.duration_manual == timedelta(0)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def duration_sum(self) -> str:
|
def duration_sum(self) -> str:
|
||||||
return Session.objects.all().total_duration_formatted()
|
return Session.objects.all().total_duration_formatted()
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs) -> None:
|
||||||
if self.timestamp_start != None and self.timestamp_end != None:
|
if self.timestamp_start != None and self.timestamp_end != None:
|
||||||
self.duration_calculated = self.timestamp_end - self.timestamp_start
|
self.duration_calculated = self.timestamp_end - self.timestamp_start
|
||||||
else:
|
else:
|
||||||
self.duration_calculated = timedelta(0)
|
self.duration_calculated = timedelta(0)
|
||||||
|
|
||||||
|
if not isinstance(self.duration_manual, timedelta):
|
||||||
|
self.duration_manual = timedelta(0)
|
||||||
|
|
||||||
|
if not self.device:
|
||||||
|
default_device, _ = Device.objects.get_or_create(
|
||||||
|
type=Device.UNKNOWN, defaults={"name": "Unknown"}
|
||||||
|
)
|
||||||
|
self.device = default_device
|
||||||
super(Session, self).save(*args, **kwargs)
|
super(Session, self).save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class Device(models.Model):
|
class Device(models.Model):
|
||||||
PC = "pc"
|
PC = "PC"
|
||||||
CONSOLE = "co"
|
CONSOLE = "Console"
|
||||||
HANDHELD = "ha"
|
HANDHELD = "Handheld"
|
||||||
MOBILE = "mo"
|
MOBILE = "Mobile"
|
||||||
SBC = "sbc"
|
SBC = "Single-board computer"
|
||||||
|
UNKNOWN = "Unknown"
|
||||||
DEVICE_TYPES = [
|
DEVICE_TYPES = [
|
||||||
(PC, "PC"),
|
(PC, "PC"),
|
||||||
(CONSOLE, "Console"),
|
(CONSOLE, "Console"),
|
||||||
(HANDHELD, "Handheld"),
|
(HANDHELD, "Handheld"),
|
||||||
(MOBILE, "Mobile"),
|
(MOBILE, "Mobile"),
|
||||||
(SBC, "Single-board computer"),
|
(SBC, "Single-board computer"),
|
||||||
|
(UNKNOWN, "Unknown"),
|
||||||
]
|
]
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
type = models.CharField(max_length=3, choices=DEVICE_TYPES, default=PC)
|
type = models.CharField(max_length=255, choices=DEVICE_TYPES, default=UNKNOWN)
|
||||||
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.name} ({self.get_type_display()})"
|
return f"{self.name} ({self.type})"
|
||||||
|
|
||||||
|
|
||||||
|
class ExchangeRate(models.Model):
|
||||||
|
currency_from = models.CharField(max_length=255)
|
||||||
|
currency_to = models.CharField(max_length=255)
|
||||||
|
year = models.PositiveIntegerField()
|
||||||
|
rate = models.FloatField()
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
unique_together = ("currency_from", "currency_to", "year")
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"{self.currency_from}/{self.currency_to} - {self.rate} ({self.year})"
|
||||||
|
30
games/schema.py
Normal file
30
games/schema.py
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
import graphene
|
||||||
|
|
||||||
|
from games.graphql.mutations import GameMutation
|
||||||
|
from games.graphql.queries import (
|
||||||
|
DeviceQuery,
|
||||||
|
EditionQuery,
|
||||||
|
GameQuery,
|
||||||
|
PlatformQuery,
|
||||||
|
PurchaseQuery,
|
||||||
|
SessionQuery,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Query(
|
||||||
|
GameQuery,
|
||||||
|
EditionQuery,
|
||||||
|
DeviceQuery,
|
||||||
|
PlatformQuery,
|
||||||
|
PurchaseQuery,
|
||||||
|
SessionQuery,
|
||||||
|
graphene.ObjectType,
|
||||||
|
):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class Mutation(GameMutation, graphene.ObjectType):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
schema = graphene.Schema(query=Query, mutation=Mutation)
|
File diff suppressed because it is too large
Load Diff
BIN
games/static/fonts/IBMPlexSansCondensed-Regular.woff2
Normal file
BIN
games/static/fonts/IBMPlexSansCondensed-Regular.woff2
Normal file
Binary file not shown.
BIN
games/static/fonts/IBMPlexSerif-Bold.woff2
Normal file
BIN
games/static/fonts/IBMPlexSerif-Bold.woff2
Normal file
Binary file not shown.
@ -1,29 +1,24 @@
|
|||||||
/**
|
import { syncSelectInputUntilChanged } from "./utils.js";
|
||||||
* @description Sync select field with input field until user focuses it.
|
|
||||||
* @param {HTMLSelectElement} sourceElementSelector
|
|
||||||
* @param {HTMLInputElement} targetElementSelector
|
|
||||||
*/
|
|
||||||
function syncSelectInputUntilChanged(
|
|
||||||
sourceElementSelector,
|
|
||||||
targetElementSelector
|
|
||||||
) {
|
|
||||||
const sourceElement = document.querySelector(sourceElementSelector);
|
|
||||||
const targetElement = document.querySelector(targetElementSelector);
|
|
||||||
function sourceElementHandler(event) {
|
|
||||||
let selected = event.target.value;
|
|
||||||
let selectedValue = document.querySelector(
|
|
||||||
`#id_game option[value='${selected}']`
|
|
||||||
).textContent;
|
|
||||||
targetElement.value = selectedValue;
|
|
||||||
}
|
|
||||||
function targetElementHandler(event) {
|
|
||||||
sourceElement.removeEventListener("change", sourceElementHandler);
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceElement.addEventListener("change", sourceElementHandler);
|
let syncData = [
|
||||||
targetElement.addEventListener("focus", targetElementHandler);
|
{
|
||||||
}
|
source: "#id_game",
|
||||||
|
source_value: "dataset.name",
|
||||||
|
target: "#id_name",
|
||||||
|
target_value: "value",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
source: "#id_game",
|
||||||
|
source_value: "textContent",
|
||||||
|
target: "#id_sort_name",
|
||||||
|
target_value: "value",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
source: "#id_game",
|
||||||
|
source_value: "dataset.year",
|
||||||
|
target: "#id_year_released",
|
||||||
|
target_value: "value",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
window.addEventListener("load", () => {
|
syncSelectInputUntilChanged(syncData, "form");
|
||||||
syncSelectInputUntilChanged("#id_game", "#id_name");
|
|
||||||
});
|
|
||||||
|
12
games/static/js/add_game.js
Normal file
12
games/static/js/add_game.js
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import { syncSelectInputUntilChanged } from "./utils.js";
|
||||||
|
|
||||||
|
let syncData = [
|
||||||
|
{
|
||||||
|
source: "#id_name",
|
||||||
|
source_value: "value",
|
||||||
|
target: "#id_sort_name",
|
||||||
|
target_value: "value",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
syncSelectInputUntilChanged(syncData, "form");
|
47
games/static/js/add_purchase.js
Normal file
47
games/static/js/add_purchase.js
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
import {
|
||||||
|
syncSelectInputUntilChanged,
|
||||||
|
getEl,
|
||||||
|
disableElementsWhenTrue,
|
||||||
|
disableElementsWhenValueNotEqual,
|
||||||
|
} from "./utils.js";
|
||||||
|
|
||||||
|
let syncData = [
|
||||||
|
{
|
||||||
|
source: "#id_edition",
|
||||||
|
source_value: "dataset.platform",
|
||||||
|
target: "#id_platform",
|
||||||
|
target_value: "value",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
syncSelectInputUntilChanged(syncData, "form");
|
||||||
|
|
||||||
|
function setupElementHandlers() {
|
||||||
|
disableElementsWhenTrue("#id_type", "game", [
|
||||||
|
"#id_name",
|
||||||
|
"#id_related_purchase",
|
||||||
|
]);
|
||||||
|
disableElementsWhenValueNotEqual(
|
||||||
|
"#id_type",
|
||||||
|
["game", "dlc"],
|
||||||
|
["#id_date_finished"]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener("DOMContentLoaded", setupElementHandlers);
|
||||||
|
document.addEventListener("htmx:afterSwap", setupElementHandlers);
|
||||||
|
getEl("#id_type").onchange = () => {
|
||||||
|
setupElementHandlers();
|
||||||
|
};
|
||||||
|
|
||||||
|
document.body.addEventListener("htmx:beforeRequest", function (event) {
|
||||||
|
// Assuming 'Purchase1' is the element that triggers the HTMX request
|
||||||
|
if (event.target.id === "id_edition") {
|
||||||
|
var idEditionValue = document.getElementById("id_edition").value;
|
||||||
|
|
||||||
|
// Condition to check - replace this with your actual logic
|
||||||
|
if (idEditionValue != "") {
|
||||||
|
event.preventDefault(); // This cancels the HTMX request
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
@ -7,10 +7,14 @@ for (let button of document.querySelectorAll("[data-target]")) {
|
|||||||
button.addEventListener("click", (event) => {
|
button.addEventListener("click", (event) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if (type == "now") {
|
if (type == "now") {
|
||||||
targetElement.value = toISOUTCString(new Date);
|
targetElement.value = toISOUTCString(new Date());
|
||||||
} else if (type == "copy") {
|
} else if (type == "copy") {
|
||||||
const oppositeName = targetElement.name == "timestamp_start" ? "timestamp_end" : "timestamp_start";
|
const oppositeName =
|
||||||
document.querySelector(`[name='${oppositeName}']`).value = targetElement.value;
|
targetElement.name == "timestamp_start"
|
||||||
|
? "timestamp_end"
|
||||||
|
: "timestamp_start";
|
||||||
|
document.querySelector(`[name='${oppositeName}']`).value =
|
||||||
|
targetElement.value;
|
||||||
} else if (type == "toggle") {
|
} else if (type == "toggle") {
|
||||||
if (targetElement.type == "datetime-local") targetElement.type = "text";
|
if (targetElement.type == "datetime-local") targetElement.type = "text";
|
||||||
else targetElement.type = "datetime-local";
|
else targetElement.type = "datetime-local";
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
* @param {Date} date
|
* @param {Date} date
|
||||||
* @returns {string}
|
* @returns {string}
|
||||||
*/
|
*/
|
||||||
export function toISOUTCString(date) {
|
function toISOUTCString(date) {
|
||||||
function stringAndPad(number) {
|
function stringAndPad(number) {
|
||||||
return number.toString().padStart(2, 0);
|
return number.toString().padStart(2, 0);
|
||||||
}
|
}
|
||||||
@ -14,3 +14,194 @@ export function toISOUTCString(date) {
|
|||||||
const minutes = stringAndPad(date.getMinutes());
|
const minutes = stringAndPad(date.getMinutes());
|
||||||
return `${year}-${month}-${day}T${hours}:${minutes}`;
|
return `${year}-${month}-${day}T${hours}:${minutes}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @description Sync values between source and target elements based on syncData configuration.
|
||||||
|
* @param {Array} syncData - Array of objects to define source and target elements with their respective value types.
|
||||||
|
*/
|
||||||
|
function syncSelectInputUntilChanged(syncData, parentSelector = document) {
|
||||||
|
const parentElement =
|
||||||
|
parentSelector === document
|
||||||
|
? document
|
||||||
|
: document.querySelector(parentSelector);
|
||||||
|
|
||||||
|
if (!parentElement) {
|
||||||
|
console.error(`The parent selector "${parentSelector}" is not valid.`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Set up a single change event listener on the document for handling all source changes
|
||||||
|
parentElement.addEventListener("change", function (event) {
|
||||||
|
// Loop through each sync configuration item
|
||||||
|
syncData.forEach((syncItem) => {
|
||||||
|
// Check if the change event target matches the source selector
|
||||||
|
if (event.target.matches(syncItem.source)) {
|
||||||
|
const sourceElement = event.target;
|
||||||
|
const valueToSync = getValueFromProperty(
|
||||||
|
sourceElement,
|
||||||
|
syncItem.source_value
|
||||||
|
);
|
||||||
|
const targetElement = document.querySelector(syncItem.target);
|
||||||
|
|
||||||
|
if (targetElement && valueToSync !== null) {
|
||||||
|
targetElement[syncItem.target_value] = valueToSync;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Set up a single focus event listener on the document for handling all target focuses
|
||||||
|
parentElement.addEventListener(
|
||||||
|
"focus",
|
||||||
|
function (event) {
|
||||||
|
// Loop through each sync configuration item
|
||||||
|
syncData.forEach((syncItem) => {
|
||||||
|
// Check if the focus event target matches the target selector
|
||||||
|
if (event.target.matches(syncItem.target)) {
|
||||||
|
// Remove the change event listener to stop syncing
|
||||||
|
// This assumes you want to stop syncing once any target receives focus
|
||||||
|
// You may need a more sophisticated way to remove listeners if you want to stop
|
||||||
|
// syncing selectively based on other conditions
|
||||||
|
document.removeEventListener("change", syncSelectInputUntilChanged);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
true
|
||||||
|
); // Use capture phase to ensure the event is captured during focus, not bubble
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @description Retrieve the value from the source element based on the provided property.
|
||||||
|
* @param {Element} sourceElement - The source HTML element.
|
||||||
|
* @param {string} property - The property to retrieve the value from.
|
||||||
|
*/
|
||||||
|
function getValueFromProperty(sourceElement, property) {
|
||||||
|
let source =
|
||||||
|
sourceElement instanceof HTMLSelectElement
|
||||||
|
? sourceElement.selectedOptions[0]
|
||||||
|
: sourceElement;
|
||||||
|
if (property.startsWith("dataset.")) {
|
||||||
|
let datasetKey = property.slice(8); // Remove 'dataset.' part
|
||||||
|
return source.dataset[datasetKey];
|
||||||
|
} else if (property in source) {
|
||||||
|
return source[property];
|
||||||
|
} else {
|
||||||
|
console.error(`Property ${property} is not valid for the option element.`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @description Returns a single element by name.
|
||||||
|
* @param {string} selector The selector to look for.
|
||||||
|
*/
|
||||||
|
function getEl(selector) {
|
||||||
|
if (selector.startsWith("#")) {
|
||||||
|
return document.getElementById(selector.slice(1));
|
||||||
|
} else if (selector.startsWith(".")) {
|
||||||
|
return document.getElementsByClassName(selector);
|
||||||
|
} else {
|
||||||
|
return document.getElementsByTagName(selector);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @description Applies different behaviors to elements based on multiple conditional configurations.
|
||||||
|
* Each configuration is an array containing a condition function, an array of target element selectors,
|
||||||
|
* and two callback functions for handling matched and unmatched conditions.
|
||||||
|
* @param {...Array} configs Each configuration is an array of the form:
|
||||||
|
* - 0: {function(): boolean} condition - Function that returns true or false based on a condition.
|
||||||
|
* - 1: {string[]} targetElements - Array of CSS selectors for target elements.
|
||||||
|
* - 2: {function(HTMLElement): void} callbackfn1 - Function to execute when condition is true.
|
||||||
|
* - 3: {function(HTMLElement): void} callbackfn2 - Function to execute when condition is false.
|
||||||
|
*/
|
||||||
|
function conditionalElementHandler(...configs) {
|
||||||
|
configs.forEach(([condition, targetElements, callbackfn1, callbackfn2]) => {
|
||||||
|
if (condition()) {
|
||||||
|
targetElements.forEach((elementName) => {
|
||||||
|
let el = getEl(elementName);
|
||||||
|
if (el === null) {
|
||||||
|
console.error(`Element ${elementName} doesn't exist.`);
|
||||||
|
} else {
|
||||||
|
callbackfn1(el);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
targetElements.forEach((elementName) => {
|
||||||
|
let el = getEl(elementName);
|
||||||
|
if (el === null) {
|
||||||
|
console.error(`Element ${elementName} doesn't exist.`);
|
||||||
|
} else {
|
||||||
|
callbackfn2(el);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function disableElementsWhenValueNotEqual(
|
||||||
|
targetSelect,
|
||||||
|
targetValue,
|
||||||
|
elementList
|
||||||
|
) {
|
||||||
|
return conditionalElementHandler([
|
||||||
|
() => {
|
||||||
|
let target = getEl(targetSelect);
|
||||||
|
console.debug(
|
||||||
|
`${disableElementsWhenTrue.name}: triggered on ${target.id}`
|
||||||
|
);
|
||||||
|
console.debug(`
|
||||||
|
${disableElementsWhenTrue.name}: matching against value(s): ${targetValue}`);
|
||||||
|
if (targetValue instanceof Array) {
|
||||||
|
if (targetValue.every((value) => target.value != value)) {
|
||||||
|
console.debug(
|
||||||
|
`${disableElementsWhenTrue.name}: none of the values is equal to ${target.value}, returning true.`
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.debug(
|
||||||
|
`${disableElementsWhenTrue.name}: none of the values is equal to ${target.value}, returning true.`
|
||||||
|
);
|
||||||
|
return target.value != targetValue;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
elementList,
|
||||||
|
(el) => {
|
||||||
|
console.debug(
|
||||||
|
`${disableElementsWhenTrue.name}: evaluated true, disabling ${el.id}.`
|
||||||
|
);
|
||||||
|
el.disabled = "disabled";
|
||||||
|
},
|
||||||
|
(el) => {
|
||||||
|
console.debug(
|
||||||
|
`${disableElementsWhenTrue.name}: evaluated false, NOT disabling ${el.id}.`
|
||||||
|
);
|
||||||
|
el.disabled = "";
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function disableElementsWhenTrue(targetSelect, targetValue, elementList) {
|
||||||
|
return conditionalElementHandler([
|
||||||
|
() => {
|
||||||
|
return getEl(targetSelect).value == targetValue;
|
||||||
|
},
|
||||||
|
elementList,
|
||||||
|
(el) => {
|
||||||
|
el.disabled = "disabled";
|
||||||
|
},
|
||||||
|
(el) => {
|
||||||
|
el.disabled = "";
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
toISOUTCString,
|
||||||
|
syncSelectInputUntilChanged,
|
||||||
|
getEl,
|
||||||
|
conditionalElementHandler,
|
||||||
|
disableElementsWhenValueNotEqual,
|
||||||
|
disableElementsWhenTrue,
|
||||||
|
getValueFromProperty,
|
||||||
|
};
|
||||||
|
57
games/tasks.py
Normal file
57
games/tasks.py
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
import requests
|
||||||
|
|
||||||
|
from games.models import ExchangeRate, Purchase
|
||||||
|
|
||||||
|
# fixme: save preferred currency in user model
|
||||||
|
currency_to = "CZK"
|
||||||
|
currency_to = currency_to.upper()
|
||||||
|
|
||||||
|
|
||||||
|
def save_converted_info(purchase, converted_price, converted_currency):
|
||||||
|
print(
|
||||||
|
f"Changing converted price of {purchase} to {converted_price} {converted_currency} "
|
||||||
|
)
|
||||||
|
purchase.converted_price = converted_price
|
||||||
|
purchase.converted_currency = converted_currency
|
||||||
|
purchase.save()
|
||||||
|
|
||||||
|
|
||||||
|
def convert_prices():
|
||||||
|
purchases = Purchase.objects.filter(
|
||||||
|
converted_price__isnull=True, converted_currency__isnull=True
|
||||||
|
)
|
||||||
|
|
||||||
|
for purchase in purchases:
|
||||||
|
if purchase.price_currency.upper() == currency_to or purchase.price == 0:
|
||||||
|
save_converted_info(purchase, purchase.price, currency_to)
|
||||||
|
continue
|
||||||
|
year = purchase.date_purchased.year
|
||||||
|
currency_from = purchase.price_currency.upper()
|
||||||
|
exchange_rate = ExchangeRate.objects.filter(
|
||||||
|
currency_from=currency_from, currency_to=currency_to, year=year
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not exchange_rate:
|
||||||
|
try:
|
||||||
|
response = requests.get(
|
||||||
|
f"https://cdn.jsdelivr.net/npm/@fawazahmed0/currency-api@{year}-01-01/v1/currencies/{currency_from}.json"
|
||||||
|
)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
rate = data[currency_from].get(currency_to)
|
||||||
|
|
||||||
|
if rate:
|
||||||
|
exchange_rate = ExchangeRate.objects.create(
|
||||||
|
currency_from=currency_from,
|
||||||
|
currency_to=currency_to,
|
||||||
|
year=year,
|
||||||
|
rate=rate,
|
||||||
|
)
|
||||||
|
except requests.RequestException as e:
|
||||||
|
print(
|
||||||
|
f"Failed to fetch exchange rate for {currency_from}->{currency_to} in {year}: {e}"
|
||||||
|
)
|
||||||
|
if exchange_rate:
|
||||||
|
save_converted_info(
|
||||||
|
purchase, purchase.price * exchange_rate.rate, currency_to
|
||||||
|
)
|
@ -1,17 +1,2 @@
|
|||||||
{% extends "base.html" %}
|
<c-layouts.add>
|
||||||
|
</c-layouts.add>
|
||||||
{% block title %}{{ title }}{% endblock title %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<form method="post" enctype="multipart/form-data">
|
|
||||||
<table class="mx-auto">
|
|
||||||
{% csrf_token %}
|
|
||||||
|
|
||||||
{{ form.as_table }}
|
|
||||||
<tr>
|
|
||||||
<td></td>
|
|
||||||
<td><input type="submit" value="Submit"/></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</form>
|
|
||||||
{% endblock content %}
|
|
||||||
|
@ -1,22 +1,12 @@
|
|||||||
{% extends "base.html" %}
|
<c-layouts.add>
|
||||||
|
<c-slot name="additional_row">
|
||||||
{% block title %}{{ title }}{% endblock title %}
|
<tr>
|
||||||
|
<td></td>
|
||||||
{% block content %}
|
<td>
|
||||||
<form method="post" enctype="multipart/form-data">
|
<input type="submit"
|
||||||
<table class="mx-auto">
|
name="submit_and_redirect"
|
||||||
{% csrf_token %}
|
value="Submit & Create Purchase" />
|
||||||
|
</td>
|
||||||
{{ form.as_table }}
|
</tr>
|
||||||
<tr>
|
</c-slot>
|
||||||
<td></td>
|
</c-layouts.add>
|
||||||
<td><input type="submit" value="Submit"/></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</form>
|
|
||||||
{% endblock content %}
|
|
||||||
|
|
||||||
{% block scripts %}
|
|
||||||
{% load static %}
|
|
||||||
<script type="module" src="{% static 'js/add_edition.js' %}"></script>
|
|
||||||
{% endblock scripts %}
|
|
||||||
|
12
games/templates/add_game.html
Normal file
12
games/templates/add_game.html
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<c-layouts.add>
|
||||||
|
<c-slot name="additional_row">
|
||||||
|
<tr>
|
||||||
|
<td></td>
|
||||||
|
<td>
|
||||||
|
<input type="submit"
|
||||||
|
name="submit_and_redirect"
|
||||||
|
value="Submit & Create Edition" />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</c-slot>
|
||||||
|
</c-layouts.add>
|
12
games/templates/add_purchase.html
Normal file
12
games/templates/add_purchase.html
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<c-layouts.add>
|
||||||
|
<c-slot name="additional_row">
|
||||||
|
<tr>
|
||||||
|
<td></td>
|
||||||
|
<td>
|
||||||
|
<input type="submit"
|
||||||
|
name="submit_and_redirect"
|
||||||
|
value="Submit & Create Session" />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</c-slot>
|
||||||
|
</c-layouts.add>
|
@ -1,37 +1,36 @@
|
|||||||
{% extends "base.html" %}
|
<c-layouts.add>
|
||||||
|
<c-slot name="form_content">
|
||||||
{% block title %}{{ title }}{% endblock title %}
|
<form method="post" enctype="multipart/form-data">
|
||||||
|
<table class="mx-auto">
|
||||||
{% block content %}
|
|
||||||
<form method="post" enctype="multipart/form-data">
|
|
||||||
<table class="mx-auto">
|
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|
||||||
{% for field in form %}
|
{% for field in form %}
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{ field.label_tag }}</th>
|
<th>{{ field.label_tag }}</th>
|
||||||
{% if field.name == "note" %}
|
{% if field.name == "note" %}
|
||||||
<td>{{ field }}</td>
|
<td>{{ field }}</td>
|
||||||
{% else %}
|
{% else %}
|
||||||
<td>{{ field }}</td>
|
<td>{{ field }}</td>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
|
{% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
|
||||||
<td>
|
<td>
|
||||||
<div class="basic-button-container">
|
<div class="basic-button-container" hx-boost="false">
|
||||||
<button class="basic-button" data-target="{{field.name}}" data-type="now">Set to now</button>
|
<button class="basic-button" data-target="{{ field.name }}" data-type="now">Set to now</button>
|
||||||
<button class="basic-button" data-target="{{field.name}}" data-type="toggle">Toggle text</button>
|
<button class="basic-button"
|
||||||
<button class="basic-button" data-target="{{field.name}}" data-type="copy">Copy</button>
|
data-target="{{ field.name }}"
|
||||||
</div>
|
data-type="toggle">Toggle text</button>
|
||||||
</td>
|
<button class="basic-button" data-target="{{ field.name }}" data-type="copy">Copy</button>
|
||||||
{% endif %}
|
</div>
|
||||||
</tr>
|
</td>
|
||||||
|
{% endif %}
|
||||||
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
<tr>
|
<tr>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td><input type="submit" value="Submit"/></td>
|
<td>
|
||||||
|
<input type="submit" value="Submit" />
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</form>
|
</form>
|
||||||
{% load static %}
|
</c-slot>
|
||||||
<script type="module" src="{% static 'js/add_session.js' %}"></script>
|
</c-layouts.add>
|
||||||
{% endblock content %}
|
|
||||||
|
@ -1,72 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
{% load static %}
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8"/>
|
|
||||||
<meta name="description" content="Self-hosted time-tracker."/>
|
|
||||||
<meta name="keywords" content="time, tracking, video games, self-hosted"/>
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
|
||||||
<title>Timetracker - {% block title %}Untitled{% endblock title %}</title>
|
|
||||||
<script src="{% static 'js/htmx.min.js' %}"></script>
|
|
||||||
<link rel="stylesheet" href="{% static 'base.css' %}" />
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body class="dark">
|
|
||||||
<img id="indicator" src="{% static 'icons/loading.png' %}" class="absolute right-3 top-3 animate-spin htmx-indicator" />
|
|
||||||
<div class="dark:bg-gray-800 min-h-screen">
|
|
||||||
<nav class="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
|
|
||||||
<div class="container flex flex-wrap items-center justify-between mx-auto">
|
|
||||||
<a href="{% url 'list_sessions_recent' %}" class="flex items-center">
|
|
||||||
<span class="text-4xl"><img src="{% static 'icons/schedule.png' %}" width="48" class="mr-4" /></span>
|
|
||||||
<span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
|
|
||||||
</a>
|
|
||||||
<div class="w-full md:block md:w-auto">
|
|
||||||
<ul
|
|
||||||
class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
|
|
||||||
<li class="relative group">
|
|
||||||
<a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New</a>
|
|
||||||
<ul class="absolute hidden text-gray-700 pt-1 group-hover:block w-auto whitespace-nowrap">
|
|
||||||
{% if purchase_available %}
|
|
||||||
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_device' %}">Device</a></li>
|
|
||||||
{% endif %}
|
|
||||||
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_game' %}">Game</a></li>
|
|
||||||
{% if game_available and platform_available %}
|
|
||||||
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_edition' %}">Edition</a></li>
|
|
||||||
{% endif %}
|
|
||||||
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_platform' %}">Platform</a></li>
|
|
||||||
{% if edition_available %}
|
|
||||||
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_purchase' %}">Purchase</a></li>
|
|
||||||
{% endif %}
|
|
||||||
{% if purchase_available %}
|
|
||||||
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_session' %}">Session</a></li>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
{% if session_count > 0 %}
|
|
||||||
<li class="relative group">
|
|
||||||
<a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'stats_current_year' %}">Stats</a>
|
|
||||||
<ul class="absolute hidden text-gray-700 pt-1 group-hover:block">
|
|
||||||
{% for year in stats_dropdown_year_range %}
|
|
||||||
<li>
|
|
||||||
<a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'stats_by_year' year %}">{{ year }}</a>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
{% block content %}No content here.{% endblock content %}
|
|
||||||
</div>
|
|
||||||
{% load version %}
|
|
||||||
<span class="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span>
|
|
||||||
{% block scripts %}{% endblock scripts %}
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
@ -1,26 +0,0 @@
|
|||||||
{% comment %}
|
|
||||||
title
|
|
||||||
text
|
|
||||||
{% endcomment %}
|
|
||||||
<a
|
|
||||||
href="{{ link }}"
|
|
||||||
title="{{ title }}"
|
|
||||||
class="truncate max-w-xs py-1 px-2 text-xs bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-sm"
|
|
||||||
>
|
|
||||||
{% comment %} <svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
fill="none"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
stroke-width="1.5"
|
|
||||||
stroke="currentColor"
|
|
||||||
class="self-center w-6 h-6 inline"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
{% endcomment %}
|
|
||||||
{{ text }}
|
|
||||||
</a>
|
|
@ -1,26 +0,0 @@
|
|||||||
{% comment %}
|
|
||||||
title
|
|
||||||
text
|
|
||||||
{% endcomment %}
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
title="{{ title }}"
|
|
||||||
autofocus
|
|
||||||
class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
fill="none"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
stroke-width="1.5"
|
|
||||||
stroke="currentColor"
|
|
||||||
class="self-center w-6 h-6 inline"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
{{ text }}
|
|
||||||
</button>
|
|
@ -1,21 +0,0 @@
|
|||||||
<a href="{{ edit_url }}">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
title="Edit"
|
|
||||||
class="ml-1 py-1 px-2 flex justify-center items-center bg-violet-600 hover:bg-violet-700 focus:ring-violet-500 focus:ring-offset-violet-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 w-7 h-4 rounded-lg"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
viewBox="0 0 20 20"
|
|
||||||
fill="currentColor"
|
|
||||||
class="w-5 h-5"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M5.433 13.917l1.262-3.155A4 4 0 017.58 9.42l6.92-6.918a2.121 2.121 0 013 3l-6.92 6.918c-.383.383-.84.685-1.343.886l-3.154 1.262a.5.5 0 01-.65-.65z"
|
|
||||||
/>
|
|
||||||
<path
|
|
||||||
d="M3.5 5.75c0-.69.56-1.25 1.25-1.25H10A.75.75 0 0010 3H4.75A2.75 2.75 0 002 5.75v9.5A2.75 2.75 0 004.75 18h9.5A2.75 2.75 0 0017 15.25V10a.75.75 0 00-1.5 0v5.25c0 .69-.56 1.25-1.25 1.25h-9.5c-.69 0-1.25-.56-1.25-1.25v-9.5z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</a>
|
|
6
games/templates/cotton/button.html
Normal file
6
games/templates/cotton/button.html
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<c-vars color="blue" size="base" />
|
||||||
|
<button type="button"
|
||||||
|
title="{{ title }}"
|
||||||
|
class=" {% if color == "blue" %} bg-blue-700 dark:bg-blue-600 dark:focus:ring-blue-800 dark:hover:bg-blue-700 focus:ring-blue-300 hover:bg-blue-800 text-white {% elif color == "red" %} bg-red-700 dark:bg-red-600 dark:focus:ring-red-900 dark:hover:bg-red-700 focus:ring-red-300 hover:bg-red-800 text-white {% elif color == "gray" %} bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-600 dark:focus:ring-gray-700 dark:hover:bg-gray-700 dark:hover:text-white dark:text-gray-400 focus:ring-gray-100 hover:bg-gray-100 hover:text-blue-700 text-gray-900 border {% elif color == "green" %} bg-green-700 dark:bg-green-600 dark:focus:ring-green-800 dark:hover:bg-green-700 focus:ring-green-300 hover:bg-green-800 text-white {% endif %} focus:outline-none focus:ring-4 font-medium mb-2 me-2 rounded-lg {% if size == "xs" %} px-3 py-2 text-xs {% elif size == "sm" %} px-3 py-2 text-sm {% elif size == "base" %} px-5 py-2.5 text-sm {% elif size == "lg" %} px-5 py-3 text-base {% elif size == "xl" %} px-6 py-3.5 text-base {% endif %} {% if icon %} inline-flex text-center items-center gap-2 {% else %} {% endif %} ">
|
||||||
|
{{ slot }}
|
||||||
|
</button>
|
8
games/templates/cotton/button_group.html
Normal file
8
games/templates/cotton/button_group.html
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<div class="inline-flex rounded-md shadow-sm" role="group">
|
||||||
|
{% if slot %}{{ slot }}{% endif %}
|
||||||
|
{% for button in buttons %}
|
||||||
|
{% if button.slot %}
|
||||||
|
<c-button-group-button-sm :href=button.href :slot=button.slot :color=button.color :hover=button.hover :title=button.title />
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
23
games/templates/cotton/button_group_button_sm.html
Normal file
23
games/templates/cotton/button_group_button_sm.html
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
<c-vars color="gray" />
|
||||||
|
<a href="{{ href }}"
|
||||||
|
class="[&:first-of-type_button]:rounded-s-lg [&:last-of-type_button]:rounded-e-lg">
|
||||||
|
{% if color == "gray" %}
|
||||||
|
<button type="button"
|
||||||
|
title="{{ title }}"
|
||||||
|
class="px-2 py-1 text-xs font-medium text-gray-900 bg-white border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white">
|
||||||
|
{{ slot }}
|
||||||
|
</button>
|
||||||
|
{% elif color == "red" %}
|
||||||
|
<button type="button"
|
||||||
|
title="{{ title }}"
|
||||||
|
class="px-2 py-1 text-xs font-medium text-gray-900 bg-white border border-gray-200 hover:bg-red-500 hover:text-white focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:border-red-700 dark:hover:bg-red-700 dark:focus:ring-blue-500 dark:focus:text-white">
|
||||||
|
{{ slot }}
|
||||||
|
</button>
|
||||||
|
{% elif color == "green" %}
|
||||||
|
<button type="button"
|
||||||
|
title="{{ title }}"
|
||||||
|
class="px-2 py-1 text-xs font-medium text-gray-900 bg-white border border-gray-200 hover:bg-green-500 hover:border-green-600 hover:text-white focus:z-10 focus:ring-2 focus:ring-green-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:border-green-700 dark:hover:bg-green-600 dark:focus:ring-green-500 dark:focus:text-white">
|
||||||
|
{{ slot }}
|
||||||
|
</button>
|
||||||
|
{% endif %}
|
||||||
|
</a>
|
13
games/templates/cotton/button_old.html
Normal file
13
games/templates/cotton/button_old.html
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{% comment %}
|
||||||
|
title
|
||||||
|
text
|
||||||
|
{% endcomment %}
|
||||||
|
<a href="{{ link }}"
|
||||||
|
title="{{ title }}"
|
||||||
|
class="truncate max-w-xs py-1 px-2 text-xs bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-sm">
|
||||||
|
{% comment %} <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="self-center w-6 h-6 inline">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
|
||||||
|
</svg>
|
||||||
|
{% endcomment %}
|
||||||
|
{{ text }}
|
||||||
|
</a>
|
18
games/templates/cotton/button_start.html
Normal file
18
games/templates/cotton/button_start.html
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{% comment %}
|
||||||
|
title
|
||||||
|
text
|
||||||
|
{% endcomment %}
|
||||||
|
<button type="button"
|
||||||
|
title="{{ title }}"
|
||||||
|
autofocus
|
||||||
|
class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
stroke-width="1.5"
|
||||||
|
stroke="currentColor"
|
||||||
|
class="self-center w-6 h-6 inline">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
|
||||||
|
</svg>
|
||||||
|
{{ text }}
|
||||||
|
</button>
|
10
games/templates/cotton/gamelink.html
Normal file
10
games/templates/cotton/gamelink.html
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<span class="truncate-container">
|
||||||
|
<a class="underline decoration-slate-500 sm:decoration-2"
|
||||||
|
href="{% url 'view_game' game_id %}">
|
||||||
|
{% if slot %}
|
||||||
|
{{ slot }}
|
||||||
|
{% else %}
|
||||||
|
{{ name }}
|
||||||
|
{% endif %}
|
||||||
|
</a>
|
||||||
|
</span>
|
8
games/templates/cotton/h1.html
Normal file
8
games/templates/cotton/h1.html
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<h1 class="{% if badge %}flex items-center {% endif %}mb-4 text-3xl font-extrabold leading-none tracking-tight text-gray-900 dark:text-white">
|
||||||
|
{{ slot }}
|
||||||
|
{% if badge %}
|
||||||
|
<span class="bg-blue-100 text-blue-800 text-2xl font-semibold me-2 px-2.5 py-0.5 rounded dark:bg-blue-200 dark:text-blue-800 ms-2">
|
||||||
|
{{ badge }}
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</h1>
|
5
games/templates/cotton/icon/battlenet.html
Normal file
5
games/templates/cotton/icon/battlenet.html
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<c-svg title="Battle.net">
|
||||||
|
<c-slot name="path">
|
||||||
|
M 43.113281 22.152344 C 43.113281 22.152344 47.058594 22.351563 47.058594 20.03125 C 47.058594 16.996094 41.804688 14.261719 41.804688 14.261719 C 41.804688 14.261719 42.628906 12.515625 43.140625 11.539063 C 43.65625 10.5625 45.101563 6.753906 45.230469 5.886719 C 45.394531 4.792969 45.144531 4.449219 45.144531 4.449219 C 44.789063 6.792969 40.972656 13.539063 40.671875 13.769531 C 36.949219 12.023438 31.835938 11.539063 31.835938 11.539063 C 31.835938 11.539063 26.832031 1 22.125 1 C 17.457031 1 17.480469 10.023438 17.480469 10.023438 C 17.480469 10.023438 16.160156 7.464844 14.507813 7.464844 C 12.085938 7.464844 11.292969 11.128906 11.292969 15.097656 C 6.511719 15.097656 2.492188 16.164063 2.132813 16.265625 C 1.773438 16.371094 0.644531 17.191406 1.15625 17.089844 C 2.203125 16.753906 7.113281 15.992188 11.410156 16.367188 C 11.648438 20.140625 13.851563 25.054688 13.851563 25.054688 C 13.851563 25.054688 9.128906 31.894531 9.128906 36.78125 C 9.128906 38.066406 9.6875 40.417969 13.078125 40.417969 C 15.917969 40.417969 19.105469 38.710938 19.707031 38.363281 C 19.183594 39.113281 18.796875 40.535156 18.796875 41.191406 C 18.796875 41.726563 19.113281 43.246094 21.304688 43.246094 C 24.117188 43.246094 27.257813 41.089844 27.257813 41.089844 C 27.257813 41.089844 30.222656 46.019531 32.761719 48.28125 C 33.445313 48.890625 34.097656 49 34.097656 49 C 34.097656 49 31.578125 46.574219 28.257813 40.324219 C 31.34375 38.417969 34.554688 33.921875 34.554688 33.921875 C 34.554688 33.921875 34.933594 33.933594 37.863281 33.933594 C 42.453125 33.933594 48.972656 32.96875 48.972656 29.320313 C 48.972656 25.554688 43.113281 22.152344 43.113281 22.152344 Z M 43.625 19.886719 C 43.625 21.21875 42.359375 21.199219 42.359375 21.199219 L 41.394531 21.265625 C 41.394531 21.265625 39.566406 20.304688 38.460938 19.855469 C 38.460938 19.855469 40.175781 17.207031 40.578125 16.46875 C 40.882813 16.644531 43.625 18.363281 43.625 19.886719 Z M 24.421875 6.308594 C 26.578125 6.308594 29.65625 11.402344 29.65625 11.402344 C 29.65625 11.402344 24.851563 10.972656 20.898438 13.296875 C 21.003906 9.628906 22.238281 6.308594 24.421875 6.308594 Z M 15.871094 10.4375 C 16.558594 10.4375 17.230469 11.269531 17.507813 11.976563 C 17.507813 12.445313 17.75 15.171875 17.75 15.171875 L 13.789063 15.023438 C 13.789063 11.449219 15.1875 10.4375 15.871094 10.4375 Z M 15.464844 35.246094 C 13.300781 35.246094 12.851563 34.039063 12.851563 32.953125 C 12.851563 30.496094 14.8125 27.058594 14.8125 27.058594 C 14.8125 27.058594 17.011719 31.683594 20.851563 33.636719 C 18.945313 34.753906 17.375 35.246094 15.464844 35.246094 Z M 22.492188 40.089844 C 20.972656 40.089844 20.789063 39.105469 20.789063 38.878906 C 20.789063 38.171875 21.339844 37.335938 21.339844 37.335938 C 21.339844 37.335938 23.890625 35.613281 24.054688 35.429688 L 25.9375 38.945313 C 25.9375 38.945313 24.007813 40.089844 22.492188 40.089844 Z M 27.226563 38.171875 C 26.300781 36.554688 25.621094 34.867188 25.621094 34.867188 C 25.621094 34.867188 29.414063 35.113281 31.453125 33.007813 C 30.183594 33.578125 28.15625 34.300781 25.800781 34.082031 C 30.726563 29.742188 33.601563 26.597656 36.03125 23.34375 C 35.824219 23.09375 34.710938 22.316406 34.4375 22.1875 C 32.972656 23.953125 27.265625 30.054688 21.984375 33.074219 C 15.292969 29.425781 13.890625 18.691406 13.746094 16.460938 L 17.402344 16.8125 C 17.402344 16.8125 16.027344 19.246094 16.027344 21.039063 C 16.027344 22.828125 16.242188 22.925781 16.242188 22.925781 C 16.242188 22.925781 16.195313 19.800781 18.125 17.390625 C 19.59375 25.210938 21.125 29.21875 22.320313 31.605469 C 22.925781 31.355469 24.058594 30.851563 24.058594 30.851563 C 24.058594 30.851563 20.683594 21.121094 20.871094 14.535156 C 22.402344 13.71875 24.667969 12.875 27.226563 12.875 C 33.957031 12.875 39.367188 15.773438 39.367188 15.773438 L 37.25 18.730469 C 37.25 18.730469 35.363281 15.3125 32.699219 14.703125 C 34.105469 15.753906 35.679688 17.136719 36.496094 19.128906 C 30.917969 16.949219 24.1875 15.796875 22.027344 15.542969 C 21.839844 16.339844 21.863281 17.480469 21.863281 17.480469 C 21.863281 17.480469 30.890625 19.144531 37.460938 22.90625 C 37.414063 31.125 28.460938 37.4375 27.226563 38.171875 Z M 35.777344 32.027344 C 35.777344 32.027344 38.578125 28.347656 38.535156 23.476563 C 38.535156 23.476563 43.0625 26.28125 43.0625 29.015625 C 43.0625 32.074219 35.777344 32.027344 35.777344 32.027344 Z
|
||||||
|
</c-slot>
|
||||||
|
</c-svg>
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user