Merge branch 'main' into dependabot/bundler/tailwindcss-rails-2.0.30

pupeno · Jul 26, 2023 · b0cee1c · b0cee1c
2 parents 10a23e2 + 3891e09
commit b0cee1c
Show file tree

Hide file tree

Showing 33 changed files with 3,490 additions and 3,427 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -26,7 +26,7 @@ jobs:
         ports:
           - "5001:5432"
         env:
-          POSTGRES_USER: repeater_world_development
+          POSTGRES_USER: repeater_world
           POSTGRES_PASSWORD: te6ahng1phi1uizaeGhahMof1
           POSTGRES_DB: repeater_world_test
     env:
@@ -63,7 +63,7 @@ jobs:
         ports:
           - "5001:5432"
         env:
-          POSTGRES_USER: repeater_world_development
+          POSTGRES_USER: repeater_world
           POSTGRES_PASSWORD: te6ahng1phi1uizaeGhahMof1
           POSTGRES_DB: repeater_world_test
     env:

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -26,7 +26,7 @@ jobs:
         ports:
           - "5001:5432"
         env:
-          POSTGRES_USER: repeater_world_development
+          POSTGRES_USER: repeater_world
           POSTGRES_PASSWORD: te6ahng1phi1uizaeGhahMof1
           POSTGRES_DB: repeater_world_test
     env:

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.1.2
+3.2.2
diff --git a/.run/rails console.run.xml b/.run/rails console.run.xml
@@ -7,6 +7,7 @@
     <IRB_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
     <IRB_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" runner="rcov" />
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <IRB_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/bin/rails" />
     <IRB_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="console" />

diff --git a/.run/rails server.run.xml b/.run/rails server.run.xml
@@ -9,6 +9,7 @@
     <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" runner="rcov" />
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
     <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="5000" />
@@ -19,4 +20,4 @@
     <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
     <method v="2" />
   </configuration>
-</component>
+</component>
diff --git a/.run/rake generate_sample_data.run.xml b/.run/rake generate_sample_data.run.xml
@@ -8,6 +8,7 @@
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" runner="rcov" />
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="generate_sample_data" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />

diff --git a/.run/rake import_all.run.xml b/.run/rake import_all.run.xml
@@ -7,6 +7,7 @@
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" runner="rcov" />
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="import_all" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />

diff --git a/.run/rake spec.run.xml b/.run/rake spec.run.xml
@@ -8,6 +8,7 @@
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" runner="rcov" />
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
@@ -18,4 +19,4 @@
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TESTOPTS" VALUE="" />
     <method v="2" />
   </configuration>
-</component>
+</component>
diff --git a/.run/rake tailwindcss_watch.run.xml b/.run/rake tailwindcss_watch.run.xml
@@ -8,6 +8,7 @@
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
     <EXTENSION ID="BundlerRunConfigurationExtension" BUNDLE_MODE="AUTO" bundleExecEnabled="true" />
     <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" runner="rcov" />
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="tailwindcss:watch" />
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
@@ -18,4 +19,4 @@
     <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TESTOPTS" VALUE="" />
     <method v="2" />
   </configuration>
-</component>
+</component>
diff --git a/Gemfile b/Gemfile
@@ -15,7 +15,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.1.2"
+ruby "3.2.2"
 
 gem "active_link_to", "~> 1.0"
 gem "rbzip2", "~> 0.3"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -87,7 +87,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
-    brakeman (6.0.0)
+    brakeman (6.0.1)
     builder (3.2.4)
     capybara (3.39.2)
       addressable
@@ -140,8 +140,8 @@ GEM
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.6.0)
-    irb (1.7.1)
-      reline (>= 0.3.0)
+    irb (1.7.4)
+      reline (>= 0.3.6)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -172,10 +172,10 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.18.1)
-    msgpack (1.7.1)
+    minitest (5.19.0)
+    msgpack (1.7.2)
     nested_form (0.3.2)
-    net-imap (0.3.6)
+    net-imap (0.3.7)
       date
       net-protocol
     net-pop (0.1.2)
@@ -198,7 +198,7 @@ GEM
     postmark-rails (0.22.1)
       actionmailer (>= 3.0.0)
       postmark (>= 1.21.3, < 2.0)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     puma (6.3.0)
       nio4r (~> 2.0)
     racc (1.7.1)
@@ -247,7 +247,7 @@ GEM
     rake (13.0.6)
     rbzip2 (0.3.0)
     regexp_parser (2.8.1)
-    reline (0.3.5)
+    reline (0.3.6)
       io-console (~> 0.5)
     responders (3.1.0)
       actionpack (>= 5.2)
@@ -262,7 +262,7 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (6.0.3)
@@ -325,9 +325,10 @@ GEM
       rubocop (~> 1.52.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.1.0)
-    standard-custom (1.0.1)
+    standard-custom (1.0.2)
       lint_roller (~> 1.0)
-    standard-performance (1.1.1)
+      rubocop (~> 1.50)
+    standard-performance (1.1.2)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.18.0)
     stimulus-rails (1.2.1)
@@ -352,12 +353,12 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.9)
 
 PLATFORMS
   x86_64-linux
@@ -404,7 +405,7 @@ DEPENDENCIES
   web-console (~> 4.2)
 
 RUBY VERSION
-   ruby 3.1.2p20
+   ruby 3.2.2p53
 
 BUNDLED WITH
    2.3.7
diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
@@ -24,13 +24,18 @@
 
     .button-base {
         @apply inline-block
-        m-1 py-3 px-7
+        py-3 sm:py-4
+        px-3 sm:px-5 md:px-7
         font-semibold
         rounded-md
         outline-2 outline-offset-2
         focus-within:outline;
     }
 
+    .button-base svg.svg-inline--fa {
+        @apply mr-1 sm:mr-2 md:mr-3;
+    }
+
     .button {
         @apply button-base
         text-white bg-orange-500
@@ -53,6 +58,7 @@
         dark:focus:bg-cyan-700;
     }
 
+
     /* Override Tailwinds white background, with transparent background, which makes dark mode behave correctly */
     [multiple], [type=date], [type=datetime-local], [type=email], [type=month], [type=number], [type=password], [type=search], [type=tel], [type=text], [type=time], [type=url], [type=week], select, textarea {
         @apply bg-transparent;

diff --git a/app/javascript/controllers/cookie_popup_controller.js b/app/javascript/controllers/cookie_popup_controller.js
@@ -22,8 +22,6 @@ const COOKIE_NAME = "accept-cookies-2023-07-10"
 
 export default class extends Controller {
   connect() {
-    console.log(COOKIE_NAME)
-    console.log(Cookies.get(COOKIE_NAME))
     if (!Cookies.get(COOKIE_NAME)) {
       this.element.classList.remove("hidden")
     }

diff --git a/app/javascript/controllers/repeater_searches_controller.js b/app/javascript/controllers/repeater_searches_controller.js
@@ -18,6 +18,11 @@ import {Controller} from "@hotwired/stimulus"
 export default class extends Controller {
   static targets = ["form", "authBeforeSavePopUp", "firstSavePopUp", "exportPopUp", "modalPanel", "exportLink"]
 
+  // Not sure why submitting on enter isn't working out of the box.
+  submit() {
+    this.formTarget.submit()
+  }
+
   exportLinkTargetConnected(target) {
     target.click()
     let url = new URL(location.href)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -21,6 +21,9 @@ You should have received a copy of the GNU Affero General Public License along w
         Repeater World
       <% end %>
     </title>
+    <% if content_for? :meta_description %>
+      <meta name="description" content="<%= yield :meta_description %>">
+    <% end %>
 
     <%# Security tags %>
     <%= csrf_meta_tags %>
@@ -122,15 +125,19 @@ You should have received a copy of the GNU Affero General Public License along w
                     my-2 md:my-4 lg:my-6 xl:my-8
                     flex justify-center space-x-10
                     text-2xl">
-          <%= link_to "https://youtube.com/@RepeaterWorld", class: "hover:text-orange-500" do %>
+          <%= link_to "https://youtube.com/@RepeaterWorld", class: "hover:text-orange-500", rel: "me" do %>
             <span class="sr-only">YouTube</span>
             <i class="fa-brands fa-youtube"></i>
           <% end %>
-          <%= link_to "https://facebook.com/RepeaterWorldApp", class: "hover:text-orange-500" do %>
+          <%= link_to "https://mastodon.radio/@RepeaterWorld", class: "hover:text-orange-500", rel: "me" do %>
+            <span class="sr-only">Mastodon</span>
+            <i class="fa-brands fa-mastodon"></i>
+          <% end %>
+          <%= link_to "https://facebook.com/RepeaterWorldApp", class: "hover:text-orange-500", rel: "me" do %>
             <span class="sr-only">Facebook</span>
             <i class="fa-brands fa-facebook"></i>
           <% end %>
-          <%= link_to "https://twitter.com/RepeaterWorld", class: "hover:text-orange-500" do %>
+          <%= link_to "https://twitter.com/RepeaterWorld", class: "hover:text-orange-500", rel: "me" do %>
             <span class="sr-only">Twitter</span>
             <i class="fa-brands fa-twitter"></i>
           <% end %>