From 8d00418059499567df582ea55bb0470201ad813f Mon Sep 17 00:00:00 2001
From: Mahad Kalam <55807755+skyfallwastaken@users.noreply.github.com>
Date: Sun, 15 Mar 2026 15:26:32 +0000
Subject: [PATCH] Spring cleaning (#1074)

* fix: use owner/repo format for project badges

Updates badge URLs to use GitHub-style owner/repo format (e.g., "hackclub/hackatime")
instead of project names. This ensures compatibility with external badge services that
expect repository paths.

Changes:
- Add Repository#full_path method to get owner/repo format
- Update settings controller to pass both display names and repo paths
- Update Badges component to display project names but use repo paths in URLs

* fix: improve user lookup in API v1 stats endpoint

Use the robust lookup_user method for username parameter in the /api/v1/stats endpoint
to ensure consistent user lookup across all API endpoints. This properly handles Slack
UIDs (HCA IDs), numeric user IDs, and usernames in the correct priority order.

* fix: reduce clutter on new user homepage

Simplify the new user experience by:
- Removing redundant "Hello friend" text from setup notice (header already provides context)
- Hiding GitHub link banner when setup notice is shown to focus user on primary action

This reduces visual clutter and helps new users focus on completing setup first.

* fix: enable full app layout for new OAuth application page

Remove layout=false directive that was preventing the app header and navigation
from appearing on the new OAuth application creation page.

* fix: add antigravity editor to docs

Add documentation for Antigravity, a VSCode fork from Google with built-in AI
features. Includes setup instructions for tracking time with Hackatime using the
WakaTime extension.

* fix: improve stat card subtitle positioning

Remove absolute positioning from subtitle text to allow it to flow naturally after
the main value. This prevents the subtitle from being pushed to the bottom when
other cards have longer content.

* fix: align settings action buttons to card end on larger screens

Remove width constraint from footer to allow action buttons to align to the right
edge of the full card width instead of being constrained to a narrower container.

* fix: improve heartbeat importer visibility on light themes

Update import provider cards and radio buttons to have better contrast on light themes:
- Use bg-surface-100 instead of bg-darker for better card visibility
- Increase radio button border thickness and use darker border color
- Add hover and focus states for better interactivity

* Split up settings controller + perf + goal display

* Make stat card subtitles larger

* Fix AG + VS Code

* Remove Shiba refs

* Bundle update
---
 .claude/settings.json                         |   8 +
 CLAUDE.md                                     |   1 +
 Gemfile.lock                                  |  22 +-
 .../api/hackatime/v1/hackatime_controller.rb  |  29 +-
 app/controllers/api/v1/stats_controller.rb    |   2 +-
 app/controllers/docs_controller.rb            |   4 +-
 app/controllers/settings/access_controller.rb |  18 +
 app/controllers/settings/badges_controller.rb |   9 +
 app/controllers/settings/base_controller.rb   | 299 ++++++--------
 app/controllers/settings/data_controller.rb   |  28 ++
 app/controllers/settings/goals_controller.rb  |  17 +-
 .../settings/integrations_controller.rb       |  37 ++
 .../settings/notifications_controller.rb      |   7 +
 .../settings/profile_controller.rb            |  10 +
 app/javascript/pages/Home/SignedIn.svelte     |   4 +-
 .../pages/Home/signedIn/SetupNotice.svelte    |   4 -
 .../pages/Home/signedIn/StatCard.svelte       |   6 +-
 .../pages/OAuthApplications/New.svelte        |   4 -
 .../pages/Users/Settings/Badges.svelte        |  16 +-
 .../pages/Users/Settings/Data.svelte          | 386 +++++++++---------
 .../Settings/components/SectionCard.svelte    |   6 +-
 app/javascript/pages/Users/Settings/types.ts  |   4 +-
 app/models/repository.rb                      |   5 +
 docs/editors/antigravity.md                   |  12 +
 docs/editors/godot.md                         |  16 +-
 docs/editors/vs-code.md                       |  11 +-
 .../images/editor-icons/antigravity-128.png   | Bin 0 -> 20190 bytes
 .../api/hackatime/v1/compatibility_spec.rb    |  12 +-
 swagger/v1/swagger.yaml                       |  18 +-
 29 files changed, 574 insertions(+), 421 deletions(-)
 create mode 100644 .claude/settings.json
 create mode 100644 CLAUDE.md
 create mode 100644 docs/editors/antigravity.md
 create mode 100644 public/images/editor-icons/antigravity-128.png

diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 0000000..d0bc87b
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,8 @@
+{
+  "includeCoAuthoredBy": false,
+  "gitAttribution": false,
+  "attribution": {
+    "commits": false,
+    "pullRequests": false
+  }
+}
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..8d770e2
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1 @@
+Read @AGENTS.md
diff --git a/Gemfile.lock b/Gemfile.lock
index d314c66..669bba5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
     ast (2.4.3)
     autotuner (1.1.0)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1225.0)
+    aws-partitions (1.1226.0)
     aws-sdk-core (3.243.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -337,7 +337,7 @@ GEM
       net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.5.1)
       net-protocol
-    net-ssh (7.3.0)
+    net-ssh (7.3.1)
     nio4r (2.7.5)
     nokogiri (1.19.1-aarch64-linux-gnu)
       racc (~> 1.4)
@@ -357,7 +357,7 @@ GEM
       faraday (>= 1.0, < 3.0)
       faraday-net_http_persistent
       net-http-persistent
-    oj (3.16.15)
+    oj (3.16.16)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     ostruct (0.6.3)
@@ -548,8 +548,8 @@ GEM
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       logger
-    skylight (7.0.0)
-      activesupport (>= 7.1.0)
+    skylight (7.1.0)
+      activesupport (>= 7.2.0)
     slack-ruby-client (3.1.0)
       faraday (>= 2.0.1)
       faraday-mashify
@@ -588,12 +588,12 @@ GEM
     tailwindcss-rails (4.4.0)
       railties (>= 7.0.0)
       tailwindcss-ruby (~> 4.0)
-    tailwindcss-ruby (4.2.0)
-    tailwindcss-ruby (4.2.0-aarch64-linux-gnu)
-    tailwindcss-ruby (4.2.0-aarch64-linux-musl)
-    tailwindcss-ruby (4.2.0-arm64-darwin)
-    tailwindcss-ruby (4.2.0-x86_64-linux-gnu)
-    tailwindcss-ruby (4.2.0-x86_64-linux-musl)
+    tailwindcss-ruby (4.2.1)
+    tailwindcss-ruby (4.2.1-aarch64-linux-gnu)
+    tailwindcss-ruby (4.2.1-aarch64-linux-musl)
+    tailwindcss-ruby (4.2.1-arm64-darwin)
+    tailwindcss-ruby (4.2.1-x86_64-linux-gnu)
+    tailwindcss-ruby (4.2.1-x86_64-linux-musl)
     thor (1.5.0)
     thruster (0.1.19)
     thruster (0.1.19-aarch64-linux)
diff --git a/app/controllers/api/hackatime/v1/hackatime_controller.rb b/app/controllers/api/hackatime/v1/hackatime_controller.rb
index e138f55..6070219 100644
--- a/app/controllers/api/hackatime/v1/hackatime_controller.rb
+++ b/app/controllers/api/hackatime/v1/hackatime_controller.rb
@@ -46,14 +46,39 @@ class Api::Hackatime::V1::HackatimeController < ApplicationController
   def status_bar_today
     Time.use_zone(@user.timezone) do
       hbt = @user.heartbeats.today
+      total_seconds = hbt.duration_seconds
+
+      # Check if user has a daily goal
+      daily_goal = @user.goals.find_by(period: "day")
+
       result = {
         data: {
           grand_total: {
-            text: @user.format_extension_text(hbt.duration_seconds),
-            total_seconds: hbt.duration_seconds
+            text: @user.format_extension_text(total_seconds),
+            total_seconds: total_seconds
           }
         }
       }
+
+      # Include goal information if daily goal exists
+      if daily_goal
+        goal_progress = ProgrammingGoalsProgressService.new(user: @user, goals: [ daily_goal ]).call.first
+
+        if goal_progress
+          # Append goal progress to the user's preferred text format
+          user_text = result[:data][:grand_total][:text]
+          goal_text = ApplicationController.helpers.short_time_simple(daily_goal.target_seconds)
+
+          result[:data][:grand_total][:text] = "#{user_text} / #{goal_text} today"
+          result[:data][:goal] = {
+            target_seconds: daily_goal.target_seconds,
+            tracked_seconds: goal_progress[:tracked_seconds],
+            completion_percent: goal_progress[:completion_percent],
+            complete: goal_progress[:complete]
+          }
+        end
+      end
+
       render json: result
     end
   end
diff --git a/app/controllers/api/v1/stats_controller.rb b/app/controllers/api/v1/stats_controller.rb
index 5d870b3..531216b 100644
--- a/app/controllers/api/v1/stats_controller.rb
+++ b/app/controllers/api/v1/stats_controller.rb
@@ -12,7 +12,7 @@ class Api::V1::StatsController < ApplicationController
 
     query = Heartbeat.where(time: start_date..end_date)
     if params[:username].present?
-      user = User.find_by(username: params[:username]) || User.find_by(slack_uid: params[:username])
+      user = lookup_user(params[:username])
       return render json: { error: "User not found" }, status: :not_found unless user
 
       query = query.where(user_id: user.id)
diff --git a/app/controllers/docs_controller.rb b/app/controllers/docs_controller.rb
index 36399d8..3ade01b 100644
--- a/app/controllers/docs_controller.rb
+++ b/app/controllers/docs_controller.rb
@@ -11,8 +11,8 @@ class DocsController < InertiaController
   ].freeze
 
   ALL_EDITORS = [
-    [ "Android Studio", "android-studio" ], [ "AppCode", "appcode" ], [ "Aptana", "aptana" ],
-    [ "Arduino IDE", "arduino-ide" ], [ "Azure Data Studio", "azure-data-studio" ],
+    [ "Android Studio", "android-studio" ], [ "Antigravity", "antigravity" ], [ "AppCode", "appcode" ],
+    [ "Aptana", "aptana" ], [ "Arduino IDE", "arduino-ide" ], [ "Azure Data Studio", "azure-data-studio" ],
     [ "Brackets", "brackets" ],
     [ "C++ Builder", "c++-builder" ],
     [ "CLion", "clion" ], [ "Cloud9", "cloud9" ], [ "Coda", "coda" ],
diff --git a/app/controllers/settings/access_controller.rb b/app/controllers/settings/access_controller.rb
index c1d4945..22c6ab4 100644
--- a/app/controllers/settings/access_controller.rb
+++ b/app/controllers/settings/access_controller.rb
@@ -37,6 +37,24 @@ class Settings::AccessController < Settings::BaseController
     )
   end
 
+  def section_props
+    api_key_token = @user.api_keys.last&.token
+
+    {
+      settings_update_path: my_settings_access_path,
+      user: user_props,
+      options: options_props,
+      paths: paths_props,
+      config_file: {
+        content: generated_wakatime_config(api_key_token),
+        has_api_key: api_key_token.present?,
+        empty_message: "No API key is available yet. Rotate your API key to generate one.",
+        api_key: api_key_token,
+        api_url: "https://#{request.host_with_port}/api/hackatime/v1"
+      }
+    }
+  end
+
   def access_params
     params.require(:user).permit(:hackatime_extension_text_type)
   end
diff --git a/app/controllers/settings/badges_controller.rb b/app/controllers/settings/badges_controller.rb
index 74e5c2f..4dca419 100644
--- a/app/controllers/settings/badges_controller.rb
+++ b/app/controllers/settings/badges_controller.rb
@@ -5,4 +5,13 @@ class Settings::BadgesController < Settings::BaseController
       settings_update_path: my_settings_profile_path
     )
   end
+
+  private
+
+  def section_props
+    {
+      options: options_props,
+      badges: badges_props
+    }
+  end
 end
diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb
index b66211e..0348b35 100644
--- a/app/controllers/settings/base_controller.rb
+++ b/app/controllers/settings/base_controller.rb
@@ -6,15 +6,13 @@ class Settings::BaseController < InertiaController
 
   before_action :set_user
   before_action :require_current_user
-  before_action :prepare_settings_page
 
   private
 
-  def render_settings_page(active_section:, settings_update_path:, status: :ok)
-    render inertia: settings_component_for(active_section), props: settings_page_props(
-      active_section: active_section,
-      settings_update_path: settings_update_path
-    ), status: status
+  def render_settings_page(active_section:, settings_update_path:, status: :ok, extra_props: {})
+    render inertia: settings_component_for(active_section), props: common_props(
+      active_section: active_section
+    ).merge(section_props).merge(extra_props), status: status
   end
 
   def settings_component_for(active_section)
@@ -29,45 +27,9 @@ class Settings::BaseController < InertiaController
     }.fetch(active_section.to_s, "Users/Settings/Profile")
   end
 
-  def prepare_settings_page
-    @is_own_settings = is_own_settings?
-    @can_enable_slack_status = @user.slack_access_token.present? && @user.slack_scopes.include?("users.profile:write")
-    @imports_enabled = Flipper.enabled?(:imports, @user)
-    @enabled_sailors_logs = SailorsLogNotificationPreference.where(
-      slack_uid: @user.slack_uid,
-      enabled: true,
-    ).where.not(slack_channel_id: SailorsLog::DEFAULT_CHANNELS)
-
-    @projects = @user.project_repo_mappings.distinct.pluck(:project_name)
-    heartbeat_language_and_projects = @user.heartbeats.distinct.pluck(:language, :project)
-    goal_languages = []
-    goal_projects = @projects.dup
-
-    heartbeat_language_and_projects.each do |language, project|
-      categorized_language = language&.categorize_language
-      goal_languages << categorized_language if categorized_language.present?
-      goal_projects << project if project.present?
-    end
-
-    @goal_selectable_languages = goal_languages.uniq.sort
-    @goal_selectable_projects = goal_projects.uniq.sort
-    @work_time_stats_base_url = @user.slack_uid.present? ? "https://hackatime-badge.hackclub.com/#{@user.slack_uid}/" : nil
-    @work_time_stats_url = if @work_time_stats_base_url.present?
-      "#{@work_time_stats_base_url}#{@projects.first || 'example'}"
-    end
-
-    @general_badge_url = GithubReadmeStats.new(@user.id, "darcula").generate_badge_url
-    @latest_api_key_token = @user.api_keys.last&.token
-    @latest_heartbeat_import = @user.heartbeat_import_runs.latest_first.first
-  end
-
-  def settings_page_props(active_section:, settings_update_path:)
-    if active_section.to_s == "data" && @latest_heartbeat_import.present?
-      @latest_heartbeat_import = HeartbeatImportRunner.refresh_remote_run!(@latest_heartbeat_import)
-    end
-
-    heartbeats_last_7_days = @user.heartbeats.where("time >= ?", 7.days.ago.to_f).count
-    channel_ids = @enabled_sailors_logs.pluck(:slack_channel_id)
+  # Lightweight props shared by every settings page
+  def common_props(active_section:)
+    is_own = is_own_settings?
 
     {
       active_section: active_section,
@@ -80,137 +42,10 @@ class Settings::BaseController < InertiaController
         badges: my_settings_badges_path,
         data: my_settings_data_path
       },
-      page_title: (@is_own_settings ? "My Settings" : "Settings | #{@user.display_name}"),
-      heading: (@is_own_settings ? "Settings" : "Settings for #{@user.display_name}"),
+      page_title: (is_own ? "My Settings" : "Settings | #{@user.display_name}"),
+      heading: (is_own ? "Settings" : "Settings for #{@user.display_name}"),
       subheading: "Manage your profile, integrations, notifications, access, goals, and data tools.",
-      settings_update_path: settings_update_path,
-      create_goal_path: my_settings_goals_create_path,
-      username_max_length: User::USERNAME_MAX_LENGTH,
-      user: {
-        id: @user.id,
-        display_name: @user.display_name,
-        timezone: @user.timezone,
-        country_code: @user.country_code,
-        username: @user.username,
-        theme: @user.theme,
-        uses_slack_status: @user.uses_slack_status,
-        weekly_summary_email_enabled: @user.subscribed?("weekly_summary"),
-        hackatime_extension_text_type: @user.hackatime_extension_text_type,
-        allow_public_stats_lookup: @user.allow_public_stats_lookup,
-        trust_level: @user.trust_level,
-        can_request_deletion: @user.can_request_deletion?,
-        github_uid: @user.github_uid,
-        github_username: @user.github_username,
-        slack_uid: @user.slack_uid,
-        programming_goals: @user.goals.order(:created_at).map { |goal|
-          goal.as_programming_goal_payload.merge(
-            update_path: my_settings_goal_update_path(goal),
-            destroy_path: my_settings_goal_destroy_path(goal)
-          )
-        }
-      },
-      paths: {
-        settings_path: settings_update_path,
-        wakatime_setup_path: my_wakatime_setup_path,
-        slack_auth_path: slack_auth_path,
-        github_auth_path: github_auth_path,
-        github_unlink_path: github_unlink_path,
-        add_email_path: add_email_auth_path,
-        unlink_email_path: unlink_email_auth_path,
-        rotate_api_key_path: my_settings_rotate_api_key_path,
-        export_all_heartbeats_path: export_my_heartbeats_path(all_data: "true"),
-        export_range_heartbeats_path: export_my_heartbeats_path,
-        create_heartbeat_import_path: my_heartbeat_imports_path,
-        create_deletion_path: create_deletion_path
-      },
-      options: {
-        countries: ISO3166::Country.all.map { |country|
-          {
-            label: country.common_name,
-            value: country.alpha2
-          }
-        }.sort_by { |country| country[:label] },
-        timezones: TZInfo::Timezone.all_identifiers.sort.map { |timezone|
-          { label: timezone, value: timezone }
-        },
-        extension_text_types: User.hackatime_extension_text_types.keys.map { |key|
-          {
-            label: key.humanize,
-            value: key
-          }
-        },
-        themes: User.theme_options,
-        badge_themes: GithubReadmeStats.themes,
-        goals: {
-          periods: Goal::PERIODS.map { |period|
-            {
-              label: period.humanize,
-              value: period
-            }
-          },
-          preset_target_seconds: Goal::PRESET_TARGET_SECONDS,
-          selectable_languages: @goal_selectable_languages
-            .map { |language| { label: language, value: language } },
-          selectable_projects: @goal_selectable_projects
-            .map { |project| { label: project, value: project } }
-        }
-      },
-      slack: {
-        can_enable_status: @can_enable_slack_status,
-        notification_channels: channel_ids.map { |channel_id|
-          {
-            id: channel_id,
-            label: "##{channel_id}",
-            url: "https://hackclub.slack.com/archives/#{channel_id}"
-          }
-        }
-      },
-      github: {
-        connected: @user.github_uid.present?,
-        username: @user.github_username,
-        profile_url: (@user.github_username.present? ? "https://github.com/#{@user.github_username}" : nil)
-      },
-      emails: @user.email_addresses.map { |email|
-        {
-          email: email.email,
-          source: email.source&.humanize || "Unknown",
-          can_unlink: @user.can_delete_email_address?(email)
-        }
-      },
-      badges: {
-        general_badge_url: @general_badge_url,
-        project_badge_url: @work_time_stats_url,
-        project_badge_base_url: @work_time_stats_base_url,
-        projects: @projects,
-        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",
-        heatmap_badge_url: "https://heatmap.shymike.dev/?id=#{@user.id}&timezone=#{@user.timezone}",
-        heatmap_config_url: "https://hackatime-heatmap.shymike.dev/?id=#{@user.id}&timezone=#{@user.timezone}",
-        hackabox_repo_url: "https://github.com/quackclub/hacka-box",
-        hackabox_preview_image_url: "https://user-cdn.hackclub-assets.com/019cef81-366a-7543-ad7c-21b738310f23/image.png"
-      },
-      config_file: {
-        content: generated_wakatime_config(@latest_api_key_token),
-        has_api_key: @latest_api_key_token.present?,
-        empty_message: "No API key is available yet. Rotate your API key to generate one.",
-        api_key: @latest_api_key_token,
-        api_url: "https://#{request.host_with_port}/api/hackatime/v1"
-      },
-      data_export: {
-        total_heartbeats: number_with_delimiter(@user.heartbeats.count),
-        total_coding_time: @user.heartbeats.duration_simple,
-        heartbeats_last_7_days: number_with_delimiter(heartbeats_last_7_days),
-        is_restricted: (@user.trust_level == "red")
-      },
-      imports_enabled: @imports_enabled,
-      remote_import_cooldown_until: HeartbeatImportRunner.remote_import_cooldown_until(user: @user)&.iso8601,
-      latest_heartbeat_import: HeartbeatImportRunner.serialize(@latest_heartbeat_import),
-      ui: {
-        show_dev_import: Rails.env.development?,
-        show_imports: @imports_enabled
-      },
+
       errors: {
         full_messages: @user.errors.full_messages,
         username: @user.errors[:username]
@@ -218,6 +53,120 @@ class Settings::BaseController < InertiaController
     }
   end
 
+  # Subclasses override this to provide section-specific props
+  def section_props
+    {}
+  end
+
+  # Shared helpers used by multiple section controllers
+
+  def user_props
+    {
+      id: @user.id,
+      display_name: @user.display_name,
+      timezone: @user.timezone,
+      country_code: @user.country_code,
+      username: @user.username,
+      theme: @user.theme,
+      uses_slack_status: @user.uses_slack_status,
+      weekly_summary_email_enabled: @user.subscribed?("weekly_summary"),
+      hackatime_extension_text_type: @user.hackatime_extension_text_type,
+      allow_public_stats_lookup: @user.allow_public_stats_lookup,
+      trust_level: @user.trust_level,
+      can_request_deletion: @user.can_request_deletion?,
+      github_uid: @user.github_uid,
+      github_username: @user.github_username,
+      slack_uid: @user.slack_uid,
+      programming_goals: @user.goals.order(:created_at).map { |goal|
+        goal.as_programming_goal_payload.merge(
+          update_path: my_settings_goal_update_path(goal),
+          destroy_path: my_settings_goal_destroy_path(goal)
+        )
+      }
+    }
+  end
+
+  def paths_props
+    {
+      settings_path: my_settings_profile_path,
+      wakatime_setup_path: my_wakatime_setup_path,
+      slack_auth_path: slack_auth_path,
+      github_auth_path: github_auth_path,
+      github_unlink_path: github_unlink_path,
+      add_email_path: add_email_auth_path,
+      unlink_email_path: unlink_email_auth_path,
+      rotate_api_key_path: my_settings_rotate_api_key_path,
+      export_all_heartbeats_path: export_my_heartbeats_path(all_data: "true"),
+      export_range_heartbeats_path: export_my_heartbeats_path,
+      create_heartbeat_import_path: my_heartbeat_imports_path,
+      create_deletion_path: create_deletion_path
+    }
+  end
+
+  def project_list
+    @project_list ||= @user.project_repo_mappings.includes(:repository).distinct.map do |mapping|
+      { display_name: mapping.project_name, repo_path: mapping.repository&.full_path || mapping.project_name }
+    end
+  end
+
+  def options_props
+    heartbeat_language_and_projects = @user.heartbeats.distinct.pluck(:language, :project)
+    goal_languages = []
+    goal_projects = project_list.map { |p| p[:display_name] }
+
+    heartbeat_language_and_projects.each do |language, project|
+      categorized_language = language&.categorize_language
+      goal_languages << categorized_language if categorized_language.present?
+      goal_projects << project if project.present?
+    end
+
+    {
+      countries: ISO3166::Country.all.map { |country|
+        { label: country.common_name, value: country.alpha2 }
+      }.sort_by { |country| country[:label] },
+      timezones: TZInfo::Timezone.all_identifiers.sort.map { |timezone|
+        { label: timezone, value: timezone }
+      },
+      extension_text_types: User.hackatime_extension_text_types.keys.map { |key|
+        { label: key.humanize, value: key }
+      },
+      themes: User.theme_options,
+      badge_themes: GithubReadmeStats.themes,
+      goals: {
+        periods: Goal::PERIODS.map { |period|
+          { label: period.humanize, value: period }
+        },
+        preset_target_seconds: Goal::PRESET_TARGET_SECONDS,
+        selectable_languages: goal_languages.uniq.sort
+          .map { |language| { label: language, value: language } },
+        selectable_projects: goal_projects.uniq.sort
+          .map { |project| { label: project, value: project } }
+      }
+    }
+  end
+
+  def badges_props
+    work_time_stats_base_url = @user.slack_uid.present? ? "https://hackatime-badge.hackclub.com/#{@user.slack_uid}/" : nil
+    work_time_stats_url = if work_time_stats_base_url.present? && project_list.first.present?
+      "#{work_time_stats_base_url}#{project_list.first[:repo_path]}"
+    end
+
+    {
+      general_badge_url: GithubReadmeStats.new(@user.id, "darcula").generate_badge_url,
+      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),
+      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",
+      heatmap_badge_url: "https://heatmap.shymike.dev/?id=#{@user.id}&timezone=#{@user.timezone}",
+      heatmap_config_url: "https://hackatime-heatmap.shymike.dev/?id=#{@user.id}&timezone=#{@user.timezone}",
+      hackabox_repo_url: "https://github.com/quackclub/hacka-box",
+      hackabox_preview_image_url: "https://user-cdn.hackclub-assets.com/019cef81-366a-7543-ad7c-21b738310f23/image.png"
+    }
+  end
+
   def generated_wakatime_config(api_key)
     return nil if api_key.blank?
 
diff --git a/app/controllers/settings/data_controller.rb b/app/controllers/settings/data_controller.rb
index b5ded78..0fe5909 100644
--- a/app/controllers/settings/data_controller.rb
+++ b/app/controllers/settings/data_controller.rb
@@ -12,4 +12,32 @@ class Settings::DataController < Settings::BaseController
       status: status
     )
   end
+
+  def section_props
+    imports_enabled = Flipper.enabled?(:imports, @user)
+    latest_import = @user.heartbeat_import_runs.latest_first.first
+    if latest_import.present?
+      latest_import = HeartbeatImportRunner.refresh_remote_run!(latest_import)
+    end
+
+    {
+      user: user_props,
+      paths: paths_props,
+      data_export: InertiaRails.defer {
+        {
+          total_heartbeats: number_with_delimiter(@user.heartbeats.count),
+          total_coding_time: @user.heartbeats.duration_simple,
+          heartbeats_last_7_days: number_with_delimiter(@user.heartbeats.where("time >= ?", 7.days.ago.to_f).count),
+          is_restricted: (@user.trust_level == "red")
+        }
+      },
+      imports_enabled: imports_enabled,
+      remote_import_cooldown_until: HeartbeatImportRunner.remote_import_cooldown_until(user: @user)&.iso8601,
+      latest_heartbeat_import: HeartbeatImportRunner.serialize(latest_import),
+      ui: {
+        show_dev_import: Rails.env.development?,
+        show_imports: imports_enabled
+      }
+    }
+  end
 end
diff --git a/app/controllers/settings/goals_controller.rb b/app/controllers/settings/goals_controller.rb
index 3850fcd..c79df87 100644
--- a/app/controllers/settings/goals_controller.rb
+++ b/app/controllers/settings/goals_controller.rb
@@ -40,10 +40,21 @@ class Settings::GoalsController < Settings::BaseController
     extra_props = {}
     extra_props[:goal_form] = goal_form if goal_form
 
-    render inertia: settings_component_for("goals"), props: settings_page_props(
+    render_settings_page(
       active_section: "goals",
-      settings_update_path: my_settings_goals_path
-    ).merge(extra_props), status: status
+      settings_update_path: my_settings_goals_path,
+      status: status,
+      extra_props: extra_props
+    )
+  end
+
+  def section_props
+    {
+      settings_update_path: my_settings_goals_path,
+      create_goal_path: my_settings_goals_create_path,
+      user: user_props,
+      options: options_props
+    }
   end
 
   def goal_params
diff --git a/app/controllers/settings/integrations_controller.rb b/app/controllers/settings/integrations_controller.rb
index b4d890f..5d128a5 100644
--- a/app/controllers/settings/integrations_controller.rb
+++ b/app/controllers/settings/integrations_controller.rb
@@ -24,6 +24,43 @@ class Settings::IntegrationsController < Settings::BaseController
     )
   end
 
+  def section_props
+    can_enable_slack_status = @user.slack_access_token.present? && @user.slack_scopes.include?("users.profile:write")
+    enabled_sailors_logs = SailorsLogNotificationPreference.where(
+      slack_uid: @user.slack_uid,
+      enabled: true,
+    ).where.not(slack_channel_id: SailorsLog::DEFAULT_CHANNELS)
+    channel_ids = enabled_sailors_logs.pluck(:slack_channel_id)
+
+    {
+      settings_update_path: my_settings_integrations_path,
+      user: user_props,
+      slack: {
+        can_enable_status: can_enable_slack_status,
+        notification_channels: channel_ids.map { |channel_id|
+          {
+            id: channel_id,
+            label: "##{channel_id}",
+            url: "https://hackclub.slack.com/archives/#{channel_id}"
+          }
+        }
+      },
+      github: {
+        connected: @user.github_uid.present?,
+        username: @user.github_username,
+        profile_url: (@user.github_username.present? ? "https://github.com/#{@user.github_username}" : nil)
+      },
+      emails: @user.email_addresses.map { |email|
+        {
+          email: email.email,
+          source: email.source&.humanize || "Unknown",
+          can_unlink: @user.can_delete_email_address?(email)
+        }
+      },
+      paths: paths_props
+    }
+  end
+
   def integrations_params
     params.require(:user).permit(:uses_slack_status)
   end
diff --git a/app/controllers/settings/notifications_controller.rb b/app/controllers/settings/notifications_controller.rb
index 8b23797..57d89a9 100644
--- a/app/controllers/settings/notifications_controller.rb
+++ b/app/controllers/settings/notifications_controller.rb
@@ -32,4 +32,11 @@ class Settings::NotificationsController < Settings::BaseController
       status: status
     )
   end
+
+  def section_props
+    {
+      settings_update_path: my_settings_notifications_path,
+      user: user_props
+    }
+  end
 end
diff --git a/app/controllers/settings/profile_controller.rb b/app/controllers/settings/profile_controller.rb
index c981d6a..6d0955a 100644
--- a/app/controllers/settings/profile_controller.rb
+++ b/app/controllers/settings/profile_controller.rb
@@ -23,6 +23,16 @@ class Settings::ProfileController < Settings::BaseController
     )
   end
 
+  def section_props
+    {
+      settings_update_path: my_settings_profile_path,
+      username_max_length: User::USERNAME_MAX_LENGTH,
+      user: user_props,
+      options: options_props,
+      badges: badges_props
+    }
+  end
+
   def profile_params
     permitted = params.require(:user).permit(
       :timezone,
diff --git a/app/javascript/pages/Home/SignedIn.svelte b/app/javascript/pages/Home/SignedIn.svelte
index 5310b9b..2312b4b 100644
--- a/app/javascript/pages/Home/SignedIn.svelte
+++ b/app/javascript/pages/Home/SignedIn.svelte
@@ -125,9 +125,7 @@
       {ssp_users_recent}
       {ssp_users_size}
     />
-  {/if}
-
-  {#if github_uid_blank}
+  {:else if github_uid_blank}
     <GitHubLinkBanner {github_auth_path} />
   {/if}
 
diff --git a/app/javascript/pages/Home/signedIn/SetupNotice.svelte b/app/javascript/pages/Home/signedIn/SetupNotice.svelte
index 3976677..963da20 100644
--- a/app/javascript/pages/Home/signedIn/SetupNotice.svelte
+++ b/app/javascript/pages/Home/signedIn/SetupNotice.svelte
@@ -18,10 +18,6 @@
 </script>
 
 <div class="text-left mt-2 mb-4 flex flex-col">
-  <p class="mb-4 text-xl text-primary">
-    Hello friend! Looks like you are new around here, let's get you set up so
-    you can start tracking your coding time.
-  </p>
   <div
     class="mb-4 rounded-xl border border-primary/40 bg-surface-100/70 p-4 md:p-5"
   >
diff --git a/app/javascript/pages/Home/signedIn/StatCard.svelte b/app/javascript/pages/Home/signedIn/StatCard.svelte
index 930aa37..e9fabbe 100644
--- a/app/javascript/pages/Home/signedIn/StatCard.svelte
+++ b/app/javascript/pages/Home/signedIn/StatCard.svelte
@@ -14,8 +14,7 @@
 
 <div
   class={`
-    relative flex flex-col justify-start p-4 rounded-xl border transition-all duration-200 h-full
-    ${subtitle ? "pb-6" : ""}
+    flex flex-col justify-start p-4 rounded-xl border transition-all duration-200 h-full
     ${
       highlight
         ? "bg-primary/10 border-primary/30"
@@ -34,8 +33,7 @@
     {value || "—"}
   </div>
   {#if subtitle}
-    <span
-      class="absolute bottom-2 left-4 text-xs text-secondary font-normal opacity-70"
+    <span class="mt-1 text-sm text-secondary font-normal opacity-70"
       >{subtitle}</span
     >
   {/if}
diff --git a/app/javascript/pages/OAuthApplications/New.svelte b/app/javascript/pages/OAuthApplications/New.svelte
index ebc0512..768049d 100644
--- a/app/javascript/pages/OAuthApplications/New.svelte
+++ b/app/javascript/pages/OAuthApplications/New.svelte
@@ -1,7 +1,3 @@
-<script module lang="ts">
-  export const layout = false;
-</script>
-
 <script lang="ts">
   import Form from "./Form.svelte";
   import type { OAuthApplicationFormProps } from "./types";
diff --git a/app/javascript/pages/Users/Settings/Badges.svelte b/app/javascript/pages/Users/Settings/Badges.svelte
index 027a1c2..cb746a9 100644
--- a/app/javascript/pages/Users/Settings/Badges.svelte
+++ b/app/javascript/pages/Users/Settings/Badges.svelte
@@ -19,7 +19,7 @@
     themes.includes("darcula") ? "darcula" : themes[0] || "default";
 
   let selectedTheme = $state("default");
-  let selectedProject = $state("");
+  let selectedProject = $state<string>("");
 
   $effect(() => {
     if (
@@ -36,8 +36,11 @@
       return;
     }
 
-    if (!badges.projects.includes(selectedProject)) {
-      selectedProject = badges.projects[0];
+    const projectRepoPath = badges.projects.find(
+      (p) => p.repo_path === selectedProject,
+    );
+    if (!projectRepoPath) {
+      selectedProject = badges.projects[0]?.repo_path || "";
     }
   });
 
@@ -49,7 +52,8 @@
 
   const projectBadgeUrl = () => {
     if (!badges.project_badge_base_url || !selectedProject) return "";
-    return `${badges.project_badge_base_url}${encodeURIComponent(selectedProject)}`;
+    // selectedProject is already in owner/repo format
+    return `${badges.project_badge_base_url}${selectedProject}`;
   };
 </script>
 
@@ -108,8 +112,8 @@
           id="badge_project"
           bind:value={selectedProject}
           items={badges.projects.map((project) => ({
-            value: project,
-            label: project,
+            value: project.repo_path,
+            label: project.display_name,
           }))}
         />
         <div class="mt-4 rounded-md border border-surface-200 bg-darker p-4">
diff --git a/app/javascript/pages/Users/Settings/Data.svelte b/app/javascript/pages/Users/Settings/Data.svelte
index ddf9924..5b40781 100644
--- a/app/javascript/pages/Users/Settings/Data.svelte
+++ b/app/javascript/pages/Users/Settings/Data.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Form, usePoll } from "@inertiajs/svelte";
+  import { Deferred, Form, usePoll } from "@inertiajs/svelte";
   import Button from "../../../components/Button.svelte";
   import SectionCard from "./components/SectionCard.svelte";
   import SettingsShell from "./Shell.svelte";
@@ -61,17 +61,13 @@
     return Date.now() - overlayStartTime > OVERLAY_TIMEOUT_MS;
   });
 
-  // Clear overlay when server confirms the import or overlay times out
   const effectiveImport = $derived(() => {
-    // If overlay is stale, discard it
     if (isOverlayStale()) {
       return latest_heartbeat_import;
     }
-    // If server has caught up to terminal state, prefer server state
     if (isServerTerminal && importOverlay) {
       return latest_heartbeat_import;
     }
-    // Otherwise prefer overlay if it exists
     return importOverlay ?? latest_heartbeat_import;
   });
 
@@ -224,14 +220,14 @@
             <div class="space-y-3">
               {#each PROVIDERS as provider}
                 <label
-                  class="flex cursor-pointer items-start gap-3 rounded-md border border-surface-200 bg-darker px-3 py-3 text-sm text-surface-content"
+                  class="flex cursor-pointer items-start gap-3 rounded-md border border-surface-200 bg-surface-100 px-3 py-3 text-sm text-surface-content hover:border-surface-300"
                 >
                   <input
                     type="radio"
                     name="heartbeat_import[provider]"
                     value={provider.value}
                     bind:group={remoteProvider}
-                    class="mt-1 h-4 w-4 border-surface-200 bg-surface text-primary"
+                    class="mt-1 h-4 w-4 shrink-0 cursor-pointer border-2 border-surface-300 text-primary focus:ring-2 focus:ring-primary focus:ring-offset-2"
                     disabled={importInProgress || processing}
                   />
                   <span class="space-y-1">
@@ -297,9 +293,9 @@
                 <span class="text-muted">·</span>
                 <span
                   class={importState === "failed"
-                    ? "text-red-300"
+                    ? "text-red-500 dark:text-red-300"
                     : importState === "completed"
-                      ? "text-green-300"
+                      ? "text-primary"
                       : "text-muted"}
                 >
                   {prettyStatus(importState)}
@@ -364,187 +360,211 @@
     description="Download your coding history as JSON for backups or analysis."
     wide
   >
-    {#if data_export.is_restricted}
-      <p
-        class="rounded-md border border-danger/40 bg-danger/10 px-3 py-2 text-sm text-red-200"
-      >
-        Data export is currently restricted for this account.
-      </p>
-    {:else}
-      <div class="grid grid-cols-1 gap-3 sm:grid-cols-3">
-        <div class="rounded-md border border-surface-200 bg-darker px-3 py-3">
-          <p class="text-xs uppercase tracking-wide text-muted">
-            Total heartbeats
-          </p>
-          <p class="mt-1 text-lg font-semibold text-surface-content">
-            {data_export.total_heartbeats}
-          </p>
-        </div>
-        <div class="rounded-md border border-surface-200 bg-darker px-3 py-3">
-          <p class="text-xs uppercase tracking-wide text-muted">
-            Total coding time
-          </p>
-          <p class="mt-1 text-lg font-semibold text-surface-content">
-            {data_export.total_coding_time}
-          </p>
-        </div>
-        <div class="rounded-md border border-surface-200 bg-darker px-3 py-3">
-          <p class="text-xs uppercase tracking-wide text-muted">Last 7 days</p>
-          <p class="mt-1 text-lg font-semibold text-surface-content">
-            {data_export.heartbeats_last_7_days}
-          </p>
-        </div>
-      </div>
-
-      <p class="mt-3 text-sm text-muted">
-        Exports are generated in the background and emailed to you.
-      </p>
-
-      <div class="mt-4 space-y-3">
-        <Form method="post" action={paths.export_all_heartbeats_path}>
-          {#snippet children({ processing })}
-            <Button type="submit" class="rounded-md" disabled={processing}>
-              {processing ? "Exporting..." : "Export all heartbeats"}
-            </Button>
-          {/snippet}
-        </Form>
-
-        <Form
-          method="post"
-          action={paths.export_range_heartbeats_path}
-          class="grid grid-cols-1 gap-3 rounded-md border border-surface-200 bg-darker p-4 sm:grid-cols-3"
-        >
-          {#snippet children({ processing })}
-            <input
-              type="date"
-              name="start_date"
-              required
-              class="rounded-md border border-surface-200 bg-surface px-3 py-2 text-sm text-surface-content focus:border-primary focus:outline-none"
-            />
-            <input
-              type="date"
-              name="end_date"
-              required
-              class="rounded-md border border-surface-200 bg-surface px-3 py-2 text-sm text-surface-content focus:border-primary focus:outline-none"
-            />
-            <Button
-              type="submit"
-              variant="surface"
-              class="rounded-md"
-              disabled={processing}
+    <Deferred data="data_export">
+      {#snippet fallback()}
+        <div class="grid grid-cols-1 gap-3 sm:grid-cols-3">
+          {#each Array(3) as _}
+            <div
+              class="rounded-md border border-surface-200 bg-darker px-3 py-3"
             >
-              {processing ? "Exporting..." : "Export date range"}
-            </Button>
-          {/snippet}
-        </Form>
-      </div>
-
-      {#if ui.show_dev_import}
-        <Form
-          method="post"
-          action={paths.create_heartbeat_import_path}
-          class="mt-4 rounded-md border border-surface-200 bg-darker p-4"
-          resetOnSuccess={["heartbeat_file"]}
-          onSuccess={() => {
-            selectedFile = null;
-          }}
-        >
-          {#snippet children({ processing, errors: formErrors })}
-            <label
-              class="mb-2 block text-sm text-surface-content"
-              for="heartbeat_file"
-            >
-              Import heartbeats (development only)
-            </label>
-            <input
-              id="heartbeat_file"
-              name="heartbeat_file"
-              type="file"
-              accept=".json,application/json"
-              required
-              disabled={importInProgress || processing}
-              onchange={(event) => {
-                const target = event.currentTarget as HTMLInputElement;
-                selectedFile = target.files?.[0] ?? null;
-              }}
-              class="w-full rounded-md border border-surface-200 bg-surface px-3 py-2 text-sm text-surface-content disabled:cursor-not-allowed disabled:opacity-60"
-            />
-
-            {#if formErrors.import}
-              <p class="mt-2 text-sm text-red-300">{formErrors.import}</p>
-            {/if}
-
-            <Button
-              type="submit"
-              variant="surface"
-              class="mt-3 rounded-md"
-              disabled={!selectedFile || importInProgress || processing}
-            >
-              {#if processing}
-                Starting import...
-              {:else if importInProgress && latestImportIsDev}
-                Importing...
-              {:else}
-                Import file
-              {/if}
-            </Button>
-
-            {#if importState !== "idle" && latestImportIsDev}
+              <div class="h-3 w-24 animate-pulse rounded bg-surface-200"></div>
               <div
-                class="mt-4 flex items-center gap-2 rounded-md border border-surface-200 bg-surface px-3 py-2 text-sm"
+                class="mt-3 h-5 w-16 animate-pulse rounded bg-surface-200"
+              ></div>
+            </div>
+          {/each}
+        </div>
+        <div class="mt-3 h-4 w-64 animate-pulse rounded bg-surface-200"></div>
+      {/snippet}
+
+      {#if !data_export}
+        <!-- waiting for deferred data -->
+      {:else if data_export.is_restricted}
+        <p
+          class="rounded-md border border-danger/40 bg-danger/10 px-3 py-2 text-sm text-red-200"
+        >
+          Data export is currently restricted for this account.
+        </p>
+      {:else}
+        <div class="grid grid-cols-1 gap-3 sm:grid-cols-3">
+          <div class="rounded-md border border-surface-200 bg-darker px-3 py-3">
+            <p class="text-xs uppercase tracking-wide text-muted">
+              Total heartbeats
+            </p>
+            <p class="mt-1 text-lg font-semibold text-surface-content">
+              {data_export.total_heartbeats}
+            </p>
+          </div>
+          <div class="rounded-md border border-surface-200 bg-darker px-3 py-3">
+            <p class="text-xs uppercase tracking-wide text-muted">
+              Total coding time
+            </p>
+            <p class="mt-1 text-lg font-semibold text-surface-content">
+              {data_export.total_coding_time}
+            </p>
+          </div>
+          <div class="rounded-md border border-surface-200 bg-darker px-3 py-3">
+            <p class="text-xs uppercase tracking-wide text-muted">
+              Last 7 days
+            </p>
+            <p class="mt-1 text-lg font-semibold text-surface-content">
+              {data_export.heartbeats_last_7_days}
+            </p>
+          </div>
+        </div>
+
+        <p class="mt-3 text-sm text-muted">
+          Exports are generated in the background and emailed to you.
+        </p>
+
+        <div class="mt-4 space-y-3">
+          <Form method="post" action={paths.export_all_heartbeats_path}>
+            {#snippet children({ processing })}
+              <Button type="submit" class="rounded-md" disabled={processing}>
+                {processing ? "Exporting..." : "Export all heartbeats"}
+              </Button>
+            {/snippet}
+          </Form>
+
+          <Form
+            method="post"
+            action={paths.export_range_heartbeats_path}
+            class="grid grid-cols-1 gap-3 rounded-md border border-surface-200 bg-darker p-4 sm:grid-cols-3"
+          >
+            {#snippet children({ processing })}
+              <input
+                type="date"
+                name="start_date"
+                required
+                class="rounded-md border border-surface-200 bg-surface px-3 py-2 text-sm text-surface-content focus:border-primary focus:outline-none"
+              />
+              <input
+                type="date"
+                name="end_date"
+                required
+                class="rounded-md border border-surface-200 bg-surface px-3 py-2 text-sm text-surface-content focus:border-primary focus:outline-none"
+              />
+              <Button
+                type="submit"
+                variant="surface"
+                class="rounded-md"
+                disabled={processing}
               >
-                {#if importInProgress}
-                  <svg
-                    class="h-4 w-4 shrink-0 animate-spin text-primary"
-                    viewBox="0 0 24 24"
-                    fill="none"
-                  >
-                    <circle
-                      cx="12"
-                      cy="12"
-                      r="10"
-                      stroke="currentColor"
-                      stroke-width="3"
-                      class="opacity-25"
-                    />
-                    <path
-                      d="M4 12a8 8 0 018-8"
-                      stroke="currentColor"
-                      stroke-width="3"
-                      stroke-linecap="round"
-                    />
-                  </svg>
+                {processing ? "Exporting..." : "Export date range"}
+              </Button>
+            {/snippet}
+          </Form>
+        </div>
+
+        {#if ui.show_dev_import}
+          <Form
+            method="post"
+            action={paths.create_heartbeat_import_path}
+            class="mt-4 rounded-md border border-surface-200 bg-darker p-4"
+            resetOnSuccess={["heartbeat_file"]}
+            onSuccess={() => {
+              selectedFile = null;
+            }}
+          >
+            {#snippet children({ processing, errors: formErrors })}
+              <label
+                class="mb-2 block text-sm text-surface-content"
+                for="heartbeat_file"
+              >
+                Import heartbeats (development only)
+              </label>
+              <input
+                id="heartbeat_file"
+                name="heartbeat_file"
+                type="file"
+                accept=".json,application/json"
+                required
+                disabled={importInProgress || processing}
+                onchange={(event) => {
+                  const target = event.currentTarget as HTMLInputElement;
+                  selectedFile = target.files?.[0] ?? null;
+                }}
+                class="w-full rounded-md border border-surface-200 bg-surface px-3 py-2 text-sm text-surface-content disabled:cursor-not-allowed disabled:opacity-60"
+              />
+
+              {#if formErrors.import}
+                <p class="mt-2 text-sm text-red-300">{formErrors.import}</p>
+              {/if}
+
+              <Button
+                type="submit"
+                variant="surface"
+                class="mt-3 rounded-md"
+                disabled={!selectedFile || importInProgress || processing}
+              >
+                {#if processing}
+                  Starting import...
+                {:else if importInProgress && latestImportIsDev}
+                  Importing...
+                {:else}
+                  Import file
                 {/if}
-                <span class="text-surface-content">
-                  {activeImport?.source_filename ||
-                    providerLabel(importSourceKind)}
-                </span>
-                <span class="text-muted">·</span>
-                <span
-                  class={importState === "failed"
-                    ? "text-red-300"
-                    : importState === "completed"
-                      ? "text-green-300"
-                      : "text-muted"}
+              </Button>
+
+              {#if importState !== "idle" && latestImportIsDev}
+                <div
+                  class="mt-4 flex items-center gap-2 rounded-md border border-surface-200 bg-surface px-3 py-2 text-sm"
                 >
-                  {prettyStatus(importState)}
-                </span>
-                {#if activeImport?.error_message}
-                  <span class="text-red-300">{activeImport.error_message}</span>
-                {/if}
-                {#if importState === "completed"}
-                  <span class="text-muted">
-                    {formatCount(activeImport?.imported_count)} imported, {formatCount(
-                      activeImport?.skipped_count,
-                    )} skipped
+                  {#if importInProgress}
+                    <svg
+                      class="h-4 w-4 shrink-0 animate-spin text-primary"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                    >
+                      <circle
+                        cx="12"
+                        cy="12"
+                        r="10"
+                        stroke="currentColor"
+                        stroke-width="3"
+                        class="opacity-25"
+                      />
+                      <path
+                        d="M4 12a8 8 0 018-8"
+                        stroke="currentColor"
+                        stroke-width="3"
+                        stroke-linecap="round"
+                      />
+                    </svg>
+                  {/if}
+                  <span class="text-surface-content">
+                    {activeImport?.source_filename ||
+                      providerLabel(importSourceKind)}
                   </span>
-                {/if}
-              </div>
-            {/if}
-          {/snippet}
-        </Form>
+                  <span class="text-muted">·</span>
+                  <span
+                    class={importState === "failed"
+                      ? "text-red-300"
+                      : importState === "completed"
+                        ? "text-green-300"
+                        : "text-muted"}
+                  >
+                    {prettyStatus(importState)}
+                  </span>
+                  {#if activeImport?.error_message}
+                    <span class="text-red-300"
+                      >{activeImport.error_message}</span
+                    >
+                  {/if}
+                  {#if importState === "completed"}
+                    <span class="text-muted">
+                      {formatCount(activeImport?.imported_count)} imported, {formatCount(
+                        activeImport?.skipped_count,
+                      )} skipped
+                    </span>
+                  {/if}
+                </div>
+              {/if}
+            {/snippet}
+          </Form>
+        {/if}
       {/if}
-    {/if}
+    </Deferred>
   </SectionCard>
 
   {#if user.can_request_deletion}
diff --git a/app/javascript/pages/Users/Settings/components/SectionCard.svelte b/app/javascript/pages/Users/Settings/components/SectionCard.svelte
index 2bcb6e8..ce556e2 100644
--- a/app/javascript/pages/Users/Settings/components/SectionCard.svelte
+++ b/app/javascript/pages/Users/Settings/components/SectionCard.svelte
@@ -60,11 +60,9 @@
   {#if footer}
     <div
       data-settings-footer
-      class="border-t border-surface-200 bg-surface-100/60 px-5 py-3.5 sm:px-6 sm:py-4"
+      class={`border-t border-surface-200 bg-surface-100/60 px-5 py-3.5 sm:px-6 sm:py-4 ${footerClass}`}
     >
-      <div class={`${contentWidth} ${footerClass}`}>
-        {@render footer()}
-      </div>
+      {@render footer()}
     </div>
   {/if}
 </section>
diff --git a/app/javascript/pages/Users/Settings/types.ts b/app/javascript/pages/Users/Settings/types.ts
index 26010f2..3f98bf3 100644
--- a/app/javascript/pages/Users/Settings/types.ts
+++ b/app/javascript/pages/Users/Settings/types.ts
@@ -138,7 +138,7 @@ export type BadgesProps = {
   general_badge_url: string;
   project_badge_url?: string | null;
   project_badge_base_url?: string | null;
-  projects: string[];
+  projects: Array<{ display_name: string; repo_path: string }>;
   profile_url?: string | null;
   markscribe_template: string;
   markscribe_reference_url: string;
@@ -250,7 +250,7 @@ export type BadgesPageProps = SettingsCommonProps & {
 export type DataPageProps = SettingsCommonProps & {
   user: UserProps;
   paths: PathsProps;
-  data_export: DataExportProps;
+  data_export?: DataExportProps;
   imports_enabled: boolean;
   remote_import_cooldown_until?: string | null;
   latest_heartbeat_import?: HeartbeatImportStatusProps | null;
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 48295a8..0fa4069 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -13,6 +13,11 @@ class Repository < ApplicationRecord
     last_synced_at.nil? || last_synced_at < 1.day.ago
   end
 
+  # Get owner/repo format (e.g., "hackclub/hackatime")
+  def full_path
+    "#{owner}/#{name}"
+  end
+
   # Get formatted languages list
   def formatted_languages
     return nil if languages.blank?
diff --git a/docs/editors/antigravity.md b/docs/editors/antigravity.md
new file mode 100644
index 0000000..ef0c500
--- /dev/null
+++ b/docs/editors/antigravity.md
@@ -0,0 +1,12 @@
+# Antigravity
+
+Antigravity is a VSCode fork from Google with built-in AI features for code assistance and generation.
+
+## Setup
+
+Antigravity uses the WakaTime extension for time tracking. Follow these steps to track your coding time with Hackatime:
+
+1. Configure your editor by using our [simple installer](https://hackatime.hackclub.com/my/wakatime_setup)
+2. Restart Antigravity and start coding!
+
+The WakaTime extension will automatically track your time spent coding in Antigravity.
diff --git a/docs/editors/godot.md b/docs/editors/godot.md
index 6d6099d..d08bc5a 100644
--- a/docs/editors/godot.md
+++ b/docs/editors/godot.md
@@ -8,7 +8,7 @@ Follow these steps to start tracking your game development in Godot with Hackati
 
 **[hackatime.hackclub.com](https://hackatime.hackclub.com)**
 
-Sign in with your Hack Club Slack account. If you haven't created one yet, head to **[shiba.hackclub.com](https://shiba.hackclub.com)** and enter your email address to get a link to the Slack :)
+Sign in with your Hackatime account (or create one if you don't have one yet)!
 
 ## 2: Set up Hackatime
 
@@ -22,9 +22,7 @@ This will set some environment variables and tell Hackatime where to "phone home
 
 **[godotengine.org/download](https://godotengine.org/download)**
 
-Download the Godot binary! Make sure you get the **regular version** and not the .NET version - web exports (required for Shiba) aren't supported with .NET.
-
-If you're on Linux and know what you're doing, make sure to check your distro's package manager for any special builds.
+Download the Godot binary! If you're on Linux and know what you're doing, make sure to check your distro's package manager for any special builds.
 
 ## 4: Create a New Godot Project
 
@@ -65,20 +63,12 @@ If you'd like to be able to run your game in browser, choose the **Mobile** rend
 
 **Important:** You need to install Godot Super WakaTime for every project (it's a Godot limitation)
 
-## ✅ All Done!
+## All Done!
 
 After you're finished, make sure to check **[hackatime.hackclub.com](https://hackatime.hackclub.com)** after a little while and ensure you're logging progress!
 
 You can also try some **[wakatime.com/plugins](https://wakatime.com/plugins)** if you'd like to log time spent editing your project in other programs.
 
-## Features
-
-This Hack Club-approved plugin provides:
-- **Accurate tracking** - Differentiates between script editing and scene building
-- **Detailed metrics** - Counts keystrokes as coding, mouse clicks as scene work
-- **Smart detection** - Tracks scene structure changes and file modifications
-- **Seamless integration** - Works with your existing Hackatime setup
-
 ## Troubleshooting
 
 - **Not seeing your time?** Make sure you completed the [setup page](https://hackatime.hackclub.com/my/wakatime_setup) first
diff --git a/docs/editors/vs-code.md b/docs/editors/vs-code.md
index 84ef749..037ce77 100644
--- a/docs/editors/vs-code.md
+++ b/docs/editors/vs-code.md
@@ -2,6 +2,13 @@
 
 ![VS Code](/images/editor-icons/vs-code-128.png)
 
+## Automatic Setup
+
+1. Configure your editor by using our [simple installer](https://hackatime.hackclub.com/my/wakatime_setup)
+2. Restart VS Code and start coding!
+
+---
+
 Let's set up VS Code to count how much time you spend coding!
 
 ## Step 1: Make a Hackatime Account
@@ -10,7 +17,7 @@ Go to [Hackatime](https://hackatime.hackclub.com) and make an account. Then log
 
 ## Step 2: Get Your Settings Ready
 
-Click this link to the [setup page](https://hackatime.hackclub.com/my/wakatime_setup). It will set up your account so it works with VS Code.
+Click this link to the [setup page](https://hackatime.hackclub.com/my/wakatime_setup). It will set up your device so it works with Hackatime.
 
 ## Step 3: Add the Plugin to VS Code
 
@@ -18,7 +25,7 @@ Click this link to the [setup page](https://hackatime.hackclub.com/my/wakatime_s
 2. Click the squares icon on the left (Extensions)
 3. Type "WakaTime" in the search box
 4. Click the **Install** button next to WakaTime
-5. VS Code might ask you to restart - click **Reload** if it does
+5. VS Code might ask you to reload your extensions to get it working - click **Reload Extensions** if it does
 
 That's it! The plugin will use your settings from Step 2.
 
diff --git a/public/images/editor-icons/antigravity-128.png b/public/images/editor-icons/antigravity-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..242967be3824f8cb61b4435d13ac88a908a7065c
GIT binary patch
literal 20190
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

literal 0
HcmV?d00001

diff --git a/spec/requests/api/hackatime/v1/compatibility_spec.rb b/spec/requests/api/hackatime/v1/compatibility_spec.rb
index a218acb..68e5aed 100644
--- a/spec/requests/api/hackatime/v1/compatibility_spec.rb
+++ b/spec/requests/api/hackatime/v1/compatibility_spec.rb
@@ -90,7 +90,17 @@ RSpec.describe 'Api::Hackatime::V1::Compatibility', type: :request do
                   type: :object,
                   properties: {
                     total_seconds: { type: :number, example: 7200.0 },
-                    text: { type: :string, example: '2 hrs' }
+                    text: { type: :string, example: '2h 30m / 4h today' }
+                  }
+                },
+                goal: {
+                  type: :object,
+                  nullable: true,
+                  properties: {
+                    target_seconds: { type: :number, example: 14400 },
+                    tracked_seconds: { type: :number, example: 9000 },
+                    completion_percent: { type: :number, example: 62 },
+                    complete: { type: :boolean, example: false }
                   }
                 }
               }
diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml
index cf67a4d..3c986a2 100644
--- a/swagger/v1/swagger.yaml
+++ b/swagger/v1/swagger.yaml
@@ -1695,7 +1695,23 @@ paths:
                             example: 7200.0
                           text:
                             type: string
-                            example: 2 hrs
+                            example: 2h 30m / 4h today
+                      goal:
+                        type: object
+                        nullable: true
+                        properties:
+                          target_seconds:
+                            type: number
+                            example: 14400
+                          tracked_seconds:
+                            type: number
+                            example: 9000
+                          completion_percent:
+                            type: number
+                            example: 62
+                          complete:
+                            type: boolean
+                            example: false
         '401':
           description: unauthorized
   "/api/hackatime/v1/users/current/stats/last_7_days":