Merge pull request #23 from infoshareacademy/michPas

Mich pas

package.json

@@ -20,12 +20,15 @@
     "react-circular-input": "^0.2.1",
     "react-dom": "^16.13.1",
     "react-icons": "^3.10.0",
+    "react-redux": "^7.2.1",
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.1",
     "react-share": "^4.2.1",
     "react-spring": "^8.0.27",
     "react-vis": "^1.11.7",
     "recharts": "^1.8.5",
+    "redux": "^4.0.5",
+    "redux-thunk": "^2.3.0",
     "swiper": "^6.0.4",
     "typescript": "^3.9.7",
     "yup": "^0.29.1"

src/App.css

@@ -5,4 +5,7 @@
 
 html{
   box-sizing: border-box;
+}
+p, h1, h2, h3, h4 {
+  margin: 0;
 }

src/App.js

@@ -5,7 +5,7 @@ import SignIn from './components/SignIn/SignIn';
 import SignUp from './components/SignUp/SignUp';
 import PasswordReset from './components/SignIn/PasswordReset';
 import About from './components/About';
-import Favorite from './components/Challlenges';
+import Favorite from './components/Challenges';
 import ChallengeDescription from './components/ChallengeDescription';
 import UserProfile from './components/UserProfile';
 import Diary from './components/diary/Diary';
@@ -14,7 +14,7 @@ import {makeStyles} from '@material-ui/core/styles';
 
 import { BrowserRouter, Switch, Route } from 'react-router-dom'
 import './App.css';
-import ChallengesList from './components/ChallengesList';
+import Challenges from './components/Challenges';
 
 import firebase from "firebase";
 /* import Password from 'antd/lib/input/Password'; */
@@ -58,21 +58,11 @@ function AppContent() {
         <main className={classes.content}>
           <div className={classes.toolbar} />
           <Switch>
-            <Route path="/about">
-              <About />
-            </Route>
-            <Route exact path="/challenges">
-            <ChallengesList />
-            </Route>
-            <Route path="/challenges/:id">
-              <ChallengeDescription />
-            </Route>
-            <Route path="/diary">
-              <Diary />
-            </Route>
-            <Route path="/">
-              <Dashboard />
-            </Route>
+            <Route path="/about" component={About} />
+            <Route exact path="/challenges" component={Challenges} />
+            <Route path="/challenges/:id" component={ChallengeDescription} />
+            <Route path="/diary" component={Diary} />
+            <Route exact path="/" component={Dashboard} />
           </Switch>
         </main>
       </div>
@@ -119,8 +109,7 @@ class App extends React.Component {
     });
   }
 
-  render() { 
-
+  render() {
     switch(this.state.user) {
       case Logged:
         return <AppContent />
@@ -133,7 +122,6 @@ class App extends React.Component {
       default:
         return <OnBoarding onLogin={this.handleLogin} onRegister={this.handleRegister} />  
     }
-
   }
 }