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
|
||||
]
|
||||
Reference in New Issue
Block a user