From ebb32bb6714a160c55f0b30cbad4e42ee66cccd9 Mon Sep 17 00:00:00 2001 From: sokie Date: Fri, 24 Oct 2025 17:56:48 +0200 Subject: [PATCH 1/3] Category improvements - Updated default categories to a more inclusive set - Updated default icon set for categories - Updated default categories colors to better separate then. --- app/models/category.rb | 46 ++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/app/models/category.rb b/app/models/category.rb index 3c63c45aba9..5582330e554 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -47,7 +47,20 @@ def initialize(category, subcategories = nil) class << self def icon_codes - %w[bus circle-dollar-sign ambulance apple award baby battery lightbulb bed-single beer bluetooth book briefcase building credit-card camera utensils cooking-pot cookie dices drama dog drill drum dumbbell gamepad-2 graduation-cap house hand-helping ice-cream-cone phone piggy-bank pill pizza printer puzzle ribbon shopping-cart shield-plus ticket trees] + %w[ + ambulance apple award baby banknote barcode bath battery bed-single beer bike + bluetooth bone book book-open briefcase building bus cake calculator camera + car cat circle-dollar-sign coffee coins compass cookie cooking-pot credit-card + dices dog drama drill droplet drum dumbbell film flame flower fuel gamepad-2 + gift glasses globe graduation-cap hammer hand-helping headphones heart + heart-pulse home house ice-cream-cone key landmark laptop leaf lightbulb + luggage mail map-pin mic monitor moon music package palette paw-print pen + pencil phone piggy-bank pill pizza plane plug power printer puzzle receipt + ribbon scale scissors settings shield shield-plus shirt shopping-bag + shopping-cart smartphone sparkles sprout stethoscope store sun tag target + tent thermometer ticket train trees trophy truck tv umbrella users utensils + video wallet waves wifi wine wrench zap + ] end def bootstrap! @@ -71,20 +84,27 @@ def uncategorized private def default_categories [ - [ "Income", "#e99537", "circle-dollar-sign", "income" ], - [ "Loan Payments", "#6471eb", "credit-card", "expense" ], - [ "Fees", "#6471eb", "credit-card", "expense" ], - [ "Entertainment", "#df4e92", "drama", "expense" ], - [ "Food & Drink", "#eb5429", "utensils", "expense" ], - [ "Shopping", "#e99537", "shopping-cart", "expense" ], - [ "Home Improvement", "#6471eb", "house", "expense" ], + [ "Income", "#22c55e", "circle-dollar-sign", "income" ], + [ "Food & Drink", "#f97316", "utensils", "expense" ], + [ "Groceries", "#407706", "shopping-bag", "expense" ], + [ "Shopping", "#3b82f6", "shopping-cart", "expense" ], + [ "Transportation", "#0ea5e9", "bus", "expense" ], + [ "Travel", "#2563eb", "plane", "expense" ], + [ "Entertainment", "#a855f7", "drama", "expense" ], [ "Healthcare", "#4da568", "pill", "expense" ], - [ "Personal Care", "#4da568", "pill", "expense" ], - [ "Services", "#4da568", "briefcase", "expense" ], + [ "Personal Care", "#14b8a6", "scissors", "expense" ], + [ "Home Improvement", "#d97706", "house", "expense" ], + [ "Mortgage / Rent", "#b45309", "home", "expense" ], + [ "Utilities", "#f97316", "lightbulb", "expense" ], + [ "Subscriptions", "#6366f1", "wifi", "expense" ], + [ "Insurance", "#0ea5e9", "shield", "expense" ], + [ "Sports & Fitness", "#10b981", "dumbbell", "expense" ], [ "Gifts & Donations", "#61c9ea", "hand-helping", "expense" ], - [ "Transportation", "#df4e92", "bus", "expense" ], - [ "Travel", "#df4e92", "plane", "expense" ], - [ "Rent & Utilities", "#db5a54", "lightbulb", "expense" ] + [ "Taxes", "#dc2626", "landmark", "expense" ], + [ "Loan Payments", "#dc2626", "credit-card", "expense" ], + [ "Services", "#6366f1", "briefcase", "expense" ], + [ "Fees", "#6b7280", "receipt", "expense" ], + [ "Savings & Investments", "#10b981", "piggy-bank", "expense" ] ] end end From f12c2ea5bd2eaef050a09c643b62ef8567925cdf Mon Sep 17 00:00:00 2001 From: sokie Date: Fri, 24 Oct 2025 18:02:46 +0200 Subject: [PATCH 2/3] FIX tests --- test/controllers/categories_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb index 2cbb46f5c45..5518ea7316f 100644 --- a/test/controllers/categories_controller_test.rb +++ b/test/controllers/categories_controller_test.rb @@ -84,7 +84,7 @@ class CategoriesControllerTest < ActionDispatch::IntegrationTest end test "bootstrap" do - assert_difference "Category.count", 12 do + assert_difference "Category.count", 19 do post bootstrap_categories_url end From cef300500e8e1213134f6b37862aab55022d7953 Mon Sep 17 00:00:00 2001 From: sokie Date: Fri, 24 Oct 2025 18:06:17 +0200 Subject: [PATCH 3/3] Better color pallettes for a few --- app/models/category.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/category.rb b/app/models/category.rb index 5582330e554..3d104f18ad2 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -95,16 +95,16 @@ def default_categories [ "Personal Care", "#14b8a6", "scissors", "expense" ], [ "Home Improvement", "#d97706", "house", "expense" ], [ "Mortgage / Rent", "#b45309", "home", "expense" ], - [ "Utilities", "#f97316", "lightbulb", "expense" ], + [ "Utilities", "#eab308", "lightbulb", "expense" ], [ "Subscriptions", "#6366f1", "wifi", "expense" ], - [ "Insurance", "#0ea5e9", "shield", "expense" ], + [ "Insurance", "#0284c7", "shield", "expense" ], [ "Sports & Fitness", "#10b981", "dumbbell", "expense" ], [ "Gifts & Donations", "#61c9ea", "hand-helping", "expense" ], [ "Taxes", "#dc2626", "landmark", "expense" ], - [ "Loan Payments", "#dc2626", "credit-card", "expense" ], - [ "Services", "#6366f1", "briefcase", "expense" ], + [ "Loan Payments", "#e11d48", "credit-card", "expense" ], + [ "Services", "#7c3aed", "briefcase", "expense" ], [ "Fees", "#6b7280", "receipt", "expense" ], - [ "Savings & Investments", "#10b981", "piggy-bank", "expense" ] + [ "Savings & Investments", "#059669", "piggy-bank", "expense" ] ] end end