Getting new commits from drupal cms including new installer page wizard

dxpr · Sep 6, 2024 · fedc675 · fedc675
1 parent 82133f0
commit fedc675
Show file tree

Hide file tree

Showing 125 changed files with 8,876 additions and 436 deletions.
diff --git a/.ddev/commands/host/rebuild b/.ddev/commands/host/rebuild
@@ -8,3 +8,4 @@ ddev stop
 ddev delete --omit-snapshot --yes
 rm -r -f vendor $DDEV_DOCROOT composer.* project_template/patches.lock.json
 ddev start
+ddev launch
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
@@ -0,0 +1,52 @@
+services:
+  php:
+    image: tugboatqa/php:8.3-apache
+    default: true
+    depends:
+      - db
+    commands:
+      init:
+        - docker-php-ext-install opcache
+        - a2enmod headers rewrite
+      update:
+        # Add the components as globally available path repositories, simulating Packagist.
+        - find $TUGBOAT_ROOT -type d -maxdepth 1 -name 'dxpr_cms*' -exec composer config --global repositories.{} path {} ';'
+        # Add the project template as a globally available path repository, simulating Packagist.
+        - composer config --global repositories.template path $TUGBOAT_ROOT/project_template
+        # Clean up from any previous build.
+        - rm -Rf $TUGBOAT_ROOT/project
+        # Create the project.
+        - composer create-project drupal/dxpr-cms-project $TUGBOAT_ROOT/project --stability=dev
+        # Symlink the Drupal root to the Apache web root.
+        - ln -snf $TUGBOAT_ROOT/project/web $DOCROOT
+        # Create the files directory and settings.php files with appropriate perms.
+        - mkdir -p $DOCROOT/sites/default/files
+        - chown -R www-data:www-data $DOCROOT/sites/default
+        - chmod 2775 $DOCROOT/sites/default/files
+        - cp $DOCROOT/sites/default/default.settings.php $DOCROOT/sites/default/settings.php
+        # Disable PHP memory limit for Drush.
+        - |
+          echo "if (PHP_SAPI === 'cli') {
+            ini_set('memory_limit', '-1');
+          }" >> $DOCROOT/sites/default/settings.php
+        # Install Drupal using Drush.
+        - |
+          set -e
+          cd $TUGBOAT_ROOT/project
+          vendor/bin/drush si \
+            --yes \
+            --db-url=mysql://tugboat:tugboat@db/tugboat \
+            --account-pass=admin \
+            --site-name="DXPR CMS Demo"
+      build:
+        # Run composer install and perform database updates
+        - |
+          set -e
+          cd $TUGBOAT_ROOT/project
+          composer install --optimize-autoloader
+          vendor/bin/drush updatedb
+          vendor/bin/drush cache:rebuild
+        # Warm the caches
+        - 'curl --silent -H "Host: $TUGBOAT_DEFAULT_SERVICE_URL_HOST" http://localhost > /dev/null'
+  db:
+    image: tugboatqa/mariadb
diff --git a/dxpr_builder_base/recipe.yml b/dxpr_builder_base/recipe.yml
@@ -16,4 +16,4 @@ config:
     system.site:
       simple_config_update:
         name: 'DXPR CMS'
-        page.front: '/node/6'
+        page.front: '/home'
diff --git a/dxpr_builder_drag_and_drop_page/composer.json b/dxpr_builder_drag_and_drop_page/composer.json
@@ -5,6 +5,7 @@
     "version": "dev-main",
     "require": {
         "drupal/core": ">=10.3",
+        "drupal/dxpr_cms_content_type_base": "*",
         "drupal/dxpr_builder": "^3.0@alpha",
         "drupal/dxpr_theme_helper": "^1",
         "drupal/menu_link_attributes": "^1.3"

diff --git a/dxpr_builder_drag_and_drop_page/content/node/2b6abda6-5b2b-4e7f-aec4-2d9e9a9d47be.yml b/dxpr_builder_drag_and_drop_page/content/node/2b6abda6-5b2b-4e7f-aec4-2d9e9a9d47be.yml
@@ -3,6 +3,7 @@ _meta:
   entity_type: node
   uuid: 2b6abda6-5b2b-4e7f-aec4-2d9e9a9d47be
   bundle: drag_and_drop_page
+  default_langcode: en
 default:
   revision_uid:
     -

diff --git a/dxpr_builder_drag_and_drop_page/content/node/564f412f-1a80-4a87-840b-d38edeeed383.yml b/dxpr_builder_drag_and_drop_page/content/node/564f412f-1a80-4a87-840b-d38edeeed383.yml
@@ -3,6 +3,7 @@ _meta:
   entity_type: node
   uuid: 564f412f-1a80-4a87-840b-d38edeeed383
   bundle: drag_and_drop_page
+  default_langcode: en
 default:
   revision_uid:
     -

diff --git a/dxpr_builder_drag_and_drop_page/content/node/6cac9014-4fb3-4152-a3df-16420d9517e9.yml b/dxpr_builder_drag_and_drop_page/content/node/6cac9014-4fb3-4152-a3df-16420d9517e9.yml
@@ -3,6 +3,7 @@ _meta:
   entity_type: node
   uuid: 6cac9014-4fb3-4152-a3df-16420d9517e9
   bundle: drag_and_drop_page
+  default_langcode: en
 default:
   revision_uid:
     -

diff --git a/dxpr_builder_drag_and_drop_page/content/node/82d6ff4a-679b-45e2-9a5c-1747fe4cfb97.yml b/dxpr_builder_drag_and_drop_page/content/node/82d6ff4a-679b-45e2-9a5c-1747fe4cfb97.yml
@@ -3,6 +3,7 @@ _meta:
   entity_type: node
   uuid: 82d6ff4a-679b-45e2-9a5c-1747fe4cfb97
   bundle: drag_and_drop_page
+  default_langcode: en
 default:
   revision_uid:
     -

diff --git a/dxpr_builder_drag_and_drop_page/content/node/8764d205-a20a-4b92-992c-755bbed154a9.yml b/dxpr_builder_drag_and_drop_page/content/node/8764d205-a20a-4b92-992c-755bbed154a9.yml
@@ -3,6 +3,7 @@ _meta:
   entity_type: node
   uuid: 8764d205-a20a-4b92-992c-755bbed154a9
   bundle: drag_and_drop_page
+  default_langcode: en
 default:
   revision_uid:
     -

diff --git a/dxpr_builder_drag_and_drop_page/content/node/9c76ff5e-7def-4611-bf22-69cd76a95a79.yml b/dxpr_builder_drag_and_drop_page/content/node/9c76ff5e-7def-4611-bf22-69cd76a95a79.yml
@@ -3,6 +3,7 @@ _meta:
   entity_type: node
   uuid: 9c76ff5e-7def-4611-bf22-69cd76a95a79
   bundle: drag_and_drop_page
+  default_langcode: en
 default:
   revision_uid:
     -

diff --git a/dxpr_builder_drag_and_drop_page/content/node/c443b638-b341-4fc8-a1ce-4dc8b527aa7a.yml b/dxpr_builder_drag_and_drop_page/content/node/c443b638-b341-4fc8-a1ce-4dc8b527aa7a.yml
@@ -3,6 +3,7 @@ _meta:
   entity_type: node
   uuid: c443b638-b341-4fc8-a1ce-4dc8b527aa7a
   bundle: drag_and_drop_page
+  default_langcode: en
 default:
   revision_uid:
     -

diff --git a/dxpr_builder_drag_and_drop_page/recipe.yml b/dxpr_builder_drag_and_drop_page/recipe.yml
@@ -2,6 +2,7 @@ name: 'Drag and drop Page'
 type: 'DXPR CMS'
 description: 'Page builder page with DXPR Builder visual layout builder.'
 recipes:
+  - dxpr_cms_content_type_base
   - dxpr_cms_full_html_editor
 install:
   - dxpr_builder_page

diff --git a/dxpr_cms_base/composer.json b/dxpr_cms_base/composer.json
@@ -6,7 +6,6 @@
     "require": {
         "drupal/core": ">=10.3",
         "drupal/block_classes": "^1.0",
-        "drupal/easy_breadcrumb": "^2",
         "drupal/eca": "^2",
         "drupal/login_emailusername": "^2.1",
         "drupal/gin_login": "^2",
@@ -35,6 +34,7 @@
         "drupal/dxpr_cms_page_content_type": "dev-main",
         "drupal/dxpr_cms_patches": "dev-main",
         "drupal/dxpr_cms_performance": "dev-main",
+        "drupal/dxpr_cms_seo_basic": "dev-main",
         "drupal/dxpr_cms_workflows": "dev-main",
         "drupal/dxpr_theme_base": "dev-main"
     }

diff --git a/dxpr_cms_base/recipe.yml b/dxpr_cms_base/recipe.yml
@@ -22,14 +22,14 @@ recipes:
   - dxpr_cms_maintenance
   - dxpr_cms_media_tools
   - dxpr_cms_page_content_type
+  - dxpr_cms_seo_basic
   - dxpr_cms_workflows
   - dxpr_builder_base
   - dxpr_builder_drag_and_drop_block
   - dxpr_builder_drag_and_drop_page
   - dxpr_theme_base
 install:
   - block_classes
-  - easy_breadcrumb
   - eca_ui
   - login_emailusername
   - gin_login
@@ -99,7 +99,7 @@ config:
     system.site:
       simple_config_update:
         name: 'DXPR CMS'
-        page.front: '/node/6'
+        page.front: '/home'
     user.role.content_editor:
       grantPermissionsForEachMediaType:
         - 'create %bundle media'
@@ -148,10 +148,6 @@ config:
         cancel_method: user_cancel_block
         password_reset_timeout: 86400
         password_strength: true
-    easy_breadcrumb.settings:
-      simple_config_update:
-        add_structured_data_json_ld: true
-        hide_single_home_item: true
     moderation_dashboard.settings:
       simple_config_update:
         redirect_on_login: false

diff --git a/dxpr_cms_blog/composer.json b/dxpr_cms_blog/composer.json
@@ -5,9 +5,9 @@
     "version": "dev-main",
     "require": {
         "drupal/core": ">=10.3",
-        "drupal/dxpr_cms_anti_spam": "*",
         "drupal/dxpr_cms_content_type_base": "*",
         "drupal/dxpr_cms_image_media_type": "*",
-        "drupal-eca-recipe/notify_new_comments": "*"
+        "drupal/better_exposed_filters": "^7.0",
+        "drupal/pathauto": "^1.13"
     }
 }
diff --git a/dxpr_cms_blog/config/core.date_format.rss.yml b/dxpr_cms_blog/config/core.date_format.rss.yml
@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+id: rss
+label: RSS
+locked: false
+pattern: r
diff --git a/dxpr_cms_blog/config/core.entity_form_display.node.blog.default.yml b/dxpr_cms_blog/config/core.entity_form_display.node.blog.default.yml
@@ -2,14 +2,13 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.node.blog.body
-    - field.field.node.blog.comment
+    - field.field.node.blog.field_content
+    - field.field.node.blog.field_description
     - field.field.node.blog.field_image
     - field.field.node.blog.field_meta_tags
     - field.field.node.blog.field_tags
     - node.type.blog
   module:
-    - comment
     - media_library
     - metatag
     - path
@@ -20,38 +19,46 @@ targetEntityType: node
 bundle: blog
 mode: default
 content:
-  body:
-    type: text_textarea_with_summary
-    weight: 2
+  created:
+    type: datetime_timestamp
+    weight: 7
     region: content
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-      show_summary: false
+    settings: {  }
     third_party_settings: {  }
-  comment:
-    type: comment_default
-    weight: 20
+  field_content:
+    type: text_textarea
+    weight: 5
     region: content
-    settings: {  }
+    settings:
+      rows: 5
+      placeholder: ''
     third_party_settings: {  }
-  created:
-    type: datetime_timestamp
-    weight: 10
+  field_description:
+    type: string_textarea
+    weight: 3
     region: content
-    settings: {  }
+    settings:
+      rows: 5
+      placeholder: ''
     third_party_settings: {  }
   field_image:
     type: media_library_widget
-    weight: 1
+    weight: 4
     region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
+  field_meta_tags:
+    type: metatag_firehose
+    weight: 16
+    region: content
+    settings:
+      sidebar: true
+      use_details: true
+    third_party_settings: {  }
   field_tags:
     type: entity_reference_autocomplete_tags
-    weight: 3
+    weight: 2
     region: content
     settings:
       match_operator: CONTAINS
@@ -61,13 +68,13 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 30
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 15
+    weight: 8
     region: content
     settings:
       display_label: true
@@ -85,14 +92,14 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 120
+    weight: 11
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    weight: 16
+    weight: 9
     region: content
     settings:
       display_label: true
@@ -112,7 +119,7 @@ content:
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 5
+    weight: 6
     region: content
     settings:
       match_operator: CONTAINS
@@ -127,8 +134,4 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
-  # These settings are advanced, and therefore hidden by default to avoid making
-  # the edit form too overwhelming. Administrators can always re-enable them later.
-  field_meta_tags: true
-  simple_sitemap: true
   url_redirects: true