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-<applet-name>.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
This commit is contained in:
23
src/apps/applets/static/apps/scripts/applets.js
Normal file
23
src/apps/applets/static/apps/scripts/applets.js
Normal file
@@ -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);
|
||||
@@ -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)
|
||||
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"])
|
||||
|
||||
11
src/apps/applets/utils.py
Normal file
11
src/apps/applets/utils.py
Normal file
@@ -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
|
||||
]
|
||||
@@ -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';
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -5,5 +5,6 @@ from . import views
|
||||
|
||||
urlpatterns = [
|
||||
path('', views.gameboard, name='gameboard'),
|
||||
path('toggle-applets', views.toggle_game_applets, name='toggle_game_applets'),
|
||||
]
|
||||
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user