Merge branch 'main' into marketplace-square-order-model

zinc-collective · Oct 28, 2023 · 37ac3e2 · 37ac3e2
2 parents 1699ee5 + 91bc6b7
commit 37ac3e2
Show file tree

Hide file tree

Showing 65 changed files with 1,138 additions and 843 deletions.
diff --git a/.env.example b/.env.example
@@ -21,7 +21,7 @@
 
 PORT=3000
 # Used to build URLs in mailers
-APP_ROOT_URL=http://localhost:3000
+APP_ROOT_URL=http://127.0.0.1:3000
 EMAIL_DEFAULT_FROM='Neighborhood Support <[email protected]>'
 
 # Ensures the data in our database is fully encrypted

diff --git a/.github/workflows/test-convene-web.yml b/.github/workflows/test-convene-web.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Node with cache
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
 
       - name: Install Node dependencies
@@ -109,7 +109,7 @@ jobs:
       - name: Setup Node with cache
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
 
       - name: Allow Ruby process to access port 80
@@ -177,7 +177,7 @@ jobs:
       - name: Setup Node with cache
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
 
       - name: Install Firefox
@@ -212,7 +212,7 @@ jobs:
         run: |
           # To wait for asset built
           # TODO: Start server in production mode
-          curl --connect-timeout 5 --retry 5 --retry-delay 5 --retry-max-time 40 --retry-connrefused localhost:3000 1> /dev/null
+          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
@@ -238,7 +238,7 @@ jobs:
       - name: Setup Node with cache
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
 
       - name: Install Node dependencies

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.20.1
+18.18.0
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -37,6 +37,3 @@ Style/TrailingCommaInArrayLiteral:
 Rails/CreateTableWithTimestamps:
   Exclude:
     - db/schema.rb
-
-Capybara/ClickLinkOrButtonStyle:
-  EnforcedStyle: link_or_button
diff --git a/Gemfile b/Gemfile
@@ -39,7 +39,7 @@ gem "rswag-ui"
 # Allows us to render .markdown.erb files
 gem "redcarpet", "~> 3.6"
 # Breadcrumbs!
-gem "gretel", "~> 4.5"
+gem "gretel", "~> 4.6"
 # Better UI components
 gem "lookbook", ">= 2.0.0.beta.4"
 gem "view_component", "~> 3.6"