From 2507515fa8f8719be8ce8074fa927a5da4ee5205 Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Wed, 8 May 2024 16:10:41 +0200 Subject: [PATCH 01/20] chore: remove debug --- packages/ui/src/components/Molecules/Breadcrumbs.tsx | 2 -- packages/ui/src/components/Routes/Menu.tsx | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/ui/src/components/Molecules/Breadcrumbs.tsx b/packages/ui/src/components/Molecules/Breadcrumbs.tsx index cdbaa5f57..27232e13b 100644 --- a/packages/ui/src/components/Molecules/Breadcrumbs.tsx +++ b/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; } diff --git a/packages/ui/src/components/Routes/Menu.tsx b/packages/ui/src/components/Routes/Menu.tsx index ea867bbd8..17c733fc2 100644 --- a/packages/ui/src/components/Routes/Menu.tsx +++ b/packages/ui/src/components/Routes/Menu.tsx @@ -10,7 +10,6 @@ export function useMenus() { const locale = intl.locale; const settings = useOperation(FrameQuery).data; - console.log('settings:', settings); return { main: settings?.mainNavigation ?.filter((nav) => nav?.locale === locale) @@ -90,6 +89,5 @@ export function useMenuAncestors(path: string, menuName: MenuNameType) { export const useBreadcrumbs = (menuName?: MenuNameType, path?: string) => { const currentPath = useCurrentPath(); - console.log('currentPath', currentPath); return useMenuAncestors(path || currentPath || '', menuName || 'main'); }; From 85e1904c4d8cf1bf884c0e4d121a537140327d92 Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Tue, 14 May 2024 06:22:46 +0200 Subject: [PATCH 02/20] style: adjust spacing --- packages/ui/src/components/Organisms/PageDisplay.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/src/components/Organisms/PageDisplay.tsx b/packages/ui/src/components/Organisms/PageDisplay.tsx index 008a582c9..d3c9f5bef 100644 --- a/packages/ui/src/components/Organisms/PageDisplay.tsx +++ b/packages/ui/src/components/Organisms/PageDisplay.tsx @@ -17,7 +17,7 @@ export function PageDisplay(page: PageFragment) {
{page.hero && } -
+
{page?.content?.filter(isTruthy).map((block, index) => { From cbfcb30cdde3fa157e0b5e1b6e2ce27f8d04eaac Mon Sep 17 00:00:00 2001 From: Mattia Simonato Date: Wed, 8 May 2024 07:56:30 +0200 Subject: [PATCH 03/20] fix(SLB-360): update fields and labels font size --- packages/ui/src/iframe.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui/src/iframe.css b/packages/ui/src/iframe.css index 8633ffd05..d831fd558 100644 --- a/packages/ui/src/iframe.css +++ b/packages/ui/src/iframe.css @@ -32,7 +32,7 @@ h1 { /* Label */ .form-item label { - @apply block mb-2; + @apply block mb-2 text-sm; } .form-item input[type="checkbox"] + label, .form-item input[type="radio"] + label { @@ -72,7 +72,7 @@ h1 { .form-item input[type="color"], .form-item textarea, .form-item select { - @apply bg-gray-50 border border-gray-300 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5; + @apply bg-gray-50 border border-gray-300 text-base rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5; } /* checkbox */ From 1aaac05ed7be563ef9404b02514f32710cb97578 Mon Sep 17 00:00:00 2001 From: Mattia Simonato Date: Wed, 8 May 2024 07:58:14 +0200 Subject: [PATCH 04/20] fix(SLB-361): add style to visually-hidden class globally --- packages/ui/src/iframe.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/ui/src/iframe.css b/packages/ui/src/iframe.css index d831fd558..affa0ef69 100644 --- a/packages/ui/src/iframe.css +++ b/packages/ui/src/iframe.css @@ -21,6 +21,11 @@ h1 { @apply px-1 text-gray-900; } +/* add style to visually-hidden class globally */ +.webform-submission-form .visually-hidden { + @apply sr-only; +} + /* Vertical spacing */ .webform-submission-form > *:not(:last-child) { @apply mb-10; From 4a8cdcb45c594b1aede7cf9fcb0484def9461af0 Mon Sep 17 00:00:00 2001 From: Mattia Simonato Date: Wed, 8 May 2024 07:58:51 +0200 Subject: [PATCH 05/20] fix(SLB-358): reduce vertical spacing between fields --- packages/ui/src/iframe.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/ui/src/iframe.css b/packages/ui/src/iframe.css index affa0ef69..4a8695e58 100644 --- a/packages/ui/src/iframe.css +++ b/packages/ui/src/iframe.css @@ -27,10 +27,15 @@ h1 { } /* Vertical spacing */ +.webform-submission-form .webform-flexbox { + @apply md:my-0 gap-y-4 md:gap-y-0 flex flex-col md:flex-row; +} + .webform-submission-form > *:not(:last-child) { - @apply mb-10; + @apply mb-4 md:mb-6; } + .fieldset-wrapper > *:not(:last-child) { @apply mb-5; } From 93e2bf05d0428e4bc549ca64bed5851a29b5ecc0 Mon Sep 17 00:00:00 2001 From: Mattia Simonato Date: Wed, 8 May 2024 09:53:01 +0200 Subject: [PATCH 06/20] fix(SLB-359): terms of service dropdown starts closed --- packages/ui/src/iframe.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/src/iframe.css b/packages/ui/src/iframe.css index 4a8695e58..36a13ad02 100644 --- a/packages/ui/src/iframe.css +++ b/packages/ui/src/iframe.css @@ -174,5 +174,5 @@ h1 { /* terms of service field - Dropdown */ .webform-terms-of-service-details { - @apply text-gray-900 border-gray-300 border rounded-lg p-5 leading-relaxed; + @apply text-gray-900 border-gray-300 border rounded-lg p-5 leading-relaxed hidden; } From 7fa5cc9b0072b5944bf579765995c6be1ba00113 Mon Sep 17 00:00:00 2001 From: Alex Tkachev Date: Wed, 8 May 2024 15:48:01 +0400 Subject: [PATCH 07/20] chore: update prettier An attempt to resolve prettier errors in dev branch, --- package.json | 2 +- pnpm-lock.yaml | 181 +++++++++++++++++++++++++++++-------------------- 2 files changed, 108 insertions(+), 75 deletions(-) diff --git a/package.json b/package.json index 12321130c..9d06dcc45 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05006d49f..cf1905123 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: devDependencies: '@commitlint/cli': specifier: ^18.4.3 - version: 18.4.3(@types/node@18.19.31)(typescript@5.3.3) + version: 18.4.3(@types/node@20.11.17)(typescript@5.3.3) '@commitlint/config-conventional': specifier: ^18.4.3 version: 18.4.3 @@ -54,8 +54,8 @@ importers: specifier: ^8.0.3 version: 8.0.3 prettier: - specifier: ^3.1.1 - version: 3.1.1 + specifier: ^3.2.5 + version: 3.2.5 turbo: specifier: ^1.11.2 version: 1.11.2 @@ -64,13 +64,13 @@ importers: version: 5.3.3 vitest: specifier: ^1.1.1 - version: 1.1.1(@types/node@18.19.31) + version: 1.1.1(@types/node@20.11.17) apps/cms: dependencies: '@amazeelabs/gatsby-source-silverback': specifier: '*' - version: 1.14.0(@types/node@18.19.31)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.3)(typescript@5.4.4) + version: 1.14.0(@types/node@20.11.17)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.3)(typescript@5.4.4) '@custom/custom': specifier: workspace:* version: link:../../packages/drupal/custom @@ -279,7 +279,7 @@ importers: version: 1.0.1 '@amazeelabs/gatsby-source-silverback': specifier: ^1.14.0 - version: 1.14.0(@types/node@18.19.31)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.1)(typescript@4.9.5) + version: 1.14.0(@types/node@20.11.17)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.1)(typescript@4.9.5) '@amazeelabs/publisher': specifier: ^2.4.17 version: 2.4.17(@types/react@18.2.46)(react@18.2.0)(typescript@4.9.5) @@ -339,7 +339,7 @@ importers: version: 2.1.35 netlify-cli: specifier: ^17.21.1 - version: 17.21.1(@types/node@18.19.31) + version: 17.21.1(@types/node@20.11.17) react: specifier: ^18.2.0 version: 18.2.0 @@ -373,7 +373,7 @@ importers: version: 2.0.3 vitest: specifier: ^1.1.1 - version: 1.1.1(@types/node@18.19.31)(happy-dom@12.10.3) + version: 1.1.1(@types/node@20.11.17)(happy-dom@12.10.3) packages/drupal/custom: {} @@ -601,7 +601,7 @@ importers: version: 8.0.0-alpha.14(jest@29.7.0)(vitest@1.1.1) '@storybook/test-runner': specifier: ^0.16.0 - version: 0.16.0(@types/node@18.19.31) + version: 0.16.0(@types/node@20.11.17) '@swc/cli': specifier: ^0.1.63 version: 0.1.63(@swc/core@1.3.102) @@ -694,7 +694,7 @@ importers: version: 5.3.3 vite: specifier: ^5.0.10 - version: 5.0.10(@types/node@18.19.31) + version: 5.0.10(@types/node@20.11.17) vite-imagetools: specifier: ^6.2.9 version: 6.2.9 @@ -703,7 +703,7 @@ importers: version: 1.0.3 vitest: specifier: ^1.1.1 - version: 1.1.1(@types/node@18.19.31)(happy-dom@12.10.3) + version: 1.1.1(@types/node@20.11.17)(happy-dom@12.10.3) tests/e2e: devDependencies: @@ -996,7 +996,7 @@ packages: - utf-8-validate dev: false - /@amazeelabs/gatsby-source-silverback@1.14.0(@types/node@18.19.31)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.1)(typescript@4.9.5): + /@amazeelabs/gatsby-source-silverback@1.14.0(@types/node@20.11.17)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.1)(typescript@4.9.5): resolution: {integrity: sha512-tIL4lPx7mQDBH5XiouXgTEhOIXF/oKDss0OYbHJEbxXVofv4IDifZcZZO1Hw9oWmrTSaJhYoC2Bdm+2kdvxf6g==} peerDependencies: gatsby-plugin-sharp: ^5.13.1 @@ -1006,7 +1006,7 @@ packages: gatsby-graphql-source-toolkit: 2.0.4(gatsby@5.13.1) gatsby-plugin-sharp: 5.13.1(gatsby@5.13.1)(graphql@16.8.1) graphql: 16.8.1 - graphql-config: 5.0.3(@types/node@18.19.31)(graphql@16.8.1)(typescript@4.9.5) + graphql-config: 5.0.3(@types/node@20.11.17)(graphql@16.8.1)(typescript@4.9.5) isomorphic-fetch: 3.0.0 lodash-es: 4.17.21 node-fetch: 3.3.2 @@ -1021,7 +1021,7 @@ packages: - utf-8-validate dev: false - /@amazeelabs/gatsby-source-silverback@1.14.0(@types/node@18.19.31)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.3)(typescript@5.4.4): + /@amazeelabs/gatsby-source-silverback@1.14.0(@types/node@20.11.17)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.3)(typescript@5.4.4): resolution: {integrity: sha512-tIL4lPx7mQDBH5XiouXgTEhOIXF/oKDss0OYbHJEbxXVofv4IDifZcZZO1Hw9oWmrTSaJhYoC2Bdm+2kdvxf6g==} peerDependencies: gatsby-plugin-sharp: ^5.13.1 @@ -1031,7 +1031,7 @@ packages: gatsby-graphql-source-toolkit: 2.0.4(gatsby@5.13.3) gatsby-plugin-sharp: 5.13.1(gatsby@5.13.3)(graphql@16.8.1) graphql: 16.8.1 - graphql-config: 5.0.3(@types/node@18.19.31)(graphql@16.8.1)(typescript@5.4.4) + graphql-config: 5.0.3(@types/node@20.11.17)(graphql@16.8.1)(typescript@5.4.4) isomorphic-fetch: 3.0.0 lodash-es: 4.17.21 node-fetch: 3.3.2 @@ -2687,14 +2687,14 @@ packages: resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==} engines: {node: '>=0.1.90'} - /@commitlint/cli@18.4.3(@types/node@18.19.31)(typescript@5.3.3): + /@commitlint/cli@18.4.3(@types/node@20.11.17)(typescript@5.3.3): resolution: {integrity: sha512-zop98yfB3A6NveYAZ3P1Mb6bIXuCeWgnUfVNkH4yhIMQpQfzFwseadazOuSn0OOfTt0lWuFauehpm9GcqM5lww==} engines: {node: '>=v18'} hasBin: true dependencies: '@commitlint/format': 18.6.1 '@commitlint/lint': 18.6.1 - '@commitlint/load': 18.6.1(@types/node@18.19.31)(typescript@5.3.3) + '@commitlint/load': 18.6.1(@types/node@20.11.17)(typescript@5.3.3) '@commitlint/read': 18.6.1 '@commitlint/types': 18.6.1 execa: 5.1.1 @@ -2765,7 +2765,7 @@ packages: '@commitlint/types': 18.6.1 dev: true - /@commitlint/load@18.6.1(@types/node@18.19.31)(typescript@5.3.3): + /@commitlint/load@18.6.1(@types/node@20.11.17)(typescript@5.3.3): resolution: {integrity: sha512-p26x8734tSXUHoAw0ERIiHyW4RaI4Bj99D8YgUlVV9SedLf8hlWAfyIFhHRIhfPngLlCe0QYOdRKYFt8gy56TA==} engines: {node: '>=v18'} dependencies: @@ -2775,7 +2775,7 @@ packages: '@commitlint/types': 18.6.1 chalk: 4.1.2 cosmiconfig: 8.3.6(typescript@5.3.3) - cosmiconfig-typescript-loader: 5.0.0(@types/node@18.19.31)(cosmiconfig@8.3.6)(typescript@5.3.3) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.11.17)(cosmiconfig@8.3.6)(typescript@5.3.3) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -4720,7 +4720,7 @@ packages: transitivePeerDependencies: - '@types/node' - /@graphql-tools/executor-http@1.0.9(@types/node@18.19.31)(graphql@16.8.1): + /@graphql-tools/executor-http@1.0.9(@types/node@20.11.17)(graphql@16.8.1): resolution: {integrity: sha512-+NXaZd2MWbbrWHqU4EhXcrDbogeiCDmEbrAN+rMn4Nu2okDjn2MTFDbTIab87oEubQCH4Te1wDkWPKrzXup7+Q==} engines: {node: '>=16.0.0'} peerDependencies: @@ -4731,7 +4731,7 @@ packages: '@whatwg-node/fetch': 0.9.17 extract-files: 11.0.0 graphql: 16.8.1 - meros: 1.3.0(@types/node@18.19.31) + meros: 1.3.0(@types/node@20.11.17) tslib: 2.6.2 value-or-promise: 1.0.12 transitivePeerDependencies: @@ -5044,7 +5044,7 @@ packages: - encoding - utf-8-validate - /@graphql-tools/url-loader@8.0.2(@types/node@18.19.31)(graphql@16.8.1): + /@graphql-tools/url-loader@8.0.2(@types/node@20.11.17)(graphql@16.8.1): resolution: {integrity: sha512-1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ==} engines: {node: '>=16.0.0'} peerDependencies: @@ -5053,7 +5053,7 @@ packages: '@ardatan/sync-fetch': 0.0.1 '@graphql-tools/delegate': 10.0.4(graphql@16.8.1) '@graphql-tools/executor-graphql-ws': 1.1.2(graphql@16.8.1) - '@graphql-tools/executor-http': 1.0.9(@types/node@18.19.31)(graphql@16.8.1) + '@graphql-tools/executor-http': 1.0.9(@types/node@20.11.17)(graphql@16.8.1) '@graphql-tools/executor-legacy-ws': 1.0.6(graphql@16.8.1) '@graphql-tools/utils': 10.1.2(graphql@16.8.1) '@graphql-tools/wrap': 10.0.5(graphql@16.8.1) @@ -5683,7 +5683,7 @@ packages: magic-string: 0.27.0 react-docgen-typescript: 2.2.2(typescript@5.3.3) typescript: 5.3.3 - vite: 5.0.10(@types/node@18.19.31) + vite: 5.0.10(@types/node@20.11.17) dev: true /@jridgewell/gen-mapping@0.3.5: @@ -6032,7 +6032,7 @@ packages: yargs: 17.7.2 dev: false - /@netlify/build@29.36.6(@opentelemetry/api@1.8.0)(@types/node@18.19.31): + /@netlify/build@29.36.6(@opentelemetry/api@1.8.0)(@types/node@20.11.17): resolution: {integrity: sha512-crNoY5Vr7tAodBfYdz8weM+NTw5q6W6ArkowNw6QhKXa4iRXT5MY6H0c2ztsge9o5gAYs55bDhBpKiPcZlzDlA==} engines: {node: ^14.16.0 || >=16.0.0} hasBin: true @@ -6097,7 +6097,7 @@ packages: strip-ansi: 7.1.0 supports-color: 9.4.0 terminal-link: 3.0.0 - ts-node: 10.9.2(@types/node@18.19.31)(typescript@5.4.4) + ts-node: 10.9.2(@types/node@20.11.17)(typescript@5.4.4) typescript: 5.4.4 uuid: 9.0.0 yargs: 17.7.2 @@ -8352,7 +8352,7 @@ packages: magic-string: 0.30.9 rollup: 3.29.4 typescript: 5.3.3 - vite: 5.0.10(@types/node@18.19.31) + vite: 5.0.10(@types/node@20.11.17) transitivePeerDependencies: - encoding - supports-color @@ -8861,7 +8861,7 @@ packages: react: 18.2.0 react-docgen: 7.0.3 react-dom: 18.2.0(react@18.2.0) - vite: 5.0.10(@types/node@18.19.31) + vite: 5.0.10(@types/node@20.11.17) transitivePeerDependencies: - '@preact/preset-vite' - encoding @@ -8935,7 +8935,7 @@ packages: - supports-color dev: true - /@storybook/test-runner@0.16.0(@types/node@18.19.31): + /@storybook/test-runner@0.16.0(@types/node@20.11.17): resolution: {integrity: sha512-LDmNbKFoEDW/VS9o6KR8e1r5MnbCc5ZojUfi5yqLdq80gFD7BvilgKgV0lUh/xWHryzoy+Ids5LYgrPJZmU2dQ==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -8955,7 +8955,7 @@ packages: commander: 9.5.0 expect-playwright: 0.8.0 glob: 10.3.12 - jest: 29.7.0(@types/node@18.19.31) + jest: 29.7.0(@types/node@20.11.17) jest-circus: 29.7.0 jest-environment-node: 29.7.0 jest-junit: 16.0.0 @@ -9413,10 +9413,10 @@ packages: chalk: 3.0.0 css.escape: 1.5.1 dom-accessibility-api: 0.6.3 - jest: 29.7.0(@types/node@18.19.31) + jest: 29.7.0(@types/node@20.11.17) lodash: 4.17.21 redent: 3.0.0 - vitest: 1.1.1(@types/node@18.19.31)(happy-dom@12.10.3) + vitest: 1.1.1(@types/node@20.11.17)(happy-dom@12.10.3) dev: true /@testing-library/react@14.1.2(react-dom@18.2.0)(react@18.2.0): @@ -11044,7 +11044,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.4) magic-string: 0.27.0 react-refresh: 0.14.0 - vite: 5.0.10(@types/node@18.19.31) + vite: 5.0.10(@types/node@20.11.17) transitivePeerDependencies: - supports-color dev: true @@ -14425,7 +14425,7 @@ packages: object-assign: 4.1.1 vary: 1.1.2 - /cosmiconfig-typescript-loader@5.0.0(@types/node@18.19.31)(cosmiconfig@8.3.6)(typescript@5.3.3): + /cosmiconfig-typescript-loader@5.0.0(@types/node@20.11.17)(cosmiconfig@8.3.6)(typescript@5.3.3): resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==} engines: {node: '>=v16'} peerDependencies: @@ -14433,7 +14433,7 @@ packages: cosmiconfig: '>=8.2' typescript: '>=4' dependencies: - '@types/node': 18.19.31 + '@types/node': 20.11.17 cosmiconfig: 8.3.6(typescript@5.3.3) jiti: 1.21.0 typescript: 5.3.3 @@ -14559,7 +14559,7 @@ packages: dependencies: '@babel/runtime': 7.24.4 - /create-jest@29.7.0(@types/node@18.19.31): + /create-jest@29.7.0(@types/node@20.11.17): resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -14568,7 +14568,7 @@ packages: chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@18.19.31) + jest-config: 29.7.0(@types/node@20.11.17) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -20576,7 +20576,7 @@ packages: - typescript - utf-8-validate - /graphql-config@5.0.3(@types/node@18.19.31)(graphql@16.8.1)(typescript@4.9.5): + /graphql-config@5.0.3(@types/node@20.11.17)(graphql@16.8.1)(typescript@4.9.5): resolution: {integrity: sha512-BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ==} engines: {node: '>= 16.0.0'} peerDependencies: @@ -20590,7 +20590,7 @@ packages: '@graphql-tools/json-file-loader': 8.0.1(graphql@16.8.1) '@graphql-tools/load': 8.0.2(graphql@16.8.1) '@graphql-tools/merge': 9.0.3(graphql@16.8.1) - '@graphql-tools/url-loader': 8.0.2(@types/node@18.19.31)(graphql@16.8.1) + '@graphql-tools/url-loader': 8.0.2(@types/node@20.11.17)(graphql@16.8.1) '@graphql-tools/utils': 10.1.2(graphql@16.8.1) cosmiconfig: 8.3.6(typescript@4.9.5) graphql: 16.8.1 @@ -20606,7 +20606,7 @@ packages: - utf-8-validate dev: false - /graphql-config@5.0.3(@types/node@18.19.31)(graphql@16.8.1)(typescript@5.4.4): + /graphql-config@5.0.3(@types/node@20.11.17)(graphql@16.8.1)(typescript@5.4.4): resolution: {integrity: sha512-BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ==} engines: {node: '>= 16.0.0'} peerDependencies: @@ -20620,7 +20620,7 @@ packages: '@graphql-tools/json-file-loader': 8.0.1(graphql@16.8.1) '@graphql-tools/load': 8.0.2(graphql@16.8.1) '@graphql-tools/merge': 9.0.3(graphql@16.8.1) - '@graphql-tools/url-loader': 8.0.2(@types/node@18.19.31)(graphql@16.8.1) + '@graphql-tools/url-loader': 8.0.2(@types/node@20.11.17)(graphql@16.8.1) '@graphql-tools/utils': 10.1.2(graphql@16.8.1) cosmiconfig: 8.3.6(typescript@5.4.4) graphql: 16.8.1 @@ -22480,7 +22480,7 @@ packages: - supports-color dev: true - /jest-cli@29.7.0(@types/node@18.19.31): + /jest-cli@29.7.0(@types/node@20.11.17): resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -22494,10 +22494,10 @@ packages: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@18.19.31) + create-jest: 29.7.0(@types/node@20.11.17) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@18.19.31) + jest-config: 29.7.0(@types/node@20.11.17) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -22548,6 +22548,46 @@ packages: - supports-color dev: true + /jest-config@29.7.0(@types/node@20.11.17): + resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + peerDependencies: + '@types/node': '*' + ts-node: '>=9.0.0' + peerDependenciesMeta: + '@types/node': + optional: true + ts-node: + optional: true + dependencies: + '@babel/core': 7.24.4 + '@jest/test-sequencer': 29.7.0 + '@jest/types': 29.6.3 + '@types/node': 20.11.17 + babel-jest: 29.7.0(@babel/core@7.24.4) + chalk: 4.1.2 + ci-info: 3.9.0 + deepmerge: 4.3.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-circus: 29.7.0 + jest-environment-node: 29.7.0 + jest-get-type: 29.6.3 + jest-regex-util: 29.6.3 + jest-resolve: 29.7.0 + jest-runner: 29.7.0 + jest-util: 29.7.0 + jest-validate: 29.7.0 + micromatch: 4.0.5 + parse-json: 5.2.0 + pretty-format: 29.7.0 + slash: 3.0.0 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - babel-plugin-macros + - supports-color + dev: true + /jest-diff@29.7.0: resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -22686,7 +22726,7 @@ packages: jest-runner: ^29.3.1 dependencies: expect-playwright: 0.8.0 - jest: 29.7.0(@types/node@18.19.31) + jest: 29.7.0(@types/node@20.11.17) jest-circus: 29.7.0 jest-environment-node: 29.7.0 jest-process-manager: 0.4.0 @@ -22897,7 +22937,7 @@ packages: dependencies: ansi-escapes: 6.2.1 chalk: 5.3.0 - jest: 29.7.0(@types/node@18.19.31) + jest: 29.7.0(@types/node@20.11.17) jest-regex-util: 29.6.3 jest-watcher: 29.7.0 slash: 5.1.0 @@ -22945,7 +22985,7 @@ packages: supports-color: 8.1.1 dev: true - /jest@29.7.0(@types/node@18.19.31): + /jest@29.7.0(@types/node@20.11.17): resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -22958,7 +22998,7 @@ packages: '@jest/core': 29.7.0 '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@18.19.31) + jest-cli: 29.7.0(@types/node@20.11.17) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -24285,7 +24325,7 @@ packages: dependencies: '@types/node': 18.0.0 - /meros@1.3.0(@types/node@18.19.31): + /meros@1.3.0(@types/node@20.11.17): resolution: {integrity: sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==} engines: {node: '>=13'} peerDependencies: @@ -24294,7 +24334,7 @@ packages: '@types/node': optional: true dependencies: - '@types/node': 18.19.31 + '@types/node': 20.11.17 dev: false /methods@1.1.2: @@ -25009,7 +25049,7 @@ packages: resolution: {integrity: sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==} dev: false - /netlify-cli@17.21.1(@types/node@18.19.31): + /netlify-cli@17.21.1(@types/node@20.11.17): resolution: {integrity: sha512-B8QveV55h2dFCTnk5LInVW1MiXPINTQ61IkEtih15CVYpvVSQy+he8M6hdpucq83VqaF/phaJkb3Si2ligOxxw==} engines: {node: '>=18.14.0'} hasBin: true @@ -25018,7 +25058,7 @@ packages: '@bugsnag/js': 7.20.2 '@fastify/static': 6.10.2 '@netlify/blobs': 7.0.1 - '@netlify/build': 29.36.6(@opentelemetry/api@1.8.0)(@types/node@18.19.31) + '@netlify/build': 29.36.6(@opentelemetry/api@1.8.0)(@types/node@20.11.17) '@netlify/build-info': 7.13.2 '@netlify/config': 20.12.1 '@netlify/edge-bundler': 11.3.0 @@ -27374,19 +27414,11 @@ packages: hasBin: true dev: true - /prettier@3.1.1: - resolution: {integrity: sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==} - engines: {node: '>=14'} - hasBin: true - dev: true - /prettier@3.2.5: resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} engines: {node: '>=14'} hasBin: true requiresBuild: true - dev: false - optional: true /pretty-bytes@5.6.0: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} @@ -31507,7 +31539,7 @@ packages: resolution: {integrity: sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==} dev: true - /ts-node@10.9.2(@types/node@18.19.31)(typescript@5.4.4): + /ts-node@10.9.2(@types/node@20.11.17)(typescript@5.4.4): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -31526,7 +31558,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 18.19.31 + '@types/node': 20.11.17 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 @@ -32619,7 +32651,7 @@ packages: - terser dev: true - /vite-node@1.1.1(@types/node@18.19.31): + /vite-node@1.1.1(@types/node@20.11.17): resolution: {integrity: sha512-2bGE5w4jvym5v8llF6Gu1oBrmImoNSs4WmRVcavnG2me6+8UQntTqLiAMFyiAobp+ZXhj5ZFhI7SmLiFr/jrow==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -32628,7 +32660,7 @@ packages: debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.2.8(@types/node@18.19.31) + vite: 5.2.8(@types/node@20.11.17) transitivePeerDependencies: - '@types/node' - less @@ -32691,7 +32723,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.0.10(@types/node@18.19.31): + /vite@5.0.10(@types/node@20.11.17): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -32719,7 +32751,7 @@ packages: terser: optional: true dependencies: - '@types/node': 18.19.31 + '@types/node': 20.11.17 esbuild: 0.19.12 postcss: 8.4.32 rollup: 4.14.1 @@ -32797,6 +32829,7 @@ packages: rollup: 4.14.1 optionalDependencies: fsevents: 2.3.3 + optional: true /vite@5.2.8(@types/node@20.11.17): resolution: {integrity: sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==} @@ -33026,7 +33059,7 @@ packages: - terser dev: true - /vitest@1.1.1(@types/node@18.19.31): + /vitest@1.1.1(@types/node@20.11.17): resolution: {integrity: sha512-Ry2qs4UOu/KjpXVfOCfQkTnwSXYGrqTbBZxw6reIYEFjSy1QUARRg5pxiI5BEXy+kBVntxUYNMlq4Co+2vD3fQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -33051,7 +33084,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 18.19.31 + '@types/node': 20.11.17 '@vitest/expect': 1.1.1 '@vitest/runner': 1.1.1 '@vitest/snapshot': 1.1.1 @@ -33070,8 +33103,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.6.0 tinypool: 0.8.3 - vite: 5.2.8(@types/node@18.19.31) - vite-node: 1.1.1(@types/node@18.19.31) + vite: 5.2.8(@types/node@20.11.17) + vite-node: 1.1.1(@types/node@20.11.17) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -33083,7 +33116,7 @@ packages: - terser dev: true - /vitest@1.1.1(@types/node@18.19.31)(happy-dom@12.10.3): + /vitest@1.1.1(@types/node@20.11.17)(happy-dom@12.10.3): resolution: {integrity: sha512-Ry2qs4UOu/KjpXVfOCfQkTnwSXYGrqTbBZxw6reIYEFjSy1QUARRg5pxiI5BEXy+kBVntxUYNMlq4Co+2vD3fQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -33108,7 +33141,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 18.19.31 + '@types/node': 20.11.17 '@vitest/expect': 1.1.1 '@vitest/runner': 1.1.1 '@vitest/snapshot': 1.1.1 @@ -33128,8 +33161,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.6.0 tinypool: 0.8.3 - vite: 5.2.8(@types/node@18.19.31) - vite-node: 1.1.1(@types/node@18.19.31) + vite: 5.2.8(@types/node@20.11.17) + vite-node: 1.1.1(@types/node@20.11.17) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 6dbfa2e0cfbe1ff870efb5c53b765d58165b694d Mon Sep 17 00:00:00 2001 From: Alex Tkachev Date: Wed, 8 May 2024 15:51:48 +0400 Subject: [PATCH 08/20] chore: fix formatting --- packages/schema/src/schema.graphql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql index d3da5ed9d..e2034acb5 100644 --- a/packages/schema/src/schema.graphql +++ b/packages/schema/src/schema.graphql @@ -199,7 +199,7 @@ type Hero { } union PageContent @resolveEditorBlockType = - BlockMarkup + | BlockMarkup | BlockMedia | BlockForm | BlockImageTeasers From 9cd0d855187fde7f700d340c46781559411f15d4 Mon Sep 17 00:00:00 2001 From: Mattia Simonato Date: Wed, 8 May 2024 16:27:23 +0200 Subject: [PATCH 09/20] fix(SLB-358): webform-address class now has consistent vertical spacing --- packages/ui/src/iframe.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/ui/src/iframe.css b/packages/ui/src/iframe.css index 36a13ad02..6c9528261 100644 --- a/packages/ui/src/iframe.css +++ b/packages/ui/src/iframe.css @@ -40,6 +40,10 @@ h1 { @apply mb-5; } +.webform-address { + @apply flex flex-col gap-y-4 md:gap-y-6; +} + /* Label */ .form-item label { @apply block mb-2 text-sm; From b6109bccce55763c1997c6cec89481f28143359f Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Fri, 3 May 2024 07:24:05 +0200 Subject: [PATCH 10/20] chore: fix gitpod configuration --- .gitpod.Dockerfile | 5 ----- .gitpod.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 913f8189c..7061f94f0 100644 --- a/.gitpod.Dockerfile +++ b/.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 - diff --git a/.gitpod.yml b/.gitpod.yml index b8f8aab49..ccd012215 100644 --- a/.gitpod.yml +++ b/.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 From 50345483dffd2b6281c2d363eecafe59d6a87945 Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Fri, 3 May 2024 07:24:31 +0200 Subject: [PATCH 11/20] style: typography refactoring --- .../Organisms/PageContent/BlockMarkup.tsx | 8 +-- packages/ui/src/tailwind.config.cjs | 64 ++++++++++++++++++- 2 files changed, 64 insertions(+), 8 deletions(-) diff --git a/packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx b/packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx index a83f81b79..f0f3c82a5 100644 --- a/packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx +++ b/packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx @@ -17,11 +17,7 @@ export function BlockMarkup(props: BlockMarkupFragment) {
{unordered ? ( - + ) : null} {children} diff --git a/packages/ui/src/tailwind.config.cjs b/packages/ui/src/tailwind.config.cjs index bbdaea5bf..c2bf31165 100644 --- a/packages/ui/src/tailwind.config.cjs +++ b/packages/ui/src/tailwind.config.cjs @@ -1,9 +1,69 @@ /** @type {import('tailwindcss').Config} */ -const theme = require('./stylingAssets.json'); +const stylingAssets = require('./stylingAssets.json'); module.exports = { content: ['./src/**/*.{tsx, mdx}'], - ...theme, + theme: { + "extend": { + "typography": ({theme}) => ({ + "DEFAULT": { + css: [ + { + 'a, p a': { + }, + 'ul, ol': { + fontSize: '1.125rem', + lineHeight: '1.688rem' + }, + ol: { + }, + 'ul>li::marker, ol>li::marker': { + }, + strong: { + color: theme('colors.gray.900'), + fontWeight: '700', + }, + '.prose p': { + color: theme('colors.gray.500'), + fontSize: '1.125rem', + lineHeight: '1.688rem' + }, + '.prose a, .prose p a': { + color: theme('colors.blue.600'), + }, + '.prose em': { + color: theme('colors.gray.900'), + }, + 'prose marker': { + fontWeight: '700', + }, + 'blockquote': { + }, + '.prose blockquote p': { + fontWeight: '700', + color: '#111928' + }, + cite: { + }, + 'h1, h2, h3, h4, h5, h6': { + }, + '.prose h1': { + }, + '.prose h2': { + fontWeight: '700', + color: theme('colors.gray.900'), + }, + '.prose h3': { + }, + '.prose h4': { + } + }, + ] + } + }), + }, + ...stylingAssets.theme, + }, plugins: [ require('@tailwindcss/forms'), require('@tailwindcss/aspect-ratio'), From 811e4ccf4d52b1abd7b8b55c66075cc1e5045072 Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Fri, 3 May 2024 07:33:54 +0200 Subject: [PATCH 12/20] chore: prettier --- packages/ui/src/tailwind.config.cjs | 43 ++++++++++++----------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/packages/ui/src/tailwind.config.cjs b/packages/ui/src/tailwind.config.cjs index c2bf31165..031674664 100644 --- a/packages/ui/src/tailwind.config.cjs +++ b/packages/ui/src/tailwind.config.cjs @@ -4,21 +4,18 @@ const stylingAssets = require('./stylingAssets.json'); module.exports = { content: ['./src/**/*.{tsx, mdx}'], theme: { - "extend": { - "typography": ({theme}) => ({ - "DEFAULT": { + extend: { + typography: ({ theme }) => ({ + DEFAULT: { css: [ { - 'a, p a': { - }, + 'a, p a': {}, 'ul, ol': { fontSize: '1.125rem', - lineHeight: '1.688rem' - }, - ol: { - }, - 'ul>li::marker, ol>li::marker': { + lineHeight: '1.688rem', }, + ol: {}, + 'ul>li::marker, ol>li::marker': {}, strong: { color: theme('colors.gray.900'), fontWeight: '700', @@ -26,7 +23,7 @@ module.exports = { '.prose p': { color: theme('colors.gray.500'), fontSize: '1.125rem', - lineHeight: '1.688rem' + lineHeight: '1.688rem', }, '.prose a, .prose p a': { color: theme('colors.blue.600'), @@ -37,29 +34,23 @@ module.exports = { 'prose marker': { fontWeight: '700', }, - 'blockquote': { - }, + blockquote: {}, '.prose blockquote p': { fontWeight: '700', - color: '#111928' - }, - cite: { - }, - 'h1, h2, h3, h4, h5, h6': { - }, - '.prose h1': { + color: '#111928', }, + cite: {}, + 'h1, h2, h3, h4, h5, h6': {}, + '.prose h1': {}, '.prose h2': { fontWeight: '700', color: theme('colors.gray.900'), }, - '.prose h3': { - }, - '.prose h4': { - } + '.prose h3': {}, + '.prose h4': {}, }, - ] - } + ], + }, }), }, ...stylingAssets.theme, From e4d8eea7ccff3e9f63aeda3dea6b4c4d0e20aa20 Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Fri, 3 May 2024 07:49:07 +0200 Subject: [PATCH 13/20] style: typography weight on p a --- packages/ui/src/tailwind.config.cjs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ui/src/tailwind.config.cjs b/packages/ui/src/tailwind.config.cjs index 031674664..c6f9477ec 100644 --- a/packages/ui/src/tailwind.config.cjs +++ b/packages/ui/src/tailwind.config.cjs @@ -27,6 +27,7 @@ module.exports = { }, '.prose a, .prose p a': { color: theme('colors.blue.600'), + fontWeight: '400', }, '.prose em': { color: theme('colors.gray.900'), From 1f8b9a6e78d0fef2f92c5e36d6b2d71cf3e9d0de Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Fri, 3 May 2024 20:25:08 +0200 Subject: [PATCH 14/20] style: adjustments --- .../ui/src/components/Organisms/PageContent/BlockMarkup.tsx | 3 ++- packages/ui/src/tailwind.config.cjs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx b/packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx index f0f3c82a5..1b4f20d0c 100644 --- a/packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx +++ b/packages/ui/src/components/Organisms/PageContent/BlockMarkup.tsx @@ -17,7 +17,8 @@ export function BlockMarkup(props: BlockMarkupFragment) {
li::marker, ol>li::marker': {}, strong: { color: theme('colors.gray.900'), From 9c12ddda489dc0f2229111094fb161a4eea30c18 Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Fri, 3 May 2024 20:54:07 +0200 Subject: [PATCH 15/20] chore: prettier --- packages/ui/src/tailwind.config.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/src/tailwind.config.cjs b/packages/ui/src/tailwind.config.cjs index 2bdeee963..e66fff3a7 100644 --- a/packages/ui/src/tailwind.config.cjs +++ b/packages/ui/src/tailwind.config.cjs @@ -13,7 +13,7 @@ module.exports = { 'ul, ol': { fontSize: '1.125rem', lineHeight: '1.688rem', - paddingLeft: '2.5rem' + paddingLeft: '2.5rem', }, 'ul>li::marker, ol>li::marker': {}, strong: { From 7f2883a033beff5fa37422ab2dc30520f8cbd383 Mon Sep 17 00:00:00 2001 From: Alex Tkachev Date: Thu, 9 May 2024 12:44:21 +0400 Subject: [PATCH 16/20] chore: simplify prettier commands .gitignore and .prettierignore are taken into account by default. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9d06dcc45..29e537f47 100644 --- a/package.json +++ b/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 '**/*.{js,cjs,mjs,ts,jsx,tsx,gql,graphql,graphqls,md,mdx,json,htm,html}'", + "test:format:workspaces": "pnpm --workspace-concurrency=1 -r exec prettier '**/*.{js,cjs,mjs,ts,jsx,tsx,gql,graphql,graphqls,md,mdx,json,htm,html}'", "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", From d8af03a0a84f84ff5807fc1a22ea6c607592e573 Mon Sep 17 00:00:00 2001 From: Alex Tkachev Date: Thu, 9 May 2024 13:00:28 +0400 Subject: [PATCH 17/20] chore: simplify prettier config even more prettify all the things --- .idea/prettier.xml | 2 +- .prettierignore | 1 + apps/cms/.prettierignore | 2 ++ package.json | 4 ++-- packages/drupal/test_content/.prettierignore | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 apps/cms/.prettierignore create mode 100644 packages/drupal/test_content/.prettierignore diff --git a/.idea/prettier.xml b/.idea/prettier.xml index 6e16fd106..50edf175d 100644 --- a/.idea/prettier.xml +++ b/.idea/prettier.xml @@ -3,6 +3,6 @@ \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index 6ad8630f6..95e9082a1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,3 +3,4 @@ apps packages tests .turbo +pnpm-lock.yaml diff --git a/apps/cms/.prettierignore b/apps/cms/.prettierignore new file mode 100644 index 000000000..d851b213c --- /dev/null +++ b/apps/cms/.prettierignore @@ -0,0 +1,2 @@ +config/sync +composer.lock diff --git a/package.json b/package.json index 29e537f47..c86941856 100644 --- a/package.json +++ b/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}'", - "test:format:workspaces": "pnpm --workspace-concurrency=1 -r exec prettier '**/*.{js,cjs,mjs,ts,jsx,tsx,gql,graphql,graphqls,md,mdx,json,htm,html}'", + "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", diff --git a/packages/drupal/test_content/.prettierignore b/packages/drupal/test_content/.prettierignore new file mode 100644 index 000000000..dd0f08c94 --- /dev/null +++ b/packages/drupal/test_content/.prettierignore @@ -0,0 +1,2 @@ +content +webforms From 16d076e79b436284d103f6690eb32e4401451c74 Mon Sep 17 00:00:00 2001 From: Alex Tkachev Date: Thu, 9 May 2024 13:00:49 +0400 Subject: [PATCH 18/20] chore: prettier --- .github/workflows/deploy.yml | 19 ++++-- .github/workflows/high_content_volume.yml | 8 ++- .github/workflows/merge_dev_to_stage.yml | 2 +- .github/workflows/test.yml | 12 +++- .../workflows/test_without_turbo_cache.yml | 4 +- apps/cms/scaffold/all.services.yml | 8 +-- .../netlify/functions/github-proxy.mts | 7 ++- docker-compose.yml | 11 ++-- packages/drupal/gutenberg_blocks/css/edit.css | 6 +- .../gutenberg_blocks.gutenberg.yml | 2 +- .../gutenberg_blocks.info.yml | 2 +- .../gutenberg_blocks.libraries.yml | 1 - .../ui/src/components/Atoms/Container.css | 5 +- packages/ui/src/iframe.css | 60 ++++++++++--------- pnpm-workspace.yaml | 8 +-- 15 files changed, 90 insertions(+), 65 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9e9897278..83587e7ac 100644 --- a/.github/workflows/deploy.yml +++ b/.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,7 +58,10 @@ 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 }} @@ -62,8 +69,10 @@ jobs: - 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 }} - diff --git a/.github/workflows/high_content_volume.yml b/.github/workflows/high_content_volume.yml index 02edab017..88bbda211 100644 --- a/.github/workflows/high_content_volume.yml +++ b/.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 diff --git a/.github/workflows/merge_dev_to_stage.yml b/.github/workflows/merge_dev_to_stage.yml index 49741615b..55ca2f714 100644 --- a/.github/workflows/merge_dev_to_stage.yml +++ b/.github/workflows/merge_dev_to_stage.yml @@ -18,4 +18,4 @@ jobs: with: type: now target_branch: stage - github_token: ${{ github.token }} \ No newline at end of file + github_token: ${{ github.token }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d9e6ac435..2d403a404 100644 --- a/.github/workflows/test.yml +++ b/.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 @@ -77,7 +79,9 @@ jobs: - name: Merge release to prod (silverback-template only) uses: devmasx/merge-branch@1.4.0 - 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 +90,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 diff --git a/.github/workflows/test_without_turbo_cache.yml b/.github/workflows/test_without_turbo_cache.yml index c247a595e..757b757c0 100644 --- a/.github/workflows/test_without_turbo_cache.yml +++ b/.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 diff --git a/apps/cms/scaffold/all.services.yml b/apps/cms/scaffold/all.services.yml index d1e0a45c9..6eb08a2b2 100644 --- a/apps/cms/scaffold/all.services.yml +++ b/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'. diff --git a/apps/website/netlify/functions/github-proxy.mts b/apps/website/netlify/functions/github-proxy.mts index f7a7e2008..d47302636 100644 --- a/apps/website/netlify/functions/github-proxy.mts +++ b/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', + ); } - diff --git a/docker-compose.yml b/docker-compose.yml index c5ad2e374..663f65444 100644 --- a/docker-compose.yml +++ b/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 diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css index 39ab66473..8e8d0594e 100644 --- a/packages/drupal/gutenberg_blocks/css/edit.css +++ b/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); -} \ No newline at end of file +} diff --git a/packages/drupal/gutenberg_blocks/gutenberg_blocks.gutenberg.yml b/packages/drupal/gutenberg_blocks/gutenberg_blocks.gutenberg.yml index 8ed456c02..42c51a1e5 100644 --- a/packages/drupal/gutenberg_blocks/gutenberg_blocks.gutenberg.yml +++ b/packages/drupal/gutenberg_blocks/gutenberg_blocks.gutenberg.yml @@ -3,4 +3,4 @@ theme-support: typography: dropCap: false libraries-edit: - - gutenberg_blocks/edit \ No newline at end of file + - gutenberg_blocks/edit diff --git a/packages/drupal/gutenberg_blocks/gutenberg_blocks.info.yml b/packages/drupal/gutenberg_blocks/gutenberg_blocks.info.yml index 039c68d3e..193f1a006 100644 --- a/packages/drupal/gutenberg_blocks/gutenberg_blocks.info.yml +++ b/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 \ No newline at end of file + - silverback_gutenberg:silverback_gutenberg diff --git a/packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml b/packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml index 89370de15..87a7ad6d9 100644 --- a/packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml +++ b/packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml @@ -13,4 +13,3 @@ customisations: /gutenberg.css: { preprocess: false } dependencies: - core/drupalSettings - diff --git a/packages/ui/src/components/Atoms/Container.css b/packages/ui/src/components/Atoms/Container.css index 8985bc6dc..5bd018f50 100644 --- a/packages/ui/src/components/Atoms/Container.css +++ b/packages/ui/src/components/Atoms/Container.css @@ -27,7 +27,7 @@ } .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, @@ -35,6 +35,7 @@ @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; } diff --git a/packages/ui/src/iframe.css b/packages/ui/src/iframe.css index 6c9528261..302b70921 100644 --- a/packages/ui/src/iframe.css +++ b/packages/ui/src/iframe.css @@ -12,7 +12,8 @@ h1 { @apply sr-only; } -.visually-hidden.focusable:active, .visually-hidden.focusable:focus { +.visually-hidden.focusable:active, +.visually-hidden.focusable:focus { @apply not-sr-only ml-1; } @@ -35,7 +36,6 @@ h1 { @apply mb-4 md:mb-6; } - .fieldset-wrapper > *:not(:last-child) { @apply mb-5; } @@ -49,11 +49,13 @@ h1 { @apply block mb-2 text-sm; } -.form-item input[type="checkbox"] + label, .form-item input[type="radio"] + label { +.form-item input[type='checkbox'] + label, +.form-item input[type='radio'] + label { @apply inline; } -.form-item input[type="checkbox"], .form-item input[type="radio"] { +.form-item input[type='checkbox'], +.form-item input[type='radio'] { @apply mr-1; } @@ -66,52 +68,54 @@ h1 { @apply mt-2; } -.form-item input[type="checkbox"] + label + .description, -.form-item input[type="radio"] + label + .description { +.form-item input[type='checkbox'] + label + .description, +.form-item input[type='radio'] + label + .description { @apply mt-0; } - /* field */ -.form-item input[type="email"], -.form-item input[type="password"], -.form-item input[type="date"], -.form-item input[type="text"], -.form-item input[type="number"], -.form-item input[type="datetime-local"], -.form-item input[type="time"], -.form-item input[type="url"], -.form-item input[type="tel"], -.form-item input[type="search"], -.form-item input[type="color"], +.form-item input[type='email'], +.form-item input[type='password'], +.form-item input[type='date'], +.form-item input[type='text'], +.form-item input[type='number'], +.form-item input[type='datetime-local'], +.form-item input[type='time'], +.form-item input[type='url'], +.form-item input[type='tel'], +.form-item input[type='search'], +.form-item input[type='color'], .form-item textarea, .form-item select { @apply bg-gray-50 border border-gray-300 text-base rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5; } /* checkbox */ -.form-item input[type="checkbox"] { +.form-item input[type='checkbox'] { @apply rounded -mt-1; } -.form-item input[type="checkbox"]:not(:checked), .form-item input[type="radio"]:not(:checked) { +.form-item input[type='checkbox']:not(:checked), +.form-item input[type='radio']:not(:checked) { @apply bg-gray-50 border-gray-300; } -.form-item input[type="file"] { +.form-item input[type='file'] { @apply block cursor-pointer bg-gray-50 border border-gray-300 rounded-lg block text-sm w-full; } -.form-item input[type="file"]::file-selector-button { +.form-item input[type='file']::file-selector-button { @apply text-white bg-blue-700 hover:bg-blue-800 rounded-l-lg text-sm w-full sm:w-auto px-6 py-2.5 text-center shadow-none border-0 font-medium mr-4; } - -.form-actions input[type="submit"] { +.form-actions input[type='submit'] { @apply text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto px-5 py-2.5 text-center; } -.form-item input.error, .form-item textarea.error, .form-item select.error, .form-item input[type="checkbox"].error { +.form-item input.error, +.form-item textarea.error, +.form-item select.error, +.form-item input[type='checkbox'].error { @apply border-red-500; } @@ -119,12 +123,11 @@ h1 { @apply content-['*'] text-gray-900 pl-1; } - .fieldset-legend { @apply font-bold mb-2 block; } -[data-drupal-messages] [role="alert"] { +[data-drupal-messages] [role='alert'] { @apply text-red-500; } @@ -162,7 +165,8 @@ h1 { @apply right-5; } -.ui-dialog .ui-button .ui-icon-closethick, .ui-dialog .ui-button:hover .ui-icon-closethick { +.ui-dialog .ui-button .ui-icon-closethick, +.ui-dialog .ui-button:hover .ui-icon-closethick { background-image: url("data:image/svg+xml;utf8,"); @apply bg-no-repeat bg-center h-10 w-10 -left-0.5 -top-0.5 rounded-lg; } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 75af705aa..1069ced0c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,5 +1,5 @@ packages: - - "apps/*" - - "packages/*" - - "packages/drupal/*" - - "tests/*" + - 'apps/*' + - 'packages/*' + - 'packages/drupal/*' + - 'tests/*' From b3fee436c3477cc273fb18abe0bc24b894f78c5b Mon Sep 17 00:00:00 2001 From: Alex Tkachev Date: Thu, 9 May 2024 13:02:42 +0400 Subject: [PATCH 19/20] chore: make format check more obvious --- .github/actions/setup/action.yml | 4 ---- .github/workflows/test.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 06cfe2bac..bd2280348 100644 --- a/.github/actions/setup/action.yml +++ b/.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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d403a404..9c1f520d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,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: From eb666ac65f9247959e157c11ab2ebd97490e1030 Mon Sep 17 00:00:00 2001 From: Luqmaan Essop Date: Thu, 2 May 2024 16:20:00 +0200 Subject: [PATCH 20/20] refactor: refactor parent menu item to be clickable --- packages/ui/src/components/Organisms/Header.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/packages/ui/src/components/Organisms/Header.tsx b/packages/ui/src/components/Organisms/Header.tsx index dacd4f058..d8d05907b 100644 --- a/packages/ui/src/components/Organisms/Header.tsx +++ b/packages/ui/src/components/Organisms/Header.tsx @@ -76,6 +76,13 @@ export function Header() { ) : ( + + {item.title} + {item.children.map((child) => child.children.length === 0 ? ( + + {item.title} + {item.children.map((child) => child.children.length === 0 ? (