Update fixes for JS and CSS

safewlabs · Jan 11, 2024 · bca2e32 · bca2e32
1 parent e717a84
commit bca2e32
Show file tree

Hide file tree

Showing 20 changed files with 1,823 additions and 1,824 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,42 +5,25 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby "3.1.1"
 
-# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem "rails", "~> 7.0.3"
-
-# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem "propshaft"
-gem "terser"
-# Use postgres as the database for Active Record
 gem "pg"
-
-# Use the Puma web server [https://github.com/puma/puma]
 gem "puma", "~> 6.0"
 
+gem "propshaft"
+gem "terser"
 gem "jsbundling-rails"
 gem "cssbundling-rails"
-# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
-# gem "importmap-rails"
-
-# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
 gem "turbo-rails", "~> 1.5.0"
-
-# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
 gem "stimulus-rails"
-
-# Use Tailwind CSS [https://github.com/rails/tailwindcss-rails]
-# gem "tailwindcss-rails"
 gem "view_component"
 
-# Build JSON APIs with ease [https://github.com/rails/jbuilder]
 gem "jbuilder"
 gem "aws-sdk-s3"
-# Use Redis adapter to run Action Cable in production
+
 gem "redis", "~> 5.0"
 gem "sidekiq"
 gem "invisible_captcha"
 
-gem "vanilla_nested", github: "arielj/vanilla-nested", branch: :main
 # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
 # gem "kredis"
 gem "money-rails"
@@ -70,16 +53,14 @@ gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", require: false
-# Use Sass to process CSS
-# gem "sassc-rails"
 
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 gem "image_processing", "~> 1.2"
 
 group :development, :test do
   gem "annotate", github: "dabit/annotate_models", branch: "rails-7"
   gem "factory_bot_rails"
-  gem "faker", git: "https://github.com/faker-ruby/faker.git", branch: "master"
+  gem "faker", git: "https://github.com/faker-ruby/faker.git", branch: "main"
   gem "rspec-rails", "~> 6.1.0"
   gem "rubocop-rails", require: false
   gem "rubocop-rails_config"
@@ -91,7 +72,7 @@ end
 group :development do
   # Use console on exceptions pages [https://github.com/rails/web-console]
   gem "web-console"
-
+  gem "graphiql-rails"
   # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
   # gem "rack-mini-profiler"
 
@@ -104,5 +85,4 @@ group :test do
   gem "capybara"
   gem "selenium-webdriver"
   gem "webdrivers"
-end
-gem "graphiql-rails", group: :development
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: https://github.com/arielj/vanilla-nested.git
-  revision: cab8f390dc99eed933952f6fcc14603bad30c6a8
-  branch: main
-  specs:
-    vanilla_nested (1.7.0)
-
 GIT
   remote: https://github.com/dabit/annotate_models.git
   revision: b0d0041e06137514fa2bf5d2e10ca4af101cbfb9
@@ -16,10 +9,10 @@ GIT
 
 GIT
   remote: https://github.com/faker-ruby/faker.git
-  revision: 91342802553bf5df9320f1a6758fd8b0dd9b20aa
-  branch: master
+  revision: c7e5e46e91d589d8bcc9ccda737694645e65a889
+  branch: main
   specs:
-    faker (2.23.0)
+    faker (3.2.2)
       i18n (>= 1.8.11, < 2)
 
 GEM
@@ -94,13 +87,13 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.873.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.878.0)
+    aws-sdk-core (3.190.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
+    aws-sdk-kms (1.76.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.142.0)
@@ -109,6 +102,7 @@ GEM
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
     bcrypt (3.1.20)
     bindex (0.8.1)
     bootsnap (1.17.0)
@@ -150,9 +144,9 @@ GEM
       railties (>= 3.2)
     erubi (1.12.0)
     execjs (2.9.1)
-    factory_bot (6.4.2)
+    factory_bot (6.4.5)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.2)
+    factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.16.3)
@@ -172,7 +166,7 @@ GEM
     graphiql-rails (1.9.0)
       railties
       sprockets-rails
-    graphql (2.1.9)
+    graphql (2.1.10)
       racc (~> 1.4)
     graphql_devise (1.4.0)
       devise_token_auth (>= 0.1.43, < 2.0)
@@ -191,16 +185,12 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (1.2.3)
-      actionpack (>= 6.0.0)
-      activesupport (>= 6.0.0)
-      railties (>= 6.0.0)
     invisible_captcha (2.1.0)
       rails (>= 5.2)
     io-console (0.7.1)
-    irb (1.11.0)
+    irb (1.11.1)
       rdoc
-      reline (>= 0.3.8)
+      reline (>= 0.4.2)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -219,8 +209,8 @@ GEM
       net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
-    meta-tags (2.19.0)
-      actionpack (>= 3.2.0, < 7.2)
+    meta-tags (2.20.0)
+      actionpack (>= 6.0.0, < 7.2)
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
@@ -236,30 +226,30 @@ GEM
       railties (>= 3.0)
     msgpack (1.7.2)
     multi_xml (0.6.0)
-    net-imap (0.4.8)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.15.5-arm64-darwin)
+    nokogiri (1.16.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-darwin)
+    nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
     orm_adapter (0.5.0)
-    pagy (6.2.0)
+    pagy (6.3.0)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.2)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -274,15 +264,16 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (5.0.4)
-    puma (6.4.0)
+    puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)
     racc (1.7.3)
     rack (2.2.8)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
-    rack-protection (3.1.0)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -322,8 +313,8 @@ GEM
       redis-client (>= 0.17.0)
     redis-client (0.19.1)
       connection_pool
-    regexp_parser (2.8.3)
-    reline (0.4.1)
+    regexp_parser (2.9.0)
+    reline (0.4.2)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
@@ -360,21 +351,21 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
     rubocop-md (1.2.2)
       rubocop (>= 1.0)
-    rubocop-minitest (0.34.1)
+    rubocop-minitest (0.34.4)
       rubocop (>= 1.39, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
-    rubocop-performance (1.20.0)
+    rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.23.0)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -387,7 +378,7 @@ GEM
       rubocop-packaging (~> 0.5)
       rubocop-performance (~> 1.11)
       rubocop-rails (~> 2.0)
-    rubocop-rspec (2.25.0)
+    rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -414,16 +405,10 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    stimulus-rails (1.3.0)
+    stimulus-rails (1.3.3)
       railties (>= 6.0.0)
     stringio (3.1.0)
-    stripe (10.4.0)
-    tailwindcss-rails (2.1.0-arm64-darwin)
-      railties (>= 6.0.0)
-    tailwindcss-rails (2.1.0-x86_64-darwin)
-      railties (>= 6.0.0)
-    tailwindcss-rails (2.1.0-x86_64-linux)
-      railties (>= 6.0.0)
+    stripe (10.5.0)
     terser (1.1.20)
       execjs (>= 0.3.0, < 3)
     thor (1.3.0)
@@ -435,7 +420,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    view_component (3.8.0)
+    view_component (3.10.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -485,7 +470,6 @@ DEPENDENCIES
   honeybadger
   httparty
   image_processing (~> 1.2)
-  importmap-rails
   invisible_captcha
   jbuilder
   jsbundling-rails
@@ -510,11 +494,9 @@ DEPENDENCIES
   sidekiq
   stimulus-rails
   stripe
-  tailwindcss-rails
   terser
   turbo-rails (~> 1.5.0)
   tzinfo-data
-  vanilla_nested!
   view_component
   web-console
   webdrivers

diff --git a/Procfile.dev b/Procfile.dev
@@ -1,4 +1,4 @@
 web: bin/rails server -p 3000
+js: yarn build --watch
+css: yarn build:css --watch
 workers: bundle exec sidekiq
-js: npm run build --watch
-css: npm run build:css --watch
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,3 +1,4 @@
 //= link_tree ../images
 //= link_tree ../builds
-//= link_tree ../fonts
+//= link_tree ../fonts
+//= link_tree ../stylesheets
diff --git a/app/assets/stylesheets/actiontext.css b/app/assets/stylesheets/actiontext.css
@@ -1,9 +1,18 @@
+/*
+ * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+ * the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+ * inclusion directly in any other asset bundle and remove this file.
+ *
+ *= require trix
+*/
 
 /*
  * We need to override trix.css’s image gallery styles to accommodate the
  * <action-text-attachment> element we wrap around attachments. Otherwise,
  * images in galleries will be squished by the max-width: 33%; rule.
 */
+@import "trix/dist/trix";
+
 .trix-content .attachment-gallery > action-text-attachment,
 .trix-content .attachment-gallery > .attachment {
   flex: 1 0 33%;

diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
@@ -1,4 +1,6 @@
+@import "./custom.css";
+@import "./actiontext.css";
+
 @tailwind base;
 @tailwind components;
-@tailwind utilities;
-
+@tailwind utilities;@import 'actiontext.css';