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:
@@ -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),
|
||||
|
||||
Reference in New Issue
Block a user