Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
Sort imports
Browse files Browse the repository at this point in the history
This helps with preventing [1]. This solution is recommended in [2].

[1]: facebook/create-react-app#5372
[2]: facebook/create-react-app#5372 (comment)
  • Loading branch information
lubo committed Jun 14, 2023
1 parent a5a546f commit 47f10d0
Show file tree
Hide file tree
Showing 40 changed files with 249 additions and 64 deletions.
5 changes: 5 additions & 0 deletions .prettierrc.yml
@@ -1,2 +1,7 @@
importOrder:
- '^\.\.'
- '^\.'
importOrderSeparation: true
importOrderSortSpecifiers: true
singleQuote: true
trailingComma: all
1 change: 1 addition & 0 deletions gatsby-browser.js
@@ -1,3 +1,4 @@
import 'normalize.css';
import 'swiper/swiper.css';

import './src/styles/global.css';
154 changes: 154 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Expand Up @@ -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",
Expand Down
7 changes: 4 additions & 3 deletions 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';

Expand Down
7 changes: 4 additions & 3 deletions 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';
Expand Down
11 changes: 6 additions & 5 deletions 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';
Expand Down
5 changes: 3 additions & 2 deletions 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 {
Expand Down
3 changes: 2 additions & 1 deletion 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';
Expand Down
2 changes: 1 addition & 1 deletion 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';

Expand Down
1 change: 1 addition & 0 deletions 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';
Expand Down
1 change: 1 addition & 0 deletions 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';
Expand Down
11 changes: 6 additions & 5 deletions 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 = [
<StaticImage src="../../assets/soupculture-1.png" alt="" />,
Expand Down
3 changes: 2 additions & 1 deletion 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() {
Expand Down
2 changes: 1 addition & 1 deletion 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';

Expand Down
2 changes: 1 addition & 1 deletion 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';

Expand Down
13 changes: 7 additions & 6 deletions src/components/ui/footer/Footer.tsx
@@ -1,26 +1,27 @@
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,
primaryRow,
secondaryRow,
socials,
} from './Common.module.css';
import FooterIconLink from './FooterIconLink';

export default forwardRef<HTMLElement>((_, ref) => {
const data = useStaticQuery<Queries.FooterQuery>(graphql`
Expand Down
3 changes: 2 additions & 1 deletion 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 {
Expand Down

0 comments on commit 47f10d0

Please sign in to comment.