Merge branch 'main' into develop

druxt · Sep 14, 2022 · e372f8e · e372f8e
2 parents c228c0d + 518e2d3
commit e372f8e
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -10,9 +10,8 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     environment:
-      name: staging
-      # @TODO - umami.demo.druxtjs.org
-      url: https://demo.druxtjs.org
+      name: production
+      url: https://umami.demo.druxtjs.org
 
     strategy:
       matrix:
@@ -40,7 +39,7 @@ jobs:
       - name: Wait for backend
         uses: nev7n/wait_for_response@v1
         with:
-          url: 'https://nginx.production-backend.druxtjs-org-demo-umami.au2.amazee.io/jsonapi'
+          url: 'https://api.umami.demo.druxtjs.org/jsonapi'
           responseCode: 200
           timeout: 600000
           interval: 15000
@@ -56,7 +55,7 @@ jobs:
       - name: Wait for frontend
         uses: nev7n/wait_for_response@v1
         with:
-          url: 'https://demo.druxtjs.org'
+          url: 'https://umami.demo.druxtjs.org'
           responseCode: 200
           timeout: 600000
           interval: 15000

diff --git a/.lagoon.env.develop b/.lagoon.env.develop
@@ -1 +1 @@
-BASE_URL=https://nginx.develop.demo-api-druxtjs-org.au2.amazee.io
+BASE_URL=https://nginx.develop.api.umami.demo-druxtjs-org.au2.amazee.io
diff --git a/.lagoon.env.main b/.lagoon.env.main
@@ -1 +1 @@
-BASE_URL=https://demo-api.druxtjs.org/
+BASE_URL=https://api.umami.demo.druxtjs.org/
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 This is a demonstation of how to create a DruxtSite using the Drupal 9 Umami installation profile.
 
-View the site @ https://demo.druxtjs.org
+View the site @ https://umami.demo.druxtjs.org
 
 ---
 

diff --git a/drupal/.lando.yml b/drupal/.lando.yml
@@ -1,4 +1,4 @@
-name: demo-api-druxtjs-org
+name: druxtjs-org-demo-umami
 recipe: lagoon
 config:
   build:

diff --git a/drupal/composer.json b/drupal/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "druxt/demo-api-druxtjs-org",
+    "name": "druxt/druxtjs-org-demo-umami",
     "description": "Drupal 9 JSON:API backend for Demonstration purposes.",
     "type": "project",
     "license": "GPL-2.0+",

diff --git a/drupal/config/sync/druxt_node_preview.settings.yml b/drupal/config/sync/druxt_node_preview.settings.yml
@@ -1,4 +1,4 @@
 _core:
   default_config_hash: zxe4iTJgwgQ0ebZqu57Rxp5NtvCPhcY-k67pNawPUVQ
 langcode: en
-frontends: 'Production|https://demo.druxtjs.org/node/preview/[view_mode]#[jsonapi_node_preview]'
+frontends: 'Production|https://umami.demo.druxtjs.org/node/preview/[view_mode]#[jsonapi_node_preview]'
diff --git a/drupal/phpunit.xml b/drupal/phpunit.xml
@@ -21,7 +21,7 @@
     <env name="SIMPLETEST_DB" value="mysql://drupal:drupal@mariadb/drupal"/>
 
     <env name="BROWSERTEST_OUTPUT_DIRECTORY" value="./web/sites/simpletest/browser_output"/>
-    <env name="BROWSERTEST_OUTPUT_BASE_URL" value="http://demo-api-druxtjs-org.docker.amazee.io"/>
+    <env name="BROWSERTEST_OUTPUT_BASE_URL" value="http://druxtjs-org-demo-umami.docker.amazee.io"/>
 
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
   </php>

diff --git a/netlify.toml b/netlify.toml
@@ -1,16 +1,16 @@
 
 [[redirects]]
   from = "/en/jsonapi*"
-  to = "https://demo-api.druxtjs.org/jsonapi:splat"
+  to = "https://api.umami.demo.druxtjs.org/jsonapi:splat"
 
 [[redirects]]
   from = "/es/jsonapi*"
-  to = "https://demo-api.druxtjs.org/en/jsonapi:splat"
+  to = "https://api.umami.demo.druxtjs.org/en/jsonapi:splat"
 
 [[redirects]]
   from = "/jsonapi*"
-  to = "https://demo-api.druxtjs.org/es/jsonapi:splat"
+  to = "https://api.umami.demo.druxtjs.org/es/jsonapi:splat"
 
 [[redirects]]
   from = "/router/translate-path*"
-  to = "https://demo-api.druxtjs.org/router/translate-path:splat"
+  to = "https://api.umami.demo.druxtjs.org/router/translate-path:splat"
diff --git a/nginx.conf b/nginx.conf
@@ -9,22 +9,22 @@ server {
   }
 
   location  /en/jsonapi {
-    proxy_pass        https://demo-api.druxtjs.org;
+    proxy_pass        https://api.umami.demo.druxtjs.org;
     proxy_set_header  Host  $proxy_host;
   }
 
   location  /es/jsonapi {
-    proxy_pass        https://demo-api.druxtjs.org;
+    proxy_pass        https://api.umami.demo.druxtjs.org;
     proxy_set_header  Host  $proxy_host;
   }
 
   location  /jsonapi {
-    proxy_pass        https://demo-api.druxtjs.org;
+    proxy_pass        https://api.umami.demo.druxtjs.org;
     proxy_set_header  Host  $proxy_host;
   }
 
   location  /router/translate-path {
-    proxy_pass        https://demo-api.druxtjs.org;
+    proxy_pass        https://api.umami.demo.druxtjs.org;
     proxy_set_header  Host  $proxy_host;
   }
 }
diff --git a/nuxt/stories/README.stories.mdx b/nuxt/stories/README.stories.mdx
@@ -5,7 +5,7 @@ import { Meta } from '@storybook/addon-docs/blocks'
 # Druxt Umami Storybook
 
 This is the Storybook for the Druxt Umami Parity project:
-https://demo.druxtjs.org
+https://umami.demo.druxtjs.org
 
 The Druxt Umami Parity project is an example of how to build a fully decoupled
 Drupal site with a Nuxt.js frontend using [Druxt](https://druxtjs.org).
@@ -29,4 +29,4 @@ For more information see https://druxtjs.org/guide/storybook
 
 ## Opensource
 
-The source code for the Druxt Umami demo and storybook can be found @ https://github.com/druxt/demo.druxtjs.org
+The source code for the Druxt Umami demo and storybook can be found @ https://github.com/druxt/umami.demo.druxtjs.org