Skip to content

OS switcher tabs updates #1002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skyfallwastaken merged 8 commits into from
Feb 25, 2026
Merged

OS switcher tabs updates #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9853da0
Add OS switcher tabs to WakatimeSetup page
skyfallwastaken Feb 25, 2026
7e99e8a
Add system test for WakatimeSetup OS switcher tabs
skyfallwastaken Feb 25, 2026
372917c
Extract repeated tab classes into tabClass helper
skyfallwastaken Feb 25, 2026
151feb8
Remove Xcode reference from setup subtitle
skyfallwastaken Feb 25, 2026
d16e221
Show Xcode in subtitle only on macOS/Linux tab
skyfallwastaken Feb 25, 2026
51ac36f
pf
skyfallwastaken Feb 25, 2026
e6175bf
Merge branch 'main' into setup-os-switcher-tabs
skyfallwastaken Feb 25, 2026
7d67b96
Update test/system/wakatime_setup_test.rb
skyfallwastaken Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions app/javascript/pages/WakatimeSetup/Index.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@

let activeSection = $state(setup_os === "windows" ? "windows" : "mac-linux");
let isWindows = setup_os === "windows";

const tabBase =
"flex-1 px-4 py-2 rounded-lg text-sm font-medium transition-all duration-300 ease-[cubic-bezier(0.16,1,0.3,1)]";
const tabActive = "bg-darkless text-surface-content shadow-sm";
const tabInactive = "text-secondary hover:text-surface-content";
function tabClass(section: string) {
return `${tabBase} ${activeSection === section ? tabActive : tabInactive}`;
}

let hasHeartbeat = $state(false);
let heartbeatTimeAgo = $state("");
let checkCount = $state(0);
Expand All @@ -33,8 +42,11 @@
];

const sharedTitle = "Configure Hackatime";
const sharedSubtitle =
const macLinuxSubtitle =
"This creates your config file and validates your API key. And if you're using VS Code, a JetBrains IDE, Zed, or Xcode, we'll even set up the plugins for you!";
const windowsSubtitle =
"This creates your config file and validates your API key. And if you're using VS Code, a JetBrains IDE, or Zed, we'll even set up the plugins for you!";
const advancedSubtitle = macLinuxSubtitle;

function showSuccess(timeAgo: string) {
hasHeartbeat = true;
Expand Down Expand Up @@ -123,28 +135,19 @@

<div class="flex gap-1 p-1 bg-darker border border-darkless rounded-xl">
<button
class="flex-1 px-4 py-2 rounded-lg text-sm font-medium transition-all duration-300 ease-[cubic-bezier(0.16,1,0.3,1)] {activeSection ===
'mac-linux'
? 'bg-darkless text-surface-content shadow-sm'
: 'text-secondary hover:text-surface-content'}"
class={tabClass("mac-linux")}
onclick={() => (activeSection = "mac-linux")}
>
macOS / Linux{isWindows ? " / WSL" : ""} / Codespaces
</button>
<button
class="flex-1 px-4 py-2 rounded-lg text-sm font-medium transition-all duration-300 ease-[cubic-bezier(0.16,1,0.3,1)] {activeSection ===
'windows'
? 'bg-darkless text-surface-content shadow-sm'
: 'text-secondary hover:text-surface-content'}"
class={tabClass("windows")}
onclick={() => (activeSection = "windows")}
>
Windows
</button>
<button
class="flex-1 px-4 py-2 rounded-lg text-sm font-medium transition-all duration-300 ease-[cubic-bezier(0.16,1,0.3,1)] {activeSection ===
'advanced'
? 'bg-darkless text-surface-content shadow-sm'
: 'text-secondary hover:text-surface-content'}"
class={tabClass("advanced")}
onclick={() => (activeSection = "advanced")}
>
Advanced
Expand All @@ -155,7 +158,7 @@
<div class="bg-dark border border-darkless rounded-xl p-8 shadow-sm">
<div class="mb-6">
<h3 class="text-xl font-semibold mb-2">{sharedTitle}</h3>
<p class="text-secondary text-sm">{sharedSubtitle}</p>
<p class="text-secondary text-sm">{macLinuxSubtitle}</p>
</div>

<div
Expand Down Expand Up @@ -267,7 +270,7 @@
<div class="bg-dark border border-darkless rounded-xl p-8 shadow-sm">
<div class="mb-6">
<h3 class="text-xl font-semibold mb-2">{sharedTitle}</h3>
<p class="text-secondary text-sm">{sharedSubtitle}</p>
<p class="text-secondary text-sm">{windowsSubtitle}</p>
</div>

<div class="space-y-4">
Expand Down Expand Up @@ -355,7 +358,7 @@
<div class="bg-dark border border-darkless rounded-xl p-8 shadow-sm">
<div class="mb-6">
<h3 class="text-xl font-semibold mb-2">{sharedTitle}</h3>
<p class="text-secondary text-sm">{sharedSubtitle}</p>
<p class="text-secondary text-sm">{advancedSubtitle}</p>
</div>

<div class="bg-purple/10 border border-purple/20 rounded-lg p-4 mb-4">
Expand Down
30 changes: 30 additions & 0 deletions test/system/wakatime_setup_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
require "application_system_test_case"

class WakatimeSetupTest < ApplicationSystemTestCase
setup do
@user = User.create!(timezone: "UTC")
sign_in_as(@user)
end

test "shows OS switcher tabs and can switch between them" do
visit my_wakatime_setup_path

# Default tab should be macOS / Linux / Codespaces (non-Windows user agent)
assert_text "Configure Hackatime"
assert_text "curl -fsSL"

# Switch to Windows tab
click_on "Windows"
assert_text "Open PowerShell"
assert_text "install.ps1"

# Switch to Advanced tab
click_on "Advanced"
assert_text "~/.wakatime.cfg"
assert_text "api_url"

# Switch back to macOS / Linux tab
click_on "macOS / Linux / Codespaces"
assert_text "curl -fsSL"
end
end