restructure components folder

cherylli · cherylli · commit 7c80202fbe6e · 2022-06-08T11:45:20.000+10:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .next
+.idea
 node_modules
 .env
 .DS_Store
diff --git a/components/Nav.js b/components/Nav.js
@@ -1,7 +1,7 @@
 import { useState, useEffect, useRef } from 'react';
 import Link from 'next/link';
 import Image from 'next/image';
-import Container from './Container';
+import Container from './containers/Container';
 import styles from '../styles/Nav.module.scss';
 import { linksNav } from '../utils/links';
 import { useRouter } from 'next/router';
diff --git a/components/buttons/ButtonLink.js b/components/buttons/ButtonLink.js
@@ -1,5 +1,5 @@
 import Link from 'next/link';
-import btnStyles from '../styles/ButtonLink.module.scss';
+import btnStyles from '../../styles/ButtonLink.module.scss';
 
 export default function ButtonLink({
   customClassName,
diff --git a/components/containers/Card.js b/components/containers/Card.js
@@ -1,6 +1,6 @@
 import Image from 'next/image';
 import Link from 'next/link';
-import styles from '../styles/Card.module.scss';
+import styles from '../../styles/Card.module.scss';
 
 export default function Card({
   image,
diff --git a/components/containers/CardsColumns.js b/components/containers/CardsColumns.js
@@ -5,7 +5,7 @@ import 'swiper/css/pagination';
 import 'swiper/css/navigation';
 import Card from './Card';
 import Container from './Container';
-import styles from '../styles/CardsColumns.module.scss';
+import styles from '../../styles/CardsColumns.module.scss';
 
 export default function CardsColumns({
   images,
diff --git a/components/containers/Container.js b/components/containers/Container.js
@@ -1,4 +1,4 @@
-import containerStyles from '../styles/Container.module.scss';
+import containerStyles from '../../styles/Container.module.scss';
 
 export default function Container({ className, children, styles }) {
   return (
diff --git a/components/containers/RevealContentContainer.js b/components/containers/RevealContentContainer.js
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
-import { useIntersect } from '../hooks/useIntersect';
-import styles from '../styles/RevealContainer.module.scss';
+import { useIntersect } from '../../hooks/useIntersect';
+import styles from '../../styles/RevealContainer.module.scss';
 
 const RevealContentContainer = ({ children }) => {
   const [ref, entry] = useIntersect({ threshold: 0.15 });
diff --git a/components/containers/TwoColumn.js b/components/containers/TwoColumn.js
@@ -1,7 +1,7 @@
 import Image from 'next/image';
-import ButtonLink from './ButtonLink';
+import ButtonLink from '../buttons/ButtonLink';
 import Container from './Container';
-import styles from '../styles/TwoColumn.module.scss';
+import styles from '../../styles/TwoColumn.module.scss';
 
 export default function TwoColumn({
   image,
diff --git a/components/docorations/Bracket.js b/components/docorations/Bracket.js
diff --git a/components/docorations/Stick.js b/components/docorations/Stick.js
diff --git a/components/layout/Footer.js b/components/layout/Footer.js
@@ -1,9 +1,9 @@
 import Link from 'next/link';
-import footerStyles from '../styles/Footer.module.scss';
-import { linksNav } from '../utils/links';
-import NewsletterSubscribe from './mailchimp/NewsletterSubscribe';
+import footerStyles from '../../styles/Footer.module.scss';
+import { linksNav } from '../../utils/links';
+import NewsletterSubscribe from '../mailchimp/NewsletterSubscribe';
 import Image from 'next/image';
-import Container from './Container';
+import Container from '../containers/Container';
 
 export default function Footer() {
   return (
@@ -21,7 +21,7 @@ export default function Footer() {
             ))}
           </ul>
         </nav>
-        <Link href="/">
+        <Link href="/pages">
           <a className={footerStyles.footer__logo} title="Go to the Homepage">
             <Image
               src="/images/svg/logo.svg"
diff --git a/components/layout/Hero.js b/components/layout/Hero.js
@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import Image from 'next/image';
-import Nav from './Nav';
-import Container from './Container';
-import styles from '../styles/Hero.module.scss';
+import Nav from '../Nav';
+import Container from '../containers/Container';
+import styles from '../../styles/Hero.module.scss';
 
 export default function Hero({
   title,
diff --git a/components/layout/Layout.js b/components/layout/Layout.js
@@ -1,9 +1,9 @@
 import { useRouter } from 'next/router';
-import { heroOptions } from '../utils/hero-options';
+import { heroOptions } from '../../utils/hero-options';
 import Hero from './Hero';
 import Meta from './Meta';
 import Footer from './Footer';
-import styles from '../styles/Layout.module.scss';
+import styles from '../../styles/Layout.module.scss';
 
 export default function Layout({ children }) {
   const router = useRouter();
diff --git a/components/layout/Meta.js b/components/layout/Meta.js
@@ -1,5 +1,5 @@
 import Head from 'next/head';
-import { meta } from '../utils/meta';
+import { meta } from '../../utils/meta';
 
 export default function Meta() {
   return (
diff --git a/components/mailchimp/NewsletterForm.js b/components/mailchimp/NewsletterForm.js
@@ -1,6 +1,6 @@
 import { createRef, useState } from 'react';
 import { decode } from 'html-entities';
-import Container from '../Container';
+import Container from '../containers/Container';
 import newsletterStyles from '../../styles/Newsletter.module.scss';
 import ReCAPTCHA from 'react-google-recaptcha';
 
diff --git a/pages/_app.js b/pages/_app.js
@@ -1,4 +1,4 @@
-import Layout from '../components/Layout';
+import Layout from '../components/layout/Layout';
 import '../styles/globals.scss';
 
 function MyApp({ Component, pageProps }) {
diff --git a/pages/about.js b/pages/about.js
@@ -1,8 +1,8 @@
-import RevealContentContainer from '../components/RevealContentContainer';
+import RevealContentContainer from '../components/containers/RevealContentContainer';
 import Title from '../components/Title';
-import TwoColumn from '../components/TwoColumn';
+import TwoColumn from '../components/containers/TwoColumn';
 import { white, primary } from '../styles/TwoColumn.module.scss';
-import Container from '../components/Container';
+import Container from '../components/containers/Container';
 
 export default function AboutUs() {
   return (
diff --git a/pages/index.js b/pages/index.js
@@ -1,10 +1,10 @@
-import Bracket from '../components/Bracket';
-import Stick from '../components/Stick';
-import TwoColumn from '../components/TwoColumn';
-import CardsColumns from '../components/CardsColumns';
+import Bracket from '../components/docorations/Bracket';
+import Stick from '../components/docorations/Stick';
+import TwoColumn from '../components/containers/TwoColumn';
+import CardsColumns from '../components/containers/CardsColumns';
 import styles from '../styles/Home.module.scss';
 import { white, primary } from '../styles/TwoColumn.module.scss';
-import RevealContentContainer from '../components/RevealContentContainer';
+import RevealContentContainer from '../components/containers/RevealContentContainer';
 
 export default function Home() {
   return (

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`.next`
	`2`	`+.idea`
`2`	`3`	`node_modules`
`3`	`4`	`.env`
`4`	`5`	`.DS_Store`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import containerStyles from '../styles/Container.module.scss';`
	`1`	`+import containerStyles from '../../styles/Container.module.scss';`
`2`	`2`
`3`	`3`	`export default function Container({ className, children, styles }) {`
`4`	`4`	`return (`