|
@@ -1,5 +1,6 @@
|
|
import React, { useEffect } from 'react'
|
|
import React, { useEffect } from 'react'
|
|
import { connect } from 'react-redux'
|
|
import { connect } from 'react-redux'
|
|
|
|
+import { Route, Switch } from 'react-router-dom'
|
|
import { myFolowingPosts } from '../actions'
|
|
import { myFolowingPosts } from '../actions'
|
|
import Header from '../components/header/Header'
|
|
import Header from '../components/header/Header'
|
|
import { CMainContent } from '../components/main/MainContent'
|
|
import { CMainContent } from '../components/main/MainContent'
|
|
@@ -7,18 +8,24 @@ import { CMainContent } from '../components/main/MainContent'
|
|
|
|
|
|
|
|
|
|
const Main = ({ children }) =>
|
|
const Main = ({ children }) =>
|
|
- <>{children}</>
|
|
|
|
|
|
+ <div className='qq'>{children}</div>
|
|
|
|
|
|
|
|
|
|
export const CMain = connect(null, { postsFollowing: myFolowingPosts })(Main)
|
|
export const CMain = connect(null, { postsFollowing: myFolowingPosts })(Main)
|
|
|
|
|
|
|
|
+const Aside = () =>
|
|
|
|
+ <div>sdfsdgsgsdg</div>
|
|
|
|
+
|
|
export const Content = () => {
|
|
export const Content = () => {
|
|
return (
|
|
return (
|
|
<>
|
|
<>
|
|
<Header />
|
|
<Header />
|
|
<Main>
|
|
<Main>
|
|
- <CMainContent />
|
|
|
|
- {/* <Aside /> */}
|
|
|
|
|
|
+ <Switch>
|
|
|
|
+ <CMainContent />
|
|
|
|
+ <Route path='/message' componernt={Aside} />
|
|
|
|
+ </Switch>
|
|
|
|
+
|
|
</Main>
|
|
</Main>
|
|
</>
|
|
</>
|
|
)
|
|
)
|