ODWRTW/canape
2
2
Fork 0
Code Issues 3 Pull Requests 1 Releases Activity

Merge branch 'wishlist' into 'master'

Browse Source 
Add wishlist pages in navbar

See merge request !50
This commit is contained in:
Grégoire Delattre 2017-03-22 13:02:53 +00:00
commit b6a09743eb
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/js/app.js
View File

@ -83,6 +83,9 @@ const MovieListPopular = (props) => (
const MovieListPolochon = (props) => ( const MovieListPolochon = (props) => (
<MovieList {...props} moviesUrl='/movies/polochon'/> <MovieList {...props} moviesUrl='/movies/polochon'/>
) )
const MovieListWishlisted = (props) => (
<MovieList {...props} moviesUrl='/wishlist/movies'/>
)
const MovieListSearch = (props) => ( const MovieListSearch = (props) => (
<MovieList {...props} /> <MovieList {...props} />
) )
@ -93,6 +96,9 @@ const ShowListPopular = (props) => (
const ShowListPolochon = (props) => ( const ShowListPolochon = (props) => (
<ShowList {...props} showsUrl='/shows/polochon'/> <ShowList {...props} showsUrl='/shows/polochon'/>
) )
const ShowListWishlisted = (props) => (
<MovieList {...props} moviesUrl='/wishlist/shows'/>
)
const ShowDetailsView = (props) => ( const ShowDetailsView = (props) => (
<ShowDetails {...props} /> <ShowDetails {...props} />
) )
@ -111,9 +117,11 @@ ReactDOM.render((
<Route path="/movies/search/:search" component={UserIsAuthenticated(MovieListSearch)} /> <Route path="/movies/search/:search" component={UserIsAuthenticated(MovieListSearch)} />
<Route path="/movies/popular" component={UserIsAuthenticated(MovieListPopular)} /> <Route path="/movies/popular" component={UserIsAuthenticated(MovieListPopular)} />
<Route path="/movies/polochon" component={UserIsAuthenticated(MovieListPolochon)} /> <Route path="/movies/polochon" component={UserIsAuthenticated(MovieListPolochon)} />
<Route path="/movies/wishlist" component={UserIsAuthenticated(MovieListWishlisted)} />
<Route path="/shows/search/:search" component={UserIsAuthenticated(ShowListSearch)} /> <Route path="/shows/search/:search" component={UserIsAuthenticated(ShowListSearch)} />
<Route path="/shows/popular" component={UserIsAuthenticated(ShowListPopular)} /> <Route path="/shows/popular" component={UserIsAuthenticated(ShowListPopular)} />
<Route path="/shows/polochon" component={UserIsAuthenticated(ShowListPolochon)} /> <Route path="/shows/polochon" component={UserIsAuthenticated(ShowListPolochon)} />
<Route path="/shows/wishlist" component={UserIsAuthenticated(ShowListWishlisted)} />
<Route path="/shows/details/:imdbId" component={UserIsAuthenticated(ShowDetailsView)} /> <Route path="/shows/details/:imdbId" component={UserIsAuthenticated(ShowDetailsView)} />
</Route> </Route>
</Router> </Router>

16
src/public/js/components/navbar.js
View File

@ -19,6 +19,7 @@ export default function NavBar(props) {
<Navbar.Collapse> <Navbar.Collapse>
<MoviesDropdown /> <MoviesDropdown />
<ShowsDropdown /> <ShowsDropdown />
<WishlistDropdown />
<UserDropdown <UserDropdown
username={props.userStore.username} username={props.userStore.username}
logout={props.userLogout} logout={props.userLogout}
@ -134,3 +135,18 @@ function UserDropdown(props) {
); );
} }
} }
function WishlistDropdown(props) {
return(
<Nav>
<NavDropdown title="Wishlist" id="navbar-wishlit-dropdown">
<LinkContainer to="/movies/wishlist">
<MenuItem>Movies</MenuItem>
</LinkContainer>
<LinkContainer to="/shows/wishlist">
<MenuItem>Shows</MenuItem>
</LinkContainer>
</NavDropdown>
</Nav>
);
}