Merge remote-tracking branch 'upstream/main'

.env.test.example

@@ -2,3 +2,7 @@
 MARKETPLACE_VENDOR_STRIPE_ACCOUNT=acct_GET_THIS_FROM_STRIPE
 MARKETPLACE_VENDOR_SQUARE_ACCESS_TOKEN=GET_THIS_FROM_SQUARE
 MARKETPLACE_VENDOR_SQUARE_LOCATION_ID=GET_THIS_FROM_SQUARE
+
+AWS_S3_ACCESS_KEY_ID="GET_THIS_FROM_AWS"
+AWS_S3_SECRET_ACCESS_KEY="GET_THIS_FROM_AWS"
+AWS_S3_BUCKET="GET_THIS_FROM_AWS"

.github/workflows/test-convene-web.yml

@@ -142,88 +142,6 @@ jobs:
           name: rspec-failed-screenshot
           path: tmp/capybara/*.png
 
-  test-features:
-    name: Run Cucumber tests
-    runs-on: ubuntu-latest
-    needs: [setup]
-
-    services:
-      postgres:
-        image: postgres:latest
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        ports:
-          - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-      redis:
-        image: redis
-        ports:
-          # Maps port 6379 on service container to the host
-          - 6379:6379
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup Ruby and install gems
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-
-      - name: Setup Node with cache
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: 'yarn'
-
-      - name: Install Firefox
-        uses: browser-actions/setup-firefox@latest
-
-      - name: Allow Ruby process to access port 80
-        run: sudo setcap 'cap_net_bind_service=+ep' `which ruby`
-
-      - name: Setup CI database.yml
-        run: cp config/database.yml.github-actions config/database.yml
-
-      - name: Use Development mode env
-        run: cp .env.example .env
-
-      - name: Install Overmind
-        run: |
-          wget https://github.com/DarthSim/overmind/releases/download/v2.3.0/overmind-v2.3.0-linux-386.gz
-          gunzip -d overmind-v2.3.0-linux-386.gz
-          mv overmind-v2.3.0-linux-386 overmind
-          chmod +x overmind
-
-      - name: Install Maildev
-        run: yarn global add maildev
-
-      - name: Start Rails server
-        run: |
-          export PATH=$PATH:~/bin:.
-          bin/setup-rails
-          bin/run &
-
-      - name: Run tests
-        run: |
-          # To wait for asset built
-          # TODO: Start server in production mode
-          curl --connect-timeout 5 --retry 5 --retry-delay 5 --retry-max-time 60 --retry-connrefused localhost:3000 1> /dev/null
-          yarn run test
-      - name: Upload Test Results
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: feature-test-failed-screenshot
-          path: features/test_reports/*.png
-
   lint:
     name: Run style checks
     runs-on: ubuntu-latest

Gemfile

@@ -47,7 +47,7 @@ gem "view_component", "~> 3.10"
 gem "rqrcode", "~> 2.2"
 
 # Pagination!
-gem "pagy", "~> 6.3"
+gem "pagy", "~> 6.4"
 
 # Database Layer
 #
@@ -78,7 +78,7 @@ gem "pg", "~> 1.5"
 gem "image_processing"
 
 # Use S3 for file storage
-gem "aws-sdk-s3", "~> 1.142", require: false
+gem "aws-sdk-s3", "~> 1.143", require: false
 # Date/Time and Internationalization
 #
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -117,9 +117,9 @@ group :development, :test do
 
   # Our preferred testing library for Ruby and Rails projects
   gem "rails-controller-testing"
-  gem "rspec-rails", "~> 6.1.0"
+  gem "rspec-rails", "~> 6.1.1"
   gem "rswag-specs"
-  gem "shoulda-matchers", "~> 6.0"
+  gem "shoulda-matchers", "~> 6.1"
 
   gem "capybara"
   gem "selenium-webdriver"

Gemfile.lock

@@ -90,7 +90,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    apimatic_core (0.3.1)
+    apimatic_core (0.3.4)
       apimatic_core_interfaces (~> 0.2.0)
       certifi (~> 2018.1, >= 2018.01.18)
       faraday-multipart (~> 1.0)
@@ -109,17 +109,17 @@ GEM
       faraday-retry (~> 2.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.873.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.883.0)
+    aws-sdk-core (3.191.0)
       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-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -130,7 +130,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.6)
     bindex (0.8.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
@@ -151,7 +151,7 @@ GEM
     choice (0.2.0)
     chunky_png (1.4.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crack (0.4.5)
       rexml
@@ -180,22 +180,21 @@ GEM
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faker (3.2.2)
+    faker (3.2.3)
       i18n (>= 1.8.11, < 2)
-    faraday (2.7.12)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
     faraday-gzip (1.0.0)
       faraday (>= 1.0)
       zlib (~> 2.1)
-    faraday-http-cache (2.5.0)
+    faraday-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (3.0.2)
+    faraday-net_http (3.1.0)
+      net-http
     faraday-net_http_persistent (2.1.0)
       faraday (~> 2.5)
       net-http-persistent (~> 4.0)
@@ -219,15 +218,15 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.7.1)
+    io-console (0.7.2)
     irb (1.11.1)
       rdoc
       reline (>= 0.4.2)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    jsbundling-rails (1.2.2)
+    jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
     json (2.7.1)
     json-pointer (0.0.1)
@@ -265,7 +264,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.2)
     monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
@@ -278,6 +277,8 @@ GEM
     msgpack (1.7.2)
     multipart-post (2.3.0)
     mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     net-imap (0.4.1)
@@ -293,7 +294,7 @@ GEM
     nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    pagy (6.3.0)
+    pagy (6.4.3)
     parallel (1.24.0)
     parser (3.3.0.0)
       ast (~> 2.4.1)
@@ -369,7 +370,7 @@ GEM
     rdoc (6.6.2)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
-    redis-client (0.18.0)
+    redis-client (0.19.1)
       connection_pool
     regexp_parser (2.8.3)
     reline (0.4.2)
@@ -389,7 +390,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.1.0)
+    rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -445,7 +446,8 @@ GEM
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    selenium-webdriver (4.16.0)
+    selenium-webdriver (4.17.0)
+      base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -454,13 +456,13 @@ GEM
       sentry-ruby (~> 5.16.1)
     sentry-ruby (5.16.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    shoulda-matchers (6.0.0)
+    shoulda-matchers (6.1.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.2.0)
+    sidekiq (7.2.1)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.14.0)
+      redis-client (>= 0.19.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -475,7 +477,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    square.rb (34.1.0.20231213)
+    square.rb (35.0.1.20240118)
       apimatic_core (~> 0.3.0)
       apimatic_core_interfaces (~> 0.2.0)
       apimatic_faraday_client_adapter (~> 0.1.0)
@@ -508,6 +510,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
     view_component (3.10.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
@@ -538,7 +541,7 @@ PLATFORMS
 DEPENDENCIES
   active_record_extended (~> 3.2)
   activerecord-postgres_enum (~> 2.0)
-  aws-sdk-s3 (~> 1.142)
+  aws-sdk-s3 (~> 1.143)
   bcrypt (~> 3.1.20)
   better_errors
   binding_of_caller
@@ -560,7 +563,7 @@ DEPENDENCIES
   lockbox (= 1.3.2)
   lookbook (>= 2.0.0.beta.4)
   money-rails
-  pagy (~> 6.3)
+  pagy (~> 6.4)
   pg (~> 1.5)
   pry-byebug
   puma (~> 6.4)
@@ -572,7 +575,7 @@ DEPENDENCIES
   redcarpet (~> 3.6)
   rotp (~> 6.3)
   rqrcode (~> 2.2)
-  rspec-rails (~> 6.1.0)
+  rspec-rails (~> 6.1.1)
   rswag-api
   rswag-specs
   rswag-ui
@@ -581,7 +584,7 @@ DEPENDENCIES
   selenium-webdriver
   sentry-rails
   sentry-ruby
-  shoulda-matchers (~> 6.0)
+  shoulda-matchers (~> 6.1)
   sidekiq
   simplecov
   spring

app/components/card_component.html.erb

@@ -1,15 +1,17 @@
-<div class="<%== card_classes_wrapper %>">
+<div <%==attributes(classes: "shadow rounded-lg bg-white group-hover:bg-slate-50 flex flex-col justify-between") %>>
+ <% if header? %>
+  <%= header%>
+ <%- end %>
   <%#
     NOTE: content? is not always working as described, and is returning a proc in some cases rather than a boolean
   %>
   <% if content.present? %>
-    <div <%== attributes(classes: card_classes_content) %>>
+    <div class="flex flex-col h-full justify-between p-2 sm:p-4">
       <%= content %>
     </div>
   <% end %>
+
   <% if footer? %>
-    <div class="<%== card_classes_footer %>">
-      <%= footer %>
-    </div>
+    <%= footer %>
   <% end %>
 </div>