diff --git a/app/views/accounts/_account_list.html.erb b/app/views/accounts/_account_list.html.erb
new file mode 100644
index 00000000..6d9617a6
--- /dev/null
+++ b/app/views/accounts/_account_list.html.erb
@@ -0,0 +1,30 @@
+<%# locals: (type:) -%>
+
+<% accounts = Current.family.accounts.where(accountable_type: type.name) %>
+
+
+
+ <%= lucide_icon("chevron-down", class: "hidden group-open:block text-[#737373] w-5 h-5") %>
+ <%= lucide_icon("chevron-right", class: "group-open:hidden text-[#737373] w-5 h-5") %>
+ <%= type.model_name.human %>
+ <%= humanized_money_with_symbol accounts.sum(&:balance) %>
+
+
+ <% accounts.each do |account| %>
+
+
+
<%= account.name %>
+ <% if account.subtype %>
+
<%= account.subtype&.humanize %>
+ <% end %>
+
+
<%= humanized_money_with_symbol account.balance %>
+
+ <% end %>
+
+ <%= link_to new_account_path(step: 'method', type: type.name.demodulize), class: "flex items-center gap-4 px-2 py-3 mb-1 text-[#737373] text-sm font-medium rounded-[10px] hover:bg-[#f2f2f2]", data: { turbo_frame: "modal" } do %>
+ <%= lucide_icon("plus", class: "w-5 h-5") %>
+ New <%= type.model_name.human.downcase %>
+ <% end %>
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 553132a6..59dc4c63 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -56,7 +56,7 @@
- <%= link_to accounts_path, class: 'text-xs' do%>
+ <%= link_to accounts_path, class: 'text-xs uppercase text-[#737373] font-bold tracking-wide' do%>
<%= t('.accounts') %>
<% end %>
<%= link_to new_account_path, class: 'block hover:bg-gray-100 p-2 text-sm font-semibold text-gray-900 flex items-center rounded', title: t('.new_account'), data: { turbo_frame: "modal" } do %>
@@ -64,20 +64,15 @@
<% end %>
-
-
<%= t('.cash') %>
- <% Current.family.accounts.each do |account| %>
-
-
- <%= account.name %>
-
-
- <%= humanized_money_with_symbol account.balance %>
-
-
- <% end %>
-
+ <%= link_to new_account_path, class: "flex items-center gap-4 px-2 py-3 mb-1 text-[#737373] text-sm font-medium rounded-[10px] hover:bg-[#f2f2f2]", data: { turbo_frame: "modal" } do %>
+ <%= lucide_icon("plus", class: "w-5 h-5") %>
+
<%= t('.new_account') %>
+ <% end %>
+
+ <% Account.accountable_types.each do |type| %>
+ <%= render 'accounts/account_list', type: type.constantize %>
+ <% end %>
diff --git a/config/locales/models/account/en.yml b/config/locales/models/account/en.yml
index 81090ddf..4b199653 100644
--- a/config/locales/models/account/en.yml
+++ b/config/locales/models/account/en.yml
@@ -12,8 +12,8 @@ en:
models:
account: Account
account/credit: Credit Card
- account/depository: Bank Accounts
- account/investment: Investments
+ account/depository: Bank Account
+ account/investment: Investment
account/loan: Loan
account/other_asset: Other Asset
account/other_liability: Other Liability
diff --git a/config/locales/views/layout/en.yml b/config/locales/views/layout/en.yml
index 780891a5..403f3ad9 100644
--- a/config/locales/views/layout/en.yml
+++ b/config/locales/views/layout/en.yml
@@ -3,9 +3,8 @@ en:
layouts:
application:
accounts: Accounts
- cash: Cash
dashboard: Dashboard
- new_account: New Account
+ new_account: New account
auth:
or: or
privacy_policy: Privacy Policy