|
@@ -1,12 +1,14 @@
|
|
import {Redirect, Switch} from 'react-router-dom';
|
|
import {Redirect, Switch} from 'react-router-dom';
|
|
import {NoPlaylistMytracks} from "./my-tracks";
|
|
import {NoPlaylistMytracks} from "./my-tracks";
|
|
-import {UserTracks} from "./user-tracks";
|
|
|
|
|
|
+import {HelloPage, UserTracks} from "./user-tracks";
|
|
import {CAllTracks} from "./user-tracks";
|
|
import {CAllTracks} from "./user-tracks";
|
|
import {CAllUsers} from "./user-tracks";
|
|
import {CAllUsers} from "./user-tracks";
|
|
import {CMyPlaylists} from "./my-tracks";
|
|
import {CMyPlaylists} from "./my-tracks";
|
|
import {CProtectedRoute} from "../reducers";
|
|
import {CProtectedRoute} from "../reducers";
|
|
import {CSearchResult} from "./tools/search";
|
|
import {CSearchResult} from "./tools/search";
|
|
-import {MyPlaylistTracks} from "./my-tracks";
|
|
|
|
|
|
+import {HelloUserPage,MyPlaylistTracks} from "./my-tracks";
|
|
|
|
+import {UserPlaylistById} from "./user-tracks/user-playlists";
|
|
|
|
+import {UserPlaylistTracks} from "./user-tracks";
|
|
|
|
|
|
export const Aside = ({children}) =>
|
|
export const Aside = ({children}) =>
|
|
<div className='Aside'>
|
|
<div className='Aside'>
|
|
@@ -33,11 +35,12 @@ export const Main = () =>
|
|
<Redirect from='/main' to='/'/>
|
|
<Redirect from='/main' to='/'/>
|
|
<Switch>
|
|
<Switch>
|
|
<CProtectedRoute roles={["anon", "user"]} path="/search" component={CSearchResult}/>
|
|
<CProtectedRoute roles={["anon", "user"]} path="/search" component={CSearchResult}/>
|
|
- <CProtectedRoute roles={["anon", "user"]} path="/music" component={CAllTracks}/>
|
|
|
|
- <CProtectedRoute roles={["anon", "user"]} path='/' component={NoPlaylistMytracks} exact/>
|
|
|
|
<CProtectedRoute roles={["anon", "user"]} path="/myPlaylist/:_id" component={MyPlaylistTracks}/>
|
|
<CProtectedRoute roles={["anon", "user"]} path="/myPlaylist/:_id" component={MyPlaylistTracks}/>
|
|
- <CProtectedRoute roles={["anon", "user"]} path="/user/:_id" component={UserTracks}/>
|
|
|
|
- <CProtectedRoute roles={["anon", "user"]} path='/mymusic' component={NoPlaylistMytracks}/>
|
|
|
|
|
|
+ <CProtectedRoute roles={["anon", "user"]} path="/userPlaylist/:_id" component={UserPlaylistTracks}/>
|
|
|
|
+ <CProtectedRoute roles={["anon", "user"]} path="/user/:_id" component={UserPlaylistById}/>
|
|
|
|
+ <CProtectedRoute roles={["anon", "user"]} path="/music" component={HelloPage}/>
|
|
|
|
+ <CProtectedRoute roles={["anon", "user"]} path='/' component={HelloPage} exact/>
|
|
|
|
+ <CProtectedRoute roles={["anon", "user"]} path='/mymusic' component={HelloUserPage}/>
|
|
</Switch>
|
|
</Switch>
|
|
</Content>
|
|
</Content>
|
|
</main>
|
|
</main>
|