From 62ba0c07a48ba3c2054378d6bf9a213b92f4b4a3 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Wed, 1 Sep 2021 19:58:33 -0700
Subject: [PATCH] update routes for album/artist/folder/genre

---
 src/App.tsx                       |  9 ++++++--
 src/components/layout/Layout.tsx  | 15 ++++++++++---
 src/components/layout/Sidebar.tsx | 35 +++++++++++++++++++++++--------
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index d15eaab..5a0e7f8 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -15,6 +15,8 @@ import PlayerBar from './components/player/PlayerBar';
 import AlbumView from './components/library/AlbumView';
 import ArtistView from './components/library/ArtistView';
 import setDefaultSettings from './components/shared/setDefaultSettings';
+import AlbumList from './components/library/AlbumList';
+import ArtistList from './components/library/ArtistList';
 
 const keyMap = {
   FOCUS_SEARCH: 'ctrl+f',
@@ -57,12 +59,15 @@ const App = () => {
       <Router>
         <Layout footer={<PlayerBar />}>
           <Switch>
+            <Route exact path="/library/album" component={AlbumList} />
+            <Route exact path="/library/artist" component={ArtistList} />
+            <Route exact path="/library/genre" component={LibraryView} />
             <Route exact path="/library/artist/:id" component={ArtistView} />
             <Route exact path="/library/album/:id" component={AlbumView} />
-            <Route exact path="/library" component={LibraryView} />
+            <Route exact path="/folder" component={LibraryView} />
             <Route exact path="/nowplaying" component={NowPlayingView} />
             <Route exact path="/playlist/:id" component={PlaylistView} />
-            <Route exact path="/playlists" component={PlaylistList} />
+            <Route exact path="/playlist" component={PlaylistList} />
             <Route exact path="/starred" component={StarredView} />
             <Route exact path="/config" component={Config} />
             <Route path="/" component={Dashboard} />
diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
index ac3ac93..a5934bd 100644
--- a/src/components/layout/Layout.tsx
+++ b/src/components/layout/Layout.tsx
@@ -24,13 +24,22 @@ const Layout = ({ footer, children, disableSidebar }: any) => {
         route = '/nowplaying';
         break;
       case 'playlists':
-        route = '/playlists';
+        route = '/playlist';
         break;
       case 'starred':
         route = '/starred';
         break;
-      case 'library':
-        route = '/library';
+      case 'albums':
+        route = '/library/album';
+        break;
+      case 'artists':
+        route = '/library/artist';
+        break;
+      case 'genres':
+        route = '/library/genre';
+        break;
+      case 'folders':
+        route = '/folder';
         break;
       case 'config':
         route = '/config';
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index 1b5647c..afc0740 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Sidenav, Nav, Icon } from 'rsuite';
+import { Sidenav, Nav, Icon, Dropdown } from 'rsuite';
 import { FixedSidebar } from './styled';
 
 const Sidebar = ({
@@ -22,20 +22,20 @@ const Sidebar = ({
         <Sidenav.Body>
           <Nav>
             <Nav.Item
-              eventKey="discover"
-              icon={<Icon icon="dashboard" />}
+              eventKey="nowplaying"
+              icon={<Icon icon="music" />}
               onSelect={handleSidebarSelect}
               disabled={disableSidebar}
             >
-              Dashboard
+              Now Playing
             </Nav.Item>
             <Nav.Item
-              eventKey="nowplaying"
-              icon={<Icon icon="music" />}
+              eventKey="discover"
+              icon={<Icon icon="dashboard" />}
               onSelect={handleSidebarSelect}
               disabled={disableSidebar}
             >
-              Now Playing
+              Dashboard
             </Nav.Item>
             <Nav.Item
               eventKey="starred"
@@ -54,13 +54,29 @@ const Sidebar = ({
               Playlists
             </Nav.Item>
             <Nav.Item
-              eventKey="library"
+              eventKey="folders"
               icon={<Icon icon="folder-open" />}
               onSelect={handleSidebarSelect}
               disabled={disableSidebar}
             >
-              Library
+              Folders
             </Nav.Item>
+            <Dropdown
+              placement="rightStart"
+              eventKey="library"
+              title="Library"
+              icon={<Icon icon="book2" />}
+            >
+              <Dropdown.Item eventKey="albums" onSelect={handleSidebarSelect}>
+                Albums
+              </Dropdown.Item>
+              <Dropdown.Item eventKey="artists" onSelect={handleSidebarSelect}>
+                Artists
+              </Dropdown.Item>
+              <Dropdown.Item eventKey="genres" onSelect={handleSidebarSelect}>
+                Genres
+              </Dropdown.Item>
+            </Dropdown>
             <Nav.Item
               eventKey="config"
               icon={<Icon icon="gear-circle" />}
@@ -69,6 +85,7 @@ const Sidebar = ({
             >
               Config
             </Nav.Item>
+
             <Nav.Item
               icon={<Icon icon={expand ? 'arrow-left' : 'arrow-right'} />}
               onSelect={handleToggle}