Skip to content

Commit

Permalink
Renamed ComicImport => Library [#547]
Browse files Browse the repository at this point in the history
 * Standardized the routing module names.
  • Loading branch information
mcpierce committed Dec 11, 2020
1 parent f42e1d2 commit 1dac15c
Show file tree
Hide file tree
Showing 47 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion comixed-web/src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
import {USER_READER} from '@app/user/user.fixtures';
import {loadSessionUpdate} from '@app/actions/session.actions';
import {SESSION_TIMEOUT} from '@app/app.constants';
import {setImportingComicsState} from '@app/comic-import/actions/comic-import.actions';
import {setImportingComicsState} from '@app/library/actions/comic-import.actions';

describe('AppComponent', () => {
const USER = USER_READER;
Expand Down
2 changes: 1 addition & 1 deletion comixed-web/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { TranslateService } from '@ngx-translate/core';
import { loadSessionUpdate } from '@app/actions/session.actions';
import { SESSION_TIMEOUT } from '@app/app.constants';
import { selectUserSessionState } from '@app/selectors/session.selectors';
import { setImportingComicsState } from '@app/comic-import/actions/comic-import.actions';
import { setImportingComicsState } from '@app/library/actions/comic-import.actions';

@Component({
selector: 'cx-root',
Expand Down
8 changes: 4 additions & 4 deletions comixed-web/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { AppRoutingModule } from './app-routing.module';
import { AppRouting } from './app.routing';
import { AppComponent } from './app.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http';
Expand All @@ -43,7 +43,7 @@ import { LoggerLevel, LoggerModule } from '@angular-ru/logger';
import { MatButtonModule } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatTooltipModule } from '@angular/material/tooltip';
import { ComicImportModule } from '@app/comic-import/comic-import.module';
import { LibraryModule } from '@app/library/library.module';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import {
_MatMenuDirectivesModule,
Expand All @@ -56,9 +56,9 @@ import { SessionEffects } from '@app/effects/session.effects';
declarations: [AppComponent, HomeComponent, NavigationBarComponent],
imports: [
UserModule,
ComicImportModule,
LibraryModule,
BrowserModule,
AppRoutingModule,
AppRouting,
BrowserAnimationsModule,
MatToolbarModule,
MatIconModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ const routes: Routes = [
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule]
})
export class AppRoutingModule {}
export class AppRouting {}
2 changes: 1 addition & 1 deletion comixed-web/src/app/app.translate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { HttpClient } from '@angular/common/http';
export function HttpLoaderFactory(http: HttpClient): MultiTranslateHttpLoader {
return new MultiTranslateHttpLoader(http, [
{ prefix: './assets/i18n/', suffix: '/app.json' },
{ prefix: './assets/i18n/', suffix: '/comic-import.json' },
{ prefix: './assets/i18n/', suffix: '/library.json' },
{ prefix: './assets/i18n/', suffix: '/core.json' },
{ prefix: './assets/i18n/', suffix: '/user.json' }
]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import { createAction, props } from '@ngrx/store';
import { ComicFile } from '@app/comic-import/models/comic-file';
import { ComicFile } from '@app/library/models/comic-file';

export const loadComicFiles = createAction(
'[ComicImport] Load comics in a file system',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComicFileDetailsComponent } from './comic-file-details.component';
import { LoggerModule } from '@angular-ru/logger';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
import { COMIC_FILE_2 } from '@app/comic-import/comic-import.fixtures';
import { setComicFilesSelectedState } from '@app/comic-import/actions/comic-import.actions';
import { COMIC_FILE_2 } from '@app/library/library.fixtures';
import { setComicFilesSelectedState } from '@app/library/actions/comic-import.actions';

describe('ComicFileDetailsComponent', () => {
const FILE = COMIC_FILE_2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
*/

import { Component, Input, OnInit } from '@angular/core';
import { ComicFile } from '@app/comic-import/models/comic-file';
import { ComicFile } from '@app/library/models/comic-file';
import { LoggerService } from '@angular-ru/logger';
import { Store } from '@ngrx/store';
import { setComicFilesSelectedState } from '@app/comic-import/actions/comic-import.actions';
import { setComicFilesSelectedState } from '@app/library/actions/comic-import.actions';

@Component({
selector: 'cx-comic-file-details',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ import {
COMIC_FILE_2,
COMIC_FILE_3,
COMIC_FILE_4,
} from '@app/comic-import/comic-import.fixtures';
} from '@app/library/library.fixtures';
import {
COMIC_IMPORT_FEATURE_KEY,
initialState as initialComicImportState,
} from '@app/comic-import/reducers/comic-import.reducer';
} from '@app/library/reducers/comic-import.reducer';
import { MatTableModule } from '@angular/material/table';
import { TranslateModule } from '@ngx-translate/core';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { setComicFilesSelectedState } from '@app/comic-import/actions/comic-import.actions';
import { setComicFilesSelectedState } from '@app/library/actions/comic-import.actions';

describe('ComicFileListComponent', () => {
const initialState = { [COMIC_IMPORT_FEATURE_KEY]: initialComicImportState };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
*/

import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ComicFile } from '@app/comic-import/models/comic-file';
import { ComicFile } from '@app/library/models/comic-file';
import { MatTableDataSource } from '@angular/material/table';
import { LoggerService } from '@angular-ru/logger';
import { Store } from '@ngrx/store';
import { setComicFilesSelectedState } from '@app/comic-import/actions/comic-import.actions';
import { setComicFilesSelectedState } from '@app/library/actions/comic-import.actions';
import { Sort } from '@angular/material/sort';
import { compare } from '@app/core';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import {
import { USER_READER } from '@app/user/user.fixtures';
import { MatSelectModule } from '@angular/material/select';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ROOT_DIRECTORY } from '@app/comic-import/comic-import.fixtures';
import { loadComicFiles } from '@app/comic-import/actions/comic-import.actions';
import { ROOT_DIRECTORY } from '@app/library/library.fixtures';
import { loadComicFiles } from '@app/library/actions/comic-import.actions';
import { MatInputModule } from '@angular/material/input';

describe('ImportToolbarComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
} from '@angular/forms';
import { LoggerService } from '@angular-ru/logger';
import { Store } from '@ngrx/store';
import { loadComicFiles } from '@app/comic-import/actions/comic-import.actions';
import { loadComicFiles } from '@app/library/actions/comic-import.actions';
import { selectUser } from '@app/user/selectors/user.selectors';
import { Subscription } from 'rxjs';
import { getUserPreference } from '@app/user';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { TestBed } from '@angular/core/testing';
import { provideMockActions } from '@ngrx/effects/testing';
import { Observable, of, throwError } from 'rxjs';
import { ComicImportEffects } from './comic-import.effects';
import { ComicImportService } from '@app/comic-import/services/comic-import.service';
import { ComicImportService } from '@app/library/services/comic-import.service';
import { AlertService } from '@app/core';
import { LoggerModule } from '@angular-ru/logger';
import { TranslateModule } from '@ngx-translate/core';
Expand All @@ -30,16 +30,16 @@ import {
COMIC_FILE_3,
COMIC_FILE_4,
ROOT_DIRECTORY
} from '@app/comic-import/comic-import.fixtures';
import { LoadComicFilesResponse } from '@app/comic-import/models/net/load-comic-files-response';
} from '@app/library/library.fixtures';
import { LoadComicFilesResponse } from '@app/library/models/net/load-comic-files-response';
import {
comicFilesLoaded,
comicFilesSent,
loadComicFiles,
loadComicFilesFailed,
sendComicFiles,
sendComicFilesFailed
} from '@app/comic-import/actions/comic-import.actions';
} from '@app/library/actions/comic-import.actions';
import { hot } from 'jasmine-marbles';
import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
import { MatSnackBarModule } from '@angular/material/snack-bar';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import { Injectable } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { LoggerService } from '@angular-ru/logger';
import { ComicImportService } from '@app/comic-import/services/comic-import.service';
import { ComicImportService } from '@app/library/services/comic-import.service';
import { AlertService } from '@app/core';
import { TranslateService } from '@ngx-translate/core';
import {
Expand All @@ -29,9 +29,9 @@ import {
loadComicFilesFailed,
sendComicFiles,
sendComicFilesFailed
} from '@app/comic-import/actions/comic-import.actions';
} from '@app/library/actions/comic-import.actions';
import { catchError, map, switchMap, tap } from 'rxjs/operators';
import { LoadComicFilesResponse } from '@app/comic-import/models/net/load-comic-files-response';
import { LoadComicFilesResponse } from '@app/library/models/net/load-comic-files-response';
import { of } from 'rxjs';

@Injectable()
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { CommonModule } from '@angular/common';
import { CoreModule } from '../core/core.module';
import { ImportComicsComponent } from './pages/import-comics/import-comics.component';
import { ImportToolbarComponent } from './components/import-toolbar/import-toolbar.component';
import { ComicImportRoutingModule } from '@app/comic-import/comic-import-routing.module';
import { LibraryRouting } from '@app/library/library.routing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
import { TranslateModule } from '@ngx-translate/core';
Expand All @@ -31,9 +31,9 @@ import { StoreModule } from '@ngrx/store';
import {
COMIC_IMPORT_FEATURE_KEY,
reducer as comicImportReducer,
} from '@app/comic-import/reducers/comic-import.reducer';
} from '@app/library/reducers/comic-import.reducer';
import { EffectsModule } from '@ngrx/effects';
import { ComicImportEffects } from '@app/comic-import/effects/comic-import.effects';
import { ComicImportEffects } from '@app/library/effects/comic-import.effects';
import { ComicFileListComponent } from './components/comic-file-list/comic-file-list.component';
import { MatTableModule } from '@angular/material/table';
import { ComicFileCoverUrlPipe } from './pipes/comic-file-cover-url.pipe';
Expand All @@ -56,7 +56,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
imports: [
CommonModule,
CoreModule,
ComicImportRoutingModule,
LibraryRouting,
ReactiveFormsModule,
TranslateModule.forRoot(),
StoreModule.forFeature(COMIC_IMPORT_FEATURE_KEY, comicImportReducer),
Expand All @@ -75,4 +75,4 @@ import { MatTooltipModule } from '@angular/material/tooltip';
],
exports: [CommonModule, CoreModule],
})
export class ComicImportModule {}
export class LibraryModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class ComicImportRoutingModule {}
export class LibraryRouting {}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
COMIC_IMPORT_FEATURE_KEY,
initialState as initialComicImportState
} from '@app/comic-import/reducers/comic-import.reducer';
} from '@app/library/reducers/comic-import.reducer';
import { MatDialogModule } from '@angular/material/dialog';
import { MatButtonModule } from '@angular/material/button';
import { MatCheckboxModule } from '@angular/material/checkbox';
Expand All @@ -39,24 +39,24 @@ import {
COMIC_FILE_2,
COMIC_FILE_3,
COMIC_FILE_4
} from '@app/comic-import/comic-import.fixtures';
} from '@app/library/library.fixtures';
import { ConfirmationService } from '@app/core';
import { Confirmation } from '@app/core/models/confirmation';
import { sendComicFiles } from '@app/comic-import/actions/comic-import.actions';
import { sendComicFiles } from '@app/library/actions/comic-import.actions';
import { USER_ADMIN } from '@app/user/user.fixtures';
import { User } from '@app/user/models/user';
import {
USER_PREFERENCE_DELETE_BLOCKED_PAGES,
USER_PREFERENCE_IGNORE_METADATA
} from '@app/user/user.constants';
import { MatIconModule } from '@angular/material/icon';
import { ImportToolbarComponent } from '@app/comic-import/components/import-toolbar/import-toolbar.component';
import { ComicFileListComponent } from '@app/comic-import/components/comic-file-list/comic-file-list.component';
import { ComicFileDetailsComponent } from '@app/comic-import/components/comic-file-details/comic-file-details.component';
import { ImportToolbarComponent } from '@app/library/components/import-toolbar/import-toolbar.component';
import { ComicFileListComponent } from '@app/library/components/comic-file-list/comic-file-list.component';
import { ComicFileDetailsComponent } from '@app/library/components/comic-file-details/comic-file-details.component';
import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';
import { MatTableModule } from '@angular/material/table';
import { ComicFileCoverUrlPipe } from '@app/comic-import/pipes/comic-file-cover-url.pipe';
import { ComicFileCoverUrlPipe } from '@app/library/pipes/comic-file-cover-url.pipe';
import { Title } from '@angular/platform-browser';

describe('ImportComicsComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@

import { Component, OnDestroy, OnInit } from '@angular/core';
import { Subscription } from 'rxjs';
import { ComicFile } from '@app/comic-import/models/comic-file';
import { ComicFile } from '@app/library/models/comic-file';
import { LoggerService } from '@angular-ru/logger';
import { Store } from '@ngrx/store';
import {
selectComicFiles,
selectComicFileSelections,
selectComicImportState
} from '@app/comic-import/selectors/comic-import.selectors';
} from '@app/library/selectors/comic-import.selectors';
import { setBusyState } from '@app/core/actions/busy.actions';
import { ConfirmationService } from '@app/core';
import { TranslateService } from '@ngx-translate/core';
import { sendComicFiles } from '@app/comic-import/actions/comic-import.actions';
import { sendComicFiles } from '@app/library/actions/comic-import.actions';
import { selectUser } from '@app/user/selectors/user.selectors';
import { filter } from 'rxjs/operators';
import { getUserPreference } from '@app/user';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import { ComicFileCoverUrlPipe } from './comic-file-cover-url.pipe';
import { COMIC_FILE_1 } from '@app/comic-import/comic-import.fixtures';
import { COMIC_FILE_1 } from '@app/library/library.fixtures';
import { API_ROOT_URL } from '@app/core';

describe('ComicFileCoverUrlPipe', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import { Pipe, PipeTransform } from '@angular/core';
import { ComicFile } from '@app/comic-import/models/comic-file';
import { ComicFile } from '@app/library/models/comic-file';
import { API_ROOT_URL } from '@app/core';

@Pipe({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ import {
sendComicFilesFailed,
setComicFilesSelectedState,
setImportingComicsState,
} from '@app/comic-import/actions/comic-import.actions';
} from '@app/library/actions/comic-import.actions';
import {
COMIC_FILE_1,
COMIC_FILE_2,
COMIC_FILE_3,
ROOT_DIRECTORY,
} from '@app/comic-import/comic-import.fixtures';
} from '@app/library/library.fixtures';

describe('ComicImport Reducer', () => {
const FILES = [COMIC_FILE_1, COMIC_FILE_2, COMIC_FILE_3];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import {
sendComicFilesFailed,
setComicFilesSelectedState,
setImportingComicsState
} from '@app/comic-import/actions/comic-import.actions';
import { ComicFile } from '@app/comic-import/models/comic-file';
} from '@app/library/actions/comic-import.actions';
import { ComicFile } from '@app/library/models/comic-file';

export const COMIC_IMPORT_FEATURE_KEY = 'comic_import_state';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
COMIC_FILE_1,
COMIC_FILE_2,
COMIC_FILE_3,
} from '@app/comic-import/comic-import.fixtures';
} from '@app/library/library.fixtures';

describe('ComicImport Selectors', () => {
const FILES = [COMIC_FILE_1, COMIC_FILE_2, COMIC_FILE_3];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ import {
COMIC_FILE_3,
COMIC_FILE_4,
ROOT_DIRECTORY
} from '@app/comic-import/comic-import.fixtures';
} from '@app/library/library.fixtures';
import { interpolate } from '@app/core';
import { LoadComicFilesResponse } from '@app/comic-import/models/net/load-comic-files-response';
import { LoadComicFilesResponse } from '@app/library/models/net/load-comic-files-response';
import {
HttpClientTestingModule,
HttpTestingController
} from '@angular/common/http/testing';
import {
LOAD_COMIC_FILES_URL,
SEND_COMIC_FILES_URL
} from '@app/comic-import/comic-import.constants';
import { LoadComicFilesRequest } from '@app/comic-import/models/net/load-comic-files-request';
import { SendComicFilesRequest } from '@app/comic-import/models/net/send-comic-files-request';
} from '@app/library/library.constants';
import { LoadComicFilesRequest } from '@app/library/models/net/load-comic-files-request';
import { SendComicFilesRequest } from '@app/library/models/net/send-comic-files-request';
import { HttpResponse } from '@angular/common/http';

describe('ComicImportService', () => {
Expand Down

0 comments on commit 1dac15c

Please sign in to comment.