- <%= account.accountable.model_name.human %>
+
+ <%= to_accountable_title(account.accountable) %>
-
+
<%= humanized_money_with_symbol account.balance %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 80628e29..fd46221a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -56,8 +56,10 @@
- <%= t('.accounts') %>
- <%= 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_accoount') do %>
+ <%= link_to accounts_path, class: 'text-xs' 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') do %>
<%= inline_svg_tag('icon-add.svg', class: 'text-gray-500 fill-current') %>
<% end %>
diff --git a/app/views/settings/edit.html.erb b/app/views/settings/edit.html.erb
index 145ec171..14a5e9d4 100644
--- a/app/views/settings/edit.html.erb
+++ b/app/views/settings/edit.html.erb
@@ -3,34 +3,34 @@
<%= form_with model: Current.user, url: settings_path, html: { class: "space-y-4" } do |form| %>
<%= form.fields_for :family_attributes do |family_fields| %>
- <%= family_fields.label :name, "Family name", class: "block text-sm font-medium opacity-50 focus-within:opacity-100" %>
+ <%= family_fields.label :name, "Family name", class: "block text-sm font-medium opacity-75 focus-within:opacity-100" %>
<%= family_fields.text_field :name, placeholder: "Family name", value: Current.family.name, class: "p-0 mt-1 bg-transparent border-none opacity-50 focus:outline-none focus:ring-0 focus-within:opacity-100" %>
<% end %>
- <%= form.label :first_name, class: "block text-sm font-medium opacity-50 focus-within:opacity-100" %>
+ <%= form.label :first_name, class: "block text-sm font-medium opacity-75 focus-within:opacity-100" %>
<%= form.text_field :first_name, placeholder: "First name", value: Current.user.first_name, class: "w-full p-0 mt-1 bg-transparent border-none opacity-50 focus:outline-none focus:ring-0 focus-within:opacity-100" %>
- <%= form.label :last_name, class: "block text-sm font-medium opacity-50 focus-within:opacity-100" %>
+ <%= form.label :last_name, class: "block text-sm font-medium opacity-75 focus-within:opacity-100" %>
<%= form.text_field :last_name, placeholder: "Last name", value: Current.user.last_name, class: "w-full p-0 mt-1 bg-transparent border-none opacity-50 focus:outline-none focus:ring-0 focus-within:opacity-100" %>
- <%= form.label :email, class: "block text-sm font-medium opacity-50 focus-within:opacity-100" %>
+ <%= form.label :email, class: "block text-sm font-medium opacity-75 focus-within:opacity-100" %>
<%= form.email_field :email, placeholder: "Email", value: Current.user.email, class: "w-full p-0 mt-1 bg-transparent border-none opacity-50 focus:outline-none focus:ring-0 focus-within:opacity-100" %>
- <%= form.label :password, class: "block text-sm font-medium opacity-50 focus-within:opacity-100" %>
+ <%= form.label :password, class: "block text-sm font-medium opacity-75 focus-within:opacity-100" %>
<%= form.password_field :password, class: "w-full p-0 mt-1 bg-transparent border-none opacity-50 focus:outline-none focus:ring-0 focus-within:opacity-100" %>
- <%= form.label :password_confirmation, class: "block text-sm font-medium opacity-50 focus-within:opacity-100" %>
+ <%= form.label :password_confirmation, class: "block text-sm font-medium opacity-75 focus-within:opacity-100" %>
<%= form.password_field :password_confirmation, class: "w-full p-0 mt-1 bg-transparent border-none opacity-50 focus:outline-none focus:ring-0 focus-within:opacity-100" %>
diff --git a/config/locales/views/layout/en.yml b/config/locales/views/layout/en.yml
index 85310a0f..780891a5 100644
--- a/config/locales/views/layout/en.yml
+++ b/config/locales/views/layout/en.yml
@@ -5,7 +5,7 @@ en:
accounts: Accounts
cash: Cash
dashboard: Dashboard
- new_accoount: New Account
+ new_account: New Account
auth:
or: or
privacy_policy: Privacy Policy
diff --git a/db/migrate/20240206031739_replace_money_field.rb b/db/migrate/20240206031739_replace_money_field.rb
index dfe2b732..4c5ef9db 100644
--- a/db/migrate/20240206031739_replace_money_field.rb
+++ b/db/migrate/20240206031739_replace_money_field.rb
@@ -6,7 +6,7 @@ class ReplaceMoneyField < ActiveRecord::Migration[7.2]
Account.reset_column_information
Account.find_each do |account|
- account.update_columns(balance_cents: Money.from_amount(account.balance, account.currency).cents)
+ account.update_columns(balance_cents: Money.from_amount(account.balance_in_database, account.currency).cents)
end
remove_column :accounts, :balance
diff --git a/db/seeds.rb b/db/seeds.rb
index 4fbd6ed9..396593bd 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -7,3 +7,11 @@
# ["Action", "Comedy", "Drama", "Horror"].each do |genre_name|
# MovieGenre.find_or_create_by!(name: genre_name)
# end
+
+# Create the default user
+family = Family.create_or_find_by!(name: "The Maybe Family")
+puts "Family created: #{family.name}"
+user = User.create_or_find_by!(
+ first_name: "Josh", last_name: "Maybe", email: "user@maybe.local",
+ password: "password", password_confirmation: "password", family_id: family.id)
+puts "User created: #{user.email} for family: #{family.name}"
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
new file mode 100644
index 00000000..14fafe8e
--- /dev/null
+++ b/test/helpers/application_helper_test.rb
@@ -0,0 +1,19 @@
+require "test_helper"
+
+class ApplicationHelperTest < ActionView::TestCase
+ test "#title(page_title)" do
+ title("Test Title")
+ assert_equal "Test Title", content_for(:title)
+ end
+
+ test "#header_title(page_title)" do
+ header_title("Test Header Title")
+ assert_equal "Test Header Title", content_for(:header_title)
+ end
+
+ test "#permitted_accountable_partial(accountable_type)" do
+ assert_equal "account", permitted_accountable_partial("Account")
+ assert_equal "user", permitted_accountable_partial("User")
+ assert_equal "admin_user", permitted_accountable_partial("AdminUser")
+ end
+end
diff --git a/test/system/accounts_test.rb b/test/system/accounts_test.rb
index 030cb87d..9c4401fe 100644
--- a/test/system/accounts_test.rb
+++ b/test/system/accounts_test.rb
@@ -5,14 +5,16 @@ class AccountsTest < ApplicationSystemTestCase
sign_in @user = users(:bob)
end
- # test "should create account" do
- # click_on "New account"
- # click_on "Credit Card"
- # within "form" do
- # fill_in "Name", with: "VISA"
- # fill_in "Balance", with: "1000"
- # click_on "Submit"
- # end
- # assert_text "$1,000"
- # end
+ test "should create account" do
+ skip("Disabling this test for now, UI is changing to quickly to do systems testing")
+
+ click_on "New account"
+ click_on "Credit Card"
+ within "form" do
+ fill_in "Name", with: "VISA"
+ fill_in "Balance", with: "1000"
+ click_on "Submit"
+ end
+ assert_text "$1,000"
+ end
end