diff --git a/.gitignore b/.gitignore index 941d019b2..fea3638a9 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,9 @@ Thumbs.db .history #rss.xml file -rss.xml \ No newline at end of file +rss.xml + +.nx/cache + +# Next.js +.next diff --git a/apps/consulting/.eslintrc.json b/apps/consulting/.eslintrc.json index d3895325d..f7ac5b382 100644 --- a/apps/consulting/.eslintrc.json +++ b/apps/consulting/.eslintrc.json @@ -5,7 +5,7 @@ "next", "next/core-web-vitals" ], - "ignorePatterns": ["!**/*"], + "ignorePatterns": ["!**/*", ".next/**/*", "jest.config.ts"], "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], diff --git a/apps/consulting/components/BlogArticle/BlogHeader/BlogHeaderLink.tsx b/apps/consulting/components/BlogArticle/BlogHeader/BlogHeaderLink.tsx index 9ba28c201..9459ac71d 100644 --- a/apps/consulting/components/BlogArticle/BlogHeader/BlogHeaderLink.tsx +++ b/apps/consulting/components/BlogArticle/BlogHeader/BlogHeaderLink.tsx @@ -7,18 +7,20 @@ import { Picture } from '@quansight/shared/ui-components'; import HeaderLinkIcon from './assets/headerLinkIcon.svg'; export const BlogHeaderLink: FC = () => ( - - - - - Back to library - - - + ( + + + + Back to library + + + ) ); diff --git a/apps/consulting/components/Board/BoardItem.tsx b/apps/consulting/components/Board/BoardItem.tsx index 55a50a7b5..0a4042619 100644 --- a/apps/consulting/components/Board/BoardItem.tsx +++ b/apps/consulting/components/Board/BoardItem.tsx @@ -22,31 +22,31 @@ const BoardItem: FC = ({ )} > - -
- -
-
- {title} -
-
- {linkTitle} - -
- + +
+ +
+
+ {title} +
+
+ {linkTitle} + +
+ ); diff --git a/apps/consulting/components/LibraryLink/LibraryLink.tsx b/apps/consulting/components/LibraryLink/LibraryLink.tsx index 9152296ad..35c618163 100644 --- a/apps/consulting/components/LibraryLink/LibraryLink.tsx +++ b/apps/consulting/components/LibraryLink/LibraryLink.tsx @@ -12,8 +12,8 @@ export const LibraryLink: FC = ({ }) => { if (link.linkType === LinkTarget.Internal) { return ( - - {children} + + {children} ); } diff --git a/apps/consulting/components/Related/RelatedItem.tsx b/apps/consulting/components/Related/RelatedItem.tsx index 3e4bd4f30..ed69c1878 100644 --- a/apps/consulting/components/Related/RelatedItem.tsx +++ b/apps/consulting/components/Related/RelatedItem.tsx @@ -13,23 +13,25 @@ export const RelatedItem: FC = ({ linkUrl, }) => (
  • - - - -

    - {title} -

    -     + + + +

    + {title} +

    +
    • ); diff --git a/apps/consulting/jest.config.js b/apps/consulting/jest.config.ts similarity index 89% rename from apps/consulting/jest.config.js rename to apps/consulting/jest.config.ts index 41b570602..acf9d786b 100644 --- a/apps/consulting/jest.config.js +++ b/apps/consulting/jest.config.ts @@ -1,4 +1,5 @@ -module.exports = { +/* eslint-disable */ +export default { displayName: 'consulting', preset: '../../jest.preset.js', transform: { @@ -7,4 +8,4 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/apps/consulting', -} +}; diff --git a/apps/consulting/next.config.js b/apps/consulting/next.config.js index 3593f13f3..a9a853856 100644 --- a/apps/consulting/next.config.js +++ b/apps/consulting/next.config.js @@ -5,11 +5,6 @@ const withNx = require('@nrwl/next/plugins/with-nx'); * @type {import('@nrwl/next/plugins/with-nx').WithNxOptions} **/ const nextConfig = { - experimental: { - images: { - allowFutureImage: true, - }, - }, async redirects() { return [ { diff --git a/apps/consulting/pages/nebari-services.tsx b/apps/consulting/pages/nebari-services.tsx index a7ffc8cc4..7a1e0a87c 100644 --- a/apps/consulting/pages/nebari-services.tsx +++ b/apps/consulting/pages/nebari-services.tsx @@ -2,7 +2,7 @@ import React, { FC } from 'react'; import { Swiper, SwiperSlide } from 'swiper/react'; import { GetStaticProps } from 'next'; -import Image from 'next/future/image'; +import Image from 'next/image'; import Link from 'next/link'; import { A11y, Keyboard, Navigation } from 'swiper'; @@ -92,22 +92,21 @@ export const NebariServicesPage: FC = ({

    Deployment, support, and training.

    - - - prefillContactFormMessage( - "Hi, I'm interested in learning more about your Nebari Services options and would like to schedule a call. Thanks!", - ) - } - > - Book a Call - - + + prefillContactFormMessage( + "Hi, I'm interested in learning more about your Nebari Services options and would like to schedule a call. Thanks!", + ) + } + > + Book a Call + @@ -149,22 +148,21 @@ export const NebariServicesPage: FC = ({

    {/* eslint-enable jsx-a11y/media-has-caption */} - - - prefillContactFormMessage( - 'Hi, please send me a login to a demo instance of Nebari so I can check it out. Thanks!', - ) - } - > - Try Nebari - - + + prefillContactFormMessage( + 'Hi, please send me a login to a demo instance of Nebari so I can check it out. Thanks!', + ) + } + > + Try Nebari +

    Drop us a line and we’ll send you a login. @@ -206,22 +204,21 @@ export const NebariServicesPage: FC = ({ Nebari for various client projects.

    - - - prefillContactFormMessage( - "Hi, I'm interested in learning more about your Nebari Services options and would like to schedule a call. Thanks!", - ) - } - > - Book a Call - - + + prefillContactFormMessage( + "Hi, I'm interested in learning more about your Nebari Services options and would like to schedule a call. Thanks!", + ) + } + > + Book a Call +
    @@ -343,22 +340,21 @@ export const NebariServicesPage: FC = ({ or a more customized solution? - - - prefillContactFormMessage( - "Hi, I'm interested in learning more about your Nebari Services options and would like to schedule a call. Thanks!", - ) - } - > - Book a Call - - + + prefillContactFormMessage( + "Hi, I'm interested in learning more about your Nebari Services options and would like to schedule a call. Thanks!", + ) + } + > + Book a Call +
    - - - prefillContactFormMessage( - "Hi, I'm interested in learning more about your Nebari Services options and would like to schedule a call. Thanks!", - ) - } - > - Book a Call - - + + prefillContactFormMessage( + "Hi, I'm interested in learning more about your Nebari Services options and would like to schedule a call. Thanks!", + ) + } + > + Book a Call + diff --git a/apps/consulting/project.json b/apps/consulting/project.json index f7223cb6e..2a0b67967 100644 --- a/apps/consulting/project.json +++ b/apps/consulting/project.json @@ -1,5 +1,6 @@ { - "root": "apps/consulting", + "name": "consulting", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/consulting", "projectType": "application", "targets": { @@ -12,7 +13,10 @@ "outputPath": "dist/apps/consulting" }, "configurations": { - "production": {} + "production": {}, + "development": { + "outputPath": "apps/consulting" + } } }, "serve": { @@ -27,8 +31,13 @@ "production": { "buildTarget": "consulting:build:production", "dev": false + }, + "development": { + "buildTarget": "consulting:build:development", + "dev": true } - } + }, + "defaultConfiguration": "development" }, "export": { "executor": "@nrwl/next:export", @@ -38,9 +47,9 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/apps/consulting"], + "outputs": ["{workspaceRoot}/coverage/apps/consulting"], "options": { - "jestConfig": "apps/consulting/jest.config.js", + "jestConfig": "apps/consulting/jest.config.ts", "passWithNoTests": true } }, diff --git a/apps/consulting/tsconfig.json b/apps/consulting/tsconfig.json index 7f521fe09..d01532f39 100644 --- a/apps/consulting/tsconfig.json +++ b/apps/consulting/tsconfig.json @@ -14,5 +14,5 @@ "incremental": true }, "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "next-env.d.ts"], - "exclude": ["node_modules"] + "exclude": ["node_modules", "jest.config.ts"] } diff --git a/apps/labs/.eslintrc.json b/apps/labs/.eslintrc.json index 69b522ce5..e0df1baec 100644 --- a/apps/labs/.eslintrc.json +++ b/apps/labs/.eslintrc.json @@ -6,7 +6,7 @@ "next", "next/core-web-vitals" ], - "ignorePatterns": ["!**/*"], + "ignorePatterns": ["!**/*", ".next/**/*", "jest.config.ts"], "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], diff --git a/apps/labs/components/LinkWithArrow/LinkWithArrow.tsx b/apps/labs/components/LinkWithArrow/LinkWithArrow.tsx index 869de9e7c..430e726fa 100644 --- a/apps/labs/components/LinkWithArrow/LinkWithArrow.tsx +++ b/apps/labs/components/LinkWithArrow/LinkWithArrow.tsx @@ -3,26 +3,24 @@ import React, { FC } from 'react'; import Image from 'next/image'; import Link, { LinkProps } from 'next/link'; -export type LinkWithArrowProps = LinkProps; +export type LinkWithArrowProps = LinkProps & { children: React.ReactNode }; export const LinkWithArrow: FC = ({ children, ...restProps }) => { return ( - - - - Left arrow - - {children} - + + + Left arrow + + {children} ); }; diff --git a/apps/labs/components/Posts/FeaturedPosts/FeaturedPosts.tsx b/apps/labs/components/Posts/FeaturedPosts/FeaturedPosts.tsx index 195130df3..47fb0fa71 100644 --- a/apps/labs/components/Posts/FeaturedPosts/FeaturedPosts.tsx +++ b/apps/labs/components/Posts/FeaturedPosts/FeaturedPosts.tsx @@ -37,7 +37,7 @@ export const FeaturedPosts: FC = ({ posts }) => {

    - {post.meta.title} + {post.meta.title}

    diff --git a/apps/labs/components/Posts/PostListItem/PostListItem.tsx b/apps/labs/components/Posts/PostListItem/PostListItem.tsx index efc351ed7..55a59890a 100644 --- a/apps/labs/components/Posts/PostListItem/PostListItem.tsx +++ b/apps/labs/components/Posts/PostListItem/PostListItem.tsx @@ -48,7 +48,7 @@ export const PostListItem: FC = ({ post, variant }) => ( )} > - {post.meta.title} + {post.meta.title}

    diff --git a/apps/labs/jest.config.js b/apps/labs/jest.config.ts similarity index 88% rename from apps/labs/jest.config.js rename to apps/labs/jest.config.ts index 6da16d9e4..172ad9288 100644 --- a/apps/labs/jest.config.js +++ b/apps/labs/jest.config.ts @@ -1,4 +1,5 @@ -module.exports = { +/* eslint-disable */ +export default { displayName: 'labs', preset: '../../jest.preset.js', transform: { @@ -7,4 +8,4 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/apps/labs', -} +}; diff --git a/apps/labs/pages/api/annual-report.pdf.ts b/apps/labs/pages/api/annual-report.pdf.ts index f3ea0a7b9..252c563ec 100644 --- a/apps/labs/pages/api/annual-report.pdf.ts +++ b/apps/labs/pages/api/annual-report.pdf.ts @@ -1,7 +1,7 @@ import type { NextRequest } from 'next/server'; export const config = { - runtime: 'experimental-edge', + runtime: 'edge', }; export default async function handler(req: NextRequest) { diff --git a/apps/labs/project.json b/apps/labs/project.json index c43e28741..6f41af84c 100644 --- a/apps/labs/project.json +++ b/apps/labs/project.json @@ -1,5 +1,6 @@ { - "root": "apps/labs", + "name": "labs", + "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/labs", "projectType": "application", "targets": { @@ -12,7 +13,10 @@ "outputPath": "dist/apps/labs" }, "configurations": { - "production": {} + "production": {}, + "development": { + "outputPath": "apps/labs" + } } }, "serve": { @@ -27,8 +31,13 @@ "production": { "buildTarget": "labs:build:production", "dev": false + }, + "development": { + "buildTarget": "labs:build:development", + "dev": true } - } + }, + "defaultConfiguration": "development" }, "export": { "executor": "@nrwl/next:export", @@ -38,9 +47,9 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/apps/labs"], + "outputs": ["{workspaceRoot}/coverage/apps/labs"], "options": { - "jestConfig": "apps/labs/jest.config.js", + "jestConfig": "apps/labs/jest.config.ts", "passWithNoTests": true } }, diff --git a/apps/labs/tsconfig.json b/apps/labs/tsconfig.json index 7f521fe09..d01532f39 100644 --- a/apps/labs/tsconfig.json +++ b/apps/labs/tsconfig.json @@ -14,5 +14,5 @@ "incremental": true }, "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "next-env.d.ts"], - "exclude": ["node_modules"] + "exclude": ["node_modules", "jest.config.ts"] } diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index 71737867a..000000000 --- a/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { getJestProjects } = require('@nrwl/jest') - -module.exports = { - projects: getJestProjects(), -} diff --git a/jest.config.ts b/jest.config.ts new file mode 100644 index 000000000..dafe1653a --- /dev/null +++ b/jest.config.ts @@ -0,0 +1,5 @@ +const { getJestProjects } = require('@nrwl/jest'); + +export default { + projects: getJestProjects(), +}; diff --git a/jest.preset.js b/jest.preset.js index 81c285766..a6d598e18 100644 --- a/jest.preset.js +++ b/jest.preset.js @@ -1,3 +1,5 @@ -const nxPreset = require('@nrwl/jest/preset') +const nxPreset = require('@nrwl/jest/preset').default; -module.exports = { ...nxPreset } +module.exports = { + ...nxPreset, +}; diff --git a/libs/shared/storyblok-sdk/.eslintrc.json b/libs/shared/storyblok-sdk/.eslintrc.json index ac4cf65d3..61a314288 100644 --- a/libs/shared/storyblok-sdk/.eslintrc.json +++ b/libs/shared/storyblok-sdk/.eslintrc.json @@ -1,6 +1,6 @@ { "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], + "ignorePatterns": ["!**/*", "jest.config.ts"], "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], diff --git a/libs/shared/storyblok-sdk/jest.config.js b/libs/shared/storyblok-sdk/jest.config.ts similarity index 65% rename from libs/shared/storyblok-sdk/jest.config.js rename to libs/shared/storyblok-sdk/jest.config.ts index 16348146a..527dbe6db 100644 --- a/libs/shared/storyblok-sdk/jest.config.js +++ b/libs/shared/storyblok-sdk/jest.config.ts @@ -1,9 +1,10 @@ -module.exports = { +/* eslint-disable */ +export default { displayName: 'shared-storyblok-sdk', preset: '../../../jest.preset.js', transform: { - '^.+\\.[tj]sx?$': 'babel-jest', + '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/react/babel'] }], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../../coverage/libs/shared/storyblok-sdk', -} +}; diff --git a/libs/shared/storyblok-sdk/project.json b/libs/shared/storyblok-sdk/project.json index 903fbb8cf..d04ed57c4 100644 --- a/libs/shared/storyblok-sdk/project.json +++ b/libs/shared/storyblok-sdk/project.json @@ -1,5 +1,6 @@ { - "root": "libs/shared/storyblok-sdk", + "name": "shared-storyblok-sdk", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/shared/storyblok-sdk/src", "projectType": "library", "tags": [], @@ -13,9 +14,9 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/libs/shared/storyblok-sdk"], + "outputs": ["{workspaceRoot}/coverage/libs/shared/storyblok-sdk"], "options": { - "jestConfig": "libs/shared/storyblok-sdk/jest.config.js", + "jestConfig": "libs/shared/storyblok-sdk/jest.config.ts", "passWithNoTests": true } } diff --git a/libs/shared/storyblok-sdk/tsconfig.lib.json b/libs/shared/storyblok-sdk/tsconfig.lib.json index 9c1ac43e8..d452f0996 100644 --- a/libs/shared/storyblok-sdk/tsconfig.lib.json +++ b/libs/shared/storyblok-sdk/tsconfig.lib.json @@ -16,7 +16,8 @@ "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", - "**/*.test.jsx" + "**/*.test.jsx", + "jest.config.ts" ], "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] } diff --git a/libs/shared/storyblok-sdk/tsconfig.spec.json b/libs/shared/storyblok-sdk/tsconfig.spec.json index d8716fecf..83cd0e830 100644 --- a/libs/shared/storyblok-sdk/tsconfig.spec.json +++ b/libs/shared/storyblok-sdk/tsconfig.spec.json @@ -14,6 +14,7 @@ "**/*.spec.js", "**/*.test.jsx", "**/*.spec.jsx", - "**/*.d.ts" + "**/*.d.ts", + "jest.config.ts" ] } diff --git a/libs/shared/types/.eslintrc.json b/libs/shared/types/.eslintrc.json index 9b742ee4c..5d3ef0fc3 100644 --- a/libs/shared/types/.eslintrc.json +++ b/libs/shared/types/.eslintrc.json @@ -1,6 +1,6 @@ { "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], + "ignorePatterns": ["!**/*", "jest.config.ts"], "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], diff --git a/libs/shared/types/jest.config.js b/libs/shared/types/jest.config.ts similarity index 54% rename from libs/shared/types/jest.config.js rename to libs/shared/types/jest.config.ts index 9acf7929c..b74dc310c 100644 --- a/libs/shared/types/jest.config.js +++ b/libs/shared/types/jest.config.ts @@ -1,13 +1,15 @@ -module.exports = { +/* eslint-disable */ +export default { displayName: 'shared-types', preset: '../../../jest.preset.js', - globals: { - 'ts-jest': { - tsconfig: '/tsconfig.spec.json', - }, - }, + globals: {}, transform: { - '^.+\\.[tj]sx?$': 'ts-jest', + '^.+\\.[tj]sx?$': [ + 'ts-jest', + { + tsconfig: '/tsconfig.spec.json', + }, + ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../../coverage/libs/shared/types', diff --git a/libs/shared/types/project.json b/libs/shared/types/project.json index 28fa738be..6909c656d 100644 --- a/libs/shared/types/project.json +++ b/libs/shared/types/project.json @@ -1,5 +1,6 @@ { - "root": "libs/shared/types", + "name": "shared-types", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/shared/types/src", "projectType": "library", "tags": [], @@ -13,9 +14,9 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/libs/shared/types"], + "outputs": ["{workspaceRoot}/coverage/libs/shared/types"], "options": { - "jestConfig": "libs/shared/types/jest.config.js", + "jestConfig": "libs/shared/types/jest.config.ts", "passWithNoTests": true } } diff --git a/libs/shared/types/tsconfig.lib.json b/libs/shared/types/tsconfig.lib.json index 8b07f7db0..fce60dd2f 100644 --- a/libs/shared/types/tsconfig.lib.json +++ b/libs/shared/types/tsconfig.lib.json @@ -16,7 +16,8 @@ "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", - "**/*.test.jsx" + "**/*.test.jsx", + "jest.config.ts" ], "include": [ "**/*.js", diff --git a/libs/shared/types/tsconfig.spec.json b/libs/shared/types/tsconfig.spec.json index d8716fecf..83cd0e830 100644 --- a/libs/shared/types/tsconfig.spec.json +++ b/libs/shared/types/tsconfig.spec.json @@ -14,6 +14,7 @@ "**/*.spec.js", "**/*.test.jsx", "**/*.spec.jsx", - "**/*.d.ts" + "**/*.d.ts", + "jest.config.ts" ] } diff --git a/libs/shared/ui-components/.eslintrc.json b/libs/shared/ui-components/.eslintrc.json index 39dc2b320..891bed6f4 100644 --- a/libs/shared/ui-components/.eslintrc.json +++ b/libs/shared/ui-components/.eslintrc.json @@ -1,6 +1,6 @@ { "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], + "ignorePatterns": ["!**/*", "jest.config.ts"], "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], diff --git a/libs/shared/ui-components/jest.config.js b/libs/shared/ui-components/jest.config.ts similarity index 56% rename from libs/shared/ui-components/jest.config.js rename to libs/shared/ui-components/jest.config.ts index f229f32c9..45808fef2 100644 --- a/libs/shared/ui-components/jest.config.js +++ b/libs/shared/ui-components/jest.config.ts @@ -1,13 +1,15 @@ -module.exports = { +/* eslint-disable */ +export default { displayName: 'shared-ui-components', preset: '../../../jest.preset.js', - globals: { - 'ts-jest': { - tsconfig: '/tsconfig.spec.json', - }, - }, + globals: {}, transform: { - '^.+\\.[tj]sx?$': 'ts-jest', + '^.+\\.[tj]sx?$': [ + 'ts-jest', + { + tsconfig: '/tsconfig.spec.json', + }, + ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../../coverage/libs/shared/ui-components', diff --git a/libs/shared/ui-components/project.json b/libs/shared/ui-components/project.json index 5db654d2b..8c9e7b153 100644 --- a/libs/shared/ui-components/project.json +++ b/libs/shared/ui-components/project.json @@ -1,5 +1,6 @@ { - "root": "libs/shared/ui-components", + "name": "shared-ui-components", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/shared/ui-components/src", "projectType": "library", "tags": [], @@ -13,9 +14,9 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/libs/shared/ui-components"], + "outputs": ["{workspaceRoot}/coverage/libs/shared/ui-components"], "options": { - "jestConfig": "libs/shared/ui-components/jest.config.js", + "jestConfig": "libs/shared/ui-components/jest.config.ts", "passWithNoTests": true } } diff --git a/libs/shared/ui-components/src/ButtonLink/ButtonLink.tsx b/libs/shared/ui-components/src/ButtonLink/ButtonLink.tsx index 1dc5f4048..ecb6ecdf0 100644 --- a/libs/shared/ui-components/src/ButtonLink/ButtonLink.tsx +++ b/libs/shared/ui-components/src/ButtonLink/ButtonLink.tsx @@ -13,33 +13,33 @@ export const ButtonLink: FC = ({ text, url, }) => ( - - - {text} - {isTriangle && ( - - )} - - + ( + + {text} + {isTriangle && ( + + )} + + ) ); export default ButtonLink; diff --git a/libs/shared/ui-components/src/Footer/FooterColumnProvider/FooterContact.tsx b/libs/shared/ui-components/src/Footer/FooterColumnProvider/FooterContact.tsx index 0a78e4327..148408ef8 100644 --- a/libs/shared/ui-components/src/Footer/FooterColumnProvider/FooterContact.tsx +++ b/libs/shared/ui-components/src/Footer/FooterColumnProvider/FooterContact.tsx @@ -22,12 +22,14 @@ export const FooterContact: FC = ({ dangerouslySetInnerHTML={createMarkup(contact)} /> {buttonText && buttonLink && ( - - - {buttonText} - - - + ( + + {buttonText} + + + ) )}

    ); diff --git a/libs/shared/ui-components/src/Footer/FooterLink/FooterLinkWrapper.tsx b/libs/shared/ui-components/src/Footer/FooterLink/FooterLinkWrapper.tsx index 403f88d81..5247376c9 100644 --- a/libs/shared/ui-components/src/Footer/FooterLink/FooterLinkWrapper.tsx +++ b/libs/shared/ui-components/src/Footer/FooterLink/FooterLinkWrapper.tsx @@ -15,8 +15,10 @@ export const FooterLinkWrapper: FC = ({ switch (linkUrl?.linktype) { case LinkTargetType.Story: return ( - - {children} + + {children} ); case LinkTargetType.Url: diff --git a/libs/shared/ui-components/src/Header/Common/HeaderLogo.tsx b/libs/shared/ui-components/src/Header/Common/HeaderLogo.tsx index 2ced2cc9d..f4339374f 100644 --- a/libs/shared/ui-components/src/Header/Common/HeaderLogo.tsx +++ b/libs/shared/ui-components/src/Header/Common/HeaderLogo.tsx @@ -9,24 +9,24 @@ import { Picture } from '../../Picture/Picture'; import { THeaderLogoProps } from '../types'; export const HeaderLogo: FC = ({ logo, domainVariant }) => ( - - - - + ( + +