Add routes and main pages

This commit is contained in:
Aarni Halinen
2019-05-27 22:46:24 +03:00
parent a33c4f3d1d
commit d4fe302de2
16 changed files with 152 additions and 2 deletions
+5
View File
@@ -0,0 +1,5 @@
.actual-page {
display: flex;
flex-flow: column wrap;
justify-content: flex-start;
}
+21
View File
@@ -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<ActualPageProps, ActualPageState> {
render() {
return (
<div className="actual-page">
<Helmet>
<link rel="canonical" href="https://sik.ayy.fi/kilta/toiminta" />
</Helmet>
Actual Page
</div>
);
}
}
export default ActualPage;
+2
View File
@@ -0,0 +1,2 @@
import ActualPage from "./ActualPage";
export default ActualPage;
@@ -0,0 +1,5 @@
.corporate-page {
display: flex;
flex-flow: column wrap;
justify-content: flex-start;
}
+21
View File
@@ -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<CorporatePageProps, CorporatePageState> {
render() {
return (
<div className="corporate-page">
<Helmet>
<link rel="canonical" href="https://sik.ayy.fi/yritysyhteistyo" />
</Helmet>
Corporate Page
</div>
);
}
}
export default CorporatePage;
+2
View File
@@ -0,0 +1,2 @@
import CorporatePage from "./CorporatePage";
export default CorporatePage;
+5
View File
@@ -0,0 +1,5 @@
.freshmen-page {
display: flex;
flex-flow: column wrap;
justify-content: flex-start;
}
+21
View File
@@ -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<FreshmenPageProps, FreshmenPageState> {
render() {
return (
<div className="freshmen-page">
<Helmet>
<link rel="canonical" href="https://sik.ayy.fi/toiminta/fuksit" />
</Helmet>
Freshmen Page
</div>
);
}
}
export default FreshmenPage;
+2
View File
@@ -0,0 +1,2 @@
import FreshmenPage from "./FreshmenPage";
export default FreshmenPage;
@@ -0,0 +1,5 @@
.in-english-page {
display: flex;
flex-flow: column wrap;
justify-content: flex-start;
}
+21
View File
@@ -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<InEnglishPageProps, InEnglishPageState> {
render() {
return (
<div className="in-english-page">
<Helmet>
<link rel="canonical" href="https://sik.ayy.fi/in_english" />
</Helmet>
In English Page
</div>
);
}
}
export default InEnglishPage;
+2
View File
@@ -0,0 +1,2 @@
import InEnglishPage from "./InEnglishPage";
export default InEnglishPage;
+5
View File
@@ -0,0 +1,5 @@
.studies-page {
display: flex;
flex-flow: column wrap;
justify-content: flex-start;
}
+21
View File
@@ -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<StudiesPageProps, StudiesPageState> {
render() {
return (
<div className="studies-page">
<Helmet>
<link rel="canonical" href="https://sik.ayy.fi/opinnot" />
</Helmet>
Studies Page
</div>
);
}
}
export default StudiesPage;
+2
View File
@@ -0,0 +1,2 @@
import StudiesPage from "./StudiesPage";
export default StudiesPage;
+12 -2
View File
@@ -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 <CommonPage page={Page} {...props} />;
@@ -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 = [