From 47d84b6bf2afe1d842adee3b6db747d1c095762b Mon Sep 17 00:00:00 2001 From: Disco DeDisco Date: Mon, 9 Mar 2026 21:13:35 -0400 Subject: [PATCH] extensive refactor push to continue to liberate applets from dashboard; new _applets.html & .gear.html template partials for use across all -board views; all applets.html sections have been liberated into their own _applet-.html template partials in their respective templates/apps/*board/_partials/ dirs; gameboard.html & home.html greatly simplified; .gear-btn describes gear menu now, #id_<*board nickname>*gear IDs abandoned; as such, .gear-btn styling moved from _dashboard.scss to _base.scss; new applets.js file contains related initGearMenus scripts, which no longer waits for window reload; new apps.applets.utils file manages applet_context() fn; new gameboard.js file but currently empty (false start); updates across all sorts of ITs & dash- & gameboard FTs --- .../applets/static/apps/scripts/applets.js | 23 +++++ .../applets/tests/integrated/test_models.py | 27 ++++- src/apps/applets/utils.py | 11 +++ .../static/apps/scripts/dashboard.js | 20 ---- .../dashboard/tests/integrated/test_views.py | 10 +- .../tests/integrated/test_wallet_views.py | 3 +- src/apps/dashboard/views.py | 19 +--- .../static/apps/gameboard/gameboard.js | 0 .../gameboard/tests/integrated/test_views.py | 55 ++++++++++- src/apps/gameboard/urls.py | 1 + src/apps/gameboard/views.py | 29 +++++- src/functional_tests/test_dashboard.py | 28 +++--- src/functional_tests/test_gameboard.py | 82 ++++++++++++++- src/static_src/scss/_base.scss | 20 ++++ src/static_src/scss/_dashboard.scss | 22 +---- .../apps/applets/_partials/_applets.html | 7 ++ .../apps/applets/_partials/_gear.html | 3 + .../dashboard/_partials/_applet-my-lists.html | 17 ++++ .../dashboard/_partials/_applet-new-list.html | 8 ++ .../dashboard/_partials/_applet-palette.html | 21 ++++ .../dashboard/_partials/_applet-username.html | 23 +++++ .../dashboard/_partials/_applet-wallet.html | 7 ++ .../apps/dashboard/_partials/_applets.html | 99 ++----------------- .../apps/dashboard/_partials/_scripts.html | 1 - src/templates/apps/dashboard/home.html | 4 +- .../gameboard/_partials/_applet-game-kit.html | 27 +++++ .../gameboard/_partials/_applet-my-games.html | 9 ++ .../gameboard/_partials/_applet-new-game.html | 9 ++ .../apps/gameboard/_partials/_applets.html | 27 +++++ src/templates/apps/gameboard/gameboard.html | 33 +------ src/templates/core/base.html | 1 + 31 files changed, 443 insertions(+), 203 deletions(-) create mode 100644 src/apps/applets/static/apps/scripts/applets.js create mode 100644 src/apps/applets/utils.py create mode 100644 src/apps/gameboard/static/apps/gameboard/gameboard.js create mode 100644 src/templates/apps/applets/_partials/_applets.html create mode 100644 src/templates/apps/applets/_partials/_gear.html create mode 100644 src/templates/apps/dashboard/_partials/_applet-my-lists.html create mode 100644 src/templates/apps/dashboard/_partials/_applet-new-list.html create mode 100644 src/templates/apps/dashboard/_partials/_applet-palette.html create mode 100644 src/templates/apps/dashboard/_partials/_applet-username.html create mode 100644 src/templates/apps/dashboard/_partials/_applet-wallet.html create mode 100644 src/templates/apps/gameboard/_partials/_applet-game-kit.html create mode 100644 src/templates/apps/gameboard/_partials/_applet-my-games.html create mode 100644 src/templates/apps/gameboard/_partials/_applet-new-game.html create mode 100644 src/templates/apps/gameboard/_partials/_applets.html diff --git a/src/apps/applets/static/apps/scripts/applets.js b/src/apps/applets/static/apps/scripts/applets.js new file mode 100644 index 0000000..6ef4f8c --- /dev/null +++ b/src/apps/applets/static/apps/scripts/applets.js @@ -0,0 +1,23 @@ +const initGearMenus = () => { + document.querySelectorAll('.gear-btn').forEach(gear => { + const menuId = gear.dataset.menuTarget; + + gear.addEventListener('click', (e) => { + e.stopPropagation(); + const menu = document.getElementById(menuId); + if (!menu) return; + menu.style.display = menu.style.display === 'none' ? 'block' : 'none'; + }); + + document.addEventListener('click', (e) => { + const menu = document.getElementById(menuId); + if (!menu || menu.style.display === 'none') return; + if (e.target.closest('.applet-menu-cancel') || !menu.contains(e.target)) { + menu.style.display = 'none'; + } + }); + }) + +}; + +document.addEventListener('DOMContentLoaded', initGearMenus); \ No newline at end of file diff --git a/src/apps/applets/tests/integrated/test_models.py b/src/apps/applets/tests/integrated/test_models.py index a6fd282..cab08cd 100644 --- a/src/apps/applets/tests/integrated/test_models.py +++ b/src/apps/applets/tests/integrated/test_models.py @@ -2,6 +2,7 @@ from django.db.utils import IntegrityError from django.test import TestCase from apps.applets.models import Applet, UserApplet +from apps.applets.utils import applet_context from apps.lyric.models import User @@ -25,6 +26,7 @@ class AppletModelTest(TestCase): self.assertEqual(self.applet.grid_cols, 12) self.assertEqual(self.applet.grid_rows, 3) + class UserAppletModelTest(TestCase): def setUp(self): self.user = User.objects.create(email="a@b.cde") @@ -37,4 +39,27 @@ class UserAppletModelTest(TestCase): def test_user_applet_unique_per_user_and_applet(self): UserApplet.objects.create(user=self.user, applet=self.applet, visible=True) with self.assertRaises(IntegrityError): - UserApplet.objects.create(user=self.user, applet=self.applet, visible=False) \ No newline at end of file + UserApplet.objects.create(user=self.user, applet=self.applet, visible=False) + +class AppletContextTest(TestCase): + def setUp(self): + self.user = User.objects.create(email="a@b.cde") + self.dash_applet = Applet.objects.create(slug="username", name="Username", context="dashboard") + self.game_applet = Applet.objects.create(slug="new-game", name="New Game", context="gameboard") + + def test_filters_by_context(self): + result = applet_context(self.user, "dashboard") + slugs = [e["applet"].slug for e in result] + self.assertIn("username", slugs) + self.assertNotIn("new-game", slugs) + + def test_defaults_to_applet_default_visible(self): + result = applet_context(self.user, "dashboard") + [entry] = [e for e in result if e["applet"].slug == "username"] + self.assertTrue(entry["visible"]) + + def test_respects_user_applet_visible_false(self): + UserApplet.objects.create(user=self.user, applet=self.dash_applet, visible=False) + result = applet_context(self.user, "dashboard") + [entry] = [e for e in result if e["applet"].slug == "username"] + self.assertFalse(entry["visible"]) diff --git a/src/apps/applets/utils.py b/src/apps/applets/utils.py new file mode 100644 index 0000000..c154648 --- /dev/null +++ b/src/apps/applets/utils.py @@ -0,0 +1,11 @@ +from apps.applets.models import Applet, UserApplet + + +def applet_context(user, context): + ua_map = {ua.applet_id: ua.visible for ua in user.user_applets.all()} + applets = {a.slug: a for a in Applet.objects.filter(context=context)} + return [ + {"applet": applets[slug], "visible": ua_map.get(applets[slug].pk, applets[slug].default_visible)} + for slug in applets + if slug in applets + ] diff --git a/src/apps/dashboard/static/apps/scripts/dashboard.js b/src/apps/dashboard/static/apps/scripts/dashboard.js index 91fb42f..3afcf39 100644 --- a/src/apps/dashboard/static/apps/scripts/dashboard.js +++ b/src/apps/dashboard/static/apps/scripts/dashboard.js @@ -8,23 +8,3 @@ const initialize = (inputSelector) => { textInput.classList.remove("is-invalid"); }; }; - -const initGearMenu = () => { - const gear = document.getElementById('id_dash_gear'); - if (!gear) return; - - gear.addEventListener('click', (e) => { - e.stopPropagation(); - const menu = document.getElementById('id_applet_menu'); - if (!menu) return; - menu.style.display = menu.style.display === 'none' ? 'block' : 'none'; - }); - - document.addEventListener('click', (e) => { - const menu = document.getElementById('id_applet_menu'); - if (!menu || menu.style.display === 'none') return; - if (e.target.closest('#id_applet_menu_cancel') || !menu.contains(e.target)) { - menu.style.display = 'none'; - } - }); -}; \ No newline at end of file diff --git a/src/apps/dashboard/tests/integrated/test_views.py b/src/apps/dashboard/tests/integrated/test_views.py index 8b2befe..fa07f7f 100644 --- a/src/apps/dashboard/tests/integrated/test_views.py +++ b/src/apps/dashboard/tests/integrated/test_views.py @@ -66,6 +66,7 @@ class NewListTest(TestCase): response = self.post_invalid_input() self.assertContains(response, html.escape(EMPTY_ITEM_ERROR)) +@override_settings(COMPRESS_ENABLED=False) class ListViewTest(TestCase): def test_uses_list_template(self): mylist = List.objects.create() @@ -358,7 +359,7 @@ class ProfileViewTest(TestCase): [username_input] = parsed.cssselect("#id_new_username") self.assertEqual("discoman", username_input.get("value")) -class ToggleAppletsViewTest(TestCase): +class ToggleDashAppletsViewTest(TestCase): def setUp(self): self.user = User.objects.create(email="disco@test.io") self.client.force_login(self.user) @@ -402,6 +403,13 @@ class ToggleAppletsViewTest(TestCase): self.assertEqual(len(parsed.cssselect("#id_applet_username")), 1) self.assertEqual(len(parsed.cssselect("#id_applet_palette")), 0) + def test_toggle_applets_does_not_affect_gameboard_applets(self): + game_applet, _ = Applet.objects.get_or_create( + slug="new-game", defaults={"name": "New Game", "context": "gameboard"} + ) + self.client.post(self.url, {"applets": ["username", "palette"]}) + self.assertFalse(UserApplet.objects.filter(user=self.user, applet=game_applet). exists()) + class AppletVisibilityContextTest(TestCase): def setUp(self): self.user = User.objects.create(email="disco@test.io") diff --git a/src/apps/dashboard/tests/integrated/test_wallet_views.py b/src/apps/dashboard/tests/integrated/test_wallet_views.py index adec63b..28c677a 100644 --- a/src/apps/dashboard/tests/integrated/test_wallet_views.py +++ b/src/apps/dashboard/tests/integrated/test_wallet_views.py @@ -1,10 +1,11 @@ import lxml.html -from django.test import TestCase +from django.test import override_settings, TestCase from apps.lyric.models import Token, User, Wallet +@override_settings(COMPRESS_ENABLED=False) class WalletViewTest(TestCase): def setUp(self): self.user = User.objects.create(email="capman@test.io") diff --git a/src/apps/dashboard/views.py b/src/apps/dashboard/views.py index fc56525..9701661 100644 --- a/src/apps/dashboard/views.py +++ b/src/apps/dashboard/views.py @@ -9,6 +9,7 @@ from django.shortcuts import redirect, render from django.views.decorators.csrf import ensure_csrf_cookie from apps.applets.models import Applet, UserApplet +from apps.applets.utils import applet_context from apps.dashboard.forms import ExistingListItemForm, ItemForm from apps.dashboard.models import Item, List from apps.lyric.models import PaymentMethod, Token, User, Wallet @@ -36,16 +37,6 @@ def _recent_lists(user, limit=3): .distinct()[:limit] ) -def _applet_context(user): - ua_map = {ua.applet_id: ua.visible for ua in user.user_applets.all()} - applets = {a.slug: a for a in Applet.objects.all()} - return [ - {"applet": applets[slug], "visible": ua_map.get(applets[slug].pk, applets[slug].default_visible)} - for slug in APPLET_ORDER - if slug in applets - ] - - def home_page(request): context = { "form": ItemForm(), @@ -53,7 +44,7 @@ def home_page(request): "page_class": "page-dashboard", } if request.user.is_authenticated: - context["applets"] = _applet_context(request.user) + context["applets"] = applet_context(request.user, "dashboard") context["recent_lists"] = _recent_lists(request.user) return render(request, "apps/dashboard/home.html", context) @@ -73,7 +64,7 @@ def new_list(request): "page_class": "page-dashboard", } if request.user.is_authenticated: - context["applets"] = _applet_context(request.user) + context["applets"] = applet_context(request.user, "dashboard") context["recent_lists"] = _recent_lists(request.user) return render(request, "apps/dashboard/home.html", context) @@ -135,7 +126,7 @@ def set_profile(request): @login_required(login_url="/") def toggle_applets(request): checked = request.POST.getlist("applets") - for applet in Applet.objects.all(): + for applet in Applet.objects.filter(context="dashboard"): UserApplet.objects.update_or_create( user=request.user, applet=applet, @@ -143,7 +134,7 @@ def toggle_applets(request): ) if request.headers.get("HX-Request"): return render(request, "apps/dashboard/_partials/_applets.html", { - "applets": _applet_context(request.user), + "applets": applet_context(request.user, "dashboard"), "palettes": PALETTES, "form": ItemForm(), "recent_lists": _recent_lists(request.user), diff --git a/src/apps/gameboard/static/apps/gameboard/gameboard.js b/src/apps/gameboard/static/apps/gameboard/gameboard.js new file mode 100644 index 0000000..e69de29 diff --git a/src/apps/gameboard/tests/integrated/test_views.py b/src/apps/gameboard/tests/integrated/test_views.py index b4c4ed6..3fed2f4 100644 --- a/src/apps/gameboard/tests/integrated/test_views.py +++ b/src/apps/gameboard/tests/integrated/test_views.py @@ -1,14 +1,19 @@ import lxml.html from django.test import TestCase +from django.urls import reverse +from apps.applets.models import Applet, UserApplet from apps.lyric.models import User class GameboardViewTest(TestCase): def setUp(self): - self.user = User.objects.create(email="capman@test.io") + self.user = User.objects.create(email="gamer@test.io") self.client.force_login(self.user) + Applet.objects.get_or_create(slug="new-game", defaults={"name": "New Game", "context": "gameboard"}) + Applet.objects.get_or_create(slug="my-games", defaults={"name": "My Games", "context": "gameboard"}) + Applet.objects.get_or_create(slug="game-kit", defaults={"name": "Game Kit", "context": "gameboard"}) response = self.client.get("/gameboard/") self.parsed = lxml.html.fromstring(response.content) @@ -33,7 +38,7 @@ class GameboardViewTest(TestCase): [_] = self.parsed.cssselect("#id_game_kit_btn") def test_gameboard_shows_game_gear(self): - [_] = self.parsed.cssselect("#id_game_gear") + [_] = self.parsed.cssselect(".gear-btn") def test_my_games_has_no_game_items_for_new_user(self): game_items = self.parsed.cssselect("#id_applet_my_games .game-item") @@ -50,3 +55,49 @@ class GameboardViewTest(TestCase): def test_game_kit_has_dice_set_placeholder(self): [_] = self.parsed.cssselect("#id_game_kit #id_kit_dice_set") + + +class ToggleGameAppletsViewTest(TestCase): + def setUp(self): + self.user = User.objects.create(email="gamer@test.io") + self.client.force_login(self.user) + self.new_game, _ = Applet.objects.get_or_create( + slug="new-game", defaults={"name": "New Game", "context": "gameboard"} + ) + self.my_games, _ = Applet.objects.get_or_create( + slug="my-games", defaults={"name": "My Games", "context": "gameboard"} + ) + self.url = reverse("toggle_game_applets") + + 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_applet_gets_user_applet_with_visible_false(self): + self.client.post(self.url, {"applets": ["new-game"]}) + ua = UserApplet.objects.get(user=self.user, applet=self.my_games) + self.assertFalse(ua.visible) + + def test_redirects_on_normal_post(self): + response = self.client.post(self.url, {"applets": ["new-game", "my-games"]}) + self.assertRedirects( + response, reverse("gameboard"), fetch_redirect_response=False + ) + + def test_returns_200_on_htmx_post(self): + response = self.client.post( + self.url, + {"applets": ["new-game", "my-games"]}, + HTTP_HX_REQUEST="true", + ) + self.assertEqual(response.status_code, 200) + + def test_does_not_affect_dash_applets(self): + dash_applet, _ = Applet.objects.get_or_create( + slug="username", defaults={"name": "Username", "context": "dashboard"} + ) + self.client.post(self.url, {"applets": ["new-game", "my-games"]}) + self.assertFalse(UserApplet.objects.filter(user=self.user, applet=dash_applet).exists()) diff --git a/src/apps/gameboard/urls.py b/src/apps/gameboard/urls.py index 47b068d..271fbf6 100644 --- a/src/apps/gameboard/urls.py +++ b/src/apps/gameboard/urls.py @@ -5,5 +5,6 @@ from . import views urlpatterns = [ path('', views.gameboard, name='gameboard'), + path('toggle-applets', views.toggle_game_applets, name='toggle_game_applets'), ] diff --git a/src/apps/gameboard/views.py b/src/apps/gameboard/views.py index b401b86..e9a9337 100644 --- a/src/apps/gameboard/views.py +++ b/src/apps/gameboard/views.py @@ -1,9 +1,18 @@ from django.contrib.auth.decorators import login_required -from django.shortcuts import render +from django.shortcuts import redirect, render +from apps.applets.utils import applet_context +from apps.applets.models import Applet, UserApplet from apps.lyric.models import Token +GAMEBOARD_APPLET_ORDER = [ + "new-game", + "my-games", + "game-kit", +] + + @login_required(login_url="/") def gameboard(request): coin = request.user.tokens.filter(token_type=Token.COIN).first() @@ -12,5 +21,23 @@ def gameboard(request): request, "apps/gameboard/gameboard.html", { "coin": coin, "free_tokens": free_tokens, + "applets": applet_context(request.user, "gameboard"), } ) + +@login_required(login_url="/") +def toggle_game_applets(request): + checked = request.POST.getlist("applets") + for applet in Applet.objects.filter(context="gameboard"): + 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/_applets.html", { + "applets": applet_context(request.user, "gameboard"), + "coin": request.user.tokens.filter(token_type=Token.COIN).first(), + "free_tokens": list(request.user.tokens.filter(token_type=Token.FREE)), + }) + return redirect("gameboard") diff --git a/src/functional_tests/test_dashboard.py b/src/functional_tests/test_dashboard.py index 9d8cd18..99eb0ab 100644 --- a/src/functional_tests/test_dashboard.py +++ b/src/functional_tests/test_dashboard.py @@ -54,16 +54,16 @@ class DashboardMaintenanceTest(FunctionalTest): self.browser.find_element(By.ID, "id_applet_username") self.browser.find_element(By.ID, "id_applet_palette") # 3. Click el w. id="id_dash_gear" - dash_gear = self.browser.find_element(By.ID, "id_dash_gear") + dash_gear = self.browser.find_element(By.CSS_SELECTOR, ".gear-btn") dash_gear.click() - # 4. A menu appears; wait_for el w. id="id_applet_menu" + # 4. A menu appears; wait_for el w. id="id_dash_applet_menu" self.wait_for( lambda: self.assertTrue( - self.browser.find_element(By.ID, "id_applet_menu").is_displayed() + self.browser.find_element(By.ID, "id_dash_applet_menu").is_displayed() ) ) # 5. Find two checkboxes in menu, name="username" & name="palette"; assert both .is_selected() - menu = self.browser.find_element(By.ID, "id_applet_menu") + menu = self.browser.find_element(By.ID, "id_dash_applet_menu") username_cb = menu.find_element(By.CSS_SELECTOR, '[name="applets"][value="username"]') palette_cb = menu.find_element(By.CSS_SELECTOR, '[name="applets"][value="palette"]') self.assertTrue(username_cb.is_selected()) @@ -76,7 +76,7 @@ class DashboardMaintenanceTest(FunctionalTest): menu.find_element(By.CSS_SELECTOR, '[type="submit"]').click() self.wait_for( lambda: self.assertFalse( - self.browser.find_element(By.ID, "id_applet_menu").is_displayed() + self.browser.find_element(By.ID, "id_dash_applet_menu").is_displayed() ) ) # 8. wait_for palette applet to be gone @@ -93,10 +93,10 @@ class DashboardMaintenanceTest(FunctionalTest): dash_gear.click() self.wait_for( lambda: self.assertTrue( - self.browser.find_element(By.ID, "id_applet_menu").is_displayed() + self.browser.find_element(By.ID, "id_dash_applet_menu").is_displayed() ) ) - menu = self.browser.find_element(By.ID, "id_applet_menu") + menu = self.browser.find_element(By.ID, "id_dash_applet_menu") palette_cb = menu.find_element(By.CSS_SELECTOR, '[name="applets"][value="palette"]') self.assertFalse(palette_cb.is_selected()) # 11. Click it to re-check box; submit @@ -106,7 +106,7 @@ class DashboardMaintenanceTest(FunctionalTest): # 12. wait_for id_applet_palette to reappear self.wait_for( lambda: self.assertFalse( - self.browser.find_element(By.ID, "id_applet_menu").is_displayed() + self.browser.find_element(By.ID, "id_dash_applet_menu").is_displayed() ) ) self.wait_for( @@ -125,19 +125,19 @@ class AppletMenuDismissTest(FunctionalTest): self.browser.get(self.live_server_url) def _open_menu(self): - self.browser.find_element(By.ID, "id_dash_gear").click() + self.browser.find_element(By.CSS_SELECTOR, ".gear-btn").click() self.wait_for( lambda: self.assertTrue( - self.browser.find_element(By.ID, "id_applet_menu").is_displayed() + self.browser.find_element(By.ID, "id_dash_applet_menu").is_displayed() ) ) def test_gear_click_toggles_menu_closed(self): self._open_menu() - self.browser.find_element(By.ID, "id_dash_gear").click() + self.browser.find_element(By.CSS_SELECTOR, ".gear-btn").click() self.wait_for( lambda: self.assertFalse( - self.browser.find_element(By.ID, "id_applet_menu").is_displayed() + self.browser.find_element(By.ID, "id_dash_applet_menu").is_displayed() ) ) @@ -146,7 +146,7 @@ class AppletMenuDismissTest(FunctionalTest): self.browser.find_element(By.ID, "id_applet_menu_cancel").click() self.wait_for( lambda: self.assertFalse( - self.browser.find_element(By.ID, "id_applet_menu").is_displayed() + self.browser.find_element(By.ID, "id_dash_applet_menu").is_displayed() ) ) @@ -155,6 +155,6 @@ class AppletMenuDismissTest(FunctionalTest): self.browser.find_element(By.TAG_NAME, "h2").click() self.wait_for( lambda: self.assertFalse( - self.browser.find_element(By.ID, "id_applet_menu").is_displayed() + self.browser.find_element(By.ID, "id_dash_applet_menu").is_displayed() ) ) diff --git a/src/functional_tests/test_gameboard.py b/src/functional_tests/test_gameboard.py index cd3e72f..499f0f5 100644 --- a/src/functional_tests/test_gameboard.py +++ b/src/functional_tests/test_gameboard.py @@ -1,10 +1,18 @@ +from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.action_chains import ActionChains from selenium.webdriver.common.by import By from .base import FunctionalTest +from apps.applets.models import Applet class GameboardNavigationTest(FunctionalTest): + def setUp(self): + super().setUp() + Applet.objects.get_or_create(slug="new-game", defaults={"name": "New Game", "context": "gameboard"}) + Applet.objects.get_or_create(slug="my-games", defaults={"name": "My Games", "context": "gameboard"}) + Applet.objects.get_or_create(slug="game-kit", defaults={"name": "Game Kit", "context": "gameboard"}) + def test_footer_links_to_gameboard(self): # 1. Log in, nav to dashboard self.create_pre_authenticated_session("capman@test.io") @@ -45,7 +53,7 @@ class GameboardNavigationTest(FunctionalTest): self.wait_for( lambda: self.browser.find_element(By.ID, "id_game_kit_btn") ) - self.browser.find_element(By.ID, "id_game_gear") + self.browser.find_element(By.CSS_SELECTOR, ".gear-btn") # 3. Click game kit btn to open panel self.browser.find_element(By.ID, "id_game_kit_btn").click() # 4. Wait for game kit panel to become visible @@ -91,3 +99,75 @@ class GameboardNavigationTest(FunctionalTest): # 9. Assert card deck & dice set placeholder present self.browser.find_element(By.ID, "id_kit_card_deck") self.browser.find_element(By.ID, "id_kit_dice_set") + + +class GameboardAppletMenuTest(FunctionalTest): + def setUp(self): + super().setUp() + Applet.objects.get_or_create(slug="new-game", defaults={"name": "New Game", "context": "gameboard"}) + Applet.objects.get_or_create(slug="my-games", defaults={"name": "My Games", "context": "gameboard"}) + self.create_pre_authenticated_session("gamer@test.io") + self.browser.get(self.live_server_url + "/gameboard/") + + def test_user_can_toggle_applet_visibility_via_gear_menu(self): + # 1. Assert both applets present + self.wait_for( + lambda: self.browser.find_element(By.ID, "id_applet_my_games") + ) + self.browser.find_element(By.ID, "id_applet_new_game") + # 2. Click gear; wait for menu + self.browser.find_element(By.CSS_SELECTOR, ".gear-btn").click() + self.wait_for( + lambda: self.assertTrue( + self.browser.find_element(By.ID, "id_game_applet_menu").is_displayed() + ) + ) + # 3. Find checkboxes; assert both checked + menu = self.browser.find_element(By.ID, "id_game_applet_menu") + my_games_cb = menu.find_element(By.CSS_SELECTOR, '[name="applets"][value="my-games"]') + new_game_cb = menu.find_element(By.CSS_SELECTOR, '[name="applets"][value="new-game"]') + self.assertTrue(my_games_cb.is_selected()) + self.assertTrue(new_game_cb.is_selected()) + # 4. Uncheck my-games; plant no-reload marker; submit + my_games_cb.click() + self.assertFalse(my_games_cb.is_selected()) + self.browser.execute_script("window.__no_reload_marker = true") + menu.find_element(By.CSS_SELECTOR, '[type="submit"]').click() + # 5. Wait for menu to close; assert my-games gone, new game remains + self.wait_for( + lambda: self.assertFalse( + self.browser.find_element(By.ID, "id_game_applet_menu").is_displayed() + ) + ) + self.wait_for( + lambda: self.assertRaises( + NoSuchElementException, + self.browser.find_element, + By.ID, "id_applet_my_games", + ) + ) + self.browser.find_element(By.ID, "id_applet_new_game") + # 6. Re-check my-games; assert it reappears + self.browser.find_element(By.CSS_SELECTOR, ".gear-btn").click() + self.wait_for( + lambda: self.assertTrue( + self.browser.find_element(By.ID, "id_game_applet_menu").is_displayed() + ) + ) + menu = self.browser.find_element(By.ID, "id_game_applet_menu") + my_games_cb = menu.find_element(By.CSS_SELECTOR, '[name="applets"][value="my-games"]') + self.assertFalse(my_games_cb.is_selected()) + my_games_cb.click() + menu.find_element(By.CSS_SELECTOR, '[type="submit"]').click() + self.wait_for( + lambda: self.assertFalse( + self.browser.find_element(By.ID, "id_game_applet_menu").is_displayed() + ) + ) + self.wait_for( + lambda: self.assertTrue( + self.browser.find_element(By.ID, "id_applet_my_games") + ) + ) + # 7. Assert no full page reload occurred + self.assertTrue(self.browser.execute_script("return window.__no_reload_marker === true")) diff --git a/src/static_src/scss/_base.scss b/src/static_src/scss/_base.scss index dbd348d..877fdda 100644 --- a/src/static_src/scss/_base.scss +++ b/src/static_src/scss/_base.scss @@ -197,4 +197,24 @@ body { opacity: 0.6; } } +} + +.gear-btn { + position: absolute; + bottom: 0.5rem; + right: 0.5rem; + z-index: 1; + background: none; + border: none; + font-size: 2rem; + cursor: pointer; + color: rgba(var(--secUser), 1); + display: inline-flex; + align-items: center; + justify-content: center; + width: 3rem; + height: 3rem; + border-radius: 50%; + background-color: rgba(var(--priUser), 1); + border: 0.15rem solid rgba(var(--secUser), 1); } \ No newline at end of file diff --git a/src/static_src/scss/_dashboard.scss b/src/static_src/scss/_dashboard.scss index c0197c4..f293935 100644 --- a/src/static_src/scss/_dashboard.scss +++ b/src/static_src/scss/_dashboard.scss @@ -28,27 +28,7 @@ body.page-dashboard { position: relative; } -#id_dash_gear { - position: absolute; - bottom: 0.5rem; - right: 0.5rem; - z-index: 1; - background: none; - border: none; - font-size: 2rem; - cursor: pointer; - color: rgba(var(--secUser), 1); - display: inline-flex; - align-items: center; - justify-content: center; - width: 3rem; - height: 3rem; - border-radius: 50%; - background-color: rgba(var(--priUser), 1); - border: 0.15rem solid rgba(var(--secUser), 1); -} - -#id_applet_menu { +#id_dash_applet_menu { position: absolute; bottom: 3rem; right: 0.5rem; diff --git a/src/templates/apps/applets/_partials/_applets.html b/src/templates/apps/applets/_partials/_applets.html new file mode 100644 index 0000000..bab087d --- /dev/null +++ b/src/templates/apps/applets/_partials/_applets.html @@ -0,0 +1,7 @@ +{% for entry in applets %} + {% if entry.visible %} + {% with "apps/"|add:entry.applet.context|add:"/_partials/_applet-"|add:entry.applet.slug|add:".html" as partial %} + {% include partial %} + {% endwith %} + {% endif %} +{% endfor %} \ No newline at end of file diff --git a/src/templates/apps/applets/_partials/_gear.html b/src/templates/apps/applets/_partials/_gear.html new file mode 100644 index 0000000..fc82281 --- /dev/null +++ b/src/templates/apps/applets/_partials/_gear.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/templates/apps/dashboard/_partials/_applet-my-lists.html b/src/templates/apps/dashboard/_partials/_applet-my-lists.html new file mode 100644 index 0000000..6ca32db --- /dev/null +++ b/src/templates/apps/dashboard/_partials/_applet-my-lists.html @@ -0,0 +1,17 @@ +
+ My lists: +
+
    + {% for list in recent_lists %} +
  • + {{ list.name }} +
    • + {% empty %} +
  • No lists yet.
    • + {% endfor %} +
+
+
\ No newline at end of file diff --git a/src/templates/apps/dashboard/_partials/_applet-new-list.html b/src/templates/apps/dashboard/_partials/_applet-new-list.html new file mode 100644 index 0000000..4f5c188 --- /dev/null +++ b/src/templates/apps/dashboard/_partials/_applet-new-list.html @@ -0,0 +1,8 @@ +
+

Start a new to-do list

+ {% url "new_list" as form_action %} + {% include "apps/dashboard/_partials/_form.html" with form=form form_action=form_action %} +
\ No newline at end of file diff --git a/src/templates/apps/dashboard/_partials/_applet-palette.html b/src/templates/apps/dashboard/_partials/_applet-palette.html new file mode 100644 index 0000000..ef56b26 --- /dev/null +++ b/src/templates/apps/dashboard/_partials/_applet-palette.html @@ -0,0 +1,21 @@ +
+
+ {% for palette in palettes %} +
+
+ {% if not palette.locked %} +
+ {% csrf_token %} + +
+ {% else %} + × + {% endif %} +
+ {% endfor %} +
+
\ No newline at end of file diff --git a/src/templates/apps/dashboard/_partials/_applet-username.html b/src/templates/apps/dashboard/_partials/_applet-username.html new file mode 100644 index 0000000..0403850 --- /dev/null +++ b/src/templates/apps/dashboard/_partials/_applet-username.html @@ -0,0 +1,23 @@ +
+
+ {% csrf_token %} +
+ @ + +
+ +
+
\ No newline at end of file diff --git a/src/templates/apps/dashboard/_partials/_applet-wallet.html b/src/templates/apps/dashboard/_partials/_applet-wallet.html new file mode 100644 index 0000000..117de57 --- /dev/null +++ b/src/templates/apps/dashboard/_partials/_applet-wallet.html @@ -0,0 +1,7 @@ +
+ Writs: {{ user.wallet.writs }} + Manage Wallet +
\ No newline at end of file diff --git a/src/templates/apps/dashboard/_partials/_applets.html b/src/templates/apps/dashboard/_partials/_applets.html index 50e7cb3..99342db 100644 --- a/src/templates/apps/dashboard/_partials/_applets.html +++ b/src/templates/apps/dashboard/_partials/_applets.html @@ -1,10 +1,11 @@ {% load lyric_extras %} +
- \ No newline at end of file diff --git a/src/templates/apps/dashboard/_partials/_scripts.html b/src/templates/apps/dashboard/_partials/_scripts.html index 7e1f397..76ac717 100644 --- a/src/templates/apps/dashboard/_partials/_scripts.html +++ b/src/templates/apps/dashboard/_partials/_scripts.html @@ -2,6 +2,5 @@ \ No newline at end of file diff --git a/src/templates/apps/dashboard/home.html b/src/templates/apps/dashboard/home.html index 7484d10..80d5352 100644 --- a/src/templates/apps/dashboard/home.html +++ b/src/templates/apps/dashboard/home.html @@ -11,9 +11,7 @@ {% block content %} {% if user.is_authenticated %}
- + {% include "apps/applets/_partials/_gear.html" with menu_id="id_dash_applet_menu" %} {% include "apps/dashboard/_partials/_applets.html" %}
{% endif %} diff --git a/src/templates/apps/gameboard/_partials/_applet-game-kit.html b/src/templates/apps/gameboard/_partials/_applet-game-kit.html new file mode 100644 index 0000000..b5c08a6 --- /dev/null +++ b/src/templates/apps/gameboard/_partials/_applet-game-kit.html @@ -0,0 +1,27 @@ +
+ + +
\ No newline at end of file diff --git a/src/templates/apps/gameboard/_partials/_applet-my-games.html b/src/templates/apps/gameboard/_partials/_applet-my-games.html new file mode 100644 index 0000000..67c1aac --- /dev/null +++ b/src/templates/apps/gameboard/_partials/_applet-my-games.html @@ -0,0 +1,9 @@ +
+

My Games

+
    + [feature forthcoming] +
+
\ No newline at end of file diff --git a/src/templates/apps/gameboard/_partials/_applet-new-game.html b/src/templates/apps/gameboard/_partials/_applet-new-game.html new file mode 100644 index 0000000..297f00b --- /dev/null +++ b/src/templates/apps/gameboard/_partials/_applet-new-game.html @@ -0,0 +1,9 @@ +
+

New Game

+
    + [feature forthcoming] +
+
\ No newline at end of file diff --git a/src/templates/apps/gameboard/_partials/_applets.html b/src/templates/apps/gameboard/_partials/_applets.html new file mode 100644 index 0000000..f100c8a --- /dev/null +++ b/src/templates/apps/gameboard/_partials/_applets.html @@ -0,0 +1,27 @@ +
+ + {% include "apps/applets/_partials/_applets.html" %} +
\ No newline at end of file diff --git a/src/templates/apps/gameboard/gameboard.html b/src/templates/apps/gameboard/gameboard.html index 0397fe7..e96b5d6 100644 --- a/src/templates/apps/gameboard/gameboard.html +++ b/src/templates/apps/gameboard/gameboard.html @@ -5,36 +5,7 @@ {% block content %}
-
-

My Games

-
- -
-

New Game

-
- -
- - + {% include "apps/applets/_partials/_gear.html" with menu_id="id_game_applet_menu" %} + {% include "apps/gameboard/_partials/_applets.html" %}
{% endblock content %} \ No newline at end of file diff --git a/src/templates/core/base.html b/src/templates/core/base.html index da9083b..007267a 100644 --- a/src/templates/core/base.html +++ b/src/templates/core/base.html @@ -53,6 +53,7 @@ {% block scripts %} {% endblock scripts %} +