Deploy v1.1 (#10)

* 🐛 fixed account form

* 🔧 configured i18n

* ✨ handled expense edit

* 🐛 budgets are now created on user registration

* 🐛 user now has to fill name and surname in order to connect

* :style: restyled sign up/in views

* 🐛 fixed submit button disappearing on sign up/in page

* ✨ new user are now redirected to account creation

* ✅ added test for signup redirection

Author: Un-dev

app/components/entry_card_component.html.erb

@@ -1,4 +1,4 @@
-<div class='flex flex-row p-4 w-full items-center space-x-4'>
+<%= link_to @link, class:'flex flex-row p-4 w-full items-center space-x-4' do %>
   <div style="background-color: <%= @color %>" class="flex items-center justify-center rounded-xl h-12 w-12 text-white">
     <%= @icon.html_safe %>
   </div>
@@ -9,5 +9,5 @@
     </div>
     <%= content_tag :p, @amount, class: "#{@amount_color} font-semibold" %>
   </div>
-</div>
+<% end %>
 <hr style="width:100%;border-color: #e3e3e3;text-align:left;margin-left:0">

app/components/entry_card_component.rb

@@ -1,6 +1,17 @@
 class EntryCardComponent < ViewComponent::Base
   attr_reader :entry
+
+  def before_render
+    @link =
+      if entry.class.name == 'Transfer'
+        edit_transfer_path(@id)
+      else
+        edit_expense_path(@id)
+      end
+  end
+
   def initialize(entry: nil)
+    @id = entry.id
     @title =
       if entry.class.name == 'Expense'
         entry.title

app/controllers/accounts_controller.rb

@@ -14,7 +14,7 @@ def create
   end
 
   def account_params
-    params.require(:account).permit(:title, :balance, :main_account)
+    params.require(:account).permit(:title, :balance, :main_account, :user_id)
   end
 
   def find_account

app/controllers/application_controller.rb

@@ -1,3 +1,16 @@
 class ApplicationController < ActionController::Base
   before_action :authenticate_user!
+  before_action :configure_permitted_parameters, if: :devise_controller?
+
+  protected
+
+  def configure_permitted_parameters
+    devise_parameter_sanitizer.permit(:sign_up) do |u|
+      u.permit(:name, :surname, :email, :password)
+    end
+
+    devise_parameter_sanitizer.permit(:account_update) do |u|
+      u.permit(:name, :surname, :email, :password, :current_password)
+    end
+  end
 end

app/controllers/expenses_controller.rb

@@ -17,12 +17,18 @@ def create
     end
   end
 
-  def edit
-    @expense.update(expense_params)
+  def edit; end
+
+  def update
+    if @expense.update(expense_params)
+      redirect_to url_for(controller: :users, action: :index)
+    else
+      render :edit
+    end
   end
 
   def find_expense
-    @expense = Expense.includes(:budget).find(params[:id])
+    @expense = Expense.find(params[:id])
   end
 
   def expense_params

app/controllers/registrations_controller.rb

@@ -0,0 +1,11 @@
+class RegistrationsController < Devise::RegistrationsController
+  protected
+
+  def after_sign_up_path_for(resource)
+    new_account_path # Or :prefix_to_your_route
+  end
+
+  def after_inactive_sign_up_path_for(resource)
+    new_account_path # Or :prefix_to_your_route
+  end
+end

app/models/budget.rb

@@ -1,7 +1,7 @@
 class Budget < ApplicationRecord
   belongs_to :user
   belongs_to :category
-  has_many :expenses, through: :category
+  has_many :expenses, through: :user
 
   validates :target_amount, presence: true, numericality: { greater_than: 0 }
 

app/models/user.rb

@@ -13,12 +13,23 @@ class User < ApplicationRecord
   has_many :sent_transfers,
            class_name: 'Transfer',
            foreign_key: 'from_account_id'
+  validates :name, :surname, presence: true
+  before_create :create_budgets
 
   def total_balance
     accounts.sum(:balance)
   end
 
   def transfers
-    accounts.includes([:sent_transfers]).map { |account| account.sent_transfers }.flatten
+    accounts
+      .includes([:sent_transfers])
+      .map { |account| account.sent_transfers }
+      .flatten
+  end
+
+  def create_budgets
+    Category.all.find_each do |category|
+      self.budgets.build(category: category, target_amount: 100, monthly: true)
+    end
   end
 end

app/views/accounts/_form.html.erb

@@ -1,16 +1,24 @@
 <%= form_with(model: account, local: true, class: 'flex flex-col w-full h-full') do |f| %>
   <%= render "shared/form_errors", form: f %>
   <div class="flex flex-col p-4 space-y-3">
+
+    <%= f.hidden_field :user_id, value: current_user.id %>
+
     <fieldset class='flex flex-col'>
       <%= f.label :title, class: 'font-semibold' %>
       <%= f.text_field :title, class: 'rounded border-gray-400' %>
     </fieldset>
 
-    <% yield %>
+    <% if @account.new_record? %>
+      <fieldset class='flex flex-col'>
+        <%= f.label :initial_balance, class: 'font-semibold' %>
+        <%= f.number_field :balance, class: 'rounded border-gray-400' %>
+      </fieldset>
+    <% end %>
 
-    <fieldset class='flex flex-col'>
+    <fieldset class='flex flex-row items-center'>
+      <%= f.check_box :main_account, class: 'rounded border-gray-400 mr-2' %>
       <%= f.label :main_account, class: 'font-semibold' %>
-      <%= f.check_box :main_account, class: 'rounded border-gray-400' %>
     </fieldset>
 
     <%= f.submit %>

app/views/accounts/edit.html.erb

@@ -1,2 +1,2 @@
-<%= render 'shared/header' %>
+<%= render 'shared/header', title: t(:edit_account) %>
 <%= render 'form', account: @account %>