diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx index 8cda681..337fab6 100644 --- a/src/components/Footer/Footer.tsx +++ b/src/components/Footer/Footer.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import { Link } from "react-router-dom"; import FooterMap from "../FooterMap/FooterMap"; import "./Footer.scss"; @@ -22,13 +23,13 @@ class Footer extends React.Component {

Y-tunnus: 1627010-1

sik-hallitus@list.ayy.fi

- Yhteystiedot + Yhteystiedot
- Jäseneksi - Palaute - Arkisto - Materiaalipankki + Jäseneksi + Palaute + Arkisto + Materiaalipankki
diff --git a/src/components/Icon/Icon.tsx b/src/components/Icon/Icon.tsx index a344bcd..e30bc91 100644 --- a/src/components/Icon/Icon.tsx +++ b/src/components/Icon/Icon.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import { Link } from "react-router-dom"; import "./Icon.scss"; export enum IconType { @@ -62,13 +63,13 @@ class Icon extends React.Component { const elem = nameToIcon(name); if (link) { return ( - {elem} - + ); } else { return ( diff --git a/src/components/NavbarChildLink/NavbarChildLink.tsx b/src/components/NavbarChildLink/NavbarChildLink.tsx index 97f9412..5ad3c08 100644 --- a/src/components/NavbarChildLink/NavbarChildLink.tsx +++ b/src/components/NavbarChildLink/NavbarChildLink.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import { Link } from "react-router-dom"; import "./NavbarChildLink.scss"; export interface NavbarChildLinkProps { @@ -11,10 +12,10 @@ export interface NavbarChildLinkState { class NavbarChildLink extends React.Component { render() { return ( - + {this.props.children} - + ); } } diff --git a/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx b/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx index 5b57268..08bc619 100644 --- a/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx +++ b/src/components/NavbarDropdownLink/NavbarDropdownLink.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import { Link } from "react-router-dom"; import "./NavbarDropdownLink.scss"; import { Fragment } from "react"; import DropDownBox from "../DropDownBox/DropDownBox"; @@ -55,9 +56,9 @@ class NavbarDropdownLink extends React.Component - {text} + {text} {children} ); @@ -65,11 +66,11 @@ class NavbarDropdownLink extends React.Component - {text} + >{text} { return (

{this.props.children}

- {desc} + {desc}
); } diff --git a/src/components/SponsorReel/SponsorReel.tsx b/src/components/SponsorReel/SponsorReel.tsx index 2417546..32a3e82 100644 --- a/src/components/SponsorReel/SponsorReel.tsx +++ b/src/components/SponsorReel/SponsorReel.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import { Link } from "react-router-dom"; import "./SponsorReel.scss"; export interface SponsorReelProps {} @@ -10,13 +11,13 @@ class SponsorReel extends React.Component {

Yhteistyössä

- - - - - + + + + +
- Haluatko kuulla lisää yhteistyöstä kanssamme? + Haluatko kuulla lisää yhteistyöstä kanssamme?
); } diff --git a/src/pages/FrontPage/FrontPage.tsx b/src/pages/FrontPage/FrontPage.tsx index 02693fb..b131e25 100644 --- a/src/pages/FrontPage/FrontPage.tsx +++ b/src/pages/FrontPage/FrontPage.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import { Link } from "react-router-dom"; import "./FrontPage.scss"; import appStore from "../../stores/AppStore"; import Card from "../../components/Card"; @@ -121,7 +122,7 @@ class FrontPage extends React.Component {

Sössöä vuodesta 1969.

- Lue opiskelijalehden viimeisin numero › + Lue opiskelijalehden viimeisin numero ›
diff --git a/src/routes.tsx b/src/routes.tsx index 04b36fc..ebebda2 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { Fragment } from "react"; -import { Switch, Route } from "react-router-dom"; +import { Switch, Route, DefaultRoute } from "react-router-dom"; import Helmet from "react-helmet"; import FrontPage from "./pages/FrontPage"; import NotFoundPage from "./pages/NotFoundPage";