From c01df688dc3de1d1dc2016df2c89551e37dcf791 Mon Sep 17 00:00:00 2001 From: Stephen Swanson Date: Mon, 26 Aug 2024 14:25:44 +0300 Subject: [PATCH 1/6] starts news page blocking and correct a semantic error in the other pages: navbar and header should be above, not nested within main. --- hooks/translations.json | 1 + pages/index.tsx | 15 ++++++----- pages/karhunkierros.tsx | 24 ++++++++--------- pages/nation-info.tsx | 40 ++++++++++++++-------------- pages/news.tsx | 51 ++++++++++++++++++++++++++++++++++++ pages/official-documents.tsx | 24 ++++++++--------- styles/news.module.css | 35 +++++++++++++++++++++++++ 7 files changed, 139 insertions(+), 51 deletions(-) create mode 100644 pages/news.tsx create mode 100644 styles/news.module.css diff --git a/hooks/translations.json b/hooks/translations.json index 383c14d..2f69813 100644 --- a/hooks/translations.json +++ b/hooks/translations.json @@ -21,6 +21,7 @@ "en": "Nation Info", "sv": "Samma på svenska" }, + "nav:news": { "fi": "Uutiset", "en": "News", "sv": "Nyheter" }, "nav:officialDocuments": { "fi": "Viralliset Dokumentit", "en": "Official Documents", diff --git a/pages/index.tsx b/pages/index.tsx index 76da80f..df7512b 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -55,15 +55,16 @@ export default function Home({ navBar }: HomePageProps) { /> + +
+

Ystäviä, tapahtumia ja koti Kampissa

+ +
- {/* Hero */} -
-

Ystäviä, tapahtumia ja koti Kampissa

- -
+ {/* Cards */}
diff --git a/pages/karhunkierros.tsx b/pages/karhunkierros.tsx index 2453ddf..9bb401e 100644 --- a/pages/karhunkierros.tsx +++ b/pages/karhunkierros.tsx @@ -47,19 +47,19 @@ export default function Karhunkierros({ navBar }: KarhunkierrosPageProps) { /> + +
+
+

Karhunkierros lehti

+

+ Lorem, ipsum dolor sit amet consectetur adipisicing elit. Dolor + doloribus impedit sapiente ipsum rerum neque consequatur tempore, + sit repellat unde, enim veniam accusantium minima molestias? + Obcaecati quis doloribus quae nesciunt? +

+
+
- -
-
-

Karhunkierros lehti

-

- Lorem, ipsum dolor sit amet consectetur adipisicing elit. Dolor - doloribus impedit sapiente ipsum rerum neque consequatur tempore, - sit repellat unde, enim veniam accusantium minima molestias? - Obcaecati quis doloribus quae nesciunt? -

-
-
diff --git a/pages/nation-info.tsx b/pages/nation-info.tsx index 7da1e23..ae6fa54 100644 --- a/pages/nation-info.tsx +++ b/pages/nation-info.tsx @@ -36,27 +36,27 @@ export default function NationInfo({ navBar }: NationInfoPageProps) { /> + + {/* Image Header */} +
+
+

Tietoa Osakunnosta

+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Quidem odit + distinctio, ullam doloremque provident voluptas illo quaerat ex + saepe voluptate reiciendis rerum fuga obcaecati esse sit cum maxime, + dolorem facilis? +

+ Nation members holding a flag +
+
- - {/* Image Header */} -
-
-

Tietoa Osakunnosta

-

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Quidem - odit distinctio, ullam doloremque provident voluptas illo quaerat - ex saepe voluptate reiciendis rerum fuga obcaecati esse sit cum - maxime, dolorem facilis? -

- Nation members holding a flag -
-