From 94c3d9050adcc1e7d05ac00338905926c1231897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= Date: Tue, 2 Jun 2026 16:32:26 +0200 Subject: [PATCH] Fix make init --- .gitignore | 1 + Makefile | 20 +++++++------------- games/fixtures/platforms.yaml | 9 ++++++++- games/static/base.css | 15 ++++++++++++--- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 9caa4e0..d3ad83c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ __pycache__ .venv/ node_modules package-lock.json +pnpm-lock.yaml db.sqlite3 data/ /static/ diff --git a/Makefile b/Makefile index 123d209..cea362f 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,14 @@ all: css migrate -initialize: npm css migrate sethookdir loadplatforms +initialize: npm css migrate loadplatforms -HTMLFILES := $(shell find games/templates -type f) PYTHON_VERSION = 3.12 npm: - npm install + pnpm install css: common/input.css - npx @tailwindcss/cli -i ./common/input.css -o ./games/static/base.css + pnpm tailwindcss -i ./common/input.css -o ./games/static/base.css makemigrations: uv run python manage.py makemigrations @@ -18,22 +17,17 @@ migrate: makemigrations uv run python manage.py migrate init: - uv install $(PYTHON_VERSION) + uv python install $(PYTHON_VERSION) uv sync - npm install - $(MAKE) sethookdir + pnpm install $(MAKE) loadplatforms -sethookdir: - git config core.hooksPath .githooks - chmod +x .githooks/* - dev: - @npx concurrently \ + @pnpm concurrently \ --names "Django,Tailwind" \ --prefix-colors "blue,green" \ "uv run python -Wa manage.py runserver" \ - "npx @tailwindcss/cli -i ./common/input.css -o ./games/static/base.css --watch" + "pnpm tailwindcss -i ./common/input.css -o ./games/static/base.css --watch" caddy: diff --git a/games/fixtures/platforms.yaml b/games/fixtures/platforms.yaml index dc09961..a183170 100644 --- a/games/fixtures/platforms.yaml +++ b/games/fixtures/platforms.yaml @@ -2,27 +2,34 @@ fields: name: Steam group: PC + created_at: 2024-01-01T00:00:00Z - model: games.Platform fields: name: Xbox Gamepass group: PC + created_at: 2024-01-01T00:00:00Z - model: games.Platform fields: name: Epic Games Store group: PC + created_at: 2024-01-01T00:00:00Z - model: games.Platform fields: name: Playstation 5 group: Playstation + created_at: 2024-01-01T00:00:00Z - model: games.Platform fields: name: Playstation 4 group: Playstation + created_at: 2024-01-01T00:00:00Z - model: games.Platform fields: name: Nintendo Switch group: Nintendo + created_at: 2024-01-01T00:00:00Z - model: games.Platform fields: name: Nintendo 3DS - group: Nintendo \ No newline at end of file + group: Nintendo + created_at: 2024-01-01T00:00:00Z \ No newline at end of file diff --git a/games/static/base.css b/games/static/base.css index 98cfd46..f449ddd 100644 --- a/games/static/base.css +++ b/games/static/base.css @@ -1,4 +1,4 @@ -/*! tailwindcss v4.1.18 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v4.3.0 | MIT License | https://tailwindcss.com */ @layer properties; @layer theme, base, components, utilities; @layer theme { @@ -289,7 +289,7 @@ --spacing-8xl: 90rem; --leading-9: 36px; --leading-6: 24px; - --leading-none: 1px; + --leading-none: 1; --leading-5: 20px; --radius-base: 12px; --color-body: var(--color-gray-600); @@ -1542,7 +1542,7 @@ } } .w-1\/2 { - width: calc(1/2 * 100%); + width: calc(1 / 2 * 100%); } .w-2\.5 { width: calc(var(--spacing) * 2.5); @@ -2696,6 +2696,15 @@ --tw-ease: var(--ease-out); transition-timing-function: var(--ease-out); } + .\[program\:caddy\] { + program: caddy; + } + .\[program\:gunicorn\] { + program: gunicorn; + } + .\[program\:qcluster\] { + program: qcluster; + } .group-hover\:absolute { &:is(:where(.group):hover *) { @media (hover: hover) {