game kit gear menu + login form UX polish; left-side position indicator flip
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
game kit: new Applet model rows (context=game-kit) for Trinkets, Tokens, Card Decks, Dice Sets via applets migration 0008; _game_kit_context() helper in gameboard.views; toggle_game_kit_sections view + URL; new _game_kit_sections.html (HTMX-swappable, visibility-conditional) + _game_kit_applet_menu.html partials; game_kit.html wired to gear btn + menu; Dice Sets now renders _forthcoming.html partial; 16 new green ITs in GameKitViewTest + ToggleGameKitSectionsViewTest login form: .input-group now position:fixed + vertically centred (top:50%) across all breakpoints as default; landscape block reduced to left/right sidebar offsets only; form-control width 24rem, text-align:center; alert block moved below h2 in base.html; alert margin 0.75rem all sides; home.html header switches between Howdy Stranger (anon) and Dashboard (authed) room.html position indicators: slots 3/4/5 (AC/SC/EC) column order flipped via SCSS data-slot selectors so .fa-chair sits table-side and label+status icon sit outward Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
25
src/apps/applets/migrations/0008_game_kit_applets.py
Normal file
25
src/apps/applets/migrations/0008_game_kit_applets.py
Normal file
@@ -0,0 +1,25 @@
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def seed_game_kit_applets(apps, schema_editor):
|
||||
Applet = apps.get_model('applets', 'Applet')
|
||||
for slug, name in [
|
||||
('gk-trinkets', 'Trinkets'),
|
||||
('gk-tokens', 'Tokens'),
|
||||
('gk-decks', 'Card Decks'),
|
||||
('gk-dice', 'Dice Sets'),
|
||||
]:
|
||||
Applet.objects.get_or_create(
|
||||
slug=slug,
|
||||
defaults={'name': name, 'grid_cols': 3, 'grid_rows': 3, 'context': 'game-kit'},
|
||||
)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
('applets', '0007_fix_billboard_applets'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(seed_game_kit_applets, migrations.RunPython.noop)
|
||||
]
|
||||
@@ -106,6 +106,110 @@ class ToggleGameAppletsViewTest(TestCase):
|
||||
self.assertFalse(UserApplet.objects.filter(user=self.user, applet=dash_applet).exists())
|
||||
|
||||
|
||||
class GameKitViewTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="gamer@test.io")
|
||||
self.client.force_login(self.user)
|
||||
Applet.objects.get_or_create(slug="gk-trinkets", defaults={"name": "Trinkets", "context": "game-kit"})
|
||||
Applet.objects.get_or_create(slug="gk-tokens", defaults={"name": "Tokens", "context": "game-kit"})
|
||||
Applet.objects.get_or_create(slug="gk-decks", defaults={"name": "Card Decks", "context": "game-kit"})
|
||||
Applet.objects.get_or_create(slug="gk-dice", defaults={"name": "Dice Sets", "context": "game-kit"})
|
||||
response = self.client.get("/gameboard/game-kit/")
|
||||
self.parsed = lxml.html.fromstring(response.content)
|
||||
|
||||
def test_game_kit_requires_login(self):
|
||||
self.client.logout()
|
||||
response = self.client.get("/gameboard/game-kit/")
|
||||
self.assertRedirects(response, "/?next=/gameboard/game-kit/", fetch_redirect_response=False)
|
||||
|
||||
def test_game_kit_shows_gear_btn(self):
|
||||
[_] = self.parsed.cssselect(".gear-btn")
|
||||
|
||||
def test_game_kit_shows_applet_menu(self):
|
||||
[_] = self.parsed.cssselect("#id_game_kit_menu")
|
||||
|
||||
def test_game_kit_applet_menu_has_trinkets_checkbox(self):
|
||||
[inp] = self.parsed.cssselect("#id_game_kit_menu input[value='gk-trinkets']")
|
||||
self.assertEqual(inp.get("type"), "checkbox")
|
||||
|
||||
def test_game_kit_applet_menu_has_tokens_checkbox(self):
|
||||
[inp] = self.parsed.cssselect("#id_game_kit_menu input[value='gk-tokens']")
|
||||
self.assertEqual(inp.get("type"), "checkbox")
|
||||
|
||||
def test_game_kit_applet_menu_has_decks_checkbox(self):
|
||||
[inp] = self.parsed.cssselect("#id_game_kit_menu input[value='gk-decks']")
|
||||
self.assertEqual(inp.get("type"), "checkbox")
|
||||
|
||||
def test_game_kit_applet_menu_has_dice_checkbox(self):
|
||||
[inp] = self.parsed.cssselect("#id_game_kit_menu input[value='gk-dice']")
|
||||
self.assertEqual(inp.get("type"), "checkbox")
|
||||
|
||||
def test_game_kit_sections_container_present(self):
|
||||
[_] = self.parsed.cssselect("#id_gk_sections_container")
|
||||
|
||||
def test_all_sections_visible_by_default(self):
|
||||
sections = self.parsed.cssselect("#id_gk_sections_container section")
|
||||
self.assertEqual(len(sections), 4)
|
||||
|
||||
|
||||
class ToggleGameKitSectionsViewTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="gamer@test.io")
|
||||
self.client.force_login(self.user)
|
||||
self.trinkets, _ = Applet.objects.get_or_create(
|
||||
slug="gk-trinkets", defaults={"name": "Trinkets", "context": "game-kit"}
|
||||
)
|
||||
self.tokens, _ = Applet.objects.get_or_create(
|
||||
slug="gk-tokens", defaults={"name": "Tokens", "context": "game-kit"}
|
||||
)
|
||||
self.decks, _ = Applet.objects.get_or_create(
|
||||
slug="gk-decks", defaults={"name": "Card Decks", "context": "game-kit"}
|
||||
)
|
||||
self.dice, _ = Applet.objects.get_or_create(
|
||||
slug="gk-dice", defaults={"name": "Dice Sets", "context": "game-kit"}
|
||||
)
|
||||
self.url = reverse("toggle_game_kit_sections")
|
||||
|
||||
def test_unauthenticated_user_is_redirected(self):
|
||||
self.client.logout()
|
||||
response = self.client.post(self.url)
|
||||
self.assertRedirects(response, f"/?next={self.url}", fetch_redirect_response=False)
|
||||
|
||||
def test_unchecked_section_gets_user_applet_with_visible_false(self):
|
||||
self.client.post(self.url, {"applets": ["gk-trinkets"]})
|
||||
ua = UserApplet.objects.get(user=self.user, applet=self.tokens)
|
||||
self.assertFalse(ua.visible)
|
||||
|
||||
def test_redirects_on_normal_post(self):
|
||||
response = self.client.post(self.url, {"applets": ["gk-trinkets", "gk-tokens"]})
|
||||
self.assertRedirects(response, reverse("game_kit"), fetch_redirect_response=False)
|
||||
|
||||
def test_returns_200_on_htmx_post(self):
|
||||
response = self.client.post(
|
||||
self.url,
|
||||
{"applets": ["gk-trinkets", "gk-tokens"]},
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
def test_does_not_affect_gameboard_applets(self):
|
||||
gb_applet, _ = Applet.objects.get_or_create(
|
||||
slug="new-game", defaults={"name": "New Game", "context": "gameboard"}
|
||||
)
|
||||
self.client.post(self.url, {"applets": ["gk-trinkets"]})
|
||||
self.assertFalse(UserApplet.objects.filter(user=self.user, applet=gb_applet).exists())
|
||||
|
||||
def test_hidden_section_absent_from_htmx_response(self):
|
||||
response = self.client.post(
|
||||
self.url,
|
||||
{"applets": ["gk-trinkets"]},
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
parsed = lxml.html.fromstring(response.content)
|
||||
sections = parsed.cssselect("section")
|
||||
self.assertEqual(len(sections), 1)
|
||||
|
||||
|
||||
class EquipTrinketViewTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="gamer@test.io")
|
||||
|
||||
@@ -9,6 +9,7 @@ urlpatterns = [
|
||||
path('equip-trinket/<int:token_id>/', views.equip_trinket, name='equip_trinket'),
|
||||
path('equip-deck/<int:deck_id>/', views.equip_deck, name='equip_deck'),
|
||||
path('game-kit/', views.game_kit, name='game_kit'),
|
||||
path('game-kit/toggle-sections', views.toggle_game_kit_sections, name='toggle_game_kit_sections'),
|
||||
path('game-kit/deck/<int:deck_id>/', views.tarot_fan, name='tarot_fan'),
|
||||
]
|
||||
|
||||
|
||||
@@ -102,26 +102,48 @@ def equip_deck(request, deck_id):
|
||||
return HttpResponse(status=405)
|
||||
|
||||
|
||||
@login_required(login_url="/")
|
||||
def game_kit(request):
|
||||
coin = request.user.tokens.filter(token_type=Token.COIN).first()
|
||||
pass_token = request.user.tokens.filter(token_type=Token.PASS).first() if request.user.is_staff else None
|
||||
carte = request.user.tokens.filter(token_type=Token.CARTE).first()
|
||||
free_tokens = list(request.user.tokens.filter(
|
||||
def _game_kit_context(user):
|
||||
coin = user.tokens.filter(token_type=Token.COIN).first()
|
||||
pass_token = user.tokens.filter(token_type=Token.PASS).first() if user.is_staff else None
|
||||
carte = user.tokens.filter(token_type=Token.CARTE).first()
|
||||
free_tokens = list(user.tokens.filter(
|
||||
token_type=Token.FREE, expires_at__gt=timezone.now()
|
||||
).order_by("expires_at"))
|
||||
tithe_tokens = list(request.user.tokens.filter(token_type=Token.TITHE))
|
||||
return render(request, "apps/gameboard/game_kit.html", {
|
||||
tithe_tokens = list(user.tokens.filter(token_type=Token.TITHE))
|
||||
return {
|
||||
"coin": coin,
|
||||
"pass_token": pass_token,
|
||||
"carte": carte,
|
||||
"free_tokens": free_tokens,
|
||||
"tithe_tokens": tithe_tokens,
|
||||
"unlocked_decks": list(request.user.unlocked_decks.all()),
|
||||
"unlocked_decks": list(user.unlocked_decks.all()),
|
||||
"applets": applet_context(user, "game-kit"),
|
||||
}
|
||||
|
||||
|
||||
@login_required(login_url="/")
|
||||
def game_kit(request):
|
||||
return render(request, "apps/gameboard/game_kit.html", {
|
||||
**_game_kit_context(request.user),
|
||||
"page_class": "page-gameboard",
|
||||
})
|
||||
|
||||
|
||||
@login_required(login_url="/")
|
||||
def toggle_game_kit_sections(request):
|
||||
checked = request.POST.getlist("applets")
|
||||
for applet in Applet.objects.filter(context="game-kit"):
|
||||
UserApplet.objects.update_or_create(
|
||||
user=request.user,
|
||||
applet=applet,
|
||||
defaults={"visible": applet.slug in checked},
|
||||
)
|
||||
if request.headers.get("HX-Request"):
|
||||
return render(request, "apps/gameboard/_partials/_game_kit_sections.html",
|
||||
_game_kit_context(request.user))
|
||||
return redirect("game_kit")
|
||||
|
||||
|
||||
@login_required(login_url="/")
|
||||
def tarot_fan(request, deck_id):
|
||||
from apps.epic.models import TarotCard
|
||||
|
||||
Reference in New Issue
Block a user