styling & subsequent testing bugs fixed across apps.dash.tests.ITs.test_views, functional_tests.test_dashboard,_dashboard.scss & apps/dash/_partials/_applets.html
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
Disco DeDisco
2026-03-06 22:31:10 -05:00
parent 4c502e40f8
commit 02d0adef78
4 changed files with 83 additions and 36 deletions

View File

@@ -269,15 +269,17 @@ class ViewAuthListTest(TestCase):
response = self.client.get(reverse("view_list", args=[self.our_list.id])) response = self.client.get(reverse("view_list", args=[self.our_list.id]))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
@override_settings(COMPRESS_ENABLED=False)
class SetPaletteTest(TestCase): class SetPaletteTest(TestCase):
def setUp(self): def setUp(self):
self.user = User.objects.create(email="a@b.cde") self.user = User.objects.create(email="a@b.cde")
self.client.force_login(self.user) self.client.force_login(self.user)
self.url = reverse("home") self.url = reverse("home")
Applet.objects.get_or_create(slug="palette", defaults={"name": "Palette"})
def test_anonymous_user_is_redirected_home(self): def test_anonymous_user_is_redirected_home(self):
response = self.client.post("/dashboard/set_palette") response = self.client.post("/dashboard/set_palette")
self.assertRedirects(response, "/") self.assertRedirects(response, "/", fetch_redirect_response=False)
def test_set_palette_updates_user_palette(self): def test_set_palette_updates_user_palette(self):
User.objects.filter(pk=self.user.pk).update(palette="palette-sheol") User.objects.filter(pk=self.user.pk).update(palette="palette-sheol")
@@ -289,11 +291,11 @@ class SetPaletteTest(TestCase):
response = self.client.post("/dashboard/set_palette", data={"palette": "palette-nirvana"}) response = self.client.post("/dashboard/set_palette", data={"palette": "palette-nirvana"})
self.user.refresh_from_db() self.user.refresh_from_db()
self.assertEqual(self.user.palette, "palette-default") self.assertEqual(self.user.palette, "palette-default")
self.assertRedirects(response, "/") self.assertRedirects(response, "/", fetch_redirect_response=False)
def test_set_palette_redirects_home(self): def test_set_palette_redirects_home(self):
response = self.client.post("/dashboard/set_palette", data={"palette": "palette-default"}) response = self.client.post("/dashboard/set_palette", data={"palette": "palette-default"})
self.assertRedirects(response, "/") self.assertRedirects(response, "/", fetch_redirect_response=False)
def test_my_lists_contains_set_palette_form(self): def test_my_lists_contains_set_palette_form(self):
response = self.client.get(self.url) response = self.client.get(self.url)
@@ -322,6 +324,7 @@ class SetPaletteTest(TestCase):
swatches = parsed.cssselect(".swatch") swatches = parsed.cssselect(".swatch")
self.assertEqual(len(swatches), len(response.context["palettes"])) self.assertEqual(len(swatches), len(response.context["palettes"]))
@override_settings(COMPRESS_ENABLED=False)
class ProfileViewTest(TestCase): class ProfileViewTest(TestCase):
def setUp(self): def setUp(self):
self.user = User.objects.create(email="discoman@example.com") self.user = User.objects.create(email="discoman@example.com")
@@ -335,22 +338,21 @@ class ProfileViewTest(TestCase):
def test_post_username_requires_login(self): def test_post_username_requires_login(self):
self.client.logout() self.client.logout()
response = self.client.post("/dashboard/set_profile", data={"username": "somnambulist"}) response = self.client.post("/dashboard/set_profile", data={"username": "somnambulist"})
self.assertRedirects(response, "/?next=/dashboard/set_profile") self.assertRedirects(response, "/?next=/dashboard/set_profile", fetch_redirect_response=False)
def test_dash_renders_username_applet(self): def test_dash_renders_username_applet(self):
response = self.client.get("/") response = self.client.get("/")
parsed = lxml.html.fromstring(response.content) parsed = lxml.html.fromstring(response.content)
[applet] = parsed.cssselect("#id_applet_username") [applet] = parsed.cssselect("#id_applet_username")
self.assertIn("di…an@e…e.com", applet.text_content()) self.assertIn("@", applet.text_content())
[_] = parsed.cssselect("#id_new_username") [input_el] = parsed.cssselect("#id_new_username")
self.assertEqual("", input_el.get("value"))
def test_dash_shows_display_name_in_applet(self): def test_dash_shows_display_name_in_applet(self):
self.user.username = "discoman" self.user.username = "discoman"
self.user.save() self.user.save()
response = self.client.get("/") response = self.client.get("/")
parsed = lxml.html.fromstring(response.content) parsed = lxml.html.fromstring(response.content)
[applet] = parsed.cssselect("#id_applet_username")
self.assertIn("discoman", applet.text_content())
[username_input] = parsed.cssselect("#id_new_username") [username_input] = parsed.cssselect("#id_new_username")
self.assertEqual("discoman", username_input.get("value")) self.assertEqual("discoman", username_input.get("value"))

View File

@@ -19,10 +19,10 @@ class DashboardMaintenanceTest(FunctionalTest):
self.browser.get(self.live_server_url) self.browser.get(self.live_server_url)
# 3. Find the username applet on the page; look for a <section> or <div> with id="id_username_applet" # 3. Find the username applet on the page; look for a <section> or <div> with id="id_username_applet"
self.browser.find_element(By.ID, "id_applet_username") self.browser.find_element(By.ID, "id_applet_username")
# 4. Assert it shows the current display name (truncated email: di…an@e…e.com)
self.assertIn("di…an@e…e.com", self.browser.find_element(By.ID, "id_applet_username").text)
# 5. Find the username input field inside the applet & type a username # 5. Find the username input field inside the applet & type a username
username_input = self.browser.find_element(By.CSS_SELECTOR, "#id_new_username") username_input = self.browser.find_element(By.CSS_SELECTOR, "#id_new_username")
# 4. Assert it shows the current display name (truncated email: di…an@e…e.com) NOPE the username value itself now
self.assertEqual("", username_input.get_attribute("value"))
# 6. Type a username, e.g., discoman # 6. Type a username, e.g., discoman
username_input.send_keys("discoman") username_input.send_keys("discoman")
self.wait_for( self.wait_for(

View File

@@ -57,7 +57,7 @@ body.page-dashboard {
overflow-y: auto; overflow-y: auto;
display: grid; display: grid;
grid-template-columns: repeat(12, 1fr); grid-template-columns: repeat(12, 1fr);
grid-auto-rows: calc((100cqw - 11 * var(--grid-gap)) / 12); grid-auto-rows: 3rem;
gap: var(--grid-gap); gap: var(--grid-gap);
padding: 0.75rem; padding: 0.75rem;
@@ -69,6 +69,50 @@ body.page-dashboard {
grid-column: span var(--applet-cols, 12); grid-column: span var(--applet-cols, 12);
grid-row: span var(--applet-rows, 3); grid-row: span var(--applet-rows, 3);
} }
#id_applet_palette {
padding: 0;
border-color: rgba(var(--secUser), 1);
.palette-scroll {
display: flex;
gap: 0.5rem;
overflow-x: auto;
padding: 1rem;
height: 100%;
scrollbar-width: none;
&::-webkit-scrollbar { display: none; }
}
}
#id_applet_username {
display: flex;
align-items: center;
.username-field {
display: flex;
align-items: baseline;
gap: 0.1em;
.username-at{
user-select: none;
pointer-events: none;
}
input {
background: transparent;
border: none;
outline: none;
font-size: 1.8rem;
font-weight: bold;
color: rgba(var(--secUser), 0.875);;
font-family: inherit;
padding: 0;
width: auto;
}
}
}
} }
@media (max-height: 500px) { @media (max-height: 500px) {

View File

@@ -54,19 +54,18 @@
id="id_applet_username" id="id_applet_username"
style="--applet-cols: {{ entry.applet.grid_cols }}; --applet-rows: {{ entry.applet.grid_rows }};" style="--applet-cols: {{ entry.applet.grid_cols }}; --applet-rows: {{ entry.applet.grid_rows }};"
> >
<h1>{{ user|display_name }}</h1>
<div class="form-container">
<form method="POST" action="{% url "set_profile" %}"> <form method="POST" action="{% url "set_profile" %}">
{% csrf_token %} {% csrf_token %}
<div class="username-field">
<span class="username-at">@</span>
<input <input
id="id_new_username" id="id_new_username"
name="username" name="username"
class="form-control"
required required
value="{{ user.username|default:'' }}" value="{{ user.username|default:'' }}"
> >
</form>
</div> </div>
</form>
</section> </section>
{% elif entry.applet.slug == "palette" %} {% elif entry.applet.slug == "palette" %}
<section <section
@@ -74,6 +73,7 @@
class="palette" class="palette"
style="--applet-cols: {{ entry.applet.grid_cols }}; --applet-rows: {{ entry.applet.grid_rows }};" style="--applet-cols: {{ entry.applet.grid_cols }}; --applet-rows: {{ entry.applet.grid_rows }};"
> >
<div class="palette-scroll">
{% for palette in palettes %} {% for palette in palettes %}
<div class="palette-item"> <div class="palette-item">
<div class="swatch {{ palette.name }}{% if user_palette == palette.name %} active{% endif %}{% if palette.locked %} locked{% endif %}"></div> <div class="swatch {{ palette.name }}{% if user_palette == palette.name %} active{% endif %}{% if palette.locked %} locked{% endif %}"></div>
@@ -87,6 +87,7 @@
{% endif %} {% endif %}
</div> </div>
{% endfor %} {% endfor %}
</div>
</section> </section>
{% endif %} {% endif %}
{% endif %} {% endif %}