mirror of
https://github.com/maybe-finance/maybe.git
synced 2025-08-04 13:05:19 +02:00
Merge branch 'main' of https://github.com/maybe-finance/maybe
This commit is contained in:
commit
55c352e8ef
11 changed files with 14 additions and 18 deletions
|
@ -20,7 +20,7 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
def authenticate_user_from_session
|
||||
User.find_by(id: session[:user_id])
|
||||
end
|
||||
end
|
||||
|
||||
def user_signed_in?
|
||||
current_user.present?
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
class PagesController < ApplicationController
|
||||
before_action :authenticate_user!
|
||||
|
||||
|
||||
def dashboard
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
class PasswordResetsController < ApplicationController
|
||||
layout "auth"
|
||||
|
||||
|
||||
def new
|
||||
end
|
||||
|
||||
|
@ -37,4 +37,3 @@ class PasswordResetsController < ApplicationController
|
|||
params.require(:user).permit(:password, :password_confirmation)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -18,4 +18,3 @@ class PasswordsController < ApplicationController
|
|||
params.require(:user).permit(:password, :password_confirmation, :password_challenge).with_defaults(password_challenge: "")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
class RegistrationsController < ApplicationController
|
||||
layout "auth"
|
||||
|
||||
|
||||
def new
|
||||
@user = User.new
|
||||
end
|
||||
|
@ -27,4 +27,3 @@ class RegistrationsController < ApplicationController
|
|||
params.require(:user).permit(:name, :email, :password, :password_confirmation)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
class SessionsController < ApplicationController
|
||||
layout "auth"
|
||||
|
||||
|
||||
def new
|
||||
end
|
||||
|
||||
|
@ -13,10 +13,9 @@ class SessionsController < ApplicationController
|
|||
render :new, status: :unprocessable_entity
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def destroy
|
||||
logout
|
||||
redirect_to root_path, notice: "You have signed out successfully."
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
class Current < ActiveSupport::CurrentAttributes
|
||||
attribute :user
|
||||
end
|
||||
end
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue