Compare commits
347 Commits
Author | SHA1 | Date |
---|---|---|
Lukáš Kucharczyk | f61cde180f | |
Lukáš Kucharczyk | a53818257c | |
Lukáš Kucharczyk | 2d3ea714c4 | |
Lukáš Kucharczyk | 832bb48983 | |
Lukáš Kucharczyk | c6b1badf39 | |
Lukáš Kucharczyk | a3ed93c154 | |
Lukáš Kucharczyk | cf503a7b7d | |
Lukáš Kucharczyk | d81df6452a | |
Lukáš Kucharczyk | d9290373b0 | |
Lukáš Kucharczyk | f8d621e710 | |
Lukáš Kucharczyk | 9992d9c9bd | |
Lukáš Kucharczyk | 2ae81bb00f | |
Lukáš Kucharczyk | 993abb4710 | |
Lukáš Kucharczyk | 23502eab85 | |
Lukáš Kucharczyk | c517d735c7 | |
Lukáš Kucharczyk | 19056f846e | |
Lukáš Kucharczyk | 0759ad0804 | |
Lukáš Kucharczyk | 228fc2bf5f | |
Lukáš Kucharczyk | a5a7041920 | |
Lukáš Kucharczyk | fbd829f70e | |
Lukáš Kucharczyk | 4873f25248 | |
Lukáš Kucharczyk | 3578f1707f | |
Lukáš Kucharczyk | b74ccb6eaa | |
Lukáš Kucharczyk | b0b1bb2d42 | |
Lukáš Kucharczyk | c40764a02f | |
Lukáš Kucharczyk | 649351efde | |
Lukáš Kucharczyk | 698c8966c0 | |
Lukáš Kucharczyk | 7f6584ecf7 | |
Lukáš Kucharczyk | 540f5ee42c | |
Lukáš Kucharczyk | 1c73268258 | |
Lukáš Kucharczyk | 3063a3d143 | |
Lukáš Kucharczyk | b589199ca6 | |
Lukáš Kucharczyk | 2fc661dade | |
Lukáš Kucharczyk | 1f535a6e84 | |
Lukáš Kucharczyk | a9c1135639 | |
Lukáš Kucharczyk | 58cfaca1a9 | |
Lukáš Kucharczyk | c1b3493c80 | |
Lukáš Kucharczyk | a1df8720f5 | |
Lukáš Kucharczyk | 5a852bc2b9 | |
Lukáš Kucharczyk | 8ab9bfeeeb | |
Lukáš Kucharczyk | 5eee7176d4 | |
Lukáš Kucharczyk | 98c9c1faee | |
Lukáš Kucharczyk | 645ffa0dad | |
Lukáš Kucharczyk | 4358708262 | |
Lukáš Kucharczyk | c738245783 | |
Lukáš Kucharczyk | 57184ceea0 | |
Lukáš Kucharczyk | c2b9409562 | |
Lukáš Kucharczyk | e067e65bce | |
Lukáš Kucharczyk | b8258e2937 | |
Lukáš Kucharczyk | 9af4c79947 | |
Lukáš Kucharczyk | d8b8182b91 | |
Lukáš Kucharczyk | 2fd44c1f53 | |
Lukáš Kucharczyk | c3f99d124c | |
Lukáš Kucharczyk | 51f5b9fceb | |
Lukáš Kucharczyk | 973f4416de | |
Lukáš Kucharczyk | a84209eb81 | |
Lukáš Kucharczyk | 498cd69328 | |
Lukáš Kucharczyk | b28c42d945 | |
Lukáš Kucharczyk | 3099f02145 | |
Lukáš Kucharczyk | 74b9d0421c | |
Lukáš Kucharczyk | c61adad180 | |
Lukáš Kucharczyk | 298ecb4092 | |
Lukáš Kucharczyk | 020e12e20b | |
Lukáš Kucharczyk | 6ef56bfed5 | |
Lukáš Kucharczyk | fda4913c97 | |
Lukáš Kucharczyk | e85b32e22f | |
Lukáš Kucharczyk | 2d6d6d24a4 | |
Lukáš Kucharczyk | 00993a85db | |
Lukáš Kucharczyk | 4f7e708255 | |
Lukáš Kucharczyk | 238e4839e0 | |
Lukáš Kucharczyk | b0ad806a93 | |
Lukáš Kucharczyk | 453b4fd922 | |
Lukáš Kucharczyk | bb0d24809e | |
Lukáš Kucharczyk | 3abd4c4af9 | |
Lukáš Kucharczyk | 2e5e77b4e5 | |
Lukáš Kucharczyk | e79cf5de7a | |
Lukáš Kucharczyk | c15eaca205 | |
Lukáš Kucharczyk | 496c99ccf1 | |
Lukáš Kucharczyk | 992622e8d1 | |
Lukáš Kucharczyk | cabe36c822 | |
Lukáš Kucharczyk | d84b67c460 | |
Lukáš Kucharczyk | 1c28950b53 | |
Lukáš Kucharczyk | b54bcdd9e9 | |
Lukáš Kucharczyk | 9ec6c958c8 | |
Lukáš Kucharczyk | 25deac6ea9 | |
Lukáš Kucharczyk | a5ac10b20d | |
Lukáš Kucharczyk | 3de40ccad3 | |
Lukáš Kucharczyk | 6a5dc9b62c | |
Lukáš Kucharczyk | b6014a72e0 | |
Lukáš Kucharczyk | 245b47b8b3 | |
Lukáš Kucharczyk | e33f23c18f | |
Lukáš Kucharczyk | 33012bc328 | |
Lukáš Kucharczyk | 447bd4820c | |
Lukáš Kucharczyk | 72e89dae77 | |
Lukáš Kucharczyk | 1cd0a8c0fb | |
Lukáš Kucharczyk | a9a430f856 | |
Lukáš Kucharczyk | 0ee4c50a24 | |
Lukáš Kucharczyk | 714f0d97a9 | |
Lukáš Kucharczyk | d622ddfbf3 | |
Lukáš Kucharczyk | 86fd40cc4a | |
Lukáš Kucharczyk | e174850262 | |
Lukáš Kucharczyk | 6328d835ee | |
Lukáš Kucharczyk | 34d42e2af5 | |
Lukáš Kucharczyk | e19caf47bf | |
Lukáš Kucharczyk | 72998ffc02 | |
Lukáš Kucharczyk | ba44814474 | |
Lukáš Kucharczyk | 86f8fde8fa | |
Lukáš Kucharczyk | 811fec4b11 | |
Lukáš Kucharczyk | fe6cf2758c | |
Lukáš Kucharczyk | 1e1372ca56 | |
Lukáš Kucharczyk | d91c0bc255 | |
Lukáš Kucharczyk | a14f5d3ae5 | |
Lukáš Kucharczyk | 4ac13053d5 | |
Lukáš Kucharczyk | e9311225e7 | |
Lukáš Kucharczyk | 44c70a5ee7 | |
Lukáš Kucharczyk | cd804f2c77 | |
Lukáš Kucharczyk | 15997bd5af | |
Lukáš Kucharczyk | 880ea93424 | |
Lukáš Kucharczyk | dc1a9d5c4f | |
Lukáš Kucharczyk | 51c25659a9 | |
Lukáš Kucharczyk | 973dda59d2 | |
Lukáš Kucharczyk | 64edca9ffa | |
Lukáš Kucharczyk | 86e25b84ab | |
Lukáš Kucharczyk | edc1d062bc | |
Lukáš Kucharczyk | 12a517c9fa | |
Lukáš Kucharczyk | c1882f66e3 | |
Lukáš Kucharczyk | 1e87e67eb1 | |
Lukáš Kucharczyk | 84552e088b | |
Lukáš Kucharczyk | 79dc8ae25c | |
Lukáš Kucharczyk | cee06e4f64 | |
Lukáš Kucharczyk | d9b5f0eab2 | |
Lukáš Kucharczyk | ff28600710 | |
Lukáš Kucharczyk | 7517bf5f37 | |
Lukáš Kucharczyk | 780a04d13f | |
Lukáš Kucharczyk | fd04e9fa77 | |
Lukáš Kucharczyk | 18902aedac | |
Lukáš Kucharczyk | f9e37e9b1e | |
Lukáš Kucharczyk | c747cd1fd8 | |
Lukáš Kucharczyk | 6a5457191a | |
Lukáš Kucharczyk | 76f6d0c377 | |
Lukáš Kucharczyk | ae93703c08 | |
Lukáš Kucharczyk | c55176090c | |
Lukáš Kucharczyk | 081b8a92de | |
Lukáš Kucharczyk | d02a60675f | |
Lukáš Kucharczyk | 4670568acb | |
Lukáš Kucharczyk | 4b75a1dea9 | |
Lukáš Kucharczyk | e2b7ff2e15 | |
Lukáš Kucharczyk | b94aa49fc3 | |
Lukáš Kucharczyk | 73a92e5636 | |
Lukáš Kucharczyk | 42b28665e1 | |
Lukáš Kucharczyk | 6ba187f8e4 | |
Lukáš Kucharczyk | a765fd8d00 | |
Lukáš Kucharczyk | 854e3cc54a | |
Lukáš Kucharczyk | 2d8eb32e90 | |
Lukáš Kucharczyk | 1f1ed79ee5 | |
Lukáš Kucharczyk | 01fd7bad69 | |
Lukáš Kucharczyk | 44f49e5974 | |
Lukáš Kucharczyk | 0cf3411f63 | |
Lukáš Kucharczyk | aa669710e1 | |
Lukáš Kucharczyk | 242833f886 | |
Lukáš Kucharczyk | 0cdfd3c298 | |
Lukáš Kucharczyk | a98b4839dd | |
Lukáš Kucharczyk | 1999f13cf2 | |
Lukáš Kucharczyk | 8466f67c86 | |
Lukáš Kucharczyk | d9fbb4b896 | |
Lukáš Kucharczyk | 4ff3692606 | |
Lukáš Kucharczyk | 8289c48896 | |
Lukáš Kucharczyk | d1b9202337 | |
Lukáš Kucharczyk | fde93cb875 | |
Lukáš Kucharczyk | d1c3ac6079 | |
Lukáš Kucharczyk | d921c2d8a6 | |
Lukáš Kucharczyk | 52513e1ed8 | |
Lukáš Kucharczyk | cb380814a7 | |
Lukáš Kucharczyk | 5ef8c07f30 | |
Lukáš Kucharczyk | 9573c3b8ff | |
Lukáš Kucharczyk | c4354a1380 | |
Lukáš Kucharczyk | a245b6ff0f | |
Lukáš Kucharczyk | 6329d380b7 | |
Lukáš Kucharczyk | 76fbc39fed | |
Lukáš Kucharczyk | 4b6734c173 | |
Lukáš Kucharczyk | b505b5b430 | |
Lukáš Kucharczyk | 87553ebdc5 | |
Lukáš Kucharczyk | ba4fc0cac5 | |
Lukáš Kucharczyk | 8cb0276215 | |
Lukáš Kucharczyk | f9a51ee83d | |
Lukáš Kucharczyk | c9deba7d65 | |
Lukáš Kucharczyk | c55fbe86b5 | |
Lukáš Kucharczyk | 0e93993498 | |
Lukáš Kucharczyk | 9fccdfbff0 | |
Lukáš Kucharczyk | d78139a5b3 | |
Lukáš Kucharczyk | 7dc43fbf77 | |
Lukáš Kucharczyk | 5442926457 | |
Lukáš Kucharczyk | db4c635260 | |
Lukáš Kucharczyk | 4a1d08d4df | |
Lukáš Kucharczyk | c35b539c42 | |
Lukáš Kucharczyk | bbe5e072b2 | |
Lukáš Kucharczyk | 6fc2f623dc | |
Lukáš Kucharczyk | 9481bd5fef | |
Lukáš Kucharczyk | 4083165123 | |
Lukáš Kucharczyk | 45bb2681c7 | |
Lukáš Kucharczyk | dbb8ec3f9a | |
Lukáš Kucharczyk | 206b5f6d46 | |
Lukáš Kucharczyk | b7e14ecc83 | |
Lukáš Kucharczyk | 912e010729 | |
Lukáš Kucharczyk | a485237456 | |
Lukáš Kucharczyk | f5faf92ee0 | |
Lukáš Kucharczyk | 07452d8c43 | |
Lukáš Kucharczyk | 229a79d266 | |
Lukáš Kucharczyk | c6ed577fe3 | |
Lukáš Kucharczyk | 171e4779a3 | |
Lukáš Kucharczyk | 79f94e5984 | |
Lukáš Kucharczyk | ccebcb89c6 | |
Lukáš Kucharczyk | fe0a6b39e3 | |
Lukáš Kucharczyk | 6a495f951f | |
Lukáš Kucharczyk | c8646d0a0c | |
Lukáš Kucharczyk | f2bb15e669 | |
Lukáš Kucharczyk | c49177d63c | |
Lukáš Kucharczyk | bd8d30eac1 | |
Lukáš Kucharczyk | c44d8bf427 | |
Lukáš Kucharczyk | 3f037b4c7c | |
Lukáš Kucharczyk | 8783d1fc8e | |
Lukáš Kucharczyk | 9a1d24dbfd | |
Lukáš Kucharczyk | 4720660cff | |
Lukáš Kucharczyk | e158bc0623 | |
Lukáš Kucharczyk | 8982fc5086 | |
Lukáš Kucharczyk | 729e1d939b | |
Lukáš Kucharczyk | 2b4683e489 | |
Lukáš Kucharczyk | cce810e8cf | |
Lukáš Kucharczyk | 62cd17f702 | |
Lukáš Kucharczyk | f31280c682 | |
Lukáš Kucharczyk | a745d16ec3 | |
Lukáš Kucharczyk | ae079e36ec | |
Lukáš Kucharczyk | c8a3212b77 | |
Lukáš Kucharczyk | d211326c3f | |
Lukáš Kucharczyk | 270a291f05 | |
Lukáš Kucharczyk | 13b750ca92 | |
Lukáš Kucharczyk | 015b6db2f7 | |
Lukáš Kucharczyk | 667b161fff | |
Lukáš Kucharczyk | 5958cbf4a6 | |
Lukáš Kucharczyk | 3b37f2c3f0 | |
Lukáš Kucharczyk | 4517ff2b5a | |
Lukáš Kucharczyk | 884ce13e26 | |
Lukáš Kucharczyk | dd219bae9d | |
Lukáš Kucharczyk | 60d29090a1 | |
Lukáš Kucharczyk | 1bc3ca057b | |
Lukáš Kucharczyk | c2c0886451 | |
Lukáš Kucharczyk | b0be7b5887 | |
Lukáš Kucharczyk | 099d989f16 | |
Lukáš Kucharczyk | a879360ebd | |
Lukáš Kucharczyk | 866f2526e6 | |
Lukáš Kucharczyk | ce3c4b55f0 | |
Lukáš Kucharczyk | c52cd822ae | |
Lukáš Kucharczyk | cdc6ca1324 | |
Lukáš Kucharczyk | e7ed349356 | |
Lukáš Kucharczyk | 5052ca7dbf | |
Lukáš Kucharczyk | f408bfd927 | |
Lukáš Kucharczyk | 666dee33ba | |
Lukáš Kucharczyk | e0b09e051a | |
Lukáš Kucharczyk | 4552cf7616 | |
Lukáš Kucharczyk | a614b51d29 | |
Lukáš Kucharczyk | e67aa3fda1 | |
Lukáš Kucharczyk | 8423fd02b4 | |
Lukáš Kucharczyk | 2bd07e5f2d | |
Lukáš Kucharczyk | 058b83522c | |
Lukáš Kucharczyk | f13ed8a078 | |
Lukáš Kucharczyk | 02d5adcb3c | |
Lukáš Kucharczyk | d6fb16bb74 | |
Lukáš Kucharczyk | 71b90b8202 | |
Lukáš Kucharczyk | 3ee36932c3 | |
Lukáš Kucharczyk | 391fcc79a8 | |
Lukáš Kucharczyk | 57d4fd7212 | |
Lukáš Kucharczyk | a5b2854bf6 | |
Lukáš Kucharczyk | 518c0ecd56 | |
Lukáš Kucharczyk | a6cd7a3430 | |
Lukáš Kucharczyk | dba8414fd9 | |
Lukáš Kucharczyk | 0e2113eefd | |
Lukáš Kucharczyk | c4b0347f3b | |
Lukáš Kucharczyk | c6ed21167c | |
Lukáš Kucharczyk | 4ce15c44fc | |
Lukáš Kucharczyk | c814b4c2cb | |
Lukáš Kucharczyk | 11b9c602de | |
Lukáš Kucharczyk | 9a332593f4 | |
Lukáš Kucharczyk | 22935721ca | |
Lukáš Kucharczyk | a2ecdcf44a | |
Lukáš Kucharczyk | 3c958c4a13 | |
Lukáš Kucharczyk | 3db1724e22 | |
Lukáš Kucharczyk | d2a9630b04 | |
Lukáš Kucharczyk | e3ee832d3f | |
Lukáš Kucharczyk | 7467e2732d | |
Lukáš Kucharczyk | 787ee8640f | |
Lukáš Kucharczyk | ab41222f3c | |
Lukáš Kucharczyk | 29bf3b1946 | |
Lukáš Kucharczyk | 3f7ccea2e2 | |
Lukáš Kucharczyk | b5ffb3586b | |
Lukáš Kucharczyk | 26d57a238e | |
Lukáš Kucharczyk | 2d5ad3182c | |
Lukáš Kucharczyk | 49cc3ea0cc | |
Lukáš Kucharczyk | 440e1cfb71 | |
Lukáš Kucharczyk | 1cbd8c5c55 | |
Lukáš Kucharczyk | bc81a0ee8e | |
Lukáš Kucharczyk | c5653977ff | |
Lukáš Kucharczyk | f151730ab6 | |
Lukáš Kucharczyk | f469a67d94 | |
Lukáš Kucharczyk | 104ffc9d03 | |
Lukáš Kucharczyk | a4b13eb247 | |
Lukáš Kucharczyk | 2307fac83a | |
Lukáš Kucharczyk | 6b52c0d4c4 | |
Lukáš Kucharczyk | ff5d8c215d | |
Lukáš Kucharczyk | cdb3b89b08 | |
Lukáš Kucharczyk | ffa8198540 | |
Lukáš Kucharczyk | 0b7da3550c | |
Lukáš Kucharczyk | e1655d6cfa | |
Lukáš Kucharczyk | 29c41865d0 | |
Lukáš Kucharczyk | d21b461726 | |
Lukáš Kucharczyk | 95489cfb78 | |
Lukáš Kucharczyk | fa4f1c4810 | |
Lukáš Kucharczyk | 366c25a1ff | |
Lukáš Kucharczyk | a3042caa20 | |
Lukáš Kucharczyk | 7997f9bbb2 | |
Lukáš Kucharczyk | b78c4ba9c5 | |
Lukáš Kucharczyk | 1df889c45d | |
Lukáš Kucharczyk | 468d05a9e2 | |
Lukáš Kucharczyk | 2640a49734 | |
Lukáš Kucharczyk | 65c175afb2 | |
Lukáš Kucharczyk | 0814071a26 | |
Lukáš Kucharczyk | 5f845f866e | |
Lukáš Kucharczyk | c3d4697470 | |
Lukáš Kucharczyk | 77293f03e9 | |
Lukáš Kucharczyk | 1fa364e2ec | |
Lukáš Kucharczyk | 4a6f4a2f9a | |
Lukáš Kucharczyk | 9590988b6a | |
Lukáš Kucharczyk | 938c82a395 | |
Lukáš Kucharczyk | 33939f631c | |
Lukáš Kucharczyk | ac8cd6534a | |
Lukáš Kucharczyk | 51d8e953c0 | |
Lukáš Kucharczyk | 2eec677f41 | |
Lukáš Kucharczyk | f2eb14d3ef | |
Lukáš Kucharczyk | c337d2200f | |
Lukáš Kucharczyk | 8a8b05b0bd | |
Lukáš Kucharczyk | 9446065271 | |
Lukáš Kucharczyk | 755093845d | |
Lukáš Kucharczyk | d4ab0596da | |
Lukáš Kucharczyk | 8dcbe2f0ad | |
Lukáš Kucharczyk | 25bc74eff1 | |
Lukáš Kucharczyk | 8a7d083fb2 | |
Lukáš Kucharczyk | 8296ebcf31 | |
Lukáš Kucharczyk | 04a4f2e0be |
|
@ -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
|
||||
.vscode
|
||||
node_modules
|
||||
src/timetracker/static/*
|
||||
static
|
||||
.drone.yml
|
||||
.editorconfig
|
||||
.gitignore
|
||||
Caddyfile
|
||||
CHANGELOG.md
|
||||
db.sqlite3
|
||||
docker-compose*
|
||||
Dockerfile
|
||||
Makefile
|
||||
|
|
24
.drone.yml
|
@ -5,23 +5,28 @@ name: default
|
|||
|
||||
steps:
|
||||
- name: test
|
||||
image: python:3.10
|
||||
image: python:3.12
|
||||
commands:
|
||||
- python -m pip install poetry
|
||||
- poetry install
|
||||
- poetry env info
|
||||
- poetry run python manage.py migrate
|
||||
- poetry run pytest
|
||||
- name: build container (prod)
|
||||
|
||||
- name: build-prod
|
||||
image: plugins/docker
|
||||
settings:
|
||||
repo: registry.kucharczyk.xyz/timetracker
|
||||
tags:
|
||||
- latest
|
||||
- 1.1.0
|
||||
depends_on:
|
||||
- "test"
|
||||
when:
|
||||
branch:
|
||||
- main
|
||||
|
||||
- name: build container (non-prod)
|
||||
- name: build-non-prod
|
||||
image: plugins/docker
|
||||
settings:
|
||||
repo: registry.kucharczyk.xyz/timetracker
|
||||
|
@ -32,9 +37,20 @@ steps:
|
|||
branch:
|
||||
exclude:
|
||||
- main
|
||||
depends_on:
|
||||
- "test"
|
||||
|
||||
- name: redeploy on portainer
|
||||
image: plugins/webhook
|
||||
settings:
|
||||
urls:
|
||||
from_secret: PORTAINER_TIMETRACKER_WEBHOOK_URL
|
||||
depends_on:
|
||||
- "build-prod"
|
||||
|
||||
|
||||
|
||||
trigger:
|
||||
event:
|
||||
- push
|
||||
- cron
|
||||
- cron
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
root = true
|
||||
|
||||
[*]
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
|
||||
[*.{js,py}]
|
||||
charset = utf-8
|
||||
|
||||
# 4 space indentation
|
||||
[*.py]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
|
||||
[**/*.js]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[*.html]
|
||||
insert_final_newline = false
|
|
@ -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
|
|
@ -1,9 +1,12 @@
|
|||
__pycache__
|
||||
.mypy_cache
|
||||
.pytest_cache
|
||||
.venv
|
||||
.venv/
|
||||
node_modules
|
||||
package-lock.json
|
||||
db.sqlite3
|
||||
static
|
||||
dist/
|
||||
/static/
|
||||
dist/
|
||||
.DS_Store
|
||||
.python-version
|
||||
.direnv
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
repos:
|
||||
# disable due to incomaptible formatting between
|
||||
# black and ruff
|
||||
# TODO: replace with ruff when it works on NixOS
|
||||
# - repo: https://github.com/psf/black
|
||||
# rev: 24.8.0
|
||||
# hooks:
|
||||
# - id: black
|
||||
- repo: https://github.com/pycqa/isort
|
||||
rev: 5.13.2
|
||||
hooks:
|
||||
- id: isort
|
||||
name: isort (python)
|
||||
- repo: https://github.com/Riverside-Healthcare/djLint
|
||||
rev: v1.34.0
|
||||
hooks:
|
||||
- id: djlint-reformat-django
|
||||
args: ["--ignore", "H011"]
|
||||
- id: djlint-django
|
||||
args: ["--ignore", "H011"]
|
|
@ -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"
|
||||
]
|
||||
}
|
|
@ -4,5 +4,30 @@
|
|||
],
|
||||
"python.testing.unittestEnabled": false,
|
||||
"python.testing.pytestEnabled": true,
|
||||
"python.analysis.typeCheckingMode": "basic"
|
||||
}
|
||||
"python.analysis.typeCheckingMode": "strict",
|
||||
"[python]": {
|
||||
"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"
|
||||
]
|
||||
}
|
||||
|
|
168
CHANGELOG.md
|
@ -1,3 +1,171 @@
|
|||
## 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
|
||||
|
||||
## 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
|
||||
|
||||
### New
|
||||
* Add Stats to the main navigation
|
||||
* Allow selecting year on the Stats page
|
||||
|
||||
### Improved
|
||||
* Make some pages redirect back instead to session list
|
||||
|
||||
### Improved
|
||||
* Make navigation more compact
|
||||
|
||||
### Fixed
|
||||
* Correctly limit sessions to a single year for stats
|
||||
|
||||
## 1.2.0 / 2023-11-01 20:18+01:00
|
||||
|
||||
### New
|
||||
* Add yearly stats page (https://git.kucharczyk.xyz/lukas/timetracker/issues/15)
|
||||
|
||||
### Enhancements
|
||||
* Add a button to start session from game overview
|
||||
|
||||
## 1.1.2 / 2023-10-13 16:30+02:00
|
||||
|
||||
### Enhancements
|
||||
* Durations are formatted in a consisent manner across all pages
|
||||
|
||||
### Fixes
|
||||
* Game Overview: display duration when >1 hour instead of displaying 0
|
||||
|
||||
## 1.1.1 / 2023-10-09 20:52+02:00
|
||||
|
||||
### New
|
||||
* Add notes section to game overview
|
||||
|
||||
### Enhancements
|
||||
* Make it possible to add any data on the game overview page
|
||||
|
||||
## 1.1.0 / 2023-10-09 00:01+02:00
|
||||
|
||||
### New
|
||||
* Add game overview page (https://git.kucharczyk.xyz/lukas/timetracker/issues/8)
|
||||
* Add helper buttons next to datime fields
|
||||
* Add copy button on Add session page to copy times between fields
|
||||
* Change fonts to IBM Plex
|
||||
|
||||
### Enhancements
|
||||
* Improve form appearance
|
||||
* Focus important fields on forms
|
||||
* Use the same form when editing a session as when adding a session
|
||||
* Change recent session view to current year instead of last 30 days
|
||||
* Add a hacky way not to reload a page when starting or ending a session (https://git.kucharczyk.xyz/lukas/timetracker/issues/52)
|
||||
* Improve session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/53)
|
||||
|
||||
### Fixes
|
||||
|
||||
* Fix session being wrongly considered in progress if it had a certain amount of manual hours (https://git.kucharczyk.xyz/lukas/timetracker/issues/58)
|
||||
* Fix bug when filtering only manual sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/51)
|
||||
|
||||
|
||||
## 1.0.3 / 2023-02-20 17:16+01:00
|
||||
|
||||
* Add wikidata ID and year for editions
|
||||
* Add icons for game, edition, purchase filters
|
||||
* Allow filtering by game, edition, purchase from the session list
|
||||
* Allow editing filtered entities from session list
|
||||
|
||||
## 1.0.2 / 2023-02-18 21:48+01:00
|
||||
|
||||
* Add support for device info (https://git.kucharczyk.xyz/lukas/timetracker/issues/49)
|
||||
* Add support for purchase ownership information (https://git.kucharczyk.xyz/lukas/timetracker/issues/48)
|
||||
* Add support for purchase prices
|
||||
* Add support for game editions (https://git.kucharczyk.xyz/lukas/timetracker/issues/28)
|
||||
|
||||
## 1.0.1 / 2023-01-30 22:17+01:00
|
||||
|
||||
* Make it possible to edit sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/46)
|
||||
|
|
53
Dockerfile
|
@ -1,34 +1,45 @@
|
|||
FROM node as css
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
RUN npm install && \
|
||||
npx tailwindcss -i ./common/input.css -o ./static/base.css --minify
|
||||
FROM python:3.12.0-slim-bullseye
|
||||
|
||||
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.0.0
|
||||
ENV PROD 1
|
||||
ENV PYTHONUNBUFFERED=1
|
||||
|
||||
RUN apt update && \
|
||||
apt install -y \
|
||||
RUN apt-get update && apt-get upgrade -y \
|
||||
&& apt-get install --no-install-recommends -y \
|
||||
bash \
|
||||
vim \
|
||||
curl && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
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
|
||||
COPY . /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 /
|
||||
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
|
||||
ENV PATH="$PATH:/home/timetracker/.local/bin"
|
||||
RUN pip install --no-cache-dir poetry
|
||||
RUN poetry install --without dev
|
||||
|
||||
EXPOSE 8000
|
||||
CMD [ "/entrypoint.sh" ]
|
||||
CMD [ "/entrypoint.sh" ]
|
||||
|
|
24
Makefile
|
@ -3,15 +3,13 @@ all: css migrate
|
|||
initialize: npm css migrate sethookdir loadplatforms
|
||||
|
||||
HTMLFILES := $(shell find games/templates -type f)
|
||||
PYTHON_VERSION = 3.12
|
||||
|
||||
npm:
|
||||
npm install
|
||||
|
||||
css: input.css
|
||||
npx tailwindcss -i ./input.css -o ./games/static/base.css
|
||||
|
||||
css-dev: css
|
||||
npx tailwindcss -i ./input.css -o ./games/static/base.css --watch
|
||||
css: common/input.css
|
||||
npx tailwindcss -i ./common/input.css -o ./games/static/base.css
|
||||
|
||||
makemigrations:
|
||||
poetry run python manage.py makemigrations
|
||||
|
@ -19,8 +17,20 @@ makemigrations:
|
|||
migrate: makemigrations
|
||||
poetry run python manage.py migrate
|
||||
|
||||
dev: migrate
|
||||
poetry run python manage.py runserver
|
||||
init:
|
||||
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 run --watch
|
||||
|
|
14
README.md
|
@ -1,3 +1,15 @@
|
|||
# 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`.
|
|
@ -0,0 +1,195 @@
|
|||
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.loader import render_to_string
|
||||
from django.urls import NoReverseMatch, reverse
|
||||
from django.utils.safestring import SafeText, mark_safe
|
||||
|
||||
from common.utils import truncate
|
||||
|
||||
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 = "",
|
||||
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),
|
||||
],
|
||||
children=children,
|
||||
template="cotton/popover.html",
|
||||
)
|
||||
|
||||
|
||||
def PopoverTruncated(input_string: str) -> str:
|
||||
if (truncated := truncate(input_string)) != input_string:
|
||||
return Popover(wrapped_content=truncated, popover_content=input_string)
|
||||
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 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)
|
155
common/input.css
|
@ -2,21 +2,170 @@
|
|||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
@font-face {
|
||||
font-family: "IBM Plex Mono";
|
||||
src: url("fonts/IBMPlexMono-Regular.woff2") format("woff2");
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: "IBM Plex Sans";
|
||||
src: url("fonts/IBMPlexSans-Regular.woff2") format("woff2");
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: "IBM Plex Serif";
|
||||
src: url("fonts/IBMPlexSerif-Regular.woff2") format("woff2");
|
||||
font-weight: 400;
|
||||
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 {
|
||||
@apply dark:text-slate-400;
|
||||
}
|
||||
|
||||
.responsive-table {
|
||||
@apply dark:text-white mx-auto table-fixed;
|
||||
}
|
||||
|
||||
.responsive-table tr:nth-child(even) {
|
||||
@apply bg-slate-800
|
||||
}
|
||||
|
||||
.responsive-table tbody tr:nth-child(odd) {
|
||||
@apply bg-slate-900
|
||||
}
|
||||
|
||||
.responsive-table thead th {
|
||||
@apply text-left border-b-2 border-b-slate-500 text-xl;
|
||||
}
|
||||
|
||||
.responsive-table thead th:not(:first-child),
|
||||
.responsive-table td:not(:first-child) {
|
||||
@apply border-l border-l-slate-500;
|
||||
}
|
||||
|
||||
@layer utilities {
|
||||
.min-w-20char {
|
||||
min-width: 20ch;
|
||||
}
|
||||
.max-w-20char {
|
||||
max-width: 20ch;
|
||||
}
|
||||
.min-w-30char {
|
||||
min-width: 30ch;
|
||||
}
|
||||
.max-w-30char {
|
||||
max-width: 30ch;
|
||||
}
|
||||
.max-w-35char {
|
||||
max-width: 35ch;
|
||||
}
|
||||
.max-w-40char {
|
||||
max-width: 40ch;
|
||||
}
|
||||
}
|
||||
|
||||
form input,
|
||||
select,
|
||||
textarea {
|
||||
@apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
|
||||
}
|
||||
|
||||
#session-table {
|
||||
display: grid;
|
||||
grid-template-columns: 3fr 1fr repeat(2, 2fr) 0.5fr 1fr;
|
||||
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) {
|
||||
form input,
|
||||
select,
|
||||
textarea {
|
||||
width: 300px;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
form input,
|
||||
select,
|
||||
textarea {
|
||||
width: 150px;
|
||||
}
|
||||
}
|
||||
|
||||
#button-container button {
|
||||
@apply mx-1;
|
||||
}
|
||||
|
||||
.basic-button-container {
|
||||
@apply flex space-x-2 justify-center;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
|
||||
.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;
|
||||
|
||||
}
|
||||
} */
|
||||
|
|
|
@ -1,95 +0,0 @@
|
|||
import base64
|
||||
from datetime import datetime
|
||||
from io import BytesIO
|
||||
|
||||
import matplotlib.pyplot as plt
|
||||
import matplotlib.dates as mdates
|
||||
import pandas as pd
|
||||
from django.db.models import F, IntegerField, QuerySet, Sum
|
||||
from django.db.models.functions import TruncDay
|
||||
from games.models import Session
|
||||
|
||||
|
||||
def key_value_to_value_value(data):
|
||||
return {data["date"]: data["hours"]}
|
||||
|
||||
|
||||
def playtime_over_time_chart(queryset: QuerySet = Session.objects):
|
||||
microsecond_in_second = 1000000
|
||||
result = (
|
||||
queryset.exclude(timestamp_end__exact=None)
|
||||
.annotate(date=TruncDay("timestamp_start"))
|
||||
.values("date")
|
||||
.annotate(
|
||||
hours=Sum(
|
||||
F("duration_calculated"),
|
||||
output_field=IntegerField(),
|
||||
)
|
||||
)
|
||||
.values("date", "hours")
|
||||
)
|
||||
keys = []
|
||||
values = []
|
||||
running_total = int(0)
|
||||
for item in result:
|
||||
# date_value = datetime.strftime(item["date"], "%d-%m-%Y")
|
||||
date_value = item["date"]
|
||||
keys.append(date_value)
|
||||
running_total += int(item["hours"] / (3600 * microsecond_in_second))
|
||||
values.append(running_total)
|
||||
data = [keys, values]
|
||||
return get_chart(
|
||||
data,
|
||||
title="Playtime over time (manual excluded)",
|
||||
xlabel="Date",
|
||||
ylabel="Hours",
|
||||
)
|
||||
|
||||
|
||||
def get_graph():
|
||||
buffer = BytesIO()
|
||||
plt.savefig(buffer, format="svg", transparent=True)
|
||||
buffer.seek(0)
|
||||
image_png = buffer.getvalue()
|
||||
graph = base64.b64encode(image_png)
|
||||
graph = graph.decode("utf-8")
|
||||
buffer.close()
|
||||
return graph
|
||||
|
||||
|
||||
def get_chart(data, title="", xlabel="", ylabel=""):
|
||||
x = data[0]
|
||||
y = data[1]
|
||||
plt.style.use("dark_background")
|
||||
plt.switch_backend("SVG")
|
||||
fig, ax = plt.subplots()
|
||||
fig.set_size_inches(10, 4)
|
||||
lines = ax.plot(x, y, "-o")
|
||||
first = x[0]
|
||||
last = x[-1]
|
||||
difference = last - first
|
||||
if difference.days <= 14:
|
||||
ax.xaxis.set_major_locator(mdates.DayLocator())
|
||||
elif difference.days < 60 or len(x) < 60:
|
||||
ax.xaxis.set_major_locator(mdates.WeekdayLocator())
|
||||
ax.xaxis.set_minor_locator(mdates.DayLocator())
|
||||
elif difference.days < 720:
|
||||
ax.xaxis.set_major_locator(mdates.MonthLocator())
|
||||
ax.xaxis.set_minor_locator(mdates.WeekdayLocator())
|
||||
for line in lines:
|
||||
line.set_marker("")
|
||||
else:
|
||||
for line in lines:
|
||||
line.set_marker("")
|
||||
ax.xaxis.set_major_locator(mdates.YearLocator())
|
||||
ax.xaxis.set_minor_locator(mdates.MonthLocator())
|
||||
|
||||
ax.xaxis.set_major_formatter(mdates.DateFormatter("%Y-%m-%d"))
|
||||
for label in ax.get_xticklabels(which="major"):
|
||||
label.set(rotation=30, horizontalalignment="right")
|
||||
ax.set_xlabel(xlabel)
|
||||
ax.set_ylabel(ylabel)
|
||||
ax.set_title(title)
|
||||
fig.tight_layout()
|
||||
chart = get_graph()
|
||||
return chart
|
142
common/time.py
|
@ -1,12 +1,15 @@
|
|||
import re
|
||||
from datetime import datetime, timedelta
|
||||
from zoneinfo import ZoneInfo
|
||||
from datetime import date, datetime, timedelta
|
||||
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
|
||||
from common.utils import generate_split_ranges
|
||||
|
||||
def now() -> datetime:
|
||||
return datetime.now(ZoneInfo(settings.TIME_ZONE))
|
||||
dateformat: str = "%d/%m/%Y"
|
||||
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):
|
||||
|
@ -19,7 +22,7 @@ def _safe_timedelta(duration: timedelta | int | None):
|
|||
|
||||
|
||||
def format_duration(
|
||||
duration: timedelta | int | None, format_string: str = "%H hours"
|
||||
duration: timedelta | int | float | None, format_string: str = "%H hours"
|
||||
) -> str:
|
||||
"""
|
||||
Format timedelta into the specified format_string.
|
||||
|
@ -32,32 +35,135 @@ def format_duration(
|
|||
from the formatting string. For example:
|
||||
- 61 seconds as "%s" = 61 seconds
|
||||
- 61 seconds as "%m %s" = 1 minutes 1 seconds"
|
||||
Format specifiers can include width and precision options:
|
||||
- %5.2H: hours formatted with width 5 and 2 decimal places (padded with zeros)
|
||||
"""
|
||||
minute_seconds = 60
|
||||
hour_seconds = 60 * minute_seconds
|
||||
day_seconds = 24 * hour_seconds
|
||||
duration = _safe_timedelta(duration)
|
||||
safe_duration = _safe_timedelta(duration)
|
||||
# we don't need float
|
||||
seconds_total = int(duration.total_seconds())
|
||||
seconds_total = int(safe_duration.total_seconds())
|
||||
# timestamps where end is before start
|
||||
if seconds_total < 0:
|
||||
seconds_total = 0
|
||||
days = hours = minutes = seconds = 0
|
||||
days = hours = hours_float = minutes = seconds = 0
|
||||
remainder = seconds = seconds_total
|
||||
if "%d" in format_string:
|
||||
days, remainder = divmod(seconds_total, day_seconds)
|
||||
if "%H" in format_string:
|
||||
hours, remainder = divmod(remainder, hour_seconds)
|
||||
if "%m" in format_string:
|
||||
if re.search(r"%\d*\.?\d*H", format_string):
|
||||
hours_float, remainder = divmod(remainder, hour_seconds)
|
||||
hours = float(hours_float) + remainder / hour_seconds
|
||||
if re.search(r"%\d*\.?\d*m", format_string):
|
||||
minutes, seconds = divmod(remainder, minute_seconds)
|
||||
literals = {
|
||||
"%d": str(days),
|
||||
"%H": str(hours),
|
||||
"%m": str(minutes),
|
||||
"%s": str(seconds),
|
||||
"%r": str(seconds_total),
|
||||
"d": str(days),
|
||||
"H": str(hours) if "m" not in format_string else str(hours_float),
|
||||
"m": str(minutes),
|
||||
"s": str(seconds),
|
||||
"r": str(seconds_total),
|
||||
}
|
||||
formatted_string = format_string
|
||||
for pattern, replacement in literals.items():
|
||||
formatted_string = re.sub(pattern, replacement, formatted_string)
|
||||
# Match format specifiers with optional width and precision
|
||||
match = re.search(rf"%(\d*\.?\d*){pattern}", formatted_string)
|
||||
if match:
|
||||
format_spec = match.group(1)
|
||||
if "." in format_spec:
|
||||
# Format the number as float if precision is specified
|
||||
replacement = f"{float(replacement):{format_spec}f}"
|
||||
else:
|
||||
# Format the number as integer if no precision is specified
|
||||
replacement = f"{int(float(replacement)):>{format_spec}}"
|
||||
# Replace the format specifier with the formatted number
|
||||
formatted_string = re.sub(
|
||||
rf"%\d*\.?\d*{pattern}", replacement, 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)
|
||||
|
|
|
@ -0,0 +1,66 @@
|
|||
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)]}{ellipsis}")
|
||||
if len(input_string) > 30
|
||||
else input_string
|
||||
)
|
||||
|
||||
|
||||
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}"
|
|
@ -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"
|
||||
user: "1000"
|
||||
volumes:
|
||||
- "static-files:/home/timetracker/app/static"
|
||||
- "static-files:/var/www/django/static"
|
||||
- "$PWD/db.sqlite3:/home/timetracker/app/db.sqlite3"
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
image: caddy
|
||||
volumes:
|
||||
- "static-files:/usr/share/caddy"
|
||||
- "static-files:/usr/share/caddy:ro"
|
||||
- "$PWD/Caddyfile:/etc/caddy/Caddyfile"
|
||||
ports:
|
||||
- "8000:8000"
|
||||
|
@ -26,3 +27,4 @@ services:
|
|||
volumes:
|
||||
static-files:
|
||||
|
||||
|
|
@ -7,5 +7,13 @@ poetry run python manage.py migrate
|
|||
echo "Collect static files"
|
||||
poetry run python manage.py collectstatic --clear --no-input
|
||||
|
||||
_term() {
|
||||
echo "Caught SIGTERM signal!"
|
||||
kill -SIGTERM "$gunicorn_pid"
|
||||
}
|
||||
trap _term SIGTERM
|
||||
|
||||
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 -
|
||||
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"
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from games.models import Game, Platform, Purchase, Session
|
||||
from games.models import Device, Edition, Game, Platform, Purchase, Session
|
||||
|
||||
# Register your models here.
|
||||
admin.site.register(Game)
|
||||
admin.site.register(Purchase)
|
||||
admin.site.register(Platform)
|
||||
admin.site.register(Session)
|
||||
admin.site.register(Edition)
|
||||
admin.site.register(Device)
|
||||
|
|
153
games/forms.py
|
@ -1,38 +1,179 @@
|
|||
from django import forms
|
||||
from django.urls import reverse
|
||||
|
||||
from games.models import Game, Platform, Purchase, Session
|
||||
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_datetime_widget = forms.DateTimeInput(
|
||||
attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M"
|
||||
)
|
||||
autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
|
||||
|
||||
|
||||
class SessionForm(forms.ModelForm):
|
||||
purchase = forms.ModelChoiceField(queryset=Purchase.objects.order_by("game__name"))
|
||||
# purchase = forms.ModelChoiceField(
|
||||
# queryset=Purchase.objects.filter(date_refunded=None).order_by("edition__name")
|
||||
# )
|
||||
purchase = forms.ModelChoiceField(
|
||||
queryset=Purchase.objects.order_by("edition__sort_name"),
|
||||
widget=forms.Select(attrs={"autofocus": "autofocus"}),
|
||||
)
|
||||
|
||||
device = forms.ModelChoiceField(queryset=Device.objects.order_by("name"))
|
||||
|
||||
class Meta:
|
||||
widgets = {
|
||||
"timestamp_start": custom_datetime_widget,
|
||||
"timestamp_end": custom_datetime_widget,
|
||||
}
|
||||
model = Session
|
||||
fields = [
|
||||
"purchase",
|
||||
"timestamp_start",
|
||||
"timestamp_end",
|
||||
"duration_manual",
|
||||
"device",
|
||||
"note",
|
||||
]
|
||||
|
||||
|
||||
class EditionChoiceField(forms.ModelChoiceField):
|
||||
def label_from_instance(self, obj) -> str:
|
||||
return f"{obj.sort_name} ({obj.platform}, {obj.year_released})"
|
||||
|
||||
|
||||
class IncludePlatformSelect(forms.Select):
|
||||
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):
|
||||
game = forms.ModelChoiceField(queryset=Game.objects.order_by("name"))
|
||||
def __init__(self, *args, **kwargs):
|
||||
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["edition"].widget.attrs.update(
|
||||
{
|
||||
"hx-trigger": "load, click",
|
||||
"hx-get": related_purchase_by_edition_url,
|
||||
"hx-target": "#id_related_purchase",
|
||||
"hx-swap": "outerHTML",
|
||||
}
|
||||
)
|
||||
|
||||
edition = EditionChoiceField(
|
||||
queryset=Edition.objects.order_by("sort_name"),
|
||||
widget=IncludePlatformSelect(attrs={"autoselect": "autoselect"}),
|
||||
)
|
||||
platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
|
||||
related_purchase = forms.ModelChoiceField(
|
||||
queryset=Purchase.objects.filter(type=Purchase.GAME).order_by(
|
||||
"edition__sort_name"
|
||||
),
|
||||
required=False,
|
||||
)
|
||||
|
||||
class Meta:
|
||||
widgets = {
|
||||
"date_purchased": custom_date_widget,
|
||||
"date_refunded": custom_date_widget,
|
||||
"date_finished": custom_date_widget,
|
||||
"date_dropped": custom_date_widget,
|
||||
}
|
||||
model = Purchase
|
||||
fields = ["game", "platform", "date_purchased", "date_refunded"]
|
||||
fields = [
|
||||
"edition",
|
||||
"platform",
|
||||
"date_purchased",
|
||||
"date_refunded",
|
||||
"date_finished",
|
||||
"date_dropped",
|
||||
"infinite",
|
||||
"price",
|
||||
"price_currency",
|
||||
"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):
|
||||
game = GameModelChoiceField(
|
||||
queryset=Game.objects.order_by("sort_name"),
|
||||
widget=IncludeNameSelect(attrs={"autofocus": "autofocus"}),
|
||||
)
|
||||
platform = forms.ModelChoiceField(
|
||||
queryset=Platform.objects.order_by("name"), required=False
|
||||
)
|
||||
|
||||
class Meta:
|
||||
model = Edition
|
||||
fields = ["game", "name", "sort_name", "platform", "year_released", "wikidata"]
|
||||
|
||||
|
||||
class GameForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Game
|
||||
fields = ["name", "wikidata"]
|
||||
fields = ["name", "sort_name", "year_released", "wikidata"]
|
||||
widgets = {"name": autofocus_input_widget}
|
||||
|
||||
|
||||
class PlatformForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Platform
|
||||
fields = ["name", "group"]
|
||||
fields = [
|
||||
"name",
|
||||
"icon",
|
||||
"group",
|
||||
]
|
||||
widgets = {"name": autofocus_input_widget}
|
||||
|
||||
|
||||
class DeviceForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Device
|
||||
fields = ["name", "type"]
|
||||
widgets = {"name": autofocus_input_widget}
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
from .game import Mutation as GameMutation
|
|
@ -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()
|
|
@ -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
|
|
@ -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()
|
|
@ -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()
|
|
@ -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
|
|
@ -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()
|
|
@ -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()
|
|
@ -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()
|
|
@ -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__"
|
|
@ -1,7 +1,7 @@
|
|||
# Generated by Django 4.1.5 on 2023-01-19 18:30
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
# Generated by Django 4.1.5 on 2023-02-18 16:29
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("games", "0007_alter_purchase_game_alter_purchase_platform_and_more"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="Edition",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.BigAutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
("name", models.CharField(max_length=255)),
|
||||
(
|
||||
"game",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE, to="games.game"
|
||||
),
|
||||
),
|
||||
(
|
||||
"platform",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE, to="games.platform"
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
]
|
|
@ -0,0 +1,34 @@
|
|||
# Generated by Django 4.1.5 on 2023-02-18 18:51
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def create_edition_of_game(apps, schema_editor):
|
||||
Game = apps.get_model("games", "Game")
|
||||
Edition = apps.get_model("games", "Edition")
|
||||
Platform = apps.get_model("games", "Platform")
|
||||
first_platform = Platform.objects.first()
|
||||
all_games = Game.objects.all()
|
||||
all_editions = Edition.objects.all()
|
||||
for game in all_games:
|
||||
existing_edition = None
|
||||
try:
|
||||
existing_edition = all_editions.objects.get(game=game.id)
|
||||
except:
|
||||
pass
|
||||
if existing_edition == None:
|
||||
edition = Edition()
|
||||
edition.id = game.id
|
||||
edition.game = game
|
||||
edition.name = game.name
|
||||
edition.platform = first_platform
|
||||
edition.save()
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("games", "0008_edition"),
|
||||
]
|
||||
|
||||
operations = [migrations.RunPython(create_edition_of_game)]
|
|
@ -0,0 +1,21 @@
|
|||
# Generated by Django 4.1.5 on 2023-02-18 19:06
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("games", "0009_create_editions"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="purchase",
|
||||
name="game",
|
||||
field=models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE, to="games.edition"
|
||||
),
|
||||
),
|
||||
]
|
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 4.1.5 on 2023-02-18 19:18
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("games", "0010_alter_purchase_game"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameField(
|
||||
model_name="purchase",
|
||||
old_name="game",
|
||||
new_name="edition",
|
||||
),
|
||||
]
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 4.1.5 on 2023-02-18 19:53
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("games", "0011_rename_game_purchase_edition"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="purchase",
|
||||
name="price",
|
||||
field=models.IntegerField(default=0),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="purchase",
|
||||
name="price_currency",
|
||||
field=models.CharField(default="USD", max_length=3),
|
||||
),
|
||||
]
|
|
@ -0,0 +1,31 @@
|
|||
# Generated by Django 4.1.5 on 2023-02-18 19:54
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("games", "0012_purchase_price_purchase_price_currency"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="purchase",
|
||||
name="ownership_type",
|
||||
field=models.CharField(
|
||||
choices=[
|
||||
("ph", "Physical"),
|
||||
("di", "Digital"),
|
||||
("du", "Digital Upgrade"),
|
||||
("re", "Rented"),
|
||||
("bo", "Borrowed"),
|
||||
("tr", "Trial"),
|
||||
("de", "Demo"),
|
||||
("pi", "Pirated"),
|
||||
],
|
||||
default="di",
|
||||
max_length=2,
|
||||
),
|
||||
),
|
||||
]
|
|
@ -0,0 +1,52 @@
|
|||
# Generated by Django 4.1.5 on 2023-02-18 19:59
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("games", "0013_purchase_ownership_type"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="Device",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.BigAutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
("name", models.CharField(max_length=255)),
|
||||
(
|
||||
"type",
|
||||
models.CharField(
|
||||
choices=[
|
||||
("pc", "PC"),
|
||||
("co", "Console"),
|
||||
("ha", "Handheld"),
|
||||
("mo", "Mobile"),
|
||||
("sbc", "Single-board computer"),
|
||||
],
|
||||
default="pc",
|
||||
max_length=3,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="session",
|
||||
name="device",
|
||||
field=models.ForeignKey(
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to="games.device",
|
||||
),
|
||||
),
|
||||
]
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 4.1.5 on 2023-02-20 14:55
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("games", "0014_device_session_device"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="edition",
|
||||
name="wikidata",
|
||||
field=models.CharField(blank=True, default=None, max_length=50, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="edition",
|
||||
name="year_released",
|
||||
field=models.IntegerField(default=2023),
|
||||
),
|
||||
]
|
|
@ -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",
|
||||
),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
]
|
|
@ -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")},
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
]
|
|
@ -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",
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
]
|
|
@ -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),
|
||||
]
|
|
@ -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,
|
||||
),
|
||||
),
|
||||
]
|
|
@ -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",
|
||||
),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
]
|
|
@ -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",
|
||||
),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
),
|
||||
]
|
|
@ -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",
|
||||
),
|
||||
),
|
||||
]
|
|
@ -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'),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
]
|
|
@ -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),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
),
|
||||
]
|
|
@ -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),
|
||||
]
|
250
games/models.py
|
@ -1,87 +1,281 @@
|
|||
from datetime import datetime, timedelta
|
||||
from typing import Any
|
||||
from zoneinfo import ZoneInfo
|
||||
from datetime import timedelta
|
||||
|
||||
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 django.conf import settings
|
||||
from django.db import models
|
||||
from django.db.models import F, Manager, Sum
|
||||
|
||||
|
||||
class Game(models.Model):
|
||||
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)
|
||||
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):
|
||||
return self.name
|
||||
|
||||
|
||||
class Purchase(models.Model):
|
||||
game = models.ForeignKey("Game", on_delete=models.CASCADE)
|
||||
platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
|
||||
date_purchased = models.DateField()
|
||||
date_refunded = models.DateField(blank=True, null=True)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.game} ({self.platform})"
|
||||
|
||||
|
||||
class Platform(models.Model):
|
||||
name = models.CharField(max_length=255)
|
||||
group = 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 Edition(models.Model):
|
||||
class Meta:
|
||||
unique_together = [["name", "platform", "year_released"]]
|
||||
|
||||
game = models.ForeignKey(Game, on_delete=models.CASCADE)
|
||||
name = models.CharField(max_length=255)
|
||||
sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
|
||||
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)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
def __str__(self):
|
||||
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):
|
||||
PHYSICAL = "ph"
|
||||
DIGITAL = "di"
|
||||
DIGITALUPGRADE = "du"
|
||||
RENTED = "re"
|
||||
BORROWED = "bo"
|
||||
TRIAL = "tr"
|
||||
DEMO = "de"
|
||||
PIRATED = "pi"
|
||||
OWNERSHIP_TYPES = [
|
||||
(PHYSICAL, "Physical"),
|
||||
(DIGITAL, "Digital"),
|
||||
(DIGITALUPGRADE, "Digital Upgrade"),
|
||||
(RENTED, "Rented"),
|
||||
(BORROWED, "Borrowed"),
|
||||
(TRIAL, "Trial"),
|
||||
(DEMO, "Demo"),
|
||||
(PIRATED, "Pirated"),
|
||||
]
|
||||
GAME = "game"
|
||||
DLC = "dlc"
|
||||
SEASONPASS = "season_pass"
|
||||
BATTLEPASS = "battle_pass"
|
||||
TYPES = [
|
||||
(GAME, "Game"),
|
||||
(DLC, "DLC"),
|
||||
(SEASONPASS, "Season Pass"),
|
||||
(BATTLEPASS, "Battle Pass"),
|
||||
]
|
||||
|
||||
objects = PurchaseQueryset().as_manager()
|
||||
|
||||
edition = models.ForeignKey(Edition, on_delete=models.CASCADE)
|
||||
platform = models.ForeignKey(
|
||||
Platform, on_delete=models.CASCADE, default=None, null=True, blank=True
|
||||
)
|
||||
date_purchased = models.DateField()
|
||||
date_refunded = models.DateField(blank=True, null=True)
|
||||
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")
|
||||
ownership_type = models.CharField(
|
||||
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)
|
||||
|
||||
def __str__(self):
|
||||
additional_info = [
|
||||
self.get_type_display() if self.type != Purchase.GAME else "",
|
||||
(
|
||||
f"{self.edition.platform} version on {self.platform}"
|
||||
if self.platform != self.edition.platform
|
||||
else self.platform
|
||||
),
|
||||
self.edition.year_released,
|
||||
self.get_ownership_type_display(),
|
||||
]
|
||||
return f"{self.edition} ({', '.join(filter(None, map(str, additional_info)))})"
|
||||
|
||||
def is_game(self):
|
||||
return self.type == self.GAME
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if self.type == Purchase.GAME:
|
||||
self.name = ""
|
||||
elif self.type != Purchase.GAME and not self.related_purchase:
|
||||
raise ValidationError(
|
||||
f"{self.get_type_display()} must have a related purchase."
|
||||
)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
|
||||
class SessionQuerySet(models.QuerySet):
|
||||
def total_duration(self):
|
||||
def total_duration_formatted(self):
|
||||
return format_duration(self.total_duration_unformatted())
|
||||
|
||||
def total_duration_unformatted(self):
|
||||
result = self.aggregate(
|
||||
duration=Sum(F("duration_calculated") + F("duration_manual"))
|
||||
)
|
||||
return format_duration(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):
|
||||
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_end = models.DateTimeField(blank=True, null=True)
|
||||
duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
|
||||
duration_calculated = models.DurationField(blank=True, null=True)
|
||||
device = models.ForeignKey(
|
||||
"Device",
|
||||
on_delete=models.SET_DEFAULT,
|
||||
null=True,
|
||||
blank=True,
|
||||
default=None,
|
||||
)
|
||||
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()
|
||||
|
||||
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})"
|
||||
|
||||
def finish_now(self):
|
||||
self.timestamp_end = datetime.now(ZoneInfo(settings.TIME_ZONE))
|
||||
self.timestamp_end = timezone.now()
|
||||
|
||||
def start_now():
|
||||
self.timestamp_start = datetime.now(ZoneInfo(settings.TIME_ZONE))
|
||||
self.timestamp_start = timezone.now()
|
||||
|
||||
def duration_seconds(self) -> timedelta:
|
||||
manual = 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
|
||||
if self.timestamp_end != None and self.timestamp_start != None:
|
||||
calculated = self.timestamp_end - self.timestamp_start
|
||||
return timedelta(seconds=(manual + calculated).total_seconds())
|
||||
|
||||
def duration_formatted(self) -> str:
|
||||
result = format_duration(self.duration_seconds(), "%H:%m")
|
||||
result = format_duration(self.duration_seconds(), "%02.0H:%02.0m")
|
||||
return result
|
||||
|
||||
def is_manual(self) -> bool:
|
||||
return not self.duration_manual == timedelta(0)
|
||||
|
||||
@property
|
||||
def duration_sum(self) -> str:
|
||||
return Session.objects.all().total_duration()
|
||||
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:
|
||||
self.duration_calculated = self.timestamp_end - self.timestamp_start
|
||||
else:
|
||||
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)
|
||||
|
||||
|
||||
class Device(models.Model):
|
||||
PC = "PC"
|
||||
CONSOLE = "Console"
|
||||
HANDHELD = "Handheld"
|
||||
MOBILE = "Mobile"
|
||||
SBC = "Single-board computer"
|
||||
UNKNOWN = "Unknown"
|
||||
DEVICE_TYPES = [
|
||||
(PC, "PC"),
|
||||
(CONSOLE, "Console"),
|
||||
(HANDHELD, "Handheld"),
|
||||
(MOBILE, "Mobile"),
|
||||
(SBC, "Single-board computer"),
|
||||
(UNKNOWN, "Unknown"),
|
||||
]
|
||||
name = models.CharField(max_length=255)
|
||||
type = models.CharField(max_length=255, choices=DEVICE_TYPES, default=UNKNOWN)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name} ({self.type})"
|
||||
|
|
|
@ -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)
|
After Width: | Height: | Size: 292 KiB |
After Width: | Height: | Size: 321 KiB |
After Width: | Height: | Size: 22 KiB |
After Width: | Height: | Size: 306 KiB |
After Width: | Height: | Size: 787 B |
After Width: | Height: | Size: 312 KiB |
After Width: | Height: | Size: 364 KiB |
After Width: | Height: | Size: 42 KiB |
After Width: | Height: | Size: 504 B |
|
@ -0,0 +1,24 @@
|
|||
import { syncSelectInputUntilChanged } from "./utils.js";
|
||||
|
||||
let syncData = [
|
||||
{
|
||||
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",
|
||||
},
|
||||
];
|
||||
|
||||
syncSelectInputUntilChanged(syncData, "form");
|
|
@ -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");
|
|
@ -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
|
||||
}
|
||||
}
|
||||
});
|
|
@ -0,0 +1,23 @@
|
|||
import { toISOUTCString } from "./utils.js";
|
||||
|
||||
for (let button of document.querySelectorAll("[data-target]")) {
|
||||
let target = button.getAttribute("data-target");
|
||||
let type = button.getAttribute("data-type");
|
||||
let targetElement = document.querySelector(`#id_${target}`);
|
||||
button.addEventListener("click", (event) => {
|
||||
event.preventDefault();
|
||||
if (type == "now") {
|
||||
targetElement.value = toISOUTCString(new Date());
|
||||
} else if (type == "copy") {
|
||||
const oppositeName =
|
||||
targetElement.name == "timestamp_start"
|
||||
? "timestamp_end"
|
||||
: "timestamp_start";
|
||||
document.querySelector(`[name='${oppositeName}']`).value =
|
||||
targetElement.value;
|
||||
} else if (type == "toggle") {
|
||||
if (targetElement.type == "datetime-local") targetElement.type = "text";
|
||||
else targetElement.type = "datetime-local";
|
||||
}
|
||||
});
|
||||
}
|
|
@ -0,0 +1,207 @@
|
|||
/**
|
||||
* @description Formats Date to a UTC string accepted by the datetime-local input field.
|
||||
* @param {Date} date
|
||||
* @returns {string}
|
||||
*/
|
||||
function toISOUTCString(date) {
|
||||
function stringAndPad(number) {
|
||||
return number.toString().padStart(2, 0);
|
||||
}
|
||||
const year = date.getFullYear();
|
||||
const month = stringAndPad(date.getMonth() + 1);
|
||||
const day = stringAndPad(date.getDate());
|
||||
const hours = stringAndPad(date.getHours());
|
||||
const minutes = stringAndPad(date.getMinutes());
|
||||
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,
|
||||
};
|
|
@ -0,0 +1,43 @@
|
|||
function elt(type, props, ...children) {
|
||||
let dom = document.createElement(type);
|
||||
if (props) Object.assign(dom, props);
|
||||
for (let child of children) {
|
||||
if (typeof child != "string") dom.appendChild(child);
|
||||
else dom.appendChild(document.createTextNode(child));
|
||||
}
|
||||
return dom;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Node} targetNode
|
||||
*/
|
||||
function addToggleButton(targetNode) {
|
||||
let manualToggleButton = elt(
|
||||
"td",
|
||||
{},
|
||||
elt(
|
||||
"div",
|
||||
{ className: "basic-button" },
|
||||
elt(
|
||||
"button",
|
||||
{
|
||||
onclick: (event) => {
|
||||
let textInputField = elt("input", { type: "text", id: targetNode.id });
|
||||
targetNode.replaceWith(textInputField);
|
||||
event.target.addEventListener("click", (event) => {
|
||||
textInputField.replaceWith(targetNode);
|
||||
});
|
||||
},
|
||||
},
|
||||
"Toggle manual"
|
||||
)
|
||||
)
|
||||
);
|
||||
targetNode.parentElement.appendChild(manualToggleButton);
|
||||
}
|
||||
|
||||
const toggleableFields = ["#id_game", "#id_edition", "#id_platform"];
|
||||
|
||||
toggleableFields.map((selector) => {
|
||||
addToggleButton(document.querySelector(selector));
|
||||
});
|
|
@ -0,0 +1,2 @@
|
|||
User-agent: *
|
||||
Disallow: /
|
|
@ -1,13 +1,2 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}{{ title }}{% endblock title %}
|
||||
|
||||
{% block content %}
|
||||
<form method="post" enctype="multipart/form-data" class="mx-auto">
|
||||
{% csrf_token %}
|
||||
|
||||
{{ form.as_p }}
|
||||
|
||||
<input type="submit" value="Submit"/>
|
||||
</form>
|
||||
{% endblock content %}
|
||||
<c-layouts.add>
|
||||
</c-layouts.add>
|
||||
|
|
|
@ -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 Purchase" />
|
||||
</td>
|
||||
</tr>
|
||||
</c-slot>
|
||||
</c-layouts.add>
|
|
@ -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>
|
|
@ -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>
|
|
@ -0,0 +1,36 @@
|
|||
<c-layouts.add>
|
||||
<c-slot name="form_content">
|
||||
<form method="post" enctype="multipart/form-data">
|
||||
<table class="mx-auto">
|
||||
{% csrf_token %}
|
||||
{% for field in form %}
|
||||
<tr>
|
||||
<th>{{ field.label_tag }}</th>
|
||||
{% if field.name == "note" %}
|
||||
<td>{{ field }}</td>
|
||||
{% else %}
|
||||
<td>{{ field }}</td>
|
||||
{% endif %}
|
||||
{% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
|
||||
<td>
|
||||
<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="toggle">Toggle text</button>
|
||||
<button class="basic-button" data-target="{{ field.name }}" data-type="copy">Copy</button>
|
||||
</div>
|
||||
</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>
|
||||
<input type="submit" value="Submit" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
</c-slot>
|
||||
</c-layouts.add>
|
|
@ -1,48 +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>
|
||||
<link rel="stylesheet" href="https://rsms.me/inter/inter.css"/>
|
||||
<link rel="stylesheet" href="{% static 'base.css' %}" />
|
||||
</head>
|
||||
|
||||
<body class="dark">
|
||||
<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">⌚</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><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
|
||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_platform' %}">New Platform</a></li>
|
||||
{% if game_available and platform_available %}
|
||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_purchase' %}">New Purchase</a></li>
|
||||
{% endif %}
|
||||
{% if purchase_available %}
|
||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
|
||||
{% endif %}
|
||||
{% if session_count > 0 %}
|
||||
<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>
|
||||
</body>
|
||||
|
||||
</html>
|