diff --git a/API.Tests/Services/ReaderServiceTests.cs b/API.Tests/Services/ReaderServiceTests.cs index 016b31f0f..fbe895317 100644 --- a/API.Tests/Services/ReaderServiceTests.cs +++ b/API.Tests/Services/ReaderServiceTests.cs @@ -1152,6 +1152,56 @@ public class ReaderServiceTests #region GetContinuePoint + [Fact] + public async Task GetContinuePoint_ShouldReturnFirstVolume_NoProgress() + { + _context.Series.Add(new Series() + { + Name = "Test", + Library = new Library() { + Name = "Test LIb", + Type = LibraryType.Manga, + }, + Volumes = new List() + { + EntityFactory.CreateVolume("0", new List() + { + EntityFactory.CreateChapter("95", false, new List(), 1), + EntityFactory.CreateChapter("96", false, new List(), 1), + }), + EntityFactory.CreateVolume("1", new List() + { + EntityFactory.CreateChapter("1", false, new List(), 1), + EntityFactory.CreateChapter("2", false, new List(), 1), + }), + EntityFactory.CreateVolume("2", new List() + { + EntityFactory.CreateChapter("21", false, new List(), 1), + EntityFactory.CreateChapter("22", false, new List(), 1), + }), + EntityFactory.CreateVolume("3", new List() + { + EntityFactory.CreateChapter("31", false, new List(), 1), + EntityFactory.CreateChapter("32", false, new List(), 1), + }), + } + }); + + _context.AppUser.Add(new AppUser() + { + UserName = "majora2007" + }); + + await _context.SaveChangesAsync(); + + + var readerService = new ReaderService(_unitOfWork, Substitute.For>()); + + var nextChapter = await readerService.GetContinuePoint(1, 1); + + Assert.Equal("1", nextChapter.Range); + } + [Fact] public async Task GetContinuePoint_ShouldReturnFirstNonSpecial() { diff --git a/API.Tests/Services/SeriesServiceTests.cs b/API.Tests/Services/SeriesServiceTests.cs index d91564cff..c8655eaba 100644 --- a/API.Tests/Services/SeriesServiceTests.cs +++ b/API.Tests/Services/SeriesServiceTests.cs @@ -201,8 +201,8 @@ public class SeriesServiceTests Assert.Equal(6, detail.Chapters.Count()); Assert.NotEmpty(detail.Volumes); - Assert.Equal(3, detail.Volumes.Count()); // This returns 3 because 0 volume will still come - Assert.All(detail.Volumes, dto => Assert.Contains(dto.Name, new[] {"0", "2", "3"})); + Assert.Equal(2, detail.Volumes.Count()); // Volume 0 shouldn't be sent in Volumes + Assert.All(detail.Volumes, dto => Assert.Contains(dto.Name, new[] {"2", "3"})); } [Fact] @@ -239,10 +239,11 @@ public class SeriesServiceTests var detail = await _seriesService.GetSeriesDetail(1, 1); Assert.NotEmpty(detail.Chapters); - Assert.Equal(3, detail.Chapters.Count()); // volume 2 has a 0 chapter aka a single chapter that is represented as a volume. We don't show in Chapters area + // volume 2 has a 0 chapter aka a single chapter that is represented as a volume. We don't show in Chapters area + Assert.Equal(3, detail.Chapters.Count()); Assert.NotEmpty(detail.Volumes); - Assert.Equal(3, detail.Volumes.Count()); + Assert.Equal(2, detail.Volumes.Count()); } [Fact] @@ -279,6 +280,46 @@ public class SeriesServiceTests Assert.Equal(2, detail.Volumes.Count()); } + [Fact] + public async Task SeriesDetail_WhenBookLibrary_ShouldReturnVolumesAndSpecial() + { + await ResetDb(); + + _context.Series.Add(new Series() + { + Name = "Test", + Library = new Library() { + Name = "Test LIb", + Type = LibraryType.Book, + }, + Volumes = new List() + { + EntityFactory.CreateVolume("0", new List() + { + EntityFactory.CreateChapter("Ano Orokamono ni mo Kyakkou wo! - Volume 1.epub", true, new List()), + }), + EntityFactory.CreateVolume("2", new List() + { + EntityFactory.CreateChapter("Ano Orokamono ni mo Kyakkou wo! - Volume 2.epub", false, new List()), + }), + } + }); + + await _context.SaveChangesAsync(); + + var detail = await _seriesService.GetSeriesDetail(1, 1); + Assert.NotEmpty(detail.Volumes); + Assert.Equal("2 - Ano Orokamono ni mo Kyakkou wo! - Volume 2", detail.Volumes.ElementAt(0).Name); + + Assert.NotEmpty(detail.Specials); + Assert.Equal("Ano Orokamono ni mo Kyakkou wo! - Volume 1.epub", detail.Specials.ElementAt(0).Range); + + // A book library where all books are Volumes, will show no "chapters" on the UI because it doesn't make sense + Assert.Empty(detail.Chapters); + + Assert.Equal(1, detail.Volumes.Count()); + } + [Fact] public async Task SeriesDetail_ShouldSortVolumesByName() { diff --git a/API/Controllers/ReadingListController.cs b/API/Controllers/ReadingListController.cs index 34a7e47b8..83cdc1a04 100644 --- a/API/Controllers/ReadingListController.cs +++ b/API/Controllers/ReadingListController.cs @@ -49,6 +49,15 @@ namespace API.Controllers return Ok(items); } + [HttpGet("lists-for-series")] + public async Task>> GetListsForSeries(int seriesId) + { + var userId = await _unitOfWork.UserRepository.GetUserIdByUsernameAsync(User.GetUsername()); + var items = await _unitOfWork.ReadingListRepository.GetReadingListDtosForSeriesAndUserAsync(userId, seriesId, true); + + return Ok(items); + } + /// /// Fetches all reading list items for a given list including rich metadata around series, volume, chapters, and progress /// diff --git a/API/DTOs/SeriesDto.cs b/API/DTOs/SeriesDto.cs index fc70ce5ed..18d706a2e 100644 --- a/API/DTOs/SeriesDto.cs +++ b/API/DTOs/SeriesDto.cs @@ -18,6 +18,10 @@ namespace API.DTOs /// public int PagesRead { get; set; } /// + /// DateTime representing last time the series was Read. Calculated at API-time. + /// + public DateTime LatestReadDate { get; set; } + /// /// Rating from logged in user. Calculated at API-time. /// public int UserRating { get; set; } diff --git a/API/Data/Repositories/ReadingListRepository.cs b/API/Data/Repositories/ReadingListRepository.cs index 329ec47a8..ca21bf26c 100644 --- a/API/Data/Repositories/ReadingListRepository.cs +++ b/API/Data/Repositories/ReadingListRepository.cs @@ -19,6 +19,9 @@ public interface IReadingListRepository Task> AddReadingProgressModifiers(int userId, IList items); Task GetReadingListDtoByTitleAsync(string title); Task> GetReadingListItemsByIdAsync(int readingListId); + + Task> GetReadingListDtosForSeriesAndUserAsync(int userId, int seriesId, + bool includePromoted); void Remove(ReadingListItem item); void BulkRemove(IEnumerable items); void Update(ReadingList list); @@ -62,6 +65,18 @@ public class ReadingListRepository : IReadingListRepository return await PagedList.CreateAsync(query, userParams.PageNumber, userParams.PageSize); } + public async Task> GetReadingListDtosForSeriesAndUserAsync(int userId, int seriesId, bool includePromoted) + { + var query = _context.ReadingList + .Where(l => l.AppUserId == userId || (includePromoted && l.Promoted )) + .Where(l => l.Items.Any(i => i.SeriesId == seriesId)) + .OrderBy(l => l.LastModified) + .ProjectTo(_mapper.ConfigurationProvider) + .AsNoTracking(); + + return await query.ToListAsync(); + } + public async Task GetReadingListByIdAsync(int readingListId) { return await _context.ReadingList diff --git a/API/Data/Repositories/SeriesRepository.cs b/API/Data/Repositories/SeriesRepository.cs index 0c8caa2e1..1d72040d9 100644 --- a/API/Data/Repositories/SeriesRepository.cs +++ b/API/Data/Repositories/SeriesRepository.cs @@ -469,6 +469,7 @@ public class SeriesRepository : ISeriesRepository if (rating == null) continue; s.UserRating = rating.Rating; s.UserReview = rating.Review; + s.LatestReadDate = userProgress.Max(p => p.LastModified); } } diff --git a/API/Services/SeriesService.cs b/API/Services/SeriesService.cs index 422d98e66..714639813 100644 --- a/API/Services/SeriesService.cs +++ b/API/Services/SeriesService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Threading.Tasks; using API.Comparators; @@ -217,14 +218,34 @@ public class SeriesService : ISeriesService var chapters = volumes.SelectMany(v => v.Chapters).ToList(); // For books, the Name of the Volume is remapped to the actual name of the book, rather than Volume number. + var processedVolumes = new List(); if (libraryType == LibraryType.Book) { foreach (var volume in volumes) { var firstChapter = volume.Chapters.First(); - if (!string.IsNullOrEmpty(firstChapter.TitleName)) volume.Name += $" - {firstChapter.TitleName}"; + // On Books, skip volumes that are specials, since these will be shown + if (firstChapter.IsSpecial) continue; + if (string.IsNullOrEmpty(firstChapter.TitleName)) + { + if (!firstChapter.Range.Equals(Parser.Parser.DefaultVolume)) + { + var title = Path.GetFileNameWithoutExtension(firstChapter.Range); + if (string.IsNullOrEmpty(title)) continue; + volume.Name += $" - {title}"; + } + } + else + { + volume.Name += $" - {firstChapter.TitleName}"; + } + processedVolumes.Add(volume); } } + else + { + processedVolumes = volumes.Where(v => v.Number > 0).ToList(); + } var specials = new List(); @@ -233,14 +254,26 @@ public class SeriesService : ISeriesService chapter.Title = Parser.Parser.CleanSpecialTitle(chapter.Title); specials.Add(chapter); } + + // Don't show chapter 0 (aka single volume chapters) in the Chapters tab or books that are just single numbers (they show as volumes) + IEnumerable retChapters; + if (libraryType == LibraryType.Book) + { + retChapters = Array.Empty(); + } else + { + retChapters = chapters + .Where(ShouldIncludeChapter) + .OrderBy(c => float.Parse(c.Number), new ChapterSortComparer()); + } + + + return new SeriesDetailDto() { Specials = specials, - // Don't show chapter 0 (aka single volume chapters) in the Chapters tab or books that are just single numbers (they show as volumes) - Chapters = chapters - .Where(ShouldIncludeChapter) - .OrderBy(c => float.Parse(c.Number), new ChapterSortComparer()), - Volumes = volumes, + Chapters = retChapters, + Volumes = processedVolumes, StorylineChapters = volumes .Where(v => v.Number == 0) .SelectMany(v => v.Chapters) diff --git a/UI/Web/src/app/_interceptors/error.interceptor.ts b/UI/Web/src/app/_interceptors/error.interceptor.ts index 2e4b50acd..a0b792045 100644 --- a/UI/Web/src/app/_interceptors/error.interceptor.ts +++ b/UI/Web/src/app/_interceptors/error.interceptor.ts @@ -1,4 +1,4 @@ -import { Injectable, OnDestroy } from '@angular/core'; +import { Injectable } from '@angular/core'; import { HttpRequest, HttpHandler, @@ -8,14 +8,12 @@ import { import { Observable, throwError } from 'rxjs'; import { Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; -import { catchError, take } from 'rxjs/operators'; +import { catchError } from 'rxjs/operators'; import { AccountService } from '../_services/account.service'; -import { environment } from 'src/environments/environment'; @Injectable() export class ErrorInterceptor implements HttpInterceptor { - public urlKey: string = 'kavita--no-connection-url'; constructor(private router: Router, private toastr: ToastrService, private accountService: AccountService) {} @@ -44,12 +42,6 @@ export class ErrorInterceptor implements HttpInterceptor { if (this.toastr.previousToastMessage !== 'Something unexpected went wrong.') { this.toastr.error('Something unexpected went wrong.'); } - - // If we are not on no-connection, redirect there and save current url so when we refersh, we redirect back there - // if (this.router.url !== '/no-connection') { - // localStorage.setItem(this.urlKey, this.router.url); - // this.router.navigateByUrl('/no-connection'); - // } break; } return throwError(error); @@ -126,8 +118,7 @@ export class ErrorInterceptor implements HttpInterceptor { private handleAuthError(error: any) { // NOTE: Signin has error.error or error.statusText available. // if statement is due to http/2 spec issue: https://github.com/angular/angular/issues/23334 - this.accountService.currentUser$.pipe(take(1)).subscribe(user => { - this.accountService.logout(); - }); + this.accountService.logout(); + this.router.navigateByUrl('/login'); } } diff --git a/UI/Web/src/app/_models/config-data.ts b/UI/Web/src/app/_models/config-data.ts index 360fc45b1..2e8dc7842 100644 --- a/UI/Web/src/app/_models/config-data.ts +++ b/UI/Web/src/app/_models/config-data.ts @@ -1,10 +1,10 @@ /** * This is for base url only. Not to be used my applicaiton, only loading and bootstrapping app */ -export class ConfigData { - baseUrl: string = '/'; +// export class ConfigData { +// baseUrl: string = '/'; - constructor(baseUrl: string) { - this.baseUrl = baseUrl; - } -} \ No newline at end of file +// constructor(baseUrl: string) { +// this.baseUrl = baseUrl; +// } +// } \ No newline at end of file diff --git a/UI/Web/src/app/_models/series.ts b/UI/Web/src/app/_models/series.ts index 332407105..2bed3bc08 100644 --- a/UI/Web/src/app/_models/series.ts +++ b/UI/Web/src/app/_models/series.ts @@ -4,16 +4,41 @@ import { Volume } from './volume'; export interface Series { id: number; name: string; - originalName: string; // This is not shown to user + /** + * This is not shown to user + */ + originalName: string; localizedName: string; sortName: string; coverImageLocked: boolean; volumes: Volume[]; - pages: number; // Total pages in series - pagesRead: number; // Total pages the logged in user has read - userRating: number; // User rating - userReview: string; // User review + /** + * Total pages in series + */ + pages: number; + /** + * Total pages the logged in user has read + */ + pagesRead: number; + /** + * User's rating (0-5) + */ + userRating: number; + /** + * The user's review + */ + userReview: string; libraryId: number; - created: string; // DateTime when entity was created + /** + * DateTime the entity was created + */ + created: string; + /** + * Format of the Series + */ format: MangaFormat; + /** + * DateTime that represents last time the logged in user read this series + */ + latestReadDate: string; } diff --git a/UI/Web/src/app/_services/reading-list.service.ts b/UI/Web/src/app/_services/reading-list.service.ts index 3ad5255f6..45bc86828 100644 --- a/UI/Web/src/app/_services/reading-list.service.ts +++ b/UI/Web/src/app/_services/reading-list.service.ts @@ -30,6 +30,10 @@ export class ReadingListService { ); } + getReadingListsForSeries(seriesId: number) { + return this.httpClient.get(this.baseUrl + 'readinglist/lists-for-series?seriesId=' + seriesId); + } + getListItems(readingListId: number) { return this.httpClient.get(this.baseUrl + 'readinglist/items?readingListId=' + readingListId); } @@ -47,7 +51,7 @@ export class ReadingListService { } updateByMultipleSeries(readingListId: number, seriesIds: Array) { - return this.httpClient.post(this.baseUrl + 'readinglist/update-by-multiple-series', {readingListId, seriesIds}); + return this.httpClient.post(this.baseUrl + 'readinglist/update-by-multiple-series', {readingListId, seriesIds}, { responseType: 'text' as 'json' }); } updateBySeries(readingListId: number, seriesId: number) { diff --git a/UI/Web/src/app/admin/manage-settings/manage-settings.component.html b/UI/Web/src/app/admin/manage-settings/manage-settings.component.html index b8b747b45..7bda84b4b 100644 --- a/UI/Web/src/app/admin/manage-settings/manage-settings.component.html +++ b/UI/Web/src/app/admin/manage-settings/manage-settings.component.html @@ -20,22 +20,15 @@ - -
-
+
  Port the server listens on. This is fixed if you are running on Docker. Requires restart to take effect.
-
+
  Use debug to help identify issues. Debug can eat up a lot of disk space. Requires restart to take effect. diff --git a/UI/Web/src/app/app-routing.module.ts b/UI/Web/src/app/app-routing.module.ts index 14763cbb3..cebf755db 100644 --- a/UI/Web/src/app/app-routing.module.ts +++ b/UI/Web/src/app/app-routing.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { LibraryDetailComponent } from './library-detail/library-detail.component'; -import { NotConnectedComponent } from './not-connected/not-connected.component'; import { SeriesDetailComponent } from './series-detail/series-detail.component'; import { RecentlyAddedComponent } from './recently-added/recently-added.component'; import { UserLoginComponent } from './user-login/user-login.component'; @@ -16,7 +15,6 @@ import { ThemeTestComponent } from './theme-test/theme-test.component'; // TODO: Once we modularize the components, use this and measure performance impact: https://angular.io/guide/lazy-loading-ngmodules#preloading-modules const routes: Routes = [ - {path: '', component: UserLoginComponent}, { path: 'admin', canActivate: [AdminGuard], @@ -37,6 +35,10 @@ const routes: Routes = [ canActivate: [AuthGuard], loadChildren: () => import('./reading-list/reading-list.module').then(m => m.ReadingListModule) }, + { + path: 'registration', + loadChildren: () => import('../app/registration/registration.module').then(m => m.RegistrationModule) + }, { path: '', runGuardsAndResolvers: 'always', @@ -66,13 +68,10 @@ const routes: Routes = [ ] }, - { - path: 'registration', - loadChildren: () => import('../app/registration/registration.module').then(m => m.RegistrationModule) - }, - {path: 'login', component: UserLoginComponent}, // TODO: move this to registration module - {path: 'no-connection', component: NotConnectedComponent}, {path: 'theme', component: ThemeTestComponent}, + + {path: '', component: UserLoginComponent}, + {path: 'login', component: UserLoginComponent}, // TODO: move this to registration module {path: '**', component: UserLoginComponent, pathMatch: 'full'} ]; diff --git a/UI/Web/src/app/app.module.ts b/UI/Web/src/app/app.module.ts index 8ced2e262..8847e77d2 100644 --- a/UI/Web/src/app/app.module.ts +++ b/UI/Web/src/app/app.module.ts @@ -7,7 +7,7 @@ import { AppComponent } from './app.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; -import { NgbCollapseModule, NgbDropdownModule, NgbNavModule, NgbPaginationModule, NgbPopoverModule, NgbRatingModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgbAccordionModule, NgbCollapseModule, NgbDropdownModule, NgbNavModule, NgbPaginationModule, NgbPopoverModule, NgbRatingModule } from '@ng-bootstrap/ng-bootstrap'; import { NavHeaderComponent } from './nav-header/nav-header.component'; import { JwtInterceptor } from './_interceptors/jwt.interceptor'; import { UserLoginComponent } from './user-login/user-login.component'; @@ -17,7 +17,6 @@ import { LibraryComponent } from './library/library.component'; import { SharedModule } from './shared/shared.module'; import { LibraryDetailComponent } from './library-detail/library-detail.component'; import { SeriesDetailComponent } from './series-detail/series-detail.component'; -import { NotConnectedComponent } from './not-connected/not-connected.component'; import { ReviewSeriesModalComponent } from './_modals/review-series-modal/review-series-modal.component'; import { CarouselModule } from './carousel/carousel.module'; @@ -29,7 +28,6 @@ import { CardsModule } from './cards/cards.module'; import { CollectionsModule } from './collections/collections.module'; import { ReadingListModule } from './reading-list/reading-list.module'; import { SAVER, getSaver } from './shared/_providers/saver.provider'; -import { ConfigData } from './_models/config-data'; import { NavEventsToggleComponent } from './nav-events-toggle/nav-events-toggle.component'; import { PersonRolePipe } from './_pipes/person-role.pipe'; import { SeriesMetadataDetailComponent } from './series-metadata-detail/series-metadata-detail.component'; @@ -48,7 +46,6 @@ import { ThemeTestComponent } from './theme-test/theme-test.component'; LibraryComponent, LibraryDetailComponent, SeriesDetailComponent, - NotConnectedComponent, // Move into ExtrasModule ReviewSeriesModalComponent, RecentlyAddedComponent, OnDeckComponent, @@ -85,6 +82,8 @@ import { ThemeTestComponent } from './theme-test/theme-test.component'; ReadingListModule, RegistrationModule, + NgbAccordionModule, // ThemeTest Component only + ToastrModule.forRoot({ positionClass: 'toast-bottom-right', @@ -99,7 +98,7 @@ import { ThemeTestComponent } from './theme-test/theme-test.component'; {provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true}, Title, {provide: SAVER, useFactory: getSaver}, - { provide: APP_BASE_HREF, useFactory: (config: ConfigData) => config.baseUrl, deps: [ConfigData] }, + // { provide: APP_BASE_HREF, useFactory: (config: ConfigData) => config.baseUrl, deps: [ConfigData] }, ], entryComponents: [], bootstrap: [AppComponent] diff --git a/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.html b/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.html index ed72bb89c..8f5fd60df 100644 --- a/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.html +++ b/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.html @@ -28,7 +28,7 @@
-
+
diff --git a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html index b525f2bc9..6c5147d7e 100644 --- a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html +++ b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.html @@ -386,7 +386,7 @@
  • -
    +
    \ No newline at end of file diff --git a/UI/Web/src/app/not-connected/not-connected.component.scss b/UI/Web/src/app/not-connected/not-connected.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/UI/Web/src/app/not-connected/not-connected.component.ts b/UI/Web/src/app/not-connected/not-connected.component.ts deleted file mode 100644 index d49575a55..000000000 --- a/UI/Web/src/app/not-connected/not-connected.component.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { MemberService } from '../_services/member.service'; - -@Component({ - selector: 'app-not-connected', - templateUrl: './not-connected.component.html', - styleUrls: ['./not-connected.component.scss'] -}) -export class NotConnectedComponent implements OnInit { - constructor(private memberService: MemberService, private router: Router) { } - - ngOnInit(): void { - // BUG: TODO: This causes an infinite reload loop on the UI when the API on backend doesn't exist - // We make a call to backend on refresh so that if it's up, we can redirect to /home - this.memberService.adminExists().subscribe((exists) => { - const pageResume = localStorage.getItem('kavita--no-connection-url'); - if (pageResume && pageResume !== '/no-connection') { - localStorage.setItem('kavita--no-connection-url', ''); - this.router.navigateByUrl(pageResume); - } else { - this.router.navigateByUrl('/home'); - } - }); - } - -} diff --git a/UI/Web/src/app/reading-list/_modals/add-to-list-modal/add-to-list-modal.component.html b/UI/Web/src/app/reading-list/_modals/add-to-list-modal/add-to-list-modal.component.html index 49d698f84..394def5ce 100644 --- a/UI/Web/src/app/reading-list/_modals/add-to-list-modal/add-to-list-modal.component.html +++ b/UI/Web/src/app/reading-list/_modals/add-to-list-modal/add-to-list-modal.component.html @@ -28,12 +28,12 @@
    -
    +
    -
    +
    diff --git a/UI/Web/src/app/series-detail/series-detail.component.html b/UI/Web/src/app/series-detail/series-detail.component.html index ce273f109..f82caf80c 100644 --- a/UI/Web/src/app/series-detail/series-detail.component.html +++ b/UI/Web/src/app/series-detail/series-detail.component.html @@ -52,7 +52,7 @@
    - +
    @@ -63,7 +63,7 @@
    • - {{libraryType === LibraryType.Book ? 'Books': 'Specials'}} + Specials
      @@ -74,7 +74,7 @@
      • -
    • +
    • Storyline
      @@ -91,7 +91,7 @@
      • -
    • +
    • {{libraryType === LibraryType.Book ? 'Books': 'Volumes'}}
      @@ -103,7 +103,7 @@
      • -
    • +
    • {{utilityService.formatChapterName(libraryType) + 's'}}
      diff --git a/UI/Web/src/app/series-detail/series-detail.component.ts b/UI/Web/src/app/series-detail/series-detail.component.ts index 9c18531ee..40eadd801 100644 --- a/UI/Web/src/app/series-detail/series-detail.component.ts +++ b/UI/Web/src/app/series-detail/series-detail.component.ts @@ -19,6 +19,7 @@ import { ScanSeriesEvent } from '../_models/events/scan-series-event'; import { SeriesRemovedEvent } from '../_models/events/series-removed-event'; import { LibraryType } from '../_models/library'; import { MangaFormat } from '../_models/manga-format'; +import { ReadingList } from '../_models/reading-list'; import { Series } from '../_models/series'; import { SeriesMetadata } from '../_models/series-metadata'; import { Volume } from '../_models/volume'; @@ -29,6 +30,7 @@ import { ImageService } from '../_services/image.service'; import { LibraryService } from '../_services/library.service'; import { EVENTS, MessageHubService } from '../_services/message-hub.service'; import { ReaderService } from '../_services/reader.service'; +import { ReadingListService } from '../_services/reading-list.service'; import { SeriesService } from '../_services/series.service'; @@ -72,12 +74,11 @@ export class SeriesDetailComponent implements OnInit, OnDestroy { hasSpecials = false; specials: Array = []; activeTabId = TabID.Storyline; - hasNonSpecialVolumeChapters = false; - hasNonSpecialNonVolumeChapters = false; userReview: string = ''; libraryType: LibraryType = LibraryType.Manga; seriesMetadata: SeriesMetadata | null = null; + readingLists: Array = []; /** * Poster image for the Series */ @@ -171,6 +172,7 @@ export class SeriesDetailComponent implements OnInit, OnDestroy { private confirmService: ConfirmService, private titleService: Title, private downloadService: DownloadService, private actionService: ActionService, public imageSerivce: ImageService, private messageHub: MessageHubService, + private readingListService: ReadingListService ) { this.router.routeReuseStrategy.shouldReuseRoute = () => false; this.accountService.currentUser$.pipe(take(1)).subscribe(user => { @@ -332,6 +334,9 @@ export class SeriesDetailComponent implements OnInit, OnDestroy { this.coverImageOffset = 0; this.seriesService.getMetadata(seriesId).subscribe(metadata => this.seriesMetadata = metadata); + this.readingListService.getReadingListsForSeries(seriesId).subscribe(lists => { + this.readingLists = lists; + }); this.setContinuePoint(); forkJoin([ @@ -352,7 +357,7 @@ export class SeriesDetailComponent implements OnInit, OnDestroy { this.chapterActions = this.actionFactoryService.getChapterActions(this.handleChapterActionCallback.bind(this)); this.seriesService.getSeriesDetail(this.seriesId).subscribe(detail => { - this.hasSpecials = detail.specials.length > 0 + this.hasSpecials = detail.specials.length > 0; this.specials = detail.specials; this.chapters = detail.chapters; @@ -373,30 +378,23 @@ export class SeriesDetailComponent implements OnInit, OnDestroy { * This assumes loadPage() has already primed all the calculations and state variables. Do not call directly. */ updateSelectedTab() { - // This shows Chapters/Issues tab - - // If this has chapters that are not specials - if (this.chapters.filter(c => !c.isSpecial).length > 0) { - this.hasNonSpecialNonVolumeChapters = true; + + // Book libraries only have Volumes or Specials enabled + if (this.libraryType === LibraryType.Book) { + if (this.volumes.length === 0) { + this.activeTabId = TabID.Specials; + } else { + this.activeTabId = TabID.Volumes; + } + return; } - // This shows Volumes tab - if (this.volumes.filter(v => v.number !== 0).length !== 0) { - this.hasNonSpecialVolumeChapters = true; - } - - // If an update occured and we were on specials, re-activate Volumes/Chapters - if (!this.hasSpecials && !this.hasNonSpecialVolumeChapters && this.activeTabId != TabID.Storyline) { - this.activeTabId = TabID.Storyline; - } - - if (this.libraryType == LibraryType.Book && !this.hasSpecials){ - this.activeTabId = TabID.Volumes; - } else if (this.hasNonSpecialVolumeChapters || this.hasNonSpecialNonVolumeChapters) { - this.activeTabId = TabID.Storyline; - } else { + if (this.volumes.length === 0 && this.chapters.length === 0 && this.specials.length > 0) { this.activeTabId = TabID.Specials; + } else { + this.activeTabId = TabID.Storyline; } + } createHTML() { diff --git a/UI/Web/src/app/series-metadata-detail/series-metadata-detail.component.html b/UI/Web/src/app/series-metadata-detail/series-metadata-detail.component.html index 58ec5ac8a..86cda81c2 100644 --- a/UI/Web/src/app/series-metadata-detail/series-metadata-detail.component.html +++ b/UI/Web/src/app/series-metadata-detail/series-metadata-detail.component.html @@ -14,6 +14,9 @@ {{utilityService.mangaFormat(series.format)}} + + Last Read: {{series.latestReadDate | date:'shortDate'}} +
      @@ -43,6 +46,25 @@
    +
    +
    +
    Reading Lists
    +
    +
    + + + + + +   + + + {{item.title}} + + + +
    +
    Writers/Authors
    diff --git a/UI/Web/src/app/series-metadata-detail/series-metadata-detail.component.ts b/UI/Web/src/app/series-metadata-detail/series-metadata-detail.component.ts index d5e4fd8fc..f5a505780 100644 --- a/UI/Web/src/app/series-metadata-detail/series-metadata-detail.component.ts +++ b/UI/Web/src/app/series-metadata-detail/series-metadata-detail.component.ts @@ -3,6 +3,7 @@ import { Router } from '@angular/router'; import { TagBadgeCursor } from '../shared/tag-badge/tag-badge.component'; import { UtilityService } from '../shared/_services/utility.service'; import { MangaFormat } from '../_models/manga-format'; +import { ReadingList } from '../_models/reading-list'; import { Series } from '../_models/series'; import { SeriesMetadata } from '../_models/series-metadata'; import { MetadataService } from '../_services/metadata.service'; @@ -15,6 +16,10 @@ import { MetadataService } from '../_services/metadata.service'; export class SeriesMetadataDetailComponent implements OnInit, OnChanges { @Input() seriesMetadata!: SeriesMetadata; + /** + * Reading lists with a connection to the Series + */ + @Input() readingLists: Array = []; @Input() series!: Series; isCollapsed: boolean = true; diff --git a/UI/Web/src/app/shared/badge-expander/badge-expander.component.html b/UI/Web/src/app/shared/badge-expander/badge-expander.component.html index c17188530..610a523b3 100644 --- a/UI/Web/src/app/shared/badge-expander/badge-expander.component.html +++ b/UI/Web/src/app/shared/badge-expander/badge-expander.component.html @@ -1,7 +1,7 @@
    -
    diff --git a/UI/Web/src/app/shared/badge-expander/badge-expander.component.scss b/UI/Web/src/app/shared/badge-expander/badge-expander.component.scss index 8ed3de4f4..cf2445645 100644 --- a/UI/Web/src/app/shared/badge-expander/badge-expander.component.scss +++ b/UI/Web/src/app/shared/badge-expander/badge-expander.component.scss @@ -5,8 +5,4 @@ .collapsed { height: 35px; overflow: hidden; -} - -.badge-expander { - //display: inline-block; } \ No newline at end of file diff --git a/UI/Web/src/app/shared/badge-expander/badge-expander.component.ts b/UI/Web/src/app/shared/badge-expander/badge-expander.component.ts index 3f4ddbcb4..17ad4efd1 100644 --- a/UI/Web/src/app/shared/badge-expander/badge-expander.component.ts +++ b/UI/Web/src/app/shared/badge-expander/badge-expander.component.ts @@ -8,6 +8,7 @@ import { Component, ContentChild, Input, OnInit, TemplateRef } from '@angular/co export class BadgeExpanderComponent implements OnInit { @Input() items: Array = []; + @Input() itemsTillExpander: number = 4; @ContentChild('badgeExpanderItem') itemTemplate!: TemplateRef; @@ -15,12 +16,12 @@ export class BadgeExpanderComponent implements OnInit { isCollapsed: boolean = false; get itemsLeft() { - return Math.max(this.items.length - 4, 0); + return Math.max(this.items.length - this.itemsTillExpander, 0); } constructor() { } ngOnInit(): void { - this.visibleItems = this.items.slice(0, 4); + this.visibleItems = this.items.slice(0, this.itemsTillExpander); } toggleVisible() { diff --git a/UI/Web/src/app/shared/person-badge/person-badge.component.html b/UI/Web/src/app/shared/person-badge/person-badge.component.html index 4b49e949a..bbfe5ef31 100644 --- a/UI/Web/src/app/shared/person-badge/person-badge.component.html +++ b/UI/Web/src/app/shared/person-badge/person-badge.component.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/UI/Web/src/app/theme-test/theme-test.component.html b/UI/Web/src/app/theme-test/theme-test.component.html index a6f168f20..6f44a7886 100644 --- a/UI/Web/src/app/theme-test/theme-test.component.html +++ b/UI/Web/src/app/theme-test/theme-test.component.html @@ -39,7 +39,7 @@
    - +
    @@ -47,7 +47,7 @@
    - +
    @@ -56,20 +56,20 @@

    Labels should have form-check-label on them and inputs form-check-input

    - +
    - - + +
    - - + +
    - - + +
    @@ -116,11 +116,28 @@ Non Allowed
    -

    Badge

    -TODO +

    Person Badge with Expander

    +
    + + + + + + +

    Switch

    -TODO: New component, will be used in place of 2 way radios +
    +
    + +
    +
    + + +
    +
    +
    +

    Dropdown/List Group

    @@ -130,5 +147,42 @@ TODO: New component, will be used in place of 2 way radios
    -

    +

    Accordion

    + + + +

    + +

    +     + +

    This is the body of the accordion...........This is the body of the accordion asdfasdf asThis is the body of the accordion asdfasdf asThis is the body of the accordion asdfasdf asThis is the body of the accordion asdfasdf asThis is the body of the accordion asdfasdf as

    +     +     + + +

    + +

    +     + +

    This is the body of the accordion asdfasdf as + dfas + f asdfasdfasdf asdfasdfaaff asdf + as fd + asfasf asdfasdfafd +

    +     +     +     + + +

    Cards

    + + + diff --git a/UI/Web/src/app/theme-test/theme-test.component.ts b/UI/Web/src/app/theme-test/theme-test.component.ts index a8a7c8ae8..c6e502feb 100644 --- a/UI/Web/src/app/theme-test/theme-test.component.ts +++ b/UI/Web/src/app/theme-test/theme-test.component.ts @@ -2,6 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; import { TagBadgeCursor } from '../shared/tag-badge/tag-badge.component'; import { ThemeService } from '../theme.service'; +import { MangaFormat } from '../_models/manga-format'; +import { Person, PersonRole } from '../_models/person'; +import { Series } from '../_models/series'; import { NavService } from '../_services/nav.service'; @Component({ @@ -20,6 +23,47 @@ export class ThemeTestComponent implements OnInit { ]; active = this.tabs[0]; + people: Array = [ + {id: 1, name: 'Joe', role: PersonRole.Artist}, + {id: 2, name: 'Joe 2', role: PersonRole.Artist}, + ]; + + seriesNotRead: Series = { + id: 1, + name: 'Test Series', + pages: 0, + pagesRead: 10, + format: MangaFormat.ARCHIVE, + libraryId: 1, + coverImageLocked: false, + created: '', + latestReadDate: '', + localizedName: '', + originalName: '', + sortName: '', + userRating: 0, + userReview: '', + volumes: [] + } + + seriesWithProgress: Series = { + id: 1, + name: 'Test Series', + pages: 5, + pagesRead: 10, + format: MangaFormat.ARCHIVE, + libraryId: 1, + coverImageLocked: false, + created: '', + latestReadDate: '', + localizedName: '', + originalName: '', + sortName: '', + userRating: 0, + userReview: '', + volumes: [] + } + get TagBadgeCursor(): typeof TagBadgeCursor { return TagBadgeCursor; } diff --git a/UI/Web/src/app/user-login/user-login.component.ts b/UI/Web/src/app/user-login/user-login.component.ts index c4f968675..a039ef98f 100644 --- a/UI/Web/src/app/user-login/user-login.component.ts +++ b/UI/Web/src/app/user-login/user-login.component.ts @@ -86,7 +86,7 @@ export class UserLoginComponent implements OnInit { // Check if user came here from another url, else send to library route const pageResume = localStorage.getItem('kavita--auth-intersection-url'); - if (pageResume && pageResume !== '/no-connection' && pageResume !== '/login') { + if (pageResume && pageResume !== '/login') { localStorage.setItem('kavita--auth-intersection-url', ''); this.router.navigateByUrl(pageResume); } else { diff --git a/UI/Web/src/app/user-settings/user-preferences/user-preferences.component.html b/UI/Web/src/app/user-settings/user-preferences/user-preferences.component.html index babb4984b..9e2a4cfb0 100644 --- a/UI/Web/src/app/user-settings/user-preferences/user-preferences.component.html +++ b/UI/Web/src/app/user-settings/user-preferences/user-preferences.component.html @@ -59,7 +59,7 @@

    Image Reader

    -
    +
      Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page. @@ -68,7 +68,7 @@
    -
    +
      How to scale the image to your screen. @@ -79,7 +79,7 @@
    -
    +
      How to split a full width image (ie both left and right images are combined) @@ -87,7 +87,7 @@
    -
    +