The personal finance app for everyone
Dashboard empty view (#707)
Claude Ayitey9563ac6334c9
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rbindex 3c800760..ce3d1206 100644--- a/app/controllers/accounts_controller.rb+++ b/app/controllers/accounts_controller.rb@@ -11,7 +11,8 @@ class AccountsController < ApplicationController@net_worth_series = snapshot[:net_worth_series]@asset_series = snapshot[:asset_series]@liability_series = snapshot[:liability_series]- @account_groups = Current.family.accounts.by_group(period: @period, currency: Current.family.currency)+ @accounts = Current.family.accounts+ @account_groups = @accounts.by_group(period: @period, currency: Current.family.currency)enddef listdiff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rbindex 1fd81196..ba584e9f 100644--- a/app/controllers/pages_controller.rb+++ b/app/controllers/pages_controller.rb@@ -17,7 +17,8 @@ class PagesController < ApplicationController@top_earners = snapshot_account_transactions[:top_earners]@top_savers = snapshot_account_transactions[:top_savers]- @account_groups = Current.family.accounts.by_group(period: @period, currency: Current.family.currency)+ @accounts = Current.family.accounts+ @account_groups = @accounts.by_group(period: @period, currency: Current.family.currency)@transactions = Current.family.transactions.limit(5).order(date: :desc)# TODO: Placeholders for trendlinesdiff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erbindex f844067d..a940c82a 100644--- a/app/views/accounts/index.html.erb+++ b/app/views/accounts/index.html.erb@@ -4,7 +4,7 @@<div class="space-y-4"><div class="flex items-center justify-between"><h1 class="text-xl font-medium text-gray-900">Accounts</h1>- <%= link_to new_account_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo_frame: "modal" } do %>+ <%= link_to new_account_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %><%= lucide_icon("plus", class: "w-5 h-5") %><span><%= t(".new_account") %></span><% end %>@@ -14,7 +14,7 @@<div class="text-center flex flex-col items-center max-w-[300px]"><p class="text-gray-900 mb-1 font-medium">No accounts yet</p><p class="text-gray-500 mb-4">Add an account either via connection, importing or entering manually.</p>- <%= link_to new_account_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo_frame: "modal" } do %>+ <%= link_to new_account_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %><%= lucide_icon("plus", class: "w-5 h-5") %><span><%= t(".new_account") %></span><% end %>diff --git a/app/views/accounts/summary.html.erb b/app/views/accounts/summary.html.erbindex ed519094..6ad213ad 100644--- a/app/views/accounts/summary.html.erb+++ b/app/views/accounts/summary.html.erb@@ -1,76 +1,81 @@<div class="space-y-4"><div class="flex items-center justify-between"><h1 class="text-xl font-medium text-gray-900">Accounts</h1>- <%= link_to new_account_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo_frame: "modal" } do %>+ <%= link_to new_account_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %><%= lucide_icon("plus", class: "w-5 h-5") %><span><%= t(".new") %></span><% end %></div>- <div class="bg-white rounded-xl shadow-xs border border-alpha-black-100 flex divide-x divide-gray-200">- <div class="w-1/2 p-4 flex items-stretch justify-between">- <div class="space-y-2 grow">- <%= render partial: "shared/value_heading", locals: {- label: "Assets",- period: @period,- value: Current.family.assets,- trend: @asset_series.trend- } %>++ <% if @accounts.empty? %>+ <%= render "shared/no_account_empty_state" %>+ <% else %>+ <div class="bg-white rounded-xl shadow-xs border border-alpha-black-100 flex divide-x divide-gray-200">+ <div class="w-1/2 p-4 flex items-stretch justify-between">+ <div class="space-y-2 grow">+ <%= render partial: "shared/value_heading", locals: {+ label: "Assets",+ period: @period,+ value: Current.family.assets,+ trend: @asset_series.trend+ } %>+ </div>+ <div+ id="assetsChart"+ class="h-full w-2/5"+ data-controller="time-series-chart"+ data-time-series-chart-data-value="<%= @asset_series.to_json %>"+ data-time-series-chart-use-labels-value="false"></div></div>- <div- id="assetsChart"- class="h-full w-2/5"- data-controller="time-series-chart"- data-time-series-chart-data-value="<%= @asset_series.to_json %>"- data-time-series-chart-use-labels-value="false"></div>- </div>- <div class="w-1/2 p-4 flex items-stretch justify-between">- <div class="space-y-2 grow">- <%= render partial: "shared/value_heading", locals: {- label: "Liabilities",- period: @period,- size: "md",- value: Current.family.liabilities,- trend: @liability_series.trend- } %>+ <div class="w-1/2 p-4 flex items-stretch justify-between">+ <div class="space-y-2 grow">+ <%= render partial: "shared/value_heading", locals: {+ label: "Liabilities",+ period: @period,+ size: "md",+ value: Current.family.liabilities,+ trend: @liability_series.trend+ } %>+ </div>+ <div+ id="liabilitiesChart"+ class="h-full w-2/5"+ data-controller="time-series-chart"+ data-time-series-chart-data-value="<%= @liability_series.to_json %>"+ data-time-series-chart-use-labels-value="false"></div></div>- <div- id="liabilitiesChart"- class="h-full w-2/5"- data-controller="time-series-chart"- data-time-series-chart-data-value="<%= @liability_series.to_json %>"- data-time-series-chart-use-labels-value="false"></div></div>- </div>- <div class="p-4 bg-white rounded-xl shadow-xs border border-alpha-black-25 space-y-4">- <div class="flex justify-between items-center mb-5">- <h2 class="text-lg font-medium text-gray-900">Assets</h2>- <div class="flex items-center gap-2">- <%= link_to new_account_path, class: "flex items-center gap-1 p-2 text-gray-900 text-sm font-medium bg-gray-50 rounded-lg hover:bg-gray-100", data: { turbo_frame: "modal" } do %>- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>- <p><%= t(".new") %></p>- <% end %>- <%= form_with url: summary_accounts_path, method: :get, class: "flex items-center gap-4", data: { controller: "auto-submit-form" } do %>- <%= render partial: "shared/period_select", locals: { value: @period.name } %>- <% end %>+ <div class="p-4 bg-white rounded-xl shadow-xs border border-alpha-black-25 space-y-4">+ <div class="flex justify-between items-center mb-5">+ <h2 class="text-lg font-medium text-gray-900">Assets</h2>+ <div class="flex items-center gap-2">+ <%= link_to new_account_path, class: "flex items-center gap-1 p-2 pr-3 text-gray-900 text-sm font-medium bg-gray-50 rounded-lg hover:bg-gray-100", data: { turbo_frame: "modal" } do %>+ <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>+ <p><%= t(".new") %></p>+ <% end %>+ <%= form_with url: summary_accounts_path, method: :get, class: "flex items-center gap-4", data: { controller: "auto-submit-form" } do %>+ <%= render partial: "shared/period_select", locals: { value: @period.name } %>+ <% end %>+ </div></div>+ <%= render partial: "pages/account_percentages_bar", locals: { account_groups: @account_groups[:assets].children } %>+ <%= render partial: "pages/account_percentages_table", locals: { account_groups: @account_groups[:assets].children } %></div>- <%= render partial: "pages/account_percentages_bar", locals: { account_groups: @account_groups[:assets].children } %>- <%= render partial: "pages/account_percentages_table", locals: { account_groups: @account_groups[:assets].children } %>- </div>- <div class="p-4 bg-white rounded-xl shadow-xs border border-alpha-black-25 space-y-4">- <div class="flex justify-between items-center mb-5">- <h2 class="text-lg font-medium text-gray-900">Liabilities</h2>- <div class="flex items-center gap-2">- <%= link_to new_account_path, class: "flex items-center gap-1 p-2 text-gray-900 text-sm font-medium bg-gray-50 rounded-lg hover:bg-gray-100", data: { turbo_frame: "modal" } do %>- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>- <p><%= t(".new") %></p>- <% end %>- <%= form_with url: summary_accounts_path, method: :get, class: "flex items-center gap-4", data: { controller: "auto-submit-form" } do %>- <%= render partial: "shared/period_select", locals: { value: @period.name } %>- <% end %>+ <div class="p-4 bg-white rounded-xl shadow-xs border border-alpha-black-25 space-y-4">+ <div class="flex justify-between items-center mb-5">+ <h2 class="text-lg font-medium text-gray-900">Liabilities</h2>+ <div class="flex items-center gap-2">+ <%= link_to new_account_path, class: "flex items-center gap-1 p-2 pr-3 text-gray-900 text-sm font-medium bg-gray-50 rounded-lg hover:bg-gray-100", data: { turbo_frame: "modal" } do %>+ <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>+ <p><%= t(".new") %></p>+ <% end %>+ <%= form_with url: summary_accounts_path, method: :get, class: "flex items-center gap-4", data: { controller: "auto-submit-form" } do %>+ <%= render partial: "shared/period_select", locals: { value: @period.name } %>+ <% end %>+ </div></div>+ <%= render partial: "pages/account_percentages_bar", locals: { account_groups: @account_groups[:liabilities].children } %>+ <%= render partial: "pages/account_percentages_table", locals: { account_groups: @account_groups[:liabilities].children } %></div>- <%= render partial: "pages/account_percentages_bar", locals: { account_groups: @account_groups[:liabilities].children } %>- <%= render partial: "pages/account_percentages_table", locals: { account_groups: @account_groups[:liabilities].children } %>- </div>+ <% end %></div>diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erbindex 53d658f4..8c527050 100644--- a/app/views/pages/dashboard.html.erb+++ b/app/views/pages/dashboard.html.erb@@ -3,13 +3,18 @@<div><h1 class="sr-only">Dashboard</h1><p class="text-xl font-medium text-gray-900 mb-1"><%= t(".greeting", name: Current.user.first_name ) %></p>- <p class="text-gray-500 text-sm"><%= t(".subtitle") %></p>+ <% if [email protected]? %>+ <p class="text-gray-500 text-sm"><%= t(".subtitle") %></p>+ <% end %></div>- <%= link_to new_account_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo_frame: "modal" } do %>+ <%= link_to new_account_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %><%= lucide_icon("plus", class: "w-5 h-5") %><span><%= t(".new") %></span><% end %></header>+ <% if @accounts.empty? %>+ <%= render "shared/no_account_empty_state" %>+ <% else %><section class="flex gap-4"><div class="bg-white border border-alpha-black-25 shadow-xs rounded-xl w-3/4 min-h-48 flex flex-col"><div class="flex justify-between p-4">@@ -177,4 +182,5 @@</div></div></section>+ <% end %></div>diff --git a/app/views/shared/_no_account_empty_state.html.erb b/app/views/shared/_no_account_empty_state.html.erbnew file mode 100644index 00000000..061e6af8--- /dev/null+++ b/app/views/shared/_no_account_empty_state.html.erb@@ -0,0 +1,10 @@+<div class="flex justify-center items-center h-[800px] text-sm">+ <div class="text-center flex flex-col items-center max-w-[300px]">+ <p class="text-gray-900 mb-1 font-medium"><%= t(".no_account_title") %></p>+ <p class="text-gray-500 mb-4"><%= t(".no_account_subtitle") %></p>+ <%= link_to new_account_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>+ <%= lucide_icon("plus", class: "w-5 h-5") %>+ <span><%= t(".new_account") %></span>+ <% end %>+ </div>+</div>diff --git a/app/views/transactions/merchants/index.html.erb b/app/views/transactions/merchants/index.html.erbindex 46469559..f26bdfc2 100644--- a/app/views/transactions/merchants/index.html.erb+++ b/app/views/transactions/merchants/index.html.erb@@ -4,7 +4,7 @@<div class="space-y-4"><div class="flex items-center justify-between"><h1 class="text-xl font-medium text-gray-900"><%= t(".title") %></h1>- <%= link_to new_transaction_merchant_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo_frame: "modal" } do %>+ <%= link_to new_transaction_merchant_path, class: "flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %><%= lucide_icon("plus", class: "w-5 h-5") %><span><%= t(".new_short") %></span><% end %>@@ -14,7 +14,7 @@<div class="flex justify-center items-center py-20"><div class="text-center flex flex-col items-center max-w-[300px]"><p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>- <%= link_to new_transaction_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo_frame: "modal" } do %>+ <%= link_to new_transaction_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %><%= lucide_icon("plus", class: "w-5 h-5") %><span><%= t(".new_long") %></span><% end %>diff --git a/config/environments/test.rb b/config/environments/test.rbindex 04a682d5..e7e507b7 100644--- a/config/environments/test.rb+++ b/config/environments/test.rb@@ -52,6 +52,8 @@ Rails.application.configure do# Tell Active Support which deprecation messages to disallow.config.active_support.disallowed_deprecation_warnings = []+ config.active_job.queue_adapter = :test+# Raises error for missing translations.# config.i18n.raise_on_missing_translations = truediff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.ymlindex 7b78ab73..1e22ea1e 100644--- a/config/locales/views/shared/en.yml+++ b/config/locales/views/shared/en.yml@@ -6,6 +6,11 @@ en:body_html: "<p>You will not be able to undo this decision</p>"cancel: Canceltitle: Are you sure?+ no_account_empty_state:+ new_account: New account+ no_account_subtitle: Since no accounts have been added, there's no data to display.+ Add your first accounts to start viewing dashboard data.+ no_account_title: No accounts yetnotification:dismiss: Dismissupgrade_notification: