Use Bootstrap 5.3.8

Author: bhaak

Gemfile

@@ -23,8 +23,6 @@ gem 'sanitize'
 
 gem 'eventmachine', git: 'https://github.com/eventmachine/eventmachine.git'
 
-gem "rack-mobile-detect"
-
 gem 'thin', '~> 1.8'
 
 # charts

Gemfile.lock

@@ -115,8 +115,6 @@ GEM
     raabro (1.4.0)
     racc (1.8.1)
     rack (2.2.16)
-    rack-mobile-detect (0.4.0)
-      rack
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
@@ -184,7 +182,6 @@ DEPENDENCIES
   json
   nokogiri
   pry
-  rack-mobile-detect
   rack-test
   rake
   rspec

README.mobile_branch

@@ -20,9 +20,6 @@
 
 require 'ext/numeric'
 
-require 'rack/mobile-detect'
-use Rack::MobileDetect
-
 $db_access = Sync.new
 
 ## settings for sinatra-cache
@@ -69,12 +66,6 @@ class WorkaroundLogger < Logger
     session["messages"] = []
     session["errors"] = []
 
-    # switch to a different layout for mobile devices
-    @layout = env['X_MOBILE_DEVICE'] ? :layout_mobile : true
-    # for debugging
-    # @layout = :layout_mobile
-    # puts env.sort.map{ |v| v.join(': ') }.join("\n") + "\n"
-
     $db_access.lock :SH
 end
 
@@ -98,14 +89,14 @@ def caching_check_application_start_time
     caching_check_application_start_time
 
     @show_banner = true
-    haml :splash, :layout => @layout
+    haml :splash
 end
 
 get "/login" do
     caching_check_application_start_time
 
     @show_banner = true
-    haml :login, :layout => @layout
+    haml :login
 end
 
 get "/logout" do
@@ -119,28 +110,28 @@ def caching_check_application_start_time
     caching_check_application_start_time
 
     @show_banner = true
-    haml :trophies, :layout => @layout
+    haml :trophies
 end
 
 get "/trophies/:variant" do
     caching_check_application_start_time
 
     @variant = params[:variant]
-    haml :variant_trophies, layout: @layout
+    haml :variant_trophies
 end
 
 get "/users" do
     caching_check_last_played_game
 
     @users = User.all
-    haml :users, :layout => @layout
+    haml :users
 end
 
 get "/about" do
     caching_check_application_start_time
 
     @show_banner = true
-    haml :about, :layout => @layout
+    haml :about
 end
 
 post "/login" do
@@ -159,14 +150,14 @@ def caching_check_application_start_time
     caching_check_application_start_time
 
     @show_banner = true
-    haml :register, :layout => @layout
+    haml :register
 end
 
 get "/rules" do
     caching_check_application_start_time
 
     @show_banner = true
-    haml :rules, :layout => @layout
+    haml :rules
 end
 
 get "/home" do
@@ -182,7 +173,7 @@ def caching_check_application_start_time
     @games_played = Game.all(:user_id => @user.id, :order => [ :endtime.desc ])
     @games_played_title = @user.display_game_statistics
 
-    haml :home, :layout => @layout
+    haml :home
 end
 
 post "/add_server_account" do
@@ -300,7 +291,7 @@ def caching_check_application_start_time
 
         @user_id = @player.id
 
-        haml :user, :layout => @layout
+        haml :user
     else
         session['errors'] << "Could not find user #{CGI::escape(params[:name])}"
     end
@@ -319,15 +310,15 @@ def caching_check_application_start_time
     caching_check_last_played_game
 
     @clans = Clan.all
-    haml :clans, :layout => @layout
+    haml :clans
 end
 
 get "/clan/:name" do
     @clan = Clan.get(params[:name])
     if @clan
         puts "Invitations: #{@clan.invitations.inspect}"
         @admin = @clan.get_admin
-        haml :clan, :layout => @layout
+        haml :clan
     else
         session['errors'] << "Could not find clan with id #{params[:name].inspect}"
         redirect "/clans"
@@ -488,27 +479,27 @@ def caching_check_application_start_time
     user_id = {:user_id => @u.id}
     @last_10_games = get_last_games(user_id)
     @most_ascended_users = most_ascensions_users(@u.id)
-    haml :user_scores, :layout => @layout
+    haml :user_scores
 end
 
 get "/servers" do
     caching_check_application_start_time
 
     @servers = Server.all
-    haml :servers, layout: @layout, locals: { verbose: false }
+    haml :servers, locals: { verbose: false }
 end
 
 get "/servers/check" do
     @servers = Server.all
-    haml :servers, layout: @layout, locals: { verbose: true }
+    haml :servers, locals: { verbose: true }
 end
 
 get "/server/:name" do
     caching_check_last_played_game
     @server = Server.first(:name => params[:name])
     if @server
         @games = @server.games :conditions => [ 'user_id > 0' ], :order => [ :endtime.desc ], :limit => 100
-        haml :server, :layout => @layout
+        haml :server
     else
         session['errors'] << "Could not find server #{ params[:name] }"
         redirect "/"
@@ -522,7 +513,7 @@ def caching_check_application_start_time
         # limit by date for not permanently showing users that haven't
         # added themselves to Junethack
         @games = @server.games :conditions => [ "endtime > #{Time.new.to_i-7*60*60*24}" ], :order => [ :endtime.desc ], :limit => 100
-        haml :server, :layout => @layout
+        haml :server
     else
         session['errors'] << "Could not find server #{ params[:name] }"
         redirect "/"
@@ -554,7 +545,7 @@ def caching_check_application_start_time
     @games_played = Game.all(hash)
     @games_played_title = "Last #{@games_played.count} games played" + title_variant + title_date
 
-    haml :last_games_played, :layout => @layout
+    haml :last_games_played
 end
 
 get %r{/ascensions/?(\d{4}-\d{2}-\d{2})?/?([-0-9a-zNH.]+)?} do |date, variant|
@@ -580,43 +571,43 @@ def caching_check_application_start_time
 
     @games_played_title = "Last #{@games_played.count} ascended games" + title_variant + title_date
 
-    haml :last_games_played, :layout => @layout
+    haml :last_games_played
 end
 
 get "/activity" do
     caching_check_last_played_game
 
-    haml :activity, :layout => @layout
+    haml :activity
 end
 
 get "/deaths" do
     caching_check_last_played_game
 
-    haml :deaths, :layout => @layout
+    haml :deaths
 end
 
 get "/scoreboard" do
     caching_check_last_played_game
 
-    haml :scoreboard, :layout => @layout
+    haml :scoreboard
 end
 
 get "/trophy_scoreboard" do
     caching_check_last_played_game
 
-    haml :trophy_scoreboard, :layout => @layout
+    haml :trophy_scoreboard
 end
 
 get "/player_scoreboard" do
     caching_check_last_played_game
 
-    haml :player_scoreboard, :layout => @layout
+    haml :player_scoreboard
 end
 
 get "/post_tournament_statistics" do
     caching_check_last_played_game
 
-    haml :post_tournament_statistics, :layout => @layout
+    haml :post_tournament_statistics
 end
 
 get "/junethack.rss" do

lib/junethack/sinatra_server.rb

@@ -1,7 +1,11 @@
 function setupTrophyToggling() {
   const expandAllIcon = document.querySelector("h2 .min-max-trophies");
+  if (!expandAllIcon) {
+    return;
+  }
+
   expandAllIcon.addEventListener("click", function() {
-    uls = document.querySelectorAll(".content_bulk ul")
+    uls = document.querySelectorAll(".container ul, .card-body ul");
 
     uls.forEach(function (ul) {
       ul.classList.toggle("collapsed");
@@ -11,15 +15,17 @@ function setupTrophyToggling() {
   const expandIcons = document.querySelectorAll("h3 .min-max-trophies");
   expandIcons.forEach(function (expandIcon) {
     expandIcon.addEventListener("click", function() {
-      section = expandIcon.closest("section");
-      uls = section.querySelectorAll("ul")
+      section = expandIcon.closest("section, .card-body");
+      if (!section) {
+        return;
+      }
+      uls = section.querySelectorAll("ul");
 
       uls.forEach(function (ul) {
         ul.classList.toggle("collapsed");
       });
     });
   });
-
 }
 
 document.addEventListener("DOMContentLoaded", function () {