diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 64d4d49..d2e5ebd 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -21,6 +21,7 @@ hooks: - exec-host: "([ ! -f ./.ddev/docker-compose.mkdocs.yaml ] && mv ./mkdocs/docker-compose.mkdocs.yaml ./.ddev/) || (echo 'A MkDocs service file has been located in your system.')" - exec-host: "([ -d ./mkdocs/docs ] && cd ./mkdocs/docs && git pull origin) || (git clone https://github.com/davidjguru/summerhouse.wiki.git ./mkdocs/docs)" - exec-host: "cp -r ./images/assets/* ./frontend_react/src/assets/" + - exec-host: "cp -r ./images/assets/* ./backend_drupal/sites/default/files/" - exec-host: "sed -i '12s/restart: \"no\"/restart: \"always\"/' ./.ddev/docker-compose.portainer.yaml" post-start: - exec: sudo echo alias ll=\"ls -lhA\" >> ~/.bashrc @@ -30,12 +31,8 @@ hooks: # Resolve all dependencies by Composer in container. - composer: install # Install Drupal after start if not installed already. - - exec: "(drush status bootstrap | grep -q Successful) || (drush site-install --site-name=SummerHouse --account-name=admin --account-pass=admin --db-url=mysql://db:db@db/db -y && drush user-add-role 'administrator' admin)" - - exec-host: "yes |ddev drush cset system.site uuid $(head -n 1 ./.settings/salt.txt)" - - exec: "drush cr" - - exec: "([ $(drush eval 'print_r(array_keys(\\Drupal::entityTypeManager()->getDefinitions()));' | grep shortcut -c) -gt 0 ] && (drush entity:delete shortcut_set) || (echo 'No shortcut entities were found in your system.'))" - - exec: "drush pmu shortcut -y" - - exec: "drush cim -y" + - exec: "(drush status bootstrap | grep -q Successful) || (drush site-install --existing-config --site-name=SummerHouse --account-name=admin --account-pass=admin --db-url=mysql://db:db@db/db -y && drush user-add-role 'administrator' admin)" + - exec: "yes | drush cset system.site uuid $(head -n 1 ./.settings/salt.txt)" - exec: "drush cr" # Generate 10 new nodes with type article. - exec: "drush genc --bundles=article 10" diff --git a/backend_drupal/profiles/summer_house/summer_house.info,yml b/backend_drupal/profiles/summer_house/summer_house.info,yml new file mode 100644 index 0000000..ebc21ef --- /dev/null +++ b/backend_drupal/profiles/summer_house/summer_house.info,yml @@ -0,0 +1,57 @@ +name: Summer House +type: profile +description: 'Custom Installation Profile for Summer House development.' +core_version_requirement: '^8.8.0 || ^9 || ^10' + +distribution: + name: Summer House. + langcode: en + +dependencies: + - automated_cron + - block + - block_content + - breakpoint + - ckeditor + - color + - comment + - config + - contact + - contextual + - datetime + - dblog + - dynamic_page_cache + - editor + - field + - field_ui + - file + - filter + - help + - history + - image + - link + - menu_ui + - node + - options + - page_cache + - path + - quickedit + - rdf + - search + - shortcut + - system + - taxonomy + - text + - toolbar + - tour + - update + - user + - views_ui + - menu_link_content + - views + +themes: + - stable + - classy + - bartik + - seven \ No newline at end of file diff --git a/backend_drupal/profiles/summer_house/summer_house.install b/backend_drupal/profiles/summer_house/summer_house.install new file mode 100644 index 0000000..e69de29 diff --git a/backend_drupal/profiles/summer_house/summer_house.profile b/backend_drupal/profiles/summer_house/summer_house.profile new file mode 100644 index 0000000..e69de29 diff --git a/backend_drupal/sites/default/files/sync/bartik.settings.yml b/backend_drupal/sites/default/files/sync/bartik.settings.yml new file mode 100644 index 0000000..da0f06c --- /dev/null +++ b/backend_drupal/sites/default/files/sync/bartik.settings.yml @@ -0,0 +1,12 @@ +favicon: + mimetype: image/png + path: 'public://summerhouse_icon_1_512x512.png' + use_default: false +features: + comment_user_picture: true + comment_user_verification: true + favicon: true + node_user_picture: true +logo: + path: 'public://summerhouse_logo_reduced.png' + use_default: false diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_account_menu.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_account_menu.yml deleted file mode 100644 index 7e9bef2..0000000 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_account_menu.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: bac69e6f-eae5-4f49-8b8a-2fa4685a8d3d -langcode: en -status: true -dependencies: - config: - - system.menu.account - module: - - system - theme: - - bartik -_core: - default_config_hash: jzu74Q7R0QWgw8IniA9HZRSb_a8RPak1M0q5J-VGkZI -id: bartik_account_menu -theme: bartik -region: secondary_menu -weight: 0 -provider: null -plugin: 'system_menu_block:account' -settings: - id: 'system_menu_block:account' - label: 'User account menu' - label_display: '0' - provider: system - level: 1 - depth: 1 - expand_all_items: false -visibility: { } diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_breadcrumbs.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_breadcrumbs.yml index 2b2e277..0d18b70 100644 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_breadcrumbs.yml +++ b/backend_drupal/sites/default/files/sync/block.block.bartik_breadcrumbs.yml @@ -1,4 +1,4 @@ -uuid: 5af4bc98-ac73-491d-8a6c-8dbfcfced847 +uuid: 60256e26-a392-4887-808f-fcbf8e787076 langcode: en status: true dependencies: @@ -7,7 +7,7 @@ dependencies: theme: - bartik _core: - default_config_hash: y0bXRvKYQQKkf_RVxA3aOPGpIfKKsDOzzrWYCgjxJ9Y + default_config_hash: NjcxOBrPOiK5-38t56DwFBDVY4yer7YSlbRWXFuHe7A id: bartik_breadcrumbs theme: bartik region: breadcrumb diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_content.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_content.yml index 93e06e2..56c2cbe 100644 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_content.yml +++ b/backend_drupal/sites/default/files/sync/block.block.bartik_content.yml @@ -1,4 +1,4 @@ -uuid: ecf11e53-0ed2-4829-b51b-3107da4cd4ea +uuid: 333035bb-34af-4903-a951-4a145da9e4e8 langcode: en status: true dependencies: @@ -7,7 +7,7 @@ dependencies: theme: - bartik _core: - default_config_hash: kigu8pTxXt1qGR2NJ5HHdC4G2G1wsDrIjLPKBT5wUBc + default_config_hash: a0Yyx1GeyKarZ4T_yXQBR_ZFKnXiFLtxAb6gWLd8nr0 id: bartik_content theme: bartik region: content diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_footer.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_footer.yml deleted file mode 100644 index 2e1f28f..0000000 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_footer.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 0d975174-04f2-4fa2-946a-90ae2030b061 -langcode: en -status: true -dependencies: - config: - - system.menu.footer - module: - - system - theme: - - bartik -_core: - default_config_hash: pnCK21YFjH7iB4XDeokSq3N3XSr6qX8BsqMs9nmip6E -id: bartik_footer -theme: bartik -region: footer_fifth -weight: 0 -provider: null -plugin: 'system_menu_block:footer' -settings: - id: 'system_menu_block:footer' - label: 'Footer menu' - label_display: '0' - provider: system - level: 1 - depth: 0 - expand_all_items: false -visibility: { } diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_help.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_help.yml index 587d44c..87d5a36 100644 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_help.yml +++ b/backend_drupal/sites/default/files/sync/block.block.bartik_help.yml @@ -1,4 +1,4 @@ -uuid: ded53f8c-dfa2-420b-8ad3-82fc482c6555 +uuid: 6cba46a2-5d29-4fed-93a0-aebe58cd92a5 langcode: en status: true dependencies: @@ -7,11 +7,11 @@ dependencies: theme: - bartik _core: - default_config_hash: '-laWx8WA-ikiIEH3NJQ0hVbjqk3iEuBms91LB0B4IQU' + default_config_hash: jccFSSVqV0WCDb6NtML1VWAWTtDbZ-zn5YgTRMgMrIM id: bartik_help theme: bartik -region: content -weight: -30 +region: header +weight: -2 provider: null plugin: help_block settings: diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_local_actions.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_local_actions.yml index 2eec077..6f42424 100644 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_local_actions.yml +++ b/backend_drupal/sites/default/files/sync/block.block.bartik_local_actions.yml @@ -1,15 +1,15 @@ -uuid: 20e5b0b9-6c7f-44d0-8322-33885228a2f4 +uuid: 3e1c2bca-75fc-4ea8-9938-65408f3ae6f6 langcode: en status: true dependencies: theme: - bartik _core: - default_config_hash: XRdb8LpbArVA6CpuuEZxzi50JIdjsJaCCZ5o3fH0Blk + default_config_hash: CdXfDmRgAvms7EQovxxWPdYi0GitxeRbVtScYK16ZH0 id: bartik_local_actions theme: bartik region: content -weight: -20 +weight: -10 provider: null plugin: local_actions_block settings: diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_main_menu.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_main_menu.yml deleted file mode 100644 index 38b5949..0000000 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_main_menu.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 7656c174-4fde-417c-8285-183b746196db -langcode: en -status: true -dependencies: - config: - - system.menu.main - module: - - system - theme: - - bartik -_core: - default_config_hash: _G1IfGESk7WqvVCi7B3VJxhSY0YICgv1OmuVPJqO8bE -id: bartik_main_menu -theme: bartik -region: primary_menu -weight: 0 -provider: null -plugin: 'system_menu_block:main' -settings: - id: 'system_menu_block:main' - label: 'Main navigation' - label_display: '0' - provider: system - level: 1 - depth: 1 - expand_all_items: false -visibility: { } diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_messages.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_messages.yml index 9b1b0bc..ecf3b5d 100644 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_messages.yml +++ b/backend_drupal/sites/default/files/sync/block.block.bartik_messages.yml @@ -1,4 +1,4 @@ -uuid: d9f1c145-a621-405f-bea1-aa59df1f824b +uuid: 64ceec44-986c-4ea7-a06a-8eb2c5cd0fe1 langcode: en status: true dependencies: @@ -7,7 +7,7 @@ dependencies: theme: - bartik _core: - default_config_hash: KC12e0aosUnBBs5bd374JVcQjJaFNOSIHzu0dUGf22o + default_config_hash: '-Ac3ISpIT0PQ-whzD7_dw0SdKi6dAbRFNWdSjOiVDqg' id: bartik_messages theme: bartik region: highlighted diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_page_title.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_page_title.yml index 541099a..e747159 100644 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_page_title.yml +++ b/backend_drupal/sites/default/files/sync/block.block.bartik_page_title.yml @@ -1,15 +1,15 @@ -uuid: 316840b2-4f2a-44cf-b447-d611d8281b19 +uuid: e51093cd-5092-47a4-a222-eea97fd96564 langcode: en status: true dependencies: theme: - bartik _core: - default_config_hash: ItFhhiUOoeR7oIq73ZaCV7PAYrOwXZ-9fazMzF5DJXM + default_config_hash: fNwDdW063tk_ktzSWzZVeQS9wzvLooVO280BQ9WrsIs id: bartik_page_title theme: bartik -region: content -weight: -50 +region: header +weight: -3 provider: null plugin: page_title_block settings: diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_powered.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_powered.yml deleted file mode 100644 index 6e17c78..0000000 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_powered.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 4cf6fe38-67c5-4b88-bf44-d308b6d05937 -langcode: en -status: true -dependencies: - module: - - system - theme: - - bartik -_core: - default_config_hash: I6Esh8cDlPdl2POZg4MOSRUrQNYA1UNCJCxL2yqT_wc -id: bartik_powered -theme: bartik -region: footer_fifth -weight: 10 -provider: null -plugin: system_powered_by_block -settings: - id: system_powered_by_block - label: 'Powered by Drupal' - label_display: '0' - provider: system -visibility: { } diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_primary_local_tasks.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_primary_local_tasks.yml new file mode 100644 index 0000000..9acbfa6 --- /dev/null +++ b/backend_drupal/sites/default/files/sync/block.block.bartik_primary_local_tasks.yml @@ -0,0 +1,22 @@ +uuid: cf6dca47-d509-4b4b-a3ec-4742589d7d80 +langcode: en +status: true +dependencies: + theme: + - bartik +_core: + default_config_hash: ACjBZI5shAMiiUpsz-inLYVXDqNNXRnSzAWV3kV_8Hw +id: bartik_primary_local_tasks +theme: bartik +region: header +weight: -1 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Primary tabs' + label_display: '0' + provider: core + primary: true + secondary: false +visibility: { } diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_search.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_search.yml deleted file mode 100644 index 3fb7537..0000000 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_search.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 7a4271c2-8013-4d7d-8e38-835e5b70a5a7 -langcode: en -status: true -dependencies: - module: - - search - theme: - - bartik -_core: - default_config_hash: jQ-C8l3dJPqYCGST1e-kSjR14PDP4wq-iFbp8dMFcRo -id: bartik_search -theme: bartik -region: sidebar_first -weight: -1 -provider: null -plugin: search_form_block -settings: - id: search_form_block - label: Search - label_display: visible - provider: search - page_id: node_search -visibility: { } diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_local_tasks.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_secondary_local_tasks.yml similarity index 52% rename from backend_drupal/sites/default/files/sync/block.block.bartik_local_tasks.yml rename to backend_drupal/sites/default/files/sync/block.block.bartik_secondary_local_tasks.yml index f3a23e6..7147f70 100644 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_local_tasks.yml +++ b/backend_drupal/sites/default/files/sync/block.block.bartik_secondary_local_tasks.yml @@ -1,22 +1,22 @@ -uuid: cdef0ee1-570f-484d-a1f4-30234efbe336 +uuid: 8a46f1f0-a22b-454c-8778-677065e5d2ef langcode: en status: true dependencies: theme: - bartik _core: - default_config_hash: Qf2BoIzd9py5AYXZj8fJzCYDyVk1-AWXcu-AqQeDZKA -id: bartik_local_tasks + default_config_hash: 2L0geP-ixCbCkEpW6BVF6H7vDUZN4ea07_Y9CociQm4 +id: bartik_secondary_local_tasks theme: bartik -region: content -weight: -40 +region: header +weight: 0 provider: null plugin: local_tasks_block settings: id: local_tasks_block - label: Tabs + label: 'Secondary tabs' label_display: '0' provider: core - primary: true + primary: false secondary: true visibility: { } diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_tools.yml b/backend_drupal/sites/default/files/sync/block.block.bartik_tools.yml deleted file mode 100644 index e8e7d56..0000000 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_tools.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 52817063-aa4a-4f63-807b-1f76fa50e5ee -langcode: en -status: true -dependencies: - config: - - system.menu.tools - module: - - system - theme: - - bartik -_core: - default_config_hash: TszJ7dH_11Qjmo_OpMzqznaED4Bvy1XfVnBzTC9LZXE -id: bartik_tools -theme: bartik -region: sidebar_first -weight: 0 -provider: null -plugin: 'system_menu_block:tools' -settings: - id: 'system_menu_block:tools' - label: Tools - label_display: visible - provider: system - level: 1 - depth: 0 - expand_all_items: false -visibility: { } diff --git a/backend_drupal/sites/default/files/sync/block.block.seven_breadcrumbs.yml b/backend_drupal/sites/default/files/sync/block.block.claro_breadcrumbs.yml similarity index 63% rename from backend_drupal/sites/default/files/sync/block.block.seven_breadcrumbs.yml rename to backend_drupal/sites/default/files/sync/block.block.claro_breadcrumbs.yml index c8dda9e..681c654 100644 --- a/backend_drupal/sites/default/files/sync/block.block.seven_breadcrumbs.yml +++ b/backend_drupal/sites/default/files/sync/block.block.claro_breadcrumbs.yml @@ -1,15 +1,15 @@ -uuid: 1ea92fe7-cc1c-4231-8a04-4247d9336443 +uuid: 009e5ada-f363-46e6-a182-454b5bb63869 langcode: en status: true dependencies: module: - system theme: - - seven + - claro _core: - default_config_hash: 2rIN97Rd7-rjv3P4h0-xrZnAgPJHyXFEwrB--sS2_qE -id: seven_breadcrumbs -theme: seven + default_config_hash: NjcxOBrPOiK5-38t56DwFBDVY4yer7YSlbRWXFuHe7A +id: claro_breadcrumbs +theme: claro region: breadcrumb weight: 0 provider: null diff --git a/backend_drupal/sites/default/files/sync/block.block.seven_content.yml b/backend_drupal/sites/default/files/sync/block.block.claro_content.yml similarity index 63% rename from backend_drupal/sites/default/files/sync/block.block.seven_content.yml rename to backend_drupal/sites/default/files/sync/block.block.claro_content.yml index 5c35a1b..f97de23 100644 --- a/backend_drupal/sites/default/files/sync/block.block.seven_content.yml +++ b/backend_drupal/sites/default/files/sync/block.block.claro_content.yml @@ -1,15 +1,15 @@ -uuid: 65fda3cb-20d6-4f48-a3f9-6af38b360bd7 +uuid: 2ac50e54-f58e-4923-b3ef-29bfbc87d5b8 langcode: en status: true dependencies: module: - system theme: - - seven + - claro _core: - default_config_hash: 6_eJxtyfANKFE_nfriHKgrARRIPHH88sI6jvQ4EHbBc -id: seven_content -theme: seven + default_config_hash: a0Yyx1GeyKarZ4T_yXQBR_ZFKnXiFLtxAb6gWLd8nr0 +id: claro_content +theme: claro region: content weight: 0 provider: null diff --git a/backend_drupal/sites/default/files/sync/block.block.seven_help.yml b/backend_drupal/sites/default/files/sync/block.block.claro_help.yml similarity index 60% rename from backend_drupal/sites/default/files/sync/block.block.seven_help.yml rename to backend_drupal/sites/default/files/sync/block.block.claro_help.yml index e14fc5f..0c7308c 100644 --- a/backend_drupal/sites/default/files/sync/block.block.seven_help.yml +++ b/backend_drupal/sites/default/files/sync/block.block.claro_help.yml @@ -1,15 +1,15 @@ -uuid: 5e51f8ff-6ec4-4787-9a29-d373e52245ee +uuid: e06d3fa7-c3d9-480c-9b03-11f9e7f5c82b langcode: en status: true dependencies: module: - help theme: - - seven + - claro _core: - default_config_hash: bYvyEzJ7UcmjXZAYLxb4Qb_J77K9bPbk4ealdap31FY -id: seven_help -theme: seven + default_config_hash: jccFSSVqV0WCDb6NtML1VWAWTtDbZ-zn5YgTRMgMrIM +id: claro_help +theme: claro region: help weight: 0 provider: null diff --git a/backend_drupal/sites/default/files/sync/block.block.seven_local_actions.yml b/backend_drupal/sites/default/files/sync/block.block.claro_local_actions.yml similarity index 61% rename from backend_drupal/sites/default/files/sync/block.block.seven_local_actions.yml rename to backend_drupal/sites/default/files/sync/block.block.claro_local_actions.yml index 591e5a9..a5831a1 100644 --- a/backend_drupal/sites/default/files/sync/block.block.seven_local_actions.yml +++ b/backend_drupal/sites/default/files/sync/block.block.claro_local_actions.yml @@ -1,13 +1,13 @@ -uuid: ad776350-a17c-48d3-8422-703fa2ef0348 +uuid: b56415b5-ded7-4332-ad47-a98eced6ef1e langcode: en status: true dependencies: theme: - - seven + - claro _core: - default_config_hash: gv5JXTvQXjlMY6PXrfxzcLMjMg4074WiEQCy7ZSMvK4 -id: seven_local_actions -theme: seven + default_config_hash: CdXfDmRgAvms7EQovxxWPdYi0GitxeRbVtScYK16ZH0 +id: claro_local_actions +theme: claro region: content weight: -10 provider: null diff --git a/backend_drupal/sites/default/files/sync/block.block.seven_messages.yml b/backend_drupal/sites/default/files/sync/block.block.claro_messages.yml similarity index 63% rename from backend_drupal/sites/default/files/sync/block.block.seven_messages.yml rename to backend_drupal/sites/default/files/sync/block.block.claro_messages.yml index e510a08..8b4f4b8 100644 --- a/backend_drupal/sites/default/files/sync/block.block.seven_messages.yml +++ b/backend_drupal/sites/default/files/sync/block.block.claro_messages.yml @@ -1,15 +1,15 @@ -uuid: 21e4eabd-139b-4a7f-9275-c6f8a13839d4 +uuid: 4d7b1ff8-efab-437a-be9b-15a13ae78b9d langcode: en status: true dependencies: module: - system theme: - - seven + - claro _core: - default_config_hash: bZvFlENVti4PpqT6kqoC86B5_lXp6aE-d4nrvLMU4CY -id: seven_messages -theme: seven + default_config_hash: '-Ac3ISpIT0PQ-whzD7_dw0SdKi6dAbRFNWdSjOiVDqg' +id: claro_messages +theme: claro region: highlighted weight: 0 provider: null diff --git a/backend_drupal/sites/default/files/sync/block.block.seven_page_title.yml b/backend_drupal/sites/default/files/sync/block.block.claro_page_title.yml similarity index 59% rename from backend_drupal/sites/default/files/sync/block.block.seven_page_title.yml rename to backend_drupal/sites/default/files/sync/block.block.claro_page_title.yml index e929501..8b66267 100644 --- a/backend_drupal/sites/default/files/sync/block.block.seven_page_title.yml +++ b/backend_drupal/sites/default/files/sync/block.block.claro_page_title.yml @@ -1,13 +1,13 @@ -uuid: 8c29b377-7126-46f5-9014-0cb9e567b71a +uuid: 9a882f5a-9040-432e-b35c-1c074b18992d langcode: en status: true dependencies: theme: - - seven + - claro _core: - default_config_hash: P-2PK2v3yJQRI4Mg1RqKQ0Ki0wP_UUErIvahd_MtMVc -id: seven_page_title -theme: seven + default_config_hash: fNwDdW063tk_ktzSWzZVeQS9wzvLooVO280BQ9WrsIs +id: claro_page_title +theme: claro region: header weight: -30 provider: null diff --git a/backend_drupal/sites/default/files/sync/block.block.seven_primary_local_tasks.yml b/backend_drupal/sites/default/files/sync/block.block.claro_primary_local_tasks.yml similarity index 62% rename from backend_drupal/sites/default/files/sync/block.block.seven_primary_local_tasks.yml rename to backend_drupal/sites/default/files/sync/block.block.claro_primary_local_tasks.yml index d504bd0..b505d94 100644 --- a/backend_drupal/sites/default/files/sync/block.block.seven_primary_local_tasks.yml +++ b/backend_drupal/sites/default/files/sync/block.block.claro_primary_local_tasks.yml @@ -1,13 +1,13 @@ -uuid: 625668da-9279-4fa6-bbc4-d8df85569e54 +uuid: 9010bf0c-94d5-46bd-aee4-b1ecd00ccbc0 langcode: en status: true dependencies: theme: - - seven + - claro _core: - default_config_hash: ouwsNHI1V3bwV1G1vl0EcbWy8AB9V62vgLOSjTpoCSI -id: seven_primary_local_tasks -theme: seven + default_config_hash: ACjBZI5shAMiiUpsz-inLYVXDqNNXRnSzAWV3kV_8Hw +id: claro_primary_local_tasks +theme: claro region: header weight: 0 provider: null diff --git a/backend_drupal/sites/default/files/sync/block.block.seven_secondary_local_tasks.yml b/backend_drupal/sites/default/files/sync/block.block.claro_secondary_local_tasks.yml similarity index 62% rename from backend_drupal/sites/default/files/sync/block.block.seven_secondary_local_tasks.yml rename to backend_drupal/sites/default/files/sync/block.block.claro_secondary_local_tasks.yml index c1dc74c..230ad56 100644 --- a/backend_drupal/sites/default/files/sync/block.block.seven_secondary_local_tasks.yml +++ b/backend_drupal/sites/default/files/sync/block.block.claro_secondary_local_tasks.yml @@ -1,13 +1,13 @@ -uuid: 2901ada2-2344-48ac-83bb-2a4e410f4fee +uuid: ad5d4531-1d27-4aa6-b86b-8e62287db558 langcode: en status: true dependencies: theme: - - seven + - claro _core: - default_config_hash: W8ripr8GQI0o3eaaD7lcd4687nUrcHoYdu4yIjzVN3o -id: seven_secondary_local_tasks -theme: seven + default_config_hash: 2L0geP-ixCbCkEpW6BVF6H7vDUZN4ea07_Y9CociQm4 +id: claro_secondary_local_tasks +theme: claro region: pre_content weight: 0 provider: null diff --git a/backend_drupal/sites/default/files/sync/block.block.bartik_branding.yml b/backend_drupal/sites/default/files/sync/block.block.sitebranding.yml similarity index 66% rename from backend_drupal/sites/default/files/sync/block.block.bartik_branding.yml rename to backend_drupal/sites/default/files/sync/block.block.sitebranding.yml index 33a9cc0..b6229d1 100644 --- a/backend_drupal/sites/default/files/sync/block.block.bartik_branding.yml +++ b/backend_drupal/sites/default/files/sync/block.block.sitebranding.yml @@ -1,4 +1,4 @@ -uuid: d8d0aed5-a974-4a8f-ae6a-11c41d8a121b +uuid: f48aa55d-d089-48e0-8032-f68e48959449 langcode: en status: true dependencies: @@ -6,12 +6,10 @@ dependencies: - system theme: - bartik -_core: - default_config_hash: d-0emr1mEq7sFKDu5RHUJckvNk62hvIZdRwPEfnJyGg -id: bartik_branding +id: sitebranding theme: bartik region: header -weight: 0 +weight: -4 provider: null plugin: system_branding_block settings: @@ -22,4 +20,8 @@ settings: use_site_logo: true use_site_name: true use_site_slogan: true -visibility: { } +visibility: + request_path: + id: request_path + negate: true + pages: '' diff --git a/backend_drupal/sites/default/files/sync/claro.settings.yml b/backend_drupal/sites/default/files/sync/claro.settings.yml new file mode 100644 index 0000000..200749d --- /dev/null +++ b/backend_drupal/sites/default/files/sync/claro.settings.yml @@ -0,0 +1,15 @@ +favicon: + mimetype: image/png + path: 'public://summerhouse_icon_1_512x512.png' + use_default: false +features: + comment_user_picture: true + comment_user_verification: true + favicon: true + node_user_picture: true +logo: + path: 'public://summerhouse_logo.png' + use_default: false +third_party_settings: + shortcut: + module_link: true diff --git a/backend_drupal/sites/default/files/sync/color.theme.bartik.yml b/backend_drupal/sites/default/files/sync/color.theme.bartik.yml new file mode 100644 index 0000000..e8b003e --- /dev/null +++ b/backend_drupal/sites/default/files/sync/color.theme.bartik.yml @@ -0,0 +1,16 @@ +palette: + top: '#f0f8fd' + bottom: '#1d84c3' + bg: '#ffffff' + sidebar: '#f6f6f2' + sidebarborders: '#f9f9f9' + footer: '#292929' + titleslogan: '#fffeff' + text: '#3b3b3b' + link: '#0071b3' +logo: 'public://color/bartik-f8b2856a/logo.svg' +stylesheets: + - 'public://color/bartik-f8b2856a/colors.css' +files: + - 'public://color/bartik-f8b2856a/logo.svg' + - 'public://color/bartik-f8b2856a/colors.css' diff --git a/backend_drupal/sites/default/files/sync/core.extension.yml b/backend_drupal/sites/default/files/sync/core.extension.yml index 5df570f..4d24365 100644 --- a/backend_drupal/sites/default/files/sync/core.extension.yml +++ b/backend_drupal/sites/default/files/sync/core.extension.yml @@ -43,6 +43,7 @@ module: path_alias: 0 rdf: 0 search: 0 + shortcut: 0 system: 0 taxonomy: 0 text: 0 @@ -54,8 +55,8 @@ module: views_ui: 0 webprofiler: 0 views: 10 - standard: 1000 + minimal: 1000 theme: bartik: 0 - seven: 0 -profile: standard + claro: 0 +profile: minimal diff --git a/backend_drupal/sites/default/files/sync/seven.settings.yml b/backend_drupal/sites/default/files/sync/seven.settings.yml deleted file mode 100644 index 43b5674..0000000 --- a/backend_drupal/sites/default/files/sync/seven.settings.yml +++ /dev/null @@ -1 +0,0 @@ -third_party_settings: { } diff --git a/backend_drupal/sites/default/files/sync/shortcut.set.default.yml b/backend_drupal/sites/default/files/sync/shortcut.set.default.yml new file mode 100644 index 0000000..72f1bf0 --- /dev/null +++ b/backend_drupal/sites/default/files/sync/shortcut.set.default.yml @@ -0,0 +1,8 @@ +uuid: 5927c46b-daaf-45b4-a439-086b1a6a00c7 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: U5VlGjd_SfV0Qm_EfnaynOfc549cNscFAx48JfYoMRI +id: default +label: Default diff --git a/backend_drupal/sites/default/files/sync/system.performance.yml b/backend_drupal/sites/default/files/sync/system.performance.yml index cd81c18..6b57fb6 100644 --- a/backend_drupal/sites/default/files/sync/system.performance.yml +++ b/backend_drupal/sites/default/files/sync/system.performance.yml @@ -4,7 +4,7 @@ cache: page: max_age: 0 css: - preprocess: true + preprocess: false gzip: true fast_404: enabled: true @@ -12,6 +12,6 @@ fast_404: exclude_paths: '/\/(?:styles|imagecache)\//' html: '404 Not Found

Not Found

The requested URL "@path" was not found on this server.

' js: - preprocess: true + preprocess: false gzip: true stale_file_threshold: 2592000 diff --git a/backend_drupal/sites/default/files/sync/system.theme.global.yml b/backend_drupal/sites/default/files/sync/system.theme.global.yml index 46ce63b..7057dcd 100644 --- a/backend_drupal/sites/default/files/sync/system.theme.global.yml +++ b/backend_drupal/sites/default/files/sync/system.theme.global.yml @@ -1,16 +1,16 @@ _core: default_config_hash: 9rAU4Pku7eMBQxauQqAgjzlcicFZ2As6zEa6zvTlCB8 favicon: - mimetype: image/vnd.microsoft.icon - path: '' + mimetype: image/png + path: 'public://summerhouse_icon_1_512x512_0.png' url: '' - use_default: true + use_default: false features: comment_user_picture: true comment_user_verification: true favicon: true node_user_picture: true logo: - path: '' + path: 'public://summerhouse_logo_0.png' url: '' - use_default: true + use_default: false diff --git a/backend_drupal/sites/default/files/sync/system.theme.yml b/backend_drupal/sites/default/files/sync/system.theme.yml index 113eb1f..985c9de 100644 --- a/backend_drupal/sites/default/files/sync/system.theme.yml +++ b/backend_drupal/sites/default/files/sync/system.theme.yml @@ -1,4 +1,4 @@ _core: default_config_hash: fOjer9hADYYnbCJVZMFZIIM1azTFWyg84ZkFDHfAbUg -admin: seven +admin: claro default: bartik diff --git a/composer.json b/composer.json index f5abe66..55ec855 100644 --- a/composer.json +++ b/composer.json @@ -82,6 +82,11 @@ ] }, "extra": { + "patches": { + "drupal/core": { + "Allow an install hook in profiles installing from configuration": "https://www.drupal.org/files/issues/2022-05-19/2982052-80.patch" + } + }, "drupal-scaffold": { "locations": { "web-root": "backend_drupal/" diff --git a/images/assets/summerhouse_logo_reduced.png b/images/assets/summerhouse_logo_reduced.png new file mode 100644 index 0000000..3d91fde Binary files /dev/null and b/images/assets/summerhouse_logo_reduced.png differ