Skip to content

Commit 7f27d68

Browse files
adamintCopilot
andcommitted
Fix remaining design issues: sidebar dots, gallery toggles, leaderboard filter
- Sidebar: add colored dots to What's New (orange) and Learning Tracks (purple) - Gallery: remove pixel font from Show less/more toggles for readability - Leaderboard: filter out E2E test users (auto-generated underscore+hex usernames) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 7b1b9ae commit 7f27d68

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

AspireAcademy.Api/Endpoints/SocialEndpoints.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,9 @@ private static async Task<IResult> GetDbLeaderboard(Guid? userId, string scope,
474474
var isWeekly = scope == "weekly";
475475

476476
var query = db.UserXp
477-
.Join(db.Users, x => x.UserId, u => u.Id, (x, u) => new { u, x });
477+
.Join(db.Users.Where(u => !u.IsDeleted), x => x.UserId, u => u.Id, (x, u) => new { u, x })
478+
// Exclude E2E test users (auto-generated usernames with underscore + hex suffix)
479+
.Where(ux => !ux.u.Username.Contains("_") || ux.u.Username == "admin" || ux.u.Username.Length < 15);
478480

479481
var orderedQuery = isWeekly
480482
? query.OrderByDescending(ux => ux.x.WeeklyXp)

AspireAcademy.Web/src/components/layout/Sidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,10 @@ export function Sidebar({ open, onClose }: SidebarProps) {
288288
<SideNavLink to="/weekly-challenge" icon={<Flex align="center" gap="0"><Box w="6px" h="6px" borderRadius="full" bg="#FB7185" mr="2" flexShrink={0} /><FiTarget size={16} /></Flex>} onClose={onClose}>
289289
Weekly Challenge
290290
</SideNavLink>
291-
<SideNavLink to="/whats-new" icon={<FiStar size={16} />} onClose={onClose}>
291+
<SideNavLink to="/whats-new" icon={<Flex align="center" gap="0"><Box w="6px" h="6px" borderRadius="full" bg="#FB923C" mr="2" flexShrink={0} /><FiStar size={16} /></Flex>} onClose={onClose}>
292292
What's New
293293
</SideNavLink>
294-
<SideNavLink to="/personas" icon={<FiCompass size={16} />} onClose={onClose}>
294+
<SideNavLink to="/personas" icon={<Flex align="center" gap="0"><Box w="6px" h="6px" borderRadius="full" bg="#A78BFA" mr="2" flexShrink={0} /><FiCompass size={16} /></Flex>} onClose={onClose}>
295295
Learning Tracks
296296
</SideNavLink>
297297
</Box>

AspireAcademy.Web/src/pages/GalleryPage.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,6 @@ function GalleryDetail({
905905
minW="auto"
906906
_hover={{ color: 'aspire.500' }}
907907
onClick={() => setShowFullOverview((v) => !v)}
908-
{...pixelFontProps}
909908
>
910909
{showFullOverview ? 'Show less ▲' : 'Show more ▼'}
911910
</Button>
@@ -949,7 +948,6 @@ function GalleryDetail({
949948
verticalAlign="baseline"
950949
_hover={{ color: 'aspire.500' }}
951950
onClick={() => setShowFullWhyAspire((v) => !v)}
952-
{...pixelFontProps}
953951
>
954952
{showFullWhyAspire ? 'less' : 'more'}
955953
</Button>

0 commit comments

Comments
 (0)