From d4fe302de272b3e5d82d756cdb68bf45725d9657 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 27 May 2019 22:46:24 +0300 Subject: [PATCH] Add routes and main pages --- src/pages/ActualPage/ActualPage.scss | 5 +++++ src/pages/ActualPage/ActualPage.tsx | 21 +++++++++++++++++++++ src/pages/ActualPage/index.ts | 2 ++ src/pages/CorporatePage/CorporatePage.scss | 5 +++++ src/pages/CorporatePage/CorporatePage.tsx | 21 +++++++++++++++++++++ src/pages/CorporatePage/index.ts | 2 ++ src/pages/FreshmenPage/FreshmenPage.scss | 5 +++++ src/pages/FreshmenPage/FreshmenPage.tsx | 21 +++++++++++++++++++++ src/pages/FreshmenPage/index.ts | 2 ++ src/pages/InEnglishPage/InEnglishPage.scss | 5 +++++ src/pages/InEnglishPage/InEnglishPage.tsx | 21 +++++++++++++++++++++ src/pages/InEnglishPage/index.ts | 2 ++ src/pages/StudiesPage/StudiesPage.scss | 5 +++++ src/pages/StudiesPage/StudiesPage.tsx | 21 +++++++++++++++++++++ src/pages/StudiesPage/index.ts | 2 ++ src/routes.tsx | 14 ++++++++++++-- 16 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 src/pages/ActualPage/ActualPage.scss create mode 100644 src/pages/ActualPage/ActualPage.tsx create mode 100644 src/pages/ActualPage/index.ts create mode 100644 src/pages/CorporatePage/CorporatePage.scss create mode 100644 src/pages/CorporatePage/CorporatePage.tsx create mode 100644 src/pages/CorporatePage/index.ts create mode 100644 src/pages/FreshmenPage/FreshmenPage.scss create mode 100644 src/pages/FreshmenPage/FreshmenPage.tsx create mode 100644 src/pages/FreshmenPage/index.ts create mode 100644 src/pages/InEnglishPage/InEnglishPage.scss create mode 100644 src/pages/InEnglishPage/InEnglishPage.tsx create mode 100644 src/pages/InEnglishPage/index.ts create mode 100644 src/pages/StudiesPage/StudiesPage.scss create mode 100644 src/pages/StudiesPage/StudiesPage.tsx create mode 100644 src/pages/StudiesPage/index.ts diff --git a/src/pages/ActualPage/ActualPage.scss b/src/pages/ActualPage/ActualPage.scss new file mode 100644 index 0000000..4ecd67d --- /dev/null +++ b/src/pages/ActualPage/ActualPage.scss @@ -0,0 +1,5 @@ +.actual-page { + display: flex; + flex-flow: column wrap; + justify-content: flex-start; +} diff --git a/src/pages/ActualPage/ActualPage.tsx b/src/pages/ActualPage/ActualPage.tsx new file mode 100644 index 0000000..26a4ca3 --- /dev/null +++ b/src/pages/ActualPage/ActualPage.tsx @@ -0,0 +1,21 @@ +import * as React from "react"; +import Helmet from "react-helmet"; +import "./ActualPage.scss"; + +export interface ActualPageProps {} +export interface ActualPageState {} + +class ActualPage extends React.Component { + render() { + return ( +
+ + + + Actual Page +
+ ); + } +} + +export default ActualPage; diff --git a/src/pages/ActualPage/index.ts b/src/pages/ActualPage/index.ts new file mode 100644 index 0000000..b0c4179 --- /dev/null +++ b/src/pages/ActualPage/index.ts @@ -0,0 +1,2 @@ +import ActualPage from "./ActualPage"; +export default ActualPage; diff --git a/src/pages/CorporatePage/CorporatePage.scss b/src/pages/CorporatePage/CorporatePage.scss new file mode 100644 index 0000000..84ee338 --- /dev/null +++ b/src/pages/CorporatePage/CorporatePage.scss @@ -0,0 +1,5 @@ +.corporate-page { + display: flex; + flex-flow: column wrap; + justify-content: flex-start; +} diff --git a/src/pages/CorporatePage/CorporatePage.tsx b/src/pages/CorporatePage/CorporatePage.tsx new file mode 100644 index 0000000..af2a243 --- /dev/null +++ b/src/pages/CorporatePage/CorporatePage.tsx @@ -0,0 +1,21 @@ +import * as React from "react"; +import Helmet from "react-helmet"; +import "./CorporatePage.scss"; + +export interface CorporatePageProps {} +export interface CorporatePageState {} + +class CorporatePage extends React.Component { + render() { + return ( +
+ + + + Corporate Page +
+ ); + } +} + +export default CorporatePage; diff --git a/src/pages/CorporatePage/index.ts b/src/pages/CorporatePage/index.ts new file mode 100644 index 0000000..1284574 --- /dev/null +++ b/src/pages/CorporatePage/index.ts @@ -0,0 +1,2 @@ +import CorporatePage from "./CorporatePage"; +export default CorporatePage; diff --git a/src/pages/FreshmenPage/FreshmenPage.scss b/src/pages/FreshmenPage/FreshmenPage.scss new file mode 100644 index 0000000..b189a40 --- /dev/null +++ b/src/pages/FreshmenPage/FreshmenPage.scss @@ -0,0 +1,5 @@ +.freshmen-page { + display: flex; + flex-flow: column wrap; + justify-content: flex-start; +} diff --git a/src/pages/FreshmenPage/FreshmenPage.tsx b/src/pages/FreshmenPage/FreshmenPage.tsx new file mode 100644 index 0000000..55cbd38 --- /dev/null +++ b/src/pages/FreshmenPage/FreshmenPage.tsx @@ -0,0 +1,21 @@ +import * as React from "react"; +import Helmet from "react-helmet"; +import "./FreshmenPage.scss"; + +export interface FreshmenPageProps {} +export interface FreshmenPageState {} + +class FreshmenPage extends React.Component { + render() { + return ( +
+ + + + Freshmen Page +
+ ); + } +} + +export default FreshmenPage; diff --git a/src/pages/FreshmenPage/index.ts b/src/pages/FreshmenPage/index.ts new file mode 100644 index 0000000..74fb55e --- /dev/null +++ b/src/pages/FreshmenPage/index.ts @@ -0,0 +1,2 @@ +import FreshmenPage from "./FreshmenPage"; +export default FreshmenPage; diff --git a/src/pages/InEnglishPage/InEnglishPage.scss b/src/pages/InEnglishPage/InEnglishPage.scss new file mode 100644 index 0000000..78efa16 --- /dev/null +++ b/src/pages/InEnglishPage/InEnglishPage.scss @@ -0,0 +1,5 @@ +.in-english-page { + display: flex; + flex-flow: column wrap; + justify-content: flex-start; +} diff --git a/src/pages/InEnglishPage/InEnglishPage.tsx b/src/pages/InEnglishPage/InEnglishPage.tsx new file mode 100644 index 0000000..80a7c1a --- /dev/null +++ b/src/pages/InEnglishPage/InEnglishPage.tsx @@ -0,0 +1,21 @@ +import * as React from "react"; +import Helmet from "react-helmet"; +import "./InEnglishPage.scss"; + +export interface InEnglishPageProps {} +export interface InEnglishPageState {} + +class InEnglishPage extends React.Component { + render() { + return ( +
+ + + + In English Page +
+ ); + } +} + +export default InEnglishPage; diff --git a/src/pages/InEnglishPage/index.ts b/src/pages/InEnglishPage/index.ts new file mode 100644 index 0000000..0022fc0 --- /dev/null +++ b/src/pages/InEnglishPage/index.ts @@ -0,0 +1,2 @@ +import InEnglishPage from "./InEnglishPage"; +export default InEnglishPage; diff --git a/src/pages/StudiesPage/StudiesPage.scss b/src/pages/StudiesPage/StudiesPage.scss new file mode 100644 index 0000000..ab0e9a4 --- /dev/null +++ b/src/pages/StudiesPage/StudiesPage.scss @@ -0,0 +1,5 @@ +.studies-page { + display: flex; + flex-flow: column wrap; + justify-content: flex-start; +} diff --git a/src/pages/StudiesPage/StudiesPage.tsx b/src/pages/StudiesPage/StudiesPage.tsx new file mode 100644 index 0000000..402aa5f --- /dev/null +++ b/src/pages/StudiesPage/StudiesPage.tsx @@ -0,0 +1,21 @@ +import * as React from "react"; +import Helmet from "react-helmet"; +import "./StudiesPage.scss"; + +export interface StudiesPageProps {} +export interface StudiesPageState {} + +class StudiesPage extends React.Component { + render() { + return ( +
+ + + + Studies Page +
+ ); + } +} + +export default StudiesPage; diff --git a/src/pages/StudiesPage/index.ts b/src/pages/StudiesPage/index.ts new file mode 100644 index 0000000..dead812 --- /dev/null +++ b/src/pages/StudiesPage/index.ts @@ -0,0 +1,2 @@ +import StudiesPage from "./StudiesPage"; +export default StudiesPage; diff --git a/src/routes.tsx b/src/routes.tsx index 338b706..7177e90 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -13,7 +13,6 @@ import AdminEventPage from "./pages/AdminEventPage"; import AdminFeedPage from "./pages/AdminFeedPage"; import AdminCommonPage from "./pages/AdminCommonPage"; import AdminLoginPage from "./pages/AdminLoginPage"; -import { getTokenCookie } from "./auth"; import AdminLogoutPage from "./pages/AdminLogoutPage"; import EventCreatePage from "./pages/EventCreatePage"; import FeedCreatePage from "./pages/FeedCreatePage"; @@ -21,6 +20,11 @@ import ContactsPage from "./pages/ContactsPage"; import AdminSignupPage from "./pages/AdminSignupPage"; import SignupCreatePage from "./pages/SignupCreatePage"; import SignUpPage from "./pages/SignUpPage"; +import ActualPage from "./pages/ActualPage/index"; +import FreshmenPage from "./pages/FreshmenPage/FreshmenPage"; +import StudiesPage from "./pages/StudiesPage/index"; +import CorporatePage from "./pages/CorporatePage/CorporatePage"; +import InEnglishPage from "./pages/InEnglishPage/index"; const renderPage = (Page) => (props): JSX.Element => { return ; @@ -38,7 +42,13 @@ const commonRoutes = [ { path: "/", page: FrontPage }, { path: "/signup/:id", page: SignUpPage }, { path: "/kilta", page: GuildPage }, - { path: "/yhteystiedot", page: ContactsPage} + { path: "/kilta/toiminta", page: ActualPage }, + { path: "/kilta/fuksi", page: FreshmenPage }, + // { path: "/kilta/arkisto", page: ActualPage }, + { path: "/opinnot_ja_ura", page: StudiesPage }, + { path: "/yritysyhteistyo", page: CorporatePage }, + { path: "/yhteystiedot", page: ContactsPage }, + { path: "/in_english", page: InEnglishPage }, ]; const adminLoginRoutes = [