Merge pull request #19 from dalvarez2596/lesson-58

Add online function for users
dalvarez2596 · Oct 26, 2024 · f76d65a · f76d65a
2 parents 5bab99f + c5864f6
commit f76d65a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -2,6 +2,7 @@ class ApplicationController < ActionController::Base
   before_action :authenticate_user!
   protect_from_forgery
 
+  after_action :user_activity
   allow_browser versions: :modern
 
   include Pundit::Authorization
@@ -16,6 +17,11 @@ def set_global_variables
   end
 
   private
+
+  def user_activity
+    current_user.try :touch
+  end
+
   def user_not_authorized # pundit
     flash[:alert] = "You are not authorized to perform this action."
     redirect_back_or_to(root_path)

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -41,8 +41,11 @@ def assign_default_role
     end
   end
 
-  private
+  def online?
+    updated_at > 2.minutes.ago
+  end
 
+  private
   validate :must_have_a_role, on: :update
   def must_have_a_role
     errors.add(:role_ids, "Must have a at least one role.") unless roles.any?

diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml
@@ -1,6 +1,6 @@
 .card.my-2
   .card-header
-    .fa.fa-user
+    %span{ class: user.online? ? "text-success fa fa-user" : "text-danger fa fa-user" }
     = link_to user.email, user_path(user)
   .card-footer
     Signed up