Added a reading lists navigation link [#950]

comixed · Sep 24, 2021 · 33ce148 · 33ce148
1 parent 8a734e1
commit 33ce148
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/comixed-webui/src/app/components/side-navigation/side-navigation.component.html b/comixed-webui/src/app/components/side-navigation/side-navigation.component.html
@@ -157,6 +157,18 @@ <h4 class="section-title" *ngIf="!!user">
   {{ "navigation.heading.reading-lists" | translate }}
 </h4>
 
+<button
+  mat-button
+  class="menu-button"
+  routerLink="/lists/reading/all"
+  routerLinkActive="active"
+>
+  <mat-icon>library_add</mat-icon>
+  <span>
+    {{ "navigation.heading.reading-lists" | translate }}
+  </span>
+</button>
+
 <button
   mat-button
   *ngFor="let list of readingLists"

diff --git a/comixed-webui/src/app/lists/lists.routing.ts b/comixed-webui/src/app/lists/lists.routing.ts
@@ -29,13 +29,13 @@ const routes: Routes = [
     canActivate: [ReaderGuard]
   },
   {
-    path: 'lists/reading/:id',
-    component: ReadingListPageComponent,
+    path: 'lists/reading/all',
+    component: ReadingListsPageComponent,
     canActivate: [ReaderGuard]
   },
   {
-    path: 'lists/reading',
-    component: ReadingListsPageComponent,
+    path: 'lists/reading/:id',
+    component: ReadingListPageComponent,
     canActivate: [ReaderGuard]
   }
 ];

diff --git a/comixed-webui/src/app/lists/pages/reading-list-page/reading-list-page.component.spec.ts b/comixed-webui/src/app/lists/pages/reading-list-page/reading-list-page.component.spec.ts
@@ -186,7 +186,7 @@ describe('ReadingListPageComponent', () => {
     });
 
     it('redirects the browser', () => {
-      expect(router.navigateByUrl).toHaveBeenCalledWith('/lists/reading');
+      expect(router.navigateByUrl).toHaveBeenCalledWith('/lists/reading/all');
     });
   });
 
@@ -380,7 +380,7 @@ describe('ReadingListPageComponent', () => {
 
     it('redirects the browser when the current list was removed', () => {
       readingListRemovalSubscription(READING_LIST);
-      expect(router.navigateByUrl).toHaveBeenCalledWith('/lists/reading');
+      expect(router.navigateByUrl).toHaveBeenCalledWith('/lists/reading/all');
     });
 
     it('ignores when a different list was removed', () => {

diff --git a/comixed-webui/src/app/lists/pages/reading-list-page/reading-list-page.component.ts b/comixed-webui/src/app/lists/pages/reading-list-page/reading-list-page.component.ts
@@ -101,7 +101,7 @@ export class ReadingListPageComponent implements OnInit, OnDestroy {
       .subscribe(state => {
         if (state.notFound) {
           this.logger.trace('Reading list not found');
-          this.router.navigateByUrl('/lists/reading');
+          this.router.navigateByUrl('/lists/reading/all');
         } else {
           this.store.dispatch(setBusyState({ enabled: state.loading }));
         }
@@ -150,7 +150,7 @@ export class ReadingListPageComponent implements OnInit, OnDestroy {
               this.store.dispatch(readingListRemoved({ list }));
               if (list.id === this.readingListId) {
                 this.logger.trace('This reading list was removed');
-                this.router.navigateByUrl('/lists/reading');
+                this.router.navigateByUrl('/lists/reading/all');
               }
             }
           );