Add login page, align styles with other admin panels, allow only sending of approved puzzles

ABizzinotto · ABizzinotto · commit e3d085b9f938 · 2025-06-11T01:14:41.000-03:00
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -9,6 +9,32 @@
  * Consider organizing styles into separate files for maintainability.
  */
 
+/* General styles */
+body {
+  font-family: 'Open Sans', sans-serif;
+  padding: 20px;
+}
+
+body.login {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  margin: 0;
+}
+.container {
+  text-align: center;
+  padding: 20px;
+  border: 2px solid #FFD633;
+  border-radius: 5px;
+  max-width: 400px;
+}
+
+.logout-container {
+  text-align: right;
+  margin-bottom: 20px;
+}
+
 table {
   border-collapse: collapse;
   width: 100%;
@@ -27,14 +53,20 @@ th {
 
 /* Reusable button base style */
 .btn {
-  color: white;
-  border: none;
-  padding: 6px 12px;
-  margin-left: 4px;
+  display: inline-block;
+  padding: 8px 16px;
+  background-color: #FFC000;
+  color: black;
+  text-decoration: none;
   border-radius: 4px;
+  border: none;
   cursor: pointer;
 }
 
+.btn:hover {
+  background-color: #FFD633;
+}
+
 /* Specific button variants */
 .approve-btn {
   background-color: #4CAF50;
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,16 @@
 class ApplicationController < ActionController::Base
   # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
   allow_browser versions: :modern
+  before_action :check_session_expiry
+
+  private
+
+  def check_session_expiry
+    if session[:expires_at].present? && Time.current > session[:expires_at]
+      reset_session
+      render "puzzles/login"
+    else
+      session[:expires_at] = 1.hour.from_now
+    end
+  end
 end
diff --git a/app/controllers/puzzles_controller.rb b/app/controllers/puzzles_controller.rb
@@ -1,5 +1,9 @@
 class PuzzlesController < ApplicationController
   def index
+    unless session[:user_token]
+      render "login"
+    end
+
     @pending_puzzles = Puzzle.pending
     @approved_puzzles = Puzzle.approved
     @rejected_puzzles = Puzzle.rejected
diff --git a/app/jobs/daily_puzzle_job.rb b/app/jobs/daily_puzzle_job.rb
@@ -3,7 +3,7 @@ class DailyPuzzleJob < ApplicationJob
   retry_on StandardError, attempts: 3
 
   def perform
-    puzzle = Puzzle.where(sent_at: nil).order("RANDOM()").first
+    puzzle = Puzzle.where(sent_at: nil, state: 0).order("RANDOM()").first
     return unless puzzle
 
     Server.where(active: true).each do |server|
diff --git a/app/views/puzzles/index.html.erb b/app/views/puzzles/index.html.erb
@@ -1,15 +1,12 @@
-<% if session[:user_token] %>
-  <%= link_to 'Logout', session_path(1), data: { turbo_method: :delete } %>
+<div class="logout-container">
+  <%= button_to 'Logout', session_path(1), method: :delete, class: "btn" %>
+</div>
 
-  <h1>Pending Puzzles</h1>
-  <%= render partial: 'puzzles_table', locals: { puzzles: @pending_puzzles, actions: :pending } %>
+<h1>Pending Puzzles</h1>
+<%= render partial: 'puzzles_table', locals: { puzzles: @pending_puzzles, actions: :pending } %>
 
-  <h1>Approved Puzzles</h1>
-  <%= render partial: 'puzzles_table', locals: { puzzles: @approved_puzzles, actions: :approved } %>
-
-  <h1>Rejected Puzzles</h1>
-  <%= render partial: 'puzzles_table', locals: { puzzles: @rejected_puzzles, actions: :rejected } %>
-<% else %>
-  <%= link_to 'Login with Google', '/auth/google_oauth2' %>
-<% end %>
+<h1>Approved Puzzles</h1>
+<%= render partial: 'puzzles_table', locals: { puzzles: @approved_puzzles, actions: :approved } %>
 
+<h1>Rejected Puzzles</h1>
+<%= render partial: 'puzzles_table', locals: { puzzles: @rejected_puzzles, actions: :rejected } %>
diff --git a/app/views/puzzles/login.html.erb b/app/views/puzzles/login.html.erb
@@ -0,0 +1,11 @@
+<% @title = "Ruby or Rails Login" %>
+
+<body class="login">
+  <div class="container">
+    <h2>Log In</h2>
+    <div>
+      <p>Log in to access the Ruby or Rails admin panel.</p>
+      <a href="/auth/google_oauth2" class="btn">Login with Google</a>
+    </div>
+  </div>
+</body>
