Conflicts manually resolved

src/components/AppBar.js

@@ -134,12 +134,7 @@ class PrimarySearchAppBar extends React.Component {
         open={isMenuOpen}
         onClose={this.handleMenuClose}>
         <MenuItem onClick={this.handleMenuClose}>Profile</MenuItem>
-<<<<<<< HEAD
-        <MenuItem onClick={this.handleMenuClose}>My account</MenuItem>
-        <MenuItem onClick={this.handleLogout}>Logout</MenuItem>
-=======
         <MenuItem onClick={this.handleMenuClose}>Logout</MenuItem>
->>>>>>> 10c4aac4ceef6ee7076e9f9d1daf97e64629717a
       </Menu>
     );
 

src/components/Dashboard.js

@@ -1,13 +1,9 @@
 import React, { Component } from 'react';
-<<<<<<< HEAD
 import { connect } from 'react-redux';
-import Paper from '@material-ui/core/Paper';
 import AppBar from './AppBar';
-import TodoCard from './TodoCard';
-import Grid from '@material-ui/core/Grid';
-import Editor from './Editor';
 import { fetchUsers, fetchPosts, fetchCategories } from '../actions';
 
+
 class Dashboard extends Component {
   componentDidMount() {
     this.props.fetchUsers();
@@ -27,26 +23,4 @@ class Dashboard extends Component {
 export default connect(
   null,
   { fetchUsers, fetchPosts, fetchCategories }
-)(Dashboard);
-=======
-// import { Provider } from 'react-redux';
-// import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
-// import { createGlobalStyle } from 'styled-components';
-// import theme from '../theme';
-import AppBar from './AppBar';
-import PreviewCard from './PreviewCard';
-
-
-class Dashboard extends Component {
-render() {
-  return (
-    <div className="app">
-    <AppBar/>
-    <PreviewCard/>
-    </div>
-    )
-}
-}
-
-export default Dashboard;
->>>>>>> 10c4aac4ceef6ee7076e9f9d1daf97e64629717a
+)(Dashboard);

src/components/Editor.js

@@ -4,29 +4,20 @@ import 'react-quill/dist/quill.snow.css';
 
 class Editor extends React.Component {
   constructor(props) {
-<<<<<<< HEAD
-    super(props);
-    this.state = { text: '' }; // You can also pass a Quill Delta here
-=======
     super(props)
     this.state = { text: '' }
     this.handleChange = this.handleChange.bind(this)
->>>>>>> 10c4aac4ceef6ee7076e9f9d1daf97e64629717a
   }
 
   handleChange = (value) => {
     this.setState({ text: value });
   }
 
   render() {
-<<<<<<< HEAD
-    return <ReactQuill value={this.state.text} onChange={this.handleChange} />;
-=======
     return (
       <ReactQuill value={this.state.text}
         onChange={this.handleChange} />
     )
->>>>>>> 10c4aac4ceef6ee7076e9f9d1daf97e64629717a
   }
 }
 

src/components/Root.js

@@ -5,21 +5,14 @@ import theme from '../theme';
 import PrivateRoute from './PrivateRoute';
 import { MuiThemeProvider } from '@material-ui/core/styles';
 import CssBaseline from '@material-ui/core/CssBaseline';
-
 import Dashboard from './Dashboard';
-<<<<<<< HEAD
 import Register from './Register';
-=======
 import NewPost from './NewPost';
-import Login from './Login';
-import Signup from './Signup';
 import SearchContainer from './SearchContainer';
 import ViewHowTo from './ViewHowTo';
 import UserProfile from './UserProfile';
 
 
->>>>>>> 10c4aac4ceef6ee7076e9f9d1daf97e64629717a
-
 const Root = ({ store }) => (
   <Provider store={store}>
     <Router>
@@ -33,24 +26,15 @@ const Root = ({ store }) => (
               return null;
             }}
           />
-<<<<<<< HEAD
           <Route exact path="/(login|signup)" component={Register} />
           <PrivateRoute path="/dashboard" component={Dashboard} />
-          {/* <PrivateRoute path="/dashboard/new" component={NewPost} /> */}
-          {/* <PrivateRoute path="/posts" component={Posts} />
-=======
-
-          <Route path="/login" component={Login} />
-          <Route path="/signup" component={Signup} />
           <Route path="/dashboard" component={Dashboard} />
           <Route path="/post/new" component={NewPost} />
           <Route path="/search" component={SearchContainer} />
           <Route path="/post/sample" component={ViewHowTo} />
           <Route path="/profile" component={UserProfile} />
-          {/* <PrivateRoute path="/onboard" component={Dashboard} />
-          <PrivateRoute path="/posts" component={Posts} />
->>>>>>> 10c4aac4ceef6ee7076e9f9d1daf97e64629717a
-          <Route component={NoMatch} /> */}
+          {/* <PrivateRoute path="/dashboard/new" component={NewPost} /> */}
+          {/* <PrivateRoute path="/posts" component={Posts} /> */}
         </Switch>
       </MuiThemeProvider>
     </Router>