From b2deca4ce86e46042bba0344b6d21c1af80ec77d Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 30 Dec 2020 00:14:44 +0200 Subject: [PATCH] Non admin static pages to NextJS --- src/pages/404.tsx | 11 ++++++----- src/pages/in_english.tsx | 18 +++++++++++------- src/pages/kilta/fuksi.tsx | 19 ++++++++++--------- src/pages/kilta/index.tsx | 14 +++++++++----- src/pages/kilta/kunnia.tsx | 14 +++++++++----- src/pages/opinnot_ja_ura.tsx | 16 ++++++++++------ src/views/common/PageWrapper.tsx | 30 +++++++++--------------------- 7 files changed, 64 insertions(+), 58 deletions(-) diff --git a/src/pages/404.tsx b/src/pages/404.tsx index ab08ac7..383273f 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -1,8 +1,9 @@ import React from "react"; -import { Helmet } from "react-helmet"; +import { NextPage } from "next"; +import Head from "next/head"; import styled from "styled-components"; -const NotFound = styled.div` +const NotFound = styled.main` text-align: center; font-size: 4rem; font-weight: 200; @@ -12,13 +13,13 @@ const NotFound = styled.div` width: 100%; `; -const NotFoundPage: React.FC = () => ( +const NotFoundPage: NextPage = () => ( <> - + 404 | Ei vaan löydy - + 404 | Ei vaan löydy diff --git a/src/pages/in_english.tsx b/src/pages/in_english.tsx index d5bb080..dc1575a 100644 --- a/src/pages/in_english.tsx +++ b/src/pages/in_english.tsx @@ -1,14 +1,18 @@ import React from "react"; -import { Helmet } from "react-helmet"; +import { NextPage } from "next"; +import Head from "next/head"; import InEnglishPageView from "@views/InEnglishPage/InEnglishPageView"; +import PageWrapper from "@views/common/PageWrapper"; -const InEnglishPage: React.FC = () => ( -
- +const InEnglishPage: NextPage= () => ( + <> + - - -
+ + + + + ); export default InEnglishPage; diff --git a/src/pages/kilta/fuksi.tsx b/src/pages/kilta/fuksi.tsx index 9f3d742..cb84f9e 100644 --- a/src/pages/kilta/fuksi.tsx +++ b/src/pages/kilta/fuksi.tsx @@ -1,16 +1,17 @@ import React from "react"; -import { Helmet } from "react-helmet"; +import { NextPage } from "next"; +import Head from "next/head"; import FreshmenPageView from "@views/FreshmenPage/FreshmenPageView"; +import PageWrapper from "@views/common/PageWrapper"; -export interface FreshmenPageProps {} -export interface FreshmenPageState {} - -const FreshmenPage: React.FC = () => ( +const FreshmenPage: NextPage = () => ( <> - - - - + + + + + + ) diff --git a/src/pages/kilta/index.tsx b/src/pages/kilta/index.tsx index db0883e..01b7413 100644 --- a/src/pages/kilta/index.tsx +++ b/src/pages/kilta/index.tsx @@ -1,13 +1,17 @@ import React from "react"; -import { Helmet } from "react-helmet"; +import { NextPage } from "next"; +import Head from "next/head"; import GuildPageView from "@views/GuildPage/GuildPageView"; +import PageWrapper from "@views/common/PageWrapper"; -const GuildPage: React.FC = () => ( +const GuildPage: NextPage = () => ( <> - + - - + + + + ); diff --git a/src/pages/kilta/kunnia.tsx b/src/pages/kilta/kunnia.tsx index 233d347..adcee91 100644 --- a/src/pages/kilta/kunnia.tsx +++ b/src/pages/kilta/kunnia.tsx @@ -1,13 +1,17 @@ import React from "react"; -import { Helmet } from "react-helmet"; +import { NextPage } from "next"; +import Head from "next/head"; import HonoraryPageView from "@views/HonoraryPage/HonoraryPageView"; +import PageWrapper from "@views/common/PageWrapper"; -const HonoraryPage: React.FC = () => ( +const HonoraryPage: NextPage = () => ( <> - + - - + + + + ) diff --git a/src/pages/opinnot_ja_ura.tsx b/src/pages/opinnot_ja_ura.tsx index d75acd1..c9a2604 100644 --- a/src/pages/opinnot_ja_ura.tsx +++ b/src/pages/opinnot_ja_ura.tsx @@ -1,13 +1,17 @@ import React from "react"; -import { Helmet } from "react-helmet"; +import { NextPage } from "next"; +import Head from "next/head"; import StudiesPageView from "@views/StudiesPage/StudiesPageView"; +import PageWrapper from "@views/common/PageWrapper"; -const StudiesPage: React.FC = () => ( +const StudiesPage: NextPage = () => ( <> - - - - + + + + + + ); diff --git a/src/views/common/PageWrapper.tsx b/src/views/common/PageWrapper.tsx index b0ad9bb..e501ca2 100644 --- a/src/views/common/PageWrapper.tsx +++ b/src/views/common/PageWrapper.tsx @@ -1,25 +1,13 @@ -import React, { ReactNode, ComponentType } from "react"; +import React from "react"; import Header from "@components/Header"; import Footer from "@components/Footer/Footer"; -interface PageProps { - page: ComponentType; -} +const PageWrapper: React.FC = ({ children }) => ( + <> +
+ {children} +