refactoring

app/controllers/matches_controller.rb

@@ -4,7 +4,7 @@
 class MatchesController < ApplicationController
   load_and_authorize_resource :tournament
   load_and_authorize_resource through: :tournament
-  skip_load_and_authorize_resource only: :all
+  skip_load_and_authorize_resource only: %i[all playmatch]
 
   def index
     @matches = @matches.includes([:winner]).desc.page(params[:page])
@@ -21,8 +21,8 @@ def new
   end
 
   def playmatch
-    @match = Match.includes([:users]).find(params[:match_id])
-    redirect_to result_tournament_match_path(match_id: @match) unless @match.match_winner_id.nil?
+    @match = @tournament.matches.includes([:users]).find(params[:match_id])
+    redirect_to result_tournament_match_path(match_id: @match) unless @match.winner_id.nil?
     @players = @match.users
     @remaining_tries = @match.remaining_tries(@players.first.id)
     @done_tries = @match.selections.by_user(@players.first.id).size
@@ -33,14 +33,8 @@ def playmatch
   def result
     @is_player = @match.users.include?(current_user)
     @players = @match.users
-    @players_selections = @match.selections.order(:try_num).group_by(&:user_id)
+    @players_selections = @match.selections.includes(:user).order(:try_num).group_by(&:user_id)
     @players_scores = @match.selections.group(:user_id).winner.count
     @result_message = @match.result_message(current_user.id)
   end
-
-  private
-
-  def match_params
-    params.require(:match).permit(:match_winner_id, :winner_score, :match_time, :tournament_id)
-  end
 end

app/controllers/messages_controller.rb

@@ -22,6 +22,6 @@ def create
   private
 
   def message_params
-    params.permit(:user_id, :match_id, :message)
+    params.permit(:user_id, :match_id, :content)
   end
 end

app/controllers/selection_controller.rb

@@ -21,6 +21,6 @@ def new
   private
 
   def selection_params
-    params.require(:selection).permit(:match_id, :user_id, :selection)
+    params.require(:selection).permit(:match_id, :user_id, :choice)
   end
 end

app/controllers/tournaments_controller.rb

@@ -4,7 +4,7 @@ class TournamentsController < ApplicationController
   before_action :authenticate_user!, except: [:index]
 
   def index
-    @tournaments = Tournament.includes(:users).all
+    @tournaments = Tournament.includes(%i[users winner]).all
     @tournaments = @tournaments.order(:registration_deadline).page(params[:page])
   end
 
@@ -28,10 +28,10 @@ def register
   def create_matches
     registered_users = @tournament.users
     length = registered_users.length
-    return unless (length - 8) != 0
+    return if (length - 8) != 0
 
     begin
-      MatchCreator.new(@tournament, registered_users).create_match
+      MatchCreator.new(@tournament, registered_users).call
       redirect_to tournament_path(@tournament), notice: 'Matches Generated'
     rescue StandardError => e
       redirect_to tournament_path(@tournament), alert: "Error generating matches: #{e.message}"
@@ -40,7 +40,6 @@ def create_matches
 
   def create
     @tournament = Tournament.new(tournament_params)
-
     respond_to do |format|
       if @tournament.save
         format.html { redirect_to tournament_url(@tournament), notice: 'Tournament was successfully created.' }
@@ -77,7 +76,7 @@ def tournament_params
                                        :description,
                                        :start_date,
                                        :end_date,
-                                       :tournament_winner_id,
+                                       :winner_id,
                                        :image,
                                        :registration_deadline)
   end

app/controllers/users/confirmations_controller.rb

@@ -15,7 +15,8 @@ def show
       end
     end
 
-    # protected
+    protected
+
     def after_confirmation_path_for(_resource_name, resource)
       sign_in(resource)
       root_path

app/controllers/users/sessions_controller.rb

@@ -1,43 +1,29 @@
-# frozen_string_literal: true
-
 module Users
   class SessionsController < Devise::SessionsController
-    before_action :authenticate_2fa!, only: [:create]
+    before_action :otp_generate_and_send, only: [:create]
     before_action :authenticate_user!, except: %i[new create destroy]
-    before_action :load_and_authorize_resource, except: %i[new create destroy]
-
-    def create
-      super do |resource|
-        if resource.valid? && resource.persisted?
-          resource.update(
-            otp_required_for_login: true
-          )
-        end
-      end
+    def verify_otp
+      authenticate_2fa!
     end
 
     private
 
     def authenticate_2fa!
-      user = self.resource = find_user
-      return unless user
-
-      if otp_attempt_present?
-        authenticate_with_2fa(user)
-        sign_in(:user, user)
-      elsif valid_password_and_otp_required?(user)
-        session[:user_id] = user.id
-        send_otp_code(user)
-        render 'user_otp/two_fa'
-      end
+      user = User.find_by(id: session[:user_id])
+      User.auth_with_2fa(user_params[:otp_attempt], user)
+      sign_in(:user, user)
+      redirect_to root_path, notice: 'OTP consumed Successfully.'
     end
 
-    def otp_attempt_present?
-      user_params[:otp_attempt].present?
-    end
+    def otp_generate_and_send
+      user = self.resource = User.find_by(email: user_params[:email])
 
-    def authenticate_with_2fa(user)
-      User.auth_with_2fa(user_params[:otp_attempt], user)
+      return unless user
+
+      valid_password_and_otp_required?(user)
+      session[:user_id] = user.id
+      send_otp_code(user)
+      render 'user_otp/two_fa'
     end
 
     def valid_password_and_otp_required?(user)
@@ -48,14 +34,6 @@ def send_otp_code(user)
       TwoFactorAuth.new(user).send_otp_code
     end
 
-    def find_user
-      if session[:user_id]
-        User.find_by(id: session[:user_id])
-      elsif user_params[:email]
-        User.find_by(email: user_params[:email])
-      end
-    end
-
     def user_params
       params.require(:user).permit(:authenticity_token, :email, :password, :otp_attempt, :remember_me)
     end

app/helpers/application_helper.rb

@@ -0,0 +1,7 @@
+module ApplicationHelper
+  def custom_index(collection, index)
+    per_page = collection.limit_value
+    starting_index = (collection.current_page - 1) * per_page + 1
+    starting_index + index
+  end
+end

app/javascript/channels/room_channel.js

@@ -13,41 +13,38 @@ document.addEventListener("turbolinks:load", () => {
       received(data) {
         const msgs = document.getElementById("message-list");
         const current_user = document.getElementById("current_user");
-        const current_user_name = current_user.getAttribute(
-          "data-current-user-name"
-        );
-        const msg_element = document.getElementById(
-          `msg_field_${data.user_name}`
-        );
+        const current_user_name = current_user.getAttribute("data-current-user-name");
+        const msg_element = document.getElementById(`msg_field_${data.user_name}`);
         let messageHTML;
         if (data.user_name === current_user_name) {
-          messageHTML = `<div class="my-1 flex flex-row">
-                         <div class="rounded-full bg-white w-7 text-black text-center h-7">
-                         ${data.user_name.substring(0, 3)}
-                         </div>
-                         <div class ="flex flex-col space-y-2 text-xs  ml-2 items-start">
-			                   <div class="line-clamp-10 max-w-sm text-lg px-3 py-2 my-1 rounded-lg rounded-br-none rounded-tl-none bg-white text-black">
-                         ${data.message}
-                         </div>
-                         <div class="flex flex-row items-end">
-                         <div class="text-white">${data.created_at}</div>
-                         </div>
-                         </div>
-                         </div>`;
-        } else {
-          messageHTML = `<div class="my-1 flex flex-row">
-                         <div class="rounded-full bg-gold_shade2 w-7 text-white text-center h-7">
-                         ${data.user_name.substring(0, 3)}
-                         </div>
-                         <div class="flex flex-col space-y-2 text-xs  ml-2 items-start">
-                         <div class="line-clamp-10 max-w-sm text-lg px-3 py-2 my-1 rounded-lg rounded-br-none rounded-tl-none bg-gold text-black">
-                         ${data.message}
-                         </div>
-                         <div class="flex flex-row items-end">
-                         <div class="text-white">${data.created_at}</div>
-                         </div>
-                         </div>
-                         </div>`;
+          messageHTML = `<div class = "my-1 flex flex-row">
+            <div class = "rounded-full bg-white w-7 text-black text-center h-7">
+              ${data.user_name.substring(0, 3)}
+            </div>
+            <div class ="flex flex-col space-y-2 text-xs  ml-2 items-start">
+			        <div class="line-clamp-10 max-w-sm text-lg px-3 py-2 my-1 rounded-lg rounded-br-none rounded-tl-none bg-white text-black">
+                ${data.message}
+              </div>
+              <div class = "flex flex-row items-end">
+                <div class = "text-white">${data.created_at}</div>
+              </div>
+            </div>
+          </div>`;
+        }
+        else {
+          messageHTML = `<div class = "my-1 flex flex-row">
+            <div class = "rounded-full bg-gold_shade2 w-7 text-white text-center h-7">
+              ${data.user_name.substring(0, 3)}
+            </div>
+            <div class ="flex flex-col space-y-2 text-xs  ml-2 items-start">
+			        <div class="line-clamp-10 max-w-sm text-lg px-3 py-2 my-1 rounded-lg rounded-br-none rounded-tl-none bg-gold text-black">
+                ${data.message}
+              </div>
+              <div class = "flex flex-row items-end">
+                <div class = "text-white">${data.created_at}</div>
+              </div>
+            </div>
+          </div>`;
         }
 
         msgs.insertAdjacentHTML("afterbegin", messageHTML);

app/javascript/controllers/countdown_controller.js

@@ -3,24 +3,28 @@ import { Controller } from "@hotwired/stimulus";
 export default class extends Controller {
   connect = (format = "seconds") => {
     const reg_date = this.data.get("time");
-    const tournament_id = this.data.get("id");
-    const number = reg_date;
+    const time_in_seconds = reg_date;
     const daysElement = document.getElementById("days");
     const hoursElement = document.getElementById("hours");
     const minutesElement = document.getElementById("minutes");
     const secondsElement = document.getElementById("seconds");
     let countdown;
+    console.log(time_in_seconds);
+    if (time_in_seconds < 0) {
+      clearDivs();
+      return;
+    }
     convertFormat(format);
     function convertFormat(format) {
       switch (format) {
         case "seconds":
-          return timer(number);
+          return timer(time_in_seconds);
         case "minutes":
-          return timer(number * 60);
+          return timer(time_in_seconds * 60);
         case "hours":
-          return timer(number * 60 * 60);
+          return timer(time_in_seconds * 60 * 60);
         case "days":
-          return timer(number * 60 * 60 * 24);
+          return timer(time_in_seconds * 60 * 60 * 24);
       }
     }
 
@@ -32,18 +36,21 @@ export default class extends Controller {
         const secondsLeft = Math.round((then - Date.now()) / 1000);
 
         if (secondsLeft <= 0) {
-          document.getElementById("days").style.display = "none";
-          document.getElementById("hours").style.display = "none";
-          document.getElementById("minutes").style.display = "none";
-          document.getElementById("seconds").style.display = "none";
+          clearDivs();
           clearInterval(countdown);
+          location.reload;
           return;
         }
 
         displayTimeLeft(secondsLeft);
       }, 1000);
     }
-
+    function clearDivs() {
+      daysElement.style.display = "none";
+      hoursElement.style.display = "none";
+      minutesElement.style.display = "none";
+      secondsElement.style.display = "none";
+    }
     function displayTimeLeft(seconds) {
       daysElement.textContent = Math.floor(seconds / 86400);
       hoursElement.textContent = Math.floor((seconds % 86400) / 3600);

app/javascript/controllers/index.js

@@ -8,5 +8,5 @@ application.load(definitionsFromContext(context));
 import CountdownController from "./countdown_controller";
 application.register("countdown", CountdownController);
 
-import LoadController from "./load_controller"
-application.register("load", LoadController)
+import LoadController from "./load_controller";
+application.register("load", LoadController);

app/javascript/controllers/load_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from "@hotwired/stimulus"
+import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="laod-file"
 export default class extends Controller {

app/javascript/packs/buttons_activity.js

@@ -9,14 +9,8 @@ function event_listener_to_buttons() {
   var user_image;
   var flag = false;
 
-  if (player1_id === user_id) {
-    user_image = document.getElementById(player1_id);
-    flag = true;
-  } else if (player2_id === user_id) {
-    user_image = document.getElementById(player2_id);
-    flag = true;
-  }
-  if (flag) {
+  if(player1_id === user_id || player2_id === user_id){
+    user_image = document.getElementById(user_id);
     document
       .getElementById("rock_button")
       .addEventListener("click", function () {