From 47f10d0a717ff29405f1fc2b719dd67106fc1107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Ku=C4=8Dera?= Date: Wed, 14 Jun 2023 15:34:04 +0200 Subject: [PATCH] Sort imports This helps with preventing [1]. This solution is recommended in [2]. [1]: https://github.com/facebook/create-react-app/issues/5372 [2]: https://github.com/facebook/create-react-app/issues/5372#issuecomment-467824427 --- .prettierrc.yml | 5 + gatsby-browser.js | 1 + package-lock.json | 154 ++++++++++++++++++ package.json | 1 + src/components/apartmea/Content.tsx | 7 +- src/components/frango/Content.tsx | 7 +- src/components/hate-free-zone/Content.tsx | 11 +- .../home-page/hero-banner/HeroBanner.tsx | 5 +- src/components/home-page/our-team/OurTeam.tsx | 3 +- .../home-page/partners/Partners.tsx | 2 +- .../home-page/services-tabs/ServicesTabs.tsx | 1 + src/components/quest-bar/Content.tsx | 1 + src/components/soupculture/Content.tsx | 11 +- src/components/soupculture/Swiper.tsx | 3 +- src/components/text/heading/Heading.tsx | 2 +- src/components/text/paragraph/Paragraph.tsx | 2 +- src/components/ui/footer/Footer.tsx | 13 +- src/components/ui/header/Header.tsx | 3 +- src/components/ui/hero/Hero.tsx | 9 +- src/components/ui/layout/Container.tsx | 2 +- src/components/ui/layout/Layout.tsx | 1 + src/components/ui/link-to-top/LinkToTop.tsx | 4 +- .../ui/link-to-top/LinkToTopAnchor.tsx | 1 + src/components/ui/link/Link.tsx | 4 +- src/components/ui/logo/Logo.tsx | 2 +- src/components/ui/section/Section.tsx | 2 +- src/components/ui/swiper/MainSwiper.tsx | 7 +- src/components/ui/tabs/TabsContent.tsx | 2 +- src/components/ui/tabs/TabsList.tsx | 2 +- src/components/ui/tabs/TabsRoot.tsx | 2 +- src/components/ui/tabs/TabsTrigger.tsx | 2 +- src/pages/404.tsx | 3 +- src/pages/apartmea.tsx | 3 +- src/pages/frango.tsx | 3 +- src/pages/hate-free-zone.tsx | 3 +- src/pages/index.tsx | 15 +- src/pages/ochrana-sukromia.tsx | 6 +- src/pages/quest-bar.tsx | 3 +- src/pages/soupculture.tsx | 3 +- src/pages/subory-cookies.tsx | 2 +- 40 files changed, 249 insertions(+), 64 deletions(-) diff --git a/.prettierrc.yml b/.prettierrc.yml index 3e9d085..2172314 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -1,2 +1,7 @@ +importOrder: + - '^\.\.' + - '^\.' +importOrderSeparation: true +importOrderSortSpecifiers: true singleQuote: true trailingComma: all diff --git a/gatsby-browser.js b/gatsby-browser.js index 56fd50b..c718487 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,3 +1,4 @@ import 'normalize.css'; import 'swiper/swiper.css'; + import './src/styles/global.css'; diff --git a/package-lock.json b/package-lock.json index b1a5179..b355aa5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,7 @@ "swiper": "^9.3.2" }, "devDependencies": { + "@trivago/prettier-plugin-sort-imports": "^4.1.1", "@types/node": "^18.16.14", "@types/react": "^18.2.7", "@types/react-dom": "^18.2.4", @@ -4135,6 +4136,86 @@ "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz", "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==" }, + "node_modules/@trivago/prettier-plugin-sort-imports": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.1.1.tgz", + "integrity": "sha512-dQ2r2uzNr1x6pJsuh/8x0IRA3CBUB+pWEW3J/7N98axqt7SQSm+2fy0FLNXvXGg77xEDC7KHxJlHfLYyi7PDcw==", + "dev": true, + "dependencies": { + "@babel/generator": "7.17.7", + "@babel/parser": "^7.20.5", + "@babel/traverse": "7.17.3", + "@babel/types": "7.17.0", + "javascript-natural-sort": "0.7.1", + "lodash": "^4.17.21" + }, + "peerDependencies": { + "@vue/compiler-sfc": "3.x", + "prettier": "2.x" + }, + "peerDependenciesMeta": { + "@vue/compiler-sfc": { + "optional": true + } + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/generator": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", + "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==", + "dev": true, + "dependencies": { + "@babel/types": "^7.17.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/traverse": { + "version": "7.17.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", + "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.3", + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-function-name": "^7.16.7", + "@babel/helper-hoist-variables": "^7.16.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/parser": "^7.17.3", + "@babel/types": "^7.17.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/types": { + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", + "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", @@ -12264,6 +12345,12 @@ "node": ">=0.10.0" } }, + "node_modules/javascript-natural-sort": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", + "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==", + "dev": true + }, "node_modules/javascript-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz", @@ -21009,6 +21096,67 @@ "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz", "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==" }, + "@trivago/prettier-plugin-sort-imports": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.1.1.tgz", + "integrity": "sha512-dQ2r2uzNr1x6pJsuh/8x0IRA3CBUB+pWEW3J/7N98axqt7SQSm+2fy0FLNXvXGg77xEDC7KHxJlHfLYyi7PDcw==", + "dev": true, + "requires": { + "@babel/generator": "7.17.7", + "@babel/parser": "^7.20.5", + "@babel/traverse": "7.17.3", + "@babel/types": "7.17.0", + "javascript-natural-sort": "0.7.1", + "lodash": "^4.17.21" + }, + "dependencies": { + "@babel/generator": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", + "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==", + "dev": true, + "requires": { + "@babel/types": "^7.17.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/traverse": { + "version": "7.17.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", + "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.3", + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-function-name": "^7.16.7", + "@babel/helper-hoist-variables": "^7.16.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/parser": "^7.17.3", + "@babel/types": "^7.17.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", + "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "dev": true + } + } + }, "@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", @@ -26982,6 +27130,12 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" }, + "javascript-natural-sort": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", + "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==", + "dev": true + }, "javascript-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz", diff --git a/package.json b/package.json index 93e66f4..ef723a1 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "swiper": "^9.3.2" }, "devDependencies": { + "@trivago/prettier-plugin-sort-imports": "^4.1.1", "@types/node": "^18.16.14", "@types/react": "^18.2.7", "@types/react-dom": "^18.2.4", diff --git a/src/components/apartmea/Content.tsx b/src/components/apartmea/Content.tsx index 5e31874..3dc4346 100644 --- a/src/components/apartmea/Content.tsx +++ b/src/components/apartmea/Content.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { StaticImage } from 'gatsby-plugin-image'; +import React from 'react'; import { SwiperSlide } from 'swiper/react'; + import Article from '../text/article/Article'; -import Container from '../ui/layout/Container'; import Description from '../text/article/Description'; import H1 from '../text/article/H1'; -import MainSwiper from '../ui/swiper/MainSwiper'; import Paragraph from '../text/article/Paragraph'; +import Container from '../ui/layout/Container'; +import MainSwiper from '../ui/swiper/MainSwiper'; import ThumbSwiper from '../ui/swiper/ThumbSwiper'; import useSwiper from '../ui/swiper/use-swiper'; diff --git a/src/components/frango/Content.tsx b/src/components/frango/Content.tsx index cc40dc3..95cfb5e 100644 --- a/src/components/frango/Content.tsx +++ b/src/components/frango/Content.tsx @@ -1,13 +1,14 @@ -import React from 'react'; import { StaticImage } from 'gatsby-plugin-image'; +import React from 'react'; + import Article from '../text/article/Article'; import Blockquote from '../text/article/Blockquote'; -import CenterBox from '../ui/layout/CenterBox'; -import Container from '../ui/layout/Container'; import Description from '../text/article/Description'; import H1 from '../text/article/H1'; import H2 from '../text/article/H2'; import Paragraph from '../text/article/Paragraph'; +import CenterBox from '../ui/layout/CenterBox'; +import Container from '../ui/layout/Container'; import Row from '../ui/layout/Row'; import { frangoIcon, grid } from './Common.module.css'; diff --git a/src/components/hate-free-zone/Content.tsx b/src/components/hate-free-zone/Content.tsx index 7c0ea89..b7d0151 100644 --- a/src/components/hate-free-zone/Content.tsx +++ b/src/components/hate-free-zone/Content.tsx @@ -1,13 +1,14 @@ -import React from 'react'; import { StaticImage } from 'gatsby-plugin-image'; +import React from 'react'; import { SwiperSlide } from 'swiper/react'; -import Article from '../text/article/Article'; -import Container from '../ui/layout/Container'; -import Description from '../text/article/Description'; + import HateFreeVideo1 from '../../assets/hate-free-video-1.mp4'; import HateFreeVideo2 from '../../assets/hate-free-video-2.mp4'; -import MainSwiper from '../ui/swiper/MainSwiper'; +import Article from '../text/article/Article'; +import Description from '../text/article/Description'; import Paragraph from '../text/article/Paragraph'; +import Container from '../ui/layout/Container'; +import MainSwiper from '../ui/swiper/MainSwiper'; import ThumbSwiper from '../ui/swiper/ThumbSwiper'; import useSwiper from '../ui/swiper/use-swiper'; import Video from '../ui/video/Video'; diff --git a/src/components/home-page/hero-banner/HeroBanner.tsx b/src/components/home-page/hero-banner/HeroBanner.tsx index bac9d64..a17f8de 100644 --- a/src/components/home-page/hero-banner/HeroBanner.tsx +++ b/src/components/home-page/hero-banner/HeroBanner.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { AnchorLink } from 'gatsby-plugin-anchor-links'; +import React from 'react'; + import ArrowDownIcon from '../../../assets/arrow-down-icon.svg'; -import Header from '../../ui/header/Header'; import MarkAvenueVideo from '../../../assets/mark-avenue-video.mp4'; +import Header from '../../ui/header/Header'; import ServicesTabs from '../services-tabs/ServicesTabs'; import { diff --git a/src/components/home-page/our-team/OurTeam.tsx b/src/components/home-page/our-team/OurTeam.tsx index 6b8e76d..f4751c9 100644 --- a/src/components/home-page/our-team/OurTeam.tsx +++ b/src/components/home-page/our-team/OurTeam.tsx @@ -1,5 +1,6 @@ -import React from 'react'; import { StaticImage } from 'gatsby-plugin-image'; +import React from 'react'; + import Heading from '../../text/heading/Heading'; import Paragraph from '../../text/paragraph/Paragraph'; import Section from '../../ui/section/Section'; diff --git a/src/components/home-page/partners/Partners.tsx b/src/components/home-page/partners/Partners.tsx index eebf54f..7eb2a2b 100644 --- a/src/components/home-page/partners/Partners.tsx +++ b/src/components/home-page/partners/Partners.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { StaticImage } from 'gatsby-plugin-image'; +import React from 'react'; import { partners } from './Partners.module.css'; diff --git a/src/components/home-page/services-tabs/ServicesTabs.tsx b/src/components/home-page/services-tabs/ServicesTabs.tsx index c11defc..127a8f2 100644 --- a/src/components/home-page/services-tabs/ServicesTabs.tsx +++ b/src/components/home-page/services-tabs/ServicesTabs.tsx @@ -1,4 +1,5 @@ import React, { forwardRef } from 'react'; + import useWindowWidth from '../../../hooks/use-window-size'; import TabsContent from '../../ui/tabs/TabsContent'; import TabsList from '../../ui/tabs/TabsList'; diff --git a/src/components/quest-bar/Content.tsx b/src/components/quest-bar/Content.tsx index e463528..6557deb 100644 --- a/src/components/quest-bar/Content.tsx +++ b/src/components/quest-bar/Content.tsx @@ -1,6 +1,7 @@ import { StaticImage } from 'gatsby-plugin-image'; import React from 'react'; import { SwiperSlide } from 'swiper/react'; + import Article from '../text/article/Article'; import Description from '../text/article/Description'; import H1 from '../text/article/H1'; diff --git a/src/components/soupculture/Content.tsx b/src/components/soupculture/Content.tsx index 4550899..fca9163 100644 --- a/src/components/soupculture/Content.tsx +++ b/src/components/soupculture/Content.tsx @@ -1,16 +1,17 @@ -import React from 'react'; import { StaticImage } from 'gatsby-plugin-image'; +import React from 'react'; import { SwiperSlide } from 'swiper/react'; + import Article from '../text/article/Article'; -import Container from '../ui/layout/Container'; import Description from '../text/article/Description'; import H1 from '../text/article/H1'; import Paragraph from '../text/article/Paragraph'; - -import { video } from './Common.module.css'; +import Container from '../ui/layout/Container'; import MainSwiper from '../ui/swiper/MainSwiper'; -import useSwiper from '../ui/swiper/use-swiper'; import ThumbSwiper from '../ui/swiper/ThumbSwiper'; +import useSwiper from '../ui/swiper/use-swiper'; + +import { video } from './Common.module.css'; const IMAGES = [ , diff --git a/src/components/soupculture/Swiper.tsx b/src/components/soupculture/Swiper.tsx index 598393a..e9e20bd 100644 --- a/src/components/soupculture/Swiper.tsx +++ b/src/components/soupculture/Swiper.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { StaticImage } from 'gatsby-plugin-image'; +import React from 'react'; import { SwiperSlide } from 'swiper/react'; + import MainSwiper from '../ui/swiper/MainSwiper'; export default function Swiper() { diff --git a/src/components/text/heading/Heading.tsx b/src/components/text/heading/Heading.tsx index d5d762f..18073e2 100644 --- a/src/components/text/heading/Heading.tsx +++ b/src/components/text/heading/Heading.tsx @@ -1,5 +1,5 @@ -import React, { PropsWithChildren } from 'react'; import classNames from 'classnames'; +import React, { PropsWithChildren } from 'react'; import { heading, normal, yellow } from './Heading.module.css'; diff --git a/src/components/text/paragraph/Paragraph.tsx b/src/components/text/paragraph/Paragraph.tsx index 3ca4c81..d137139 100644 --- a/src/components/text/paragraph/Paragraph.tsx +++ b/src/components/text/paragraph/Paragraph.tsx @@ -1,5 +1,5 @@ -import React, { PropsWithChildren } from 'react'; import classNames from 'classnames'; +import React, { PropsWithChildren } from 'react'; import { paragraph } from './Paragraph.module.css'; diff --git a/src/components/ui/footer/Footer.tsx b/src/components/ui/footer/Footer.tsx index 6961868..e30fbef 100644 --- a/src/components/ui/footer/Footer.tsx +++ b/src/components/ui/footer/Footer.tsx @@ -1,19 +1,19 @@ -import { graphql, Link, useStaticQuery } from 'gatsby'; +import { Link, graphql, useStaticQuery } from 'gatsby'; import React, { forwardRef } from 'react'; -import Heading from '../../text/heading/Heading'; + import FacebookIcon from '../../../assets/facebook.svg'; -import FooterIconLink from './FooterIconLink'; import InstagramIcon from '../../../assets/instagram.svg'; import LinkedInIcon from '../../../assets/linked-in.svg'; -import PhoneLink from '../link/PhoneLink'; -import EmailLink from '../link/EmailLink'; -import Section from '../section/Section'; import { CONTACT_EMAIL_ADDRESS, CONTACT_PHONE_NUMBER, } from '../../../const/contact'; import { COOKIE_POLICY_PAGE, PRIVACY_POLICY_PAGE } from '../../../const/routes'; import { SITE_TITLE } from '../../../const/site-metadata'; +import Heading from '../../text/heading/Heading'; +import EmailLink from '../link/EmailLink'; +import PhoneLink from '../link/PhoneLink'; +import Section from '../section/Section'; import { footerLink, @@ -21,6 +21,7 @@ import { secondaryRow, socials, } from './Common.module.css'; +import FooterIconLink from './FooterIconLink'; export default forwardRef((_, ref) => { const data = useStaticQuery(graphql` diff --git a/src/components/ui/header/Header.tsx b/src/components/ui/header/Header.tsx index 3a8842d..4f99eb6 100644 --- a/src/components/ui/header/Header.tsx +++ b/src/components/ui/header/Header.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import classNames from 'classnames'; import { Link } from 'gatsby'; import { AnchorLink } from 'gatsby-plugin-anchor-links'; +import React from 'react'; + import Logo from '../logo/Logo'; import { diff --git a/src/components/ui/hero/Hero.tsx b/src/components/ui/hero/Hero.tsx index e632b5d..f180d9c 100644 --- a/src/components/ui/hero/Hero.tsx +++ b/src/components/ui/hero/Hero.tsx @@ -1,15 +1,16 @@ -import React, { ReactNode } from 'react'; import classNames from 'classnames'; +import React, { ReactNode } from 'react'; + import Heading from '../../text/heading/Heading'; -import Link from '../link/Link'; import Paragraph from '../../text/paragraph/Paragraph'; +import Link from '../link/Link'; import { + content, hero, - rtl as rtlClassName, icon as iconClassName, - content, paragraph, + rtl as rtlClassName, } from './Hero.module.css'; interface HeroProps { diff --git a/src/components/ui/layout/Container.tsx b/src/components/ui/layout/Container.tsx index 2546d56..1cae7d4 100644 --- a/src/components/ui/layout/Container.tsx +++ b/src/components/ui/layout/Container.tsx @@ -1,5 +1,5 @@ -import React, { PropsWithChildren } from 'react'; import classNames from 'classnames'; +import React, { PropsWithChildren } from 'react'; import { container, rtl as rtlClassName } from './Layout.module.css'; diff --git a/src/components/ui/layout/Layout.tsx b/src/components/ui/layout/Layout.tsx index d5cce96..691f22c 100644 --- a/src/components/ui/layout/Layout.tsx +++ b/src/components/ui/layout/Layout.tsx @@ -1,4 +1,5 @@ import React, { PropsWithChildren } from 'react'; + import Footer from '../footer/Footer'; import Header from '../header/Header'; import LinkToTop from '../link-to-top/LinkToTop'; diff --git a/src/components/ui/link-to-top/LinkToTop.tsx b/src/components/ui/link-to-top/LinkToTop.tsx index eff1217..5ed2a0f 100644 --- a/src/components/ui/link-to-top/LinkToTop.tsx +++ b/src/components/ui/link-to-top/LinkToTop.tsx @@ -1,8 +1,10 @@ import { AnchorLink } from 'gatsby-plugin-anchor-links'; import React from 'react'; + import ArrowUpCircle from '../../../assets/arrow-up-circle.svg'; -import LINK_TO_TOP_ANCHOR from './const'; + import { linkToTop } from './LinkToTop.module.css'; +import LINK_TO_TOP_ANCHOR from './const'; export default function LinkToTop() { return ( diff --git a/src/components/ui/link-to-top/LinkToTopAnchor.tsx b/src/components/ui/link-to-top/LinkToTopAnchor.tsx index a837f7b..cd77466 100644 --- a/src/components/ui/link-to-top/LinkToTopAnchor.tsx +++ b/src/components/ui/link-to-top/LinkToTopAnchor.tsx @@ -1,4 +1,5 @@ import React from 'react'; + import LINK_TO_TOP_ANCHOR from './const'; export default function LinkToTopAnchor() { diff --git a/src/components/ui/link/Link.tsx b/src/components/ui/link/Link.tsx index b7accb9..1b1e3d8 100644 --- a/src/components/ui/link/Link.tsx +++ b/src/components/ui/link/Link.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import classNames from 'classnames'; -import { GatsbyLinkProps, Link as GatsbyLink } from 'gatsby'; +import { Link as GatsbyLink, GatsbyLinkProps } from 'gatsby'; +import React from 'react'; import { image, link, primary } from './Link.module.css'; diff --git a/src/components/ui/logo/Logo.tsx b/src/components/ui/logo/Logo.tsx index fedb14a..25e8a0a 100644 --- a/src/components/ui/logo/Logo.tsx +++ b/src/components/ui/logo/Logo.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import classNames from 'classnames'; +import React from 'react'; import { highlighted, diff --git a/src/components/ui/section/Section.tsx b/src/components/ui/section/Section.tsx index 407bd14..741c45c 100644 --- a/src/components/ui/section/Section.tsx +++ b/src/components/ui/section/Section.tsx @@ -1,5 +1,5 @@ -import React, { forwardRef, PropsWithChildren } from 'react'; import classNames from 'classnames'; +import React, { PropsWithChildren, forwardRef } from 'react'; import { dark, diff --git a/src/components/ui/swiper/MainSwiper.tsx b/src/components/ui/swiper/MainSwiper.tsx index 89b67f7..d719d2d 100644 --- a/src/components/ui/swiper/MainSwiper.tsx +++ b/src/components/ui/swiper/MainSwiper.tsx @@ -1,12 +1,13 @@ +import classNames from 'classnames'; import React, { PropsWithChildren } from 'react'; import Swiper, { Autoplay, Thumbs } from 'swiper'; import { Swiper as SwiperCore } from 'swiper/react'; -import classNames from 'classnames'; -import useSwiper from './use-swiper'; -import ArrowPrev from '../../../assets/arrow-prev.svg'; + import ArrowNext from '../../../assets/arrow-next.svg'; +import ArrowPrev from '../../../assets/arrow-prev.svg'; import { controlButton, next, prev, root } from './Swiper.module.css'; +import useSwiper from './use-swiper'; export interface MainSwiperProps extends PropsWithChildren { swiper?: Swiper; diff --git a/src/components/ui/tabs/TabsContent.tsx b/src/components/ui/tabs/TabsContent.tsx index 31b7771..1f7d954 100644 --- a/src/components/ui/tabs/TabsContent.tsx +++ b/src/components/ui/tabs/TabsContent.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import { Content, TabsContentProps } from '@radix-ui/react-tabs'; import classNames from 'classnames'; +import React from 'react'; import { content } from './Tabs.module.css'; diff --git a/src/components/ui/tabs/TabsList.tsx b/src/components/ui/tabs/TabsList.tsx index a2faa8e..451a3ca 100644 --- a/src/components/ui/tabs/TabsList.tsx +++ b/src/components/ui/tabs/TabsList.tsx @@ -1,5 +1,5 @@ -import React, { ReactElement } from 'react'; import { List, TabsTriggerProps } from '@radix-ui/react-tabs'; +import React, { ReactElement } from 'react'; interface TabsListProps { children: ReactElement[]; diff --git a/src/components/ui/tabs/TabsRoot.tsx b/src/components/ui/tabs/TabsRoot.tsx index 91a7417..960ec2e 100644 --- a/src/components/ui/tabs/TabsRoot.tsx +++ b/src/components/ui/tabs/TabsRoot.tsx @@ -1,5 +1,5 @@ -import React, { ComponentProps, forwardRef } from 'react'; import { Root } from '@radix-ui/react-tabs'; +import React, { ComponentProps, forwardRef } from 'react'; export default forwardRef>( ({ defaultValue, className, children, defaultChecked }, ref) => ( diff --git a/src/components/ui/tabs/TabsTrigger.tsx b/src/components/ui/tabs/TabsTrigger.tsx index 957e40f..a11a588 100644 --- a/src/components/ui/tabs/TabsTrigger.tsx +++ b/src/components/ui/tabs/TabsTrigger.tsx @@ -1,5 +1,5 @@ -import React, { ComponentProps } from 'react'; import { Trigger } from '@radix-ui/react-tabs'; +import React, { ComponentProps } from 'react'; import { trigger } from './Tabs.module.css'; diff --git a/src/pages/404.tsx b/src/pages/404.tsx index 361b6d5..2fb0197 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -1,5 +1,6 @@ -import React from 'react'; import { Link } from 'gatsby'; +import React from 'react'; + import PageTitle from '../components/page-title/PageTitle'; const pageStyles = { diff --git a/src/pages/apartmea.tsx b/src/pages/apartmea.tsx index 643136c..78a60ac 100644 --- a/src/pages/apartmea.tsx +++ b/src/pages/apartmea.tsx @@ -1,8 +1,9 @@ import React from 'react'; + import Content from '../components/apartmea/Content'; +import PageTitle from '../components/page-title/PageTitle'; import Heading from '../components/text/heading/Heading'; import Layout from '../components/ui/layout/Layout'; -import PageTitle from '../components/page-title/PageTitle'; function ApartmeaPage() { return ( diff --git a/src/pages/frango.tsx b/src/pages/frango.tsx index ca6a5eb..ef2c7c3 100644 --- a/src/pages/frango.tsx +++ b/src/pages/frango.tsx @@ -1,8 +1,9 @@ import React from 'react'; + import Content from '../components/frango/Content'; +import PageTitle from '../components/page-title/PageTitle'; import Heading from '../components/text/heading/Heading'; import Layout from '../components/ui/layout/Layout'; -import PageTitle from '../components/page-title/PageTitle'; function FrangoPage() { return ( diff --git a/src/pages/hate-free-zone.tsx b/src/pages/hate-free-zone.tsx index 9b8905f..ddbdb2a 100644 --- a/src/pages/hate-free-zone.tsx +++ b/src/pages/hate-free-zone.tsx @@ -1,8 +1,9 @@ import React from 'react'; + import Content from '../components/hate-free-zone/Content'; +import PageTitle from '../components/page-title/PageTitle'; import Heading from '../components/text/heading/Heading'; import Layout from '../components/ui/layout/Layout'; -import PageTitle from '../components/page-title/PageTitle'; function HateFreeZonePage() { return ( diff --git a/src/pages/index.tsx b/src/pages/index.tsx index a7ede21..9a028c1 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,16 +1,19 @@ import React from 'react'; + import ApartmeaIcon from '../assets/apartmea-icon.svg'; -import Footer from '../components/ui/footer/Footer'; import FrangoIcon from '../assets/frango-icon.svg'; import HateFreeZoneIcon from '../assets/hate-free-zone-icon.svg'; -import Hero from '../components/ui/hero/Hero'; +import QuestBarIcon from '../assets/quest-bar-icon.svg'; +import SoupCultureIcon from '../assets/soup-culture-icon.svg'; import HeroBanner from '../components/home-page/hero-banner/HeroBanner'; import OurTeam from '../components/home-page/our-team/OurTeam'; -import PageTitle from '../components/page-title/PageTitle'; import Partners from '../components/home-page/partners/Partners'; -import QuestBarIcon from '../assets/quest-bar-icon.svg'; +import PageTitle from '../components/page-title/PageTitle'; +import Footer from '../components/ui/footer/Footer'; +import Hero from '../components/ui/hero/Hero'; +import LinkToTop from '../components/ui/link-to-top/LinkToTop'; +import LinkToTopAnchor from '../components/ui/link-to-top/LinkToTopAnchor'; import Section from '../components/ui/section/Section'; -import SoupCultureIcon from '../assets/soup-culture-icon.svg'; import { APARTMEA_PAGE, FRANGO_PAGE, @@ -18,8 +21,6 @@ import { QUEST_BAR_PAGE, SOUPCULTURE_PAGE, } from '../const/routes'; -import LinkToTopAnchor from '../components/ui/link-to-top/LinkToTopAnchor'; -import LinkToTop from '../components/ui/link-to-top/LinkToTop'; function IndexPage() { return ( diff --git a/src/pages/ochrana-sukromia.tsx b/src/pages/ochrana-sukromia.tsx index 5e7a028..be05fb6 100644 --- a/src/pages/ochrana-sukromia.tsx +++ b/src/pages/ochrana-sukromia.tsx @@ -1,12 +1,12 @@ +import { Link } from 'gatsby'; import React from 'react'; -import { Link } from 'gatsby'; +import PageTitle from '../components/page-title/PageTitle'; import Heading from '../components/text/heading/Heading'; import Layout from '../components/ui/layout/Layout'; -import PageTitle from '../components/page-title/PageTitle'; import EmailLink from '../components/ui/link/EmailLink'; -import { CONTACT_EMAIL_ADDRESS, CONTACT_PHONE_NUMBER } from '../const/contact'; import PhoneLink from '../components/ui/link/PhoneLink'; +import { CONTACT_EMAIL_ADDRESS, CONTACT_PHONE_NUMBER } from '../const/contact'; import { COOKIE_POLICY_PAGE } from '../const/routes'; export default function PrivacyPolicyPage() { diff --git a/src/pages/quest-bar.tsx b/src/pages/quest-bar.tsx index 2260e39..0240de2 100644 --- a/src/pages/quest-bar.tsx +++ b/src/pages/quest-bar.tsx @@ -1,8 +1,9 @@ import React from 'react'; + +import PageTitle from '../components/page-title/PageTitle'; import Content from '../components/quest-bar/Content'; import Heading from '../components/text/heading/Heading'; import Layout from '../components/ui/layout/Layout'; -import PageTitle from '../components/page-title/PageTitle'; function QuestBarPage() { return ( diff --git a/src/pages/soupculture.tsx b/src/pages/soupculture.tsx index 53fad1a..8f3708a 100644 --- a/src/pages/soupculture.tsx +++ b/src/pages/soupculture.tsx @@ -1,8 +1,9 @@ import React from 'react'; + +import PageTitle from '../components/page-title/PageTitle'; import Content from '../components/soupculture/Content'; import Heading from '../components/text/heading/Heading'; import Layout from '../components/ui/layout/Layout'; -import PageTitle from '../components/page-title/PageTitle'; function SoupculturePage() { return ( diff --git a/src/pages/subory-cookies.tsx b/src/pages/subory-cookies.tsx index f40f62a..25fe3fc 100644 --- a/src/pages/subory-cookies.tsx +++ b/src/pages/subory-cookies.tsx @@ -1,8 +1,8 @@ import React from 'react'; +import PageTitle from '../components/page-title/PageTitle'; import Heading from '../components/text/heading/Heading'; import Layout from '../components/ui/layout/Layout'; -import PageTitle from '../components/page-title/PageTitle'; export default function CookiePolicyPage() { return (