Merge with master

Relates #63
fac-17 · Oct 8, 2019 · 6cf1802 · 6cf1802
2 parents 2f740f3 + b1edc80
commit 6cf1802
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/src/App.js b/src/App.js
@@ -1,6 +1,12 @@
 import React from "react";
 import "./App.css";
-import { BrowserRouter as Router, Route, Switch, Link } from "react-router-dom";
+import {
+  Redirect,
+  BrowserRouter as Router,
+  Route,
+  Switch,
+  Link
+} from "react-router-dom";
 import PrivacyPolicy from "./components/PrivacyPolicy/PrivacyPolicy";
 import Menu from "./components/Menu/Menu";
 import Welcome from "./components/Welcome/Welcome";
@@ -9,17 +15,21 @@ import About from "./components/About/About";
 import FeelingOverwhelmed from "./components/FeelingOverwhelmed/FeelingOverwhelmed";
 import HelpingOurselves from "./components/HelpingOurselves/HelpingOurselves";
 import MyAppointment from "./components/MyAppointment/MyAppointment";
+import PageNotFound from "./components/PageNotFound/PageNotFound";
 
 function App() {
   return (
     <div className="App">
       <Router>
-        <Route exact path="/" component={PrivacyPolicy} />
-        <Route path="/welcome" component={Welcome} />
-        <Route path="/about" component={About} />
-        <Route path="/feelingoverwhelmed" component={FeelingOverwhelmed} />
-        <Route path="/helpingourselves" component={HelpingOurselves} />
-        <Route path="/myappointment" component={MyAppointment} />
+        <Switch>
+          <Route exact path="/" component={PrivacyPolicy} />
+          <Route path="/welcome" component={Welcome} />
+          <Route path="/about" component={About} />
+          <Route path="/feelingoverwhelmed" component={FeelingOverwhelmed} />
+          <Route path="/helpingourselves" component={HelpingOurselves} />
+          <Route path="/myappointment" component={MyAppointment} />
+          <Route path="*" component={PageNotFound} />
+        </Switch>
       </Router>
     </div>
   );

diff --git a/src/components/PageNotFound/PageNotFound.css b/src/components/PageNotFound/PageNotFound.css
diff --git a/src/components/PageNotFound/PageNotFound.js b/src/components/PageNotFound/PageNotFound.js
@@ -0,0 +1,12 @@
+import React from "react";
+import { Link } from 'react-router-dom';
+
+
+const PageNotFound = () => (
+    <div>
+        <p>page is not found!!!404</p>
+    </div>
+
+);
+
+export default PageNotFound;