Slb 295 breadcrumbs

.github/actions/setup/action.yml

@@ -35,10 +35,6 @@ runs:
       shell: bash
       run: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 pnpm i
 
-    - name: Check formatting
-      shell: bash
-      run: pnpm test:format
-
     - name: Cache playwright binaries
       uses: actions/cache@v3
       id: playwright-cache

.github/workflows/deploy.yml

@@ -23,11 +23,15 @@ jobs:
 
       - name: Extract branch name
         shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        run:
+          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >>
+          $GITHUB_OUTPUT
         id: extract_branch
 
       - name: Prepare deployment package
-        run: pnpm turbo:prep && pnpm deploy --filter "@custom/website" ../deploy --prod
+        run:
+          pnpm turbo:prep && pnpm deploy --filter "@custom/website" ../deploy
+          --prod
         env:
           VITE_DECAP_REPO: ${{ github.repository }}
           VITE_DECAP_BRANCH: ${{ steps.extract_branch.outputs.branch }}
@@ -54,16 +58,21 @@ jobs:
       - name: Deploy to dev
         run: pnpm netlify deploy --prod --filter "@custom/website"
         working-directory: ../deploy
-        if: github.ref == 'refs/heads/dev' && steps.netlify-check.outputs.available == 'true' && vars.NETLIFY_DEV_ID != ''
+        if:
+          github.ref == 'refs/heads/dev' &&
+          steps.netlify-check.outputs.available == 'true' && vars.NETLIFY_DEV_ID
+          != ''
         env:
           NETLIFY_SITE_ID: ${{ vars.NETLIFY_DEV_ID }}
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
 
       - name: Deploy to prod
         run: pnpm netlify deploy --prod --filter "@custom/website"
         working-directory: ../deploy
-        if: github.ref == 'refs/heads/prod' && steps.netlify-check.outputs.available == 'true' && vars.NETLIFY_PROD_ID != ''
+        if:
+          github.ref == 'refs/heads/prod' &&
+          steps.netlify-check.outputs.available == 'true' &&
+          vars.NETLIFY_PROD_ID != ''
         env:
           NETLIFY_SITE_ID: ${{ vars.NETLIFY_PROD_ID }}
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-

.github/workflows/high_content_volume.yml

@@ -35,7 +35,9 @@ jobs:
         run: pnpm --filter "@custom/website" clean
 
       - name: 'Drupal: Create content'
-        run: pnpm --filter "@custom/cms" drush php:script scripts/create-lots-of-content/run.php
+        run:
+          pnpm --filter "@custom/cms" drush php:script
+          scripts/create-lots-of-content/run.php
 
       - name: 'Gatsby: Full build'
         run: pnpm --filter "@custom/website" build:gatsby
@@ -44,7 +46,9 @@ jobs:
         run: pnpm --filter "@custom/website" build:gatsby
 
       - name: 'Drupal: Create more content'
-        run: pnpm --filter "@custom/cms" drush php:script scripts/create-lots-of-content/create-100-pages.php
+        run:
+          pnpm --filter "@custom/cms" drush php:script
+          scripts/create-lots-of-content/create-100-pages.php
 
       - name: 'Gatsby: Incremental build with new content'
         run: pnpm --filter "@custom/website" build:gatsby

.github/workflows/merge_dev_to_stage.yml

@@ -18,4 +18,4 @@ jobs:
         with:
           type: now
           target_branch: stage
-          github_token: ${{ github.token }}
+          github_token: ${{ github.token }}

.github/workflows/test.yml

@@ -9,7 +9,9 @@ jobs:
     steps:
       - name: Init check
         if: ${{ github.repository != 'AmazeeLabs/silverback-template'}}
-        run: echo 'Please run the INIT script. See the root README.md for instructions.' && false
+        run:
+          echo 'Please run the INIT script. See the root README.md for
+          instructions.' && false
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -19,6 +21,9 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
 
+      - name: Check formatting
+        run: pnpm test:format
+
       - name: TurboRepo local server
         uses: felixmosh/turborepo-gh-artifacts@v2
         with:
@@ -77,7 +82,9 @@ jobs:
 
       - name: Merge release to prod (silverback-template only)
         uses: devmasx/[email protected]
-        if: ${{ github.repository == 'AmazeeLabs/silverback-template' && github.ref  == 'refs/heads/release'}}
+        if:
+          ${{ github.repository == 'AmazeeLabs/silverback-template' &&
+          github.ref  == 'refs/heads/release'}}
         with:
           type: now
           from_branch: release
@@ -86,7 +93,9 @@ jobs:
 
   docker_build:
     name: Docker Build
-    if: startsWith(github.ref_name, 'test-all/') || startsWith(github.head_ref, 'test-all/')
+    if:
+      startsWith(github.ref_name, 'test-all/') || startsWith(github.head_ref,
+      'test-all/')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/test_without_turbo_cache.yml

@@ -9,7 +9,9 @@ jobs:
     steps:
       - name: Init check
         if: ${{ github.repository != 'AmazeeLabs/silverback-template'}}
-        run: echo 'Please run the INIT script. See the root README.md for instructions.' && false
+        run:
+          echo 'Please run the INIT script. See the root README.md for
+          instructions.' && false
 
       - name: Checkout
         uses: actions/checkout@v3

.gitpod.Dockerfile

@@ -28,8 +28,3 @@ RUN chmod a+x phpactor.phar
 RUN sudo mv phpactor.phar /usr/local/bin/phpactor
 # Install gh cli
 RUN sudo install-packages gh
-
-RUN curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_0.40.2_Linux_x86_64.tar.gz" \
-  && tar xf lazygit.tar.gz lazygit \
-  && sudo install lazygit /usr/local/bin
-

.gitpod.yml

@@ -1,6 +1,6 @@
 tasks:
   - name: Setup
-    init: pnpm install && pnpm turbo build --no-daemon --go-fallback && gp sync-done setup
+    init: pnpm install && pnpm turbo build gp sync-done setup
     env:
       NETLIFY_URL: http://localhost:8000
       DRUPAL_EXTERNAL_URL: http://localhost:8888

.prettierignore

@@ -3,3 +3,4 @@ apps
 packages
 tests
 .turbo
+pnpm-lock.yaml

apps/cms/.prettierignore

@@ -0,0 +1,2 @@
+config/sync
+composer.lock

apps/cms/scaffold/all.services.yml

@@ -3,10 +3,10 @@
 # To activate this feature, follow the instructions at the top of the
 # 'example.settings.local.php' file, which sits next to this file.
 parameters:
-    # Configure Cross-Site HTTP requests (CORS).
-    # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
-    # for more information about the topic in general.
-    # Note: By default the configuration is disabled.
+  # Configure Cross-Site HTTP requests (CORS).
+  # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
+  # for more information about the topic in general.
+  # Note: By default the configuration is disabled.
   cors.config:
     enabled: true
     # Specify allowed headers, like 'x-allowed-header'.

apps/website/netlify/functions/github-proxy.mts

@@ -5,6 +5,9 @@ export default function (request: Request, context: Context) {
   if (!process.env.DECAP_GITHUB_TOKEN) {
     throw new Error('Missing environment variable DECAP_GITHUB_TOKEN.');
   }
-  return githubProxy(request, process.env.DECAP_GITHUB_TOKEN, '/.netlify/functions/github-proxy');
+  return githubProxy(
+    request,
+    process.env.DECAP_GITHUB_TOKEN,
+    '/.netlify/functions/github-proxy',
+  );
 }
-

docker-compose.yml

@@ -1,14 +1,12 @@
 version: '2.3'
 
 x-volumes:
-  &default-volumes
-  # Define all volumes you would like to have real-time mounted into the docker containers
+  &default-volumes # Define all volumes you would like to have real-time mounted into the docker containers
   volumes:
     - ./packages/drupal:/app/web/modules/custom:delegated
     - ./apps/cms:/app:delegated
 
-x-environment:
-  &default-environment
+x-environment: &default-environment
   LAGOON_PROJECT: &lagoon-project ${COMPOSE_PROJECT_NAME:-slbtemplate}
   # Route that should be used locally, if you are using pygmy, this route *must* end with .docker.amazee.io
   LAGOON_ROUTE: &default-url http://${COMPOSE_PROJECT_NAME:-slbtemplate}.docker.amazee.io
@@ -17,8 +15,7 @@ x-environment:
   # See example.docker-compose.override.yml for XDEBUG_ENABLE option
 
 x-user:
-  &default-user
-  # The default user under which the containers should run. Change this if you are on linux and run with another user than id `1000`
+  &default-user # The default user under which the containers should run. Change this if you are on linux and run with another user than id `1000`
   user: '1000'
 
 services:
@@ -58,7 +55,7 @@ services:
     depends_on:
       - cli # basically just tells docker-compose to build the cli first
     environment:
-      << : *default-environment # loads the defined environment variables from the top
+      <<: *default-environment # loads the defined environment variables from the top
     networks:
       - amazeeio-network
       - default

package.json

@@ -13,8 +13,8 @@
     "tb": "pnpm turbo --filter @custom/website",
     "test:format": "pnpm test:format:root --check && pnpm test:format:workspaces --check",
     "test:format:fix": "pnpm test:format:root --write && pnpm test:format:workspaces --write",
-    "test:format:root": "pnpm prettier '**/*.{js,cjs,mjs,ts,jsx,tsx,gql,graphql,graphqls,md,mdx,json,htm,html}' --ignore-path='./.prettierignore'",
-    "test:format:workspaces": "pnpm --workspace-concurrency=1 -r exec prettier '**/*.{js,cjs,mjs,ts,jsx,tsx,gql,graphql,graphqls,md,mdx,json,htm,html}' --ignore-path='./.gitignore'",
+    "test:format:root": "pnpm prettier --ignore-unknown '**/**'",
+    "test:format:workspaces": "pnpm --workspace-concurrency=1 -r exec prettier --ignore-unknown '**/**'",
     "turbo:local": "if [ -z $CI ]; then echo $(date)$RANDOM > apps/cms/turbo-seed.txt; fi",
     "turbo:test": "pnpm turbo:local && pnpm tb test:unit --no-daemon --go-fallback --output-logs=new-only && pnpm tb test:integration --no-daemon --go-fallback --output-logs=new-only --concurrency=1",
     "turbo:test:force": "pnpm tb test:unit --no-daemon --go-fallback --output-logs=new-only --force && pnpm tb test:integration --no-daemon --go-fallback --output-logs=new-only --concurrency=1 --force",
@@ -38,7 +38,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "husky": "^8.0.3",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.5",
     "turbo": "^1.11.2",
     "typescript": "^5.3.3",
     "vitest": "^1.1.1"

packages/drupal/gutenberg_blocks/css/edit.css

@@ -1,10 +1,10 @@
 /* We can put any editor specific styling in here */
 .gutenberg__editor .editor-styles-wrapper {
-  font-family:inherit;
+  font-family: inherit;
 }
 
 .gutenberg__editor blockquote {
-  margin:0;
+  margin: 0;
 }
 
 .gutenberg__editor blockquote .quote-image img {
@@ -40,4 +40,4 @@
   left: 0;
   transform-origin: 0 0;
   transform: rotate(90deg);
-}
+}

packages/drupal/gutenberg_blocks/gutenberg_blocks.gutenberg.yml

@@ -3,4 +3,4 @@ theme-support:
     typography:
       dropCap: false
 libraries-edit:
-  - gutenberg_blocks/edit
+  - gutenberg_blocks/edit

packages/drupal/gutenberg_blocks/gutenberg_blocks.info.yml

@@ -5,4 +5,4 @@ package: Custom
 core_version_requirement: ^9 || ^10
 dependencies:
   - gutenberg:gutenberg
-  - silverback_gutenberg:silverback_gutenberg
+  - silverback_gutenberg:silverback_gutenberg

packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml

@@ -13,4 +13,3 @@ customisations:
       /gutenberg.css: { preprocess: false }
   dependencies:
     - core/drupalSettings
-

packages/drupal/test_content/.prettierignore

@@ -0,0 +1,2 @@
+content
+webforms

packages/schema/src/schema.graphql

@@ -199,7 +199,7 @@ type Hero {
 }
 
 union PageContent @resolveEditorBlockType =
-    BlockMarkup
+  | BlockMarkup
   | BlockMedia
   | BlockForm
   | BlockImageTeasers

packages/ui/src/components/Atoms/Container.css

@@ -27,14 +27,15 @@
 }
 
 .nested-container .container-page:first-child .container-text,
-.nested-container .container-page:first-child .container-text *:first-child{
+.nested-container .container-page:first-child .container-text *:first-child {
   @apply mt-0;
 }
 .nested-container .container-page:last-child .container-text,
 .nested-container .container-page:last-child .container-text *:last-child {
   @apply mb-0;
 }
 
-.container-nested .prose ul:not(ul ul), .container-nested .prose ol:not(ol ol) {
+.container-nested .prose ul:not(ul ul),
+.container-nested .prose ol:not(ol ol) {
   @apply mt-0;
 }

packages/ui/src/components/Molecules/Breadcrumbs.tsx

@@ -9,8 +9,6 @@ import { useBreadcrumbs } from '../Routes/Menu';
 export function BreadCrumbs({ className }: { className?: string }) {
   const breadcrumbs = useBreadcrumbs();
 
-  console.log('breadcrumbs:', breadcrumbs);
-
   if (!breadcrumbs.length) {
     return null;
   }

packages/ui/src/components/Organisms/Header.tsx

@@ -76,6 +76,13 @@ export function Header() {
                 </Link>
               ) : (
                 <DesktopMenuDropDown title={item.title} key={item.title}>
+                  <Link
+                    key={item.target}
+                    href={item.target}
+                    className="m-1.5 block hover:text-blue-600 p-2 text-sm leading-[1.25rem] text-gray-900 font-bold"
+                  >
+                    {item.title}
+                  </Link>
                   {item.children.map((child) =>
                     child.children.length === 0 ? (
                       <Link
@@ -126,6 +133,14 @@ export function Header() {
                       key={item.title}
                       nestLevel={1}
                     >
+                      <Link
+                        key={item.target}
+                        href={item.target}
+                        title={item.title}
+                        className="block hover:text-blue-600 py-4 pr-8 pl-10 text-base text-gray-600"
+                      >
+                        {item.title}
+                      </Link>
                       {item.children.map((child) =>
                         child.children.length === 0 ? (
                           <Link

packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx

@@ -17,11 +17,8 @@ export function BlockMarkup(props: BlockMarkupFragment) {
     <div
       className={clsx([
         'mx-auto max-w-3xl prose lg:prose-xl mt-10',
-        'prose-a:text-indigo-600',
-        'prose-em:text-indigo-600',
-        'prose-strong:text-indigo-600',
-        'marker:text-indigo-600 marker:font-bold',
-        'prose-h2:text-indigo-600 prose-h2:font-bold',
+        'marker:text-[#111928]',
+        'marker:font-bold',
       ])}
     >
       <Html
@@ -42,7 +39,7 @@ export function BlockMarkup(props: BlockMarkupFragment) {
                 className={clsx(className, { 'list-none relative': unordered })}
               >
                 {unordered ? (
-                  <ArrowRightCircleIcon className="not-prose w-6 h-6 absolute mt-1.5 left-[-1.5em] text-indigo-600" />
+                  <ArrowRightCircleIcon className="not-prose w-6 h-6 absolute mt-1.5 left-[-1.5em] text-gray-900" />
                 ) : null}
                 {children}
               </li>

packages/ui/src/components/Organisms/PageDisplay.tsx

@@ -17,7 +17,7 @@ export function PageDisplay(page: PageFragment) {
     <PageTransition>
       <div>
         {page.hero && <PageHero {...page.hero} />}
-        <div className="bg-white pt-5 pb-12 lg:px-8">
+        <div className="bg-white pt-5 pb-12 px-6 lg:px-8">
           <BreadCrumbs className="mx-auto max-w-3xl" />
           <div className="mx-auto max-w-3xl text-base leading-7 text-gray-700">
             {page?.content?.filter(isTruthy).map((block, index) => {