From 01e7fc63a7493196b7e1def9f5be7f41e998f5fe Mon Sep 17 00:00:00 2001 From: Michael Drayer Date: Mon, 4 Mar 2024 16:48:51 -0500 Subject: [PATCH] [83] Configure prettier-plugin-organize-imports. Add mdx files to prettierignore. Run prettier write. --- .prettierignore | 1 + .prettierrc | 1 + pages/_app.tsx | 2 +- pages/_document.tsx | 1 - source/00-config/constants.ts | 2 +- source/00-config/mixins/button.css | 2 +- source/00-config/mixins/link.css | 6 ++--- source/00-config/vars/easing.css | 2 +- .../01-typography/line-height.module.css | 1 - .../Constrain/Constrain.stories.tsx | 2 +- source/02-layouts/Footer/Footer.tsx | 2 +- source/02-layouts/Header/Header.tsx | 2 +- .../InlineForm/InlineForm.stories.tsx | 2 +- source/02-layouts/Main/Main.tsx | 2 +- source/02-layouts/Media/Media.stories.tsx | 2 +- .../ResponsiveTable.stories.tsx | 2 +- source/02-layouts/Section/Section.tsx | 2 +- .../SiteContainer/SiteContainer.stories.tsx | 2 +- .../Accordion/Accordion.stories.tsx | 2 +- source/03-components/Accordion/Accordion.tsx | 4 ++-- .../03-components/Accordion/AccordionItem.tsx | 2 +- .../Accordion/accordion-item.module.css | 8 +++---- .../BackToTop/BackToTop.stories.tsx | 2 +- .../03-components/Breadcrumb/Breadcrumb.tsx | 2 +- .../03-components/Button/Button.stories.tsx | 3 +-- source/03-components/Button/Button.tsx | 4 ++-- .../ButtonGroup/ButtonGroup.stories.tsx | 2 +- .../ButtonGroup/button-group.yml | 10 ++++---- source/03-components/Card/card.yml | 16 ++++++------- .../FormItem/FormItem.stories.tsx | 2 +- source/03-components/FormItem/FormItem.tsx | 2 +- .../03-components/FormItem/Input.stories.tsx | 2 +- .../FormItem/form-item-input.css | 18 +++++++++++++- .../HeroBgImage/HeroBgImage.stories.tsx | 2 +- .../HeroInlineImage.stories.tsx | 2 +- .../ImageTeaser/ImageTeaser.stories.tsx | 2 +- .../ImageTeaser/image-teaser.yml | 18 +++++++------- source/03-components/List/List.stories.tsx | 2 +- source/03-components/Menu/Menu.tsx | 2 +- .../Menu/OverlayMenu/OverlayMenu.stories.tsx | 2 +- .../Menu/OverlayMenu/OverlayMenu.tsx | 2 +- .../Menu/OverlayMenu/overlay-menu.yml | 12 ++++------ .../ResponsiveMenu/ResponsiveMenu.stories.tsx | 2 +- .../Menu/ResponsiveMenu/responsive-menu.yml | 12 ++++------ source/03-components/Menu/menu.module.css | 2 +- source/03-components/Menu/menu.yml | 4 ++-- .../PageTitle/PageTitle.stories.tsx | 2 +- .../ReadMoreLink/ReadMoreLink.stories.tsx | 2 +- .../SiteName/SiteName.stories.tsx | 2 +- .../StyledSelect/StyledSelect.stories.tsx | 2 +- .../StyledSelect/styled-select.yml | 18 +++++--------- .../StyledSelect/with-groups.yml | 24 +++++++------------ .../03-components/TagList/TagList.stories.tsx | 2 +- source/03-components/TagList/tag-list.yml | 12 ++++------ .../LandingPage/LandingPage.stories.tsx | 3 +-- source/04-templates/Page/Page.stories.tsx | 3 +-- source/05-pages/Page.stories.tsx | 5 ++-- source/05-pages/page-wrappers/default.tsx | 2 +- source/gesso.d.ts | 2 +- 59 files changed, 122 insertions(+), 136 deletions(-) diff --git a/.prettierignore b/.prettierignore index a773b0ba..b7c11a53 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,3 @@ source/01-global/icon/**/*.svg source/01-global/icon/**/*.tsx +source/**/*.mdx diff --git a/.prettierrc b/.prettierrc index d5fc477c..416fe902 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,6 +3,7 @@ "bracketSpacing": true, "endOfLine": "lf", "bracketSameLine": false, + "plugins": ["prettier-plugin-organize-imports"], "printWidth": 80, "quoteProps": "as-needed", "semi": true, diff --git a/pages/_app.tsx b/pages/_app.tsx index 6556115f..bfc1e75c 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -7,8 +7,8 @@ import Header from '../source/02-layouts/Header/Header'; import SiteContainer from '../source/02-layouts/SiteContainer/SiteContainer'; import BackToTop from '../source/03-components/BackToTop/BackToTop'; import Menu from '../source/03-components/Menu/Menu'; -import footerStyles from '../source/03-components/Menu/menu-footer.module.css'; import ResponsiveMenu from '../source/03-components/Menu/ResponsiveMenu/ResponsiveMenu'; +import footerStyles from '../source/03-components/Menu/menu-footer.module.css'; import SiteName from '../source/03-components/SiteName/SiteName'; import Skiplink from '../source/03-components/Skiplink/Skiplink'; import addBasePath from '../source/06-utility/addBasePath'; diff --git a/pages/_document.tsx b/pages/_document.tsx index 8e5e236d..f0c86340 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -1,5 +1,4 @@ import Document, { Head, Html, Main, NextScript } from 'next/document'; -import React from 'react'; class MyDocument extends Document { render() { diff --git a/source/00-config/constants.ts b/source/00-config/constants.ts index 3e2aecbc..04e5ae19 100644 --- a/source/00-config/constants.ts +++ b/source/00-config/constants.ts @@ -15,4 +15,4 @@ const KEYCODE = { DOWN: 'ArrowDown', }; -export { MAIN_ID, KEYCODE }; +export { KEYCODE, MAIN_ID }; diff --git a/source/00-config/mixins/button.css b/source/00-config/mixins/button.css index 07ccdf6a..1cc1686b 100644 --- a/source/00-config/mixins/button.css +++ b/source/00-config/mixins/button.css @@ -4,7 +4,7 @@ background-color: var(--button-background-color); @if $border-width != 0 { border: $border-width solid var(--button-border-color); - } @else { + } @else { border: 0; } diff --git a/source/00-config/mixins/link.css b/source/00-config/mixins/link.css index dc983260..262b1d95 100644 --- a/source/00-config/mixins/link.css +++ b/source/00-config/mixins/link.css @@ -19,17 +19,17 @@ --text-link: $link; @if $hover != '' { --text-link-hover: $hover; - } @else { + } @else { --text-link-hover: var(--text-link); } @if $active != '' { --text-link-active: $active; - } @else { + } @else { --text-link-active: var(--text-link-hover); } @if $visit != '' { --text-link-visited: $visit; - } @else { + } @else { --text-link-visited: var(--text-link); } } diff --git a/source/00-config/vars/easing.css b/source/00-config/vars/easing.css index 8574bda1..8a2eff7c 100644 --- a/source/00-config/vars/easing.css +++ b/source/00-config/vars/easing.css @@ -1,6 +1,6 @@ :root { --easing-ease-in-out: cubic-bezier(0.4, 0, 0.2, 1); - --easing-ease-out: cubic-bezier(0.0, 0, 0.2, 1); + --easing-ease-out: cubic-bezier(0, 0, 0.2, 1); --easing-ease-in: cubic-bezier(0.4, 0, 1, 1); --easing-sharp: cubic-bezier(0.4, 0, 0.6, 1); } diff --git a/source/01-global/01-typography/line-height.module.css b/source/01-global/01-typography/line-height.module.css index 88ce224c..e9a69141 100644 --- a/source/01-global/01-typography/line-height.module.css +++ b/source/01-global/01-typography/line-height.module.css @@ -1,4 +1,3 @@ - .line-height { margin: 1rem 1rem 3rem; } diff --git a/source/02-layouts/Constrain/Constrain.stories.tsx b/source/02-layouts/Constrain/Constrain.stories.tsx index 22549721..87301d1c 100644 --- a/source/02-layouts/Constrain/Constrain.stories.tsx +++ b/source/02-layouts/Constrain/Constrain.stories.tsx @@ -1,7 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; import SampleContent from '../../06-utility/storybook/SampleContent'; -import constrainArgs from './constrain.yml'; import ConstrainLayout from './Constrain'; +import constrainArgs from './constrain.yml'; const meta: Meta = { title: 'Layouts/Constrain', diff --git a/source/02-layouts/Footer/Footer.tsx b/source/02-layouts/Footer/Footer.tsx index 997bba20..438a9bf8 100644 --- a/source/02-layouts/Footer/Footer.tsx +++ b/source/02-layouts/Footer/Footer.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { ConstrainComponent } from 'gesso'; -import Constrain from '../Constrain/Constrain'; import { ReactNode } from 'react'; +import Constrain from '../Constrain/Constrain'; import styles from './footer.module.css'; interface FooterProps extends ConstrainComponent { diff --git a/source/02-layouts/Header/Header.tsx b/source/02-layouts/Header/Header.tsx index e7e1c0e9..623e1823 100644 --- a/source/02-layouts/Header/Header.tsx +++ b/source/02-layouts/Header/Header.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { ConstrainComponent } from 'gesso'; -import Constrain from '../Constrain/Constrain'; import { ReactNode } from 'react'; +import Constrain from '../Constrain/Constrain'; import styles from './header.module.css'; interface HeaderProps extends ConstrainComponent { diff --git a/source/02-layouts/InlineForm/InlineForm.stories.tsx b/source/02-layouts/InlineForm/InlineForm.stories.tsx index 95016818..924b788f 100644 --- a/source/02-layouts/InlineForm/InlineForm.stories.tsx +++ b/source/02-layouts/InlineForm/InlineForm.stories.tsx @@ -1,7 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; import SampleContent from '../../06-utility/storybook/SampleContent'; -import inlineFormArgs from './inline-form.yml'; import InlineFormLayout from './InlineForm'; +import inlineFormArgs from './inline-form.yml'; const meta: Meta = { title: 'Layouts/Inline Form', diff --git a/source/02-layouts/Main/Main.tsx b/source/02-layouts/Main/Main.tsx index e1e307ac..4f4db0f9 100644 --- a/source/02-layouts/Main/Main.tsx +++ b/source/02-layouts/Main/Main.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { ConstrainComponent } from 'gesso'; -import Constrain from '../Constrain/Constrain'; import { ReactNode } from 'react'; +import Constrain from '../Constrain/Constrain'; import styles from './main.module.css'; interface MainProps extends ConstrainComponent { diff --git a/source/02-layouts/Media/Media.stories.tsx b/source/02-layouts/Media/Media.stories.tsx index 0fae0b48..381585c7 100644 --- a/source/02-layouts/Media/Media.stories.tsx +++ b/source/02-layouts/Media/Media.stories.tsx @@ -42,4 +42,4 @@ const Reversed: Story = { }; export default meta; -export { Default, Column, Reversed }; +export { Column, Default, Reversed }; diff --git a/source/02-layouts/ResponsiveTable/ResponsiveTable.stories.tsx b/source/02-layouts/ResponsiveTable/ResponsiveTable.stories.tsx index a73f7855..69e1f226 100644 --- a/source/02-layouts/ResponsiveTable/ResponsiveTable.stories.tsx +++ b/source/02-layouts/ResponsiveTable/ResponsiveTable.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import responsiveTableArgs from './responsive-table.yml'; import ResponsiveTableComponent from './ResponsiveTable'; +import responsiveTableArgs from './responsive-table.yml'; const meta: Meta = { title: 'Layouts/Responsive Table', diff --git a/source/02-layouts/Section/Section.tsx b/source/02-layouts/Section/Section.tsx index 87df27c5..e2e73df2 100644 --- a/source/02-layouts/Section/Section.tsx +++ b/source/02-layouts/Section/Section.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { ConstrainComponent } from 'gesso'; -import Constrain from '../Constrain/Constrain'; import { ElementType, ReactNode } from 'react'; +import Constrain from '../Constrain/Constrain'; import styles from './section.module.css'; interface SectionProps extends ConstrainComponent { diff --git a/source/02-layouts/SiteContainer/SiteContainer.stories.tsx b/source/02-layouts/SiteContainer/SiteContainer.stories.tsx index 92ad17f6..9e7da5d3 100644 --- a/source/02-layouts/SiteContainer/SiteContainer.stories.tsx +++ b/source/02-layouts/SiteContainer/SiteContainer.stories.tsx @@ -1,7 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; import SampleContent from '../../06-utility/storybook/SampleContent'; -import siteContainerArgs from './site-container.yml'; import SiteContainerLayout from './SiteContainer'; +import siteContainerArgs from './site-container.yml'; const meta: Meta = { title: 'Layouts/Site Container', diff --git a/source/03-components/Accordion/Accordion.stories.tsx b/source/03-components/Accordion/Accordion.stories.tsx index 718f8f66..9d3a66f8 100644 --- a/source/03-components/Accordion/Accordion.stories.tsx +++ b/source/03-components/Accordion/Accordion.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; import parse from 'html-react-parser'; import AccordionComponent from './Accordion'; -import accordionArgs from './accordion.yml'; import { AccordionItemProps } from './AccordionItem'; +import accordionArgs from './accordion.yml'; const meta: Meta = { title: 'Components/Accordion', diff --git a/source/03-components/Accordion/Accordion.tsx b/source/03-components/Accordion/Accordion.tsx index 5a4fbf1d..60292930 100644 --- a/source/03-components/Accordion/Accordion.tsx +++ b/source/03-components/Accordion/Accordion.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; import { GessoComponent } from 'gesso'; import { KeyboardEvent, createRef, useId, useMemo, useState } from 'react'; -import styles from './accordion.module.css'; -import getCssVar from '../../06-utility/getCssVar'; import { KEYCODE } from '../../00-config/constants'; +import getCssVar from '../../06-utility/getCssVar'; import AccordionItem, { AccordionItemProps } from './AccordionItem'; +import styles from './accordion.module.css'; interface AccordionProps extends GessoComponent { accordionItems: AccordionItemProps[]; diff --git a/source/03-components/Accordion/AccordionItem.tsx b/source/03-components/Accordion/AccordionItem.tsx index 45f47db5..691a33bb 100644 --- a/source/03-components/Accordion/AccordionItem.tsx +++ b/source/03-components/Accordion/AccordionItem.tsx @@ -7,8 +7,8 @@ import { useEffect, useRef, } from 'react'; -import styles from './accordion-item.module.css'; import { slideCollapse, slideExpand } from '../../06-utility/slide'; +import styles from './accordion-item.module.css'; export interface AccordionItemProps extends GessoComponent { id: string; diff --git a/source/03-components/Accordion/accordion-item.module.css b/source/03-components/Accordion/accordion-item.module.css index ee2f362c..6a9e6f44 100644 --- a/source/03-components/Accordion/accordion-item.module.css +++ b/source/03-components/Accordion/accordion-item.module.css @@ -43,7 +43,7 @@ inset-inline-end: var(--spacing-3); position: absolute; transform: translateY(-50%); - + &::before, &::after { background-color: var(--ui-accent); @@ -60,11 +60,11 @@ transition-property: transform; transition-timing-function: var(--easing-ease-out); } - + &::after { transform: translate(-50%, -50%) rotate(90deg); } - + [aria-expanded='true'] & { &::after { transform: translate(-50%, -50%) rotate(0deg); @@ -79,7 +79,7 @@ .drawerInner { padding-block: 0 var(--spacing-2); padding-inline: var(--spacing-2) var(--spacing-8); - + > :last-child { margin-block-end: 0; } diff --git a/source/03-components/BackToTop/BackToTop.stories.tsx b/source/03-components/BackToTop/BackToTop.stories.tsx index 2cd76792..4483e9bf 100644 --- a/source/03-components/BackToTop/BackToTop.stories.tsx +++ b/source/03-components/BackToTop/BackToTop.stories.tsx @@ -1,7 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; +import BackToTopComponent from './BackToTop'; import styles from './back-to-top.module.css'; import backToTopArgs from './back-to-top.yml'; -import BackToTopComponent from './BackToTop'; const meta: Meta = { title: 'Components/Back To Top', diff --git a/source/03-components/Breadcrumb/Breadcrumb.tsx b/source/03-components/Breadcrumb/Breadcrumb.tsx index 7aaf390e..471eb415 100644 --- a/source/03-components/Breadcrumb/Breadcrumb.tsx +++ b/source/03-components/Breadcrumb/Breadcrumb.tsx @@ -1,8 +1,8 @@ import clsx from 'clsx'; import { GessoComponent } from 'gesso'; -import Constrain from '../../02-layouts/Constrain/Constrain'; import Link from 'next/link'; import { ElementType } from 'react'; +import Constrain from '../../02-layouts/Constrain/Constrain'; import styles from './breadcrumb.module.css'; interface Crumbs { diff --git a/source/03-components/Button/Button.stories.tsx b/source/03-components/Button/Button.stories.tsx index 1ae30ecf..d6d0600e 100644 --- a/source/03-components/Button/Button.stories.tsx +++ b/source/03-components/Button/Button.stories.tsx @@ -1,5 +1,4 @@ import { Meta, StoryObj } from '@storybook/react'; -import React from 'react'; import { Button as ButtonComponent, LinkButton as LinkButtonComponent, @@ -71,4 +70,4 @@ const Small: Story = { }; export default meta; -export { Primary, Secondary, Danger, Large, Small }; +export { Danger, Large, Primary, Secondary, Small }; diff --git a/source/03-components/Button/Button.tsx b/source/03-components/Button/Button.tsx index c5e46a09..fbd1666b 100644 --- a/source/03-components/Button/Button.tsx +++ b/source/03-components/Button/Button.tsx @@ -1,5 +1,5 @@ import clsx from 'clsx'; -import React, { ComponentProps } from 'react'; +import { ComponentProps } from 'react'; import styles from './button.module.css'; interface SharedButtonProps { @@ -65,5 +65,5 @@ const LinkButton = ({ ); }; -export type { SharedButtonProps, ButtonProps, LinkProps }; export { Button, LinkButton }; +export type { ButtonProps, LinkProps, SharedButtonProps }; diff --git a/source/03-components/ButtonGroup/ButtonGroup.stories.tsx b/source/03-components/ButtonGroup/ButtonGroup.stories.tsx index 4c10eec4..50a4bded 100644 --- a/source/03-components/ButtonGroup/ButtonGroup.stories.tsx +++ b/source/03-components/ButtonGroup/ButtonGroup.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import buttonGroupArgs from './button-group.yml'; import ButtonGroupComponent from './ButtonGroup'; +import buttonGroupArgs from './button-group.yml'; const meta: Meta = { title: 'Components/Button Group', diff --git a/source/03-components/ButtonGroup/button-group.yml b/source/03-components/ButtonGroup/button-group.yml index 65dc9cc4..b6424bb2 100644 --- a/source/03-components/ButtonGroup/button-group.yml +++ b/source/03-components/ButtonGroup/button-group.yml @@ -3,9 +3,9 @@ heading: 'Heading' element: 'div' modifierClasses: '' buttons: - - text: 'First button' - - text: 'Active middle button' - isActive: true - - text: 'Middle button' - - text: 'Last button' + - text: 'First button' + - text: 'Active middle button' + isActive: true + - text: 'Middle button' + - text: 'Last button' activeLabel: '(active)' diff --git a/source/03-components/Card/card.yml b/source/03-components/Card/card.yml index fd566000..c76ce3af 100644 --- a/source/03-components/Card/card.yml +++ b/source/03-components/Card/card.yml @@ -6,13 +6,13 @@ date: 'September 28, 2018' readMore: true media: 'Placeholder card image' tags: -- url: '#0' - title: 'Tag 1' -- url: '#0' - title: 'Tag 2' -- url: '#0' - title: 'Tag 3' -- url: '#0' - title: 'Tag 4' + - url: '#0' + title: 'Tag 1' + - url: '#0' + title: 'Tag 2' + - url: '#0' + title: 'Tag 3' + - url: '#0' + title: 'Tag 4' children: |-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam et accumsan augue. Morbi non laoreet lorem.

diff --git a/source/03-components/FormItem/FormItem.stories.tsx b/source/03-components/FormItem/FormItem.stories.tsx index c7714638..f970e22f 100644 --- a/source/03-components/FormItem/FormItem.stories.tsx +++ b/source/03-components/FormItem/FormItem.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import checkboxArgs from './checkbox.yml'; import { Input } from './FormItem'; +import checkboxArgs from './checkbox.yml'; import radioArgs from './radio.yml'; const meta: Meta = { diff --git a/source/03-components/FormItem/FormItem.tsx b/source/03-components/FormItem/FormItem.tsx index 5949b43d..a3d5a781 100644 --- a/source/03-components/FormItem/FormItem.tsx +++ b/source/03-components/FormItem/FormItem.tsx @@ -6,9 +6,9 @@ import { ReactNode, SelectHTMLAttributes, } from 'react'; -import styles from './form-item.module.css'; import FormItemLabel from './FormItemLabel'; import FormItemWrapper from './FormItemWrapper'; +import styles from './form-item.module.css'; interface FormItemProps extends GessoComponent { id: string; diff --git a/source/03-components/FormItem/Input.stories.tsx b/source/03-components/FormItem/Input.stories.tsx index 541e5fdb..d7e8f345 100644 --- a/source/03-components/FormItem/Input.stories.tsx +++ b/source/03-components/FormItem/Input.stories.tsx @@ -1,11 +1,11 @@ import { Meta, StoryObj } from '@storybook/react'; +import { Input } from './FormItem'; import colorArgs from './color.yml'; import dateArgs from './date.yml'; import decimalArgs from './decimal.yml'; import emailArgs from './email.yml'; import fileArgs from './file.yml'; import floatArgs from './float.yml'; -import { Input } from './FormItem'; import integerArgs from './integer.yml'; import monthArgs from './month.yml'; import passwordArgs from './password.yml'; diff --git a/source/03-components/FormItem/form-item-input.css b/source/03-components/FormItem/form-item-input.css index e088c5ea..2d7a06a2 100644 --- a/source/03-components/FormItem/form-item-input.css +++ b/source/03-components/FormItem/form-item-input.css @@ -1,4 +1,20 @@ -:is(.form-item--box, .form-item--color, .form-item--date, .form-item--email, .form-item--file, .form-item--month, .form-item--number, .form-item--password, .form-item--search, .form-item--select, .form-item--tel, .form-item--text, .form-item--time, .form-item--url, .form-item--week) { +:is( + .form-item--box, + .form-item--color, + .form-item--date, + .form-item--email, + .form-item--file, + .form-item--month, + .form-item--number, + .form-item--password, + .form-item--search, + .form-item--select, + .form-item--tel, + .form-item--text, + .form-item--time, + .form-item--url, + .form-item--week + ) { & :is(input, select) { @include focus; diff --git a/source/03-components/HeroBgImage/HeroBgImage.stories.tsx b/source/03-components/HeroBgImage/HeroBgImage.stories.tsx index 6367b593..4db8ef7e 100644 --- a/source/03-components/HeroBgImage/HeroBgImage.stories.tsx +++ b/source/03-components/HeroBgImage/HeroBgImage.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; import parse from 'html-react-parser'; +import HeroBgImage from './HeroBgImage'; import styles from './hero-bg-image.module.css'; import heroBgImageArgs from './hero-bg-image.yml'; -import HeroBgImage from './HeroBgImage'; const meta: Meta = { title: 'Components/Hero/Hero With Background Image', diff --git a/source/03-components/HeroInlineImage/HeroInlineImage.stories.tsx b/source/03-components/HeroInlineImage/HeroInlineImage.stories.tsx index 3137a4dc..944112d4 100644 --- a/source/03-components/HeroInlineImage/HeroInlineImage.stories.tsx +++ b/source/03-components/HeroInlineImage/HeroInlineImage.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; import parse from 'html-react-parser'; +import HeroInlineImage from './HeroInlineImage'; import styles from './hero-inline-image.module.css'; import heroInlineImageArgs from './hero-inline-image.yml'; -import HeroInlineImage from './HeroInlineImage'; const meta: Meta = { title: 'Components/Hero/Hero With Inline Image', diff --git a/source/03-components/ImageTeaser/ImageTeaser.stories.tsx b/source/03-components/ImageTeaser/ImageTeaser.stories.tsx index 37f005f9..60183947 100644 --- a/source/03-components/ImageTeaser/ImageTeaser.stories.tsx +++ b/source/03-components/ImageTeaser/ImageTeaser.stories.tsx @@ -1,7 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; import parse from 'html-react-parser'; -import imageTeaserArgs from './image-teaser.yml'; import ImageTeaserComponent from './ImageTeaser'; +import imageTeaserArgs from './image-teaser.yml'; const meta: Meta = { title: 'Components/Image Teaser', diff --git a/source/03-components/ImageTeaser/image-teaser.yml b/source/03-components/ImageTeaser/image-teaser.yml index 78c85c38..fab34307 100644 --- a/source/03-components/ImageTeaser/image-teaser.yml +++ b/source/03-components/ImageTeaser/image-teaser.yml @@ -1,15 +1,15 @@ --- url: '#0' image: |- - Thumbnail placeholder + Thumbnail placeholder title: 'Title' date: 'Teaser Date' summary: |- -

- This is the summary, which can contain - HTML markup. It should be - 600 characters or less. -

+

+ This is the summary, which can contain + HTML markup. It should be + 600 characters or less. +

diff --git a/source/03-components/List/List.stories.tsx b/source/03-components/List/List.stories.tsx index 7de86dcf..fb07448e 100644 --- a/source/03-components/List/List.stories.tsx +++ b/source/03-components/List/List.stories.tsx @@ -50,4 +50,4 @@ const Column: Story = { }; export default meta; -export { Clean, Inline, Pipeline, Border, Column }; +export { Border, Clean, Column, Inline, Pipeline }; diff --git a/source/03-components/Menu/Menu.tsx b/source/03-components/Menu/Menu.tsx index 3f34ee27..29a6d978 100644 --- a/source/03-components/Menu/Menu.tsx +++ b/source/03-components/Menu/Menu.tsx @@ -74,5 +74,5 @@ function Menu({ } export default Menu; -export type { MenuLinksProps, MenuProps, MenuItem }; export { MenuLinks }; +export type { MenuItem, MenuLinksProps, MenuProps }; diff --git a/source/03-components/Menu/OverlayMenu/OverlayMenu.stories.tsx b/source/03-components/Menu/OverlayMenu/OverlayMenu.stories.tsx index 8a67872e..2be87659 100644 --- a/source/03-components/Menu/OverlayMenu/OverlayMenu.stories.tsx +++ b/source/03-components/Menu/OverlayMenu/OverlayMenu.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import overlayMenuArgs from './overlay-menu.yml'; import OverlayMenuComponent from './OverlayMenu'; +import overlayMenuArgs from './overlay-menu.yml'; const meta: Meta = { title: 'Components/Menu/Overlay Menu', diff --git a/source/03-components/Menu/OverlayMenu/OverlayMenu.tsx b/source/03-components/Menu/OverlayMenu/OverlayMenu.tsx index 5e568e23..435390e2 100644 --- a/source/03-components/Menu/OverlayMenu/OverlayMenu.tsx +++ b/source/03-components/Menu/OverlayMenu/OverlayMenu.tsx @@ -1,8 +1,8 @@ import clsx from 'clsx'; import { GessoComponent } from 'gesso'; import { useEffect, useId, useState } from 'react'; -import buttonStyles from '../../HamburgerButton/hamburger-button.module.css'; import HamburgerButton from '../../HamburgerButton/HamburgerButton'; +import buttonStyles from '../../HamburgerButton/hamburger-button.module.css'; import Menu, { MenuItem } from '../Menu'; import styles from './overlay-menu.module.css'; diff --git a/source/03-components/Menu/OverlayMenu/overlay-menu.yml b/source/03-components/Menu/OverlayMenu/overlay-menu.yml index 808de6ca..006bb011 100644 --- a/source/03-components/Menu/OverlayMenu/overlay-menu.yml +++ b/source/03-components/Menu/OverlayMenu/overlay-menu.yml @@ -1,18 +1,14 @@ --- items: - - - title: 'Home' + - title: 'Home' url: '#0' inActiveTrail: false - - - title: 'About' + - title: 'About' url: '#0' inActiveTrail: false - - - title: 'Resources' + - title: 'Resources' url: '#0' inActiveTrail: false - - - title: 'Contact' + - title: 'Contact' url: '#0' inActiveTrail: false diff --git a/source/03-components/Menu/ResponsiveMenu/ResponsiveMenu.stories.tsx b/source/03-components/Menu/ResponsiveMenu/ResponsiveMenu.stories.tsx index be960fb9..122b1b53 100644 --- a/source/03-components/Menu/ResponsiveMenu/ResponsiveMenu.stories.tsx +++ b/source/03-components/Menu/ResponsiveMenu/ResponsiveMenu.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import responsiveMenuArgs from './responsive-menu.yml'; import ResponsiveMenuComponent from './ResponsiveMenu'; +import responsiveMenuArgs from './responsive-menu.yml'; const meta: Meta = { title: 'Components/Menu/Responsive Menu', diff --git a/source/03-components/Menu/ResponsiveMenu/responsive-menu.yml b/source/03-components/Menu/ResponsiveMenu/responsive-menu.yml index 808de6ca..006bb011 100644 --- a/source/03-components/Menu/ResponsiveMenu/responsive-menu.yml +++ b/source/03-components/Menu/ResponsiveMenu/responsive-menu.yml @@ -1,18 +1,14 @@ --- items: - - - title: 'Home' + - title: 'Home' url: '#0' inActiveTrail: false - - - title: 'About' + - title: 'About' url: '#0' inActiveTrail: false - - - title: 'Resources' + - title: 'Resources' url: '#0' inActiveTrail: false - - - title: 'Contact' + - title: 'Contact' url: '#0' inActiveTrail: false diff --git a/source/03-components/Menu/menu.module.css b/source/03-components/Menu/menu.module.css index 927065d8..8c69bc96 100644 --- a/source/03-components/Menu/menu.module.css +++ b/source/03-components/Menu/menu.module.css @@ -9,7 +9,7 @@ margin-block-end: 0; } - .link{ + .link { } .subnav { diff --git a/source/03-components/Menu/menu.yml b/source/03-components/Menu/menu.yml index f8481a51..353b545b 100644 --- a/source/03-components/Menu/menu.yml +++ b/source/03-components/Menu/menu.yml @@ -1,8 +1,8 @@ --- items: - - title: 'Link 1' + - title: 'Link 1' url: '#0' - - title: 'Link 2' + - title: 'Link 2' url: '#0' itemClasses: '' linkClasses: '' diff --git a/source/03-components/PageTitle/PageTitle.stories.tsx b/source/03-components/PageTitle/PageTitle.stories.tsx index 798783d7..ad64fc27 100644 --- a/source/03-components/PageTitle/PageTitle.stories.tsx +++ b/source/03-components/PageTitle/PageTitle.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import pageTitleArgs from './page-title.yml'; import PageTitleComponent from './PageTitle'; +import pageTitleArgs from './page-title.yml'; const meta: Meta = { title: 'Components/Page Title', diff --git a/source/03-components/ReadMoreLink/ReadMoreLink.stories.tsx b/source/03-components/ReadMoreLink/ReadMoreLink.stories.tsx index 6b23932e..b14e5b15 100644 --- a/source/03-components/ReadMoreLink/ReadMoreLink.stories.tsx +++ b/source/03-components/ReadMoreLink/ReadMoreLink.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import readMoreLinkArgs from './read-more-link.yml'; import ReadMoreLinkComponent from './ReadMoreLink'; +import readMoreLinkArgs from './read-more-link.yml'; const meta: Meta = { title: 'Components/Read More Link', diff --git a/source/03-components/SiteName/SiteName.stories.tsx b/source/03-components/SiteName/SiteName.stories.tsx index a5666968..a9bd722c 100644 --- a/source/03-components/SiteName/SiteName.stories.tsx +++ b/source/03-components/SiteName/SiteName.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import siteNameArgs from './site-name.yml'; import SiteNameComponent from './SiteName'; +import siteNameArgs from './site-name.yml'; const meta: Meta = { title: 'Components/Site Name', diff --git a/source/03-components/StyledSelect/StyledSelect.stories.tsx b/source/03-components/StyledSelect/StyledSelect.stories.tsx index feb42e87..d992dfe3 100644 --- a/source/03-components/StyledSelect/StyledSelect.stories.tsx +++ b/source/03-components/StyledSelect/StyledSelect.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import styledSelectArgs from './styled-select.yml'; import StyledSelectComponent from './StyledSelect'; +import styledSelectArgs from './styled-select.yml'; import withGroupsArgs from './with-groups.yml'; const meta: Meta = { diff --git a/source/03-components/StyledSelect/styled-select.yml b/source/03-components/StyledSelect/styled-select.yml index a2ac4e7f..0d34b2f4 100644 --- a/source/03-components/StyledSelect/styled-select.yml +++ b/source/03-components/StyledSelect/styled-select.yml @@ -1,22 +1,16 @@ --- options: - - - value: 'one' + - value: 'one' label: 'Option One' - - - value: 'two' + - value: 'two' label: 'Option Two' - - - value: 'three' + - value: 'three' label: 'Option Three' - - - value: 'four' + - value: 'four' label: 'Option Four' - - - value: 'five' + - value: 'five' label: 'Option Five' - - - value: 'six' + - value: 'six' label: 'Disabled Option' isDisabled: true isMulti: true diff --git a/source/03-components/StyledSelect/with-groups.yml b/source/03-components/StyledSelect/with-groups.yml index 7ac10a10..9651b494 100644 --- a/source/03-components/StyledSelect/with-groups.yml +++ b/source/03-components/StyledSelect/with-groups.yml @@ -1,28 +1,20 @@ --- options: - - - label: 'Group One' + - label: 'Group One' options: - - - value: 'one' + - value: 'one' label: 'Option One' - - - value: 'two' + - value: 'two' label: 'Option Two' - - - value: 'three' + - value: 'three' label: 'Option Three' - - - label: 'Group Two' + - label: 'Group Two' options: - - - value: 'four' + - value: 'four' label: 'Option Four' - - - value: 'five' + - value: 'five' label: 'Option Five' - - - value: 'six' + - value: 'six' label: 'Disabled Option' isDisabled: true isMulti: false diff --git a/source/03-components/TagList/TagList.stories.tsx b/source/03-components/TagList/TagList.stories.tsx index 4ae8ccce..ec71374a 100644 --- a/source/03-components/TagList/TagList.stories.tsx +++ b/source/03-components/TagList/TagList.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import tagListArgs from './tag-list.yml'; import TagListComponent from './TagList'; +import tagListArgs from './tag-list.yml'; const meta: Meta = { title: 'Components/Tag List', diff --git a/source/03-components/TagList/tag-list.yml b/source/03-components/TagList/tag-list.yml index 1b33b78f..86cc08c4 100644 --- a/source/03-components/TagList/tag-list.yml +++ b/source/03-components/TagList/tag-list.yml @@ -1,15 +1,11 @@ --- items: - - - url: '#0' + - url: '#0' title: 'Tag 1' - - - url: '#0' + - url: '#0' title: 'Tag 2' - - - url: '#0' + - url: '#0' title: 'Tag 3' - - - url: '#0' + - url: '#0' title: 'Tag 4' modifierClasses: '' diff --git a/source/04-templates/LandingPage/LandingPage.stories.tsx b/source/04-templates/LandingPage/LandingPage.stories.tsx index aa229b79..8315dfb5 100644 --- a/source/04-templates/LandingPage/LandingPage.stories.tsx +++ b/source/04-templates/LandingPage/LandingPage.stories.tsx @@ -1,7 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import React from 'react'; -import LandingPageTemplate from './LandingPage'; import SampleContent from '../../06-utility/storybook/SampleContent'; +import LandingPageTemplate from './LandingPage'; const meta: Meta = { title: 'Templates/Landing Page', diff --git a/source/04-templates/Page/Page.stories.tsx b/source/04-templates/Page/Page.stories.tsx index 88be33b9..12e6697f 100644 --- a/source/04-templates/Page/Page.stories.tsx +++ b/source/04-templates/Page/Page.stories.tsx @@ -1,7 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import React from 'react'; -import PageTemplate from './Page'; import SampleContent from '../../06-utility/storybook/SampleContent'; +import PageTemplate from './Page'; const meta: Meta = { title: 'Templates/Page', diff --git a/source/05-pages/Page.stories.tsx b/source/05-pages/Page.stories.tsx index 95e40447..248fdd2e 100644 --- a/source/05-pages/Page.stories.tsx +++ b/source/05-pages/Page.stories.tsx @@ -1,9 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import PageTemplate, { PageProps } from '../04-templates/Page/Page'; -import PageWrapper from './page-wrappers/default'; import { Breadcrumb } from '../03-components/Breadcrumb/Breadcrumb.stories'; -import React from 'react'; import { WYSIWYG } from '../03-components/Wysiwyg/Wysiwyg.stories'; +import PageTemplate, { PageProps } from '../04-templates/Page/Page'; +import PageWrapper from './page-wrappers/default'; interface PageStoryArgs { page: PageProps; diff --git a/source/05-pages/page-wrappers/default.tsx b/source/05-pages/page-wrappers/default.tsx index 683516bb..f96124d5 100644 --- a/source/05-pages/page-wrappers/default.tsx +++ b/source/05-pages/page-wrappers/default.tsx @@ -1,4 +1,4 @@ -import React, { ReactNode } from 'react'; +import { ReactNode } from 'react'; import Footer from '../../02-layouts/Footer/Footer'; import Header from '../../02-layouts/Header/Header'; import SiteContainer from '../../02-layouts/SiteContainer/SiteContainer'; diff --git a/source/gesso.d.ts b/source/gesso.d.ts index bd0f3ffd..1b2c1f59 100644 --- a/source/gesso.d.ts +++ b/source/gesso.d.ts @@ -8,5 +8,5 @@ declare module 'gesso' { constrainClasses?: string | string[]; } - export type { GessoComponent, ConstrainComponent }; + export type { ConstrainComponent, GessoComponent }; }