diff --git a/.eslintrc.json b/.eslintrc.json index 51dfe1c..b8c71e5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,10 +10,13 @@ "project": "./tsconfig.json" }, "rules": { - "react/function-component-definition": [2, { - "namedComponents": "arrow-function", - "unnamedComponents": "arrow-function" - }], + "react/function-component-definition": [ + 2, + { + "namedComponents": "arrow-function", + "unnamedComponents": "arrow-function" + } + ], "react/jsx-props-no-spreading": [0] } } diff --git a/components/Carousel.tsx b/components/Carousel.tsx index 598a521..7b2bf48 100644 --- a/components/Carousel.tsx +++ b/components/Carousel.tsx @@ -112,7 +112,7 @@ const Carousel: React.FC = (props) => {
- { /* eslint-disable-next-line jsx-a11y/anchor-is-valid -- Placeholder href */ } + {/* eslint-disable-next-line jsx-a11y/anchor-is-valid -- Placeholder href */} Katso Lisää diff --git a/components/Navbar.tsx b/components/Navbar.tsx index 4cc5861..8850bcb 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -46,6 +46,6 @@ const Navbar = ({ links }: NavbarProps) => {
); -} +}; export default Navbar; diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx index ff2785a..9889d87 100644 --- a/components/Sidebar.tsx +++ b/components/Sidebar.tsx @@ -200,6 +200,6 @@ const Sidebar = ({ links }: NavbarProps) => { ); -} +}; export default Sidebar; diff --git a/pages/_app.tsx b/pages/_app.tsx index 76fc91c..d3cee4d 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -2,12 +2,10 @@ import "@/styles/globals.css"; import type { AppProps } from "next/app"; import { LanguageProvider } from "@/lib/LanguageContext"; -const App = ({ Component, pageProps }: AppProps) => - ( - - - - ); +const App = ({ Component, pageProps }: AppProps) => ( + + + +); - -export default App; \ No newline at end of file +export default App; diff --git a/pages/_document.tsx b/pages/_document.tsx index 409fd48..4d42534 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -1,13 +1,13 @@ import { Html, Head, Main, NextScript } from "next/document"; const Document = () => ( - - - -
- - - - ) + + + +
+ + + +); -export default Document; \ No newline at end of file +export default Document; diff --git a/pages/index.tsx b/pages/index.tsx index 2864ca6..3824bc1 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -43,30 +43,120 @@ type HomePageProps = { navBar: NavbarProps; }; -const Home = ({ navBar }: HomePageProps) => - ( - <> - - Satakuntalainen Osakunta - ( + <> + + Satakuntalainen Osakunta + + + +
+ + {/* Hero */} +
+

Ystäviä, tapahtumia ja koti Kampissa

+ +
+ {/* Cards */} +
+ + + + + Tietoa osakunnasta + arrow forward + + + + + + + + + + + + Liity jäseneksi + arrow forward + + + + + + + + + + + + Tapahtumat + arrow forward + + + + + + +
+ {/* Living Info */} +
+ A photo of SatO's mascot - - -
- - {/* Hero */} -
-

Ystäviä, tapahtumia ja koti Kampissa

- -
- {/* Cards */} -
- + +
+ {/* News */} +
+

Uutisia

+ + image="https://lh5.googleusercontent.com/bDp4TqmugenBz4t8K9J4PfQkJbnEzwef49kbULsCaJ-7BY4VZ0Jg0I4V7SYcvb4lFISHnvjeYm1ARN4WVsoRUwdEcAwB9_ogpPV90CBlRMeAkFns7XDevbB3kKlTrwlvZQ=w1280" alt="Satakuntalainen Osakunta" /> - - Tietoa osakunnasta - arrow forward + + Title + + Lorem ipsum dolor sit amet consectetur adipisicing elit. + Itaque, numquam magnam, eum nihil adipisci tenetur quasi vel + minima nemo ratione molestiae in ab laborum perferendis beatae + impedit dolorem iusto sunt. + - - + image="https://lh5.googleusercontent.com/bDp4TqmugenBz4t8K9J4PfQkJbnEzwef49kbULsCaJ-7BY4VZ0Jg0I4V7SYcvb4lFISHnvjeYm1ARN4WVsoRUwdEcAwB9_ogpPV90CBlRMeAkFns7XDevbB3kKlTrwlvZQ=w1280" alt="Satakuntalainen Osakunta" /> - - Liity jäseneksi - arrow forward + + Title + + Lorem ipsum dolor sit amet consectetur adipisicing elit. + Itaque, numquam magnam, eum nihil adipisci tenetur quasi vel + minima nemo ratione molestiae in ab laborum perferendis beatae + impedit dolorem iusto sunt. + - - + image="https://lh5.googleusercontent.com/bDp4TqmugenBz4t8K9J4PfQkJbnEzwef49kbULsCaJ-7BY4VZ0Jg0I4V7SYcvb4lFISHnvjeYm1ARN4WVsoRUwdEcAwB9_ogpPV90CBlRMeAkFns7XDevbB3kKlTrwlvZQ=w1280" alt="Satakuntalainen Osakunta" /> - - Tapahtumat - arrow forward + + Title + + Lorem ipsum dolor sit amet consectetur adipisicing elit. + Itaque, numquam magnam, eum nihil adipisci tenetur quasi vel + minima nemo ratione molestiae in ab laborum perferendis beatae + impedit dolorem iusto sunt. + -
- {/* Living Info */} -
- A photo of SatO's mascot - -
-

- Asuminen -
- satakintatalolla -

-
+ + + + + Title + + Lorem ipsum dolor sit amet consectetur adipisicing elit. + Itaque, numquam magnam, eum nihil adipisci tenetur quasi vel + minima nemo ratione molestiae in ab laborum perferendis beatae + impedit dolorem iusto sunt. + + + + + + + + +
+ {/* Calendar */} +
+ +

Kalenteri

+ +
+ {/* Carousel */} +
+

Osakuntalehti Karhunkierros

+ + + +
+ {/* Contact */} +
+
+
+

Postia hallitikselle

- Lorem, ipsum dolor sit amet consectetur adipisicing elit. Eveniet - natus dignissimos nobis, soluta repellendus ipsam ducimus omnis - quis numquam accusantium, tempora veniam earum provident aut iure - assumenda obcaecati nam quas. Lorem ipsum dolor sit amet - consectetur adipisicing elit. Error distinctio repudiandae harum - est recusandae id nam, debitis minus quod totam? Nostrum suscipit - dolor accusamus minima eius libero similique voluptate natus? + Lorem ipsum dolor, sit amet consectetur adipisicing elit. + Asperiores facere at minus officiis nesciunt? Quos labore dolorem + et mollitia quia. Recusandae dolores modi quaerat magnam! Autem + distinctio ipsa a alias.

+

- - - -
- {/* News */} -
-

Uutisia

- - - - - - Title - - Lorem ipsum dolor sit amet consectetur adipisicing elit. - Itaque, numquam magnam, eum nihil adipisci tenetur quasi vel - minima nemo ratione molestiae in ab laborum perferendis - beatae impedit dolorem iusto sunt. - - - - - - - - - - - - Title - - Lorem ipsum dolor sit amet consectetur adipisicing elit. - Itaque, numquam magnam, eum nihil adipisci tenetur quasi vel - minima nemo ratione molestiae in ab laborum perferendis - beatae impedit dolorem iusto sunt. - - - - - - - - - - - - Title - - Lorem ipsum dolor sit amet consectetur adipisicing elit. - Itaque, numquam magnam, eum nihil adipisci tenetur quasi vel - minima nemo ratione molestiae in ab laborum perferendis - beatae impedit dolorem iusto sunt. - - - - - - - - - - - - Title - - Lorem ipsum dolor sit amet consectetur adipisicing elit. - Itaque, numquam magnam, eum nihil adipisci tenetur quasi vel - minima nemo ratione molestiae in ab laborum perferendis - beatae impedit dolorem iusto sunt. - - - - - - - - -
- {/* Calendar */} -
- -

Kalenteri

- -
- {/* Carousel */} -
-

Osakuntalehti Karhunkierros

- - - - -
- {/* Contact */} -
-
-
-

Postia hallitikselle

-

- Lorem ipsum dolor, sit amet consectetur adipisicing elit. - Asperiores facere at minus officiis nesciunt? Quos labore - dolorem et mollitia quia. Recusandae dolores modi quaerat - magnam! Autem distinctio ipsa a alias. -

- -
-
-

Häirintälomake

-

- Lorem ipsum dolor, sit amet consectetur adipisicing elit. - Asperiores facere at minus officiis nesciunt? Quos labore - dolorem et mollitia quia. Recusandae dolores modi quaerat - magnam! Autem distinctio ipsa a alias. -

- -
- various messaging icons
-
+ various messaging icons + +
- {/* Footer */} -
-
-
- - ); + {/* Footer */} +
+
+
+ +); -export default Home; \ No newline at end of file +export default Home; diff --git a/pages/nation-info.tsx b/pages/nation-info.tsx index bedcd18..82bfe53 100644 --- a/pages/nation-info.tsx +++ b/pages/nation-info.tsx @@ -24,84 +24,83 @@ type NationInfoPageProps = { navBar: NavbarProps; }; -const NationInfo = ({ navBar }: NationInfoPageProps) => - ( - <> - - Satakuntalainen Osakunta - - - -
- - {/* 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 -
-
-
- - -
-
-
- - ); +const NationInfo = ({ navBar }: NationInfoPageProps) => ( + <> + + Satakuntalainen Osakunta + + + +
+ + {/* 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 +
+
+
+ + +
+
+
+ +); - export default NationInfo; \ No newline at end of file +export default NationInfo; diff --git a/pages/official-documents.tsx b/pages/official-documents.tsx index 8952281..774941c 100644 --- a/pages/official-documents.tsx +++ b/pages/official-documents.tsx @@ -28,133 +28,130 @@ type OfficialDocumentsPageProps = { navBar: NavbarProps; }; -const OfficialDocuments = ({ - navBar, -}: OfficialDocumentsPageProps) => - ( - <> - - Satakuntalainen Osakunta - - - -
- -
-
-

Viralliset Documentit

-

- 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? -

-
-
-
-
-
Rules
-
- - Rules 2011 - -
-
Old Rules
-
- - Rules 2007 - -
-
- - Rules 2004 - -
-
- - Rules at the time of
the cooperative building - -
-
-
-
Regulations
-
- - Guidelines 2020 - -
-
Old Regulations
-
- - Guidelines 2019 - -
-
- - Guidelines 2017 - -
-
- - Guidelines 2016 - -
-
- - Guidelines 2011 - -
-
-
-
Other Documents
-
- - Equality Plan - -
-
- - SatO Safe Space - -
-
- - Environmental plan - -
-
Dormitory
-
- - Dormitory Regulations - -
-
-
-
-
-

Proceedings

- -
-

- Looking for the Satakunta series or Maila Talvio's collected - works? You can now find them on the - - {" "} - Archive - {" "} - page! +const OfficialDocuments = ({ navBar }: OfficialDocumentsPageProps) => ( + <> + + Satakuntalainen Osakunta + + + +

+ +
+
+

Viralliset Documentit

+

+ 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?

-
-
-
- - ); + + +
+
+
Rules
+
+ + Rules 2011 + +
+
Old Rules
+
+ + Rules 2007 + +
+
+ + Rules 2004 + +
+
+ + Rules at the time of
the cooperative building + +
+
+
+
Regulations
+
+ + Guidelines 2020 + +
+
Old Regulations
+
+ + Guidelines 2019 + +
+
+ + Guidelines 2017 + +
+
+ + Guidelines 2016 + +
+
+ + Guidelines 2011 + +
+
+
+
Other Documents
+
+ + Equality Plan + +
+
+ + SatO Safe Space + +
+
+ + Environmental plan + +
+
Dormitory
+
+ + Dormitory Regulations + +
+
+
+
+
+

Proceedings

+ +
+

+ Looking for the Satakunta series or Maila Talvio's collected + works? You can now find them on the + + {" "} + Archive + {" "} + page! +

+
+
+ +); - export default OfficialDocuments; \ No newline at end of file +export default OfficialDocuments;