From 4b586587b686d6376f6598b5bddb2d61db3bc067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 21 Sep 2023 20:38:53 +0200 Subject: [PATCH 01/14] adds page structure --- frontend/src/Pages/LycheContactPage/index.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 frontend/src/Pages/LycheContactPage/index.ts diff --git a/frontend/src/Pages/LycheContactPage/index.ts b/frontend/src/Pages/LycheContactPage/index.ts new file mode 100644 index 000000000..e69de29bb From 2b4fbf1b132dc195f04043c5c9460107214f8995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 21 Sep 2023 20:39:09 +0200 Subject: [PATCH 02/14] adds page strucutre --- .../LycheContactPage.module.scss | 0 .../Pages/LycheContactPage/LycheContactPage.tsx | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss create mode 100644 frontend/src/Pages/LycheContactPage/LycheContactPage.tsx diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss new file mode 100644 index 000000000..e69de29bb diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx new file mode 100644 index 000000000..96954aad8 --- /dev/null +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx @@ -0,0 +1,17 @@ +import { KEY } from '~/i18n/constants'; +import { ROUTES } from '~/routes'; +import styles from './LycheContactPage.module.scss'; +import { Image } from '~/Components'; +import { kitteh } from '~/assets'; + +export function LycheContactPage() { + const mapImage = ; + const; + return ( + <> +
+
+
+ + ); +} From 1d4a8b717f463916843b5b136aeed560a20ef558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 28 Sep 2023 22:04:25 +0200 Subject: [PATCH 03/14] adds icon mixins --- frontend/src/_mixins.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/frontend/src/_mixins.scss b/frontend/src/_mixins.scss index d2365d70b..9e8af2fb6 100644 --- a/frontend/src/_mixins.scss +++ b/frontend/src/_mixins.scss @@ -172,3 +172,18 @@ Usage: @mixin shadow-light { box-shadow: 0 0 0.5em 0.1em rgba(0, 0, 0, 0.05); } + +@mixin icon-white { + color: $white; + z-index: 1; +} + +@mixin icon-gray { + color: $grey-3; + z-index: 1; +} + +@mixin icon-black { + color: $black; + z-index: 1; +} From 4bdda28956b73b5aaa690e74afae4e606a7f54f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 28 Sep 2023 22:05:33 +0200 Subject: [PATCH 04/14] first setup of lyche aboutpage #675 --- frontend/src/AppRoutes.tsx | 3 ++ .../LycheContactPage.module.scss | 36 +++++++++++++++++++ .../LycheContactPage/LycheContactPage.tsx | 33 ++++++++++++++--- frontend/src/Pages/LycheContactPage/index.ts | 1 + frontend/src/Pages/index.ts | 1 + 5 files changed, 69 insertions(+), 5 deletions(-) diff --git a/frontend/src/AppRoutes.tsx b/frontend/src/AppRoutes.tsx index 1102282f7..dbcbcd27e 100644 --- a/frontend/src/AppRoutes.tsx +++ b/frontend/src/AppRoutes.tsx @@ -11,6 +11,7 @@ import { HomePage, InformationListPage, InformationPage, + LycheContactPage, LoginPage, LychePage, NotFoundPage, @@ -211,7 +212,9 @@ export function AppRoutes() { */} }> } /> + } /> + {/* 404 NOT FOUND */} diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss index e69de29bb..629ab60b2 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss @@ -0,0 +1,36 @@ +@import 'src/mixins'; + +@import 'src/constants'; + +.outerContainer { + width: 100%; + height: 100%; + // @include flex-row-center; +} +.innerContainer { + width: 100px; + height: 100px; + background-color: red; + // @include flex-row-center; +} + +.contactContainer { + width: 50vw; + height: 75vh; + background-color: green; + + // @include flex-columns-center; +} +.contactAddress { + @include flex-row-center; +} +.contactEmail { + @include flex-row-center; +} +.contactSocials { + @include flex-row-center; +} + +.icon { + @include icon-white; +} diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx index 96954aad8..2bce7fc87 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx @@ -1,17 +1,40 @@ import { KEY } from '~/i18n/constants'; import { ROUTES } from '~/routes'; +import { SultenPage } from '~/Components/SultenPage'; import styles from './LycheContactPage.module.scss'; import { Image } from '~/Components'; import { kitteh } from '~/assets'; +import { Icon } from '@iconify/react'; export function LycheContactPage() { - const mapImage = ; - const; + const contactCard = ( +
+

HALLO !!!!

+

HVOR ER JEG !!!!

+
+ + +
+
+ ); return ( <> -
-
-
+ +
+
+ {/* */} + {contactCard} +
+
+ ); } diff --git a/frontend/src/Pages/LycheContactPage/index.ts b/frontend/src/Pages/LycheContactPage/index.ts index e69de29bb..673fc34da 100644 --- a/frontend/src/Pages/LycheContactPage/index.ts +++ b/frontend/src/Pages/LycheContactPage/index.ts @@ -0,0 +1 @@ +export { LycheContactPage } from './LycheContactPage'; diff --git a/frontend/src/Pages/index.ts b/frontend/src/Pages/index.ts index 8a45011d9..40059e349 100644 --- a/frontend/src/Pages/index.ts +++ b/frontend/src/Pages/index.ts @@ -10,6 +10,7 @@ export { HomePage } from './HomePage'; export { InformationListPage } from './InformationListPage'; export { InformationPage } from './InformationPage'; export { LoginPage } from './LoginPage'; +export { LycheContactPage } from './LycheContactPage'; export { LychePage } from './LychePage'; export { NotFoundPage } from './NotFoundPage'; export { RecruitmentPage } from './RecruitmentPage'; From 3f146868447bf64c319b8bb5fa57cc7fe6b3d6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Tue, 10 Oct 2023 20:51:42 +0200 Subject: [PATCH 05/14] creates lyche contact page --- frontend/src/AppRoutes.tsx | 2 +- .../LycheContactPage.module.scss | 69 ++++++++++++++----- .../LycheContactPage/LycheContactPage.tsx | 52 +++++++------- frontend/src/constants/TextItems.ts | 1 + 4 files changed, 83 insertions(+), 41 deletions(-) diff --git a/frontend/src/AppRoutes.tsx b/frontend/src/AppRoutes.tsx index 4b0a63349..a8b5e2bcb 100644 --- a/frontend/src/AppRoutes.tsx +++ b/frontend/src/AppRoutes.tsx @@ -11,9 +11,9 @@ import { HomePage, InformationListPage, InformationPage, - LycheContactPage, LoginPage, LycheAboutPage, + LycheContactPage, LycheHomePage, NotFoundPage, RecruitmentAdmissionFormPage, diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss index 629ab60b2..2ec21b097 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss @@ -2,35 +2,70 @@ @import 'src/constants'; -.outerContainer { +.container { + margin: $sulten-navbar-height/2 0 $sulten-navbar-height/2 0; width: 100%; height: 100%; - // @include flex-row-center; -} -.innerContainer { - width: 100px; - height: 100px; - background-color: red; - // @include flex-row-center; + @include flex-column-center; } .contactContainer { - width: 50vw; + width: 75vw; height: 75vh; - background-color: green; + @include flex-row-center; + gap: 4rem; + overflow: hidden; + color: $white; - // @include flex-columns-center; + @include for-mobile-down { + @include flex-column-center; + margin: $sulten-navbar-height/2 0 $sulten-navbar-height/2 0; + height: 50%; + width: 100%; + gap: 1em; + } } -.contactAddress { - @include flex-row-center; + +.lycheContactText { + width: 100%; + text-align: center; } -.contactEmail { - @include flex-row-center; + +.textContainer { + width: 50%; + height: 100%; + @include flex-column-center; + gap: 1rem; + @include for-mobile-down { + width: 100%; + } } -.contactSocials { + +.lycheMapContainer { + width: 50%; + height: 75%; + overflow: hidden; + border-radius: 1.5em; + @include for-mobile-down { + width: 100%; + height: 60vh; + } +} + +.lycheStreet { + height: 100%; + width: 100%; + border: none; +} + +.contactAddress { + color: #fbb040; +} + +.lycheSocialsContainer { @include flex-row-center; } .icon { - @include icon-white; + margin: 0.5rem; } diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx index 2bce7fc87..1f736d2de 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx @@ -1,26 +1,37 @@ -import { KEY } from '~/i18n/constants'; -import { ROUTES } from '~/routes'; +import { Icon } from '@iconify/react'; +import { Link } from '~/Components/Link/Link'; import { SultenPage } from '~/Components/SultenPage'; +import { TextItem } from '~/constants/TextItems'; +import { useTextItem } from '~/hooks'; import styles from './LycheContactPage.module.scss'; -import { Image } from '~/Components'; -import { kitteh } from '~/assets'; -import { Icon } from '@iconify/react'; - export function LycheContactPage() { const contactCard = (
-

HALLO !!!!

-

HVOR ER JEG !!!!

-
- +
+

{useTextItem(TextItem.sulten_contact_page_text)}

+

booking-lyche@uka.no

+

Elgesetergate 1

+
+ + + + + + + + + +
+
+ +
@@ -28,12 +39,7 @@ export function LycheContactPage() { return ( <> -
-
- {/* */} - {contactCard} -
-
+
{contactCard}
 ); diff --git a/frontend/src/constants/TextItems.ts b/frontend/src/constants/TextItems.ts index e50af7f18..2d58f3735 100644 --- a/frontend/src/constants/TextItems.ts +++ b/frontend/src/constants/TextItems.ts @@ -17,4 +17,5 @@ export const TextItem = { sulten_what_is_lyche_text: 'sulten_what_is_lyche_text', sulten_lyche_goal_text: 'sulten_lyche_goal_text', sulten_lyche_about_menu_text: 'sulten_lyche_about_menu_text', + sulten_contact_page_text: 'sulten_contact_page_text', } as const; From 97d46241606d030118ac2b09c49d5f2d607e32f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 19 Oct 2023 19:26:42 +0200 Subject: [PATCH 06/14] removes icon mixin --- frontend/src/_mixins.scss | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/frontend/src/_mixins.scss b/frontend/src/_mixins.scss index 149de74a2..38babdaf6 100644 --- a/frontend/src/_mixins.scss +++ b/frontend/src/_mixins.scss @@ -185,17 +185,3 @@ Usage: justify-content: center; } -@mixin icon-white { - color: $white; - z-index: 1; -} - -@mixin icon-gray { - color: $grey-3; - z-index: 1; -} - -@mixin icon-black { - color: $black; - z-index: 1; -} From 101540da61bf27eed4969bbecd85c98a27c354f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 19 Oct 2023 19:27:07 +0200 Subject: [PATCH 07/14] adds lyche realted external routes --- frontend/src/routes/other.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/routes/other.ts b/frontend/src/routes/other.ts index fc1b59e3c..3ff4e7187 100644 --- a/frontend/src/routes/other.ts +++ b/frontend/src/routes/other.ts @@ -2,4 +2,9 @@ export const ROUTES_OTHER = { maps_elgsetergate_1: 'https://goo.gl/maps/av8ogQPgwWU5ahKr6', sulten_instagram: 'https://www.instagram.com/lychekjokkenogbar/', foto_samfundet_no: 'https://foto.samfundet.no/', + streetview_lyche: + 'https://www.google.com/maps/embed?pb=!4v1696369072803!6m8!1m7!1s2XEhTJwM_No8aTTrqI72RQ!2m2!1d63\n' + + ' .42220330892942!2d10.3953201100997!3f352.98823313957973!4f2.236618333891684!5f0.7820865974627469', + maps_lyche: 'https://maps.app.goo.gl/z98jeRNVqQUPRWsv9', + lyche_facebook: 'https://www.facebook.com/samfundet.lyche', } as const; From 34ceb7ec495e3ac8f4639ab5dee9fd99ce0d1976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 19 Oct 2023 19:27:42 +0200 Subject: [PATCH 08/14] uses color constant and calc for css calculation --- .../src/Pages/LycheContactPage/LycheContactPage.module.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss index 2ec21b097..8f1152619 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss @@ -3,7 +3,7 @@ @import 'src/constants'; .container { - margin: $sulten-navbar-height/2 0 $sulten-navbar-height/2 0; + margin: calc($sulten-navbar-height/2 0 $sulten-navbar-height/2 0); width: 100%; height: 100%; @include flex-column-center; @@ -19,7 +19,7 @@ @include for-mobile-down { @include flex-column-center; - margin: $sulten-navbar-height/2 0 $sulten-navbar-height/2 0; + margin: calc($sulten-navbar-height/2 0 $sulten-navbar-height/2 0); height: 50%; width: 100%; gap: 1em; @@ -59,7 +59,7 @@ } .contactAddress { - color: #fbb040; + color: $sulten-orange; } .lycheSocialsContainer { From 0521188161082c105c1e2a4c7e73baeb3e9c53fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 19 Oct 2023 19:28:11 +0200 Subject: [PATCH 09/14] uses external routes and code was formated --- .../src/Pages/LycheContactPage/LycheContactPage.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx index 1f736d2de..0b51cddf2 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx @@ -3,7 +3,9 @@ import { Link } from '~/Components/Link/Link'; import { SultenPage } from '~/Components/SultenPage'; import { TextItem } from '~/constants/TextItems'; import { useTextItem } from '~/hooks'; +import { ROUTES } from '~/routes'; import styles from './LycheContactPage.module.scss'; + export function LycheContactPage() { const contactCard = (
@@ -12,24 +14,21 @@ export function LycheContactPage() {

booking-lyche@uka.no

Elgesetergate 1

- + - + - +
-
From 7cdd9b207b8f6aca614fafb0cae619d0dc7ec751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Thu, 19 Oct 2023 19:42:37 +0200 Subject: [PATCH 10/14] fixes calc bug --- .../src/Pages/LycheContactPage/LycheContactPage.module.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss index 8f1152619..00e927815 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss @@ -3,7 +3,7 @@ @import 'src/constants'; .container { - margin: calc($sulten-navbar-height/2 0 $sulten-navbar-height/2 0); + margin: calc($sulten-navbar-height / 2) 0 calc($sulten-navbar-height / 2) 0; width: 100%; height: 100%; @include flex-column-center; @@ -19,7 +19,7 @@ @include for-mobile-down { @include flex-column-center; - margin: calc($sulten-navbar-height/2 0 $sulten-navbar-height/2 0); + margin: calc($sulten-navbar-height / 2) 0 calc($sulten-navbar-height / 2) 0; height: 50%; width: 100%; gap: 1em; From 3581c4b03a1679efc31156552fd1975fd48fb40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Tue, 24 Oct 2023 20:35:59 +0200 Subject: [PATCH 11/14] solves issue where navbar ovarlaps content --- frontend/src/Components/SultenPage/SultenPage.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/Components/SultenPage/SultenPage.module.scss b/frontend/src/Components/SultenPage/SultenPage.module.scss index 67f642856..86b415cfc 100644 --- a/frontend/src/Components/SultenPage/SultenPage.module.scss +++ b/frontend/src/Components/SultenPage/SultenPage.module.scss @@ -12,6 +12,7 @@ min-width: 100vw; min-height: calc(100vh - 200px); z-index: 10; + padding: calc($sulten-navbar-height / 2) 0 calc($sulten-navbar-height / 2) 0; @include for-mobile-down { flex-direction: column; padding: 0%; From 77d65fb6be116952558206f9f1e80dce131f7cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Tue, 24 Oct 2023 20:39:30 +0200 Subject: [PATCH 12/14] removes outer container --- .../LycheContactPage.module.scss | 7 --- .../LycheContactPage/LycheContactPage.tsx | 55 +++++++++---------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss index 00e927815..43c30d5d6 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.module.scss @@ -2,13 +2,6 @@ @import 'src/constants'; -.container { - margin: calc($sulten-navbar-height / 2) 0 calc($sulten-navbar-height / 2) 0; - width: 100%; - height: 100%; - @include flex-column-center; -} - .contactContainer { width: 75vw; height: 75vh; diff --git a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx index 0b51cddf2..ba096d8a9 100644 --- a/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx +++ b/frontend/src/Pages/LycheContactPage/LycheContactPage.tsx @@ -7,38 +7,35 @@ import { ROUTES } from '~/routes'; import styles from './LycheContactPage.module.scss'; export function LycheContactPage() { - const contactCard = ( -
-
-

{useTextItem(TextItem.sulten_contact_page_text)}

-

booking-lyche@uka.no

-

Elgesetergate 1

-
- - - - - - - - - -
-
-
- -
-
- ); return ( <> -
{contactCard}
+
+
+

{useTextItem(TextItem.sulten_contact_page_text)}

+

booking-lyche@uka.no

+

Elgesetergate 1

+
+ + + + + + + + + +
+
+
+ +
+
); From 5cefca18a422d502d5c5011aa08217e8f2331296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Tue, 24 Oct 2023 20:39:54 +0200 Subject: [PATCH 13/14] removes whitespace --- frontend/src/_mixins.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/_mixins.scss b/frontend/src/_mixins.scss index 38babdaf6..6b5b443b3 100644 --- a/frontend/src/_mixins.scss +++ b/frontend/src/_mixins.scss @@ -184,4 +184,3 @@ Usage: @include flex-column; justify-content: center; } - From 305c4540e182b11c37f61c99dc74b0d3eac149c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Snorre=20S=C3=A6ther?= Date: Tue, 24 Oct 2023 21:59:52 +0200 Subject: [PATCH 14/14] fixes overflow right, caused by scrollbar --- frontend/src/Components/SultenPage/SultenPage.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/Components/SultenPage/SultenPage.module.scss b/frontend/src/Components/SultenPage/SultenPage.module.scss index 86b415cfc..16105aa44 100644 --- a/frontend/src/Components/SultenPage/SultenPage.module.scss +++ b/frontend/src/Components/SultenPage/SultenPage.module.scss @@ -9,7 +9,7 @@ justify-content: center; align-items: stretch; align-content: center; - min-width: 100vw; + min-width: 100%; min-height: calc(100vh - 200px); z-index: 10; padding: calc($sulten-navbar-height / 2) 0 calc($sulten-navbar-height / 2) 0;