From 6131c75ae1bfed528f01364b97ece542177e61a5 Mon Sep 17 00:00:00 2001 From: Mat Manna Date: Sun, 5 Apr 2026 22:43:49 -0400 Subject: [PATCH 1/6] feat: show username in sidebar --- app/controllers/inertia_controller.rb | 1 + app/javascript/layouts/AppLayout.svelte | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/controllers/inertia_controller.rb b/app/controllers/inertia_controller.rb index 10c85ce00..ca2f9cd28 100644 --- a/app/controllers/inertia_controller.rb +++ b/app/controllers/inertia_controller.rb @@ -135,6 +135,7 @@ def inertia_nav_current_user { display_name: current_user.display_name, + username: current_user.username, avatar_url: current_user.avatar_url, title: FlavorText.same_user.sample, country_code: current_user.country_code, diff --git a/app/javascript/layouts/AppLayout.svelte b/app/javascript/layouts/AppLayout.svelte index fdba2c701..1e585e2e3 100644 --- a/app/javascript/layouts/AppLayout.svelte +++ b/app/javascript/layouts/AppLayout.svelte @@ -21,6 +21,7 @@ type NavCurrentUser = { display_name: string; + username?: string | null; avatar_url?: string | null; title: string; country_code?: string | null; @@ -308,9 +309,21 @@ loading="lazy" /> {/if} - - {layout.nav.current_user.display_name} - +
+ + {layout.nav.current_user.display_name} + + {#if layout.nav.current_user.username} + + @{layout.nav.current_user.username} + + {/if} +
{#if layout.nav.current_user.country_code} Date: Sun, 5 Apr 2026 23:00:24 -0400 Subject: [PATCH 2/6] fix: profile link --- app/controllers/settings/base_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb index 8b0ba8ee3..bd5e527fc 100644 --- a/app/controllers/settings/base_controller.rb +++ b/app/controllers/settings/base_controller.rb @@ -161,7 +161,7 @@ def badges_props project_badge_url: work_time_stats_url, project_badge_base_url: work_time_stats_base_url, projects: project_list, - profile_url: (@user.username.present? ? "https://hackati.me/#{@user.username}" : nil), + profile_url: (@user.username.present? ? "https://hackati.me/@#{@user.username}" : nil), markscribe_template: '{{ wakatimeDoubleCategoryBar "Languages:" wakatimeData.Languages "Projects:" wakatimeData.Projects 5 }}', markscribe_reference_url: "https://github.com/taciturnaxolotl/markscribe#your-wakatime-languages-formated-as-a-bar", markscribe_preview_image_url: "https://cdn.fluff.pw/slackcdn/524e293aa09bc5f9115c0c29c18fb4bc.png", From 7755c3435871a587f6ca6b40be2fe455945dd282 Mon Sep 17 00:00:00 2001 From: Mat Manna Date: Sun, 5 Apr 2026 23:05:11 -0400 Subject: [PATCH 3/6] fix: hackati.me links are dumb --- app/controllers/settings/base_controller.rb | 2 +- app/javascript/layouts/AppLayout.svelte | 2 +- test/controllers/settings_profile_controller_test.rb | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb index bd5e527fc..8b0ba8ee3 100644 --- a/app/controllers/settings/base_controller.rb +++ b/app/controllers/settings/base_controller.rb @@ -161,7 +161,7 @@ def badges_props project_badge_url: work_time_stats_url, project_badge_base_url: work_time_stats_base_url, projects: project_list, - profile_url: (@user.username.present? ? "https://hackati.me/@#{@user.username}" : nil), + profile_url: (@user.username.present? ? "https://hackati.me/#{@user.username}" : nil), markscribe_template: '{{ wakatimeDoubleCategoryBar "Languages:" wakatimeData.Languages "Projects:" wakatimeData.Projects 5 }}', markscribe_reference_url: "https://github.com/taciturnaxolotl/markscribe#your-wakatime-languages-formated-as-a-bar", markscribe_preview_image_url: "https://cdn.fluff.pw/slackcdn/524e293aa09bc5f9115c0c29c18fb4bc.png", diff --git a/app/javascript/layouts/AppLayout.svelte b/app/javascript/layouts/AppLayout.svelte index 1e585e2e3..6cf007a3f 100644 --- a/app/javascript/layouts/AppLayout.svelte +++ b/app/javascript/layouts/AppLayout.svelte @@ -315,7 +315,7 @@ {#if layout.nav.current_user.username} Date: Sun, 5 Apr 2026 23:05:57 -0400 Subject: [PATCH 4/6] fix: actually scratch that just use hackatime.hackclub.com/@ --- app/controllers/settings/base_controller.rb | 2 +- app/javascript/layouts/AppLayout.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb index 8b0ba8ee3..76cce57fe 100644 --- a/app/controllers/settings/base_controller.rb +++ b/app/controllers/settings/base_controller.rb @@ -161,7 +161,7 @@ def badges_props project_badge_url: work_time_stats_url, project_badge_base_url: work_time_stats_base_url, projects: project_list, - profile_url: (@user.username.present? ? "https://hackati.me/#{@user.username}" : nil), + profile_url: (@user.username.present? ? "https://hackatime.hackclub.com/@#{@user.username}" : nil), markscribe_template: '{{ wakatimeDoubleCategoryBar "Languages:" wakatimeData.Languages "Projects:" wakatimeData.Projects 5 }}', markscribe_reference_url: "https://github.com/taciturnaxolotl/markscribe#your-wakatime-languages-formated-as-a-bar", markscribe_preview_image_url: "https://cdn.fluff.pw/slackcdn/524e293aa09bc5f9115c0c29c18fb4bc.png", diff --git a/app/javascript/layouts/AppLayout.svelte b/app/javascript/layouts/AppLayout.svelte index 6cf007a3f..eb6af2388 100644 --- a/app/javascript/layouts/AppLayout.svelte +++ b/app/javascript/layouts/AppLayout.svelte @@ -315,7 +315,7 @@ {#if layout.nav.current_user.username} Date: Wed, 27 May 2026 22:29:46 -0400 Subject: [PATCH 5/6] feat: user tag transition +profile link in usersummary Co-authored-by: Copilot --- app/javascript/layouts/app/UserSummary.svelte | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/app/javascript/layouts/app/UserSummary.svelte b/app/javascript/layouts/app/UserSummary.svelte index f3768a3f1..15171190c 100644 --- a/app/javascript/layouts/app/UserSummary.svelte +++ b/app/javascript/layouts/app/UserSummary.svelte @@ -1,5 +1,7 @@