Compare commits

...

4 Commits

Author SHA1 Message Date
Lukáš Kucharczyk d91c0bc255
Update npm deps
Django CI/CD / test (push) Successful in 1m1s Details
Django CI/CD / build-and-push (push) Successful in 1m57s Details
2024-06-26 17:39:53 +02:00
Lukáš Kucharczyk a14f5d3ae5
Add npm-check-updates 2024-06-26 17:39:39 +02:00
Lukáš Kucharczyk 4ac13053d5
Use new Poetry section for main deps 2024-06-26 17:31:43 +02:00
Lukáš Kucharczyk e9311225e7
Make setting up and developing easier 2024-06-26 17:18:58 +02:00
6 changed files with 48 additions and 21 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ db.sqlite3
/static/
dist/
.DS_Store
.python-version

View File

@ -3,6 +3,7 @@ all: css migrate
initialize: npm css migrate sethookdir loadplatforms
HTMLFILES := $(shell find games/templates -type f)
PYTHON_VERSION = 3.12
npm:
npm install
@ -10,17 +11,26 @@ npm:
css: common/input.css
npx tailwindcss -i ./common/input.css -o ./games/static/base.css
css-dev: css
npx tailwindcss -i ./common/input.css -o ./games/static/base.css --watch
makemigrations:
poetry run python manage.py 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 manage.py runserver" \
"npx tailwindcss -i ./common/input.css -o ./games/static/base.css --watch"
caddy:
caddy run --watch

View File

@ -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`.

View File

@ -1,7 +1,9 @@
{
"devDependencies": {
"@tailwindcss/forms": "^0.5.6",
"@tailwindcss/typography": "^0.5.10",
"tailwindcss": "^3.3.3"
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.13",
"concurrently": "^8.2.2",
"npm-check-updates": "^16.14.20",
"tailwindcss": "^3.4.4"
}
}

5
poetry.lock generated
View File

@ -1,4 +1,4 @@
# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
[[package]]
name = "aniso8601"
@ -683,6 +683,7 @@ files = [
{file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
{file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
{file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
{file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
{file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
{file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
{file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
@ -955,4 +956,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
[metadata]
lock-version = "2.0"
python-versions = "^3.11"
content-hash = "2ce1b4da68f977c38f606fb0e296a363d3564ca0bde72a77565f00e1a9af60de"
content-hash = "e378db0f181ae21ecf5a7c1bbe261712e7b12c0c956c8555dd2853824560baf9"

View File

@ -7,16 +7,6 @@ license = "GPL"
readme = "README.md"
packages = [{include = "timetracker"}]
[tool.poetry.group.main.dependencies]
python = "^3.11"
django = "^4.2.0"
gunicorn = "^22"
uvicorn = "^0.20.0"
graphene-django = "^3.1.5"
django-htmx = "^1.17.2"
django-template-partials = "^23.4"
markdown = "^3.5.2"
[tool.poetry.group.dev.dependencies]
black = "^24.3.0"
mypy = "^1.9.0"
@ -30,6 +20,17 @@ pre-commit = "^3.5.0"
django-debug-toolbar = "^4.2.0"
[tool.poetry.dependencies]
python = "^3.11"
django = "^4.2.0"
gunicorn = "^22"
uvicorn = "^0.20.0"
graphene-django = "^3.1.5"
django-htmx = "^1.17.2"
django-template-partials = "^23.4"
markdown = "^3.5.2"
[tool.isort]
profile = "black"