Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
fb4e4db
Convert installation scripts to use recipes.
richardgaunt Mar 9, 2025
762eb6c
Add recipes to docker container.
richardgaunt Mar 9, 2025
e26e2f0
Updated path to recipes.
richardgaunt Mar 9, 2025
e204a25
Merge branch 'develop' into feature/convert-site-install-to-recipes
richardgaunt Mar 11, 2025
a1a6097
Merge branch 'develop' into feature/convert-site-install-to-recipes
joshua-salsadigital Apr 9, 2025
c1ff8f4
Minor Fixes.
joshua-salsadigital Apr 9, 2025
4cecef0
Test error [cli stage-0 4/22] COPY recipes /app/recipes:
joshua-salsadigital Apr 9, 2025
a676e41
Fixed recipe installation issues.
joshua-salsadigital Apr 22, 2025
7d55a36
phpcs fixes
joshua-salsadigital Apr 22, 2025
50a1926
Fixed config issues.
joshua-salsadigital Apr 22, 2025
5c3778c
Fixed node dependency issue in recipie
joshua-salsadigital Apr 22, 2025
ed8f217
Updated behat test.
joshua-salsadigital Apr 22, 2025
be77525
Fix route null error.
joshua-salsadigital Apr 22, 2025
c60e5ed
Fix route null error.
joshua-salsadigital Apr 22, 2025
f66cd94
Fix route null error.
joshua-salsadigital Apr 22, 2025
5dc5d5b
Merge branch 'develop' into feature/convert-site-install-to-recipes
richardgaunt May 8, 2025
e2a03c8
Merge branch 'develop' into feature/convert-site-install-to-recipes
richardgaunt May 9, 2025
65563d6
Merge branch 'develop' into feature/convert-site-install-to-recipes
richardgaunt May 9, 2025
f6df94c
Merge branch 'develop' into feature/convert-site-install-to-recipes
joshua-salsadigital Jun 2, 2025
83fadc1
Added the media_library view for the media field.
IvanZugec Jun 30, 2025
87ea5da
Merge branch 'develop' into feature/convert-site-install-to-recipes
joshua-salsadigital Jul 11, 2025
fcd7ddf
Merge branch 'develop' into feature/convert-site-install-to-recipes
joshua-salsadigital Jul 16, 2025
b0d0cad
Merge branch 'develop' into feature/convert-site-install-to-recipes
joshua-salsadigital Jul 23, 2025
c9f28d6
Merge branch 'develop' into feature/convert-site-install-to-recipes
joshua-salsadigital Aug 5, 2025
23b451f
Merge branch 'develop' into feature/convert-site-install-to-recipes
joshua-salsadigital Aug 20, 2025
891e052
Merge branch 'develop' into feature/convert-site-install-to-recipes
joshua-salsadigital Aug 25, 2025
1603697
Added recipe for generated static content.
richardgaunt Sep 26, 2025
9ddf6d7
[#3543470] Updated provision callbacks to provide the theme_name to a…
richardgaunt Aug 28, 2025
11c2d4c
Issue #3543729 by richardgaunt, ivan zugec: Add a script to automate …
richardgaunt Aug 29, 2025
0f13d5e
Bump the npm_and_yarn group across 2 directories with 1 update (#1420)
dependabot[bot] Sep 10, 2025
1275444
Issue #3525185 by anirudhsingh19: Expose banner type as a variable (#…
anirudhsingh-7773 Sep 10, 2025
9062c19
[#3525687] Fixed cleanup delete cmd (#1421)
richardgaunt Sep 10, 2025
832a183
Updated script to be able to skip provisioning content. (#1423)
richardgaunt Sep 11, 2025
2e136a2
Add Quant Cloud migration configuration
stooit Sep 14, 2025
01f18ec
Add Quant Cloud migration configuration
stooit Sep 14, 2025
cca2be9
Add Quant Cloud migration configuration
stooit Sep 14, 2025
8a932aa
Bump axios from 1.9.0 to 1.12.0 in /scripts/civictheme-uikit-version-…
dependabot[bot] Sep 20, 2025
29accf3
Fix link to theme docs (#1419)
mlncn Sep 21, 2025
faa6388
UIKit bump.
richardgaunt Sep 21, 2025
8b0f5a7
Updated unit tests for new dev host. (#1426)
richardgaunt Sep 22, 2025
66e58c6
Issue #3545860: Added collapsible video player transcript. (#1422)
alan-cole Sep 22, 2025
43d3f15
Add Quant Cloud migration configuration
stooit Sep 25, 2025
e562041
Add Quant Cloud migration configuration
stooit Sep 25, 2025
37996bd
Updated content.
richardgaunt Sep 26, 2025
c4827f2
Merge branch 'feature/generated-content-static' into feature/convert-…
richardgaunt Sep 26, 2025
719d110
Added missing view, updated message test.
richardgaunt Sep 26, 2025
2beb330
Updated static content.
richardgaunt Sep 26, 2025
0a881a4
Updated for faulty static content.
richardgaunt Sep 26, 2025
48897fd
Merge branch 'feature/generated-content-static' into feature/convert-…
richardgaunt Sep 26, 2025
fb2953c
Added default content to content provision.
richardgaunt Sep 27, 2025
33bf45c
Removed incorrect provisioning of default content.
richardgaunt Sep 27, 2025
bd4818b
Fixed test, added content view to site install.
richardgaunt Sep 27, 2025
d665052
Added config action to recipes.
richardgaunt Sep 27, 2025
d252d52
Updates to assets for content recipes.
richardgaunt Sep 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .docker/cli.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ RUN curl -L -o shipshape "https://github.com/salsadigitalauorg/shipshape/release
# Install updated version of NPM.
RUN npm install -g npm@^8.6 && fix-permissions /home/.npm

# Adding patches and scripts.
# Adding recipes, patches and scripts.
COPY recipes /app/recipes
COPY patches /app/patches
COPY scripts /app/scripts

Expand Down
3 changes: 2 additions & 1 deletion .docker/cli.onlytheme.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ RUN curl -L -o shipshape "https://github.com/salsadigitalauorg/shipshape/release
# Install updated version of NPM.
RUN npm install -g npm@^8.6 && fix-permissions /home/.npm

# Adding patches and scripts.
# Adding recipes, patches and scripts.
COPY recipes /app/recipes
COPY patches /app/patches
COPY scripts /app/scripts

Expand Down
3 changes: 2 additions & 1 deletion .docker/cli.sibling.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ RUN curl -L -o shipshape "https://github.com/salsadigitalauorg/shipshape/release
# Install updated version of NPM.
RUN npm install -g npm@^8.6 && fix-permissions /home/.npm

# Adding patches and scripts.
# Adding recipes, patches and scripts.
COPY recipes /app/recipes
COPY patches /app/patches
COPY scripts /app/scripts

Expand Down
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ node_modules
!package-lock.json
!patches
!scripts
!recipes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Ensure the recipes directory and its contents are correctly whitelisted.

The pattern !recipes will re-include the directory itself but not its nested files by default. To guarantee that all subdirectories and files under recipes/ are part of the build context, update to:

-!recipes
+!recipes/
+!recipes/**

Without this, Docker may still ignore the actual recipe files.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
!recipes
-!recipes
+!recipes/
+!recipes/**

!.lagoon.env.*
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ DREVOPS_TZ="Australia/Melbourne"
################################################################################

# Drupal profile name (used only when installing from profile).
DRUPAL_PROFILE=minimal
DRUPAL_PROFILE=/app/recipes/civictheme_site_install

# Drupal theme name.
DRUPAL_THEME=civictheme
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
langcode: en
status: true
dependencies:
config:
- system.menu.civictheme-footer
module:
- menu_block
theme:
- civictheme
id: civictheme_footer_menu_1
theme: civictheme
region: footer_middle_1
weight: 0
provider: null
plugin: 'menu_block:civictheme-footer'
settings:
id: 'menu_block:civictheme-footer'
label: 'Footer menu 1'
label_display: '0'
provider: menu_block
follow: false
follow_parent: child
label_link: false
label_type: fixed
level: 1
depth: 1
expand_all_items: false
parent: 'civictheme-footer:menu_link_content:de247e03-0ea1-4d32-bbb0-06aa34123279'
render_parent: false
suggestion: civictheme_footer
hide_on_nonactive: false
visibility: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
langcode: en
status: true
dependencies:
config:
- system.menu.civictheme-footer
module:
- menu_block
theme:
- civictheme
id: civictheme_footer_menu_2
theme: civictheme
region: footer_middle_2
weight: 0
provider: null
plugin: 'menu_block:civictheme-footer'
settings:
id: 'menu_block:civictheme-footer'
label: 'Footer menu 2'
label_display: '0'
provider: menu_block
follow: false
follow_parent: child
label_link: false
label_type: fixed
level: 1
depth: 1
expand_all_items: false
parent: 'civictheme-footer:menu_link_content:f1f66752-e425-42a2-a966-09adc983b29c'
render_parent: false
suggestion: civictheme_footer
hide_on_nonactive: false
visibility: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
langcode: en
status: true
dependencies:
config:
- system.menu.civictheme-footer
module:
- menu_block
theme:
- civictheme
id: civictheme_footer_menu_3
theme: civictheme
region: footer_middle_3
weight: 0
provider: null
plugin: 'menu_block:civictheme-footer'
settings:
id: 'menu_block:civictheme-footer'
label: 'Footer menu 3'
label_display: '0'
provider: menu_block
follow: false
follow_parent: child
label_link: false
label_type: fixed
level: 1
depth: 1
expand_all_items: false
parent: 'civictheme-footer:menu_link_content:f45bf798-cdf1-46fc-b27a-3fd6472fba25'
render_parent: false
suggestion: civictheme_footer
hide_on_nonactive: false
visibility: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
langcode: en
status: true
dependencies:
config:
- system.menu.civictheme-footer
module:
- menu_block
theme:
- civictheme
id: civictheme_footer_menu_4
theme: civictheme
region: footer_middle_4
weight: 0
provider: null
plugin: 'menu_block:civictheme-footer'
settings:
id: 'menu_block:civictheme-footer'
label: 'Footer menu 4'
label_display: '0'
provider: menu_block
follow: false
follow_parent: child
label_link: false
label_type: fixed
level: 1
depth: 1
expand_all_items: false
parent: 'civictheme-footer:menu_link_content:de247e03-0ea1-4d32-bbb0-06aa34123279'
render_parent: false
suggestion: civictheme_footer
hide_on_nonactive: false
Comment on lines +28 to +31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Fix duplicate parent reference for Footer menu 4

Footer menu 4 is pointing at the same parent menu link UUID as Footer menu 1, so both blocks will render the identical child set. That leaves the fourth column without its intended links and duplicates column 1 in the UI. Please update parent to the UUID of the fourth footer column menu item (matching the configuration in menu_link_content) so each block resolves to a distinct branch.

🤖 Prompt for AI Agents
In
recipes/civictheme_content_corporate/config/block.block.civictheme_footer_menu_4.yml
around lines 28–31, the block's parent is incorrectly set to the same UUID as
Footer menu 1; update the parent field to the UUID that corresponds to the
fourth footer column menu item (the UUID used in menu_link_content for the
fourth column) so this block points to the correct menu branch and renders its
distinct child links; keep render_parent, suggestion and hide_on_nonactive
values as-is unless the menu_link_content configuration requires changes.

visibility: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
_meta:
version: '1.0'
entity_type: block_content
uuid: 286ff750-a9a9-423a-8a4e-515f79fc0a8f
bundle: civictheme_search
default_langcode: en
default:
status:
-
value: true
info:
-
value: Search
reusable:
-
value: true
revision_translation_affected:
-
value: true
moderation_state:
-
value: published
field_c_b_link:
-
uri: 'internal:/search'
title: Search
options: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
_meta:
version: '1.0'
entity_type: block_content
uuid: 50c52459-c100-4e4d-92a4-9c4c77d8f8d0
bundle: civictheme_banner
default_langcode: en
depends:
26820d38-aabc-4c1d-a6df-09fa62a3fe8a: media
default:
status:
-
value: true
info:
-
value: Banner
reusable:
-
value: true
revision_translation_affected:
-
value: true
moderation_state:
-
value: published
field_c_b_background_image:
-
entity: 26820d38-aabc-4c1d-a6df-09fa62a3fe8a
field_c_b_banner_blend_mode:
-
value: soft-light
field_c_b_banner_type:
-
value: default
field_c_b_theme:
-
value: dark
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
_meta:
version: '1.0'
entity_type: block_content
uuid: 5508dc51-1cf8-4577-9038-b572fbd698ae
bundle: civictheme_component_block
default_langcode: en
default:
status:
-
value: true
info:
-
value: Signup
reusable:
-
value: true
revision_translation_affected:
-
value: true
moderation_state:
-
value: published
field_c_b_components:
-
entity:
_meta:
version: '1.0'
entity_type: paragraph
uuid: ab2d43e2-1a13-4bd1-8bc5-6ad52b9f83a8
bundle: civictheme_promo
default_langcode: en
default:
status:
-
value: true
created:
-
value: 1667026058
behavior_settings:
-
value: { }
revision_translation_affected:
-
value: true
field_c_p_background:
-
value: false
field_c_p_content:
-
value: "<p>Sign up for news and updates from our agency.</p>\r\n"
format: civictheme_rich_text
field_c_p_link:
-
uri: 'internal:/subscribe'
title: 'Sign up'
options: { }
field_c_p_theme:
-
value: dark
field_c_p_title:
-
value: 'Sign up'
field_c_p_vertical_spacing:
-
value: top
Loading
Loading