rework sidebar

src/conteiners/home/Home.js

@@ -2,6 +2,8 @@ import React from 'react';
 
 import './home.scss';
 
+import Sidebar from '../../components/sidebar/Sidebar';
+
 export default class Home extends React.Component {
     state = {
         videoURL: 'https://gcs-vimeo.akamaized.net/exp=1562893179~acl=%2A%2F1021052489.mp4%2A~hmac=6ef33efd6a7867f05a06d888e576e87a48b2f33f42ca65ed7e78cd0d7a5cf3b0/vimeo-prod-skyfire-std-us/01/2799/9/238996987/1021052489.mp4'
@@ -9,6 +11,8 @@ export default class Home extends React.Component {
 
     render() {
         return (
+            <>
+            <Sidebar/>
             <div className="hero">
                 <h1>International triathlon competitions among professionals and amateurs</h1>
 
@@ -21,6 +25,7 @@ export default class Home extends React.Component {
                     Your browser does not support the video tag.
                 </video>
             </div>
+            </>
         )
     }
 }

src/conteiners/login/Login.js

@@ -1,25 +1,9 @@
 import React from 'react';
-import { connect } from "react-redux";
-
-import { showSidebar } from "../../actions/show-sidebar";
 
 import LoginForm from '../../components/login-form/LoginForm';
 
-export class Login extends React.Component {
-    componentDidMount() {
-        this.props.showSidebar()
-    }
-
-    componentWillUnmount() {
-        this.props.showSidebar()
-    }
-
+export default class Login extends React.Component {
     render() {
         return ( <LoginForm/> )
     }
-};
-
-export default connect(
-    null,
-    { showSidebar }
-)(Login);
+}

src/router.js

@@ -1,6 +1,5 @@
 import React from 'react'
 import { Switch, Route } from "react-router-dom";
-import { connect } from "react-redux";
 
 import AdminMainPage from './conteiners/adminMainPage/adminMainPage';
 import AdminAddEventPage from './conteiners/adminAddEventPage/adminAddEventPage';
@@ -10,59 +9,57 @@ import Login from './conteiners/login/Login';
 import AdminAddPhotogalarytPage from "./conteiners/adminPhotogalaryPage/adminPhotogalaryPage"
 import Sidebar from './components/sidebar/Sidebar';
 
-export class Router extends React.Component {
+export default class Router extends React.Component {
 	render() {
-		const { showSidebarBool } = this.props
 		return(
-			<>
-				{showSidebarBool && <Sidebar /> }
-				<div className="container">
-			        <Switch>
-			        	<Route exact path="/" component={Home} />
+			<div className="container">
+			    <Switch>
+			        <Route exact path="/" component={Home} />
 
-	                    <Route exact path="/races" render={() => (
-	                        <div className="text-center">
-	                            Races
-	                        </div>
-	                    )} />
+	                <Route exact path="/races" render={() => (
+						<>
+							<Sidebar />
+							<div className="text-center">
+								Races
+							</div>
+						</>
+	                )} />
 
-	                    <Route exact path="/result" render={() => (
-	                        <div className="text-center">
-	                            Result
-	                        </div>
-	                    )} />
+	                <Route exact path="/result" render={() => (
+						<>
+							<Sidebar />
+							<div className="text-center">
+								Result
+							</div>
+						</>
+	                )} />
 
-	                    <Route exact path="/gallery" render={() => (
-	                        <div className= "text-center">
-	                            Gallery
-	                        </div>
-	                    )} />
+	                <Route exact path="/gallery" render={() => (
+						<>
+							<Sidebar />
+							<div className= "text-center">
+								Gallery
+							</div>
+						</>
+	                )} />
 
-	                    <Route exact path="/reviews" render={() => (
-	                        <div className="text-center">
-	                            Reviews
-	                        </div>
-	                    )} />
+	                <Route exact path="/reviews" render={() => (
+						<>
+							<Sidebar />
+							<div className="text-center">
+								Reviews
+							</div>
+						</>
+	                )} />
 
-	                    <Route exact path="/login" component={Login} />
+	                <Route exact path="/login" component={Login} />
 			           
-			            <Route exact path = '/admin' component = {AdminMainPage} />
-			            <Route exact path = '/admin/add_new_event' component = {AdminAddEventPage} />
-			            <Route exact path = '/admin/photogalary' component = {AdminAddPhotogalarytPage} />
+			        <Route exact path = '/admin' component = {AdminMainPage} />
+			        <Route exact path = '/admin/add_new_event' component = {AdminAddEventPage} />
+			        <Route exact path = '/admin/photogalary' component = {AdminAddPhotogalarytPage} />
 			            
-			        </Switch>
-			    </div>
-		    </>
+			    </Switch>
+			</div>
 		)
 	}
-}
-
-const mapStateToProps = state => {
-    return {
-        showSidebarBool: state.Sidebar.showSidebar
-    };
-};
-
-export default connect(
-    mapStateToProps
-)(Router);
+}