diff --git a/.gitignore b/.gitignore index 592992c6..8b5e6100 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,24 @@ js-coverage node_modules public/service-worker* .vercel + +#amplify-do-not-edit-begin +amplify/\#current-cloud-backend +amplify/.config/local-* +amplify/logs +amplify/mock-data +amplify/backend/amplify-meta.json +amplify/backend/.temp +build/ +dist/ +node_modules/ +aws-exports.js +awsconfiguration.json +amplifyconfiguration.json +amplifyconfiguration.dart +amplify-build-config.json +amplify-gradle-config.json +amplifytools.xcconfig +.secret-* +**.sample +#amplify-do-not-edit-end diff --git a/amplify/.config/project-config.json b/amplify/.config/project-config.json new file mode 100644 index 00000000..0dca422e --- /dev/null +++ b/amplify/.config/project-config.json @@ -0,0 +1,17 @@ +{ + "projectName": "fddesignsystem", + "version": "3.1", + "frontend": "javascript", + "javascript": { + "framework": "react", + "config": { + "SourceDir": "src", + "DistributionDir": ".next", + "BuildCommand": "npm.cmd run-script build", + "StartCommand": "npm.cmd run-script start" + } + }, + "providers": [ + "awscloudformation" + ] +} \ No newline at end of file diff --git a/amplify/README.md b/amplify/README.md new file mode 100644 index 00000000..7c0a9e28 --- /dev/null +++ b/amplify/README.md @@ -0,0 +1,8 @@ +# Getting Started with Amplify CLI +This directory was generated by [Amplify CLI](https://docs.amplify.aws/cli). + +Helpful resources: +- Amplify documentation: https://docs.amplify.aws +- Amplify CLI documentation: https://docs.amplify.aws/cli +- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files +- Join Amplify's community: https://amplify.aws/community/ diff --git a/amplify/backend/backend-config.json b/amplify/backend/backend-config.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/amplify/backend/backend-config.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/amplify/backend/tags.json b/amplify/backend/tags.json new file mode 100644 index 00000000..b9321d71 --- /dev/null +++ b/amplify/backend/tags.json @@ -0,0 +1,10 @@ +[ + { + "Key": "user:Stack", + "Value": "{project-env}" + }, + { + "Key": "user:Application", + "Value": "{project-name}" + } +] \ No newline at end of file diff --git a/amplify/cli.json b/amplify/cli.json new file mode 100644 index 00000000..2636a69a --- /dev/null +++ b/amplify/cli.json @@ -0,0 +1,51 @@ +{ + "features": { + "graphqltransformer": { + "addmissingownerfields": true, + "improvepluralization": false, + "validatetypenamereservedwords": true, + "useexperimentalpipelinedtransformer": true, + "enableiterativegsiupdates": true, + "secondarykeyasgsi": true, + "skipoverridemutationinputtypes": true, + "transformerversion": 2, + "suppressschemamigrationprompt": true + }, + "frontend-ios": { + "enablexcodeintegration": true + }, + "auth": { + "enablecaseinsensitivity": true, + "useinclusiveterminology": true, + "breakcirculardependency": true, + "forcealiasattributes": false, + "useenabledmfas": true + }, + "codegen": { + "useappsyncmodelgenplugin": true, + "usedocsgeneratorplugin": true, + "usetypesgeneratorplugin": true, + "cleangeneratedmodelsdirectory": true, + "retaincasestyle": true, + "addtimestampfields": true, + "handlelistnullabilitytransparently": true, + "emitauthprovider": true, + "generateindexrules": true, + "enabledartnullsafety": true + }, + "appsync": { + "generategraphqlpermissions": true + }, + "latestregionsupport": { + "pinpoint": 1, + "translate": 1, + "transcribe": 1, + "rekognition": 1, + "textract": 1, + "comprehend": 1 + }, + "project": { + "overrides": true + } + } +} \ No newline at end of file diff --git a/amplify/hooks/README.md b/amplify/hooks/README.md new file mode 100644 index 00000000..8fb601ea --- /dev/null +++ b/amplify/hooks/README.md @@ -0,0 +1,7 @@ +# Command Hooks + +Command hooks can be used to run custom scripts upon Amplify CLI lifecycle events like pre-push, post-add-function, etc. + +To get started, add your script files based on the expected naming convention in this directory. + +Learn more about the script file naming convention, hook parameters, third party dependencies, and advanced configurations at https://docs.amplify.aws/cli/usage/command-hooks diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json new file mode 100644 index 00000000..ed8cf5f4 --- /dev/null +++ b/amplify/team-provider-info.json @@ -0,0 +1,15 @@ +{ + "dev": { + "awscloudformation": { + "AuthRoleName": "amplify-fddesignsystem-dev-143608-authRole", + "UnauthRoleArn": "arn:aws:iam::851161100412:role/amplify-fddesignsystem-dev-143608-unauthRole", + "AuthRoleArn": "arn:aws:iam::851161100412:role/amplify-fddesignsystem-dev-143608-authRole", + "Region": "eu-west-1", + "DeploymentBucketName": "amplify-fddesignsystem-dev-143608-deployment", + "UnauthRoleName": "amplify-fddesignsystem-dev-143608-unauthRole", + "StackName": "amplify-fddesignsystem-dev-143608", + "StackId": "arn:aws:cloudformation:eu-west-1:851161100412:stack/amplify-fddesignsystem-dev-143608/47793b40-6d63-11ec-94bd-0a587617e72d", + "AmplifyAppId": "daztfc5libv8i" + } + } +} \ No newline at end of file diff --git a/package.json b/package.json index cbb7dd34..b44dce20 100644 --- a/package.json +++ b/package.json @@ -84,8 +84,6 @@ "pretty": "^2.0.0", "punycode": "^2.1.1", "raw-loader": "^4.0.2", - "react": "^17.0.2", - "react-dom": "^17.0.2", "react-element-to-jsx-string": "^14.3.4", "sass": "^1.45.2", "sass-loader": "^12.4.0", @@ -101,7 +99,9 @@ "webpack-cli": "^4.9.1" }, "dependencies": { - "js-cookie": "^3.0.1" + "js-cookie": "^3.0.1", + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "browserslist": { "production": [ diff --git a/src/pages/[section]/[id]/Article.module.scss b/pages/[section]/[id]/Article.module.scss similarity index 94% rename from src/pages/[section]/[id]/Article.module.scss rename to pages/[section]/[id]/Article.module.scss index 7e1a7636..bf3a80e0 100644 --- a/src/pages/[section]/[id]/Article.module.scss +++ b/pages/[section]/[id]/Article.module.scss @@ -1,7 +1,7 @@ -@import '../../../utils/map-deep-get.scss'; -@import '../../../design-tokens/colors.scss'; -@import '../../../design-tokens/media.scss'; -@import '../../../design-tokens/typography.scss'; +@import '../../../src/utils/map-deep-get.scss'; +@import '../../../src/design-tokens/colors.scss'; +@import '../../../src/design-tokens/media.scss'; +@import '../../../src/design-tokens/typography.scss'; .article { max-width: 1248px; diff --git a/src/pages/[section]/[id]/[title].tsx b/pages/[section]/[id]/[title].tsx similarity index 94% rename from src/pages/[section]/[id]/[title].tsx rename to pages/[section]/[id]/[title].tsx index 856afc3c..8967c0b8 100644 --- a/src/pages/[section]/[id]/[title].tsx +++ b/pages/[section]/[id]/[title].tsx @@ -2,14 +2,14 @@ import React, { useState, useEffect } from 'react'; import '@fdmg/css-grid/css/grid.css'; import '@fdmg/css-grid/css/flex.css'; import styles from './Article.module.scss'; -import { mergeInlineContent } from '../../../utils/articleContent'; -import PageStore from '../../../stores/PageStore'; -import { OEmbedLoader } from '../../../utils/OEmbedLoader'; -import { ArticleMeta } from '../../../components/article-meta/ArticleMeta'; +import { mergeInlineContent } from '../../../src/utils/articleContent'; +import PageStore from '../../../src/stores/PageStore'; +import { OEmbedLoader } from '../../../src/utils/OEmbedLoader'; +import { ArticleMeta } from '../../../src/components/article-meta/ArticleMeta'; import { parseXMLToJSON } from '@fdmg/article-xml-json'; import Head from 'next/head'; import { GridContainer } from '@fdmg/css-grid/GridContainer'; -import { VerticalToolbar } from '../../../components/toolbar/VerticalToolbar'; +import { VerticalToolbar } from '../../../src/components/toolbar/VerticalToolbar'; import { GetStaticPaths, GetStaticPathsContext, diff --git a/src/pages/_app.module.scss b/pages/_app.module.scss similarity index 97% rename from src/pages/_app.module.scss rename to pages/_app.module.scss index 3f5917e5..38c11540 100644 --- a/src/pages/_app.module.scss +++ b/pages/_app.module.scss @@ -1,6 +1,6 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/colors.scss'; -@import '../design-tokens/media.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/colors.scss'; +@import '../src/design-tokens/media.scss'; .overview, .article { diff --git a/src/pages/_app.scss b/pages/_app.scss similarity index 88% rename from src/pages/_app.scss rename to pages/_app.scss index 79631681..e0e8e1e0 100644 --- a/src/pages/_app.scss +++ b/pages/_app.scss @@ -1,6 +1,6 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/colors.scss'; -@import '../design-tokens/typography.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/colors.scss'; +@import '../src/design-tokens/typography.scss'; html { overflow-x: hidden; diff --git a/src/pages/_app.tsx b/pages/_app.tsx similarity index 92% rename from src/pages/_app.tsx rename to pages/_app.tsx index be35aa77..eb8fdb08 100644 --- a/src/pages/_app.tsx +++ b/pages/_app.tsx @@ -2,19 +2,19 @@ import React, { useEffect, useState } from 'react'; import '@fdmg/css-grid/css/flex.css'; import '@fdmg/css-grid/css/grid.css'; import '@fdmg/css-grid/GridContainer.css'; -import '../design-tokens/design-tokens.scss'; +import '../src/design-tokens/design-tokens.scss'; import './_app.scss'; import './_app_markdown.scss'; import './_app_a11y-dark.scss'; import styles from './_app.module.scss'; -import PageStore, { Page } from '../stores/PageStore'; +import PageStore, { Page } from '../src/stores/PageStore'; import Head from 'next/head'; -import { Tooltip } from '../components/Tooltip'; -import { Menu } from '../components/menu/Menu'; -import { debounce } from '../utils/debounce'; -import { Footer } from '../components/footer/Footer'; -import { Profile } from '../components/menu/Profile'; -import { Aside } from '../components/Aside'; +import { Tooltip } from '../src/components/Tooltip'; +import { Menu } from '../src/components/menu/Menu'; +import { debounce } from '../src/utils/debounce'; +import { Footer } from '../src/components/footer/Footer'; +import { Profile } from '../src/components/menu/Profile'; +import { Aside } from '../src/components/Aside'; /** * Make sibling elements same height as its tallest sibling with the given CSS Class Name. diff --git a/src/pages/_app_a11y-dark.scss b/pages/_app_a11y-dark.scss similarity index 89% rename from src/pages/_app_a11y-dark.scss rename to pages/_app_a11y-dark.scss index 4e79e322..a94029b4 100644 --- a/src/pages/_app_a11y-dark.scss +++ b/pages/_app_a11y-dark.scss @@ -1,6 +1,6 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/colors.scss'; -@import '../design-tokens/typography.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/colors.scss'; +@import '../src/design-tokens/typography.scss'; .markdown { &#{&} { diff --git a/src/pages/_app_markdown.scss b/pages/_app_markdown.scss similarity index 96% rename from src/pages/_app_markdown.scss rename to pages/_app_markdown.scss index a996a47e..52af07a7 100644 --- a/src/pages/_app_markdown.scss +++ b/pages/_app_markdown.scss @@ -1,6 +1,6 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/colors.scss'; -@import '../design-tokens/typography.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/colors.scss'; +@import '../src/design-tokens/typography.scss'; html.dark { .markdown { diff --git a/src/pages/_document.tsx b/pages/_document.tsx similarity index 100% rename from src/pages/_document.tsx rename to pages/_document.tsx diff --git a/src/pages/ab.module.scss b/pages/ab.module.scss similarity index 91% rename from src/pages/ab.module.scss rename to pages/ab.module.scss index b66ba87e..6b160ec5 100644 --- a/src/pages/ab.module.scss +++ b/pages/ab.module.scss @@ -1,6 +1,6 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/colors.scss'; -@import '../design-tokens/media.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/colors.scss'; +@import '../src/design-tokens/media.scss'; .ab { display: flex; diff --git a/src/pages/ab.tsx b/pages/ab.tsx similarity index 98% rename from src/pages/ab.tsx rename to pages/ab.tsx index d60e8c5c..5840e0ee 100644 --- a/src/pages/ab.tsx +++ b/pages/ab.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ABProvider, Experiment, Variant } from '../components/ab/ab'; +import { ABProvider, Experiment, Variant } from '../src/components/ab/ab'; import { parseCookies } from 'nookies'; import styles from './ab.module.scss'; import { GetServerSidePropsContext } from 'next'; diff --git a/src/pages/accordion.tsx b/pages/accordion.tsx similarity index 96% rename from src/pages/accordion.tsx rename to pages/accordion.tsx index 00f7bee5..0542e6cc 100644 --- a/src/pages/accordion.tsx +++ b/pages/accordion.tsx @@ -1,9 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; -import { Accordion, getCssClassNames } from '../components/accordion/Accordion'; -import PageStore from '../stores/PageStore'; +import { Explain } from '../src/components/Explain'; +import { + Accordion, + getCssClassNames, +} from '../src/components/accordion/Accordion'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const items = [ { diff --git a/src/pages/api/fd-web/index.ts b/pages/api/fd-web/index.ts similarity index 99% rename from src/pages/api/fd-web/index.ts rename to pages/api/fd-web/index.ts index 1f7b6f58..d4106722 100644 --- a/src/pages/api/fd-web/index.ts +++ b/pages/api/fd-web/index.ts @@ -1,5 +1,5 @@ import Cors from 'micro-cors'; -import { timeout } from '../../../utils/timeout'; +import { timeout } from '../../../src/utils/timeout'; const cors = Cors({ allowMethods: ['GET', 'HEAD'] }); export const data = { diff --git a/src/pages/article-bullet-point.module.scss b/pages/article-bullet-point.module.scss similarity index 100% rename from src/pages/article-bullet-point.module.scss rename to pages/article-bullet-point.module.scss diff --git a/src/pages/article-bullet-point.tsx b/pages/article-bullet-point.tsx similarity index 95% rename from src/pages/article-bullet-point.tsx rename to pages/article-bullet-point.tsx index 200a1924..60f6b3c4 100644 --- a/src/pages/article-bullet-point.tsx +++ b/pages/article-bullet-point.tsx @@ -1,13 +1,13 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { BulletPoint, getCssClassNames, -} from '../components/bullet-point/BulletPoint'; -import PageStore from '../stores/PageStore'; +} from '../src/components/bullet-point/BulletPoint'; +import PageStore from '../src/stores/PageStore'; import styles from './article-bullet-point.module.scss'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { bullets: [ diff --git a/src/pages/article-image.tsx b/pages/article-image.tsx similarity index 88% rename from src/pages/article-image.tsx rename to pages/article-image.tsx index 106d41c4..fcb7e64b 100644 --- a/src/pages/article-image.tsx +++ b/pages/article-image.tsx @@ -1,12 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { ArticleImage, getCssClassNames, -} from '../components/article-image/ArticleImage'; -import PageStore from '../stores/PageStore'; +} from '../src/components/article-image/ArticleImage'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { caption: `What a photo`, diff --git a/src/pages/article-infographic.tsx b/pages/article-infographic.tsx similarity index 89% rename from src/pages/article-infographic.tsx rename to pages/article-infographic.tsx index 6eca6af2..f7d5cbd9 100644 --- a/src/pages/article-infographic.tsx +++ b/pages/article-infographic.tsx @@ -1,12 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { InfographicExtended, getCssClassNames, -} from '../components/article-image/InfographicExtended'; -import PageStore from '../stores/PageStore'; +} from '../src/components/article-image/InfographicExtended'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { smallImageUrl: diff --git a/src/pages/article-latest-news.tsx b/pages/article-latest-news.tsx similarity index 91% rename from src/pages/article-latest-news.tsx rename to pages/article-latest-news.tsx index 8d31d49b..d54921d4 100644 --- a/src/pages/article-latest-news.tsx +++ b/pages/article-latest-news.tsx @@ -1,12 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { ArticleLatestNews, getCssClassNames, -} from '../components/article-latest-news/ArticleLatestNews'; -import PageStore from '../stores/PageStore'; +} from '../src/components/article-latest-news/ArticleLatestNews'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { news: [ diff --git a/src/pages/article-link-block.module.scss b/pages/article-link-block.module.scss similarity index 100% rename from src/pages/article-link-block.module.scss rename to pages/article-link-block.module.scss diff --git a/src/pages/article-link-block.tsx b/pages/article-link-block.tsx similarity index 92% rename from src/pages/article-link-block.tsx rename to pages/article-link-block.tsx index ffe8bcd7..87a09af1 100644 --- a/src/pages/article-link-block.tsx +++ b/pages/article-link-block.tsx @@ -1,13 +1,13 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { LinkBlock, getCssClassNames, -} from '../components/article-link-block/LinkBlock'; -import PageStore from '../stores/PageStore'; +} from '../src/components/article-link-block/LinkBlock'; +import PageStore from '../src/stores/PageStore'; import styles from './article-link-block.module.scss'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; export const metaTitle = 'Link block'; export const metaDescription = diff --git a/src/pages/article-link-card.tsx b/pages/article-link-card.tsx similarity index 88% rename from src/pages/article-link-card.tsx rename to pages/article-link-card.tsx index 97c93292..696c6cbe 100644 --- a/src/pages/article-link-card.tsx +++ b/pages/article-link-card.tsx @@ -1,12 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { LinkCard, getCssClassNames, -} from '../components/article-link-card/LinkCard'; -import PageStore from '../stores/PageStore'; +} from '../src/components/article-link-card/LinkCard'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; export const metaTitle = 'Link card'; export const metaDescription = diff --git a/src/pages/article-summary.tsx b/pages/article-summary.tsx similarity index 93% rename from src/pages/article-summary.tsx rename to pages/article-summary.tsx index 7b79b3fd..52fba3c7 100644 --- a/src/pages/article-summary.tsx +++ b/pages/article-summary.tsx @@ -1,12 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { Summary, getCssClassNames, -} from '../components/article-summary/Summary'; -import PageStore from '../stores/PageStore'; +} from '../src/components/article-summary/Summary'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { title: 'In het kort', diff --git a/src/pages/article-tags.tsx b/pages/article-tags.tsx similarity index 94% rename from src/pages/article-tags.tsx rename to pages/article-tags.tsx index 16b5e940..4dc3230c 100644 --- a/src/pages/article-tags.tsx +++ b/pages/article-tags.tsx @@ -1,13 +1,13 @@ import React, { useState, useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { ArticleTags, getCssClassNames, -} from '../components/article-tags/ArticleTags'; +} from '../src/components/article-tags/ArticleTags'; import styles from './article-link-block.module.scss'; -import PageStore from '../stores/PageStore'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; export const metaTitle = 'Article tags'; export const metaDescription = 'Article tags, used to display tags in articles'; diff --git a/src/pages/author-info.tsx b/pages/author-info.tsx similarity index 93% rename from src/pages/author-info.tsx rename to pages/author-info.tsx index 77136a36..f8bed4ad 100644 --- a/src/pages/author-info.tsx +++ b/pages/author-info.tsx @@ -1,12 +1,12 @@ import React, { useState } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { AuthorInfo, getCssClassNames, -} from '../components/author-info/AuthorInfo'; +} from '../src/components/author-info/AuthorInfo'; import styles from './article-link-block.module.scss'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; export const metaTitle = 'Author info'; export const metaDescription = diff --git a/src/pages/button/buttons.module.scss b/pages/button/buttons.module.scss similarity index 100% rename from src/pages/button/buttons.module.scss rename to pages/button/buttons.module.scss diff --git a/src/pages/button/cta.tsx b/pages/button/cta.tsx similarity index 95% rename from src/pages/button/cta.tsx rename to pages/button/cta.tsx index 49fc0e07..d82733b4 100644 --- a/src/pages/button/cta.tsx +++ b/pages/button/cta.tsx @@ -1,10 +1,13 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { ButtonCta, getCssClassNames } from '../../components/button/ButtonCta'; +import { Explain } from '../../src/components/Explain'; +import { + ButtonCta, + getCssClassNames, +} from '../../src/components/button/ButtonCta'; import Head from 'next/head'; -import { EnvelopeIcon } from '../../design-tokens/icons'; +import { EnvelopeIcon } from '../../src/design-tokens/icons'; import styles from './buttons.module.scss'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Button call-to-action'; export const metaDescription = diff --git a/src/pages/button/default.tsx b/pages/button/default.tsx similarity index 93% rename from src/pages/button/default.tsx rename to pages/button/default.tsx index d7584572..09699cfc 100644 --- a/src/pages/button/default.tsx +++ b/pages/button/default.tsx @@ -1,10 +1,10 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { Button, getCssClassNames } from '../../components/button/Button'; +import { Explain } from '../../src/components/Explain'; +import { Button, getCssClassNames } from '../../src/components/button/Button'; import Head from 'next/head'; -import { EnvelopeIcon } from '../../design-tokens/icons'; +import { EnvelopeIcon } from '../../src/design-tokens/icons'; import styles from './buttons.module.scss'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Neutral Button'; export const metaDescription = diff --git a/src/pages/button/dropdown.tsx b/pages/button/dropdown.tsx similarity index 92% rename from src/pages/button/dropdown.tsx rename to pages/button/dropdown.tsx index 7f10fa6c..985e6fc6 100644 --- a/src/pages/button/dropdown.tsx +++ b/pages/button/dropdown.tsx @@ -1,8 +1,11 @@ import React, { useState } from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; -import { Dropdown, getCssClassNames } from '../../components/button/Dropdown'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; +import { + Dropdown, + getCssClassNames, +} from '../../src/components/button/Dropdown'; export const metaTitle = 'Dropdown'; export const metaDescription = 'Dropdown, used to show multiple choices'; diff --git a/src/pages/button/follow.tsx b/pages/button/follow.tsx similarity index 93% rename from src/pages/button/follow.tsx rename to pages/button/follow.tsx index ad10e8b4..e8663bcb 100644 --- a/src/pages/button/follow.tsx +++ b/pages/button/follow.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { ButtonFollow, getCssClassNames, -} from '../../components/button/ButtonFollow'; +} from '../../src/components/button/ButtonFollow'; import { useState } from 'react'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Follow button'; export const metaDescription = 'Follow Button, used to follow content'; diff --git a/src/pages/button/ghost.tsx b/pages/button/ghost.tsx similarity index 95% rename from src/pages/button/ghost.tsx rename to pages/button/ghost.tsx index 65435703..f5919639 100644 --- a/src/pages/button/ghost.tsx +++ b/pages/button/ghost.tsx @@ -1,13 +1,13 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { ButtonGhost, getCssClassNames, -} from '../../components/button/ButtonGhost'; +} from '../../src/components/button/ButtonGhost'; import Head from 'next/head'; -import { EnvelopeIcon } from '../../design-tokens/icons'; +import { EnvelopeIcon } from '../../src/design-tokens/icons'; import styles from './buttons.module.scss'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Ghost Button'; export const metaDescription = diff --git a/src/pages/card/cards.module.scss b/pages/card/cards.module.scss similarity index 86% rename from src/pages/card/cards.module.scss rename to pages/card/cards.module.scss index e699be89..21317040 100644 --- a/src/pages/card/cards.module.scss +++ b/pages/card/cards.module.scss @@ -1,6 +1,6 @@ -@import '../../utils/map-deep-get.scss'; -@import '../../design-tokens/media.scss'; -@import '../../design-tokens/colors.scss'; +@import '../../src/utils/map-deep-get.scss'; +@import '../../src/design-tokens/media.scss'; +@import '../../src/design-tokens/colors.scss'; .table { &, diff --git a/src/pages/card/horizontal-1.tsx b/pages/card/horizontal-1.tsx similarity index 96% rename from src/pages/card/horizontal-1.tsx rename to pages/card/horizontal-1.tsx index 4a97aa07..39f2c088 100644 --- a/src/pages/card/horizontal-1.tsx +++ b/pages/card/horizontal-1.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { HorizontalCard1, getCssClassNames, -} from '../../components/card/HorizontalCard1'; +} from '../../src/components/card/HorizontalCard1'; import Head from 'next/head'; import Image from 'next/image'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; import styles from './cards.module.scss'; const horizontalCards1: any = [ diff --git a/src/pages/card/horizontal-2.tsx b/pages/card/horizontal-2.tsx similarity index 95% rename from src/pages/card/horizontal-2.tsx rename to pages/card/horizontal-2.tsx index b805031d..7a69a29f 100644 --- a/src/pages/card/horizontal-2.tsx +++ b/pages/card/horizontal-2.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { HorizontalCard2, getCssClassNames, -} from '../../components/card/HorizontalCard2'; +} from '../../src/components/card/HorizontalCard2'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; import styles from './cards.module.scss'; const horizontalCards2: any = [ diff --git a/src/pages/card/horizontal-3.tsx b/pages/card/horizontal-3.tsx similarity index 95% rename from src/pages/card/horizontal-3.tsx rename to pages/card/horizontal-3.tsx index 98e70725..70f4322d 100644 --- a/src/pages/card/horizontal-3.tsx +++ b/pages/card/horizontal-3.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { HorizontalCard3, getCssClassNames, -} from '../../components/card/HorizontalCard3'; +} from '../../src/components/card/HorizontalCard3'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; import styles from './cards.module.scss'; const horizontalCards3: any = [ diff --git a/src/pages/card/hybrid-1.tsx b/pages/card/hybrid-1.tsx similarity index 97% rename from src/pages/card/hybrid-1.tsx rename to pages/card/hybrid-1.tsx index 0e4d4ea8..3c4ace96 100644 --- a/src/pages/card/hybrid-1.tsx +++ b/pages/card/hybrid-1.tsx @@ -1,12 +1,12 @@ import React, { useState } from 'react'; import styles from './cards.module.scss'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { HybridCard1, getCssClassNames, -} from '../../components/card/HybridCard1'; +} from '../../src/components/card/HybridCard1'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; const hybridCards1: any = [ { diff --git a/src/pages/card/hybrid-2.tsx b/pages/card/hybrid-2.tsx similarity index 95% rename from src/pages/card/hybrid-2.tsx rename to pages/card/hybrid-2.tsx index 947137a8..60d3e8e9 100644 --- a/src/pages/card/hybrid-2.tsx +++ b/pages/card/hybrid-2.tsx @@ -1,12 +1,12 @@ import React, { useState } from 'react'; import styles from './cards.module.scss'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { HybridCard2, getCssClassNames, -} from '../../components/card/HybridCard2'; +} from '../../src/components/card/HybridCard2'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; const hybridCards1: any = [ { diff --git a/src/pages/card/hybrid-3.tsx b/pages/card/hybrid-3.tsx similarity index 96% rename from src/pages/card/hybrid-3.tsx rename to pages/card/hybrid-3.tsx index 2e26af65..cdb10ef3 100644 --- a/src/pages/card/hybrid-3.tsx +++ b/pages/card/hybrid-3.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import Head from 'next/head'; import { getCssClassNames, HybridCard3, -} from '../../components/card/HybridCard3'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +} from '../../src/components/card/HybridCard3'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; const hybridCards3: any = [ { diff --git a/src/pages/card/link-card.tsx b/pages/card/link-card.tsx similarity index 87% rename from src/pages/card/link-card.tsx rename to pages/card/link-card.tsx index 04f76e98..8409b262 100644 --- a/src/pages/card/link-card.tsx +++ b/pages/card/link-card.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { LinkCard, getCssClassNames } from '../../components/card/LinkCard'; +import { Explain } from '../../src/components/Explain'; +import { LinkCard, getCssClassNames } from '../../src/components/card/LinkCard'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Link Card'; export const metaDescription = 'Link Card, used on the My News page'; diff --git a/src/pages/card/vertical-1.tsx b/pages/card/vertical-1.tsx similarity index 97% rename from src/pages/card/vertical-1.tsx rename to pages/card/vertical-1.tsx index 4abe7a89..3fdce2df 100644 --- a/src/pages/card/vertical-1.tsx +++ b/pages/card/vertical-1.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { VerticalCard1, getCssClassNames, -} from '../../components/card/VerticalCard1'; +} from '../../src/components/card/VerticalCard1'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; const verticalCards1: any = [ { diff --git a/src/pages/card/vertical-2.tsx b/pages/card/vertical-2.tsx similarity index 96% rename from src/pages/card/vertical-2.tsx rename to pages/card/vertical-2.tsx index 492e2c4e..3731217e 100644 --- a/src/pages/card/vertical-2.tsx +++ b/pages/card/vertical-2.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { VerticalCard2, getCssClassNames, -} from '../../components/card/VerticalCard2'; +} from '../../src/components/card/VerticalCard2'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; const verticalCards1: any = [ { diff --git a/src/pages/card/vertical-3.tsx b/pages/card/vertical-3.tsx similarity index 97% rename from src/pages/card/vertical-3.tsx rename to pages/card/vertical-3.tsx index 7daef22a..1a42d96b 100644 --- a/src/pages/card/vertical-3.tsx +++ b/pages/card/vertical-3.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { VerticalCard3, getCssClassNames, -} from '../../components/card/VerticalCard3'; +} from '../../src/components/card/VerticalCard3'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; const verticalCards1: any = [ { diff --git a/src/pages/card/vertical-4.tsx b/pages/card/vertical-4.tsx similarity index 97% rename from src/pages/card/vertical-4.tsx rename to pages/card/vertical-4.tsx index 121700ac..f217c10a 100644 --- a/src/pages/card/vertical-4.tsx +++ b/pages/card/vertical-4.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { VerticalCard4, getCssClassNames, -} from '../../components/card/VerticalCard4'; +} from '../../src/components/card/VerticalCard4'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; const verticalCards4: any = [ { diff --git a/src/pages/cards.module.scss b/pages/cards.module.scss similarity index 92% rename from src/pages/cards.module.scss rename to pages/cards.module.scss index f8f1d223..2f716942 100644 --- a/src/pages/cards.module.scss +++ b/pages/cards.module.scss @@ -1,6 +1,6 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/media.scss'; -@import '../design-tokens/colors.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/media.scss'; +@import '../src/design-tokens/colors.scss'; .table { &, diff --git a/src/pages/cards.tsx b/pages/cards.tsx similarity index 100% rename from src/pages/cards.tsx rename to pages/cards.tsx diff --git a/src/pages/cookieconsent.module.scss b/pages/cookieconsent.module.scss similarity index 100% rename from src/pages/cookieconsent.module.scss rename to pages/cookieconsent.module.scss diff --git a/src/pages/cookieconsent.tsx b/pages/cookieconsent.tsx similarity index 98% rename from src/pages/cookieconsent.tsx rename to pages/cookieconsent.tsx index 010a0296..388dd066 100644 --- a/src/pages/cookieconsent.tsx +++ b/pages/cookieconsent.tsx @@ -1,19 +1,19 @@ import React, { useState, useCallback, useEffect } from 'react'; import Script from 'next/script'; import styles from './cookieconsent.module.scss'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import Head from 'next/head'; -import { Switch } from '../components/input/Switch'; +import { Switch } from '../src/components/input/Switch'; import { CookieConsent, getCssClassNames, LockedContent, CookieConsentApi, CookieConsentStore, -} from '../components/cookieconsent/CookieConsent'; -import { FdmgIcon } from '../design-tokens/icons'; -import PageStore from '../stores/PageStore'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +} from '../src/components/cookieconsent/CookieConsent'; +import { FdmgIcon } from '../src/design-tokens/icons'; +import PageStore from '../src/stores/PageStore'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; import MarkdownIt from 'markdown-it'; const md = new MarkdownIt({ html: true, diff --git a/pages/downloads.module.scss b/pages/downloads.module.scss new file mode 100644 index 00000000..5dac09fc --- /dev/null +++ b/pages/downloads.module.scss @@ -0,0 +1,9 @@ +@import '@import ' ../src/utils/map-deep-get.scss ';'; +@import '../src/design-tokens/typography.scss'; + +.downloads { + h1 { + font-family: map-deep-get($typography, 'font-family', 'bold'), + sans-serif; + } +} diff --git a/src/pages/fd-web/[section].tsx b/pages/fd-web/[section].tsx similarity index 100% rename from src/pages/fd-web/[section].tsx rename to pages/fd-web/[section].tsx diff --git a/src/pages/fd-web/index.module.scss b/pages/fd-web/index.module.scss similarity index 90% rename from src/pages/fd-web/index.module.scss rename to pages/fd-web/index.module.scss index 052bace3..841b7b08 100644 --- a/src/pages/fd-web/index.module.scss +++ b/pages/fd-web/index.module.scss @@ -1,7 +1,7 @@ -@import '../../utils/map-deep-get.scss'; -@import '../../design-tokens/colors.scss'; -@import '../../design-tokens/media.scss'; -@import '../../design-tokens/typography.scss'; +@import '../../src/utils/map-deep-get.scss'; +@import '../../src/design-tokens/colors.scss'; +@import '../../src/design-tokens/media.scss'; +@import '../../src/design-tokens/typography.scss'; .page { max-width: 1248px; diff --git a/src/pages/fd-web/index.tsx b/pages/fd-web/index.tsx similarity index 98% rename from src/pages/fd-web/index.tsx rename to pages/fd-web/index.tsx index f34f85c6..5148a0c8 100644 --- a/src/pages/fd-web/index.tsx +++ b/pages/fd-web/index.tsx @@ -2,14 +2,14 @@ import React from 'react'; import styles from './index.module.scss'; import '@fdmg/css-grid/css/grid.css'; import '@fdmg/css-grid/css/flex.css'; -import { VerticalCard1 } from '../../components/card/VerticalCard1'; +import { VerticalCard1 } from '../../src/components/card/VerticalCard1'; import { getPayload } from '../api/fd-web'; -import { HybridCard1 } from '../../components/card/HybridCard1'; -import { VerticalCard3 } from '../../components/card/VerticalCard3'; -import { HybridCard2 } from '../../components/card/HybridCard2'; +import { HybridCard1 } from '../../src/components/card/HybridCard1'; +import { VerticalCard3 } from '../../src/components/card/VerticalCard3'; +import { HybridCard2 } from '../../src/components/card/HybridCard2'; import Head from 'next/head'; import { GridContainer } from '@fdmg/css-grid/GridContainer'; -import { HybridCard3 } from '../../components/card/HybridCard3'; +import { HybridCard3 } from '../../src/components/card/HybridCard3'; interface Props { data: any; diff --git a/src/pages/financial-agenda.tsx b/pages/financial-agenda.tsx similarity index 95% rename from src/pages/financial-agenda.tsx rename to pages/financial-agenda.tsx index b7864759..7bc1c18c 100644 --- a/src/pages/financial-agenda.tsx +++ b/pages/financial-agenda.tsx @@ -1,12 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { FinancialAgenda, getCssClassNames, -} from '../components/financial-agenda/FinancialAgenda'; -import PageStore from '../stores/PageStore'; +} from '../src/components/financial-agenda/FinancialAgenda'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const data = [ { diff --git a/src/pages/grid.module.scss b/pages/grid.module.scss similarity index 100% rename from src/pages/grid.module.scss rename to pages/grid.module.scss diff --git a/src/pages/grid.tsx b/pages/grid.tsx similarity index 99% rename from src/pages/grid.tsx rename to pages/grid.tsx index 87cf6542..ad3c7c23 100644 --- a/src/pages/grid.tsx +++ b/pages/grid.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import Head from 'next/head'; import styles from './grid.module.scss'; import { getCssClassNames, GridContainer } from '@fdmg/css-grid/GridContainer'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; export const metaTitle = 'Grid'; export const metaDescription = 'Grid, used to layout a page'; diff --git a/src/pages/hall-of-fame/Styles.module.scss b/pages/hall-of-fame/Styles.module.scss similarity index 100% rename from src/pages/hall-of-fame/Styles.module.scss rename to pages/hall-of-fame/Styles.module.scss diff --git a/src/pages/hall-of-fame/jorien-beukers.tsx b/pages/hall-of-fame/jorien-beukers.tsx similarity index 98% rename from src/pages/hall-of-fame/jorien-beukers.tsx rename to pages/hall-of-fame/jorien-beukers.tsx index 1db9818a..02226f58 100644 --- a/src/pages/hall-of-fame/jorien-beukers.tsx +++ b/pages/hall-of-fame/jorien-beukers.tsx @@ -1,15 +1,15 @@ import React, { useEffect } from 'react'; import styles from './Styles.module.scss'; import articleStyles from '../[section]/[id]/Article.module.scss'; -import { Quote } from '../../components/quote/Quote'; -import { NumberFrame } from '../../components/numberframe/NumberFrame'; -import { WordFrame } from '../../components/wordframe/WordFrame'; -import { ReadMore } from '../../components/readmore/ReadMore'; -import { Summary } from '../../components/article-summary/Summary'; -import { InfographicExtended } from '../../components/article-image/InfographicExtended'; -import { ArticleMeta } from '../../components/article-meta/ArticleMeta'; +import { Quote } from '../../src/components/quote/Quote'; +import { NumberFrame } from '../../src/components/numberframe/NumberFrame'; +import { WordFrame } from '../../src/components/wordframe/WordFrame'; +import { ReadMore } from '../../src/components/readmore/ReadMore'; +import { Summary } from '../../src/components/article-summary/Summary'; +import { InfographicExtended } from '../../src/components/article-image/InfographicExtended'; +import { ArticleMeta } from '../../src/components/article-meta/ArticleMeta'; import Head from 'next/head'; -import PageStore from '../../stores/PageStore'; +import PageStore from '../../src/stores/PageStore'; function JorienBeukers() { useEffect(() => { diff --git a/src/pages/index.tsx b/pages/index.tsx similarity index 98% rename from src/pages/index.tsx rename to pages/index.tsx index 9e2ff7bb..4dcd3635 100644 --- a/src/pages/index.tsx +++ b/pages/index.tsx @@ -101,7 +101,7 @@ function Page(props: Props) { } export async function getStaticProps() { - const readme = require('../../README.md'); + const readme = require('../README.md'); return { props: { diff --git a/src/pages/input/breaking-switch.tsx b/pages/input/breaking-switch.tsx similarity index 90% rename from src/pages/input/breaking-switch.tsx rename to pages/input/breaking-switch.tsx index 2fa2e782..b4152f01 100644 --- a/src/pages/input/breaking-switch.tsx +++ b/pages/input/breaking-switch.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { BreakingSwitch, getCssClassNames, -} from '../../components/input/BreakingSwitch'; +} from '../../src/components/input/BreakingSwitch'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Breaking Switch'; export const metaDescription = diff --git a/src/pages/input/checkbox.tsx b/pages/input/checkbox.tsx similarity index 92% rename from src/pages/input/checkbox.tsx rename to pages/input/checkbox.tsx index 3a799c84..a6beaf5b 100644 --- a/src/pages/input/checkbox.tsx +++ b/pages/input/checkbox.tsx @@ -1,8 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { Checkbox, getCssClassNames } from '../../components/input/Checkbox'; +import { Explain } from '../../src/components/Explain'; +import { + Checkbox, + getCssClassNames, +} from '../../src/components/input/Checkbox'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Checkbox'; export const metaDescription = 'Checkbox, used in forms'; diff --git a/src/pages/input/dateinput.tsx b/pages/input/dateinput.tsx similarity index 96% rename from src/pages/input/dateinput.tsx rename to pages/input/dateinput.tsx index d3491fa4..35ac741d 100644 --- a/src/pages/input/dateinput.tsx +++ b/pages/input/dateinput.tsx @@ -1,8 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { TextInput, getCssClassNames } from '../../components/input/TextInput'; +import { Explain } from '../../src/components/Explain'; +import { + TextInput, + getCssClassNames, +} from '../../src/components/input/TextInput'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Date input'; export const metaDescription = 'Date input, used in forms'; diff --git a/src/pages/input/emailinput.tsx b/pages/input/emailinput.tsx similarity index 97% rename from src/pages/input/emailinput.tsx rename to pages/input/emailinput.tsx index 0481d59a..4e924074 100644 --- a/src/pages/input/emailinput.tsx +++ b/pages/input/emailinput.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { TextInput, getCssClassNames, Patterns, -} from '../../components/input/TextInput'; +} from '../../src/components/input/TextInput'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'E-mail input'; export const metaDescription = 'E-mail input, used in forms'; diff --git a/src/pages/input/mobileinput.tsx b/pages/input/mobileinput.tsx similarity index 96% rename from src/pages/input/mobileinput.tsx rename to pages/input/mobileinput.tsx index 10422bf4..c504c2a1 100644 --- a/src/pages/input/mobileinput.tsx +++ b/pages/input/mobileinput.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { TextInput, getCssClassNames, Patterns, -} from '../../components/input/TextInput'; +} from '../../src/components/input/TextInput'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Mobile number input'; export const metaDescription = 'Mobile number input, used in forms'; diff --git a/src/pages/input/radio.tsx b/pages/input/radio.tsx similarity index 94% rename from src/pages/input/radio.tsx rename to pages/input/radio.tsx index 030c7932..c465f3b5 100644 --- a/src/pages/input/radio.tsx +++ b/pages/input/radio.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { Radio, getCssClassNames } from '../../components/input/Radio'; +import { Explain } from '../../src/components/Explain'; +import { Radio, getCssClassNames } from '../../src/components/input/Radio'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Radio input'; export const metaDescription = 'Radio input, used in forms'; diff --git a/src/pages/input/select.tsx b/pages/input/select.tsx similarity index 96% rename from src/pages/input/select.tsx rename to pages/input/select.tsx index cfba81c1..26fa0fcd 100644 --- a/src/pages/input/select.tsx +++ b/pages/input/select.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import Head from 'next/head'; -import { Select, getCssClassNames } from '../../components/input/Select'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { Select, getCssClassNames } from '../../src/components/input/Select'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Select drop-down'; export const metaDescription = 'Select drop-down, used in forms'; diff --git a/src/pages/input/switch.tsx b/pages/input/switch.tsx similarity index 93% rename from src/pages/input/switch.tsx rename to pages/input/switch.tsx index badc965f..e8f0b0a7 100644 --- a/src/pages/input/switch.tsx +++ b/pages/input/switch.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { Switch, getCssClassNames } from '../../components/input/Switch'; +import { Explain } from '../../src/components/Explain'; +import { Switch, getCssClassNames } from '../../src/components/input/Switch'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Switch'; export const metaDescription = diff --git a/src/pages/input/textarea.tsx b/pages/input/textarea.tsx similarity index 98% rename from src/pages/input/textarea.tsx rename to pages/input/textarea.tsx index 16bf3b1c..42fd80d8 100644 --- a/src/pages/input/textarea.tsx +++ b/pages/input/textarea.tsx @@ -1,8 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { TextArea, getCssClassNames } from '../../components/input/TextArea'; +import { Explain } from '../../src/components/Explain'; +import { + TextArea, + getCssClassNames, +} from '../../src/components/input/TextArea'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Text area'; export const metaDescription = 'Text area, used in forms'; diff --git a/src/pages/input/textinput.tsx b/pages/input/textinput.tsx similarity index 97% rename from src/pages/input/textinput.tsx rename to pages/input/textinput.tsx index f14bf2ba..ba7b64ae 100644 --- a/src/pages/input/textinput.tsx +++ b/pages/input/textinput.tsx @@ -1,8 +1,11 @@ import React from 'react'; -import { Explain } from '../../components/Explain'; -import { TextInput, getCssClassNames } from '../../components/input/TextInput'; +import { Explain } from '../../src/components/Explain'; +import { + TextInput, + getCssClassNames, +} from '../../src/components/input/TextInput'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Text input'; export const metaDescription = 'Text input, used in forms'; diff --git a/src/pages/modal.module.scss b/pages/modal.module.scss similarity index 70% rename from src/pages/modal.module.scss rename to pages/modal.module.scss index 6cb12f19..07c4b273 100644 --- a/src/pages/modal.module.scss +++ b/pages/modal.module.scss @@ -1,5 +1,5 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/typography.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/typography.scss'; .modal { h1, diff --git a/src/pages/modal.tsx b/pages/modal.tsx similarity index 95% rename from src/pages/modal.tsx rename to pages/modal.tsx index 267c0304..8f4bd816 100644 --- a/src/pages/modal.tsx +++ b/pages/modal.tsx @@ -1,10 +1,10 @@ import React, { useState, useCallback } from 'react'; -import { Explain } from '../components/Explain'; -import { Modal, getCssClassNames } from '../components/modal/Modal'; +import { Explain } from '../src/components/Explain'; +import { Modal, getCssClassNames } from '../src/components/modal/Modal'; import Head from 'next/head'; -import { Switch } from '../components/input/Switch'; +import { Switch } from '../src/components/input/Switch'; import styles from './modal.module.scss'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; export const metaTitle = 'Modal'; export const metaDescription = 'Modal, used to display a modal overlay'; diff --git a/src/pages/numberframe.tsx b/pages/numberframe.tsx similarity index 89% rename from src/pages/numberframe.tsx rename to pages/numberframe.tsx index 440ae760..efe0026d 100644 --- a/src/pages/numberframe.tsx +++ b/pages/numberframe.tsx @@ -1,12 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { NumberFrame, getCssClassNames, -} from '../components/numberframe/NumberFrame'; -import PageStore from '../stores/PageStore'; +} from '../src/components/numberframe/NumberFrame'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { number: `57%`, diff --git a/src/pages/quote.tsx b/pages/quote.tsx similarity index 88% rename from src/pages/quote.tsx rename to pages/quote.tsx index 9d88cb62..4588c15c 100644 --- a/src/pages/quote.tsx +++ b/pages/quote.tsx @@ -1,9 +1,9 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; -import { Quote, getCssClassNames } from '../components/quote/Quote'; -import PageStore from '../stores/PageStore'; +import { Explain } from '../src/components/Explain'; +import { Quote, getCssClassNames } from '../src/components/quote/Quote'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { blockquote: `Je moet je afvragen wat er gebeurt als je één partij hebt – in diff --git a/src/pages/readmore.tsx b/pages/readmore.tsx similarity index 93% rename from src/pages/readmore.tsx rename to pages/readmore.tsx index 17c3ad2c..4e2e86b0 100644 --- a/src/pages/readmore.tsx +++ b/pages/readmore.tsx @@ -1,9 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; -import { ReadMore, getCssClassNames } from '../components/readmore/ReadMore'; -import PageStore from '../stores/PageStore'; +import { Explain } from '../src/components/Explain'; +import { + ReadMore, + getCssClassNames, +} from '../src/components/readmore/ReadMore'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { title: `Ridiculus Sollicitudin Cras Ipsum Ornare`, diff --git a/src/pages/search.module.scss b/pages/search.module.scss similarity index 68% rename from src/pages/search.module.scss rename to pages/search.module.scss index 3c062138..65b669c7 100644 --- a/src/pages/search.module.scss +++ b/pages/search.module.scss @@ -1,6 +1,6 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/colors.scss'; -@import '../design-tokens/media.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/colors.scss'; +@import '../src/design-tokens/media.scss'; .search { .searchContent { diff --git a/src/pages/search.tsx b/pages/search.tsx similarity index 98% rename from src/pages/search.tsx rename to pages/search.tsx index 57421bb7..60f06f73 100644 --- a/src/pages/search.tsx +++ b/pages/search.tsx @@ -7,7 +7,7 @@ import { GridContainer } from '@fdmg/css-grid/GridContainer'; import Head from 'next/head'; import { useRouter } from 'next/router'; import React, { useEffect, useState } from 'react'; -import { HorizontalCard3 } from '../components/card/HorizontalCard3'; +import { HorizontalCard3 } from '../src/components/card/HorizontalCard3'; import styles from './search.module.scss'; import { metaTitle as abTitle, metaDescription as abDescription } from './ab'; @@ -203,8 +203,8 @@ import { metaTitle as wordframeTitle, metaDescription as wordframeDescription, } from './wordframe'; -import { TextInput } from '../components/input/TextInput'; -import { handleSearchSubmit, interceptLinks } from '../utils/search'; +import { TextInput } from '../src/components/input/TextInput'; +import { handleSearchSubmit, interceptLinks } from '../src/utils/search'; type SearchIndex = { [x: string]: { diff --git a/src/pages/stock-ticker.tsx b/pages/stock-ticker.tsx similarity index 96% rename from src/pages/stock-ticker.tsx rename to pages/stock-ticker.tsx index f9a2819f..b95e0076 100644 --- a/src/pages/stock-ticker.tsx +++ b/pages/stock-ticker.tsx @@ -1,12 +1,12 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import { StockTicker, getCssClassNames, Props, -} from '../components/stockticker/StockTicker'; +} from '../src/components/stockticker/StockTicker'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps: Props = { stocks: [ diff --git a/src/pages/textframe.tsx b/pages/textframe.tsx similarity index 88% rename from src/pages/textframe.tsx rename to pages/textframe.tsx index 64dd63fd..d97d8f75 100644 --- a/src/pages/textframe.tsx +++ b/pages/textframe.tsx @@ -1,9 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; -import { TextFrame, getCssClassNames } from '../components/textframe/TextFrame'; -import PageStore from '../stores/PageStore'; +import { Explain } from '../src/components/Explain'; +import { + TextFrame, + getCssClassNames, +} from '../src/components/textframe/TextFrame'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { title: 'Integer posuere erat a ante venenatis dapibus posuere velit aliquet', diff --git a/src/pages/tokens.module.scss b/pages/tokens.module.scss similarity index 93% rename from src/pages/tokens.module.scss rename to pages/tokens.module.scss index 8881ae04..c42e6484 100644 --- a/src/pages/tokens.module.scss +++ b/pages/tokens.module.scss @@ -1,7 +1,7 @@ -@import '../utils/map-deep-get.scss'; -@import '../design-tokens/colors.scss'; -@import '../design-tokens/typography.scss'; -@import '../design-tokens/media.scss'; +@import '../src/utils/map-deep-get.scss'; +@import '../src/design-tokens/colors.scss'; +@import '../src/design-tokens/typography.scss'; +@import '../src/design-tokens/media.scss'; .tokens { display: flex; diff --git a/src/pages/tokens.tsx b/pages/tokens.tsx similarity index 96% rename from src/pages/tokens.tsx rename to pages/tokens.tsx index 94f182a3..d325f823 100644 --- a/src/pages/tokens.tsx +++ b/pages/tokens.tsx @@ -3,9 +3,9 @@ import styles from './tokens.module.scss'; import fs from 'fs'; import path from 'path'; import Head from 'next/head'; -import colors from '../../public/assets/design-tokens/colors.json'; -import media from '../../public/assets/design-tokens/media.json'; -import typography from '../../public/assets/design-tokens/typography.json'; +import colors from '../public/assets/design-tokens/colors.json'; +import media from '../public/assets/design-tokens/media.json'; +import typography from '../public/assets/design-tokens/typography.json'; interface Props { icons: any; diff --git a/src/pages/toolbar/horizontal.tsx b/pages/toolbar/horizontal.tsx similarity index 90% rename from src/pages/toolbar/horizontal.tsx rename to pages/toolbar/horizontal.tsx index 02f901c4..531628cf 100644 --- a/src/pages/toolbar/horizontal.tsx +++ b/pages/toolbar/horizontal.tsx @@ -1,14 +1,14 @@ import React, { useEffect, useState } from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { HorizontalToolbar, getCssClassNames, EventType, Props as HybridToolbarProps, -} from '../../components/toolbar/HorizontalToolbar'; -import PageStore from '../../stores/PageStore'; +} from '../../src/components/toolbar/HorizontalToolbar'; +import PageStore from '../../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Horizontal toolbar'; export const metaDescription = diff --git a/src/pages/toolbar/vertical.tsx b/pages/toolbar/vertical.tsx similarity index 90% rename from src/pages/toolbar/vertical.tsx rename to pages/toolbar/vertical.tsx index 432080c9..891ce7e1 100644 --- a/src/pages/toolbar/vertical.tsx +++ b/pages/toolbar/vertical.tsx @@ -1,14 +1,14 @@ import React, { useEffect, useState } from 'react'; -import { Explain } from '../../components/Explain'; +import { Explain } from '../../src/components/Explain'; import { VerticalToolbar, getCssClassNames, EventType, Props as HybridToolbarProps, -} from '../../components/toolbar/VerticalToolbar'; -import PageStore from '../../stores/PageStore'; +} from '../../src/components/toolbar/VerticalToolbar'; +import PageStore from '../../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../../utils/globalCssClassNames'; +import { globalCssClassNames } from '../../src/utils/globalCssClassNames'; export const metaTitle = 'Vertical toolbar'; export const metaDescription = diff --git a/src/pages/typography.tsx b/pages/typography.tsx similarity index 99% rename from src/pages/typography.tsx rename to pages/typography.tsx index 5620a32f..2640ab2e 100644 --- a/src/pages/typography.tsx +++ b/pages/typography.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Explain } from '../components/Explain'; +import { Explain } from '../src/components/Explain'; import Head from 'next/head'; export const metaTitle = 'Typograhpy'; diff --git a/src/pages/wordframe.tsx b/pages/wordframe.tsx similarity index 88% rename from src/pages/wordframe.tsx rename to pages/wordframe.tsx index 05f00c3f..11729a81 100644 --- a/src/pages/wordframe.tsx +++ b/pages/wordframe.tsx @@ -1,9 +1,12 @@ import React, { useEffect } from 'react'; -import { Explain } from '../components/Explain'; -import { WordFrame, getCssClassNames } from '../components/wordframe/WordFrame'; -import PageStore from '../stores/PageStore'; +import { Explain } from '../src/components/Explain'; +import { + WordFrame, + getCssClassNames, +} from '../src/components/wordframe/WordFrame'; +import PageStore from '../src/stores/PageStore'; import Head from 'next/head'; -import { globalCssClassNames } from '../utils/globalCssClassNames'; +import { globalCssClassNames } from '../src/utils/globalCssClassNames'; const initialProps = { title: `WordFrame test`, diff --git a/src/pages/downloads.module.scss b/src/pages/downloads.module.scss deleted file mode 100644 index ac4f5a84..00000000 --- a/src/pages/downloads.module.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import "../utils/map-deep-get.scss"; -@import "../design-tokens/typography.scss"; - -.downloads { - h1 { - font-family: map-deep-get($typography, "font-family", "bold"), - sans-serif; - } -}