Downgrade to php 8.1 (and use dns when possible with ddev!...pls)

(this weirdness introduced by other recent changes, but it's better on the right anyway)

Also do not wrap menu on desktop and widescreen.

Ref #114

.ddev/.gitignore

@@ -1,19 +1,32 @@
 #ddev-generated: Automatically generated ddev .gitignore.
 # You can remove the above line if you want to edit and maintain this file yourself.
+/.gitignore
 
-/import.yaml
+/**/*.example
-/docker-compose.yaml
-/db_snapshots
-/sequelpro.spf
-/import-db
-/.bgsync*
-/config.*.y*ml
-/.webimageBuild
 /.dbimageBuild
-/.bgsyncimageBuild
+/.ddev-docker-*.yaml
+/.*downloads
+/.homeadditions
+/.importdb*
 /.sshimageBuild
-/.webimageExtra
-/.dbimageExtra
 /.webimageBuild
-/.dbimageBuild
+/apache/apache-site.conf
-/*-build/Dockerfile.example
+/commands/.gitattributes
+/config.local.y*ml
+/config.*.local.y*ml
+/db_snapshots
+/mutagen/mutagen.yml
+/mutagen/.start-synced
+/nginx_full/nginx-site.conf
+/postgres/postgresql.conf
+/providers/acquia.yaml
+/providers/lagoon.yaml
+/providers/pantheon.yaml
+/providers/platform.yaml
+/providers/upsun.yaml
+/sequelpro.spf
+/traefik/config/geo-coop.yaml
+/traefik/certs/geo-coop.crt
+/traefik/certs/geo-coop.key
+/xhprof/xhprof_prepend.php
+/**/README.*

.ddev/commands/db/mysql

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-## #ddev-generated
-## Description: run mysql client in db container
-## Usage: mysql [flags] [args]
-## Example: "ddev mysql" or "ddev mysql -uroot -proot" or "echo 'SHOW TABLES;' | ddev mysql"
-## `ddev mysql --database=mysql -uroot -proot` gets you to the 'mysql' database with root privileges
-
-mysql -udb -pdb $@

.ddev/config.yaml

@@ -1,66 +1,96 @@
-APIVersion: v1.10.1
+name: geo-coop
-name: geo
+type: drupal11
-type: drupal8
 docroot: web
-php_version: "7.2"
+php_version: "8.1"
-webserver_type: nginx-fpm
+webserver_type: apache-fpm
-router_http_port: "80"
-router_https_port: "443"
 xdebug_enabled: false
 additional_hostnames: []
 additional_fqdns: []
-mariadb_version: "10.2"
+database:
-nfs_mount_enabled: false
+    type: mariadb
-provider: default
+    version: "10.5"
 use_dns_when_possible: true
-timezone: ""
+composer_version: "2"
+web_environment: []
+nodejs_version: "16"
+corepack_enable: false
+default_container_timeout: "240"
 
-
+# Key features of DDEV's config.yaml:
-# This config.yaml was created with ddev version v1.10.1 
-# webimage: drud/ddev-webserver:v1.10.0
-# dbimage: drud/ddev-dbserver:v1.10.0-10.2
-# dbaimage: drud/phpmyadmin:v1.10.0
-# bgsyncimage: drud/ddev-bgsync:v1.10.0
-# However we do not recommend explicitly wiring these images into the
-# config.yaml as they may break future versions of ddev.
-# You can update this config.yaml using 'ddev config'.
-
-# Key features of ddev's config.yaml:
 
 # name: <projectname> # Name of the project, automatically provides
 #   http://projectname.ddev.site and https://projectname.ddev.site
 
-# type: <projecttype>  # drupal6/7/8, backdrop, typo3, wordpress, php
+# type: <projecttype>  # backdrop, cakephp, craftcms, drupal, drupal6, drupal7, drupal8, drupal9, drupal10, drupal11, laravel, magento, magento2, php, shopware6, silverstripe, symfony, typo3, wordpress
+# See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more
+# information on the different project types
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "7.2"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3"
+# php_version: "8.3"  # PHP version to use, "5.6" through "8.4"
 
-# You can explicitly specify the webimage, dbimage, dbaimage lines but this
+# You can explicitly specify the webimage but this
-# is not recommended, as the images are often closely tied to ddev's' behavior,
+# is not recommended, as the images are often closely tied to DDEV's' behavior,
 # so this can break upgrades.
 
 # webimage: <docker_image>  # nginx/php docker image.
-# dbimage: <docker_image>  # mariadb docker image.
-# dbaimage: <docker_image>
-# bgsyncimage: <docker_image>
 
-# router_http_port: <port>  # Port to be used for http (defaults to port 80)
+# database:
-# router_https_port: <port> # Port for https (defaults to 443)
+#   type: <dbtype> # mysql, mariadb, postgres
+#   version: <version> # database version, like "10.11" or "8.0"
+#   MariaDB versions can be 5.5-10.8, 10.11, and 11.4.
+#   MySQL versions can be 5.5-8.0.
+#   PostgreSQL versions can be 9-17.
 
-# xdebug_enabled: false  # Set to true to enable xdebug and "ddev start" or "ddev restart"
+# router_http_port: <port>  # Port to be used for http (defaults to global configuration, usually 80)
-# Note that for most people the commands 
+# router_https_port: <port> # Port for https (defaults to global configuration, usually 443)
-# "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better,
-# as leaving xdebug enabled all the time is a big performance hit.
 
-# webserver_type: nginx-fpm  # Can be set to apache-fpm or apache-cgi as well
+# xdebug_enabled: false  # Set to true to enable Xdebug and "ddev start" or "ddev restart"
+# Note that for most people the commands
+# "ddev xdebug" to enable Xdebug and "ddev xdebug off" to disable it work better,
+# as leaving Xdebug enabled all the time is a big performance hit.
+
+# xhprof_enabled: false  # Set to true to enable Xhprof and "ddev start" or "ddev restart"
+# Note that for most people the commands
+# "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,
+# as leaving Xhprof enabled all the time is a big performance hit.
+
+# webserver_type: nginx-fpm or apache-fpm
 
 # timezone: Europe/Berlin
+# If timezone is unset, DDEV will attempt to derive it from the host system timezone
+# using the $TZ environment variable or the /etc/localtime symlink.
 # This is the timezone used in the containers and by PHP;
-# it can be set to any valid timezone, 
+# it can be set to any valid timezone,
 # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 # For example Europe/Dublin or MST7MDT
 
+# composer_root: <relative_path>
+# Relative path to the Composer root directory from the project root. This is
+# the directory which contains the composer.json and where all Composer related
+# commands are executed.
+
+# composer_version: "2"
+# You can set it to "" or "2" (default) for Composer v2 or "1" for Composer v1
+# to use the latest major version available at the time your container is built.
+# It is also possible to use each other Composer version channel. This includes:
+#   - 2.2 (latest Composer LTS version)
+#   - stable
+#   - preview
+#   - snapshot
+# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
+# To reinstall Composer after the image was built, run "ddev debug rebuild".
+
+# nodejs_version: "22"
+# change from the default system Node.js version to any other version.
+# See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information
+# and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
+# Note that using of 'ddev nvm' is discouraged because "nodejs_version" is much easier to use,
+# can specify any version, and is more robust than using 'nvm'.
+
+# corepack_enable: false
+# Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm
+
 # additional_hostnames:
 #  - somename
 #  - someothername
@@ -73,29 +103,56 @@ timezone: ""
 # would provide http and https URLs for "example.com" and "sub1.example.com"
 # Please take care with this because it can cause great confusion.
 
-# upload_dir: custom/upload/dir
+# upload_dirs: "custom/upload/dir"
-# would set the destination path for ddev import-files to custom/upload/dir.
+#
+# upload_dirs:
+#   - custom/upload/dir
+#   - ../private
+#
+# would set the destination paths for ddev import-files to <docroot>/custom/upload/dir
+# When Mutagen is enabled this path is bind-mounted so that all the files
+# in the upload_dirs don't have to be synced into Mutagen.
+
+# disable_upload_dirs_warning: false
+# If true, turns off the normal warning that says
+# "You have Mutagen enabled and your 'php' project type doesn't have upload_dirs set"
+
+# ddev_version_constraint: ""
+# Example:
+# ddev_version_constraint: ">= 1.22.4"
+# This will enforce that the running ddev version is within this constraint.
+# See https://github.com/Masterminds/semver#checking-version-constraints for
+# supported constraint formats
 
 # working_dir:
 #   web: /var/www/html
 #   db: /home
-# would set the default working directory for the web and db services. 
+# would set the default working directory for the web and db services.
-# These values specify the destination directory for ddev ssh and the 
+# These values specify the destination directory for ddev ssh and the
-# directory in which commands passed into ddev exec are run. 
+# directory in which commands passed into ddev exec are run.
 
-# omit_containers: ["dba", "ddev-ssh-agent"]
+# omit_containers: [db, ddev-ssh-agent]
-# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently
+# Currently only these containers are supported. Some containers can also be
-# only those two containers can be omitted here.
+# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
-# Note that these containers can also be omitted globally in the 
+# the "db" container, several standard features of DDEV that access the
-# ~/.ddev/global_config.yaml or with the "ddev config global" command.
+# database container will be unusable. In the global configuration it is also
+# possible to omit ddev-router, but not here.
 
-# nfs_mount_enabled: false
+# performance_mode: "global"
-# Great performance improvement but requires host configuration first.
+# DDEV offers performance optimization strategies to improve the filesystem
-# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container
+# performance depending on your host system. Should be configured globally.
+#
+# If set, will override the global config. Possible values are:
+#   - "global":  uses the value from the global config.
+#   - "none":    disables performance optimization for this project.
+#   - "mutagen": enables Mutagen for this project.
+#   - "nfs":     enables NFS for this project.
+#
+# See https://ddev.readthedocs.io/en/stable/users/install/performance/#nfs
+# See https://ddev.readthedocs.io/en/stable/users/install/performance/#mutagen
 
-# webcache_enabled: false (deprecated)
+# fail_on_hook_fail: False
-# Was only for macOS, but now deprecated. 
+# Decide whether 'ddev start' should be interrupted by a failing hook
-# See https://ddev.readthedocs.io/en/stable/users/performance/#using-webcache_enabled-to-cache-the-project-directory
 
 # host_https_port: "59002"
 # The host port binding for https can be explicitly specified. It is
@@ -113,21 +170,23 @@ timezone: ""
 # The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
 # unless explicitly specified.
 
-# phpmyadmin_port: "1000"
+# mailpit_http_port: "8025"
-# The PHPMyAdmin port can be changed from the default 8036
+# mailpit_https_port: "8026"
+# The Mailpit ports can be changed from the default 8025 and 8026
 
-# mailhog_port: "1001"
+# host_mailpit_port: "8025"
-# The MailHog port can be changed from the default 8025
+# The mailpit port is not normally bound on the host at all, instead being routed
+# through ddev-router, but it can be bound directly to localhost if specified here.
 
-# webimage_extra_packages: [php-yaml, php7.3-ldap]
+# webimage_extra_packages: [php7.4-tidy, php-bcmath]
 # Extra Debian packages that are needed in the webimage can be added here
 
 # dbimage_extra_packages: [telnet,netcat]
 # Extra Debian packages that are needed in the dbimage can be added here
 
 # use_dns_when_possible: true
-# If the host has internet access and the domain configured can 
+# If the host has internet access and the domain configured can
-# successfully be looked up, DNS will be used for hostname resolution 
+# successfully be looked up, DNS will be used for hostname resolution
 # instead of editing /etc/hosts
 # Defaults to true
 
@@ -137,19 +196,91 @@ timezone: ""
 # If you prefer you can change this to "ddev.local" to preserve
 # pre-v1.9 behavior.
 
-# ngrok_args: --subdomain mysite --auth username:pass
+# ngrok_args: --basic-auth username:pass1234
-# Provide extra flags to the "ngrok http" command, see 
+# Provide extra flags to the "ngrok http" command, see
-# https://ngrok.com/docs#http or run "ngrok http -h"
+# https://ngrok.com/docs/ngrok-agent/config or run "ngrok http -h"
 
-# provider: default # Currently either "default" or "pantheon"
+# disable_settings_management: false
+# If true, DDEV will not create CMS-specific settings files like
+# Drupal's settings.php/settings.ddev.php or TYPO3's additional.php
+# In this case the user must provide all such settings.
+
+# You can inject environment variables into the web container with:
+# web_environment:
+#     - SOMEENV=somevalue
+#     - SOMEOTHERENV=someothervalue
+
+# no_project_mount: false
+# (Experimental) If true, DDEV will not mount the project into the web container;
+# the user is responsible for mounting it manually or via a script.
+# This is to enable experimentation with alternate file mounting strategies.
+# For advanced users only!
+
+# bind_all_interfaces: false
+# If true, host ports will be bound on all network interfaces,
+# not the localhost interface only. This means that ports
+# will be available on the local network if the host firewall
+# allows it.
+
+# default_container_timeout: 120
+# The default time that DDEV waits for all containers to become ready can be increased from
+# the default 120. This helps in importing huge databases, for example.
+
+#web_extra_exposed_ports:
+#- name: nodejs
+#  container_port: 3000
+#  http_port: 2999
+#  https_port: 3000
+#- name: something
+#  container_port: 4000
+#  https_port: 4000
+#  http_port: 3999
+# Allows a set of extra ports to be exposed via ddev-router
+# Fill in all three fields even if you don’t intend to use the https_port!
+# If you don’t add https_port, then it defaults to 0 and ddev-router will fail to start.
 #
-# Many ddev commands can be extended to run tasks before or after the 
+# The port behavior on the ddev-webserver must be arranged separately, for example
-# ddev command is executed, for example "post-start", "post-import-db", 
+# using web_extra_daemons.
+# For example, with a web app on port 3000 inside the container, this config would
+# expose that web app on https://<project>.ddev.site:9999 and http://<project>.ddev.site:9998
+# web_extra_exposed_ports:
+#  - name: myapp
+#    container_port: 3000
+#    http_port: 9998
+#    https_port: 9999
+
+#web_extra_daemons:
+#- name: "http-1"
+#  command: "/var/www/html/node_modules/.bin/http-server -p 3000"
+#  directory: /var/www/html
+#- name: "http-2"
+#  command: "/var/www/html/node_modules/.bin/http-server /var/www/html/sub -p 3000"
+#  directory: /var/www/html
+
+# override_config: false
+# By default, config.*.yaml files are *merged* into the configuration
+# But this means that some things can't be overridden
+# For example, if you have 'use_dns_when_possible: true'' you can't override it with a merge
+# and you can't erase existing hooks or all environment variables.
+# However, with "override_config: true" in a particular config.*.yaml file,
+# 'use_dns_when_possible: false' can override the existing values, and
+# hooks:
+#   post-start: []
+# or
+# web_environment: []
+# or
+# additional_hostnames: []
+# can have their intended affect. 'override_config' affects only behavior of the
+# config.*.yaml file it exists in.
+
+# Many DDEV commands can be extended to run tasks before or after the
+# DDEV command is executed, for example "post-start", "post-import-db",
 # "pre-composer", "post-composer"
-# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
+# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
 # information on the commands that can be extended and the tasks you can define
 # for them. Example:
 #hooks:
 # post-import-db:
-#   - exec: drush cr
+#   - exec: drush sql:sanitize
-#   - exec: drush updb
+#   - exec: drush updatedb
+#   - exec: drush cache:rebuild

.ddev/traefik/certs/geo.crt

@@ -0,0 +1,27 @@
+#ddev-generated
+-----BEGIN CERTIFICATE-----
+MIIEZjCCAs6gAwIBAgIRAK3U6VQeR8o6nUc7H7ksR+4wDQYJKoZIhvcNAQELBQAw
+UzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMRQwEgYDVQQLDAttbG5j
+bkBuaXhvczEbMBkGA1UEAwwSbWtjZXJ0IG1sbmNuQG5peG9zMB4XDTI1MDEyNTAz
+MjEyM1oXDTI3MDQyNTAyMjEyM1owPzEnMCUGA1UEChMebWtjZXJ0IGRldmVsb3Bt
+ZW50IGNlcnRpZmljYXRlMRQwEgYDVQQLDAttbG5jbkBuaXhvczCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALcfIXjuIeyEIrS3ieJNMiyQi0908vdwRRPm
+JyF3pi3y59wkD/354M3qkCeciElXaFwocZLLc5aPDaeqe5RxP0MndQ0nX7HbQYyB
+9dgoThvrCKbE2hc/75AlpBa/2kVEoefVF7hqMVz1K/TU2fbUTUK0vpU73m4Aqdfa
+fN6XVUO4VvGcw1LcxkoIxPqNOU3TqVKyoRdfzchTqkhZv18lqa3IMhQCjAYhjt0q
+LIp8n1kSJP46ypubzdIUf6ZxSMlf1A1RYMItbV5nj6DWkCcl3oarpzBVA/aw+WSq
+OrhCgHBSKTluFJrQ6y1vUEFgcF6Hldekg2DIg4/uUUUztYz0ExECAwEAAaOByDCB
+xTAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHwYDVR0jBBgw
+FoAUR3Cycv34IqivU0o5oFchbxNKLNswfQYDVR0RBHYwdIILKi5kZGV2LnNpdGWC
+CWxvY2FsaG9zdIIMKi5kZGV2LmxvY2FsggtkZGV2LXJvdXRlcoIQZGRldi1yb3V0
+ZXIuZGRldoIYZGRldi1yb3V0ZXIuZGRldl9kZWZhdWx0gg1nZW8uZGRldi5zaXRl
+hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBgQBDkTBQ9ky52hOYo/N4q4wVpZlCM/4k
+5pmPeeMz6Qjjq2IvniU8ts1gd+FrVjclY5jaoqlK7ke8fLF/y6Pc4/MMYgCk/l7d
+xCGCz6FzaN390M/qg4U4fDhAiauize/89nLd6+Su9cpwgyg8ZedeT4rDbdf0YM+U
+zuNN/3xz0r+k+Tno0KJZuggoyfWKWZpsFyQneKqVzO5O92pUIRKwhL04GEaK+rOe
+i3umlICWAZ2ENVOY/pc8Z760imO11pXTRnR8C80byk9yM0c6WmzVeMMybNxg3Bx8
+0v3h21/MeZRYcwkDO5pVI6VcJsCh2U60sZghCe1Zrj/lgJ9n1YZYRxLwEcll/2Bi
+w/pDIm5LiyBwwa7tYY8bWVaJ/dGKmVY0TbN5Qy1zSSnmwbLa/z6wmDJT6b3mqdU4
+4XYE0Yi2SGXYWyCBoipi6felZmyNJRcZgUAQm28kk2kUgdxQsLVVxL3/IAfZA4mZ
+HAUnA3Mpd6z3opjEnYZxx47tHXFRXs3+rWQ=
+-----END CERTIFICATE-----

.ddev/traefik/certs/geo.key

@@ -0,0 +1,29 @@
+#ddev-generated
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC3HyF47iHshCK0
+t4niTTIskItPdPL3cEUT5ichd6Yt8ufcJA/9+eDN6pAnnIhJV2hcKHGSy3OWjw2n
+qnuUcT9DJ3UNJ1+x20GMgfXYKE4b6wimxNoXP++QJaQWv9pFRKHn1Re4ajFc9Sv0
+1Nn21E1CtL6VO95uAKnX2nzel1VDuFbxnMNS3MZKCMT6jTlN06lSsqEXX83IU6pI
+Wb9fJamtyDIUAowGIY7dKiyKfJ9ZEiT+Osqbm83SFH+mcUjJX9QNUWDCLW1eZ4+g
+1pAnJd6Gq6cwVQP2sPlkqjq4QoBwUik5bhSa0Ostb1BBYHBeh5XXpINgyIOP7lFF
+M7WM9BMRAgMBAAECggEBAIfRryHifYbO+m7PMpWGbBBhpPHp68tameGIcr1/4OFz
+qES++p2FGBeiQgkfMHY1PlIcLSCThcfFknspFz+iPymvukFnUrK3zIZKXe1U95n9
+WQ1YM+nKogRn5qx434tAvFUW1+EP4kzwCwosVP2duTAgnrpRDUjJdS+D/dmapML0
+VAE9nlSZmSKd+pwKaOnxP0e+6rWm3/C7dGV7/kjsiE5odbSaYvIIFVaYwbRaDNa+
+5N+Omir2HFGABs9P1T6Pi4muCpTsNY6KbVeurOmYG5juN415B9jb1APuY+LtHCSf
+ecbv8KNk7ApFaz7BK1IZJ3lVIPnz4teGm7u2bmhIgAECgYEAxZHb6AexKzP4rbb2
+JycMwQUrsA9AIQ24lfsNq2izsN22BIFxOPvodM7nURV5v7NMlw/CzD2v6MpTbw/J
+axK1SigjROGLn1QHIuGhq1ykSX+fKVztzPXyAxpjvnZOrsVMM9BYRv/FtejSQnLF
+dKuxwxdg5GqizY4QKDwvgZp1EtECgYEA7UdkVbhr6aRZwQHWE2R9jCccgCzwimSC
+nXtje+vFTfKzRdtJ6U4VVY3vIy7BehpVgPZ0p/GjYzh6qLEqHgRVi53Botsedpmg
+/oQSqFQrmn/Vob7saUy8B3tOMll1FoEU92YrQEYonrBhyTFMuzfIiwcQwRgUtMR4
+8JCWxbvwjEECgYEAjRHP7oaHh6ytVQR+EIi+f5g8kJLjHHbapSTEpu6014YHsIHo
+oWKloboWyvvFmg7hkj9rvUASueq11mh0TmLmVZQBUu6lLlfmXI61TFFy8RQSRouX
+NLEsY/DU5as+FWbFOX37en6o4nHiqBWhTeRGomGwCojlxFY6zS/kT+tEyvECgYBJ
+ik72omoPx/hpcYBAEm02+whCUatbuTsiRBPZXIGSXx5hEE4gGStTkOIFLYCZr3/A
+sKIHS0Uwg1jA3+gF1aIN258gMnmGmKblO1ntAelhwS0dLGdpW3cLepQJ1uALUYaG
+Bwxwp03/oPstuDHn9KobLN1se2IvhJVXOfkA3/b2AQKBgQCqkZxAPnfOrN2ethtV
+w/jsYzBNfhqTk9/B4G4j/I3GTfltk64JFBZud8ci4e1DJEkchWQZlIbiX9Fnx4+M
+CFFmDo2Tn40tQdi50m8BgbMoes9vlXCtSFFgoJUQBLTJ/n8N0y7nN2Gw40/jLmag
+mkFdV/iE29uEMgFLDLgcrH6/jw==
+-----END PRIVATE KEY-----

.ddev/traefik/config/geo.yaml

@@ -0,0 +1,77 @@
+#ddev-generated
+# If you remove the ddev-generated line above you
+# are responsible for maintaining this file. DDEV will not then
+# update it, for example if you add `additional_hostnames`, etc.
+
+http:
+  routers:
+    geo-web-80-http:
+      entrypoints:
+        - http-80
+      rule: HostRegexp(`^geo\.ddev\.site$`)
+      
+      service: "geo-web-80"
+      ruleSyntax: v3
+      tls: false
+      # middlewares:
+      #   - "geo-redirectHttps"
+    geo-web-8025-http:
+      entrypoints:
+        - http-8025
+      rule: HostRegexp(`^geo\.ddev\.site$`)
+      
+      service: "geo-web-8025"
+      ruleSyntax: v3
+      tls: false
+      # middlewares:
+      #   - "geo-redirectHttps"
+    
+    
+    
+    geo-web-80-https:
+      entrypoints:
+        - http-443
+      rule: HostRegexp(`^geo\.ddev\.site$`)
+      
+      service: "geo-web-80"
+      ruleSyntax: v3
+      
+      tls: true
+      
+    geo-web-8025-https:
+      entrypoints:
+        - http-8026
+      rule: HostRegexp(`^geo\.ddev\.site$`)
+      
+      service: "geo-web-8025"
+      ruleSyntax: v3
+      
+      tls: true
+      
+    
+
+  middlewares:
+    geo-redirectHttps:
+      redirectScheme:
+        scheme: https
+        permanent: true
+
+  services:
+    geo-web-80:
+      loadbalancer:
+        servers:
+          - url: http://ddev-geo-web:80
+        
+    geo-web-8025:
+      loadbalancer:
+        servers:
+          - url: http://ddev-geo-web:8025
+        
+    
+    
+    
+
+tls:
+  certificates:
+    - certFile: /mnt/ddev-global-cache/traefik/certs/geo.crt
+      keyFile: /mnt/ddev-global-cache/traefik/certs/geo.key

.gitignore

@@ -4,6 +4,7 @@
 # Drutopia-provided files which should not be overridden
 /web/core
 /web/modules/contrib
+/web/libraries/
 /web/profiles/contrib
 /web/themes/contrib
 /web/sites/default/files
@@ -17,6 +18,9 @@
 /web/sites/example.sites.php
 /vendor/
 
-# This file will contain just the files of the old site
+# Temporary data dumps directory
-d7
+/backups/
-data
+
+# Drupal scaffolding auto-added ignores
+/.editorconfig
+/.gitattributes

.gitlab/issue_templates/bug.md

@@ -26,4 +26,4 @@ If bug is not present in a certain browser, specify that as well.
 
 
 /label ~Bug
-/assign @cedewey
+/assign @freescholar

.gitlab/issue_templates/task.md

@@ -7,4 +7,4 @@
 
 
 /label ~Task
-/assign @cedewey
+/assign @freescholar

.gitlab/issue_templates/user-story.md

@@ -18,4 +18,4 @@ so that [reason].
 [Steps required to complete user story, usually completed by Agaric.]
 
 /label ~"User Story"
-/assign @cedewey
+/assign @freescholar

DEPLOYMENT.md

@@ -0,0 +1,18 @@
+Set up 
+
+Make sure all your code is pushed, including an updated composer.lock file if you've made any changes to modules, themes, or libraries brought in that way.
+
+```
+cd ~/Projects/drutopia-platform/drutopia_host/hosting_private/
+ahoy git-pull-all
+ahoy deploy-build news
+ahoy deploy-site geo_test
+```
+
+When you're absolutely certain and ready to do a force override quickly:
+
+```
+ahoy deploy-build news && ahoy deploy-site-force geo_test
+```
+
+And same for `_live` of course.

README.md

@@ -4,12 +4,16 @@ This project is based on Drutopia, which means it is compatible with
 existing and future Drutopia features.  We will be diverging from
 Drutopia for special functionality, however.
 
+See [DEPLOYMENT.md](DEPLOYMENT.md) for easy deploy instructions with Ahoy.
+
 ## Getting started
 
 One time:
 
-```
+```shell
-git clone git@gitlab.com:agaric/sites/geo.git
+mkdir -p ~/Projects/geo
+cd ~/Projects/geo
+git clone git@git.agaric.com:geo/geo-coop.git
 cd geo
 ```
 
@@ -18,90 +22,19 @@ the following steps to work.
 
 Whenever you want a fresh start:
 
-
+```shell
-```
 git pull
 ddev start
 ddev composer update
-ddev . drush -y site:install minimal --existing-config
+ddev drush -y site:install minimal --existing-config
 ```
 
 Note: If you receive a `Permission denied (publickey).` error it means you need to copy your key into the DDEV container by running `ddev auth ssh`.
 
 ## Pull live content down for development
 
-```
+```shell
-drush sql-sync @live @self
+ddev drush sql-sync @live @self
-drush -y rsync --exclude-paths=css:js:php --verbose @live:%files/ @self:%files
+ddev drush -y rsync --exclude-paths=css:js:php --verbose @live:%files/ @self:%files
 ```
 
-
-## Running the migration in development
-
-Download the D7 files via the Backup and Migrate module.
-
-Put the D7 files in the following location:
-```
-<Project Root>/d7/sites/default/files/
-```
-There is a reference to the `sites/default/files` in the database so that structure is mandatory for the migration.
-
-The path in the `upgrade_d7_file.yml` migration file is different because this is executed inside the docker container so in the docker container the <Project Root> is: `/var/www/html/` but no need to re-create those folders in the host machine.
-
-Download a database dump of the D7 site via the Backup and Migrate module.
-
-Create a database called `drupal7`:
-
-Use `ddev describe` to see what the host and port are for your local environment, and use that in the first line here:
-
-```
-mysql --host=127.0.0.1 --port=32779 --user=root --password=root --database=db
-CREATE DATABASE drupal7;
-GRANT ALL ON drupal7.* to 'db'@'%' IDENTIFIED BY 'db';
-```
-
-Now `ctrl+c` out of there, and, again substituting the host and port for your own, import your file from whereever you placed and named your db SQL dump:
-
-```
-mysql --host=127.0.0.1 --port=32779 --user=root --password=root --database=drupal7 < data/db.mysql
-```
-
-(Above per [instructions for creating another database in ddev](https://stackoverflow.com/a/49785024/1943924).)
-
-Once the files are in the correct place and the database has been created we can run the following  to run all the migrations:
-
-```
-ddev . drush mim --group="migrate_drupal_7_geo"
-```
-Note: The migration will partially fail because of missing files. For now, re-run the migration command and it will complete the migration.
-
-## Running the migration on the hosted instance
-
-1. Ensure the files you need are uploaded to the server. Obtain the latest from the prior site: database, and files. Upload these to the server (e.g. `scp *.gz geo_live@drutopia.org:`) and we'll extract them there.
-1. If a deployment has been performed already, it must be moved out of the way by removing existing databases. Log into the server (`ssh geo_live@drutopia.org`) and remove the database(s):
-   - Start the mysql client (logged into geo_live): `mysql`
-   - Drop the drupal db: `drop database geo_live;`
-   - Drop the migration source db: `drop database geo_legacy;`
-   - Exit mysql by typing `ctrl+d`
-1. Extract the uploaded files (still on server):
-   - Unzip the uploaded database file (this expects there to be only ONE such file): `gunzip *.mysql.gz`
-   - Rename the database file: `mv *.mysql geo_legacy.sql`
-   - Unpack the files, but first cd to where they go (again, there should only be ONE file ending in .tar.gz in home): `cd site/d7/sites/default/files/` and untar: `tar xzf ~/*.tar.gz` (this will take a minute/two).
-   - The server side is ready! Log off by typing `ctrl+d`
-1. Now perform a deployment with drutopia_hosting. This will install the site using the minimal profile and existing config:
-   - `ahoy deploy-build news`
-   - `ahoy deploy-site geo_live`
-1. Return to the server (`ssh geo_live@drutopia.org`), load legacy db and run the migration:
-   - Read the db source into the proper database: `mysql geo_legacy < geo_legacy.sql`
-   - `drush mim --group="migrate_drupal_7_geo"`
-   - `drush php:script article_type_term.php`
-
-## Post go-live tasks
-
-1. Remove all d7 files: `rm -rf site/d7` and `rm geo_legacy.sql`, etc.
-1. Change the site settings in hosting:
-   - config_import -> True
-   - php_settings_code -> blank
-1. Change the news build settings in hosting:
-   - remove custom build commands (i.e. sed)
-1. At this point, the deploy should be typical (deploy-build/deploy-site as normal)

UPGRADE.md

@@ -0,0 +1,34 @@
+## Uninstall
+
+### The following will be uninstalled automatically on deploy to D9-latest (now merged into master branch)
+
+- Color
+- Quick Edit
+- Seven
+
+### The following can be removed manually after the D10 upgrade is complete
+
+- Stable (uninstall and remove from composer.json)
+- Geo upgrade (this one is actually now used during the upgrade, and it may not hurt to keep it around, though it can be uninstalled at the end)
+
+### Migration related modules
+
+Modules related to the migration from D7 to D8 are still enabled, they can probably be disabled, but this can be done after the upgrade is finished.
+
+## Drupal 9.3.3 -> Drupal 9 latest
+
+1. Add the following to the vault member:
+```
+post_deploy:
+        - command: "then stable9"
+          action: drush
+```
+2. Deploy master branch to site
+3. Remove the post_deploy command from the vault member
+
+## Drupal 9 latest -> Drupal 10
+
+1. Deploy drupal10-rebased branch to site
+2. Edit media items and apply cropping where needed (likely the hero blocks in header and footer will be tiny)
+3. Uninstall Stable theme and Geo Upgrade custom module (remember to commit this change)
+4. After finally deployed to live, remove the root composer dependency on honeypot (this was there because honeypot needed a constraint in order to apply database updates correctly)

composer.json

@@ -1,87 +1,222 @@
 {
     "name": "agaric-sites/geo",
-    "description": "Drutopia-based site for the Grassroots Economic Organizing collective.",
+    "description": "Drutopia-based site for the Grassroots Economic Organizing collective and potentially other news sites.",
+    "homepage": "https://geo.coop",
     "type": "project",
-    "license": "GPL-2.0+",
+    "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "config": {
+    "support": {
-        "sort-packages": true
+        "docs": "http://docs.drutopia.org/en/latest",
-    },
+        "issues": "https://gitlab.com/drutopia/drutopia/-/issues"
-    "require": {
-        "composer/installers": "^1.0",
-        "cweagans/composer-patches": "^1.0",
-        "drupal-composer/drupal-scaffold": "^2.0.0",
-        "drupal/claro": "^1.0@alpha",
-        "drupal/config_actions": "1.x-dev",
-        "drupal/convert_bundles": "^1.0@alpha",
-        "drupal/cshs": "^1.0@beta",
-        "drupal/drutopia_collection": "dev-8.x-1.x as 1.x-dev",
-        "drupal/field_token_value": "^1.0",
-        "drupal/fixed_block_content": "^1.0",
-        "drupal/link_attributes": "^1.9",
-        "drupal/migrate_plus": "^4.2",
-        "drupal/migrate_source_csv": "3.1",
-        "drupal/migrate_tools": "^4.1",
-        "drupal/migrate_upgrade": "^3",
-        "drush/drush": "^9.0",
-        "drutopia/drutopia": "^1.0-beta2"
     },
     "repositories": {
+        "drupal/empty_page": {
+            "type": "git",
+            "url": "git@git.drupal.org:issue/empty_page-3287186.git"
+        },
         "drupal": {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
-        },
-        "drutopia": {
-            "type": "vcs",
-            "url": "https://github.com/drutopia/drutopia"
-        },
-        "drupal/drutopia_collection": {
-            "type": "git",
-            "url": "git@gitlab.com:drutopia/drutopia_collection.git"
         }
     },
-    "scripts": {
+    "require": {
-        "post-install-cmd": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
+        "composer/installers": "^2",
-        "post-update-cmd": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
+        "cweagans/composer-patches": "^1.7",
-        "nuke": "rm -rf vendor web/core web/modules/contrib web/profiles/contrib drush/contrib",
+        "drupal/admin_toolbar": "^3",
-        "quick-start": [
+        "drupal/antibot": "^2",
-            "composer install",
+        "drupal/asset_injector": "^2",
-            "php docroot/core/scripts/drupal quick-start drutopia --no-interaction"
+        "drupal/auto_entitylabel": "^3",
-        ]
+        "drupal/backup_migrate": "^5",
+        "drupal/better_exposed_filters": "^6",
+        "drupal/block_class": "^4",
+        "drupal/bpmn_io": "^1",
+        "drupal/cancel_button": "^1",
+        "drupal/ckeditor_iframe": "^3.0@beta",
+        "drupal/ckeditorheight": "^1",
+        "drupal/classitup": "^1",
+        "drupal/comment_notify": "^1",
+        "drupal/content_lock": "^2",
+        "drupal/convert_bundles": "^2",
+        "drupal/core-composer-scaffold": "^10",
+        "drupal/core-recommended": "^10",
+        "drupal/cshs": "^4",
+        "drupal/csp": "^1",
+        "drupal/customerror": "^1",
+        "drupal/dashboards": "^2",
+        "drupal/date_popup": "^2",
+        "drupal/datetimehideseconds": "^1",
+        "drupal/diff": "^1",
+        "drupal/drd_agent": "^4",
+        "drupal/drutopia_collection": "2.0.x-dev@dev",
+        "drupal/drutopia_core": "2.0.x-dev@dev",
+        "drupal/drutopia_organization": "2.0.x-dev@dev",
+        "drupal/drutopia_paragraph_title": "^1",
+        "drupal/drutopia_site": "2.0.x-dev@dev",
+        "drupal/easy_breadcrumb": "^2",
+        "drupal/eca": "^1",
+        "drupal/eca_context": "^1.0",
+        "drupal/editor_advanced_link": "^2.0",
+        "drupal/editoria11y": "^2",
+        "drupal/empty_page": "dev-8.x-1.x",
+        "drupal/entity_reference_override": "^2",
+        "drupal/entitygroupfield": "^2",
+        "drupal/environment_indicator": "^4",
+        "drupal/eva": "^3",
+        "drupal/exif_orientation": "^1",
+        "drupal/facets": "dev-3.0.x as 2.0.x-dev",
+        "drupal/fakeobjects": "^2",
+        "drupal/field_defaults": "^2",
+        "drupal/field_formatter_class": "^1",
+        "drupal/field_token_value": "^3",
+        "drupal/filter_perms": "^1",
+        "drupal/fitvids": "^2",
+        "drupal/fixed_block_content": "^1",
+        "drupal/footnotes": "^4",
+        "drupal/geolocation": "^3",
+        "drupal/gin_gutenberg": "^1",
+        "drupal/gin_login": "^2",
+        "drupal/google_analytics": "^4",
+        "drupal/gutenberg": "^2",
+        "drupal/http_cache_control": "^2",
+        "drupal/http_client_error_status": "^3",
+        "drupal/ief_complex_open": "^1",
+        "drupal/indieweb": "^1",
+        "drupal/inotherwords": "^3",
+        "drupal/insert": "^3",
+        "drupal/key": "^1.14",
+        "drupal/link_attributes": "^1.9",
+        "drupal/linkit": "^6",
+        "drupal/mailchimp": "^2",
+        "drupal/markdown": "^3",
+        "drupal/menu_link_config": "^1.0@alpha",
+        "drupal/menu_trail_by_path": "^2",
+        "drupal/microformats": "^2",
+        "drupal/migrate_plus": "^6",
+        "drupal/migrate_source_csv": "^3",
+        "drupal/migrate_tools": "^6",
+        "drupal/migrate_upgrade": "^4",
+        "drupal/migration_helpers": "1.0.x-dev@dev",
+        "drupal/minimalhtml": "^2",
+        "drupal/node_view_permissions": "^1.4",
+        "drupal/noreferrer": "^1",
+        "drupal/notfoundpassthrough": "1.x-dev",
+        "drupal/octavia": "2.0.x-dev@dev",
+        "drupal/octavia_camouflage": "2.0.x-dev@dev",
+        "drupal/paragraphs_features": "^2",
+        "drupal/password_policy": "^4",
+        "drupal/plausible": "^2.0@beta",
+        "drupal/prepopulate": "^2",
+        "drupal/preview_link": "^2",
+        "drupal/printable": "^3",
+        "drupal/r4032login": "^2",
+        "drupal/rabbit_hole": "^1.0@beta",
+        "drupal/regionincontent": "^1",
+        "drupal/registration_role": "^2",
+        "drupal/require_on_publish": "^1",
+        "drupal/role_delegation": "^1",
+        "drupal/scheduler": "^1",
+        "drupal/schema_metatag": "^3",
+        "drupal/scn": "^2",
+        "drupal/search404": "^2",
+        "drupal/search_api_autocomplete": "^1.6",
+        "drupal/search_api_saved_searches": "^1",
+        "drupal/seckit": "^2",
+        "drupal/select_or_other": "^4.0",
+        "drupal/shield": "^1.4",
+        "drupal/simple_sitemap": "^4.1",
+        "drupal/smart_date": "^4",
+        "drupal/sms": "^2",
+        "drupal/social_post_facebook": "3.0.x-dev@dev",
+        "drupal/social_post_twitter": "3.x-dev@dev",
+        "drupal/stable": "^2.0",
+        "drupal/stringoverrides": "^1.8",
+        "drupal/subpathauto": "^1.0@RC",
+        "drupal/taxonomy_import": "^2",
+        "drupal/taxonomy_manager": "^2",
+        "drupal/textarea_widget_for_text": "^1.1",
+        "drupal/tomselect": "1.0.x-dev@dev",
+        "drupal/trim": "^2",
+        "drupal/twig_tweak": "^3",
+        "drupal/ui_patterns": "^1",
+        "drupal/unique_content_field_validation": "^1.1",
+        "drupal/view_password": "^6",
+        "drupal/view_unpublished": "^1.0",
+        "drupal/viewsreference": "^1",
+        "drupal/visitors": "^2.17",
+        "drupal/webform": "^6.0",
+        "drupal/weight": "^3.3",
+        "drupal/workflow_buttons": "1.x-dev",
+        "drupal/wysiwyg_linebreaks": "^2",
+        "drush/drush": "*",
+        "drutopia/drutopia": "2.0.x-dev",
+        "league/commonmark": "^1.0",
+        "vlucas/phpdotenv": "^5.1",
+        "webflo/drupal-finder": "^1.2"
+    },
+    "require-dev": {
+        "behat/behat": "^3.4",
+        "behat/mink": "^1.7",
+        "drupal/upgrade_status": "^4"
+    },
+    "config": {
+        "sort-packages": true,
+        "process-timeout": 600,
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "drupal/core-composer-scaffold": true,
+            "drupal/core-project-message": false
+        }
+    },
+    "conflict": {
+        "drupal/drupal": "*"
     },
     "extra": {
+        "drupal-scaffold": {
+            "locations": {
+                "web-root": "web/"
+            },
+            "allowed-packages": [
+                "drupal/ui_patterns"
+            ]
+        },
         "installer-paths": {
-            "web/core": [
+            "web/core": ["type:drupal-core"],
-                "drupal/core"
+            "web/libraries/{$name}": ["type:drupal-library"],
-            ],
+            "web/modules/contrib/{$name}": ["type:drupal-module"],
-            "web/modules/contrib/{$name}": [
+            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
-                "type:drupal-module"
+            "web/themes/contrib/{$name}": ["type:drupal-theme"],
-            ],
+            "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
-            "web/profiles/contrib/{$name}": [
+            "web/modules/custom/{$name}": ["type:drupal-custom-module"],
-                "type:drupal-profile"
+            "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
-            ],
+        },
-            "web/themes/contrib/{$name}": [
+        "merge-plugin": {
-                "type:drupal-theme"
+            "include": [
-            ],
+                "web/modules/contrib/webform/composer.libraries.json"
-            "drush/contrib/{$name}": [
-                "type:drupal-drush"
             ]
         },
         "enable-patching": true,
         "patches": {
             "drupal/core": {
-                "Allow an install hook in profiles installing from configuration": "https://www.drupal.org/files/issues/2018-11-27/2982052-22.patch"
+                "Adding attributes to views-view-list.html.twig doesn't work if Views List class Style option is empty": "https://www.drupal.org/files/issues/2023-03-16/2845400-24.patch",
+                "Use form element of type date instead textfield when selecting a date in an exposed filter": "https://www.drupal.org/files/issues/2024-08-21/2648950-284.patch",
+                "Views Date Filter Datetime Granularity Option": "https://www.drupal.org/files/issues/2021-04-27/2868014-110-after-2648950-247-applied.patch"
             },
-            "drutopia/drutopia": {
+            "drupal/ds": {
-                "Remove default content": "patches/drutopia-remove-default-content.patch"
+                "Parent theme template inheritance bug": "https://www.drupal.org/files/issues/2021-02-22/2895316-12.patch"
             },
-            "drupal/drutopia_core": {
+            "drupal/unique_content_field_validation": {
-                "Remove default content": "patches/drutopia-core-remove-default-content.patch"
+                "Overriden title field" : "https://www.drupal.org/files/issues/2023-01-05/unique-validation-title-override.patch"
-            },
-            "drupal/migrate_tools": {
-                "The limit option does not accept a value": "https://www.drupal.org/files/issues/2019-02-05/migrate-tools_fix-drush-options_3024399-23.patch"
             }
         }
+    },
+    "scripts": {
+        "nuke": "rm -rf vendor web/core web/modules/contrib web/profiles/contrib drush/contrib",
+        "pull": "scripts/pull.sh",
+        "quick-start": [
+            "composer install",
+            "php docroot/core/scripts/drupal quick-start drutopia --no-interaction"
+        ]
     }
 }

config/sync/admin_toolbar.settings.yml

@@ -0,0 +1 @@
+menu_depth: 4

config/sync/admin_toolbar_search.settings.yml

@@ -0,0 +1,3 @@
+_core:
+  default_config_hash: AAmWcgwzGYbXfR6wfEfMyoi3r5QZwlpxvq5dHbupnJo
+display_menu_item: 0

config/sync/admin_toolbar_tools.settings.yml

@@ -0,0 +1,2 @@
+max_bundle_number: 20
+hoverintent_functionality: true

config/sync/antibot.settings.yml

@@ -0,0 +1,9 @@
+_core:
+  default_config_hash: 7QwhifH5gAzkdFMMDFV6XQRrcx4PAvtROZO8rs19nTo
+form_ids:
+  - 'comment_*'
+  - user_login_form
+  - user_pass
+  - user_register_form
+  - 'contact_message_*'
+show_form_ids: false

config/sync/automated_cron.settings.yml

@@ -1,3 +1,3 @@
-interval: 10800
 _core:
   default_config_hash: fUksROt4FfkAU9BV4hV2XvhTBSS2nTNrZS4U7S-tKrs
+interval: 10800

config/sync/autosave_form.messages.yml

@@ -0,0 +1,3 @@
+_core:
+  default_config_hash: In3MY-CuVp64RxCeU5X6rsEhR6jR4Si8OG6BX18DALg
+entity_saved_in_background_alert_message: 'The content has been modified elsewhere. As a result, autosaving has been disabled and autosaved states for the current page have been deleted. Autosave will be reactivated after reloading the page.'

config/sync/autosave_form.settings.yml

@@ -0,0 +1,14 @@
+_core:
+  default_config_hash: NX6_WyjygzZfQY-9SZq6_5fmh_KUK7L0XlOqaAXkRCQ
+langcode: en
+interval: 60000
+only_on_form_change: false
+active_on:
+  content_entity_forms: true
+  config_entity_forms: false
+notification:
+  active: true
+  message: 'Saving draft...'
+  delay: 1000
+allowed_content_entity_types: {  }
+allowed_new: true

config/sync/block.block.articletopics.yml

@@ -18,12 +18,12 @@ plugin: 'facet_block:article_topics'
 settings:
   id: 'facet_block:article_topics'
   label: 'Article Topics'
-  provider: facets
   label_display: visible
+  provider: facets
   block_id: articletopics
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.articletype.yml

@@ -18,12 +18,12 @@ plugin: 'facet_block:article_type'
 settings:
   id: 'facet_block:article_type'
   label: 'Article Type'
-  provider: facets
   label_display: visible
+  provider: facets
   block_id: articletype
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.bulma_account_menu.yml

@@ -19,8 +19,8 @@ plugin: 'system_menu_block:account'
 settings:
   id: 'system_menu_block:account'
   label: 'User account menu'
-  provider: system
   label_display: '1'
+  provider: system
   level: 1
   depth: 1
   expand_all_items: false

config/sync/block.block.bulma_branding.yml

@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true

config/sync/block.block.bulma_content.yml

@@ -17,6 +17,6 @@ plugin: system_main_block
 settings:
   id: system_main_block
   label: 'Main page content'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.bulma_help.yml

@@ -17,6 +17,6 @@ plugin: help_block
 settings:
   id: help_block
   label: Help
-  provider: help
   label_display: '0'
+  provider: help
 visibility: {  }

config/sync/block.block.bulma_local_tasks.yml

@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }

config/sync/block.block.bulma_main_menu.yml

@@ -19,8 +19,8 @@ plugin: 'system_menu_block:main'
 settings:
   id: 'system_menu_block:main'
   label: 'Main navigation'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 1
   expand_all_items: false

config/sync/block.block.bulma_messages.yml

@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.bulma_page_title.yml

@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }

config/sync/block.block.bulma_powered.yml

@@ -17,6 +17,6 @@ plugin: system_powered_by_block
 settings:
   id: system_powered_by_block
   label: 'Powered by Drupal'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.bulma_tools.yml

@@ -19,8 +19,8 @@ plugin: 'system_menu_block:tools'
 settings:
   id: 'system_menu_block:tools'
   label: Tools
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

config/sync/block.block.claro_breadcrumbs.yml

@@ -17,6 +17,6 @@ plugin: system_breadcrumb_block
 settings:
   id: system_breadcrumb_block
   label: Breadcrumbs
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.claro_content.yml

@@ -17,6 +17,6 @@ plugin: system_main_block
 settings:
   id: system_main_block
   label: 'Main page content'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.claro_help.yml

@@ -17,6 +17,6 @@ plugin: help_block
 settings:
   id: help_block
   label: Help
-  provider: help
   label_display: '0'
+  provider: help
 visibility: {  }

config/sync/block.block.claro_local_actions.yml

@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }

config/sync/block.block.claro_messages.yml

@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.claro_page_title.yml

@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }

config/sync/block.block.claro_primary_local_tasks.yml

@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: 'Primary tabs'
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: false
 visibility: {  }

config/sync/block.block.claro_secondary_local_tasks.yml

@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: 'Secondary tabs'
-  provider: core
   label_display: '0'
+  provider: core
   primary: false
   secondary: true
 visibility: {  }

config/sync/block.block.donatelink.yml

@@ -0,0 +1,31 @@
+uuid: e236c061-f0f8-4620-b069-cc4f7713f364
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:slide:385d1256-b634-44c5-85cb-0d08a6da226b'
+  module:
+    - block_content
+    - block_visibility_groups
+  theme:
+    - geofresco
+id: donatelink
+theme: geofresco
+region: footer_notice
+weight: 0
+provider: null
+plugin: 'block_content:385d1256-b634-44c5-85cb-0d08a6da226b'
+settings:
+  id: 'block_content:385d1256-b634-44c5-85cb-0d08a6da226b'
+  label: 'Donate link'
+  label_display: '0'
+  provider: block_content
+  status: true
+  info: ''
+  view_mode: default
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.exposedformsearchpage_1.yml

@@ -5,10 +5,14 @@ dependencies:
   config:
     - views.view.search
   module:
+    - block_class
     - block_visibility_groups
     - views
   theme:
     - geofresco
+third_party_settings:
+  block_class:
+    classes: is-hidden-mobile
 id: exposedformsearchpage_1
 theme: geofresco
 region: header_search
@@ -18,12 +22,12 @@ plugin: 'views_exposed_filter_block:search-page_1'
 settings:
   id: 'views_exposed_filter_block:search-page_1'
   label: ''
-  provider: views
   label_display: '0'
+  provider: views
   views_label: ''
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.footer_about_us.yml

@@ -20,16 +20,20 @@ plugin: 'menu_block:main'
 settings:
   id: 'menu_block:main'
   label: 'About Us'
-  provider: menu_block
   label_display: visible
+  provider: menu_block
+  follow: false
+  follow_parent: child
+  label_link: false
+  label_type: block
   level: 1
   depth: 0
-  expand: 0
+  expand_all_items: false
   parent: 'main:menu_link_content:33435872-bdbe-4833-9477-c057c2c33359'
   suggestion: main
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.footer_contact_info.yml

@@ -17,8 +17,8 @@ plugin: 'block_content:ab794f80-2d8f-4254-bda4-6554074ab46c'
 settings:
   id: 'block_content:ab794f80-2d8f-4254-bda4-6554074ab46c'
   label: 'Footer contact information'
-  provider: block_content
   label_display: '0'
+  provider: block_content
   status: true
   info: ''
   view_mode: full
@@ -26,5 +26,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.footer_copyleft.yml

@@ -17,8 +17,8 @@ plugin: 'block_content:5eeea524-f31d-4a75-92aa-8f3d92925a9f'
 settings:
   id: 'block_content:5eeea524-f31d-4a75-92aa-8f3d92925a9f'
   label: 'Footer copyleft'
-  provider: block_content
   label_display: '0'
+  provider: block_content
   status: true
   info: ''
   view_mode: full
@@ -26,5 +26,5 @@ visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.footer_get_involved.yml

@@ -20,16 +20,20 @@ plugin: 'menu_block:main'
 settings:
   id: 'menu_block:main'
   label: 'Get Involved'
-  provider: menu_block
   label_display: visible
+  provider: menu_block
+  follow: false
+  follow_parent: child
+  label_link: false
+  label_type: block
   level: 1
   depth: 0
-  expand: 0
+  expand_all_items: false
   parent: 'main:menu_link_content:f1eaa438-620d-418b-acd3-ad00dab9c635'
   suggestion: main
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.footer_our_work.yml

@@ -20,16 +20,20 @@ plugin: 'menu_block:main'
 settings:
   id: 'menu_block:main'
   label: 'Our Work'
-  provider: menu_block
   label_display: visible
+  provider: menu_block
+  follow: false
+  follow_parent: child
+  label_link: false
+  label_type: block
   level: 1
   depth: 0
-  expand: 0
+  expand_all_items: false
   parent: 'main:menu_link_content:3f594be0-bb0f-4b30-923e-e7984983a0fd'
   suggestion: main
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.geofresco_account_menu.yml

@@ -19,8 +19,8 @@ plugin: 'system_menu_block:account'
 settings:
   id: 'system_menu_block:account'
   label: 'User account menu'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 1
   expand_all_items: false

config/sync/block.block.geofresco_branding.yml

@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true

config/sync/block.block.geofresco_content.yml

@@ -11,12 +11,12 @@ _core:
 id: geofresco_content
 theme: geofresco
 region: content
-weight: 0
+weight: -5
 provider: null
 plugin: system_main_block
 settings:
   id: system_main_block
   label: 'Main page content'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.geofresco_footer_menu.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - system.menu.footer
   module:
+    - block_visibility_groups
     - system
   theme:
     - geofresco
@@ -19,9 +20,13 @@ plugin: 'system_menu_block:footer'
 settings:
   id: 'system_menu_block:footer'
   label: 'Footer menu'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
-visibility: {  }
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    block_visibility_group: ''

config/sync/block.block.geofresco_help.yml

@@ -17,6 +17,6 @@ plugin: help_block
 settings:
   id: help_block
   label: Help
-  provider: help
   label_display: '0'
+  provider: help
 visibility: {  }

config/sync/block.block.geofresco_local_actions.yml

@@ -9,12 +9,12 @@ _core:
 id: geofresco_local_actions
 theme: geofresco
 region: content
-weight: -20
+weight: -6
 provider: null
 plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }

config/sync/block.block.geofresco_local_tasks.yml

@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }

config/sync/block.block.geofresco_main_menu.yml

@@ -19,8 +19,8 @@ plugin: 'system_menu_block:main'
 settings:
   id: 'system_menu_block:main'
   label: 'Main navigation'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 2
   expand_all_items: false

config/sync/block.block.geofresco_messages.yml

@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.geofresco_page_title.yml

@@ -2,8 +2,13 @@ uuid: aeb3ab6f-f30b-48d1-85ab-97a6dfde8e3a
 langcode: en
 status: true
 dependencies:
+  module:
+    - block_class
   theme:
     - geofresco
+third_party_settings:
+  block_class:
+    classes: column
 _core:
   default_config_hash: sFPCArkI1EMTMKn-T_Gtlk6pAr2_JhI5b7aLvRz9UjM
 id: geofresco_page_title
@@ -15,6 +20,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }

config/sync/block.block.geofresco_views_block__comments_recent_block_1.yml

@@ -18,13 +18,13 @@ plugin: 'views_block:comments_recent-block_1'
 settings:
   id: 'views_block:comments_recent-block_1'
   label: ''
-  provider: views
   label_display: visible
+  provider: views
   views_label: ''
-  items_per_page: none
+  items_per_page: '5'
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.geofresco_views_block__content_recent_block_1.yml

@@ -18,13 +18,13 @@ plugin: 'views_block:content_recent-block_1'
 settings:
   id: 'views_block:content_recent-block_1'
   label: ''
-  provider: views
   label_display: visible
+  provider: views
   views_label: ''
   items_per_page: none
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.homepagehero.yml

@@ -19,17 +19,17 @@ plugin: 'fixed_block_content:home_page_hero'
 settings:
   id: 'fixed_block_content:home_page_hero'
   label: 'Home page hero'
+  label_display: '0'
   provider: fixed_block_content
-  label_display: visible
   view_mode: default
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''
   request_path:
     id: request_path
-    pages: '<front>'
     negate: false
     context_mapping: {  }
+    pages: '<front>'

config/sync/block.block.octavia_account_menu.yml

@@ -19,8 +19,8 @@ plugin: 'system_menu_block:account'
 settings:
   id: 'system_menu_block:account'
   label: 'User account menu'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 1
   expand_all_items: false

config/sync/block.block.octavia_branding.yml

@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true

config/sync/block.block.octavia_content.yml

@@ -17,6 +17,6 @@ plugin: system_main_block
 settings:
   id: system_main_block
   label: 'Main page content'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.octavia_footer_menu.yml

@@ -19,8 +19,8 @@ plugin: 'system_menu_block:footer'
 settings:
   id: 'system_menu_block:footer'
   label: 'Footer menu'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false

config/sync/block.block.octavia_help.yml

@@ -17,6 +17,6 @@ plugin: help_block
 settings:
   id: help_block
   label: Help
-  provider: help
   label_display: '0'
+  provider: help
 visibility: {  }

config/sync/block.block.octavia_local_actions.yml

@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }

config/sync/block.block.octavia_local_tasks.yml

@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }

config/sync/block.block.octavia_main_menu.yml

@@ -19,8 +19,8 @@ plugin: 'system_menu_block:main'
 settings:
   id: 'system_menu_block:main'
   label: 'Main navigation'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 2
   expand_all_items: false

config/sync/block.block.octavia_messages.yml

@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }

config/sync/block.block.octavia_page_title.yml

@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }

config/sync/block.block.seven_breadcrumbs.yml

@@ -1,22 +0,0 @@
-uuid: 556ed494-c332-4fcf-b6b1-a4f985a8466b
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - seven
-_core:
-  default_config_hash: WWu2OQswgCztl9OeXjD1stexIEMZsSgPMYIdC-JHx9c
-id: seven_breadcrumbs
-theme: seven
-region: breadcrumb
-weight: 0
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  provider: system
-  label_display: '0'
-visibility: {  }

config/sync/block.block.seven_content.yml

@@ -1,22 +0,0 @@
-uuid: 24269707-b61f-4072-8033-d17d3abb0523
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - seven
-_core:
-  default_config_hash: YRY68JWkaUiGeZlWMv1nzeIgDm0ZZwXYgpqUpLFzwAY
-id: seven_content
-theme: seven
-region: content
-weight: 0
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  provider: system
-  label_display: '0'
-visibility: {  }

config/sync/block.block.seven_help.yml

@@ -1,22 +0,0 @@
-uuid: bf5e4d50-acbf-45af-96e4-a318c246904a
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - seven
-_core:
-  default_config_hash: NU5A_49mwLHfs5xFzMFrZ850w9pgUolxMS9NNF3vv4c
-id: seven_help
-theme: seven
-region: help
-weight: 0
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  provider: help
-  label_display: '0'
-visibility: {  }

config/sync/block.block.seven_local_actions.yml

@@ -1,20 +0,0 @@
-uuid: f018e64e-0b86-4837-8db8-2ec94c878763
-langcode: en
-status: true
-dependencies:
-  theme:
-    - seven
-_core:
-  default_config_hash: HHryZVJbeKi9WnuBGC8FOhBZmBnk2G1H6KxFuy-rC9A
-id: seven_local_actions
-theme: seven
-region: content
-weight: -10
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  provider: core
-  label_display: '0'
-visibility: {  }

config/sync/block.block.seven_login.yml

@@ -1,22 +0,0 @@
-uuid: 3b9bb00c-49d4-460a-a084-f2eb228b4ac6
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-  theme:
-    - seven
-_core:
-  default_config_hash: IItlF4SKHgxduIysVQdvirDJ_v3HGuAviOkidAOJYRE
-id: seven_login
-theme: seven
-region: content
-weight: 10
-provider: null
-plugin: user_login_block
-settings:
-  id: user_login_block
-  label: 'User login'
-  provider: user
-  label_display: visible
-visibility: {  }

config/sync/block.block.seven_messages.yml

@@ -1,22 +0,0 @@
-uuid: 694d2bb8-1dfc-4297-9c25-c9f7bb558c0e
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - seven
-_core:
-  default_config_hash: XJqWwLt1LDCnazcEN6QkJmCLjk4R0__-8s0OO9xeNjg
-id: seven_messages
-theme: seven
-region: highlighted
-weight: 0
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  provider: system
-  label_display: '0'
-visibility: {  }

config/sync/block.block.seven_page_title.yml

@@ -1,20 +0,0 @@
-uuid: 822971cb-9b83-4f6e-bf40-30d095be48b2
-langcode: en
-status: true
-dependencies:
-  theme:
-    - seven
-_core:
-  default_config_hash: ZSpc3IoSaLd0PkB02nxjVPBMztIdsTdHek9SiGaqZ_c
-id: seven_page_title
-theme: seven
-region: header
-weight: -30
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  provider: core
-  label_display: '0'
-visibility: {  }

config/sync/block.block.seven_primary_local_tasks.yml

@@ -1,22 +0,0 @@
-uuid: 0c817cde-31b9-4dbd-b9be-02c42d1b7329
-langcode: en
-status: true
-dependencies:
-  theme:
-    - seven
-_core:
-  default_config_hash: ddy1OsBbWxjwEI8VL1viD4I69qcLHOkul4BxbTqLBTs
-id: seven_primary_local_tasks
-theme: seven
-region: header
-weight: 0
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Primary tabs'
-  provider: core
-  label_display: '0'
-  primary: true
-  secondary: false
-visibility: {  }

config/sync/block.block.seven_secondary_local_tasks.yml

@@ -1,22 +0,0 @@
-uuid: 31ea76a8-edcf-4191-ba4e-a89066418909
-langcode: en
-status: true
-dependencies:
-  theme:
-    - seven
-_core:
-  default_config_hash: QeZBeCilQfeET3GeW6ZtJkEiwROADTZktFgKWwPieD4
-id: seven_secondary_local_tasks
-theme: seven
-region: pre_content
-weight: 0
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Secondary tabs'
-  provider: core
-  label_display: '0'
-  primary: false
-  secondary: true
-visibility: {  }

config/sync/block.block.syndicate.yml

@@ -0,0 +1,27 @@
+uuid: 4a62ed89-3157-46fd-a77e-7c8ee4e5a1e0
+langcode: en
+status: true
+dependencies:
+  module:
+    - block_visibility_groups
+    - node
+  theme:
+    - geofresco
+id: syndicate
+theme: geofresco
+region: footer_menus
+weight: 0
+provider: null
+plugin: node_syndicate_block
+settings:
+  id: node_syndicate_block
+  label: Syndicate
+  label_display: '0'
+  provider: node
+  block_count: 10
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.views_block__comments_recent_block_1.yml

@@ -18,13 +18,13 @@ plugin: 'views_block:comments_recent-block_1'
 settings:
   id: 'views_block:comments_recent-block_1'
   label: ''
-  provider: views
   label_display: visible
+  provider: views
   views_label: ''
   items_per_page: none
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.views_block__content_by_author_block_author.yml

@@ -0,0 +1,39 @@
+uuid: 451af5c3-b1a7-43a9-80ce-64629a3f38db
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.content_by_author
+  module:
+    - block_visibility_groups
+    - ctools
+    - views
+  theme:
+    - geofresco
+id: views_block__content_by_author_block_author
+theme: geofresco
+region: content
+weight: -4
+provider: null
+plugin: 'views_block:content_by_author-block_author'
+settings:
+  id: 'views_block:content_by_author-block_author'
+  label: ''
+  label_display: visible
+  provider: views
+  context_mapping: {  }
+  views_label: ''
+  items_per_page: '40'
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''
+  'entity_bundle:node':
+    id: 'entity_bundle:node'
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
+    bundles:
+      people: people

config/sync/block.block.views_block__content_recent_block_1.yml

@@ -18,13 +18,13 @@ plugin: 'views_block:content_recent-block_1'
 settings:
   id: 'views_block:content_recent-block_1'
   label: ''
-  provider: views
   label_display: visible
+  provider: views
   views_label: ''
   items_per_page: none
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''

config/sync/block.block.views_block__home_page_views_block_articles.yml

@@ -0,0 +1,36 @@
+uuid: f6120e1c-309a-4395-a7ef-4b5058e328aa
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.home_page_views
+  module:
+    - block_visibility_groups
+    - system
+    - views
+  theme:
+    - geofresco
+id: views_block__home_page_views_block_articles
+theme: geofresco
+region: content
+weight: -11
+provider: null
+plugin: 'views_block:home_page_views-block_articles'
+settings:
+  id: 'views_block:home_page_views-block_articles'
+  label: ''
+  label_display: visible
+  provider: views
+  views_label: ''
+  items_per_page: none
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''
+  request_path:
+    id: request_path
+    negate: false
+    context_mapping: {  }
+    pages: '<front>'

config/sync/block.block.views_block__home_page_views_block_blogs.yml

@@ -0,0 +1,36 @@
+uuid: 0d56df84-e499-4cdc-b987-99a668ba1557
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.home_page_views
+  module:
+    - block_visibility_groups
+    - system
+    - views
+  theme:
+    - geofresco
+id: views_block__home_page_views_block_blogs
+theme: geofresco
+region: content
+weight: -9
+provider: null
+plugin: 'views_block:home_page_views-block_blogs'
+settings:
+  id: 'views_block:home_page_views-block_blogs'
+  label: ''
+  label_display: visible
+  provider: views
+  views_label: ''
+  items_per_page: none
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''
+  request_path:
+    id: request_path
+    negate: false
+    context_mapping: {  }
+    pages: '<front>'

config/sync/block.block.views_block__home_page_views_block_collections.yml

@@ -0,0 +1,36 @@
+uuid: 88fd256e-0dee-4c74-8d20-0351bb6fe912
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.home_page_views
+  module:
+    - block_visibility_groups
+    - system
+    - views
+  theme:
+    - geofresco
+id: views_block__home_page_views_block_collections
+theme: geofresco
+region: content
+weight: -7
+provider: null
+plugin: 'views_block:home_page_views-block_collections'
+settings:
+  id: 'views_block:home_page_views-block_collections'
+  label: ''
+  label_display: visible
+  provider: views
+  views_label: ''
+  items_per_page: none
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''
+  request_path:
+    id: request_path
+    negate: false
+    context_mapping: {  }
+    pages: '<front>'

config/sync/block.block.views_block__home_page_views_block_featured.yml

@@ -0,0 +1,36 @@
+uuid: 003eb8a5-597a-4ec9-9ad5-a50573ff103f
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.home_page_views
+  module:
+    - block_visibility_groups
+    - system
+    - views
+  theme:
+    - geofresco
+id: views_block__home_page_views_block_featured
+theme: geofresco
+region: content
+weight: -8
+provider: null
+plugin: 'views_block:home_page_views-block_featured'
+settings:
+  id: 'views_block:home_page_views-block_featured'
+  label: 'Featured articles'
+  label_display: visible
+  provider: views
+  views_label: 'Featured articles'
+  items_per_page: none
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''
+  request_path:
+    id: request_path
+    negate: false
+    context_mapping: {  }
+    pages: '<front>'

config/sync/block.block.views_block__home_page_views_block_gleanings.yml

@@ -0,0 +1,36 @@
+uuid: 71576977-dc89-43ad-b748-5f30ddf3e0e1
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.home_page_views
+  module:
+    - block_visibility_groups
+    - system
+    - views
+  theme:
+    - geofresco
+id: views_block__home_page_views_block_gleanings
+theme: geofresco
+region: content
+weight: -10
+provider: null
+plugin: 'views_block:home_page_views-block_gleanings'
+settings:
+  id: 'views_block:home_page_views-block_gleanings'
+  label: ''
+  label_display: visible
+  provider: views
+  views_label: ''
+  items_per_page: none
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''
+  request_path:
+    id: request_path
+    negate: false
+    context_mapping: {  }
+    pages: '<front>'

config/sync/block.block.views_block__related_content_block_related_content.yml

@@ -21,22 +21,22 @@ plugin: 'views_block:related_content-block_related_content'
 settings:
   id: 'views_block:related_content-block_related_content'
   label: ''
-  provider: views
   label_display: visible
+  provider: views
+  context_mapping: {  }
   views_label: ''
   items_per_page: none
-  context_mapping: {  }
 visibility:
   condition_group:
     id: condition_group
     negate: false
-    block_visibility_group: ''
     context_mapping: {  }
+    block_visibility_group: ''
   'entity_bundle:node':
     id: 'entity_bundle:node'
-    bundles:
-      landing_page: landing_page
-      people: people
     negate: true
     context_mapping:
       node: '@node.node_route_context:node'
+    bundles:
+      landing_page: landing_page
+      people: people

config/sync/block.block.views_block__related_content_block_related_content_2.yml

@@ -0,0 +1,42 @@
+uuid: 69eaf1b9-f9ed-44ab-a28c-a35091ac2595
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.related_content
+  module:
+    - block_visibility_groups
+    - node
+    - views
+  theme:
+    - geofresco
+id: views_block__related_content_block_related_content_2
+theme: geofresco
+region: content_bottom
+weight: -12
+provider: null
+plugin: 'views_block:related_content-block_related_content'
+settings:
+  id: 'views_block:related_content-block_related_content'
+  label: ''
+  label_display: visible
+  provider: views
+  context_mapping: {  }
+  views_label: ''
+  items_per_page: none
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    context_mapping: {  }
+    block_visibility_group: ''
+  'entity_bundle:node':
+    id: 'entity_bundle:node'
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
+    bundles:
+      article: article
+      blog: blog
+      collection: collection
+      gleaning: gleaning

config/sync/block_class.settings.yml

@@ -0,0 +1,24 @@
+_core:
+  default_config_hash: XEpuHrBp3DELKxVx0tmwE6CS7NSIKXu4F6QhT_vwqd0
+maxlength_block_class_field: 255
+field_type: multiple_textfields
+default_case: lowercase
+block_classes_stored:
+  - is-hidden-mobile
+  - column
+enable_attributes: true
+enable_auto_complete: true
+qty_classes_per_block: 10
+items_per_page: 50
+enable_special_chars: false
+qty_attributes_per_block: 10
+enable_id_replacement: true
+weight_attributes: null
+weight_class: null
+weight_id: null
+filter_html_clean_css_identifier: ''
+maxlength_attributes: 255
+maxlength_id: 255
+attribute_keys_stored: '[]'
+attribute_value_stored: '[]'
+attributes_inline: '[]'

config/sync/block_content.type.basic.yml

@@ -1,10 +0,0 @@
-uuid: cf2666c1-8ee6-467c-b771-71f4d39492bf
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: zglzjmYxi0G0ag9MZ02y0LSJOdpWRwJxyP_OvFojFyo
-id: basic
-label: 'Basic block'
-revision: 0
-description: 'A basic block contains a title and a body.'

config/sync/block_content.type.slide.yml

@@ -6,5 +6,5 @@ _core:
   default_config_hash: pOGP3cCvZKJh3KvC3N1wt5CzxZgG0DOu7KDyFMi3gZw
 id: slide
 label: Slide
-revision: 1
+revision: true
 description: ''

config/sync/block_visibility_groups.block_visibility_group.article_listing.yml

@@ -12,8 +12,8 @@ logic: and
 conditions:
   7ff8110c-3b7e-4b97-8def-4081a2590558:
     id: request_path
-    pages: /articles
     negate: false
-    context_mapping: {  }
     uuid: 7ff8110c-3b7e-4b97-8def-4081a2590558
+    context_mapping: {  }
+    pages: /articles
 allow_other_conditions: false

config/sync/block_visibility_groups.block_visibility_group.blog_listing.yml

@@ -12,8 +12,8 @@ logic: and
 conditions:
   b3c1bb42-5349-4f54-abe9-590277c82bcc:
     id: request_path
-    pages: /blog
     negate: false
-    context_mapping: {  }
     uuid: b3c1bb42-5349-4f54-abe9-590277c82bcc
+    context_mapping: {  }
+    pages: /blog
 allow_other_conditions: false

config/sync/block_visibility_groups.block_visibility_group.search.yml

@@ -12,8 +12,8 @@ logic: and
 conditions:
   f502a545-a711-401c-8e94-6e727993abb4:
     id: request_path
-    pages: /search
     negate: false
-    context_mapping: {  }
     uuid: f502a545-a711-401c-8e94-6e727993abb4
+    context_mapping: {  }
+    pages: /search
 allow_other_conditions: false

config/sync/bulma.settings.yml

@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: u5HfkXMiQipMF-CAMTyJj7Thrm-29irq33crpU5f3jI
 general:
   block: 1
   icon: 1
@@ -25,9 +27,7 @@ table:
   narrow: 0
 cdn:
   bulma:
-    version: 0.5.3
+    version: 0.9.1
   bulmaswatch:
-    version: 0.5.1
+    version: 0.8.1
     theme: default
-_core:
-  default_config_hash: u5HfkXMiQipMF-CAMTyJj7Thrm-29irq33crpU5f3jI

config/sync/captcha.captcha_point.comment_comment_form.yml

@@ -0,0 +1,7 @@
+uuid: 68c612df-4e72-4492-bdd8-049905aede18
+langcode: en
+status: true
+dependencies: {  }
+formId: comment_comment_form
+captchaType: riddler/Riddler
+label: comment_comment_form