Skip to content

armgit / maybe

Public Imported from GitHub
0

The personal finance app for everyone

Add breadcrumbs support across application (#1897)

Josh Pigforda4874815a64d
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2951cbfd..be739d23 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,5 @@
class ApplicationController < ActionController::Base
- include Onboardable, Localize, AutoSync, Authentication, Invitable, SelfHostable, StoreLocation, Impersonatable
+ include Onboardable, Localize, AutoSync, Authentication, Invitable, SelfHostable, StoreLocation, Impersonatable, Breadcrumbable
include Pagy::Backend
helper_method :require_upgrade?, :subscription_pending?
diff --git a/app/controllers/budgets_controller.rb b/app/controllers/budgets_controller.rb
index 992dec44..9ec26e83 100644
--- a/app/controllers/budgets_controller.rb
+++ b/app/controllers/budgets_controller.rb
@@ -25,6 +25,7 @@ class BudgetsController < ApplicationController
end
private
+
def budget_create_params
params.require(:budget).permit(:start_date)
end
diff --git a/app/controllers/concerns/breadcrumbable.rb b/app/controllers/concerns/breadcrumbable.rb
new file mode 100644
index 00000000..38ebd889
--- /dev/null
+++ b/app/controllers/concerns/breadcrumbable.rb
@@ -0,0 +1,13 @@
+module Breadcrumbable
+ extend ActiveSupport::Concern
+
+ included do
+ before_action :set_breadcrumbs
+ end
+
+ private
+ # The default, unless specific controller or action explicitly overrides
+ def set_breadcrumbs
+ @breadcrumbs = [ [ "Home", root_path ], [ controller_name.titleize, nil ] ]
+ end
+end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 61d39322..0b2b26b4 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -5,6 +5,8 @@ class PagesController < ApplicationController
@period = Period.from_key(params[:period], fallback: true)
@balance_sheet = Current.family.balance_sheet
@accounts = Current.family.accounts.active.with_attached_logo
+
+ @breadcrumbs = [ [ "Home", root_path ], [ "Dashboard", nil ] ]
end
def changelog
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index a1e254c4..484c53a0 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -49,6 +49,7 @@ class TransactionsController < ApplicationController
end
private
+
def search_params
cleaned_params = params.fetch(:q, {})
.permit(
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ffdffa7f..13857d81 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -44,6 +44,17 @@
<% end %>
<%= tag.div class: class_names("mx-auto w-full h-full", Current.user.show_sidebar? ? "max-w-4xl" : "max-w-5xl"), data: { sidebar_target: "content" } do %>
+ <% unless controller_path.start_with?('settings/') %>
+ <% if content_for?(:breadcrumbs) %>
+ <%= yield :breadcrumbs %>
+ <% else %>
+ <%= render "layouts/shared/breadcrumbs", breadcrumbs: @breadcrumbs %>
+ <% end %>
+
+ <% if content_for?(:page_header) %>
+ <%= yield :page_header %>
+ <% end %>
+ <% end %>
<%= yield %>
<% end %>
<% end %>
diff --git a/app/views/layouts/settings.html.erb b/app/views/layouts/settings.html.erb
index f8743333..e394b592 100644
--- a/app/views/layouts/settings.html.erb
+++ b/app/views/layouts/settings.html.erb
@@ -7,6 +7,12 @@
<main class="py-4 px-10 grow flex h-full overflow-y-auto">
<div class="relative max-w-4xl mx-auto flex flex-col w-full h-full">
<div class="grow space-y-4 overflow-y-auto -mx-1 px-1 pb-12">
+ <% if content_for?(:breadcrumbs) %>
+ <%= yield :breadcrumbs %>
+ <% else %>
+ <%= render "layouts/shared/breadcrumbs", breadcrumbs: @breadcrumbs %>
+ <% end %>
+
<% if content_for?(:page_title) %>
<h1 class="text-primary text-xl font-medium">
<%= content_for :page_title %>
diff --git a/app/views/layouts/shared/_breadcrumbs.html.erb b/app/views/layouts/shared/_breadcrumbs.html.erb
new file mode 100644
index 00000000..e6604ba9
--- /dev/null
+++ b/app/views/layouts/shared/_breadcrumbs.html.erb
@@ -0,0 +1,21 @@
+<%# locals: (breadcrumbs:) %>
+
+<nav class="flex items-center gap-2 mb-6">
+ <button data-action="sidebar#toggle" class="w-9 h-9 inline-flex rounded-lg items-center justify-center hover:bg-gray-100 cursor-pointer">
+ <%= icon("panel-left", color: "gray") %>
+ </button>
+
+ <% breadcrumbs.each_with_index do |(name, path), index| %>
+ <% if index > 0 %>
+ <%= icon("chevron-right", color: "gray", size: "sm") %>
+ <% end %>
+
+ <% if path.present? && index < breadcrumbs.size - 1 %>
+ <%= link_to name, path, class: "text-sm text-gray-500 font-medium" %>
+ <% elsif index == breadcrumbs.size - 1 %>
+ <span class="text-gray-900 font-medium text-sm"><%= name %></span>
+ <% else %>
+ <span class="text-sm text-gray-500 font-medium"><%= name %></span>
+ <% end %>
+ <% end %>
+</nav>
\ No newline at end of file
diff --git a/app/views/layouts/shared/_page_header.html.erb b/app/views/layouts/shared/_page_header.html.erb
new file mode 100644
index 00000000..9c2e2726
--- /dev/null
+++ b/app/views/layouts/shared/_page_header.html.erb
@@ -0,0 +1,11 @@
+<%# This partial renders the page header with title and optional subtitle %>
+<header class="space-y-6">
+ <% if local_assigns[:title].present? %>
+ <div class="space-y-1">
+ <h1 class="text-3xl font-medium text-gray-900"><%= title %></h1>
+ <% if local_assigns[:subtitle].present? %>
+ <p class="text-gray-500"><%= subtitle %></p>
+ <% end %>
+ </div>
+ <% end %>
+</header>
\ No newline at end of file
diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb
index b9055b70..cc6ef589 100644
--- a/app/views/pages/dashboard.html.erb
+++ b/app/views/pages/dashboard.html.erb
@@ -1,23 +1,11 @@
-<div class="w-full space-y-6 pb-24">
- <header class="space-y-6">
- <nav class="flex items-center gap-2">
- <button data-action="sidebar#toggle" class="w-9 h-9 inline-flex rounded-lg items-center justify-center hover:bg-gray-100 cursor-pointer">
- <%= icon("panel-left", color: "gray") %>
- </button>
-
- <span class="text-sm text-gray-500 font-medium">Home</span>
-
- <%= icon("chevron-right", color: "gray", size: "sm") %>
-
- <span class="text-gray-900 font-medium text-sm">Dashboard</span>
- </nav>
-
- <div class="space-y-1">
- <h1 class="text-3xl font-medium text-gray-900">Welcome back, <%= Current.user.first_name %></h1>
- <p class="text-gray-500">Here's what's happening with your money this week</p>
- </div>
- </header>
+<% content_for :page_header do %>
+ <div class="space-y-1 mb-6">
+ <h1 class="text-3xl font-medium text-gray-900">Welcome back, <%= Current.user.first_name %></h1>
+ <p class="text-gray-500">Here's what's happening with your money this week</p>
+ </div>
+<% end %>
+<div class="w-full space-y-6 pb-24">
<section class="bg-white py-4 rounded-xl shadow-border-xs">
<%= render partial: "pages/dashboard/net_worth_chart", locals: { series: @balance_sheet.net_worth_series(period: @period), period: @period } %>
</section>
diff --git a/test/system/accounts_test.rb b/test/system/accounts_test.rb
index 64c5a8bf..ff8d4500 100644
--- a/test/system/accounts_test.rb
+++ b/test/system/accounts_test.rb
@@ -103,7 +103,7 @@ class AccountsTest < ApplicationSystemTestCase
visit account_url(created_account)
- within "header" do
+ within "header:has(button[data-menu-target='button'])" do
find('button[data-menu-target="button"]').click
click_on "Edit"
end