[Issue #270] prettier clean up

comixed · May 24, 2020 · c543fe0 · c543fe0
1 parent d6f426f
commit c543fe0
Show file tree

Hide file tree

Showing 22 changed files with 278 additions and 271 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -8,3 +8,4 @@ what it is today.
  * Alex Engelhardt <alex.engelhardt@readinow.com>
  * João França <jmcrfp@gmail.com>
  * Pidockmedia <pidockmedia@gmail.com>
+ * Frédéric Fouret (BRUCELLA2) <fouretfrederic@gmail.com>
diff --git a/.../app/comic-import/components/comic-file-list-toolbar/comic-file-list-toolbar.component.ts b/.../app/comic-import/components/comic-file-list-toolbar/comic-file-list-toolbar.component.ts
@@ -86,10 +86,18 @@ export class ComicFileListToolbarComponent implements OnInit, OnDestroy {
     this.layoutSubscription = this.libraryDisplayAdaptor.layout$.subscribe(
       layout => (this.gridLayout = layout === 'grid')
     );
-    this.sortFieldSubscription = this.libraryDisplayAdaptor.sortField$.subscribe(field => this.sortField = field);
-    this.rowsSubscription = this.libraryDisplayAdaptor.rows$.subscribe(rows => this.rows = rows);
-    this.sameHeightSubscription = this.libraryDisplayAdaptor.sameHeight$.subscribe(sameHeight => this.sameHeight = sameHeight);
-    this.coverSizeSubscription = this.libraryDisplayAdaptor.coverSize$.subscribe(coverSize => this.coverSize = coverSize);
+    this.sortFieldSubscription = this.libraryDisplayAdaptor.sortField$.subscribe(
+      field => (this.sortField = field)
+    );
+    this.rowsSubscription = this.libraryDisplayAdaptor.rows$.subscribe(
+      rows => (this.rows = rows)
+    );
+    this.sameHeightSubscription = this.libraryDisplayAdaptor.sameHeight$.subscribe(
+      sameHeight => (this.sameHeight = sameHeight)
+    );
+    this.coverSizeSubscription = this.libraryDisplayAdaptor.coverSize$.subscribe(
+      coverSize => (this.coverSize = coverSize)
+    );
   }
 
   ngOnDestroy() {

diff --git a/comixed-frontend/src/app/comic-import/index.ts b/comixed-frontend/src/app/comic-import/index.ts
@@ -15,31 +15,31 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http:/www.gnu.org/licenses>
  */
-import {Params} from '@angular/router';
+import { Params } from '@angular/router';
 import * as fromRouter from '@ngrx/router-store';
 import * as fromImporting from './reducers/comic-import.reducer';
-import {ComicImportState} from './reducers/comic-import.reducer';
-import {ActionReducerMap, MetaReducer} from '@ngrx/store';
-import {environment} from '../../environments/environment';
+import { ComicImportState } from './reducers/comic-import.reducer';
+import { ActionReducerMap, MetaReducer } from '@ngrx/store';
+import { environment } from '../../environments/environment';
 
 interface RouterStateUrl {
-    url: string;
-    params: Params;
-    queryParams: Params;
+  url: string;
+  params: Params;
+  queryParams: Params;
 }
 
 export interface AppState {
-    router: fromRouter.RouterReducerState<RouterStateUrl>;
-    comicImport: ComicImportState;
+  router: fromRouter.RouterReducerState<RouterStateUrl>;
+  comicImport: ComicImportState;
 }
 
 export type State = AppState;
 
 export const reducers: ActionReducerMap<AppState> = {
-    router: fromRouter.routerReducer,
-    comicImport: fromImporting.reducer
+  router: fromRouter.routerReducer,
+  comicImport: fromImporting.reducer
 };
 
 export const metaReducers: MetaReducer<AppState>[] = !environment.production
-    ? []
-    : [];
+  ? []
+  : [];
diff --git a/comixed-frontend/src/app/comics/models/scraping-issue.fixtures.ts b/comixed-frontend/src/app/comics/models/scraping-issue.fixtures.ts
@@ -19,11 +19,11 @@
 import { ScrapingIssue } from 'app/comics/models/scraping-issue';
 
 export const SCRAPING_ISSUE_1000: ScrapingIssue = {
-         id: 1000,
-         coverDate: '0',
-         coverUrl: 'http://comixed.org/issues/1000',
-         issueNumber: '1000',
-         name: 'Issue1000',
-         volumeName: '2009',
-         volumeId: 1000
-       };
+  id: 1000,
+  coverDate: '0',
+  coverUrl: 'http://comixed.org/issues/1000',
+  issueNumber: '1000',
+  name: 'Issue1000',
+  volumeName: '2009',
+  volumeId: 1000
+};
diff --git a/comixed-frontend/src/app/comics/services/scraping.service.spec.ts b/comixed-frontend/src/app/comics/services/scraping.service.spec.ts
@@ -81,9 +81,7 @@ describe('ScrapingService', () => {
       .getVolumes(API_KEY, SERIES, VOLUME, SKIP_CACHE)
       .subscribe(response => expect(response).toEqual(VOLUMES));
 
-    const req = httpMock.expectOne(
-      interpolate(GET_VOLUMES_URL)
-    );
+    const req = httpMock.expectOne(interpolate(GET_VOLUMES_URL));
     expect(req.request.method).toEqual('POST');
     expect(req.request.body).toEqual({
       apiKey: API_KEY,

diff --git a/comixed-frontend/src/app/components/main-menu/main-menu.component.ts b/comixed-frontend/src/app/components/main-menu/main-menu.component.ts
@@ -75,7 +75,7 @@ export class MainMenuComponent implements OnInit {
           },
           {
             label: this.translateService.instant(
-                'main-menu.item.library.duplicates'
+              'main-menu.item.library.duplicates'
             ),
             icon: 'fa fw fas fa-clone',
             routerLink: ['/comics/duplicates'],

diff --git a/...ontend/src/app/library/components/comic-list-toolbar/comic-list-toolbar.component.spec.ts b/...ontend/src/app/library/components/comic-list-toolbar/comic-list-toolbar.component.spec.ts
@@ -16,29 +16,29 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-import {HttpClientTestingModule} from '@angular/common/http/testing';
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {FormsModule} from '@angular/forms';
-import {Router} from '@angular/router';
-import {RouterTestingModule} from '@angular/router/testing';
-import {EffectsModule} from '@ngrx/effects';
-import {Store, StoreModule} from '@ngrx/store';
-import {TranslateModule} from '@ngx-translate/core';
-import {ScrapingAdaptor} from 'app/comics/adaptors/scraping.adaptor';
-import {COMIC_1, COMIC_3, COMIC_5} from 'app/comics/comics.fixtures';
-import {ComicsModule} from 'app/comics/comics.module';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { EffectsModule } from '@ngrx/effects';
+import { Store, StoreModule } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { ScrapingAdaptor } from 'app/comics/adaptors/scraping.adaptor';
+import { COMIC_1, COMIC_3, COMIC_5 } from 'app/comics/comics.fixtures';
+import { ComicsModule } from 'app/comics/comics.module';
 import {
   AppState,
   LibraryAdaptor,
   LibraryDisplayAdaptor,
   ReadingListAdaptor,
   SelectionAdaptor
 } from 'app/library';
-import {LibraryEffects} from 'app/library/effects/library.effects';
+import { LibraryEffects } from 'app/library/effects/library.effects';
 import * as fromLibrary from 'app/library/reducers/library.reducer';
 import * as fromSelect from 'app/library/reducers/selection.reducer';
-import {AuthenticationAdaptor} from 'app/user';
-import {LoggerModule} from '@angular-ru/logger';
+import { AuthenticationAdaptor } from 'app/user';
+import { LoggerModule } from '@angular-ru/logger';
 import {
   ButtonModule,
   CheckboxModule,
@@ -53,9 +53,9 @@ import {
   TooltipModule,
   TreeModule
 } from 'primeng/primeng';
-import {ComicListToolbarComponent} from './comic-list-toolbar.component';
-import {LibraryNavigationTreeComponent} from 'app/library/components/library-navigation-tree/library-navigation-tree.component';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import { ComicListToolbarComponent } from './comic-list-toolbar.component';
+import { LibraryNavigationTreeComponent } from 'app/library/components/library-navigation-tree/library-navigation-tree.component';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('ComicListToolbarComponent', () => {
   const COMICS = [COMIC_1, COMIC_3, COMIC_5];
@@ -80,12 +80,12 @@ describe('ComicListToolbarComponent', () => {
         LoggerModule.forRoot(),
         StoreModule.forRoot({}),
         StoreModule.forFeature(
-            fromLibrary.LIBRARY_FEATURE_KEY,
-            fromLibrary.reducer
+          fromLibrary.LIBRARY_FEATURE_KEY,
+          fromLibrary.reducer
         ),
         StoreModule.forFeature(
-            fromSelect.SELECTION_FEATURE_KEY,
-            fromSelect.reducer
+          fromSelect.SELECTION_FEATURE_KEY,
+          fromSelect.reducer
         ),
         EffectsModule.forRoot([]),
         EffectsModule.forFeature([LibraryEffects]),
@@ -135,7 +135,7 @@ describe('ComicListToolbarComponent', () => {
 
     it('emits an event', () => {
       component.startScraping.subscribe(response =>
-          expect(response).toBeTruthy()
+        expect(response).toBeTruthy()
       );
     });
   });

diff --git a/...tend/src/app/library/components/consolidate-library/consolidate-library.component.spec.ts b/...tend/src/app/library/components/consolidate-library/consolidate-library.component.spec.ts
@@ -118,10 +118,9 @@ describe('ConsolidateLibraryComponent', () => {
 
   describe('consolidating the library', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirm: Confirmation) => confirm.accept());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirm: Confirmation) => confirm.accept()
+      );
       spyOn(libraryAdaptor, 'consolidate');
       spyOn(authenticationAdaptor, 'setPreference');
     });

diff --git a/...-frontend/src/app/library/components/consolidate-library/consolidate-library.component.ts b/...-frontend/src/app/library/components/consolidate-library/consolidate-library.component.ts
@@ -75,7 +75,9 @@ export class ConsolidateLibraryComponent implements OnInit, OnDestroy {
       message: this.translateService.instant(
         'consolidate-library.confirm.message',
         {
-          deletePhysicalFiles: this.consolidationForm.controls['deletePhysicalFiles'].value
+          deletePhysicalFiles: this.consolidationForm.controls[
+            'deletePhysicalFiles'
+          ].value
         }
       ),
       accept: () => {

diff --git a/.../app/library/components/duplicates-page-toolbar/duplicates-page-toolbar.component.spec.ts b/.../app/library/components/duplicates-page-toolbar/duplicates-page-toolbar.component.spec.ts
@@ -117,10 +117,9 @@ describe('DuplicatesPageToolbarComponent', () => {
 
   describe('turn on blocked for selected pages', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirm: Confirmation) => confirm.accept());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirm: Confirmation) => confirm.accept()
+      );
       spyOn(duplicatesPagesAdaptors, 'setBlocking');
       component.selectedPages = PAGES;
       component.setBlocking(true);
@@ -136,10 +135,9 @@ describe('DuplicatesPageToolbarComponent', () => {
 
   describe('turn off blocked for selected pages', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirm: Confirmation) => confirm.accept());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirm: Confirmation) => confirm.accept()
+      );
       spyOn(duplicatesPagesAdaptors, 'setBlocking');
       component.selectedPages = PAGES;
       component.setBlocking(false);

diff --git a/comixed-frontend/src/app/library/pages/library-page/library-page.component.spec.ts b/comixed-frontend/src/app/library/pages/library-page/library-page.component.spec.ts
@@ -16,37 +16,37 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {RouterTestingModule} from '@angular/router/testing';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {TranslateModule} from '@ngx-translate/core';
-import {Store, StoreModule} from '@ngrx/store';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule } from '@ngx-translate/core';
+import { Store, StoreModule } from '@ngrx/store';
 import {
   AppState,
   LibraryAdaptor,
   LibraryDisplayAdaptor,
   ReadingListAdaptor,
   SelectionAdaptor
 } from 'app/library';
-import {ConfirmDialogModule} from 'primeng/confirmdialog';
-import {DataViewModule} from 'primeng/dataview';
-import {SliderModule} from 'primeng/slider';
-import {ConfirmationService, MessageService} from 'primeng/api';
-import {CheckboxModule} from 'primeng/checkbox';
-import {DropdownModule} from 'primeng/dropdown';
-import {PanelModule} from 'primeng/panel';
-import {SidebarModule} from 'primeng/sidebar';
-import {SplitButtonModule} from 'primeng/splitbutton';
-import {ScrollPanelModule} from 'primeng/scrollpanel';
-import {OverlayPanelModule} from 'primeng/overlaypanel';
-import {CardModule} from 'primeng/card';
-import {ComicListComponent} from 'app/library/components/comic-list/comic-list.component';
-import {ComicListItemComponent} from 'app/library/components/comic-list-item/comic-list-item.component';
-import {ComicGridItemComponent} from 'app/library/components/comic-grid-item/comic-grid-item.component';
-import {UserService} from 'app/services/user.service';
-import {UserServiceMock} from 'app/services/user.service.mock';
-import {LibraryPageComponent} from './library-page.component';
+import { ConfirmDialogModule } from 'primeng/confirmdialog';
+import { DataViewModule } from 'primeng/dataview';
+import { SliderModule } from 'primeng/slider';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { CheckboxModule } from 'primeng/checkbox';
+import { DropdownModule } from 'primeng/dropdown';
+import { PanelModule } from 'primeng/panel';
+import { SidebarModule } from 'primeng/sidebar';
+import { SplitButtonModule } from 'primeng/splitbutton';
+import { ScrollPanelModule } from 'primeng/scrollpanel';
+import { OverlayPanelModule } from 'primeng/overlaypanel';
+import { CardModule } from 'primeng/card';
+import { ComicListComponent } from 'app/library/components/comic-list/comic-list.component';
+import { ComicListItemComponent } from 'app/library/components/comic-list-item/comic-list-item.component';
+import { ComicGridItemComponent } from 'app/library/components/comic-grid-item/comic-grid-item.component';
+import { UserService } from 'app/services/user.service';
+import { UserServiceMock } from 'app/services/user.service.mock';
+import { LibraryPageComponent } from './library-page.component';
 import {
   ContextMenuModule,
   DialogModule,
@@ -55,22 +55,22 @@ import {
   TooltipModule,
   TreeModule
 } from 'primeng/primeng';
-import {UserModule} from 'app/user/user.module';
-import {HttpClientTestingModule} from '@angular/common/http/testing';
-import {EffectsModule} from '@ngrx/effects';
-import {BreadcrumbAdaptor} from 'app/adaptors/breadcrumb.adaptor';
-import {ComicListToolbarComponent} from 'app/library/components/comic-list-toolbar/comic-list-toolbar.component';
+import { UserModule } from 'app/user/user.module';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { EffectsModule } from '@ngrx/effects';
+import { BreadcrumbAdaptor } from 'app/adaptors/breadcrumb.adaptor';
+import { ComicListToolbarComponent } from 'app/library/components/comic-list-toolbar/comic-list-toolbar.component';
 import {
   LIBRARY_FEATURE_KEY,
   reducer
 } from 'app/library/reducers/library.reducer';
-import {LibraryEffects} from 'app/library/effects/library.effects';
-import {ComicsModule} from 'app/comics/comics.module';
-import {COMIC_1} from 'app/comics/comics.fixtures';
-import {LoggerModule} from '@angular-ru/logger';
-import {ConvertComicsSettingsComponent} from 'app/library/components/convert-comics-settings/convert-comics-settings.component';
-import {LibraryNavigationTreeComponent} from 'app/library/components/library-navigation-tree/library-navigation-tree.component';
-import {ReadingListEditComponent} from 'app/library/components/reading-list-edit/reading-list-edit.component';
+import { LibraryEffects } from 'app/library/effects/library.effects';
+import { ComicsModule } from 'app/comics/comics.module';
+import { COMIC_1 } from 'app/comics/comics.fixtures';
+import { LoggerModule } from '@angular-ru/logger';
+import { ConvertComicsSettingsComponent } from 'app/library/components/convert-comics-settings/convert-comics-settings.component';
+import { LibraryNavigationTreeComponent } from 'app/library/components/library-navigation-tree/library-navigation-tree.component';
+import { ReadingListEditComponent } from 'app/library/components/reading-list-edit/reading-list-edit.component';
 
 describe('LibraryPageComponent', () => {
   const COMIC = COMIC_1;
@@ -133,7 +133,7 @@ describe('LibraryPageComponent', () => {
         ConfirmationService,
         MessageService,
         UserService,
-        {provide: UserService, useClass: UserServiceMock}
+        { provide: UserService, useClass: UserServiceMock }
       ]
     }).compileComponents();