Merge pull request #3898 from mattlindsey/3878_fix_profile_linking

Add turbo-rails, cleanup some js, and update devise.

Gemfile

@@ -16,16 +16,19 @@ gem 'activesupport', '~> 7.0.4.3'
 gem 'cssbundling-rails'
 gem 'jsbundling-rails'
 gem 'railties', '~> 7.0.4.3'
+gem 'redis'
 gem 'sprockets'
 gem 'sprockets-rails'
 gem 'stimulus-rails'
+gem 'turbo-rails'
 
 # Gems used in production
 gem 'acts_as_follower', git: 'https://github.com/AgileVentures/acts_as_follower.git'
 gem 'acts-as-taggable-on'
 gem 'acts_as_tree'
 gem 'acts_as_votable', '~> 0.12.1'
 gem 'addressable'
+gem 'bootsnap', '~> 1.9'
 gem 'bootstrap-sass'
 gem 'cocoon'
 gem 'code_climate_badges', git: 'https://github.com/AgileVentures/codeclimate_badges'
@@ -40,12 +43,9 @@ gem 'faker'
 gem 'font-awesome-rails'
 gem 'friendly_id'
 gem 'geocoder'
-# gem 'ice_cube', '0.16.3'
-gem 'bootsnap', '~> 1.9'
 gem 'icalendar'
 gem 'jbuilder'
 gem 'jquery-rails'
-gem 'jquery-turbolinks', '2.1.0' # Replace turbolinks: https://www.honeybadger.io/blog/hb-turbolinks-to-turbo/
 gem 'jvectormap-rails', '~> 2.0'
 gem 'jwt'
 gem 'kaminari'
@@ -80,7 +80,6 @@ gem 'sorted_set', '~> 1.0', '>= 1.0.3'
 gem 'spinjs-rails'
 gem 'stripe'
 gem 'sucker_punch'
-gem 'turbolinks'
 gem 'utf8-cleaner'
 gem 'vanity'
 gem 'verbs'

Gemfile.lock

@@ -224,7 +224,7 @@ GEM
       rake (> 10, < 14)
       ruby-statistics (>= 2.1)
       thor (>= 0.19, < 2)
-    devise (4.9.0)
+    devise (4.9.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -360,7 +360,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     icalendar (2.8.0)
       ice_cube (~> 0.16)
@@ -371,9 +371,6 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-turbolinks (2.1.0)
-      railties (>= 3.1.0)
-      turbolinks
     jsbundling-rails (1.1.1)
       railties (>= 6.0.0)
     json (2.6.3)
@@ -406,9 +403,9 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     local_time (2.1.0)
-    loofah (2.20.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     lumberjack (1.2.8)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
@@ -444,13 +441,13 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.14.2-aarch64-linux)
+    nokogiri (1.14.5-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.14.2-arm64-darwin)
+    nokogiri (1.14.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-darwin)
+    nokogiri (1.14.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.14.5-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -520,7 +517,7 @@ GEM
     puma (6.1.0)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.4)
+    rack (2.2.7)
     rack-cache (1.13.0)
       rack (>= 0.4)
     rack-cors (2.0.0)
@@ -557,8 +554,9 @@ GEM
       activesupport (>= 4.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails_autolink (1.1.8)
       actionview (> 3.1)
       activesupport (> 3.1)
@@ -580,6 +578,7 @@ GEM
     recaptcha (5.12.3)
       json
     redcarpet (3.6.0)
+    redis (4.8.1)
     regexp_parser (2.7.0)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -718,14 +717,15 @@ GEM
       ffi (~> 1.1)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.2.1)
+    thor (1.2.2)
     tilt (2.1.0)
     timeout (0.3.2)
     tins (1.32.1)
       sync
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
+    turbo-rails (1.4.0)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
@@ -765,7 +765,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     youtube_rails (1.2.3)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   aarch64-linux
@@ -833,7 +833,6 @@ DEPENDENCIES
   ice_cube!
   jbuilder
   jquery-rails
-  jquery-turbolinks (= 2.1.0)
   jsbundling-rails
   jvectormap-rails (~> 2.0)
   jwt
@@ -872,6 +871,7 @@ DEPENDENCIES
   rb-readline
   recaptcha
   redcarpet
+  redis
   rspec-activemodel-mocks
   rspec-html-matchers
   rspec-rails
@@ -892,7 +892,7 @@ DEPENDENCIES
   stripe
   stripe-ruby-mock (~> 3.1.0.rc2)
   sucker_punch
-  turbolinks
+  turbo-rails
   utf8-cleaner
   vanity
   vcr

app/assets/config/manifest.js

@@ -2,7 +2,6 @@
 //= link_tree ../images/
 //= link application.css
 //= link jquery-ui.js
-//= link jquery-ujs.js
 //= link bootstrap.js
 //= link lolex.js
 //= link disqus.js

app/assets/javascripts/application.js

@@ -10,7 +10,6 @@ import "@nathanvda/cocoon";
 import "trix";
 import './global-modules/*.js';
 import './documents';
-import './projects';
 import './users';
 import LocalTime from "local-time";
 import './controllers/*.js';

app/assets/javascripts/controllers/application.js

@@ -1,4 +1,5 @@
 import { Application } from "@hotwired/stimulus"
+import "@hotwired/turbo-rails"
 
 const application = Application.start()
 

app/assets/javascripts/controllers/events_form_controller.js

@@ -26,6 +26,41 @@ export default class extends Controller {
             daysOfWeek.forEach(function (checkBox, index) { checkBox.checked = arrayOfdays[index] })
         }
     }
+    this.repeats();
+    this.repeat_ends_on();
+  }
+  repeats() {
+    console.log('in events_repeats_controller repeats')
+    $('.event_option').hide();
+    switch ($('#event_repeats').val()) {
+        case 'never':
+            // Nothing
+            break;
+        case 'biweekly':    
+        case 'weekly':
+            $('#repeats_options').show();
+            $('#repeats_weekly_options').show();
+            $('.event_option').show();
+            this.repeat_ends_on();
+            break;
+    }
+  }
+  repeat_ends_on(){
+    console.log('in events_repeats_controller repeat_ends_on')
+    switch ($('#event_repeat_ends_string').val()) {
+      case 'never':
+          $('#repeat_ends_on_label').hide();
+          $('#event_repeat_ends_on_1i').hide();
+          $('#event_repeat_ends_on_2i').hide();
+          $('#event_repeat_ends_on_3i').hide();
+          break;
+      case 'on':
+          $('#repeat_ends_on_label').show();
+          $('#event_repeat_ends_on_1i').show();
+          $('#event_repeat_ends_on_2i').show();
+          $('#event_repeat_ends_on_3i').show();
+          break;
+    }
   }
 }