|
@@ -10,33 +10,32 @@ import Profile from "./Content/Profile/profile";
|
|
|
import Settings from "./Content/Settings/settings";
|
|
|
|
|
|
function App(props) {
|
|
|
- return (
|
|
|
- <div className="app-wrapper">
|
|
|
- <Header />
|
|
|
+ return (
|
|
|
+ <div className="app-wrapper">
|
|
|
+ <Header />
|
|
|
|
|
|
- <div className="content-block">
|
|
|
- <Navigation />
|
|
|
+ <div className="content-block">
|
|
|
+ <Navigation />
|
|
|
|
|
|
- <div className="app-wrapper-content">
|
|
|
- <Redirect exact from="/" to="/profile" />
|
|
|
- <Route
|
|
|
- path="/profile"
|
|
|
- render={() => <Profile profilePage={props.state.profilePage}
|
|
|
- addPost={ props.addPost }
|
|
|
- updateNewPostText={ props.updateNewPostText }
|
|
|
- />}
|
|
|
- />
|
|
|
- <Route
|
|
|
- path="/messages"
|
|
|
- render={() => <Messages state={props.state.messagesPage} />}
|
|
|
- />
|
|
|
- <Route path="/news" component={News} />
|
|
|
- <Route path="/music" component={Music} />
|
|
|
- <Route path="/settings" component={Settings} />
|
|
|
+ <div className="app-wrapper-content">
|
|
|
+ <Redirect exact from="/" to="/profile" />
|
|
|
+ <Route
|
|
|
+ path="/profile"
|
|
|
+ render={() => <Profile profilePage={props.state.profilePage}
|
|
|
+ dispatch={props.dispatch}
|
|
|
+ />}
|
|
|
+ />
|
|
|
+ <Route
|
|
|
+ path="/messages"
|
|
|
+ render={() => <Messages state={props.state.messagesPage} />}
|
|
|
+ />
|
|
|
+ <Route path="/news" component={News} />
|
|
|
+ <Route path="/music" component={Music} />
|
|
|
+ <Route path="/settings" component={Settings} />
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- );
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
export default App;
|