job_harbor 0.1.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8886fa57253d6ca9b9d65e8a7e969b7758505a73b7edc2590b1c39efbd5e7c06
-  data.tar.gz: 7d11c049a0e8ca9131601a6c88cb818e3724b4c4854bb2450d36686cb6a34cc4
+  metadata.gz: 421784ad68128e6ee09898b0bd2a93ef4acfc3a8313f18a241c3c25fdb2e2cce
+  data.tar.gz: 94cbfb2e3682ab600424c7f9c607434fd3e64cc4692fbc7473cce13a8c7dfeff
 SHA512:
-  metadata.gz: 68200679eacafc5f57e61ffaf5d13897ac4017b95f8422db7ced82f3be29077325c384be39c16d1a0abb75f2ec690e5f36f3bc398bd8f34bdf76b0ff557796ce
-  data.tar.gz: 4af20afe1df6d6b8ee22f99ab85cdbaead13d083fc2a4c46cdd7569d98d023f125e6ea52df97daaea1f7316509dee5e8d83d5f77920b3b68800acb0e496071b2
+  metadata.gz: f54f4ad961c726515225230daa9a99886c12a76eaf0dc769690d1f1af99a6ccd53589a8979dfc9a219442a3f03931636e08d1f7dba8edb3bd91bcf4eb4b76eea
+  data.tar.gz: 6d577a23966412672c5363bc91d1cd3915a8d46b5eba021bbcd41de8a70a4961906f1c5d4723b1f7c1a40eb0d7e95b5fbe10df7233679da21ea8312d544b7e5c

data/README.md

@@ -1,23 +1,72 @@
-# SolidQueue Dashboard
+# Job Harbor
 
-A modern, self-contained dashboard for monitoring and managing [Solid Queue](https://github.com/rails/solid_queue) jobs. Built with ViewComponents and vanilla CSS for easy integration with any Rails application.
+A modern, beautiful dashboard for monitoring and managing [Solid Queue](https://github.com/rails/solid_queue) jobs in Rails. Built with ViewComponents and a shadcn/ui-inspired design system.
+
+![Dashboard Dark](docs/screenshots/dashboard-dark.png)
 
 ## Features
 
-- **Dashboard Overview**: Real-time statistics for pending, scheduled, in-progress, failed, blocked, and finished jobs
-- **Job Management**: View, search, retry, and discard jobs with full argument and error inspection
-- **Queue Management**: Monitor queue health, pause/resume queues
-- **Worker Monitoring**: Track active workers with heartbeat status detection
-- **Recurring Tasks**: View and manually trigger recurring jobs
-- **Real-time Updates**: Auto-refresh with configurable polling interval
-- **Dark/Light Themes**: CSS variable-based theming with no external dependencies
+- **Dashboard Overview** - Real-time statistics, job activity charts, failure rates, and recent failures at a glance
+- **Job Management** - View, search, filter, retry, and discard jobs with full argument and error inspection
+- **Queue Management** - Monitor queue health, pause and resume queues
+- **Worker Monitoring** - Track active workers with heartbeat status and hostname details
+- **Recurring Tasks** - View schedules and manually trigger recurring jobs
+- **Auto-Refresh** - Configurable polling interval keeps data current
+- **Dark/Light Themes** - Toggle between themes with localStorage persistence
+
+## Screenshots
+
+<details>
+<summary>Dashboard</summary>
+
+| Dark | Light |
+|------|-------|
+| ![Dashboard Dark](docs/screenshots/dashboard-dark.png) | ![Dashboard Light](docs/screenshots/dashboard-light.png) |
+
+</details>
+
+<details>
+<summary>Jobs</summary>
+
+| Dark | Light |
+|------|-------|
+| ![Jobs Dark](docs/screenshots/jobs-dark.png) | ![Jobs Light](docs/screenshots/jobs-light.png) |
+
+</details>
+
+<details>
+<summary>Queues</summary>
+
+| Dark | Light |
+|------|-------|
+| ![Queues Dark](docs/screenshots/queues-dark.png) | ![Queues Light](docs/screenshots/queues-light.png) |
+
+</details>
+
+<details>
+<summary>Workers</summary>
+
+| Dark | Light |
+|------|-------|
+| ![Workers Dark](docs/screenshots/workers-dark.png) | ![Workers Light](docs/screenshots/workers-light.png) |
+
+</details>
+
+<details>
+<summary>Recurring Tasks</summary>
+
+| Dark | Light |
+|------|-------|
+| ![Recurring Dark](docs/screenshots/recurring-dark.png) | ![Recurring Light](docs/screenshots/recurring-light.png) |
+
+</details>
 
 ## Installation
 
 Add to your Gemfile:
 
 ```ruby
-gem "solidqueue_dashboard"
+gem "job_harbor"
 ```
 
 Then run:
@@ -26,49 +75,58 @@ Then run:
 bundle install
 ```
 
+## Mounting
+
+Mount the engine in your routes:
+
+```ruby
+# config/routes.rb
+Rails.application.routes.draw do
+  mount JobHarbor::Engine, at: "/job_harbor"
+end
+```
+
+Or with an authentication constraint:
+
+```ruby
+authenticated :user, ->(u) { u.admin? } do
+  mount JobHarbor::Engine, at: "/admin/jobs"
+end
+```
+
 ## Configuration
 
-Create an initializer at `config/initializers/solidqueue_dashboard.rb`:
+Create an initializer at `config/initializers/job_harbor.rb`:
 
 ```ruby
-SolidqueueDashboard.configure do |config|
-  # Authorization callback - must return true to allow access
+JobHarbor.configure do |config|
+  # Authorization - must return true to allow access (default: open)
   config.authorize_with = -> { current_user&.admin? }
 
-  # Theme: :dark or :light
+  # Theme: :dark or :light (default: :dark)
   config.theme = :dark
 
-  # Primary accent color
-  config.primary_color = "amber"
-
-  # Jobs per page
+  # Jobs per page (default: 25)
   config.jobs_per_page = 25
 
-  # Enable recurring tasks management
-  config.enable_recurring_tasks = true
-
-  # Enable auto-refresh
-  config.enable_real_time_updates = true
-
-  # Poll interval in seconds
+  # Auto-refresh polling interval in seconds (default: 5)
   config.poll_interval = 5
-end
-```
 
-## Mounting
+  # Toggle features on/off
+  config.enable_recurring_tasks = true   # default: true
+  config.enable_real_time_updates = true # default: true
+  config.enable_failure_stats = true     # default: true
+  config.enable_charts = true            # default: true
 
-Mount the engine in your routes:
+  # Default chart time range (default: "24h")
+  config.default_chart_range = "24h"
 
-```ruby
-# config/routes.rb
-Rails.application.routes.draw do
-  # Basic mount
-  mount SolidqueueDashboard::Engine, at: "/jobs"
+  # "Back to App" link in the navbar (default: nil, hidden)
+  config.return_to_app_path = "/"
+  config.return_to_app_label = "Back to App"
 
-  # Or with authentication constraint
-  authenticated :user, ->(u) { u.admin? } do
-    mount SolidqueueDashboard::Engine, at: "/admin/jobs"
-  end
+  # Also accepts a proc for dynamic paths:
+  # config.return_to_app_path = -> { main_app.root_path }
 end
 ```
 
@@ -77,18 +135,22 @@ end
 The dashboard uses a configurable authorization callback. Return `true` to allow access:
 
 ```ruby
-# Allow all authenticated users
+# Allow all (default - not recommended for production)
+config.authorize_with = -> { true }
+
+# Require authentication
 config.authorize_with = -> { current_user.present? }
 
 # Require admin role
 config.authorize_with = -> { current_user&.admin? }
 
 # Use Pundit or similar
-config.authorize_with = -> { authorize(:solid_queue, :manage?) }
+config.authorize_with = -> { authorize(:job_harbor, :manage?) }
 ```
 
-## Dependencies
+## Requirements
 
+- Ruby >= 3.2
 - Rails >= 7.1
 - Solid Queue >= 0.3
 - ViewComponent >= 3.0

data/app/components/job_harbor/badge_component.rb

@@ -4,19 +4,51 @@ module JobHarbor
   class BadgeComponent < ApplicationComponent
     VALID_STATUSES = %w[pending scheduled in_progress failed finished blocked active paused].freeze
 
+    STATUS_COLORS = {
+      "pending" => "badge-sky",
+      "scheduled" => "badge-yellow",
+      "in_progress" => "badge-amber",
+      "failed" => "badge-red",
+      "finished" => "badge-green",
+      "blocked" => "badge-zinc",
+      "active" => "badge-green",
+      "paused" => "badge-amber"
+    }.freeze
+
+    STATUS_CIRCLES = {
+      "pending" => "circle-sky",
+      "scheduled" => "circle-yellow",
+      "in_progress" => "circle-amber",
+      "failed" => "circle-red",
+      "finished" => "circle-green",
+      "blocked" => "circle-zinc",
+      "active" => "circle-green",
+      "paused" => "circle-amber"
+    }.freeze
+
     def initialize(status:)
       @status = status.to_s.downcase
     end
 
     def call
-      content_tag(:span, display_text, class: css_classes)
+      content_tag(:span, class: css_classes) do
+        safe_join([
+          content_tag(:span, "", class: "circle #{circle_class}"),
+          display_text
+        ])
+      end
     end
 
     private
 
     def css_classes
-      status_class = VALID_STATUSES.include?(@status) ? @status : "pending"
-      "sqd-badge sqd-badge-#{status_class}"
+      status_key = VALID_STATUSES.include?(@status) ? @status : "pending"
+      "badge #{STATUS_COLORS[status_key]}"
+    end
+
+    def circle_class
+      status_key = VALID_STATUSES.include?(@status) ? @status : "pending"
+      STATUS_CIRCLES[status_key]
     end
 
     def display_text

data/app/components/job_harbor/chart_component.rb

@@ -8,7 +8,7 @@ module JobHarbor
     end
 
     def call
-      content_tag(:div, class: "sqd-card sqd-chart-card") do
+      content_tag(:div, class: "card") do
         safe_join([
           header,
           body
@@ -19,23 +19,25 @@ module JobHarbor
     private
 
     def header
-      content_tag(:div, class: "sqd-card-header sqd-chart-header") do
-        safe_join([
-          content_tag(:h3, "Job Activity", class: "sqd-card-title"),
-          range_selector
-        ])
+      content_tag(:div, class: "card-header") do
+        content_tag(:div, class: "flex items-center justify-between") do
+          safe_join([
+            content_tag(:h3, "Job Activity", class: "card-title"),
+            range_selector
+          ])
+        end
       end
     end
 
     def range_selector
-      content_tag(:div, class: "sqd-chart-ranges") do
+      content_tag(:div, class: "sqd-chart-ranges flex gap-1") do
         safe_join(ChartData.available_ranges.map { |range| range_button(range) })
       end
     end
 
     def range_button(range)
       active = range[:value] == @current_range
-      css_class = "sqd-chart-range-btn#{' active' if active}"
+      css_class = active ? "btn btn-default btn-xs" : "btn btn-secondary btn-xs"
 
       link_to range[:label],
         "#{root_path}?chart_range=#{range[:value]}",
@@ -43,7 +45,7 @@ module JobHarbor
     end
 
     def body
-      content_tag(:div, class: "sqd-card-body") do
+      content_tag(:div, class: "card-content") do
         safe_join([
           legend,
           chart_container
@@ -52,20 +54,20 @@ module JobHarbor
     end
 
     def legend
-      content_tag(:div, class: "sqd-chart-legend") do
+      content_tag(:div, class: "flex gap-4 mb-3") do
         safe_join([
-          legend_item("Completed", "sqd-chart-completed"),
-          legend_item("Failed", "sqd-chart-failed"),
-          legend_item("Enqueued", "sqd-chart-enqueued")
+          legend_item("Completed", "circle-green"),
+          legend_item("Failed", "circle-red"),
+          legend_item("Enqueued", "circle-sky")
         ])
       end
     end
 
-    def legend_item(label, css_class)
-      content_tag(:div, class: "sqd-legend-item") do
+    def legend_item(label, circle_class)
+      content_tag(:div, class: "flex items-center gap-1.5 text-xs") do
         safe_join([
-          content_tag(:span, "", class: "sqd-legend-color #{css_class}"),
-          content_tag(:span, label, class: "sqd-legend-label")
+          content_tag(:span, "", class: "circle #{circle_class}"),
+          content_tag(:span, label, class: "text-muted-foreground")
         ])
       end
     end

data/app/components/job_harbor/empty_state_component.rb

@@ -6,7 +6,8 @@ module JobHarbor
       jobs: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10"/>',
       queues: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 10h16M4 14h16M4 18h16"/>',
       workers: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 3v2m6-2v2M9 19v2m6-2v2M5 9H3m2 6H3m18-6h-2m2 6h-2M7 19h10a2 2 0 002-2V7a2 2 0 00-2-2H7a2 2 0 00-2 2v10a2 2 0 002 2zM9 9h6v6H9V9z"/>',
-      search: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>'
+      search: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>',
+      recurring: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"/>'
     }.freeze
 
     def initialize(title:, description: nil, icon: :jobs)
@@ -16,10 +17,10 @@ module JobHarbor
     end
 
     def call
-      content_tag(:div, class: "sqd-empty-state") do
+      content_tag(:div, class: "text-center py-12") do
         safe_join([
           icon_svg,
-          content_tag(:h3, @title, class: "sqd-empty-title"),
+          content_tag(:h3, @title, class: "text-lg font-semibold mt-4"),
           description_tag
         ].compact)
       end
@@ -29,13 +30,18 @@ module JobHarbor
 
     def icon_svg
       icon_path = ICONS[@icon] || ICONS[:jobs]
-      content_tag(:svg, icon_path.html_safe, class: "sqd-empty-icon", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor")
+      content_tag(:svg, icon_path.html_safe,
+        class: "w-12 h-12 mx-auto text-muted-foreground",
+        viewBox: "0 0 24 24",
+        fill: "none",
+        stroke: "currentColor"
+      )
     end
 
     def description_tag
       return unless @description
 
-      content_tag(:p, @description, class: "sqd-empty-description")
+      content_tag(:p, @description, class: "text-sm text-muted-foreground mt-1")
     end
   end
 end

data/app/components/job_harbor/failure_rates_component.rb

@@ -7,7 +7,7 @@ module JobHarbor
     end
 
     def call
-      content_tag(:div, class: "sqd-card sqd-failure-rates") do
+      content_tag(:div, class: "card sqd-failure-rates") do
         safe_join([
           header,
           body
@@ -18,13 +18,13 @@ module JobHarbor
     private
 
     def header
-      content_tag(:div, class: "sqd-card-header") do
-        content_tag(:h3, "Failure Rates (24h)", class: "sqd-card-title")
+      content_tag(:div, class: "card-header") do
+        content_tag(:h3, "Failure Rates (24h)", class: "card-title")
       end
     end
 
     def body
-      content_tag(:div, class: "sqd-card-body") do
+      content_tag(:div, class: "card-content") do
         if @stats.empty?
           empty_state
         else
@@ -34,7 +34,7 @@ module JobHarbor
     end
 
     def empty_state
-      content_tag(:p, "No jobs in the last 24 hours", class: "sqd-text-muted")
+      content_tag(:p, "No jobs in the last 24 hours", class: "text-sm text-muted-foreground")
     end
 
     def stats_table
@@ -68,7 +68,7 @@ module JobHarbor
     def stat_row(stat)
       content_tag(:tr) do
         safe_join([
-          content_tag(:td, content_tag(:code, stat[:class_name], class: "sqd-code")),
+          content_tag(:td, content_tag(:code, stat[:class_name], class: "text-sm font-mono")),
           content_tag(:td, stat[:total]),
           content_tag(:td, stat[:failed]),
           content_tag(:td, rate_badge(stat[:rate]))
@@ -78,7 +78,7 @@ module JobHarbor
 
     def rate_badge(rate)
       css_class = FailureStats.rate_badge_class(rate)
-      content_tag(:span, "#{rate}%", class: "sqd-rate-badge #{css_class}")
+      content_tag(:span, "#{rate}%", class: "badge #{css_class}")
     end
   end
 end

data/app/components/job_harbor/job_filters_component.rb

@@ -12,7 +12,7 @@ module JobHarbor
     end
 
     def call
-      content_tag(:div, class: "sqd-filters") do
+      content_tag(:div, class: "sqd-filters flex gap-4 mb-4 flex-wrap") do
         safe_join([
           class_filter,
           queue_filter
@@ -23,11 +23,11 @@ module JobHarbor
     private
 
     def class_filter
-      content_tag(:div, class: "sqd-filter-group") do
+      content_tag(:div, class: "flex items-center gap-1.5") do
         safe_join([
-          content_tag(:label, "Class", class: "sqd-filter-label", for: "class_filter"),
+          content_tag(:label, "Class", class: "text-sm text-muted-foreground", for: "class_filter"),
           content_tag(:select,
-            class: "sqd-filter-select",
+            class: "sqd-filter-select select",
             id: "class_filter",
             data: { filter_type: "class_name" }
           ) do
@@ -41,11 +41,11 @@ module JobHarbor
     end
 
     def queue_filter
-      content_tag(:div, class: "sqd-filter-group") do
+      content_tag(:div, class: "flex items-center gap-1.5") do
         safe_join([
-          content_tag(:label, "Queue", class: "sqd-filter-label", for: "queue_filter"),
+          content_tag(:label, "Queue", class: "text-sm text-muted-foreground", for: "queue_filter"),
           content_tag(:select,
-            class: "sqd-filter-select",
+            class: "sqd-filter-select select",
             id: "queue_filter",
             data: { filter_type: "queue_name" }
           ) do
@@ -71,11 +71,9 @@ module JobHarbor
     def build_filter_url(filter_key, value)
       query_params = @params.dup
 
-      # Preserve the other filter if set
       query_params[:class_name] = @current_class if @current_class.present? && filter_key != :class_name
       query_params[:queue_name] = @current_queue if @current_queue.present? && filter_key != :queue_name
 
-      # Set the new filter value
       if value.present?
         query_params[filter_key] = value
       else

data/app/components/job_harbor/job_row_component.rb

@@ -23,14 +23,14 @@ module JobHarbor
 
     def id_cell
       content_tag(:td) do
-        link_to @job.id, job_path(@job), class: "sqd-table-link"
+        link_to @job.id, job_path(@job), class: "link font-medium"
       end
     end
 
     def class_cell
       content_tag(:td) do
         safe_join([
-          content_tag(:code, @job.class_name, class: "sqd-code"),
+          content_tag(:code, @job.class_name, class: "text-sm font-mono"),
           retry_badge_tag
         ].compact)
       end
@@ -39,12 +39,12 @@ module JobHarbor
     def retry_badge_tag
       return nil unless @job.respond_to?(:retry_badge) && @job.retry_badge.present?
 
-      content_tag(:span, @job.retry_badge, class: "sqd-retry-badge")
+      content_tag(:span, @job.retry_badge, class: "sqd-retry-badge ml-1")
     end
 
     def queue_cell
       content_tag(:td) do
-        link_to @job.queue_name, queue_path(@job.queue_name), class: "sqd-table-link"
+        link_to @job.queue_name, queue_path(@job.queue_name), class: "link"
       end
     end
 
@@ -60,7 +60,7 @@ module JobHarbor
     def running_duration_tag
       return nil unless @job.respond_to?(:running_duration) && @job.running_duration.present?
 
-      content_tag(:span, " (#{@job.running_duration})", class: "sqd-running-duration")
+      content_tag(:span, " (#{@job.running_duration})", class: "text-xs text-sky-500")
     end
 
     def scheduled_cell
@@ -75,31 +75,33 @@ module JobHarbor
 
     def relative_time_tag
       if @job.respond_to?(:relative_created_at)
-        content_tag(:span, @job.relative_created_at, class: "sqd-text-muted sqd-relative-time")
+        content_tag(:span, @job.relative_created_at, class: "text-xs text-muted-foreground")
       else
-        content_tag(:span, "—", class: "sqd-text-muted")
+        content_tag(:span, "\u2014", class: "text-muted-foreground")
       end
     end
 
     def actions_cell
-      content_tag(:td, class: "sqd-actions") do
-        safe_join([
-          retry_button,
-          discard_button
-        ].compact)
+      content_tag(:td) do
+        content_tag(:div, class: "flex items-center gap-1") do
+          safe_join([
+            retry_button,
+            discard_button
+          ].compact)
+        end
       end
     end
 
     def retry_button
       return unless @job.can_retry?
 
-      button_to "Retry", retry_job_path(@job), method: :post, class: "sqd-btn sqd-btn-sm sqd-btn-secondary"
+      button_to "Retry", retry_job_path(@job), method: :post, class: "btn btn-secondary btn-xs"
     end
 
     def discard_button
       return unless @job.can_discard?
 
-      button_to "Discard", discard_job_path(@job), method: :delete, class: "sqd-btn sqd-btn-sm sqd-btn-danger",
+      button_to "Discard", discard_job_path(@job), method: :delete, class: "btn btn-destructive btn-xs",
         data: { confirm: "Are you sure you want to discard this job?" }
     end
   end

data/app/components/job_harbor/nav_link_component.rb

@@ -2,14 +2,6 @@
 
 module JobHarbor
   class NavLinkComponent < ApplicationComponent
-    ICONS = {
-      dashboard: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"/>',
-      jobs: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10"/>',
-      queues: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 10h16M4 14h16M4 18h16"/>',
-      workers: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 3v2m6-2v2M9 19v2m6-2v2M5 9H3m2 6H3m18-6h-2m2 6h-2M7 19h10a2 2 0 002-2V7a2 2 0 00-2-2H7a2 2 0 00-2 2v10a2 2 0 002 2zM9 9h6v6H9V9z"/>',
-      recurring: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"/>'
-    }.freeze
-
     def initialize(path:, label:, icon:, active: false, badge: nil)
       @path = path
       @label = label
@@ -21,8 +13,7 @@ module JobHarbor
     def call
       link_to @path, class: css_classes do
         safe_join([
-          icon_svg,
-          content_tag(:span, @label, class: "sqd-nav-label"),
+          content_tag(:span, @label),
           badge_tag
         ].compact)
       end
@@ -31,20 +22,15 @@ module JobHarbor
     private
 
     def css_classes
-      classes = [ "sqd-nav-link" ]
-      classes << "active" if @active
+      classes = [ "sqd-nav-link", "navbar-item" ]
+      classes << "active navbar-item-current" if @active
       classes.join(" ")
     end
 
-    def icon_svg
-      icon_path = ICONS[@icon] || ICONS[:dashboard]
-      content_tag(:svg, icon_path.html_safe, class: "sqd-nav-icon", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor")
-    end
-
     def badge_tag
       return nil unless @badge.present? && @badge.to_i > 0
 
-      content_tag(:span, @badge, class: "sqd-nav-badge")
+      content_tag(:span, @badge, class: "sqd-nav-badge navbar-badge")
     end
   end
 end