Polish Round 1 (#2396)
This commit is contained in:
Joe Milazzo
GitHub
parent
cf2c43d390
commit
02b002d81a
197 changed files with 1233 additions and 1751 deletions
|
|
@ -80,7 +80,7 @@ export class ReadingListDetailComponent implements OnInit {
|
|||
const listId = this.route.snapshot.paramMap.get('id');
|
||||
|
||||
if (listId === null) {
|
||||
this.router.navigateByUrl('/libraries');
|
||||
this.router.navigateByUrl('/home');
|
||||
return;
|
||||
}
|
||||
this.titleService.setTitle('Kavita - ' + translate('side-nav.reading-lists'));
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ import { LibraryType } from 'src/app/_models/library';
|
|||
import { MangaFormat } from 'src/app/_models/manga-format';
|
||||
import { ReadingListItem } from 'src/app/_models/reading-list';
|
||||
import { ImageService } from 'src/app/_services/image.service';
|
||||
import { MangaFormatIconPipe } from '../../../pipe/manga-format-icon.pipe';
|
||||
import { MangaFormatPipe } from '../../../pipe/manga-format.pipe';
|
||||
import { MangaFormatIconPipe } from '../../../_pipes/manga-format-icon.pipe';
|
||||
import { MangaFormatPipe } from '../../../_pipes/manga-format.pipe';
|
||||
import { NgbProgressbar } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { NgIf, DatePipe } from '@angular/common';
|
||||
import { ImageComponent } from '../../../shared/image/image.component';
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
|||
import { ToastrService } from 'ngx-toastr';
|
||||
import { ReadingList } from 'src/app/_models/reading-list';
|
||||
import { ReadingListService } from 'src/app/_services/reading-list.service';
|
||||
import { FilterPipe } from '../../../pipe/filter.pipe';
|
||||
import { FilterPipe } from '../../../_pipes/filter.pipe';
|
||||
import { NgIf, NgFor } from '@angular/common';
|
||||
import {TranslocoDirective, TranslocoService} from "@ngneat/transloco";
|
||||
|
||||
|
|
@ -17,10 +17,10 @@ export enum ADD_FLOW {
|
|||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-add-to-list-modal',
|
||||
templateUrl: './add-to-list-modal.component.html',
|
||||
styleUrls: ['./add-to-list-modal.component.scss'],
|
||||
standalone: true,
|
||||
selector: 'app-add-to-list-modal',
|
||||
templateUrl: './add-to-list-modal.component.html',
|
||||
styleUrls: ['./add-to-list-modal.component.scss'],
|
||||
standalone: true,
|
||||
imports: [ReactiveFormsModule, NgIf, NgFor, FilterPipe, TranslocoDirective]
|
||||
})
|
||||
export class AddToListModalComponent implements OnInit, AfterViewInit {
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ import { CblImportSummary } from 'src/app/_models/reading-list/cbl/cbl-import-su
|
|||
import { ReadingListService } from 'src/app/_services/reading-list.service';
|
||||
import {StepTrackerComponent, TimelineStep} from '../../_components/step-tracker/step-tracker.component';
|
||||
import {CommonModule} from "@angular/common";
|
||||
import {SafeHtmlPipe} from "../../../pipe/safe-html.pipe";
|
||||
import {CblConflictReasonPipe} from "../../_pipes/cbl-conflict-reason.pipe";
|
||||
import {CblImportResultPipe} from "../../_pipes/cbl-import-result.pipe";
|
||||
import {SafeHtmlPipe} from "../../../_pipes/safe-html.pipe";
|
||||
import {CblConflictReasonPipe} from "../../../_pipes/cbl-conflict-reason.pipe";
|
||||
import {CblImportResultPipe} from "../../../_pipes/cbl-import-result.pipe";
|
||||
import {TranslocoDirective, TranslocoService} from "@ngneat/transloco";
|
||||
|
||||
interface FileStep {
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
import {inject, Pipe, PipeTransform} from '@angular/core';
|
||||
import { CblBookResult } from 'src/app/_models/reading-list/cbl/cbl-book-result';
|
||||
import { CblImportReason } from 'src/app/_models/reading-list/cbl/cbl-import-reason.enum';
|
||||
import {TranslocoService} from "@ngneat/transloco";
|
||||
|
||||
const failIcon = '<i aria-hidden="true" class="reading-list-fail--item fa-solid fa-circle-xmark me-1"></i>';
|
||||
const successIcon = '<i aria-hidden="true" class="reading-list-success--item fa-solid fa-circle-check me-1"></i>';
|
||||
|
||||
@Pipe({
|
||||
name: 'cblConflictReason',
|
||||
standalone: true
|
||||
})
|
||||
export class CblConflictReasonPipe implements PipeTransform {
|
||||
|
||||
translocoService = inject(TranslocoService);
|
||||
|
||||
transform(result: CblBookResult): string {
|
||||
switch (result.reason) {
|
||||
case CblImportReason.AllSeriesMissing:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.all-series-missing');
|
||||
case CblImportReason.ChapterMissing:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.chapter-missing', {series: result.series, chapter: result.number});
|
||||
case CblImportReason.EmptyFile:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.empty-file');
|
||||
case CblImportReason.NameConflict:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.chapter-missing', {readingListName: result.readingListName});
|
||||
case CblImportReason.SeriesCollision:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.series-collision', {seriesLink: `<a href="/library/${result.libraryId}/series/${result.seriesId}" target="_blank">${result.series}</a>`});
|
||||
case CblImportReason.SeriesMissing:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.series-missing', {series: result.series});
|
||||
case CblImportReason.VolumeMissing:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.volume-missing', {series: result.series, volume: result.volume});
|
||||
case CblImportReason.AllChapterMissing:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.all-chapter-missing');
|
||||
case CblImportReason.Success:
|
||||
return successIcon + this.translocoService.translate('cbl-conflict-reason-pipe.volume-missing', {series: result.series, volume: result.volume, chapter: result.number});
|
||||
case CblImportReason.InvalidFile:
|
||||
return failIcon + this.translocoService.translate('cbl-conflict-reason-pipe.invalid-file');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
import {inject, Pipe, PipeTransform} from '@angular/core';
|
||||
import { CblImportResult } from 'src/app/_models/reading-list/cbl/cbl-import-result.enum';
|
||||
import {TranslocoService} from "@ngneat/transloco";
|
||||
|
||||
@Pipe({
|
||||
name: 'cblImportResult',
|
||||
standalone: true
|
||||
})
|
||||
export class CblImportResultPipe implements PipeTransform {
|
||||
|
||||
translocoService = inject(TranslocoService);
|
||||
|
||||
transform(result: CblImportResult): string {
|
||||
switch (result) {
|
||||
case CblImportResult.Success:
|
||||
return this.translocoService.translate('cbl-import-result-pipe.success');
|
||||
case CblImportResult.Partial:
|
||||
return this.translocoService.translate('cbl-import-result-pipe.partial');
|
||||
case CblImportResult.Fail:
|
||||
return this.translocoService.translate('cbl-import-result-pipe.failure');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
import { NgModule } from "@angular/core";
|
||||
import { Routes, RouterModule } from "@angular/router";
|
||||
import { AuthGuard } from "../_guards/auth.guard";
|
||||
import { ReadingListDetailComponent } from "./_components/reading-list-detail/reading-list-detail.component";
|
||||
import { ReadingListsComponent } from "./_components/reading-lists/reading-lists.component";
|
||||
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
runGuardsAndResolvers: 'always',
|
||||
canActivate: [AuthGuard],
|
||||
children: [
|
||||
{path: '', component: ReadingListsComponent, pathMatch: 'full'},
|
||||
{path: ':id', component: ReadingListDetailComponent, pathMatch: 'full'},
|
||||
]
|
||||
},
|
||||
{path: '**', component: ReadingListsComponent, pathMatch: 'full', canActivate: [AuthGuard]},
|
||||
];
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forChild(routes)],
|
||||
exports: [RouterModule]
|
||||
})
|
||||
export class ReadingListRoutingModule { }
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { DraggableOrderedListComponent } from './_components/draggable-ordered-list/draggable-ordered-list.component';
|
||||
import { ReadingListRoutingModule } from './reading-list-routing.module';
|
||||
import {DragDropModule} from '@angular/cdk/drag-drop';
|
||||
import { AddToListModalComponent } from './_modals/add-to-list-modal/add-to-list-modal.component';
|
||||
import { ReactiveFormsModule } from '@angular/forms';
|
||||
import { EditReadingListModalComponent } from './_modals/edit-reading-list-modal/edit-reading-list-modal.component';
|
||||
import { NgbDropdownModule, NgbNavModule, NgbProgressbarModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { ReadingListDetailComponent } from './_components/reading-list-detail/reading-list-detail.component';
|
||||
import { ReadingListItemComponent } from './_components/reading-list-item/reading-list-item.component';
|
||||
import { ReadingListsComponent } from './_components/reading-lists/reading-lists.component';
|
||||
import { VirtualScrollerModule } from '@iharbeck/ngx-virtual-scroller';
|
||||
import {ImageComponent} from "../shared/image/image.component";
|
||||
import {ReadMoreComponent} from "../shared/read-more/read-more.component";
|
||||
import {PersonBadgeComponent} from "../shared/person-badge/person-badge.component";
|
||||
import {BadgeExpanderComponent} from "../shared/badge-expander/badge-expander.component";
|
||||
import {MangaFormatPipe} from "../pipe/manga-format.pipe";
|
||||
import {MangaFormatIconPipe} from "../pipe/manga-format-icon.pipe";
|
||||
import {SafeHtmlPipe} from "../pipe/safe-html.pipe";
|
||||
import {FilterPipe} from "../pipe/filter.pipe";
|
||||
import {CoverImageChooserComponent} from "../cards/cover-image-chooser/cover-image-chooser.component";
|
||||
import {CardDetailLayoutComponent} from "../cards/card-detail-layout/card-detail-layout.component";
|
||||
import {CardItemComponent} from "../cards/card-item/card-item.component";
|
||||
import {
|
||||
SideNavCompanionBarComponent
|
||||
} from "../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component";
|
||||
import {LoadingComponent} from "../shared/loading/loading.component";
|
||||
import {A11yClickDirective} from "../shared/a11y-click.directive";
|
||||
import {CardActionablesComponent} from "../_single-module/card-actionables/card-actionables.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
ReactiveFormsModule,
|
||||
DragDropModule,
|
||||
NgbNavModule,
|
||||
NgbProgressbarModule,
|
||||
NgbTooltipModule,
|
||||
NgbDropdownModule,
|
||||
ImageComponent,
|
||||
ReadMoreComponent,
|
||||
PersonBadgeComponent,
|
||||
BadgeExpanderComponent,
|
||||
ReadingListRoutingModule,
|
||||
VirtualScrollerModule,
|
||||
CardActionablesComponent,
|
||||
MangaFormatPipe,
|
||||
MangaFormatIconPipe,
|
||||
SafeHtmlPipe,
|
||||
FilterPipe,
|
||||
CoverImageChooserComponent,
|
||||
CardDetailLayoutComponent,
|
||||
CardItemComponent,
|
||||
SideNavCompanionBarComponent,
|
||||
LoadingComponent,
|
||||
A11yClickDirective,
|
||||
DraggableOrderedListComponent,
|
||||
ReadingListDetailComponent,
|
||||
AddToListModalComponent,
|
||||
ReadingListsComponent,
|
||||
EditReadingListModalComponent,
|
||||
ReadingListItemComponent,
|
||||
],
|
||||
exports: [
|
||||
AddToListModalComponent,
|
||||
ReadingListsComponent,
|
||||
EditReadingListModalComponent
|
||||
]
|
||||
})
|
||||
export class ReadingListModule { }
|
||||
Loading…
Add table
Add a link
Reference in a new issue