added all pages

City-of-Turku · Oct 12, 2022 · fab1cf1 · fab1cf1
1 parent 404092f
commit fab1cf1
Show file tree

Hide file tree

Showing 12 changed files with 225 additions and 23 deletions.
diff --git a/components/Navbar/Navbar.jsx b/components/Navbar/Navbar.jsx
@@ -66,7 +66,7 @@ const Navbar = ({ locale }) => {
                 <MenuIcon />
               </IconButton>
               <Box sx={{ cursor: "pointer" }}>
-                <Link href={"/"}>
+                <Link href={"#"}>
                   <Image src={vinkLogoWhite} alt="Vink logo" height={100} width={195} />
                 </Link>
               </Box>

diff --git a/components/Navbar/Navbar.module.css b/components/Navbar/Navbar.module.css
@@ -14,8 +14,11 @@
     border-radius: 5px;
 }
 
+.link:hover {
+    background-color: #fff;
+}
 
-.link:after {
+/* .link:after {
     position: absolute;
     content: '';
     display: block;
@@ -25,18 +28,13 @@
     background-color: transparent;
 }
 
-.link:hover {
-    background-color: #fff;
-
-}
-
 .activeLink {
     background-color: #fff;
 }
 
 .activeLink:after {
     color: black
-}
+} */
 
 .linkContainer {
     display: flex;

diff --git a/pageComponents/Educations.jsx b/pageComponents/Educations.jsx
@@ -0,0 +1,26 @@
+import DynamicComponent from "../components/DynamicComponent/dynamicComponent";
+import Head from "next/head";
+
+const Educations = ({ locale, elements }) => {
+    return (
+        <>
+            <Head>
+                <title>{titles[locale]}</title>
+            </Head>
+            <div>
+                {elements?.map((element, index) => (
+                    <DynamicComponent
+                        key={index}
+                        component={element?.acf_fc_layout}
+                        props={element}
+                        locale={locale}
+                    />
+                ))}
+            </div>
+        </>
+    )
+}
+
+const titles = { fi: "Koulutukset", sv: "Träning", en: "Educations" }
+
+export default Educations
diff --git a/pageComponents/Events.jsx b/pageComponents/Events.jsx
@@ -0,0 +1,26 @@
+import DynamicComponent from "../components/DynamicComponent/dynamicComponent";
+import Head from "next/head";
+
+const Events = ({ locale, elements }) => {
+    return (
+        <>
+            <Head>
+                <title>{titles[locale]}</title>
+            </Head>
+            <div>
+                {elements?.map((element, index) => (
+                    <DynamicComponent
+                        key={index}
+                        component={element?.acf_fc_layout}
+                        props={element}
+                        locale={locale}
+                    />
+                ))}
+            </div>
+        </>
+    )
+}
+
+const titles = { fi: "Tapahtumat", sv: "Evenemang", en: "Events" }
+
+export default Events
diff --git a/pages/educations.jsx → pages/educations.js b/pages/educations.jsx → pages/educations.js
@@ -1,27 +1,25 @@
-import Layout from "../components/Layout/Layout";
-import IndexPage from "../pageComponents/Index";
+import Layout from "../components/Layout/Layout"
+import Educations from "../pageComponents/Educations"
 
-const Educations = ({ locale, elements }) => {
+const EducationsPage = ({ elements }) => {
     return (
         <Layout>
-            <IndexPage locale={"fi"} elements={elements} />
+            <Educations locale={"fi"} elements={elements} />
         </Layout>
     )
-
 }
 
 export const getStaticProps = async () => {
 
     const res = await fetch(process.env.NEXT_PUBLIC_WP_URL + "/wp-json/wp/v2/pages?slug=educations&acf_format=standard").then(r => r.json())
     const elements = res[0]?.acf?.elements
-
+    console.log(elements);
     return {
         props: {
             elements: elements
         }
-
     }
-
 }
 
-export default Educations
+
+export default EducationsPage
diff --git a/pages/en/educations.jsx b/pages/en/educations.jsx
@@ -0,0 +1,26 @@
+import Layout from "../../components/Layout/Layout";
+import Educations from "../../pageComponents/Educations";
+
+const EducationsPage = ({ elements }) => {
+    return (
+        <Layout locale={"en"}>
+            <Educations locale={"en"} elements={elements} />
+        </Layout>
+    )
+}
+
+export const getStaticProps = async () => {
+
+    const res = await fetch(process.env.NEXT_PUBLIC_WP_URL + "/wp-json/wp/v2/pages?slug=educations-en&acf_format=standard").then(r => r.json())
+    const elements = res[0]?.acf?.elements
+
+    return {
+        props: {
+            elements: elements
+        }
+
+    }
+
+}
+
+export default EducationsPage
diff --git a/pages/en/events.jsx b/pages/en/events.jsx
@@ -0,0 +1,26 @@
+import Layout from "../../components/Layout/Layout";
+import Events from "../../pageComponents/Events";
+
+const EventsPage = ({ elements }) => {
+    return (
+        <Layout locale={"en"}>
+            <Events locale={"en"} elements={elements} />
+        </Layout>
+    )
+}
+
+export const getStaticProps = async () => {
+
+    const res = await fetch(process.env.NEXT_PUBLIC_WP_URL + "/wp-json/wp/v2/pages?slug=events-en&acf_format=standard").then(r => r.json())
+    const elements = res[0]?.acf?.elements
+
+    return {
+        props: {
+            elements: elements
+        }
+
+    }
+
+}
+
+export default EventsPage
diff --git a/pages/events.js b/pages/events.js
@@ -0,0 +1,25 @@
+import Layout from "../components/Layout/Layout"
+import Events from "../pageComponents/Events"
+
+const EventsPage = ({ elements }) => {
+    return (
+        <Layout>
+            <Events locale={"fi"} elements={elements} />
+        </Layout>
+    )
+}
+
+export const getStaticProps = async () => {
+
+    const res = await fetch(process.env.NEXT_PUBLIC_WP_URL + "/wp-json/wp/v2/pages?slug=events&acf_format=standard").then(r => r.json())
+    const elements = res[0]?.acf?.elements
+    console.log(elements);
+    return {
+        props: {
+            elements: elements
+        }
+    }
+}
+
+
+export default EventsPage
diff --git a/pages/fi/koulutukset.jsx b/pages/fi/koulutukset.jsx
@@ -0,0 +1,26 @@
+import Layout from "../../components/Layout/Layout";
+import Educations from "../../pageComponents/Educations";
+
+const EducationPage = ({ elements }) => {
+    return (
+        <Layout locale={"fi"}>
+            <Educations locale={"fi"} elements={elements} />
+        </Layout>
+    )
+}
+
+export const getStaticProps = async () => {
+
+    const res = await fetch(process.env.NEXT_PUBLIC_WP_URL + "/wp-json/wp/v2/pages?slug=educations&acf_format=standard").then(r => r.json())
+    const elements = res[0]?.acf?.elements
+
+    return {
+        props: {
+            elements: elements
+        }
+
+    }
+
+}
+
+export default EducationPage
diff --git a/pages/events.jsx → pages/fi/tapahtumat.jsx b/pages/events.jsx → pages/fi/tapahtumat.jsx
@@ -1,11 +1,10 @@
-import Layout from "../components/Layout/Layout";
-import IndexPage from "../pageComponents/Index";
-import Link from 'next/link'
+import Layout from "../../components/Layout/Layout";
+import Events from "../../pageComponents/Events";
 
-const Events = ({ locale, elements }) => {
+const EventsPage = ({ elements }) => {
     return (
         <Layout locale={"fi"}>
-            <IndexPage locale={"fi"} elements={elements} />
+            <Events locale={"fi"} elements={elements} />
         </Layout>
     )
 }
@@ -24,4 +23,4 @@ export const getStaticProps = async () => {
 
 }
 
-export default Events
+export default EventsPage
diff --git a/pages/sv/evenemang.jsx b/pages/sv/evenemang.jsx
@@ -0,0 +1,26 @@
+import Layout from "../../components/Layout/Layout";
+import Events from "../../pageComponents/Events";
+
+const EventsPage = ({ elements }) => {
+    return (
+        <Layout locale={"sv"}>
+            <Events locale={"sv"} elements={elements} />
+        </Layout>
+    )
+}
+
+export const getStaticProps = async () => {
+
+    const res = await fetch(process.env.NEXT_PUBLIC_WP_URL + "/wp-json/wp/v2/pages?slug=events-sv&acf_format=standard").then(r => r.json())
+    const elements = res[0]?.acf?.elements
+
+    return {
+        props: {
+            elements: elements,
+        }
+
+    }
+
+}
+
+export default EventsPage
diff --git a/pages/sv/traning.jsx b/pages/sv/traning.jsx
@@ -0,0 +1,26 @@
+import Layout from "../../components/Layout/Layout";
+import Educations from "../../pageComponents/Educations";
+
+const EducationsPage = ({ elements }) => {
+    return (
+        <Layout locale={"sv"}>
+            <Educations locale={"sv"} elements={elements} />
+        </Layout>
+    )
+}
+
+export const getStaticProps = async () => {
+
+    const res = await fetch(process.env.NEXT_PUBLIC_WP_URL + "/wp-json/wp/v2/pages?slug=educations-sv&acf_format=standard").then(r => r.json())
+    const elements = res[0]?.acf?.elements
+
+    return {
+        props: {
+            elements: elements,
+        }
+
+    }
+
+}
+
+export default EducationsPage