Merge branch 'main' of https://github.com/maybe-finance/maybe

Gemfile

@@ -32,10 +32,10 @@ gem "jbuilder"
 # Use Redis adapter to run Action Cable in production
 gem "redis", ">= 4.0.1"
 
-# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
-# gem "kredis"
+ # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
+ # gem "kredis"
 
-# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
+ # Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
  gem "bcrypt", "~> 3.1.7"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -106,7 +106,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
-    brakeman (6.1.1)
+    brakeman (6.1.2)
       racc
     builder (3.2.4)
     capybara (3.40.0)

app/controllers/application_controller.rb

@@ -20,7 +20,7 @@ def current_family
 
   def authenticate_user_from_session
     User.find_by(id: session[:user_id])
-  end  
+  end
 
   def user_signed_in?
     current_user.present?

app/controllers/pages_controller.rb

@@ -1,6 +1,6 @@
 class PagesController < ApplicationController
   before_action :authenticate_user!
-  
+
   def dashboard
   end
 end

app/controllers/password_resets_controller.rb

@@ -1,6 +1,6 @@
 class PasswordResetsController < ApplicationController
   layout "auth"
-  
+
   def new
   end
 
@@ -37,4 +37,3 @@ def password_params
     params.require(:user).permit(:password, :password_confirmation)
   end
 end
-

app/controllers/passwords_controller.rb

@@ -18,4 +18,3 @@ def password_params
     params.require(:user).permit(:password, :password_confirmation, :password_challenge).with_defaults(password_challenge: "")
   end
 end
-

app/controllers/registrations_controller.rb

@@ -1,6 +1,6 @@
 class RegistrationsController < ApplicationController
   layout "auth"
-  
+
   def new
     @user = User.new
   end
@@ -27,4 +27,3 @@ def user_params
     params.require(:user).permit(:name, :email, :password, :password_confirmation)
   end
 end
-

app/controllers/sessions_controller.rb

@@ -1,6 +1,6 @@
 class SessionsController < ApplicationController
   layout "auth"
-  
+
   def new
   end
 
@@ -13,10 +13,9 @@ def create
       render :new, status: :unprocessable_entity
     end
   end
-  
+
   def destroy
     logout
     redirect_to root_path, notice: "You have signed out successfully."
   end
 end
-

app/models/current.rb

@@ -1,3 +1,3 @@
 class Current < ActiveSupport::CurrentAttributes
   attribute :user
-end
+end

app/models/user.rb

@@ -1,10 +1,10 @@
 class User < ApplicationRecord
   has_secure_password
-  
+
   belongs_to :family
 
   validates :email, presence: true, uniqueness: true
-  normalizes :email, with: -> (email) { email.strip.downcase }
+  normalizes :email, with: ->(email) { email.strip.downcase }
 
   generates_token_for :password_reset, expires_in: 15.minutes do
     password_salt&.last(10)

config/initializers/generator.rb

@@ -1,3 +1,3 @@
 Rails.application.config.generators do |g|
   g.orm :active_record, primary_key_type: :uuid
-end
+end