diff --git a/UI/Web/src/app/devices/devices.component.html b/UI/Web/src/app/_components/devices/devices.component.html similarity index 100% rename from UI/Web/src/app/devices/devices.component.html rename to UI/Web/src/app/_components/devices/devices.component.html diff --git a/UI/Web/src/app/devices/devices.component.scss b/UI/Web/src/app/_components/devices/devices.component.scss similarity index 100% rename from UI/Web/src/app/devices/devices.component.scss rename to UI/Web/src/app/_components/devices/devices.component.scss diff --git a/UI/Web/src/app/devices/devices.component.ts b/UI/Web/src/app/_components/devices/devices.component.ts similarity index 100% rename from UI/Web/src/app/devices/devices.component.ts rename to UI/Web/src/app/_components/devices/devices.component.ts diff --git a/UI/Web/src/app/_models/invite-user-response.ts b/UI/Web/src/app/_models/auth/invite-user-response.ts similarity index 100% rename from UI/Web/src/app/_models/invite-user-response.ts rename to UI/Web/src/app/_models/auth/invite-user-response.ts diff --git a/UI/Web/src/app/_models/member.ts b/UI/Web/src/app/_models/auth/member.ts similarity index 70% rename from UI/Web/src/app/_models/member.ts rename to UI/Web/src/app/_models/auth/member.ts index adfbd9d93..76f05d44d 100644 --- a/UI/Web/src/app/_models/member.ts +++ b/UI/Web/src/app/_models/auth/member.ts @@ -1,5 +1,5 @@ -import { AgeRestriction } from './age-restriction'; -import { Library } from './library'; +import { AgeRestriction } from '../metadata/age-restriction'; +import { Library } from '../library'; export interface Member { id: number; diff --git a/UI/Web/src/app/_models/email/update-email-response.ts b/UI/Web/src/app/_models/auth/update-email-response.ts similarity index 100% rename from UI/Web/src/app/_models/email/update-email-response.ts rename to UI/Web/src/app/_models/auth/update-email-response.ts diff --git a/UI/Web/src/app/_models/chapter.ts b/UI/Web/src/app/_models/chapter.ts index 0fedbbb80..a0a434236 100644 --- a/UI/Web/src/app/_models/chapter.ts +++ b/UI/Web/src/app/_models/chapter.ts @@ -1,4 +1,4 @@ -import { HourEstimateRange } from './hour-estimate-range'; +import { HourEstimateRange } from './series-detail/hour-estimate-range'; import { MangaFile } from './manga-file'; import { AgeRating } from './metadata/age-rating'; import { AgeRatingDto } from './metadata/age-rating-dto'; diff --git a/UI/Web/src/app/_models/config-data.ts b/UI/Web/src/app/_models/config-data.ts deleted file mode 100644 index 2e8dc7842..000000000 --- a/UI/Web/src/app/_models/config-data.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - * This is for base url only. Not to be used my applicaiton, only loading and bootstrapping app - */ -// export class ConfigData { -// baseUrl: string = '/'; - -// constructor(baseUrl: string) { -// this.baseUrl = baseUrl; -// } -// } \ No newline at end of file diff --git a/UI/Web/src/app/_models/age-restriction.ts b/UI/Web/src/app/_models/metadata/age-restriction.ts similarity index 64% rename from UI/Web/src/app/_models/age-restriction.ts rename to UI/Web/src/app/_models/metadata/age-restriction.ts index e5be030b1..103330383 100644 --- a/UI/Web/src/app/_models/age-restriction.ts +++ b/UI/Web/src/app/_models/metadata/age-restriction.ts @@ -1,4 +1,4 @@ -import { AgeRating } from "./metadata/age-rating"; +import { AgeRating } from "./age-rating"; export interface AgeRestriction { ageRating: AgeRating; diff --git a/UI/Web/src/app/_models/chapter-metadata.ts b/UI/Web/src/app/_models/metadata/chapter-metadata.ts similarity index 83% rename from UI/Web/src/app/_models/chapter-metadata.ts rename to UI/Web/src/app/_models/metadata/chapter-metadata.ts index edda5dec4..4606021a9 100644 --- a/UI/Web/src/app/_models/chapter-metadata.ts +++ b/UI/Web/src/app/_models/metadata/chapter-metadata.ts @@ -1,8 +1,8 @@ import { Genre } from "./genre"; -import { AgeRating } from "./metadata/age-rating"; -import { PublicationStatus } from "./metadata/publication-status"; +import { AgeRating } from "./age-rating"; +import { PublicationStatus } from "./publication-status"; import { Person } from "./person"; -import { Tag } from "./tag"; +import { Tag } from "../tag"; export interface ChapterMetadata { id: number; diff --git a/UI/Web/src/app/_models/genre.ts b/UI/Web/src/app/_models/metadata/genre.ts similarity index 100% rename from UI/Web/src/app/_models/genre.ts rename to UI/Web/src/app/_models/metadata/genre.ts diff --git a/UI/Web/src/app/_models/person.ts b/UI/Web/src/app/_models/metadata/person.ts similarity index 100% rename from UI/Web/src/app/_models/person.ts rename to UI/Web/src/app/_models/metadata/person.ts diff --git a/UI/Web/src/app/_models/series-filter.ts b/UI/Web/src/app/_models/metadata/series-filter.ts similarity index 97% rename from UI/Web/src/app/_models/series-filter.ts rename to UI/Web/src/app/_models/metadata/series-filter.ts index 439d7f508..18ef0257c 100644 --- a/UI/Web/src/app/_models/series-filter.ts +++ b/UI/Web/src/app/_models/metadata/series-filter.ts @@ -1,4 +1,4 @@ -import { MangaFormat } from "./manga-format"; +import { MangaFormat } from "../manga-format"; export interface FilterItem { title: string; diff --git a/UI/Web/src/app/_models/series-metadata.ts b/UI/Web/src/app/_models/metadata/series-metadata.ts similarity index 86% rename from UI/Web/src/app/_models/series-metadata.ts rename to UI/Web/src/app/_models/metadata/series-metadata.ts index d15dcc2f8..0b2606ac3 100644 --- a/UI/Web/src/app/_models/series-metadata.ts +++ b/UI/Web/src/app/_models/metadata/series-metadata.ts @@ -1,9 +1,9 @@ -import { CollectionTag } from "./collection-tag"; +import { CollectionTag } from "../collection-tag"; import { Genre } from "./genre"; -import { AgeRating } from "./metadata/age-rating"; -import { PublicationStatus } from "./metadata/publication-status"; +import { AgeRating } from "./age-rating"; +import { PublicationStatus } from "./publication-status"; import { Person } from "./person"; -import { Tag } from "./tag"; +import { Tag } from "../tag"; export interface SeriesMetadata { seriesId: number; diff --git a/UI/Web/src/app/_models/preferences/preferences.ts b/UI/Web/src/app/_models/preferences/preferences.ts index aeb92b3bf..680386e48 100644 --- a/UI/Web/src/app/_models/preferences/preferences.ts +++ b/UI/Web/src/app/_models/preferences/preferences.ts @@ -1,7 +1,7 @@ import { LayoutMode } from 'src/app/manga-reader/_models/layout-mode'; -import { BookPageLayoutMode } from '../book-page-layout-mode'; -import { PageLayoutMode } from '../page-layout-mode'; +import { BookPageLayoutMode } from '../readers/book-page-layout-mode'; +import { PageLayoutMode } from '../readers/page-layout-mode'; import { PageSplitOption } from './page-split-option'; import { ReaderMode } from './reader-mode'; import { ReadingDirection } from './reading-direction'; diff --git a/UI/Web/src/app/_models/book-page-layout-mode.ts b/UI/Web/src/app/_models/readers/book-page-layout-mode.ts similarity index 100% rename from UI/Web/src/app/_models/book-page-layout-mode.ts rename to UI/Web/src/app/_models/readers/book-page-layout-mode.ts diff --git a/UI/Web/src/app/_models/page-bookmark.ts b/UI/Web/src/app/_models/readers/page-bookmark.ts similarity index 100% rename from UI/Web/src/app/_models/page-bookmark.ts rename to UI/Web/src/app/_models/readers/page-bookmark.ts diff --git a/UI/Web/src/app/_models/page-layout-mode.ts b/UI/Web/src/app/_models/readers/page-layout-mode.ts similarity index 100% rename from UI/Web/src/app/_models/page-layout-mode.ts rename to UI/Web/src/app/_models/readers/page-layout-mode.ts diff --git a/UI/Web/src/app/_models/progress-bookmark.ts b/UI/Web/src/app/_models/readers/progress-bookmark.ts similarity index 100% rename from UI/Web/src/app/_models/progress-bookmark.ts rename to UI/Web/src/app/_models/readers/progress-bookmark.ts diff --git a/UI/Web/src/app/_models/search/search-result-group.ts b/UI/Web/src/app/_models/search/search-result-group.ts index 901e63548..a9d0005dd 100644 --- a/UI/Web/src/app/_models/search/search-result-group.ts +++ b/UI/Web/src/app/_models/search/search-result-group.ts @@ -1,7 +1,7 @@ import { Chapter } from "../chapter"; import { Library } from "../library"; import { MangaFile } from "../manga-file"; -import { SearchResult } from "../search-result"; +import { SearchResult } from "./search-result"; import { Tag } from "../tag"; export class SearchResultGroup { diff --git a/UI/Web/src/app/_models/search-result.ts b/UI/Web/src/app/_models/search/search-result.ts similarity index 82% rename from UI/Web/src/app/_models/search-result.ts rename to UI/Web/src/app/_models/search/search-result.ts index 3026c96c3..f7025a72a 100644 --- a/UI/Web/src/app/_models/search-result.ts +++ b/UI/Web/src/app/_models/search/search-result.ts @@ -1,4 +1,4 @@ -import { MangaFormat } from "./manga-format"; +import { MangaFormat } from "../manga-format"; export interface SearchResult { seriesId: number; diff --git a/UI/Web/src/app/_models/hour-estimate-range.ts b/UI/Web/src/app/_models/series-detail/hour-estimate-range.ts similarity index 100% rename from UI/Web/src/app/_models/hour-estimate-range.ts rename to UI/Web/src/app/_models/series-detail/hour-estimate-range.ts diff --git a/UI/Web/src/app/_models/user.ts b/UI/Web/src/app/_models/user.ts index 8aa1467bc..5c552ff02 100644 --- a/UI/Web/src/app/_models/user.ts +++ b/UI/Web/src/app/_models/user.ts @@ -1,4 +1,4 @@ -import { AgeRestriction } from './age-restriction'; +import { AgeRestriction } from './metadata/age-restriction'; import { Preferences } from './preferences/preferences'; // This interface is only used for login and storing/retreiving JWT from local storage diff --git a/UI/Web/src/app/_models/volume.ts b/UI/Web/src/app/_models/volume.ts index e1d48f3fb..2b55cb4b9 100644 --- a/UI/Web/src/app/_models/volume.ts +++ b/UI/Web/src/app/_models/volume.ts @@ -1,5 +1,5 @@ import { Chapter } from './chapter'; -import { HourEstimateRange } from './hour-estimate-range'; +import { HourEstimateRange } from './series-detail/hour-estimate-range'; export interface Volume { id: number; diff --git a/UI/Web/src/app/_services/account.service.ts b/UI/Web/src/app/_services/account.service.ts index 9da026262..7f3e07fa5 100644 --- a/UI/Web/src/app/_services/account.service.ts +++ b/UI/Web/src/app/_services/account.service.ts @@ -8,11 +8,11 @@ import { User } from '../_models/user'; import { Router } from '@angular/router'; import { EVENTS, MessageHubService } from './message-hub.service'; import { ThemeService } from './theme.service'; -import { InviteUserResponse } from '../_models/invite-user-response'; +import { InviteUserResponse } from '../_models/auth/invite-user-response'; import { UserUpdateEvent } from '../_models/events/user-update-event'; -import { UpdateEmailResponse } from '../_models/email/update-email-response'; +import { UpdateEmailResponse } from '../_models/auth/update-email-response'; import { AgeRating } from '../_models/metadata/age-rating'; -import { AgeRestriction } from '../_models/age-restriction'; +import { AgeRestriction } from '../_models/metadata/age-restriction'; export enum Role { Admin = 'Admin', diff --git a/UI/Web/src/app/_services/member.service.ts b/UI/Web/src/app/_services/member.service.ts index a187bec1a..31cf187fd 100644 --- a/UI/Web/src/app/_services/member.service.ts +++ b/UI/Web/src/app/_services/member.service.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'src/environments/environment'; -import { Member } from '../_models/member'; +import { Member } from '../_models/auth/member'; @Injectable({ providedIn: 'root' diff --git a/UI/Web/src/app/_services/metadata.service.ts b/UI/Web/src/app/_services/metadata.service.ts index c2ec18320..7d0e115b8 100644 --- a/UI/Web/src/app/_services/metadata.service.ts +++ b/UI/Web/src/app/_services/metadata.service.ts @@ -4,12 +4,12 @@ import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { environment } from 'src/environments/environment'; import { UtilityService } from '../shared/_services/utility.service'; -import { Genre } from '../_models/genre'; +import { Genre } from '../_models/metadata/genre'; import { AgeRating } from '../_models/metadata/age-rating'; import { AgeRatingDto } from '../_models/metadata/age-rating-dto'; import { Language } from '../_models/metadata/language'; import { PublicationStatusDto } from '../_models/metadata/publication-status-dto'; -import { Person } from '../_models/person'; +import { Person } from '../_models/metadata/person'; import { Tag } from '../_models/tag'; @Injectable({ diff --git a/UI/Web/src/app/_services/reader.service.ts b/UI/Web/src/app/_services/reader.service.ts index ddabc0ab8..7b9a3e99b 100644 --- a/UI/Web/src/app/_services/reader.service.ts +++ b/UI/Web/src/app/_services/reader.service.ts @@ -5,12 +5,12 @@ import { Router } from '@angular/router'; import { environment } from 'src/environments/environment'; import { ChapterInfo } from '../manga-reader/_models/chapter-info'; import { Chapter } from '../_models/chapter'; -import { HourEstimateRange } from '../_models/hour-estimate-range'; +import { HourEstimateRange } from '../_models/series-detail/hour-estimate-range'; import { MangaFormat } from '../_models/manga-format'; import { BookmarkInfo } from '../_models/manga-reader/bookmark-info'; -import { PageBookmark } from '../_models/page-bookmark'; -import { ProgressBookmark } from '../_models/progress-bookmark'; -import { SeriesFilter } from '../_models/series-filter'; +import { PageBookmark } from '../_models/readers/page-bookmark'; +import { ProgressBookmark } from '../_models/readers/progress-bookmark'; +import { SeriesFilter } from '../_models/metadata/series-filter'; import { UtilityService } from '../shared/_services/utility.service'; import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service'; diff --git a/UI/Web/src/app/_services/series.service.ts b/UI/Web/src/app/_services/series.service.ts index ef6cbcea0..94227379a 100644 --- a/UI/Web/src/app/_services/series.service.ts +++ b/UI/Web/src/app/_services/series.service.ts @@ -6,15 +6,15 @@ import { environment } from 'src/environments/environment'; import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service'; import { UtilityService } from '../shared/_services/utility.service'; import { Chapter } from '../_models/chapter'; -import { ChapterMetadata } from '../_models/chapter-metadata'; +import { ChapterMetadata } from '../_models/metadata/chapter-metadata'; import { CollectionTag } from '../_models/collection-tag'; import { PaginatedResult } from '../_models/pagination'; import { Series } from '../_models/series'; import { RelatedSeries } from '../_models/series-detail/related-series'; import { SeriesDetail } from '../_models/series-detail/series-detail'; -import { SeriesFilter } from '../_models/series-filter'; +import { SeriesFilter } from '../_models/metadata/series-filter'; import { SeriesGroup } from '../_models/series-group'; -import { SeriesMetadata } from '../_models/series-metadata'; +import { SeriesMetadata } from '../_models/metadata/series-metadata'; import { Volume } from '../_models/volume'; import { ImageService } from './image.service'; diff --git a/UI/Web/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts b/UI/Web/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts index 50023b3e7..f6a83e8bd 100644 --- a/UI/Web/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts +++ b/UI/Web/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts @@ -3,7 +3,7 @@ import { FormBuilder } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { SelectionModel } from 'src/app/typeahead/typeahead.component'; import { Library } from 'src/app/_models/library'; -import { Member } from 'src/app/_models/member'; +import { Member } from 'src/app/_models/auth/member'; import { LibraryService } from 'src/app/_services/library.service'; @Component({ diff --git a/UI/Web/src/app/admin/_modals/reset-password-modal/reset-password-modal.component.ts b/UI/Web/src/app/admin/_modals/reset-password-modal/reset-password-modal.component.ts index 22cfe289f..7a7c88d7b 100644 --- a/UI/Web/src/app/admin/_modals/reset-password-modal/reset-password-modal.component.ts +++ b/UI/Web/src/app/admin/_modals/reset-password-modal/reset-password-modal.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup, FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Member } from 'src/app/_models/member'; +import { Member } from 'src/app/_models/auth/member'; import { AccountService } from 'src/app/_services/account.service'; @Component({ diff --git a/UI/Web/src/app/admin/edit-user/edit-user.component.ts b/UI/Web/src/app/admin/edit-user/edit-user.component.ts index 8ad8215cd..1544001fd 100644 --- a/UI/Web/src/app/admin/edit-user/edit-user.component.ts +++ b/UI/Web/src/app/admin/edit-user/edit-user.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormGroup, FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { AgeRestriction } from 'src/app/_models/age-restriction'; +import { AgeRestriction } from 'src/app/_models/metadata/age-restriction'; import { Library } from 'src/app/_models/library'; -import { Member } from 'src/app/_models/member'; +import { Member } from 'src/app/_models/auth/member'; import { AccountService } from 'src/app/_services/account.service'; @Component({ diff --git a/UI/Web/src/app/admin/invite-user/invite-user.component.ts b/UI/Web/src/app/admin/invite-user/invite-user.component.ts index ddbc8fea6..0c4720505 100644 --- a/UI/Web/src/app/admin/invite-user/invite-user.component.ts +++ b/UI/Web/src/app/admin/invite-user/invite-user.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrService } from 'ngx-toastr'; -import { AgeRestriction } from 'src/app/_models/age-restriction'; -import { InviteUserResponse } from 'src/app/_models/invite-user-response'; +import { AgeRestriction } from 'src/app/_models/metadata/age-restriction'; +import { InviteUserResponse } from 'src/app/_models/auth/invite-user-response'; import { Library } from 'src/app/_models/library'; import { AgeRating } from 'src/app/_models/metadata/age-rating'; import { AccountService } from 'src/app/_services/account.service'; diff --git a/UI/Web/src/app/admin/library-selector/library-selector.component.ts b/UI/Web/src/app/admin/library-selector/library-selector.component.ts index d474add0e..05b4f3bdb 100644 --- a/UI/Web/src/app/admin/library-selector/library-selector.component.ts +++ b/UI/Web/src/app/admin/library-selector/library-selector.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { SelectionModel } from 'src/app/typeahead/typeahead.component'; import { Library } from 'src/app/_models/library'; -import { Member } from 'src/app/_models/member'; +import { Member } from 'src/app/_models/auth/member'; import { LibraryService } from 'src/app/_services/library.service'; @Component({ diff --git a/UI/Web/src/app/admin/manage-library/manage-library.component.ts b/UI/Web/src/app/admin/manage-library/manage-library.component.ts index 8e53f11e7..e1d114a04 100644 --- a/UI/Web/src/app/admin/manage-library/manage-library.component.ts +++ b/UI/Web/src/app/admin/manage-library/manage-library.component.ts @@ -4,7 +4,7 @@ import { ToastrService } from 'ngx-toastr'; import { Subject } from 'rxjs'; import { distinctUntilChanged, filter, take, takeUntil } from 'rxjs/operators'; import { ConfirmService } from 'src/app/shared/confirm.service'; -import { LibrarySettingsModalComponent } from 'src/app/sidenav/_components/library-settings-modal/library-settings-modal.component'; +import { LibrarySettingsModalComponent } from 'src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component'; import { NotificationProgressEvent } from 'src/app/_models/events/notification-progress-event'; import { ScanSeriesEvent } from 'src/app/_models/events/scan-series-event'; import { Library } from 'src/app/_models/library'; diff --git a/UI/Web/src/app/admin/manage-users/manage-users.component.ts b/UI/Web/src/app/admin/manage-users/manage-users.component.ts index 7389927b0..5855fdc18 100644 --- a/UI/Web/src/app/admin/manage-users/manage-users.component.ts +++ b/UI/Web/src/app/admin/manage-users/manage-users.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { catchError, take } from 'rxjs/operators'; import { MemberService } from 'src/app/_services/member.service'; -import { Member } from 'src/app/_models/member'; +import { Member } from 'src/app/_models/auth/member'; import { User } from 'src/app/_models/user'; import { AccountService } from 'src/app/_services/account.service'; import { ToastrService } from 'ngx-toastr'; diff --git a/UI/Web/src/app/admin/role-selector/role-selector.component.ts b/UI/Web/src/app/admin/role-selector/role-selector.component.ts index f748e3a70..1e703cf41 100644 --- a/UI/Web/src/app/admin/role-selector/role-selector.component.ts +++ b/UI/Web/src/app/admin/role-selector/role-selector.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Member } from 'src/app/_models/member'; +import { Member } from 'src/app/_models/auth/member'; import { User } from 'src/app/_models/user'; import { AccountService } from 'src/app/_services/account.service'; import { MemberService } from 'src/app/_services/member.service'; diff --git a/UI/Web/src/app/all-series/all-series.component.html b/UI/Web/src/app/all-series/_components/all-series/all-series.component.html similarity index 100% rename from UI/Web/src/app/all-series/all-series.component.html rename to UI/Web/src/app/all-series/_components/all-series/all-series.component.html diff --git a/UI/Web/src/app/all-series/all-series.component.scss b/UI/Web/src/app/all-series/_components/all-series/all-series.component.scss similarity index 100% rename from UI/Web/src/app/all-series/all-series.component.scss rename to UI/Web/src/app/all-series/_components/all-series/all-series.component.scss diff --git a/UI/Web/src/app/all-series/all-series.component.ts b/UI/Web/src/app/all-series/_components/all-series/all-series.component.ts similarity index 84% rename from UI/Web/src/app/all-series/all-series.component.ts rename to UI/Web/src/app/all-series/_components/all-series/all-series.component.ts index f9ae5be77..34d5fc487 100644 --- a/UI/Web/src/app/all-series/all-series.component.ts +++ b/UI/Web/src/app/all-series/_components/all-series/all-series.component.ts @@ -3,19 +3,21 @@ import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; import { Subject } from 'rxjs'; import { take, debounceTime, takeUntil } from 'rxjs/operators'; -import { BulkSelectionService } from '../cards/bulk-selection.service'; -import { FilterSettings } from '../metadata-filter/filter-settings'; -import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service'; -import { KEY_CODES, UtilityService } from '../shared/_services/utility.service'; -import { JumpKey } from '../_models/jumpbar/jump-key'; -import { Pagination } from '../_models/pagination'; -import { Series } from '../_models/series'; -import { FilterEvent, SeriesFilter } from '../_models/series-filter'; -import { Action, ActionItem } from '../_services/action-factory.service'; -import { ActionService } from '../_services/action.service'; -import { JumpbarService } from '../_services/jumpbar.service'; -import { EVENTS, Message, MessageHubService } from '../_services/message-hub.service'; -import { SeriesService } from '../_services/series.service'; +import { BulkSelectionService } from 'src/app/cards/bulk-selection.service'; +import { FilterSettings } from 'src/app/metadata-filter/filter-settings'; +import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service'; +import { UtilityService, KEY_CODES } from 'src/app/shared/_services/utility.service'; +import { JumpKey } from 'src/app/_models/jumpbar/jump-key'; +import { Pagination } from 'src/app/_models/pagination'; +import { Series } from 'src/app/_models/series'; +import { SeriesFilter, FilterEvent } from 'src/app/_models/metadata/series-filter'; +import { Action, ActionItem } from 'src/app/_services/action-factory.service'; +import { ActionService } from 'src/app/_services/action.service'; +import { JumpbarService } from 'src/app/_services/jumpbar.service'; +import { MessageHubService, Message, EVENTS } from 'src/app/_services/message-hub.service'; +import { SeriesService } from 'src/app/_services/series.service'; + + @Component({ selector: 'app-all-series', diff --git a/UI/Web/src/app/all-series/all-series-routing.module.ts b/UI/Web/src/app/all-series/all-series-routing.module.ts index 5e9969b4d..73d3da56c 100644 --- a/UI/Web/src/app/all-series/all-series-routing.module.ts +++ b/UI/Web/src/app/all-series/all-series-routing.module.ts @@ -1,7 +1,9 @@ import { NgModule } from "@angular/core"; import { Routes, RouterModule } from "@angular/router"; import { AuthGuard } from "../_guards/auth.guard"; -import { AllSeriesComponent } from "./all-series.component"; +import { AllSeriesComponent } from "./_components/all-series/all-series.component"; + + const routes: Routes = [ {path: '**', component: AllSeriesComponent, pathMatch: 'full', canActivate: [AuthGuard]}, { diff --git a/UI/Web/src/app/all-series/all-series.module.ts b/UI/Web/src/app/all-series/all-series.module.ts index b9fffa8dd..684742c3b 100644 --- a/UI/Web/src/app/all-series/all-series.module.ts +++ b/UI/Web/src/app/all-series/all-series.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { AllSeriesComponent } from './all-series.component'; import { AllSeriesRoutingModule } from './all-series-routing.module'; import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module'; +import { AllSeriesComponent } from './_components/all-series/all-series.component'; diff --git a/UI/Web/src/app/announcements/announcements.component.html b/UI/Web/src/app/announcements/_components/announcements/announcements.component.html similarity index 100% rename from UI/Web/src/app/announcements/announcements.component.html rename to UI/Web/src/app/announcements/_components/announcements/announcements.component.html diff --git a/UI/Web/src/app/announcements/announcements.component.scss b/UI/Web/src/app/announcements/_components/announcements/announcements.component.scss similarity index 100% rename from UI/Web/src/app/announcements/announcements.component.scss rename to UI/Web/src/app/announcements/_components/announcements/announcements.component.scss diff --git a/UI/Web/src/app/announcements/announcements.component.ts b/UI/Web/src/app/announcements/_components/announcements/announcements.component.ts similarity index 100% rename from UI/Web/src/app/announcements/announcements.component.ts rename to UI/Web/src/app/announcements/_components/announcements/announcements.component.ts diff --git a/UI/Web/src/app/announcements/changelog/changelog.component.html b/UI/Web/src/app/announcements/_components/changelog/changelog.component.html similarity index 100% rename from UI/Web/src/app/announcements/changelog/changelog.component.html rename to UI/Web/src/app/announcements/_components/changelog/changelog.component.html diff --git a/UI/Web/src/app/announcements/changelog/changelog.component.scss b/UI/Web/src/app/announcements/_components/changelog/changelog.component.scss similarity index 100% rename from UI/Web/src/app/announcements/changelog/changelog.component.scss rename to UI/Web/src/app/announcements/_components/changelog/changelog.component.scss diff --git a/UI/Web/src/app/announcements/changelog/changelog.component.ts b/UI/Web/src/app/announcements/_components/changelog/changelog.component.ts similarity index 100% rename from UI/Web/src/app/announcements/changelog/changelog.component.ts rename to UI/Web/src/app/announcements/_components/changelog/changelog.component.ts diff --git a/UI/Web/src/app/announcements/announcements-routing.module.ts b/UI/Web/src/app/announcements/announcements-routing.module.ts index f04eaef1a..c209e5928 100644 --- a/UI/Web/src/app/announcements/announcements-routing.module.ts +++ b/UI/Web/src/app/announcements/announcements-routing.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { Routes, RouterModule } from "@angular/router"; import { AdminGuard } from "../_guards/admin.guard"; import { AuthGuard } from "../_guards/auth.guard"; -import { AnnouncementsComponent } from "./announcements.component"; +import { AnnouncementsComponent } from "./_components/announcements/announcements.component"; const routes: Routes = [ {path: '**', component: AnnouncementsComponent, pathMatch: 'full', canActivate: [AuthGuard, AdminGuard]}, diff --git a/UI/Web/src/app/announcements/announcements.module.ts b/UI/Web/src/app/announcements/announcements.module.ts index e601e38a9..9a39d119e 100644 --- a/UI/Web/src/app/announcements/announcements.module.ts +++ b/UI/Web/src/app/announcements/announcements.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { AnnouncementsComponent } from './announcements.component'; -import { ChangelogComponent } from './changelog/changelog.component'; +import { AnnouncementsComponent } from './_components/announcements/announcements.component'; +import { ChangelogComponent } from './_components/changelog/changelog.component'; import { AnnouncementsRoutingModule } from './announcements-routing.module'; import { SharedModule } from '../shared/shared.module'; import { PipeModule } from '../pipe/pipe.module'; diff --git a/UI/Web/src/app/app.module.ts b/UI/Web/src/app/app.module.ts index 015b4c062..f9edb67a7 100644 --- a/UI/Web/src/app/app.module.ts +++ b/UI/Web/src/app/app.module.ts @@ -12,7 +12,7 @@ import { ErrorInterceptor } from './_interceptors/error.interceptor'; import { SAVER, getSaver } from './shared/_providers/saver.provider'; import { SidenavModule } from './sidenav/sidenav.module'; import { NavModule } from './nav/nav.module'; -import { DevicesComponent } from './devices/devices.component'; +import { DevicesComponent } from './_components/devices/devices.component'; diff --git a/UI/Web/src/app/book-reader/book-reader/book-reader.component.html b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html similarity index 100% rename from UI/Web/src/app/book-reader/book-reader/book-reader.component.html rename to UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html diff --git a/UI/Web/src/app/book-reader/book-reader/book-reader.component.scss b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.scss similarity index 100% rename from UI/Web/src/app/book-reader/book-reader/book-reader.component.scss rename to UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.scss diff --git a/UI/Web/src/app/book-reader/book-reader/book-reader.component.ts b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts similarity index 99% rename from UI/Web/src/app/book-reader/book-reader/book-reader.component.ts rename to UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts index 0e39ecb07..88d69d344 100644 --- a/UI/Web/src/app/book-reader/book-reader/book-reader.component.ts +++ b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts @@ -10,9 +10,9 @@ import { NavService } from 'src/app/_services/nav.service'; import { CHAPTER_ID_DOESNT_EXIST, CHAPTER_ID_NOT_FETCHED, ReaderService } from 'src/app/_services/reader.service'; import { SeriesService } from 'src/app/_services/series.service'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; -import { BookService } from '../book.service'; +import { BookService } from '../../_services/book.service'; import { KEY_CODES, UtilityService } from 'src/app/shared/_services/utility.service'; -import { BookChapterItem } from '../_models/book-chapter-item'; +import { BookChapterItem } from '../../_models/book-chapter-item'; import { animate, state, style, transition, trigger } from '@angular/animations'; import { Stack } from 'src/app/shared/data-structures/stack'; import { MemberService } from 'src/app/_services/member.service'; @@ -21,7 +21,7 @@ import { MangaFormat } from 'src/app/_models/manga-format'; import { LibraryService } from 'src/app/_services/library.service'; import { LibraryType } from 'src/app/_models/library'; import { BookTheme } from 'src/app/_models/preferences/book-theme'; -import { BookPageLayoutMode } from 'src/app/_models/book-page-layout-mode'; +import { BookPageLayoutMode } from 'src/app/_models/readers/book-page-layout-mode'; import { PageStyle } from '../reader-settings/reader-settings.component'; import { User } from 'src/app/_models/user'; import { ThemeService } from 'src/app/_services/theme.service'; diff --git a/UI/Web/src/app/book-reader/reader-settings/reader-settings.component.html b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.html similarity index 100% rename from UI/Web/src/app/book-reader/reader-settings/reader-settings.component.html rename to UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.html diff --git a/UI/Web/src/app/book-reader/reader-settings/reader-settings.component.scss b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.scss similarity index 100% rename from UI/Web/src/app/book-reader/reader-settings/reader-settings.component.scss rename to UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.scss diff --git a/UI/Web/src/app/book-reader/reader-settings/reader-settings.component.ts b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts similarity index 96% rename from UI/Web/src/app/book-reader/reader-settings/reader-settings.component.ts rename to UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts index 40a00ce43..944f81534 100644 --- a/UI/Web/src/app/book-reader/reader-settings/reader-settings.component.ts +++ b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts @@ -2,17 +2,17 @@ import { DOCUMENT } from '@angular/common'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Inject, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Subject, take, takeUntil } from 'rxjs'; -import { BookPageLayoutMode } from 'src/app/_models/book-page-layout-mode'; +import { BookPageLayoutMode } from 'src/app/_models/readers/book-page-layout-mode'; import { BookTheme } from 'src/app/_models/preferences/book-theme'; import { ReadingDirection } from 'src/app/_models/preferences/reading-direction'; import { ThemeProvider } from 'src/app/_models/preferences/site-theme'; import { User } from 'src/app/_models/user'; import { AccountService } from 'src/app/_services/account.service'; import { ThemeService } from 'src/app/_services/theme.service'; -import { BookService, FontFamily } from '../book.service'; -import { BookBlackTheme } from '../_models/book-black-theme'; -import { BookDarkTheme } from '../_models/book-dark-theme'; -import { BookWhiteTheme } from '../_models/book-white-theme'; +import { FontFamily, BookService } from '../../_services/book.service'; +import { BookBlackTheme } from '../../_models/book-black-theme'; +import { BookDarkTheme } from '../../_models/book-dark-theme'; +import { BookWhiteTheme } from '../../_models/book-white-theme'; /** * Used for book reader. Do not use for other components diff --git a/UI/Web/src/app/book-reader/table-of-contents/table-of-contents.component.html b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html similarity index 100% rename from UI/Web/src/app/book-reader/table-of-contents/table-of-contents.component.html rename to UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html diff --git a/UI/Web/src/app/book-reader/table-of-contents/table-of-contents.component.scss b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss similarity index 100% rename from UI/Web/src/app/book-reader/table-of-contents/table-of-contents.component.scss rename to UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss diff --git a/UI/Web/src/app/book-reader/table-of-contents/table-of-contents.component.ts b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts similarity index 94% rename from UI/Web/src/app/book-reader/table-of-contents/table-of-contents.component.ts rename to UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts index 0612f60d0..1411d479a 100644 --- a/UI/Web/src/app/book-reader/table-of-contents/table-of-contents.component.ts +++ b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { Subject } from 'rxjs'; -import { BookChapterItem } from '../_models/book-chapter-item'; +import { BookChapterItem } from '../../_models/book-chapter-item'; @Component({ selector: 'app-table-of-contents', diff --git a/UI/Web/src/app/book-reader/safe-style.pipe.ts b/UI/Web/src/app/book-reader/_pipes/safe-style.pipe.ts similarity index 100% rename from UI/Web/src/app/book-reader/safe-style.pipe.ts rename to UI/Web/src/app/book-reader/_pipes/safe-style.pipe.ts diff --git a/UI/Web/src/app/book-reader/book.service.ts b/UI/Web/src/app/book-reader/_services/book.service.ts similarity index 93% rename from UI/Web/src/app/book-reader/book.service.ts rename to UI/Web/src/app/book-reader/_services/book.service.ts index 10d5b6f7c..3dd579662 100644 --- a/UI/Web/src/app/book-reader/book.service.ts +++ b/UI/Web/src/app/book-reader/_services/book.service.ts @@ -1,8 +1,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'src/environments/environment'; -import { BookChapterItem } from './_models/book-chapter-item'; -import { BookInfo } from './_models/book-info'; +import { BookChapterItem } from '../_models/book-chapter-item'; +import { BookInfo } from '../_models/book-info'; export interface BookPage { bookTitle: string; diff --git a/UI/Web/src/app/book-reader/book-reader.module.ts b/UI/Web/src/app/book-reader/book-reader.module.ts index 50bd0060b..e7336978d 100644 --- a/UI/Web/src/app/book-reader/book-reader.module.ts +++ b/UI/Web/src/app/book-reader/book-reader.module.ts @@ -1,14 +1,14 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { BookReaderComponent } from './book-reader/book-reader.component'; +import { BookReaderComponent } from './_components/book-reader/book-reader.component'; import { BookReaderRoutingModule } from './book-reader.router.module'; import { SharedModule } from '../shared/shared.module'; -import { SafeStylePipe } from './safe-style.pipe'; +import { SafeStylePipe } from './_pipes/safe-style.pipe'; import { ReactiveFormsModule } from '@angular/forms'; import { PipeModule } from '../pipe/pipe.module'; import { NgbAccordionModule, NgbNavModule, NgbProgressbarModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { TableOfContentsComponent } from './table-of-contents/table-of-contents.component'; -import { ReaderSettingsComponent } from './reader-settings/reader-settings.component'; +import { ReaderSettingsComponent } from './_components/reader-settings/reader-settings.component'; +import { TableOfContentsComponent } from './_components/table-of-contents/table-of-contents.component'; @NgModule({ diff --git a/UI/Web/src/app/book-reader/book-reader.router.module.ts b/UI/Web/src/app/book-reader/book-reader.router.module.ts index a82163c83..751d55cba 100644 --- a/UI/Web/src/app/book-reader/book-reader.router.module.ts +++ b/UI/Web/src/app/book-reader/book-reader.router.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { BookReaderComponent } from './book-reader/book-reader.component'; +import { BookReaderComponent } from './_components/book-reader/book-reader.component'; const routes: Routes = [ { diff --git a/UI/Web/src/app/bookmark/bookmarks/bookmarks.component.html b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.html similarity index 100% rename from UI/Web/src/app/bookmark/bookmarks/bookmarks.component.html rename to UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.html diff --git a/UI/Web/src/app/bookmark/bookmarks/bookmarks.component.scss b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.scss similarity index 100% rename from UI/Web/src/app/bookmark/bookmarks/bookmarks.component.scss rename to UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.scss diff --git a/UI/Web/src/app/bookmark/bookmarks/bookmarks.component.ts b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts similarity index 98% rename from UI/Web/src/app/bookmark/bookmarks/bookmarks.component.ts rename to UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts index e37c96aea..1c0573d6c 100644 --- a/UI/Web/src/app/bookmark/bookmarks/bookmarks.component.ts +++ b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts @@ -9,10 +9,10 @@ import { DownloadService } from 'src/app/shared/_services/download.service'; import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service'; import { KEY_CODES } from 'src/app/shared/_services/utility.service'; import { JumpKey } from 'src/app/_models/jumpbar/jump-key'; -import { PageBookmark } from 'src/app/_models/page-bookmark'; +import { PageBookmark } from 'src/app/_models/readers/page-bookmark'; import { Pagination } from 'src/app/_models/pagination'; import { Series } from 'src/app/_models/series'; -import { FilterEvent, SeriesFilter } from 'src/app/_models/series-filter'; +import { FilterEvent, SeriesFilter } from 'src/app/_models/metadata/series-filter'; import { Action, ActionFactoryService, ActionItem } from 'src/app/_services/action-factory.service'; import { ImageService } from 'src/app/_services/image.service'; import { JumpbarService } from 'src/app/_services/jumpbar.service'; diff --git a/UI/Web/src/app/bookmark/bookmark-routing.module.ts b/UI/Web/src/app/bookmark/bookmark-routing.module.ts index 8748829c2..e0ab6ca52 100644 --- a/UI/Web/src/app/bookmark/bookmark-routing.module.ts +++ b/UI/Web/src/app/bookmark/bookmark-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; import { Routes, RouterModule } from "@angular/router"; import { AuthGuard } from "../_guards/auth.guard"; -import { BookmarksComponent } from "./bookmarks/bookmarks.component"; +import { BookmarksComponent } from "./_components/bookmarks/bookmarks.component"; const routes: Routes = [ {path: '**', component: BookmarksComponent, pathMatch: 'full', canActivate: [AuthGuard]}, diff --git a/UI/Web/src/app/bookmark/bookmark.module.ts b/UI/Web/src/app/bookmark/bookmark.module.ts index 40d7716e1..b7d4bb6b4 100644 --- a/UI/Web/src/app/bookmark/bookmark.module.ts +++ b/UI/Web/src/app/bookmark/bookmark.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { BookmarkRoutingModule } from './bookmark-routing.module'; -import { BookmarksComponent } from './bookmarks/bookmarks.component'; +import { BookmarksComponent } from './_components/bookmarks/bookmarks.component'; import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module'; diff --git a/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts b/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts index 9ac9d1b44..497fe8e1f 100644 --- a/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts +++ b/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts @@ -4,16 +4,16 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { forkJoin, Observable, of, Subject } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; import { Breakpoint, UtilityService } from 'src/app/shared/_services/utility.service'; -import { TypeaheadSettings } from 'src/app/typeahead/typeahead-settings'; +import { TypeaheadSettings } from 'src/app/typeahead/_models/typeahead-settings'; import { Chapter } from 'src/app/_models/chapter'; import { CollectionTag } from 'src/app/_models/collection-tag'; -import { Genre } from 'src/app/_models/genre'; +import { Genre } from 'src/app/_models/metadata/genre'; import { AgeRatingDto } from 'src/app/_models/metadata/age-rating-dto'; import { Language } from 'src/app/_models/metadata/language'; import { PublicationStatusDto } from 'src/app/_models/metadata/publication-status-dto'; -import { Person, PersonRole } from 'src/app/_models/person'; +import { Person, PersonRole } from 'src/app/_models/metadata/person'; import { Series } from 'src/app/_models/series'; -import { SeriesMetadata } from 'src/app/_models/series-metadata'; +import { SeriesMetadata } from 'src/app/_models/metadata/series-metadata'; import { Tag } from 'src/app/_models/tag'; import { CollectionTagService } from 'src/app/_services/collection-tag.service'; import { ImageService } from 'src/app/_services/image.service'; diff --git a/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts b/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts index 729734612..e9817462d 100644 --- a/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts +++ b/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts @@ -7,12 +7,12 @@ import { Download } from 'src/app/shared/_models/download'; import { DownloadService } from 'src/app/shared/_services/download.service'; import { Breakpoint, UtilityService } from 'src/app/shared/_services/utility.service'; import { Chapter } from 'src/app/_models/chapter'; -import { ChapterMetadata } from 'src/app/_models/chapter-metadata'; +import { ChapterMetadata } from 'src/app/_models/metadata/chapter-metadata'; import { Device } from 'src/app/_models/device/device'; import { LibraryType } from 'src/app/_models/library'; import { MangaFile } from 'src/app/_models/manga-file'; import { MangaFormat } from 'src/app/_models/manga-format'; -import { PersonRole } from 'src/app/_models/person'; +import { PersonRole } from 'src/app/_models/metadata/person'; import { Volume } from 'src/app/_models/volume'; import { AccountService } from 'src/app/_services/account.service'; import { ActionItem, ActionFactoryService, Action } from 'src/app/_services/action-factory.service'; diff --git a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts index 701a01f49..0825e8d48 100644 --- a/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts +++ b/UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts @@ -11,7 +11,7 @@ import { Breakpoint, UtilityService } from 'src/app/shared/_services/utility.ser import { JumpKey } from 'src/app/_models/jumpbar/jump-key'; import { Library } from 'src/app/_models/library'; import { Pagination } from 'src/app/_models/pagination'; -import { FilterEvent, FilterItem, SeriesFilter } from 'src/app/_models/series-filter'; +import { FilterEvent, FilterItem, SeriesFilter } from 'src/app/_models/metadata/series-filter'; import { ActionItem } from 'src/app/_services/action-factory.service'; import { JumpbarService } from 'src/app/_services/jumpbar.service'; diff --git a/UI/Web/src/app/cards/card-item/card-item.component.ts b/UI/Web/src/app/cards/card-item/card-item.component.ts index 10d881636..ec717710c 100644 --- a/UI/Web/src/app/cards/card-item/card-item.component.ts +++ b/UI/Web/src/app/cards/card-item/card-item.component.ts @@ -7,7 +7,7 @@ import { Chapter } from 'src/app/_models/chapter'; import { CollectionTag } from 'src/app/_models/collection-tag'; import { UserProgressUpdateEvent } from 'src/app/_models/events/user-progress-update-event'; import { MangaFormat } from 'src/app/_models/manga-format'; -import { PageBookmark } from 'src/app/_models/page-bookmark'; +import { PageBookmark } from 'src/app/_models/readers/page-bookmark'; import { RecentlyAddedItem } from 'src/app/_models/recently-added-item'; import { Series } from 'src/app/_models/series'; import { User } from 'src/app/_models/user'; diff --git a/UI/Web/src/app/cards/chapter-metadata-detail/chapter-metadata-detail.component.ts b/UI/Web/src/app/cards/chapter-metadata-detail/chapter-metadata-detail.component.ts index 6a2668c01..84d27aab0 100644 --- a/UI/Web/src/app/cards/chapter-metadata-detail/chapter-metadata-detail.component.ts +++ b/UI/Web/src/app/cards/chapter-metadata-detail/chapter-metadata-detail.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { ChapterMetadata } from 'src/app/_models/chapter-metadata'; +import { ChapterMetadata } from 'src/app/_models/metadata/chapter-metadata'; @Component({ selector: 'app-chapter-metadata-detail', diff --git a/UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.ts b/UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.ts index d44f5535a..4fcaf7b16 100644 --- a/UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.ts +++ b/UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.ts @@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, In import { FormControl } from '@angular/forms'; import { map, Subject, Observable, of, firstValueFrom, takeUntil, ReplaySubject } from 'rxjs'; import { UtilityService } from 'src/app/shared/_services/utility.service'; -import { TypeaheadSettings } from 'src/app/typeahead/typeahead-settings'; -import { SearchResult } from 'src/app/_models/search-result'; +import { TypeaheadSettings } from 'src/app/typeahead/_models/typeahead-settings'; +import { SearchResult } from 'src/app/_models/search/search-result'; import { Series } from 'src/app/_models/series'; import { RelationKind, RelationKinds } from 'src/app/_models/series-detail/relation-kind'; import { ImageService } from 'src/app/_services/image.service'; diff --git a/UI/Web/src/app/cards/entity-info-cards/entity-info-cards.component.ts b/UI/Web/src/app/cards/entity-info-cards/entity-info-cards.component.ts index 4c79f2361..cc91f0c7b 100644 --- a/UI/Web/src/app/cards/entity-info-cards/entity-info-cards.component.ts +++ b/UI/Web/src/app/cards/entity-info-cards/entity-info-cards.component.ts @@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy import { Subject } from 'rxjs'; import { UtilityService } from 'src/app/shared/_services/utility.service'; import { Chapter } from 'src/app/_models/chapter'; -import { ChapterMetadata } from 'src/app/_models/chapter-metadata'; -import { HourEstimateRange } from 'src/app/_models/hour-estimate-range'; +import { ChapterMetadata } from 'src/app/_models/metadata/chapter-metadata'; +import { HourEstimateRange } from 'src/app/_models/series-detail/hour-estimate-range'; import { LibraryType } from 'src/app/_models/library'; import { MangaFormat } from 'src/app/_models/manga-format'; import { AgeRating } from 'src/app/_models/metadata/age-rating'; diff --git a/UI/Web/src/app/cards/series-info-cards/series-info-cards.component.ts b/UI/Web/src/app/cards/series-info-cards/series-info-cards.component.ts index bdff5f269..95e875701 100644 --- a/UI/Web/src/app/cards/series-info-cards/series-info-cards.component.ts +++ b/UI/Web/src/app/cards/series-info-cards/series-info-cards.component.ts @@ -3,10 +3,10 @@ import { debounceTime, filter, map, Subject, takeUntil } from 'rxjs'; import { FilterQueryParam } from 'src/app/shared/_services/filter-utilities.service'; import { UtilityService } from 'src/app/shared/_services/utility.service'; import { UserProgressUpdateEvent } from 'src/app/_models/events/user-progress-update-event'; -import { HourEstimateRange } from 'src/app/_models/hour-estimate-range'; +import { HourEstimateRange } from 'src/app/_models/series-detail/hour-estimate-range'; import { MangaFormat } from 'src/app/_models/manga-format'; import { Series } from 'src/app/_models/series'; -import { SeriesMetadata } from 'src/app/_models/series-metadata'; +import { SeriesMetadata } from 'src/app/_models/metadata/series-metadata'; import { AccountService } from 'src/app/_services/account.service'; import { EVENTS, MessageHubService } from 'src/app/_services/message-hub.service'; import { MetadataService } from 'src/app/_services/metadata.service'; diff --git a/UI/Web/src/app/carousel/carousel-reel/carousel-reel.component.html b/UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.html similarity index 100% rename from UI/Web/src/app/carousel/carousel-reel/carousel-reel.component.html rename to UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.html diff --git a/UI/Web/src/app/carousel/carousel-reel/carousel-reel.component.scss b/UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.scss similarity index 100% rename from UI/Web/src/app/carousel/carousel-reel/carousel-reel.component.scss rename to UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.scss diff --git a/UI/Web/src/app/carousel/carousel-reel/carousel-reel.component.ts b/UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.ts similarity index 100% rename from UI/Web/src/app/carousel/carousel-reel/carousel-reel.component.ts rename to UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.ts diff --git a/UI/Web/src/app/carousel/carousel.module.ts b/UI/Web/src/app/carousel/carousel.module.ts index 98017f81f..e079edd0c 100644 --- a/UI/Web/src/app/carousel/carousel.module.ts +++ b/UI/Web/src/app/carousel/carousel.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { CarouselReelComponent } from './carousel-reel/carousel-reel.component'; +import { CarouselReelComponent } from './_components/carousel-reel/carousel-reel.component'; import { SwiperModule } from 'swiper/angular'; diff --git a/UI/Web/src/app/collections/all-collections/all-collections.component.html b/UI/Web/src/app/collections/_components/all-collections/all-collections.component.html similarity index 100% rename from UI/Web/src/app/collections/all-collections/all-collections.component.html rename to UI/Web/src/app/collections/_components/all-collections/all-collections.component.html diff --git a/UI/Web/src/app/collections/all-collections/all-collections.component.scss b/UI/Web/src/app/collections/_components/all-collections/all-collections.component.scss similarity index 100% rename from UI/Web/src/app/collections/all-collections/all-collections.component.scss rename to UI/Web/src/app/collections/_components/all-collections/all-collections.component.scss diff --git a/UI/Web/src/app/collections/all-collections/all-collections.component.ts b/UI/Web/src/app/collections/_components/all-collections/all-collections.component.ts similarity index 100% rename from UI/Web/src/app/collections/all-collections/all-collections.component.ts rename to UI/Web/src/app/collections/_components/all-collections/all-collections.component.ts diff --git a/UI/Web/src/app/collections/collection-detail/collection-detail.component.html b/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.html similarity index 100% rename from UI/Web/src/app/collections/collection-detail/collection-detail.component.html rename to UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.html diff --git a/UI/Web/src/app/collections/collection-detail/collection-detail.component.scss b/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.scss similarity index 100% rename from UI/Web/src/app/collections/collection-detail/collection-detail.component.scss rename to UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.scss diff --git a/UI/Web/src/app/collections/collection-detail/collection-detail.component.ts b/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.ts similarity index 99% rename from UI/Web/src/app/collections/collection-detail/collection-detail.component.ts rename to UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.ts index 6627c6d50..e0484a38e 100644 --- a/UI/Web/src/app/collections/collection-detail/collection-detail.component.ts +++ b/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.ts @@ -16,7 +16,7 @@ import { SeriesAddedToCollectionEvent } from 'src/app/_models/events/series-adde import { JumpKey } from 'src/app/_models/jumpbar/jump-key'; import { Pagination } from 'src/app/_models/pagination'; import { Series } from 'src/app/_models/series'; -import { FilterEvent, SeriesFilter } from 'src/app/_models/series-filter'; +import { FilterEvent, SeriesFilter } from 'src/app/_models/metadata/series-filter'; import { Action, ActionFactoryService, ActionItem } from 'src/app/_services/action-factory.service'; import { ActionService } from 'src/app/_services/action.service'; import { CollectionTagService } from 'src/app/_services/collection-tag.service'; diff --git a/UI/Web/src/app/collections/collections-routing.module.ts b/UI/Web/src/app/collections/collections-routing.module.ts index ad6249f8c..07d6ccae9 100644 --- a/UI/Web/src/app/collections/collections-routing.module.ts +++ b/UI/Web/src/app/collections/collections-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { AuthGuard } from '../_guards/auth.guard'; -import { AllCollectionsComponent } from './all-collections/all-collections.component'; -import { CollectionDetailComponent } from './collection-detail/collection-detail.component'; +import { AllCollectionsComponent } from './_components/all-collections/all-collections.component'; +import { CollectionDetailComponent } from './_components/collection-detail/collection-detail.component'; const routes: Routes = [ { diff --git a/UI/Web/src/app/collections/collections.module.ts b/UI/Web/src/app/collections/collections.module.ts index 54ef17d32..7be8cfcb4 100644 --- a/UI/Web/src/app/collections/collections.module.ts +++ b/UI/Web/src/app/collections/collections.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { CollectionDetailComponent } from './collection-detail/collection-detail.component'; +import { CollectionDetailComponent } from './_components/collection-detail/collection-detail.component'; import { SharedModule } from '../shared/shared.module'; -import { AllCollectionsComponent } from './all-collections/all-collections.component'; +import { AllCollectionsComponent } from './_components/all-collections/all-collections.component'; import { CollectionsRoutingModule } from './collections-routing.module'; import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module'; diff --git a/UI/Web/src/app/dashboard/dashboard.component.html b/UI/Web/src/app/dashboard/_components/dashboard.component.html similarity index 100% rename from UI/Web/src/app/dashboard/dashboard.component.html rename to UI/Web/src/app/dashboard/_components/dashboard.component.html diff --git a/UI/Web/src/app/dashboard/dashboard.component.scss b/UI/Web/src/app/dashboard/_components/dashboard.component.scss similarity index 100% rename from UI/Web/src/app/dashboard/dashboard.component.scss rename to UI/Web/src/app/dashboard/_components/dashboard.component.scss diff --git a/UI/Web/src/app/dashboard/dashboard.component.ts b/UI/Web/src/app/dashboard/_components/dashboard.component.ts similarity index 88% rename from UI/Web/src/app/dashboard/dashboard.component.ts rename to UI/Web/src/app/dashboard/_components/dashboard.component.ts index 0f7fc167f..ddacd96c5 100644 --- a/UI/Web/src/app/dashboard/dashboard.component.ts +++ b/UI/Web/src/app/dashboard/_components/dashboard.component.ts @@ -3,19 +3,19 @@ import { Title } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { Observable, of, ReplaySubject, Subject } from 'rxjs'; import { debounceTime, map, take, takeUntil, tap, shareReplay } from 'rxjs/operators'; -import { FilterQueryParam } from '../shared/_services/filter-utilities.service'; -import { SeriesAddedEvent } from '../_models/events/series-added-event'; -import { SeriesRemovedEvent } from '../_models/events/series-removed-event'; -import { Library } from '../_models/library'; -import { RecentlyAddedItem } from '../_models/recently-added-item'; -import { Series } from '../_models/series'; -import { SortField } from '../_models/series-filter'; -import { SeriesGroup } from '../_models/series-group'; -import { AccountService } from '../_services/account.service'; -import { ImageService } from '../_services/image.service'; -import { LibraryService } from '../_services/library.service'; -import { MessageHubService, EVENTS } from '../_services/message-hub.service'; -import { SeriesService } from '../_services/series.service'; +import { FilterQueryParam } from 'src/app/shared/_services/filter-utilities.service'; +import { SeriesAddedEvent } from 'src/app/_models/events/series-added-event'; +import { SeriesRemovedEvent } from 'src/app/_models/events/series-removed-event'; +import { Library } from 'src/app/_models/library'; +import { RecentlyAddedItem } from 'src/app/_models/recently-added-item'; +import { Series } from 'src/app/_models/series'; +import { SortField } from 'src/app/_models/metadata/series-filter'; +import { SeriesGroup } from 'src/app/_models/series-group'; +import { AccountService } from 'src/app/_services/account.service'; +import { ImageService } from 'src/app/_services/image.service'; +import { LibraryService } from 'src/app/_services/library.service'; +import { MessageHubService, EVENTS } from 'src/app/_services/message-hub.service'; +import { SeriesService } from 'src/app/_services/series.service'; @Component({ selector: 'app-dashboard', diff --git a/UI/Web/src/app/dashboard/dashboard-routing.module.ts b/UI/Web/src/app/dashboard/dashboard-routing.module.ts index adf41b73b..cb126360b 100644 --- a/UI/Web/src/app/dashboard/dashboard-routing.module.ts +++ b/UI/Web/src/app/dashboard/dashboard-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { AuthGuard } from '../_guards/auth.guard'; -import { DashboardComponent } from './dashboard.component'; +import { DashboardComponent } from './_components/dashboard.component'; const routes: Routes = [ diff --git a/UI/Web/src/app/dashboard/dashboard.module.ts b/UI/Web/src/app/dashboard/dashboard.module.ts index 55b9a5329..def517670 100644 --- a/UI/Web/src/app/dashboard/dashboard.module.ts +++ b/UI/Web/src/app/dashboard/dashboard.module.ts @@ -3,20 +3,16 @@ import { CommonModule } from '@angular/common'; import { DashboardRoutingModule } from './dashboard-routing.module'; import { CarouselModule } from '../carousel/carousel.module'; -import { DashboardComponent } from './dashboard.component'; +import { DashboardComponent } from './_components/dashboard.component'; import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module'; - @NgModule({ declarations: [DashboardComponent], imports: [ CommonModule, - CarouselModule, - SharedSideNavCardsModule, - DashboardRoutingModule ] }) diff --git a/UI/Web/src/app/library-detail/library-detail.component.ts b/UI/Web/src/app/library-detail/library-detail.component.ts index 689fa328f..79d1a1490 100644 --- a/UI/Web/src/app/library-detail/library-detail.component.ts +++ b/UI/Web/src/app/library-detail/library-detail.component.ts @@ -9,7 +9,7 @@ import { SeriesAddedEvent } from '../_models/events/series-added-event'; import { Library } from '../_models/library'; import { Pagination } from '../_models/pagination'; import { Series } from '../_models/series'; -import { FilterEvent, SeriesFilter } from '../_models/series-filter'; +import { FilterEvent, SeriesFilter } from '../_models/metadata/series-filter'; import { Action, ActionFactoryService, ActionItem } from '../_services/action-factory.service'; import { ActionService } from '../_services/action.service'; import { LibraryService } from '../_services/library.service'; diff --git a/UI/Web/src/app/library-detail/library-recommended/library-recommended.component.ts b/UI/Web/src/app/library-detail/library-recommended/library-recommended.component.ts index 76415028d..fc1cc8409 100644 --- a/UI/Web/src/app/library-detail/library-recommended/library-recommended.component.ts +++ b/UI/Web/src/app/library-detail/library-recommended/library-recommended.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; import { filter, map, merge, Observable, shareReplay, Subject, takeUntil } from 'rxjs'; -import { Genre } from 'src/app/_models/genre'; +import { Genre } from 'src/app/_models/metadata/genre'; import { Series } from 'src/app/_models/series'; import { MetadataService } from 'src/app/_services/metadata.service'; import { RecommendationService } from 'src/app/_services/recommendation.service'; diff --git a/UI/Web/src/app/metadata-filter/filter-settings.ts b/UI/Web/src/app/metadata-filter/filter-settings.ts index cfe504247..c80ed96ac 100644 --- a/UI/Web/src/app/metadata-filter/filter-settings.ts +++ b/UI/Web/src/app/metadata-filter/filter-settings.ts @@ -1,4 +1,4 @@ -import { SeriesFilter } from "../_models/series-filter"; +import { SeriesFilter } from "../_models/metadata/series-filter"; export class FilterSettings { libraryDisabled = false; diff --git a/UI/Web/src/app/metadata-filter/metadata-filter.component.ts b/UI/Web/src/app/metadata-filter/metadata-filter.component.ts index 69286b85f..d3e85596d 100644 --- a/UI/Web/src/app/metadata-filter/metadata-filter.component.ts +++ b/UI/Web/src/app/metadata-filter/metadata-filter.component.ts @@ -4,16 +4,16 @@ import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap'; import { distinctUntilChanged, forkJoin, map, Observable, of, ReplaySubject, Subject, takeUntil } from 'rxjs'; import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service'; import { UtilityService } from '../shared/_services/utility.service'; -import { TypeaheadSettings } from '../typeahead/typeahead-settings'; +import { TypeaheadSettings } from '../typeahead/_models/typeahead-settings'; import { CollectionTag } from '../_models/collection-tag'; -import { Genre } from '../_models/genre'; +import { Genre } from '../_models/metadata/genre'; import { Library } from '../_models/library'; import { MangaFormat } from '../_models/manga-format'; import { AgeRatingDto } from '../_models/metadata/age-rating-dto'; import { Language } from '../_models/metadata/language'; import { PublicationStatusDto } from '../_models/metadata/publication-status-dto'; -import { Person, PersonRole } from '../_models/person'; -import { FilterEvent, FilterItem, mangaFormatFilters, SeriesFilter, SortField } from '../_models/series-filter'; +import { Person, PersonRole } from '../_models/metadata/person'; +import { FilterEvent, FilterItem, mangaFormatFilters, SeriesFilter, SortField } from '../_models/metadata/series-filter'; import { Tag } from '../_models/tag'; import { CollectionTagService } from '../_services/collection-tag.service'; import { LibraryService } from '../_services/library.service'; diff --git a/UI/Web/src/app/nav/events-widget/events-widget.component.html b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.html similarity index 100% rename from UI/Web/src/app/nav/events-widget/events-widget.component.html rename to UI/Web/src/app/nav/_components/events-widget/events-widget.component.html diff --git a/UI/Web/src/app/nav/events-widget/events-widget.component.scss b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss similarity index 100% rename from UI/Web/src/app/nav/events-widget/events-widget.component.scss rename to UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss diff --git a/UI/Web/src/app/nav/events-widget/events-widget.component.ts b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts similarity index 100% rename from UI/Web/src/app/nav/events-widget/events-widget.component.ts rename to UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts diff --git a/UI/Web/src/app/nav/grouped-typeahead/grouped-typeahead.component.html b/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.html similarity index 100% rename from UI/Web/src/app/nav/grouped-typeahead/grouped-typeahead.component.html rename to UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.html diff --git a/UI/Web/src/app/nav/grouped-typeahead/grouped-typeahead.component.scss b/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.scss similarity index 100% rename from UI/Web/src/app/nav/grouped-typeahead/grouped-typeahead.component.scss rename to UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.scss diff --git a/UI/Web/src/app/nav/grouped-typeahead/grouped-typeahead.component.ts b/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.ts similarity index 97% rename from UI/Web/src/app/nav/grouped-typeahead/grouped-typeahead.component.ts rename to UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.ts index 687e54c3d..7d97c981e 100644 --- a/UI/Web/src/app/nav/grouped-typeahead/grouped-typeahead.component.ts +++ b/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.ts @@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, El import { FormControl, FormGroup } from '@angular/forms'; import { Subject } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; -import { KEY_CODES } from '../../shared/_services/utility.service'; -import { SearchResultGroup } from '../../_models/search/search-result-group'; +import { KEY_CODES } from 'src/app/shared/_services/utility.service'; +import { SearchResultGroup } from 'src/app/_models/search/search-result-group'; @Component({ selector: 'app-grouped-typeahead', diff --git a/UI/Web/src/app/nav/nav-header/nav-header.component.html b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html similarity index 100% rename from UI/Web/src/app/nav/nav-header/nav-header.component.html rename to UI/Web/src/app/nav/_components/nav-header/nav-header.component.html diff --git a/UI/Web/src/app/nav/nav-header/nav-header.component.scss b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.scss similarity index 100% rename from UI/Web/src/app/nav/nav-header/nav-header.component.scss rename to UI/Web/src/app/nav/_components/nav-header/nav-header.component.scss diff --git a/UI/Web/src/app/nav/nav-header/nav-header.component.ts b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.ts similarity index 91% rename from UI/Web/src/app/nav/nav-header/nav-header.component.ts rename to UI/Web/src/app/nav/_components/nav-header/nav-header.component.ts index fd25b7887..bafc72273 100644 --- a/UI/Web/src/app/nav/nav-header/nav-header.component.ts +++ b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.ts @@ -3,21 +3,20 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inje import { NavigationEnd, Router } from '@angular/router'; import { fromEvent, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, takeUntil, tap } from 'rxjs/operators'; +import { FilterQueryParam } from 'src/app/shared/_services/filter-utilities.service'; import { Chapter } from 'src/app/_models/chapter'; +import { CollectionTag } from 'src/app/_models/collection-tag'; +import { Library } from 'src/app/_models/library'; import { MangaFile } from 'src/app/_models/manga-file'; +import { PersonRole } from 'src/app/_models/metadata/person'; +import { ReadingList } from 'src/app/_models/reading-list'; +import { SearchResult } from 'src/app/_models/search/search-result'; +import { SearchResultGroup } from 'src/app/_models/search/search-result-group'; +import { AccountService } from 'src/app/_services/account.service'; +import { ImageService } from 'src/app/_services/image.service'; +import { NavService } from 'src/app/_services/nav.service'; import { ScrollService } from 'src/app/_services/scroll.service'; import { SearchService } from 'src/app/_services/search.service'; -import { FilterQueryParam } from '../../shared/_services/filter-utilities.service'; -import { CollectionTag } from '../../_models/collection-tag'; -import { Library } from '../../_models/library'; -import { PersonRole } from '../../_models/person'; -import { ReadingList } from '../../_models/reading-list'; -import { SearchResult } from '../../_models/search-result'; -import { SearchResultGroup } from '../../_models/search/search-result-group'; -import { AccountService } from '../../_services/account.service'; -import { ImageService } from '../../_services/image.service'; -import { LibraryService } from '../../_services/library.service'; -import { NavService } from '../../_services/nav.service'; @Component({ selector: 'app-nav-header', diff --git a/UI/Web/src/app/nav/nav.module.ts b/UI/Web/src/app/nav/nav.module.ts index 97e77b9f3..a68159d55 100644 --- a/UI/Web/src/app/nav/nav.module.ts +++ b/UI/Web/src/app/nav/nav.module.ts @@ -1,14 +1,14 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { EventsWidgetComponent } from './events-widget/events-widget.component'; -import { GroupedTypeaheadComponent } from './grouped-typeahead/grouped-typeahead.component'; -import { NavHeaderComponent } from './nav-header/nav-header.component'; +import { EventsWidgetComponent } from './_components/events-widget/events-widget.component'; import { NgbDropdownModule, NgbPopoverModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { SharedModule } from '../shared/shared.module'; import { PipeModule } from '../pipe/pipe.module'; import { TypeaheadModule } from '../typeahead/typeahead.module'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; +import { GroupedTypeaheadComponent } from './_components/grouped-typeahead/grouped-typeahead.component'; +import { NavHeaderComponent } from './_components/nav-header/nav-header.component'; diff --git a/UI/Web/src/app/pdf-reader/pdf-reader/pdf-reader.component.html b/UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.html similarity index 100% rename from UI/Web/src/app/pdf-reader/pdf-reader/pdf-reader.component.html rename to UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.html diff --git a/UI/Web/src/app/pdf-reader/pdf-reader/pdf-reader.component.scss b/UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.scss similarity index 100% rename from UI/Web/src/app/pdf-reader/pdf-reader/pdf-reader.component.scss rename to UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.scss diff --git a/UI/Web/src/app/pdf-reader/pdf-reader/pdf-reader.component.ts b/UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.ts similarity index 98% rename from UI/Web/src/app/pdf-reader/pdf-reader/pdf-reader.component.ts rename to UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.ts index 16a4c3f90..57b0d61b9 100644 --- a/UI/Web/src/app/pdf-reader/pdf-reader/pdf-reader.component.ts +++ b/UI/Web/src/app/pdf-reader/_components/pdf-reader/pdf-reader.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { NgxExtendedPdfViewerService, PageViewModeType, ProgressBarEvent } from 'ngx-extended-pdf-viewer'; import { ToastrService } from 'ngx-toastr'; import { Subject, take } from 'rxjs'; -import { BookService } from 'src/app/book-reader/book.service'; +import { BookService } from 'src/app/book-reader/_services/book.service'; import { KEY_CODES } from 'src/app/shared/_services/utility.service'; import { Chapter } from 'src/app/_models/chapter'; import { User } from 'src/app/_models/user'; diff --git a/UI/Web/src/app/pdf-reader/package-lock.json b/UI/Web/src/app/pdf-reader/package-lock.json deleted file mode 100644 index 48e341a09..000000000 --- a/UI/Web/src/app/pdf-reader/package-lock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "lockfileVersion": 1 -} diff --git a/UI/Web/src/app/pdf-reader/pdf-reader.module.ts b/UI/Web/src/app/pdf-reader/pdf-reader.module.ts index 7b49ac00c..2b110f58f 100644 --- a/UI/Web/src/app/pdf-reader/pdf-reader.module.ts +++ b/UI/Web/src/app/pdf-reader/pdf-reader.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { PdfReaderComponent } from './pdf-reader/pdf-reader.component'; +import { PdfReaderComponent } from './_components/pdf-reader/pdf-reader.component'; import { PdfReaderRoutingModule } from './pdf-reader.router.module'; import { NgxExtendedPdfViewerModule } from 'ngx-extended-pdf-viewer'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; diff --git a/UI/Web/src/app/pdf-reader/pdf-reader.router.module.ts b/UI/Web/src/app/pdf-reader/pdf-reader.router.module.ts index 0b4f871d4..c43583e15 100644 --- a/UI/Web/src/app/pdf-reader/pdf-reader.router.module.ts +++ b/UI/Web/src/app/pdf-reader/pdf-reader.router.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { PdfReaderComponent } from './pdf-reader/pdf-reader.component'; +import { PdfReaderComponent } from './_components/pdf-reader/pdf-reader.component'; const routes: Routes = [ { diff --git a/UI/Web/src/app/pipe/person-role.pipe.ts b/UI/Web/src/app/pipe/person-role.pipe.ts index f71b4412b..0189b3c6e 100644 --- a/UI/Web/src/app/pipe/person-role.pipe.ts +++ b/UI/Web/src/app/pipe/person-role.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { PersonRole } from '../_models/person'; +import { PersonRole } from '../_models/metadata/person'; @Pipe({ name: 'personRole' diff --git a/UI/Web/src/app/reading-list/draggable-ordered-list/draggable-ordered-list.component.html b/UI/Web/src/app/reading-list/_components/draggable-ordered-list/draggable-ordered-list.component.html similarity index 100% rename from UI/Web/src/app/reading-list/draggable-ordered-list/draggable-ordered-list.component.html rename to UI/Web/src/app/reading-list/_components/draggable-ordered-list/draggable-ordered-list.component.html diff --git a/UI/Web/src/app/reading-list/draggable-ordered-list/draggable-ordered-list.component.scss b/UI/Web/src/app/reading-list/_components/draggable-ordered-list/draggable-ordered-list.component.scss similarity index 100% rename from UI/Web/src/app/reading-list/draggable-ordered-list/draggable-ordered-list.component.scss rename to UI/Web/src/app/reading-list/_components/draggable-ordered-list/draggable-ordered-list.component.scss diff --git a/UI/Web/src/app/reading-list/draggable-ordered-list/draggable-ordered-list.component.ts b/UI/Web/src/app/reading-list/_components/draggable-ordered-list/draggable-ordered-list.component.ts similarity index 100% rename from UI/Web/src/app/reading-list/draggable-ordered-list/draggable-ordered-list.component.ts rename to UI/Web/src/app/reading-list/_components/draggable-ordered-list/draggable-ordered-list.component.ts diff --git a/UI/Web/src/app/reading-list/reading-list-detail/reading-list-detail.component.html b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html similarity index 100% rename from UI/Web/src/app/reading-list/reading-list-detail/reading-list-detail.component.html rename to UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html diff --git a/UI/Web/src/app/reading-list/reading-list-detail/reading-list-detail.component.scss b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.scss similarity index 100% rename from UI/Web/src/app/reading-list/reading-list-detail/reading-list-detail.component.scss rename to UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.scss diff --git a/UI/Web/src/app/reading-list/reading-list-detail/reading-list-detail.component.ts b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts similarity index 97% rename from UI/Web/src/app/reading-list/reading-list-detail/reading-list-detail.component.ts rename to UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts index 5f4d78065..1d6041a59 100644 --- a/UI/Web/src/app/reading-list/reading-list-detail/reading-list-detail.component.ts +++ b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; -import { shareReplay, take } from 'rxjs/operators'; +import { take } from 'rxjs/operators'; import { ConfirmService } from 'src/app/shared/confirm.service'; import { UtilityService } from 'src/app/shared/_services/utility.service'; import { LibraryType } from 'src/app/_models/library'; @@ -12,10 +12,10 @@ import { Action, ActionFactoryService, ActionItem } from 'src/app/_services/acti import { ActionService } from 'src/app/_services/action.service'; import { ImageService } from 'src/app/_services/image.service'; import { ReadingListService } from 'src/app/_services/reading-list.service'; -import { IndexUpdateEvent, ItemRemoveEvent } from '../draggable-ordered-list/draggable-ordered-list.component'; -import { LibraryService } from '../../_services/library.service'; +import { IndexUpdateEvent } from '../draggable-ordered-list/draggable-ordered-list.component'; import { forkJoin } from 'rxjs'; import { ReaderService } from 'src/app/_services/reader.service'; +import { LibraryService } from 'src/app/_services/library.service'; @Component({ selector: 'app-reading-list-detail', diff --git a/UI/Web/src/app/reading-list/reading-list-item/reading-list-item.component.html b/UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.html similarity index 100% rename from UI/Web/src/app/reading-list/reading-list-item/reading-list-item.component.html rename to UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.html diff --git a/UI/Web/src/app/reading-list/reading-list-item/reading-list-item.component.scss b/UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.scss similarity index 100% rename from UI/Web/src/app/reading-list/reading-list-item/reading-list-item.component.scss rename to UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.scss diff --git a/UI/Web/src/app/reading-list/reading-list-item/reading-list-item.component.ts b/UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.ts similarity index 100% rename from UI/Web/src/app/reading-list/reading-list-item/reading-list-item.component.ts rename to UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.ts diff --git a/UI/Web/src/app/reading-list/reading-lists/reading-lists.component.html b/UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.html similarity index 100% rename from UI/Web/src/app/reading-list/reading-lists/reading-lists.component.html rename to UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.html diff --git a/UI/Web/src/app/reading-list/reading-lists/reading-lists.component.scss b/UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.scss similarity index 100% rename from UI/Web/src/app/reading-list/reading-lists/reading-lists.component.scss rename to UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.scss diff --git a/UI/Web/src/app/reading-list/reading-lists/reading-lists.component.ts b/UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.ts similarity index 100% rename from UI/Web/src/app/reading-list/reading-lists/reading-lists.component.ts rename to UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.ts diff --git a/UI/Web/src/app/reading-list/reading-list-routing.module.ts b/UI/Web/src/app/reading-list/reading-list-routing.module.ts index 3f2fda386..2043415fe 100644 --- a/UI/Web/src/app/reading-list/reading-list-routing.module.ts +++ b/UI/Web/src/app/reading-list/reading-list-routing.module.ts @@ -1,8 +1,9 @@ import { NgModule } from "@angular/core"; import { Routes, RouterModule } from "@angular/router"; import { AuthGuard } from "../_guards/auth.guard"; -import { ReadingListDetailComponent } from "./reading-list-detail/reading-list-detail.component"; -import { ReadingListsComponent } from "./reading-lists/reading-lists.component"; +import { ReadingListDetailComponent } from "./_components/reading-list-detail/reading-list-detail.component"; +import { ReadingListsComponent } from "./_components/reading-lists/reading-lists.component"; + const routes: Routes = [ { diff --git a/UI/Web/src/app/reading-list/reading-list.module.ts b/UI/Web/src/app/reading-list/reading-list.module.ts index 09ca14da7..0b4dda74c 100644 --- a/UI/Web/src/app/reading-list/reading-list.module.ts +++ b/UI/Web/src/app/reading-list/reading-list.module.ts @@ -1,19 +1,18 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { DraggableOrderedListComponent } from './draggable-ordered-list/draggable-ordered-list.component'; -import { ReadingListDetailComponent } from './reading-list-detail/reading-list-detail.component'; +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 { ReadingListsComponent } from './reading-lists/reading-lists.component'; import { EditReadingListModalComponent } from './_modals/edit-reading-list-modal/edit-reading-list-modal.component'; import { PipeModule } from '../pipe/pipe.module'; import { SharedModule } from '../shared/shared.module'; import { NgbNavModule, NgbProgressbarModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module'; -import { ReadingListItemComponent } from './reading-list-item/reading-list-item.component'; - +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'; @NgModule({ diff --git a/UI/Web/src/app/registration/confirm-email-change/confirm-email-change.component.html b/UI/Web/src/app/registration/_components/confirm-email-change/confirm-email-change.component.html similarity index 100% rename from UI/Web/src/app/registration/confirm-email-change/confirm-email-change.component.html rename to UI/Web/src/app/registration/_components/confirm-email-change/confirm-email-change.component.html diff --git a/UI/Web/src/app/registration/confirm-email-change/confirm-email-change.component.scss b/UI/Web/src/app/registration/_components/confirm-email-change/confirm-email-change.component.scss similarity index 100% rename from UI/Web/src/app/registration/confirm-email-change/confirm-email-change.component.scss rename to UI/Web/src/app/registration/_components/confirm-email-change/confirm-email-change.component.scss diff --git a/UI/Web/src/app/registration/confirm-email-change/confirm-email-change.component.ts b/UI/Web/src/app/registration/_components/confirm-email-change/confirm-email-change.component.ts similarity index 100% rename from UI/Web/src/app/registration/confirm-email-change/confirm-email-change.component.ts rename to UI/Web/src/app/registration/_components/confirm-email-change/confirm-email-change.component.ts diff --git a/UI/Web/src/app/registration/confirm-email/confirm-email.component.html b/UI/Web/src/app/registration/_components/confirm-email/confirm-email.component.html similarity index 100% rename from UI/Web/src/app/registration/confirm-email/confirm-email.component.html rename to UI/Web/src/app/registration/_components/confirm-email/confirm-email.component.html diff --git a/UI/Web/src/app/registration/confirm-email/confirm-email.component.scss b/UI/Web/src/app/registration/_components/confirm-email/confirm-email.component.scss similarity index 100% rename from UI/Web/src/app/registration/confirm-email/confirm-email.component.scss rename to UI/Web/src/app/registration/_components/confirm-email/confirm-email.component.scss diff --git a/UI/Web/src/app/registration/confirm-email/confirm-email.component.ts b/UI/Web/src/app/registration/_components/confirm-email/confirm-email.component.ts similarity index 100% rename from UI/Web/src/app/registration/confirm-email/confirm-email.component.ts rename to UI/Web/src/app/registration/_components/confirm-email/confirm-email.component.ts diff --git a/UI/Web/src/app/registration/confirm-migration-email/confirm-migration-email.component.html b/UI/Web/src/app/registration/_components/confirm-migration-email/confirm-migration-email.component.html similarity index 100% rename from UI/Web/src/app/registration/confirm-migration-email/confirm-migration-email.component.html rename to UI/Web/src/app/registration/_components/confirm-migration-email/confirm-migration-email.component.html diff --git a/UI/Web/src/app/registration/confirm-migration-email/confirm-migration-email.component.scss b/UI/Web/src/app/registration/_components/confirm-migration-email/confirm-migration-email.component.scss similarity index 100% rename from UI/Web/src/app/registration/confirm-migration-email/confirm-migration-email.component.scss rename to UI/Web/src/app/registration/_components/confirm-migration-email/confirm-migration-email.component.scss diff --git a/UI/Web/src/app/registration/confirm-migration-email/confirm-migration-email.component.ts b/UI/Web/src/app/registration/_components/confirm-migration-email/confirm-migration-email.component.ts similarity index 100% rename from UI/Web/src/app/registration/confirm-migration-email/confirm-migration-email.component.ts rename to UI/Web/src/app/registration/_components/confirm-migration-email/confirm-migration-email.component.ts diff --git a/UI/Web/src/app/registration/confirm-reset-password/confirm-reset-password.component.html b/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.html similarity index 100% rename from UI/Web/src/app/registration/confirm-reset-password/confirm-reset-password.component.html rename to UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.html diff --git a/UI/Web/src/app/registration/confirm-reset-password/confirm-reset-password.component.scss b/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.scss similarity index 100% rename from UI/Web/src/app/registration/confirm-reset-password/confirm-reset-password.component.scss rename to UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.scss diff --git a/UI/Web/src/app/registration/confirm-reset-password/confirm-reset-password.component.ts b/UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.ts similarity index 100% rename from UI/Web/src/app/registration/confirm-reset-password/confirm-reset-password.component.ts rename to UI/Web/src/app/registration/_components/confirm-reset-password/confirm-reset-password.component.ts diff --git a/UI/Web/src/app/registration/register/register.component.html b/UI/Web/src/app/registration/_components/register/register.component.html similarity index 100% rename from UI/Web/src/app/registration/register/register.component.html rename to UI/Web/src/app/registration/_components/register/register.component.html diff --git a/UI/Web/src/app/registration/register/register.component.scss b/UI/Web/src/app/registration/_components/register/register.component.scss similarity index 100% rename from UI/Web/src/app/registration/register/register.component.scss rename to UI/Web/src/app/registration/_components/register/register.component.scss diff --git a/UI/Web/src/app/registration/register/register.component.ts b/UI/Web/src/app/registration/_components/register/register.component.ts similarity index 100% rename from UI/Web/src/app/registration/register/register.component.ts rename to UI/Web/src/app/registration/_components/register/register.component.ts diff --git a/UI/Web/src/app/registration/reset-password/reset-password.component.html b/UI/Web/src/app/registration/_components/reset-password/reset-password.component.html similarity index 100% rename from UI/Web/src/app/registration/reset-password/reset-password.component.html rename to UI/Web/src/app/registration/_components/reset-password/reset-password.component.html diff --git a/UI/Web/src/app/registration/reset-password/reset-password.component.scss b/UI/Web/src/app/registration/_components/reset-password/reset-password.component.scss similarity index 100% rename from UI/Web/src/app/registration/reset-password/reset-password.component.scss rename to UI/Web/src/app/registration/_components/reset-password/reset-password.component.scss diff --git a/UI/Web/src/app/registration/reset-password/reset-password.component.ts b/UI/Web/src/app/registration/_components/reset-password/reset-password.component.ts similarity index 100% rename from UI/Web/src/app/registration/reset-password/reset-password.component.ts rename to UI/Web/src/app/registration/_components/reset-password/reset-password.component.ts diff --git a/UI/Web/src/app/registration/splash-container/splash-container.component.html b/UI/Web/src/app/registration/_components/splash-container/splash-container.component.html similarity index 100% rename from UI/Web/src/app/registration/splash-container/splash-container.component.html rename to UI/Web/src/app/registration/_components/splash-container/splash-container.component.html diff --git a/UI/Web/src/app/registration/splash-container/splash-container.component.scss b/UI/Web/src/app/registration/_components/splash-container/splash-container.component.scss similarity index 100% rename from UI/Web/src/app/registration/splash-container/splash-container.component.scss rename to UI/Web/src/app/registration/_components/splash-container/splash-container.component.scss diff --git a/UI/Web/src/app/registration/splash-container/splash-container.component.ts b/UI/Web/src/app/registration/_components/splash-container/splash-container.component.ts similarity index 100% rename from UI/Web/src/app/registration/splash-container/splash-container.component.ts rename to UI/Web/src/app/registration/_components/splash-container/splash-container.component.ts diff --git a/UI/Web/src/app/registration/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.html b/UI/Web/src/app/registration/_modals/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.html similarity index 100% rename from UI/Web/src/app/registration/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.html rename to UI/Web/src/app/registration/_modals/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.html diff --git a/UI/Web/src/app/registration/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.scss b/UI/Web/src/app/registration/_modals/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.scss similarity index 100% rename from UI/Web/src/app/registration/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.scss rename to UI/Web/src/app/registration/_modals/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.scss diff --git a/UI/Web/src/app/registration/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.ts b/UI/Web/src/app/registration/_modals/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.ts similarity index 100% rename from UI/Web/src/app/registration/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.ts rename to UI/Web/src/app/registration/_modals/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component.ts diff --git a/UI/Web/src/app/registration/registration.module.ts b/UI/Web/src/app/registration/registration.module.ts index bf18d60d1..b025ea427 100644 --- a/UI/Web/src/app/registration/registration.module.ts +++ b/UI/Web/src/app/registration/registration.module.ts @@ -1,17 +1,17 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ConfirmEmailComponent } from './confirm-email/confirm-email.component'; +import { ConfirmEmailComponent } from './_components/confirm-email/confirm-email.component'; import { RegistrationRoutingModule } from './registration.router.module'; -import { NgbCollapseModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { ReactiveFormsModule } from '@angular/forms'; -import { SplashContainerComponent } from './splash-container/splash-container.component'; -import { RegisterComponent } from './register/register.component'; -import { AddEmailToAccountMigrationModalComponent } from './add-email-to-account-migration-modal/add-email-to-account-migration-modal.component'; -import { ConfirmMigrationEmailComponent } from './confirm-migration-email/confirm-migration-email.component'; -import { ResetPasswordComponent } from './reset-password/reset-password.component'; -import { ConfirmResetPasswordComponent } from './confirm-reset-password/confirm-reset-password.component'; +import { AddEmailToAccountMigrationModalComponent } from './_modals/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component'; import { UserLoginComponent } from './user-login/user-login.component'; -import { ConfirmEmailChangeComponent } from './confirm-email-change/confirm-email-change.component'; +import { ConfirmEmailChangeComponent } from './_components/confirm-email-change/confirm-email-change.component'; +import { ConfirmMigrationEmailComponent } from './_components/confirm-migration-email/confirm-migration-email.component'; +import { ConfirmResetPasswordComponent } from './_components/confirm-reset-password/confirm-reset-password.component'; +import { RegisterComponent } from './_components/register/register.component'; +import { ResetPasswordComponent } from './_components/reset-password/reset-password.component'; +import { SplashContainerComponent } from './_components/splash-container/splash-container.component'; diff --git a/UI/Web/src/app/registration/registration.router.module.ts b/UI/Web/src/app/registration/registration.router.module.ts index ebe35dd00..c82952145 100644 --- a/UI/Web/src/app/registration/registration.router.module.ts +++ b/UI/Web/src/app/registration/registration.router.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { ConfirmEmailChangeComponent } from './confirm-email-change/confirm-email-change.component'; -import { ConfirmEmailComponent } from './confirm-email/confirm-email.component'; -import { ConfirmMigrationEmailComponent } from './confirm-migration-email/confirm-migration-email.component'; -import { ConfirmResetPasswordComponent } from './confirm-reset-password/confirm-reset-password.component'; -import { RegisterComponent } from './register/register.component'; -import { ResetPasswordComponent } from './reset-password/reset-password.component'; import { UserLoginComponent } from './user-login/user-login.component'; +import { ConfirmEmailChangeComponent } from './_components/confirm-email-change/confirm-email-change.component'; +import { ConfirmEmailComponent } from './_components/confirm-email/confirm-email.component'; +import { ConfirmMigrationEmailComponent } from './_components/confirm-migration-email/confirm-migration-email.component'; +import { ConfirmResetPasswordComponent } from './_components/confirm-reset-password/confirm-reset-password.component'; +import { RegisterComponent } from './_components/register/register.component'; +import { ResetPasswordComponent } from './_components/reset-password/reset-password.component'; const routes: Routes = [ { diff --git a/UI/Web/src/app/registration/user-login/user-login.component.ts b/UI/Web/src/app/registration/user-login/user-login.component.ts index 1a5c0184c..585cf2935 100644 --- a/UI/Web/src/app/registration/user-login/user-login.component.ts +++ b/UI/Web/src/app/registration/user-login/user-login.component.ts @@ -4,7 +4,7 @@ import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrService } from 'ngx-toastr'; import { take } from 'rxjs/operators'; -import { AddEmailToAccountMigrationModalComponent } from '../add-email-to-account-migration-modal/add-email-to-account-migration-modal.component'; +import { AddEmailToAccountMigrationModalComponent } from '../_modals/add-email-to-account-migration-modal/add-email-to-account-migration-modal.component'; import { User } from '../../_models/user'; import { AccountService } from '../../_services/account.service'; import { MemberService } from '../../_services/member.service'; diff --git a/UI/Web/src/app/series-detail/series-detail.component.html b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html similarity index 100% rename from UI/Web/src/app/series-detail/series-detail.component.html rename to UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html diff --git a/UI/Web/src/app/series-detail/series-detail.component.scss b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.scss similarity index 100% rename from UI/Web/src/app/series-detail/series-detail.component.scss rename to UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.scss diff --git a/UI/Web/src/app/series-detail/series-detail.component.ts b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts similarity index 91% rename from UI/Web/src/app/series-detail/series-detail.component.ts rename to UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts index 4754644c0..593cfd3c7 100644 --- a/UI/Web/src/app/series-detail/series-detail.component.ts +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts @@ -1,48 +1,47 @@ +import { DOCUMENT } from '@angular/common'; import { Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild, Inject, ChangeDetectionStrategy, ChangeDetectorRef, AfterContentChecked } from '@angular/core'; +import { FormGroup, FormControl } from '@angular/forms'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal, NgbNavChangeEvent, NgbOffcanvas } from '@ng-bootstrap/ng-bootstrap'; import { ToastrService } from 'ngx-toastr'; import { catchError, forkJoin, of, Subject } from 'rxjs'; import { take, takeUntil } from 'rxjs/operators'; -import { BulkSelectionService } from '../cards/bulk-selection.service'; -import { EditSeriesModalComponent } from '../cards/_modals/edit-series-modal/edit-series-modal.component'; -import { ConfirmConfig } from '../shared/confirm-dialog/_models/confirm-config'; -import { ConfirmService } from '../shared/confirm.service'; -import { TagBadgeCursor } from '../shared/tag-badge/tag-badge.component'; -import { DownloadService } from '../shared/_services/download.service'; -import { KEY_CODES, UtilityService } from '../shared/_services/utility.service'; -import { ReviewSeriesModalComponent } from './review-series-modal/review-series-modal.component'; -import { Chapter } from '../_models/chapter'; -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'; -import { AccountService } from '../_services/account.service'; -import { ActionItem, ActionFactoryService, Action } from '../_services/action-factory.service'; -import { ActionService } from '../_services/action.service'; -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'; -import { NavService } from '../_services/nav.service'; -import { RelatedSeries } from '../_models/series-detail/related-series'; -import { RelationKind } from '../_models/series-detail/relation-kind'; -import { CardDetailDrawerComponent } from '../cards/card-detail-drawer/card-detail-drawer.component'; -import { FormGroup, FormControl } from '@angular/forms'; -import { PageLayoutMode } from '../_models/page-layout-mode'; -import { DOCUMENT } from '@angular/common'; -import { User } from '../_models/user'; -import { ScrollService } from '../_services/scroll.service'; -import { DeviceService } from '../_services/device.service'; -import { Device } from '../_models/device/device'; -import { ThisReceiver } from '@angular/compiler'; +import { BulkSelectionService } from 'src/app/cards/bulk-selection.service'; +import { CardDetailDrawerComponent } from 'src/app/cards/card-detail-drawer/card-detail-drawer.component'; +import { EditSeriesModalComponent } from 'src/app/cards/_modals/edit-series-modal/edit-series-modal.component'; +import { ConfirmConfig } from 'src/app/shared/confirm-dialog/_models/confirm-config'; +import { ConfirmService } from 'src/app/shared/confirm.service'; +import { TagBadgeCursor } from 'src/app/shared/tag-badge/tag-badge.component'; +import { DownloadService } from 'src/app/shared/_services/download.service'; +import { UtilityService, KEY_CODES } from 'src/app/shared/_services/utility.service'; +import { Chapter } from 'src/app/_models/chapter'; +import { Device } from 'src/app/_models/device/device'; +import { ScanSeriesEvent } from 'src/app/_models/events/scan-series-event'; +import { SeriesRemovedEvent } from 'src/app/_models/events/series-removed-event'; +import { LibraryType } from 'src/app/_models/library'; +import { MangaFormat } from 'src/app/_models/manga-format'; +import { PageLayoutMode } from 'src/app/_models/readers/page-layout-mode'; +import { ReadingList } from 'src/app/_models/reading-list'; +import { Series } from 'src/app/_models/series'; +import { RelatedSeries } from 'src/app/_models/series-detail/related-series'; +import { RelationKind } from 'src/app/_models/series-detail/relation-kind'; +import { SeriesMetadata } from 'src/app/_models/metadata/series-metadata'; +import { User } from 'src/app/_models/user'; +import { Volume } from 'src/app/_models/volume'; +import { AccountService } from 'src/app/_services/account.service'; +import { ActionItem, ActionFactoryService, Action } from 'src/app/_services/action-factory.service'; +import { ActionService } from 'src/app/_services/action.service'; +import { DeviceService } from 'src/app/_services/device.service'; +import { ImageService } from 'src/app/_services/image.service'; +import { LibraryService } from 'src/app/_services/library.service'; +import { MessageHubService, EVENTS } from 'src/app/_services/message-hub.service'; +import { NavService } from 'src/app/_services/nav.service'; +import { ReaderService } from 'src/app/_services/reader.service'; +import { ReadingListService } from 'src/app/_services/reading-list.service'; +import { ScrollService } from 'src/app/_services/scroll.service'; +import { SeriesService } from 'src/app/_services/series.service'; +import { ReviewSeriesModalComponent } from '../../_modals/review-series-modal/review-series-modal.component'; interface RelatedSeris { series: Series; diff --git a/UI/Web/src/app/series-detail/series-metadata-detail/series-metadata-detail.component.html b/UI/Web/src/app/series-detail/_components/series-metadata-detail/series-metadata-detail.component.html similarity index 100% rename from UI/Web/src/app/series-detail/series-metadata-detail/series-metadata-detail.component.html rename to UI/Web/src/app/series-detail/_components/series-metadata-detail/series-metadata-detail.component.html diff --git a/UI/Web/src/app/series-detail/series-metadata-detail/series-metadata-detail.component.scss b/UI/Web/src/app/series-detail/_components/series-metadata-detail/series-metadata-detail.component.scss similarity index 100% rename from UI/Web/src/app/series-detail/series-metadata-detail/series-metadata-detail.component.scss rename to UI/Web/src/app/series-detail/_components/series-metadata-detail/series-metadata-detail.component.scss diff --git a/UI/Web/src/app/series-detail/series-metadata-detail/series-metadata-detail.component.ts b/UI/Web/src/app/series-detail/_components/series-metadata-detail/series-metadata-detail.component.ts similarity index 83% rename from UI/Web/src/app/series-detail/series-metadata-detail/series-metadata-detail.component.ts rename to UI/Web/src/app/series-detail/_components/series-metadata-detail/series-metadata-detail.component.ts index 132a8d080..409ceb0b9 100644 --- a/UI/Web/src/app/series-detail/series-metadata-detail/series-metadata-detail.component.ts +++ b/UI/Web/src/app/series-detail/_components/series-metadata-detail/series-metadata-detail.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { Router } from '@angular/router'; import { ReaderService } from 'src/app/_services/reader.service'; -import { TagBadgeCursor } from '../../shared/tag-badge/tag-badge.component'; -import { FilterQueryParam } from '../../shared/_services/filter-utilities.service'; -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'; +import { TagBadgeCursor } from '../../../shared/tag-badge/tag-badge.component'; +import { FilterQueryParam } from '../../../shared/_services/filter-utilities.service'; +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/metadata/series-metadata'; +import { MetadataService } from '../../../_services/metadata.service'; @Component({ diff --git a/UI/Web/src/app/series-detail/review-series-modal/review-series-modal.component.html b/UI/Web/src/app/series-detail/_modals/review-series-modal/review-series-modal.component.html similarity index 100% rename from UI/Web/src/app/series-detail/review-series-modal/review-series-modal.component.html rename to UI/Web/src/app/series-detail/_modals/review-series-modal/review-series-modal.component.html diff --git a/UI/Web/src/app/series-detail/review-series-modal/review-series-modal.component.scss b/UI/Web/src/app/series-detail/_modals/review-series-modal/review-series-modal.component.scss similarity index 100% rename from UI/Web/src/app/series-detail/review-series-modal/review-series-modal.component.scss rename to UI/Web/src/app/series-detail/_modals/review-series-modal/review-series-modal.component.scss diff --git a/UI/Web/src/app/series-detail/review-series-modal/review-series-modal.component.ts b/UI/Web/src/app/series-detail/_modals/review-series-modal/review-series-modal.component.ts similarity index 95% rename from UI/Web/src/app/series-detail/review-series-modal/review-series-modal.component.ts rename to UI/Web/src/app/series-detail/_modals/review-series-modal/review-series-modal.component.ts index eba3daed9..4d67244d8 100644 --- a/UI/Web/src/app/series-detail/review-series-modal/review-series-modal.component.ts +++ b/UI/Web/src/app/series-detail/_modals/review-series-modal/review-series-modal.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Series } from 'src/app/_models/series'; import { SeriesService } from 'src/app/_services/series.service'; diff --git a/UI/Web/src/app/series-detail/series-detail-routing.module.ts b/UI/Web/src/app/series-detail/series-detail-routing.module.ts index 3e7917797..70288597e 100644 --- a/UI/Web/src/app/series-detail/series-detail-routing.module.ts +++ b/UI/Web/src/app/series-detail/series-detail-routing.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { SeriesDetailComponent } from './series-detail.component'; +import { SeriesDetailComponent } from './_components/series-detail/series-detail.component'; + const routes: Routes = [ { diff --git a/UI/Web/src/app/series-detail/series-detail.module.ts b/UI/Web/src/app/series-detail/series-detail.module.ts index e0ae26dd5..2ecaf7344 100644 --- a/UI/Web/src/app/series-detail/series-detail.module.ts +++ b/UI/Web/src/app/series-detail/series-detail.module.ts @@ -2,14 +2,14 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SeriesDetailRoutingModule } from './series-detail-routing.module'; import { NgbCollapseModule, NgbNavModule, NgbRatingModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { SeriesDetailComponent } from './series-detail.component'; -import { SeriesMetadataDetailComponent } from './series-metadata-detail/series-metadata-detail.component'; -import { ReviewSeriesModalComponent } from './review-series-modal/review-series-modal.component'; +import { SeriesMetadataDetailComponent } from './_components/series-metadata-detail/series-metadata-detail.component'; +import { ReviewSeriesModalComponent } from './_modals/review-series-modal/review-series-modal.component'; import { SharedModule } from '../shared/shared.module'; import { TypeaheadModule } from '../typeahead/typeahead.module'; import { PipeModule } from '../pipe/pipe.module'; import { ReactiveFormsModule } from '@angular/forms'; import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module'; +import { SeriesDetailComponent } from './_components/series-detail/series-detail.component'; @NgModule({ diff --git a/UI/Web/src/app/shared/_services/download.service.ts b/UI/Web/src/app/shared/_services/download.service.ts index a6e26dc5f..8fbee570f 100644 --- a/UI/Web/src/app/shared/_services/download.service.ts +++ b/UI/Web/src/app/shared/_services/download.service.ts @@ -9,7 +9,7 @@ import { ToastrService } from 'ngx-toastr'; import { asyncScheduler, BehaviorSubject, Observable, tap, finalize, of, filter } from 'rxjs'; import { SAVER, Saver } from '../_providers/saver.provider'; import { download, Download } from '../_models/download'; -import { PageBookmark } from 'src/app/_models/page-bookmark'; +import { PageBookmark } from 'src/app/_models/readers/page-bookmark'; import { switchMap, takeWhile, throttleTime } from 'rxjs/operators'; import { AccountService } from 'src/app/_services/account.service'; diff --git a/UI/Web/src/app/shared/_services/filter-utilities.service.ts b/UI/Web/src/app/shared/_services/filter-utilities.service.ts index ff805b3e4..b0873eeb4 100644 --- a/UI/Web/src/app/shared/_services/filter-utilities.service.ts +++ b/UI/Web/src/app/shared/_services/filter-utilities.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router'; import { Pagination } from 'src/app/_models/pagination'; -import { SeriesFilter, SortField } from 'src/app/_models/series-filter'; +import { SeriesFilter, SortField } from 'src/app/_models/metadata/series-filter'; import { SeriesService } from 'src/app/_services/series.service'; /** diff --git a/UI/Web/src/app/shared/person-badge/person-badge.component.ts b/UI/Web/src/app/shared/person-badge/person-badge.component.ts index 0365c2b3c..a1e21b2d6 100644 --- a/UI/Web/src/app/shared/person-badge/person-badge.component.ts +++ b/UI/Web/src/app/shared/person-badge/person-badge.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { Person } from '../../_models/person'; +import { Person } from '../../_models/metadata/person'; @Component({ selector: 'app-person-badge', diff --git a/UI/Web/src/app/sidenav/side-nav-companion-bar/side-nav-companion-bar.component.html b/UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.html similarity index 100% rename from UI/Web/src/app/sidenav/side-nav-companion-bar/side-nav-companion-bar.component.html rename to UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.html diff --git a/UI/Web/src/app/sidenav/side-nav-companion-bar/side-nav-companion-bar.component.scss b/UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.scss similarity index 100% rename from UI/Web/src/app/sidenav/side-nav-companion-bar/side-nav-companion-bar.component.scss rename to UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.scss diff --git a/UI/Web/src/app/sidenav/side-nav-companion-bar/side-nav-companion-bar.component.ts b/UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.ts similarity index 100% rename from UI/Web/src/app/sidenav/side-nav-companion-bar/side-nav-companion-bar.component.ts rename to UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.ts diff --git a/UI/Web/src/app/sidenav/side-nav-item/side-nav-item.component.html b/UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.html similarity index 100% rename from UI/Web/src/app/sidenav/side-nav-item/side-nav-item.component.html rename to UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.html diff --git a/UI/Web/src/app/sidenav/side-nav-item/side-nav-item.component.scss b/UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.scss similarity index 100% rename from UI/Web/src/app/sidenav/side-nav-item/side-nav-item.component.scss rename to UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.scss diff --git a/UI/Web/src/app/sidenav/side-nav-item/side-nav-item.component.ts b/UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.ts similarity index 97% rename from UI/Web/src/app/sidenav/side-nav-item/side-nav-item.component.ts rename to UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.ts index 71523fee0..a93c2fb49 100644 --- a/UI/Web/src/app/sidenav/side-nav-item/side-nav-item.component.ts +++ b/UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.ts @@ -1,7 +1,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { filter, map, Subject, takeUntil } from 'rxjs'; -import { NavService } from '../../_services/nav.service'; +import { NavService } from 'src/app/_services/nav.service'; + @Component({ selector: 'app-side-nav-item', diff --git a/UI/Web/src/app/sidenav/side-nav/side-nav.component.html b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.html similarity index 100% rename from UI/Web/src/app/sidenav/side-nav/side-nav.component.html rename to UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.html diff --git a/UI/Web/src/app/sidenav/side-nav/side-nav.component.scss b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.scss similarity index 100% rename from UI/Web/src/app/sidenav/side-nav/side-nav.component.scss rename to UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.scss diff --git a/UI/Web/src/app/sidenav/side-nav/side-nav.component.ts b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts similarity index 88% rename from UI/Web/src/app/sidenav/side-nav/side-nav.component.ts rename to UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts index a8db4094f..ec4892839 100644 --- a/UI/Web/src/app/sidenav/side-nav/side-nav.component.ts +++ b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts @@ -5,14 +5,14 @@ import { Subject } from 'rxjs'; import { filter, map, shareReplay, take, takeUntil } from 'rxjs/operators'; import { ImageService } from 'src/app/_services/image.service'; import { EVENTS, MessageHubService } from 'src/app/_services/message-hub.service'; -import { Breakpoint, UtilityService } from '../../shared/_services/utility.service'; -import { Library, LibraryType } from '../../_models/library'; -import { AccountService } from '../../_services/account.service'; -import { Action, ActionFactoryService, ActionItem } from '../../_services/action-factory.service'; -import { ActionService } from '../../_services/action.service'; -import { LibraryService } from '../../_services/library.service'; -import { NavService } from '../../_services/nav.service'; -import { LibrarySettingsModalComponent } from '../_components/library-settings-modal/library-settings-modal.component'; +import { Breakpoint, UtilityService } from '../../../shared/_services/utility.service'; +import { Library, LibraryType } from '../../../_models/library'; +import { AccountService } from '../../../_services/account.service'; +import { Action, ActionFactoryService, ActionItem } from '../../../_services/action-factory.service'; +import { ActionService } from '../../../_services/action.service'; +import { LibraryService } from '../../../_services/library.service'; +import { NavService } from '../../../_services/nav.service'; +import { LibrarySettingsModalComponent } from '../../_modals/library-settings-modal/library-settings-modal.component'; @Component({ selector: 'app-side-nav', diff --git a/UI/Web/src/app/sidenav/_components/library-settings-modal/library-settings-modal.component.html b/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.html similarity index 100% rename from UI/Web/src/app/sidenav/_components/library-settings-modal/library-settings-modal.component.html rename to UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.html diff --git a/UI/Web/src/app/sidenav/_components/library-settings-modal/library-settings-modal.component.scss b/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.scss similarity index 100% rename from UI/Web/src/app/sidenav/_components/library-settings-modal/library-settings-modal.component.scss rename to UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.scss diff --git a/UI/Web/src/app/sidenav/_components/library-settings-modal/library-settings-modal.component.ts b/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts similarity index 100% rename from UI/Web/src/app/sidenav/_components/library-settings-modal/library-settings-modal.component.ts rename to UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts diff --git a/UI/Web/src/app/sidenav/sidenav.module.ts b/UI/Web/src/app/sidenav/sidenav.module.ts index 08bc2a040..8fe6b9757 100644 --- a/UI/Web/src/app/sidenav/sidenav.module.ts +++ b/UI/Web/src/app/sidenav/sidenav.module.ts @@ -1,14 +1,14 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SideNavCompanionBarComponent } from './side-nav-companion-bar/side-nav-companion-bar.component'; -import { SideNavItemComponent } from './side-nav-item/side-nav-item.component'; -import { SideNavComponent } from './side-nav/side-nav.component'; +import { SideNavComponent } from './_components/side-nav/side-nav.component'; import { PipeModule } from '../pipe/pipe.module'; import { CardsModule } from '../cards/cards.module'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgbNavModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { RouterModule } from '@angular/router'; -import { LibrarySettingsModalComponent } from './_components/library-settings-modal/library-settings-modal.component'; +import { LibrarySettingsModalComponent } from './_modals/library-settings-modal/library-settings-modal.component'; +import { SideNavCompanionBarComponent } from './_components/side-nav-companion-bar/side-nav-companion-bar.component'; +import { SideNavItemComponent } from './_components/side-nav-item/side-nav-item.component'; diff --git a/UI/Web/src/app/typeahead/typeahead.component.html b/UI/Web/src/app/typeahead/_components/typeahead.component.html similarity index 100% rename from UI/Web/src/app/typeahead/typeahead.component.html rename to UI/Web/src/app/typeahead/_components/typeahead.component.html diff --git a/UI/Web/src/app/typeahead/typeahead.component.scss b/UI/Web/src/app/typeahead/_components/typeahead.component.scss similarity index 100% rename from UI/Web/src/app/typeahead/typeahead.component.scss rename to UI/Web/src/app/typeahead/_components/typeahead.component.scss diff --git a/UI/Web/src/app/typeahead/typeahead.component.ts b/UI/Web/src/app/typeahead/_components/typeahead.component.ts similarity index 96% rename from UI/Web/src/app/typeahead/typeahead.component.ts rename to UI/Web/src/app/typeahead/_components/typeahead.component.ts index 232e6153f..8273095f9 100644 --- a/UI/Web/src/app/typeahead/typeahead.component.ts +++ b/UI/Web/src/app/typeahead/_components/typeahead.component.ts @@ -2,10 +2,11 @@ import { trigger, state, style, transition, animate } from '@angular/animations' import { DOCUMENT } from '@angular/common'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ElementRef, EventEmitter, HostListener, Inject, Input, OnDestroy, OnInit, Output, Renderer2, RendererStyleFlags2, TemplateRef, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { Observable, of, ReplaySubject, Subject } from 'rxjs'; -import { auditTime, distinctUntilChanged, filter, map, shareReplay, switchMap, take, takeUntil, tap } from 'rxjs/operators'; -import { KEY_CODES } from '../shared/_services/utility.service'; -import { SelectionCompareFn, TypeaheadSettings } from './typeahead-settings'; +import { Observable, ReplaySubject, Subject } from 'rxjs'; +import { auditTime, filter, map, shareReplay, switchMap, take, takeUntil, tap } from 'rxjs/operators'; +import { KEY_CODES } from 'src/app/shared/_services/utility.service'; +import { SelectionCompareFn, TypeaheadSettings } from '../_models/typeahead-settings'; + /** * SelectionModel is used for keeping track of multiple selections. Simple interface with ability to toggle. @@ -114,8 +115,12 @@ export class SelectionModel { } shallowEqual(object1: T, object2: T) { - const keys1 = Object.keys(object1); - const keys2 = Object.keys(object2); + if (object1 === undefined || object2 === undefined) return false; + + if (typeof(object1) === 'string' && typeof(object2) === 'string') return object1 === object2; + + const keys1 = Object.keys(object1); + const keys2 = Object.keys(object2); if (keys1.length !== keys2.length) { return false; diff --git a/UI/Web/src/app/typeahead/typeahead-settings.ts b/UI/Web/src/app/typeahead/_models/typeahead-settings.ts similarity index 100% rename from UI/Web/src/app/typeahead/typeahead-settings.ts rename to UI/Web/src/app/typeahead/_models/typeahead-settings.ts diff --git a/UI/Web/src/app/typeahead/typeahead.module.ts b/UI/Web/src/app/typeahead/typeahead.module.ts index 7742cc02d..e54312c59 100644 --- a/UI/Web/src/app/typeahead/typeahead.module.ts +++ b/UI/Web/src/app/typeahead/typeahead.module.ts @@ -1,12 +1,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { TypeaheadComponent } from './typeahead.component'; +import { TypeaheadComponent } from './_components/typeahead.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { SharedModule } from '../shared/shared.module'; import { PipeModule } from '../pipe/pipe.module'; + @NgModule({ declarations: [ TypeaheadComponent diff --git a/UI/Web/src/app/user-settings/change-age-restriction/change-age-restriction.component.ts b/UI/Web/src/app/user-settings/change-age-restriction/change-age-restriction.component.ts index 2169d4cd1..1262e1ba7 100644 --- a/UI/Web/src/app/user-settings/change-age-restriction/change-age-restriction.component.ts +++ b/UI/Web/src/app/user-settings/change-age-restriction/change-age-restriction.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; import { Observable, of, Subject, takeUntil, shareReplay, map, take } from 'rxjs'; -import { AgeRestriction } from 'src/app/_models/age-restriction'; +import { AgeRestriction } from 'src/app/_models/metadata/age-restriction'; import { AgeRating } from 'src/app/_models/metadata/age-rating'; import { User } from 'src/app/_models/user'; import { AccountService } from 'src/app/_services/account.service'; diff --git a/UI/Web/src/app/user-settings/change-email/change-email.component.ts b/UI/Web/src/app/user-settings/change-email/change-email.component.ts index 1e210f916..6455fd9b8 100644 --- a/UI/Web/src/app/user-settings/change-email/change-email.component.ts +++ b/UI/Web/src/app/user-settings/change-email/change-email.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { FormGroup, FormControl, Validators } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; import { Observable, of, Subject, takeUntil, shareReplay, map, tap, take } from 'rxjs'; -import { UpdateEmailResponse } from 'src/app/_models/email/update-email-response'; +import { UpdateEmailResponse } from 'src/app/_models/auth/update-email-response'; import { User } from 'src/app/_models/user'; import { AccountService } from 'src/app/_services/account.service'; diff --git a/UI/Web/src/app/user-settings/restriction-selector/restriction-selector.component.ts b/UI/Web/src/app/user-settings/restriction-selector/restriction-selector.component.ts index 6ca87dd2c..5933f1b42 100644 --- a/UI/Web/src/app/user-settings/restriction-selector/restriction-selector.component.ts +++ b/UI/Web/src/app/user-settings/restriction-selector/restriction-selector.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { AgeRestriction } from 'src/app/_models/age-restriction'; -import { Member } from 'src/app/_models/member'; +import { AgeRestriction } from 'src/app/_models/metadata/age-restriction'; +import { Member } from 'src/app/_models/auth/member'; import { AgeRating } from 'src/app/_models/metadata/age-rating'; import { AgeRatingDto } from 'src/app/_models/metadata/age-rating-dto'; import { User } from 'src/app/_models/user'; diff --git a/UI/Web/src/app/user-settings/user-preferences/user-preferences.component.ts b/UI/Web/src/app/user-settings/user-preferences/user-preferences.component.ts index 92e25bc4f..e250cfe44 100644 --- a/UI/Web/src/app/user-settings/user-preferences/user-preferences.component.ts +++ b/UI/Web/src/app/user-settings/user-preferences/user-preferences.component.ts @@ -3,14 +3,14 @@ import { FormControl, FormGroup } from '@angular/forms'; import { ToastrService } from 'ngx-toastr'; import { take, takeUntil } from 'rxjs/operators'; import { Title } from '@angular/platform-browser'; -import { BookService } from 'src/app/book-reader/book.service'; +import { BookService } from 'src/app/book-reader/_services/book.service'; import { readingDirections, scalingOptions, pageSplitOptions, readingModes, Preferences, bookLayoutModes, layoutModes, pageLayoutModes } from 'src/app/_models/preferences/preferences'; import { User } from 'src/app/_models/user'; import { AccountService } from 'src/app/_services/account.service'; import { ActivatedRoute, Router } from '@angular/router'; import { SettingsService } from 'src/app/admin/settings.service'; import { bookColorThemes } from 'src/app/book-reader/reader-settings/reader-settings.component'; -import { BookPageLayoutMode } from 'src/app/_models/book-page-layout-mode'; +import { BookPageLayoutMode } from 'src/app/_models/readers/book-page-layout-mode'; import { forkJoin, Subject } from 'rxjs'; enum AccordionPanelID { diff --git a/UI/Web/src/app/want-to-read/want-to-read/want-to-read.component.html b/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.html similarity index 100% rename from UI/Web/src/app/want-to-read/want-to-read/want-to-read.component.html rename to UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.html diff --git a/UI/Web/src/app/want-to-read/want-to-read/want-to-read.component.scss b/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.scss similarity index 100% rename from UI/Web/src/app/want-to-read/want-to-read/want-to-read.component.scss rename to UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.scss diff --git a/UI/Web/src/app/want-to-read/want-to-read/want-to-read.component.ts b/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts similarity index 98% rename from UI/Web/src/app/want-to-read/want-to-read/want-to-read.component.ts rename to UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts index ff2a906a5..8e49e4771 100644 --- a/UI/Web/src/app/want-to-read/want-to-read/want-to-read.component.ts +++ b/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts @@ -11,7 +11,7 @@ import { SeriesRemovedEvent } from 'src/app/_models/events/series-removed-event' import { JumpKey } from 'src/app/_models/jumpbar/jump-key'; import { Pagination } from 'src/app/_models/pagination'; import { Series } from 'src/app/_models/series'; -import { SeriesFilter, FilterEvent } from 'src/app/_models/series-filter'; +import { SeriesFilter, FilterEvent } from 'src/app/_models/metadata/series-filter'; import { Action, ActionItem } from 'src/app/_services/action-factory.service'; import { ActionService } from 'src/app/_services/action.service'; import { ImageService } from 'src/app/_services/image.service'; diff --git a/UI/Web/src/app/want-to-read/want-to-read-routing.module.ts b/UI/Web/src/app/want-to-read/want-to-read-routing.module.ts index 7ccca91ae..6464098fd 100644 --- a/UI/Web/src/app/want-to-read/want-to-read-routing.module.ts +++ b/UI/Web/src/app/want-to-read/want-to-read-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { AuthGuard } from '../_guards/auth.guard'; -import { WantToReadComponent } from './want-to-read/want-to-read.component'; +import { WantToReadComponent } from './_components/want-to-read/want-to-read.component'; const routes: Routes = [ {path: '**', component: WantToReadComponent, pathMatch: 'full'}, diff --git a/UI/Web/src/app/want-to-read/want-to-read.module.ts b/UI/Web/src/app/want-to-read/want-to-read.module.ts index d3efdffd9..4686b2732 100644 --- a/UI/Web/src/app/want-to-read/want-to-read.module.ts +++ b/UI/Web/src/app/want-to-read/want-to-read.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { WantToReadComponent } from './want-to-read/want-to-read.component'; +import { WantToReadComponent } from './_components/want-to-read/want-to-read.component'; import { CardsModule } from '../cards/cards.module'; import { SidenavModule } from '../sidenav/sidenav.module'; import { WantToReadRoutingModule } from './want-to-read-routing.module'; diff --git a/openapi.json b/openapi.json index aa798003f..42e8dd494 100644 --- a/openapi.json +++ b/openapi.json @@ -7,7 +7,7 @@ "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" }, - "version": "0.6.1.5" + "version": "0.6.1.6" }, "servers": [ {