From b9a6f939b5dd1f9f7cac2e56ccb0cc19cc4ba8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Veikko=20Lintuj=C3=A4rvi?= Date: Thu, 3 Nov 2022 18:38:56 +0200 Subject: [PATCH] Move everything into a same index component --- components/Contact.tsx | 45 ----------------- components/Header.tsx | 21 -------- components/OpenHours.tsx | 15 ------ components/PostService.tsx | 20 -------- pages/index.tsx | 86 +++++++++++++++++++++++++++++---- styles/Contact.module.scss | 28 ----------- styles/Header.module.scss | 19 -------- styles/Home.module.scss | 12 ----- styles/Index.module.scss | 88 ++++++++++++++++++++++++++++++++++ styles/OpenHours.module.scss | 22 --------- styles/PostService.module.scss | 34 ------------- 11 files changed, 164 insertions(+), 226 deletions(-) delete mode 100644 components/Contact.tsx delete mode 100644 components/Header.tsx delete mode 100644 components/OpenHours.tsx delete mode 100644 components/PostService.tsx delete mode 100644 styles/Contact.module.scss delete mode 100644 styles/Header.module.scss delete mode 100644 styles/Home.module.scss create mode 100644 styles/Index.module.scss delete mode 100644 styles/OpenHours.module.scss delete mode 100644 styles/PostService.module.scss diff --git a/components/Contact.tsx b/components/Contact.tsx deleted file mode 100644 index b5b5e27..0000000 --- a/components/Contact.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import React from 'react'; -import Image from 'next/image'; -import styles from '../styles/Contact.module.scss'; - -export const Contact = () => { - return ( -
- shop keepers - - info@livonsaarenosuuskauppa.fi - - +358 40 0460600 -
- - facebook - - - facebook - -
- -
- ); -}; diff --git a/components/Header.tsx b/components/Header.tsx deleted file mode 100644 index c82c44b..0000000 --- a/components/Header.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; -import styles from '../styles/Header.module.scss'; -import Image from 'next/image'; - -export const Header = () => { - return ( -
- - Velkuantie 988, 21180 Livonsaari - - main -

Kauppa&Ravintola&Kahvila&Baari

-
- ); -}; diff --git a/components/OpenHours.tsx b/components/OpenHours.tsx deleted file mode 100644 index 728cc32..0000000 --- a/components/OpenHours.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; -import styles from '../styles/OpenHours.module.scss'; - -export const OpenHours = () => { - return ( -
-

Auki:

- ma-la 12:00-19:00 -

- kysynnän ja sään salliessa myös pidempään -

-

Tervetuloa!

-
- ); -}; diff --git a/components/PostService.tsx b/components/PostService.tsx deleted file mode 100644 index dd89ae4..0000000 --- a/components/PostService.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import React from 'react'; -import styles from '../styles/PostService.module.scss'; - -export const PostService = () => { - return ( -
-

Postin automaattipalvelu

-

- Lähetä tai nouda paketti Postin pakettiautomaatista Livonsaaren - Osuuskaupasta -

- ma-la 12:00-19:00 - Velkuantie 988, 21180 Livonsaari - - Lisätietoja - - -
- ); -}; diff --git a/pages/index.tsx b/pages/index.tsx index d6679bf..7a380b6 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,17 +1,83 @@ -import { Contact } from '../components/Contact'; -import { Header } from '../components/Header'; -import { OpenHours } from '../components/OpenHours'; -import { PostService } from '../components/PostService'; -import styles from '../styles/Home.module.scss'; +import styles from '../styles/Index.module.scss'; +import Image from 'next/image'; -export default function Home() { +export default function Index() { return (
-
- - - +
+ + Velkuantie 988, 21180 Livonsaari + + main +

Kauppa&Ravintola&Kahvila&Baari

+
+
+

Auki:

+ ma-la 12:00-19:00 +

+ kysynnän ja sään salliessa myös pidempään +

+

Tervetuloa!

+
{' '} +
+ shop keepers + + info@livonsaarenosuuskauppa.fi + + +358 40 0460600 + + +
+
+

Postin automaattipalvelu

+

+ Lähetä tai nouda paketti Postin pakettiautomaatista Livonsaaren + Osuuskaupasta +

+ ma-la 12:00-19:00 + + Velkuantie 988, 21180 Livonsaari + + + Lisätietoja + + +
); diff --git a/styles/Contact.module.scss b/styles/Contact.module.scss deleted file mode 100644 index 41eeef0..0000000 --- a/styles/Contact.module.scss +++ /dev/null @@ -1,28 +0,0 @@ -.mainContainer { - display: flex; - flex-direction: column; - align-items: center; - width: 100%; -} - -.keepersImage { - max-width: 150px; - margin-top: 1.5rem; -} - -.emailAddress, -.phone { - margin-top: 1rem; -} - -.someContainer { - display: flex; - justify-content: space-around; - margin-top: 1rem; -} - -.someIcon { - max-width: 30px; - margin: 15px; - margin-bottom: 0; -} diff --git a/styles/Header.module.scss b/styles/Header.module.scss deleted file mode 100644 index 40c337d..0000000 --- a/styles/Header.module.scss +++ /dev/null @@ -1,19 +0,0 @@ -.mainContainer { - display: flex; - flex-direction: column; - align-items: center; -} - -.addressText { - font-weight: lighter; - margin-top: 1rem; - font-size: 1.1rem; -} - -.subTitleText { - font-size: 2rem; - margin-top: 0; - margin-bottom: 0; - font-weight: 600; - color: #686868; -} diff --git a/styles/Home.module.scss b/styles/Home.module.scss deleted file mode 100644 index a5b7eae..0000000 --- a/styles/Home.module.scss +++ /dev/null @@ -1,12 +0,0 @@ -.outerContainer { - display: flex; - align-items: center; - flex-direction: column; -} - -.innerContainer { - display: flex; - align-items: center; - flex-direction: column; - max-width: 50%; -} diff --git a/styles/Index.module.scss b/styles/Index.module.scss new file mode 100644 index 0000000..6451d10 --- /dev/null +++ b/styles/Index.module.scss @@ -0,0 +1,88 @@ +.outerContainer { + display: flex; + align-items: center; + flex-direction: column; +} + +.innerContainer { + display: flex; + align-items: center; + flex-direction: column; + max-width: 50%; +} + +.sectionContainer { + display: flex; + flex-direction: column; + align-items: center; +} + +.address { + font-weight: lighter; + margin-top: 1rem; + font-size: 1.1rem; +} + +.title { + font-size: 2rem; + margin-top: 0; + margin-bottom: 0; + font-weight: 600; + color: #686868; +} + +.openHoursTitle { + font-weight: bold; + margin: 0; + font-size: 1.2rem; +} + +.openHoursText { + margin-top: 0.5rem; +} + +.openHoursDesc { + max-width: 15rem; + text-align: center; +} + +.keepersImage { + max-width: 150px; + margin-top: 1.5rem; +} + +.emailAddress, +.phone { + margin-top: 1rem; +} + +.socialMediaContainer { + display: flex; + justify-content: space-around; + margin-top: 1rem; +} + +.socialMediaIcon { + max-width: 30px; + margin: 15px; + margin-bottom: 0; +} + +.postServiceDesc { + margin-top: 0.5rem; + margin-bottom: 0; +} + +.postServiceInfo { + margin-top: 0.7rem; +} + +.link { + color: #0274be; + text-decoration: none; + font-weight: bold; +} + +.link:hover { + color: #3a3a3a; +} diff --git a/styles/OpenHours.module.scss b/styles/OpenHours.module.scss deleted file mode 100644 index 2f4225c..0000000 --- a/styles/OpenHours.module.scss +++ /dev/null @@ -1,22 +0,0 @@ -.mainContainer { - margin-top: 1.5rem; - font-size: 1.2rem; - display: flex; - align-items: center; - flex-direction: column; -} - -.openHoursBold { - font-weight: bold; - margin: 0; - font-size: 1.2rem; -} - -.openHours { - margin-top: 0.5rem; -} - -.openHoursDesc { - max-width: 15rem; - text-align: center; -} diff --git a/styles/PostService.module.scss b/styles/PostService.module.scss deleted file mode 100644 index a0c4641..0000000 --- a/styles/PostService.module.scss +++ /dev/null @@ -1,34 +0,0 @@ -.mainContainer { - display: flex; - justify-content: center; - flex-direction: column; - align-items: center; -} - -.title { - font-size: 2rem; - margin-bottom: 0; - margin-top: 0; - font-weight: 600; - color: #686868; -} - -.desc { - margin-top: 0.5rem; - margin-bottom: 0; -} - -.info { - margin-top: 0.7rem; -} - -.link { - color: #0274be; - text-decoration: none; - font-weight: bold; - margin-top: 0.7rem; -} - -.link:hover { - color: #3a3a3a; -}