Merge Pathways rework into main

.github/workflows/tests.yaml

@@ -0,0 +1,78 @@
+name: tests
+
+on:
+    push:
+    pull_request:
+    workflow_dispatch:
+
+permissions:
+    contents: read
+
+concurrency:
+    group: tests-${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+jobs:
+    test:
+        name: Django tests
+        runs-on: ubuntu-latest
+        timeout-minutes: 15
+
+        services:
+            postgres:
+                image: postgres:16
+                env:
+                    POSTGRES_DB: twisted_test
+                    POSTGRES_USER: twisted_test
+                    POSTGRES_PASSWORD: twisted_test
+                ports:
+                    - 5432:5432
+                options: >-
+                    --health-cmd "pg_isready -U twisted_test -d twisted_test"
+                    --health-interval 10s
+                    --health-timeout 5s
+                    --health-retries 5
+
+        env:
+            DJANGO_SETTINGS_MODULE: mysite.test_settings
+            POSTGRES_DB: twisted_test
+            POSTGRES_HOST: 127.0.0.1
+            POSTGRES_PASSWORD: twisted_test
+            POSTGRES_PORT: 5432
+            POSTGRES_USER: twisted_test
+
+        steps:
+            - name: Check out repository
+              uses: actions/checkout@v4
+
+            - name: Set up Python
+              uses: actions/setup-python@v5
+              with:
+                  python-version: "3.13"
+
+            - name: Set up uv
+              uses: astral-sh/setup-uv@v6
+              with:
+                  enable-cache: true
+
+            - name: Install dependencies
+              run: uv sync --frozen --dev
+
+            - name: Run Django checks
+              run: |
+                  uv run python twisted/manage.py check --settings=mysite.test_settings
+                  uv run python twisted/manage.py makemigrations --check --dry-run --settings=mysite.test_settings
+
+            - name: Run tests with coverage
+              run: |
+                  uv run coverage run twisted/manage.py test twisted_site common --settings=mysite.test_settings --verbosity 2
+                  uv run coverage report
+                  uv run coverage xml -o coverage.xml
+
+            - name: Upload coverage report
+              if: always()
+              uses: actions/upload-artifact@v4
+              with:
+                  name: python-coverage
+                  path: coverage.xml
+                  if-no-files-found: ignore

.gitignore

@@ -5,6 +5,9 @@ build/
 dist/
 wheels/
 *.egg-info
+.coverage
+coverage.xml
+htmlcov/
 
 # Virtual environments
 .venv

README.md

@@ -18,11 +18,21 @@ wanna help dev? follow these steps!
 2. [install uv](https://docs.astral.sh/uv/getting-started/installation/)
 3. copy twisted/.env.example to twisted/.env
 
+All instructions below assume you've already cd'd into the `twisted` dir
+
 ### launching
-1. run `cd twisted`
-2. run `uv run manage.py migrate`
-3. run `docker compose up db`
-4. run `uv run manage.py tailwind dev` in a new terminal
-5. 
-## Thanks
-Thats all! Thanks to Heliodex for making this Hack Club ysws possible, if your interested in participating, your're more than welcome to do that :)
+1. run `uv run manage.py migrate`
+2. run `docker compose up db`
+3. run `uv run manage.py tailwind dev` in a new terminal
+
+### getting an admin account
+1. log into your account on the web
+2. run `uv run manage.py shell_plus` or `uv run manage.py shell` depending on what you fancy
+3. get your profile by running `profile = Profile.objects.get()` (assuming only one person has signed up)
+4. run `profile.is_staff = True`
+5. run `perms = ProfileStaffPermissions.objects.create(superuser = True, view_users = True, view_pathways = True, manage_pathways = True, manage_fulfillments = True, manage_shop = True, view_review = True, manage_review = True, manage_announcements = True, view_auditlogs = True)` (this creates a perms object with all perms)
+6. run `profile.staff_permissions = perms` (this associates the perms object with your profile)
+7. run `profile.save()` (this saves the changes to the DB)
+
+### testing
+run `uv run manage.py test --settings mysite.test_settings`

pyproject.toml

@@ -13,6 +13,7 @@ dependencies = [
     "django-tailwind[cookiecutter,honcho,reload]>=4.5.0",
     "gunicorn>=26.0.0",
     "psycopg[binary]>=3.3.4",
+    "pillow>=11.3.0",
     "python-dotenv>=1.2.2",
     "requests>=2.34.2",
     "slack-bolt>=1.30.0",
@@ -38,6 +39,7 @@ ignore = ["A002", "C901", "CPY001", "D100", "D101", "D102", "D103", "D104", "D10
 
 [tool.ruff.lint.per-file-ignores]
 "*/migrations/*.py" = ["RUF012", "ALL"]
+"*/tests/*.py" = ["PT009", "PT027", "S106"]
 
 [tool.pyright]
 venvPath = "."
@@ -47,3 +49,24 @@ executionEnvironments = [{ root = "twisted" }]
 [tool.pyrefly]
 infer-with-first-use = false
 search-path = ["twisted"]
+# Migrations are generated and excluded from ruff too (see per-file-ignores above).
+project-excludes = ["**/migrations/**"]
+
+[tool.coverage.run]
+branch = true
+source = ["twisted"]
+omit = [
+    "*/migrations/*",
+    "*/tests/*",
+    "twisted/manage.py",
+]
+
+[tool.coverage.report]
+show_missing = true
+skip_covered = true
+
+[dependency-groups]
+dev = [
+    "coverage[toml]>=7.9.0",
+    "django-stubs>=6.1.1",
+]

twisted/.env.example

@@ -15,7 +15,7 @@ HCA_REDIRECT_URI = http://localhost:8000/oauth/callback
 
 HACKATIME_CLIENT_ID =
 HACKATIME_CLIENT_SECRET =
-HACKATIME_REDIRECT_URI = https://localhost:8000/oauth/hackatime_callback
+HACKATIME_REDIRECT_URI = http://localhost:8000/oauth/hackatime_callback
 
 SLACK_TOKEN = xoxb-***
 SLACK_LOG_CHANNEL = C***

twisted/mysite/middleware.py

@@ -23,7 +23,9 @@ def __call__(self, request: HttpRequest) -> HttpResponse:
             else:
                 timezone.deactivate()
         except (zoneinfo.ZoneInfoNotFoundError, ValueError):
-            logger.warning("Invalid django_timezone cookie value: %r", request.COOKIES.get("django_timezone"))
+            logger.warning(
+                "Invalid django_timezone cookie value: %r", request.COOKIES.get("django_timezone"),
+            )
             timezone.deactivate()
 
         return self.get_response(request)

twisted/mysite/settings.py

@@ -66,6 +66,7 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.humanize",
+    "django.contrib.postgres",
     # Your apps
     "common",
     "twisted_site",

twisted/mysite/test_settings.py

@@ -0,0 +1,64 @@
+# ruff: noqa: E402
+# pyright: reportConstantRedefinition=false
+"""Deterministic settings for the automated test suite."""
+
+import os
+
+_TEST_ENVIRONMENT = {
+    "ALLOWED_HOSTS": "testserver,localhost,127.0.0.1",
+    "ARI_INGEST_ENDPOINT": "https://example.invalid/ari/",
+    "ARI_SIGNING_SECRET": "test-ari-signing-secret",
+    "ARI_WEBHOOK_SECRET": "test-ari-webhook-secret",
+    "CSRF_TRUSTED_ORIGINS": "http://testserver",
+    "DEBUG": "false",
+    "DEBUG_REVIEW": "false",
+    "DEFAULT_PFP": "https://example.invalid/avatar.png",
+    "HACKATIME_CLIENT_ID": "test-hackatime-client-id",
+    "HACKATIME_CLIENT_SECRET": "test-hackatime-client-secret",
+    "HACKATIME_REDIRECT_URI": "http://testserver/oauth/hackatime_callback",
+    "HCA_CLIENT_ID": "test-hca-client-id",
+    "HCA_CLIENT_SECRET": "test-hca-client-secret",
+    "HCA_REDIRECT_URI": "http://testserver/oauth/callback",
+    "LOGIN_ENABLED": "true",
+    "POSTGRES_DB": "django",
+    "POSTGRES_HOST": "127.0.0.1",
+    "POSTGRES_PASSWORD": "django",
+    "POSTGRES_PORT": "5432",
+    "POSTGRES_USER": "django",
+    "R2_ACCESS_KEY": "test-r2-access-key",
+    "R2_BUCKET": "test-r2-bucket",
+    "R2_ENDPOINT": "https://example.invalid/r2",
+    "R2_PUBLIC_URL": "https://example.invalid/uploads",
+    "R2_SECRET_KEY": "test-r2-secret-key",
+    "SECRET_KEY": "test-secret-key-that-is-only-used-by-the-automated-test-suite",
+    "SLACK_LOG_CHANNEL": "C_TEST",
+    "SLACK_TOKEN": "xoxb-test-token",
+}
+
+for _name, _value in _TEST_ENVIRONMENT.items():
+    _ = os.environ.setdefault(_name, _value)
+
+from mysite.settings import *  # noqa: F403
+
+DEBUG = False
+DEBUG_REVIEW = False
+SECURE_SSL_REDIRECT = False
+SESSION_COOKIE_SECURE = False
+CSRF_COOKIE_SECURE = False
+
+MIDDLEWARE = [
+    middleware
+    for middleware in MIDDLEWARE  # noqa: F405
+    if middleware != "whitenoise.middleware.WhiteNoiseMiddleware"
+]
+
+PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
+
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+    },
+}

twisted/tailwindcsstheme/static_src/src/styles.css

@@ -21,14 +21,6 @@
 	font-display: swap;
 }
 
-@font-face {
-	font-family: "Piedra";
-	src: url("/static/fonts/Piedra-Regular.ttf") format("truetype");
-	font-weight: 100;
-	font-style: normal;
-	font-display: swap;
-}
-
 :root {
 	/* Accent: primary buttons, links, focus ring, active states */
 	--color-accent: var(--color-red-500);
@@ -67,15 +59,10 @@
 	--color-twisted-200: #e0a7ff;
 	--color-twisted-400: #b96cff;
 	--color-twisted-600: #8c3ed1;
-	--color-twisted-800: #61268f;
-	--color-twisted-999: #3a1750;
 
-	--color-absolute-white: #ffffff;
-	--color-fair-gray: #b8adbf;
 	--color-dark-black: #120817;
 
 	--color-surface: #2e153c;
-	--color-dark: #1b0d25;
 }
 
 @theme {
@@ -94,9 +81,6 @@
 	--color-card: #1b0d25;
 	--color-card-foreground: #faf7ff;
 
-	--color-popover: #48245c;
-	--color-popover-foreground: #ffffff;
-
 	--color-primary: #b96cff;
 	--color-primary-foreground: #190b24;
 
@@ -110,10 +94,8 @@
 	--color-muted-foreground: #c9b8d3;
 
 	--color-subtle: #806a8d;
-	--color-subtle-foreground: #e2d8e8;
 
 	--color-border: #654078;
-	--color-input: #75488a;
 	--color-ring: #c27aff;
 
 	--color-success: #4ade80;
@@ -124,6 +106,17 @@
 
 	--color-destructive: #ff6b7a;
 	--color-destructive-foreground: #2a080d;
+
+	/* "OS" palette — must live in @theme for Tailwind to generate its utilities */
+	--color-twisted-200: #e0a7ff;
+	--color-twisted-400: #b96cff;
+	--color-twisted-600: #8c3ed1;
+	--color-twisted-800: #61268f;
+	--color-twisted-999: #3a1750;
+
+	--color-absolute-white: #ffffff;
+	--color-dark-black: #120817;
+	--color-surface: #2e153c;
 }
 
 button {
@@ -162,33 +155,6 @@ button {
 	image-rendering: pixelated;
 }
 
-.window .maximized {
-	position: fixed !important;
-	inset: 0 0 32px 0 !important;
-	width: auto !important;
-	height: auto !important;
-	min-width: 0 !important;
-	min-height: 0 !important;
-	margin: 0 !important;
-	transform: none !important;
-}
-
-progress {
-	-webkit-appearance: none;
-	-moz-appearance: none;
-	appearance: none;
-	display: block;
-	height: 100%;
-	border: none;
-	box-sizing: border-box;
-	background-color: var(--color-primary);
-}
-
-progress::-webkit-progress-bar {
-	background-color: var(--color-primary);
-	height: 100%;
-}
-
 ::-webkit-scrollbar {
 	width: 10px;
 	height: 10px;
@@ -212,13 +178,6 @@ progress::-webkit-progress-bar {
 	background: #1e072f;
 }
 
-@utility no-scrollbar {
-	@apply [scrollbar-width:none] [&::-webkit-scrollbar]:hidden;
-}
-
-::-webkit-scrollbar-corner {
-	background: #1e072f;
-}
 .resize-handle {
 	position: absolute;
 	z-index: 10;