From b272191dc04fbf234b76f69adbf88b5534a8ed35 Mon Sep 17 00:00:00 2001 From: jliddev Date: Sat, 11 Sep 2021 10:58:10 -0500 Subject: [PATCH] More tidying Fix tests --- wowup-electron/src/app/app.component.spec.ts | 2 +- wowup-electron/src/app/app.module.ts | 4 ++-- .../addons/addon-detail/addon-detail.component.spec.ts | 2 +- .../addon-update-button.component.spec.ts | 2 +- .../addons/funding-button/funding-button.component.spec.ts | 2 +- .../install-from-protocol-dialog.component.spec.ts | 2 +- .../install-from-url-dialog.component.spec.ts | 2 +- .../my-addon-status-column.component.spec.ts | 2 +- .../my-addons-addon-cell.component.spec.ts | 2 +- .../common/alert-dialog/alert-dialog.component.spec.ts | 2 +- .../centered-snackbar/centered-snackbar.component.spec.ts | 2 +- .../common/confirm-dialog/confirm-dialog.component.spec.ts | 2 +- .../app/components/common/footer/footer.component.spec.ts | 2 +- .../common/progress-button/progress-button.component.spec.ts | 2 +- .../telemetry-dialog/telemetry-dialog.component.spec.ts | 2 +- .../components/common/titlebar/titlebar.component.spec.ts | 2 +- .../src/app/components/options/about/about.component.spec.ts | 2 +- .../options-addon-section.component.spec.ts | 2 +- .../options-app-section.component.spec.ts | 2 +- .../options-debug-section.component.spec.ts | 2 +- .../options-wow-section.component.spec.ts | 2 +- .../wow-client-options/wow-client-options.component.spec.ts | 2 +- .../progress-spinner/progress-spinner.component.scss | 2 -- .../progress-spinner/progress-spinner.component.spec.ts | 2 +- wowup-electron/src/app/modules/addons.module.ts | 5 +++-- wowup-electron/src/app/modules/common-ui.module.ts | 5 +++-- wowup-electron/src/app/{ => modules}/directive.module.ts | 2 +- wowup-electron/src/app/{ => modules}/mat-module.ts | 0 wowup-electron/src/app/modules/options.module.ts | 2 +- .../src/app/pages/get-addons/get-addons.component.scss | 2 -- .../src/app/pages/get-addons/get-addons.component.spec.ts | 2 +- wowup-electron/src/app/pages/home/home.component.spec.ts | 2 +- wowup-electron/src/app/pages/home/home.module.ts | 4 ++-- .../src/app/pages/my-addons/my-addons.component.scss | 2 -- .../src/app/pages/my-addons/my-addons.component.spec.ts | 2 +- .../src/app/pages/my-addons/my-addons.component.ts | 5 ----- wowup-electron/src/app/pages/options/options.component.scss | 2 -- .../src/app/pages/options/options.component.spec.ts | 2 +- wowup-electron/src/app/tests/test-helpers.ts | 2 +- 39 files changed, 39 insertions(+), 50 deletions(-) rename wowup-electron/src/app/{ => modules}/directive.module.ts (67%) rename wowup-electron/src/app/{ => modules}/mat-module.ts (100%) diff --git a/wowup-electron/src/app/app.component.spec.ts b/wowup-electron/src/app/app.component.spec.ts index 48dc7d01..5c182073 100644 --- a/wowup-electron/src/app/app.component.spec.ts +++ b/wowup-electron/src/app/app.component.spec.ts @@ -12,7 +12,7 @@ import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-transl import { AppComponent } from "./app.component"; import { httpLoaderFactory } from "./app.module"; import { AnimatedLogoComponent } from "./components/common/animated-logo/animated-logo.component"; -import { MatModule } from "./mat-module"; +import { MatModule } from "./modules/mat-module"; import { PreferenceChange } from "./models/wowup/preference-change"; import { ElectronService } from "./services"; import { AddonService } from "./services/addons/addon.service"; diff --git a/wowup-electron/src/app/app.module.ts b/wowup-electron/src/app/app.module.ts index 2bd3075c..8e07ecd4 100644 --- a/wowup-electron/src/app/app.module.ts +++ b/wowup-electron/src/app/app.module.ts @@ -15,10 +15,10 @@ import { GalleryModule } from "ng-gallery"; import { AppRoutingModule } from "./app-routing.module"; import { AppComponent } from "./app.component"; import { TitlebarComponent } from "./components/common/titlebar/titlebar.component"; -import { DirectiveModule } from "./directive.module"; +import { DirectiveModule } from "./modules/directive.module"; import { DefaultHeadersInterceptor } from "./interceptors/default-headers.interceptor"; import { ErrorHandlerInterceptor } from "./interceptors/error-handler-interceptor"; -import { MatModule } from "./mat-module"; +import { MatModule } from "./modules/mat-module"; import { HomeModule } from "./pages/home/home.module"; import { AnalyticsService } from "./services/analytics/analytics.service"; import { WowUpApiService } from "./services/wowup-api/wowup-api.service"; diff --git a/wowup-electron/src/app/components/addons/addon-detail/addon-detail.component.spec.ts b/wowup-electron/src/app/components/addons/addon-detail/addon-detail.component.spec.ts index 1287649a..4dfd84f3 100644 --- a/wowup-electron/src/app/components/addons/addon-detail/addon-detail.component.spec.ts +++ b/wowup-electron/src/app/components/addons/addon-detail/addon-detail.component.spec.ts @@ -11,7 +11,6 @@ import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-transl import { httpLoaderFactory } from "../../../app.module"; import { AddonViewModel } from "../../../business-objects/addon-view-model"; import { Addon } from "../../../../common/entities/addon"; -import { MatModule } from "../../../mat-module"; import { AddonUpdateEvent } from "../../../models/wowup/addon-update-event"; import { AddonService } from "../../../services/addons/addon.service"; import { SessionService } from "../../../services/session/session.service"; @@ -22,6 +21,7 @@ import { WowUpService } from "../../../services/wowup/wowup.service"; import { LinkService } from "../../../services/links/link.service"; import { GalleryModule } from "ng-gallery"; import { LightboxModule } from "ng-gallery/lightbox"; +import { MatModule } from "../../../modules/mat-module"; describe("AddonDetailComponent", () => { let dialogModel: AddonDetailModel; diff --git a/wowup-electron/src/app/components/addons/addon-update-button/addon-update-button.component.spec.ts b/wowup-electron/src/app/components/addons/addon-update-button/addon-update-button.component.spec.ts index 14859425..650b1671 100644 --- a/wowup-electron/src/app/components/addons/addon-update-button/addon-update-button.component.spec.ts +++ b/wowup-electron/src/app/components/addons/addon-update-button/addon-update-button.component.spec.ts @@ -8,7 +8,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { AddonUpdateEvent } from "../../../models/wowup/addon-update-event"; import { ElectronService } from "../../../services"; import { AddonService } from "../../../services/addons/addon.service"; diff --git a/wowup-electron/src/app/components/addons/funding-button/funding-button.component.spec.ts b/wowup-electron/src/app/components/addons/funding-button/funding-button.component.spec.ts index b3a24f02..1cc9fcf3 100644 --- a/wowup-electron/src/app/components/addons/funding-button/funding-button.component.spec.ts +++ b/wowup-electron/src/app/components/addons/funding-button/funding-button.component.spec.ts @@ -9,7 +9,7 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { FundingButtonComponent } from "./funding-button.component"; describe("FundingButtonComponent", () => { diff --git a/wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.spec.ts b/wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.spec.ts index f685233b..5fa08cfd 100644 --- a/wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.spec.ts @@ -6,7 +6,7 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { AddonService } from "../../../services/addons/addon.service"; import { IconService } from "../../../services/icons/icon.service"; import { SessionService } from "../../../services/session/session.service"; diff --git a/wowup-electron/src/app/components/addons/install-from-url-dialog/install-from-url-dialog.component.spec.ts b/wowup-electron/src/app/components/addons/install-from-url-dialog/install-from-url-dialog.component.spec.ts index 451f389b..6982ef7f 100644 --- a/wowup-electron/src/app/components/addons/install-from-url-dialog/install-from-url-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/addons/install-from-url-dialog/install-from-url-dialog.component.spec.ts @@ -7,7 +7,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { DownloadCountPipe } from "../../../pipes/download-count.pipe"; import { AddonService } from "../../../services/addons/addon.service"; import { SessionService } from "../../../services/session/session.service"; diff --git a/wowup-electron/src/app/components/addons/my-addon-status-column/my-addon-status-column.component.spec.ts b/wowup-electron/src/app/components/addons/my-addon-status-column/my-addon-status-column.component.spec.ts index 704b5e4f..57448b5c 100644 --- a/wowup-electron/src/app/components/addons/my-addon-status-column/my-addon-status-column.component.spec.ts +++ b/wowup-electron/src/app/components/addons/my-addon-status-column/my-addon-status-column.component.spec.ts @@ -7,7 +7,7 @@ import { MatDialog } from "@angular/material/dialog"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { AddonUpdateEvent } from "../../../models/wowup/addon-update-event"; import { AddonService } from "../../../services/addons/addon.service"; import { MyAddonStatusColumnComponent } from "./my-addon-status-column.component"; diff --git a/wowup-electron/src/app/components/addons/my-addons-addon-cell/my-addons-addon-cell.component.spec.ts b/wowup-electron/src/app/components/addons/my-addons-addon-cell/my-addons-addon-cell.component.spec.ts index 243e6eee..19bc5e5c 100644 --- a/wowup-electron/src/app/components/addons/my-addons-addon-cell/my-addons-addon-cell.component.spec.ts +++ b/wowup-electron/src/app/components/addons/my-addons-addon-cell/my-addons-addon-cell.component.spec.ts @@ -8,7 +8,7 @@ import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-transl import { Addon } from "../../../../common/entities/addon"; import { httpLoaderFactory } from "../../../app.module"; import { AddonViewModel } from "../../../business-objects/addon-view-model"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { SessionService } from "../../../services/session/session.service"; import { MyAddonsAddonCellComponent } from "./my-addons-addon-cell.component"; diff --git a/wowup-electron/src/app/components/common/alert-dialog/alert-dialog.component.spec.ts b/wowup-electron/src/app/components/common/alert-dialog/alert-dialog.component.spec.ts index cd92c0c3..0cbb006d 100644 --- a/wowup-electron/src/app/components/common/alert-dialog/alert-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/common/alert-dialog/alert-dialog.component.spec.ts @@ -7,7 +7,7 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { AlertDialogComponent } from "./alert-dialog.component"; describe("AlertDialogComponent", () => { diff --git a/wowup-electron/src/app/components/common/centered-snackbar/centered-snackbar.component.spec.ts b/wowup-electron/src/app/components/common/centered-snackbar/centered-snackbar.component.spec.ts index ed00412b..d29a0964 100644 --- a/wowup-electron/src/app/components/common/centered-snackbar/centered-snackbar.component.spec.ts +++ b/wowup-electron/src/app/components/common/centered-snackbar/centered-snackbar.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { MAT_SNACK_BAR_DATA } from "@angular/material/snack-bar"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { CenteredSnackbarComponent, CenteredSnackbarComponentData } from "./centered-snackbar.component"; describe("CenteredSnackbarComponent", () => { diff --git a/wowup-electron/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts b/wowup-electron/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts index e2709d42..585be54a 100644 --- a/wowup-electron/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts @@ -7,7 +7,7 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { ConfirmDialogComponent } from "./confirm-dialog.component"; describe("ConfirmDialogComponent", () => { diff --git a/wowup-electron/src/app/components/common/footer/footer.component.spec.ts b/wowup-electron/src/app/components/common/footer/footer.component.spec.ts index 895e8dbe..ac8c9d4a 100644 --- a/wowup-electron/src/app/components/common/footer/footer.component.spec.ts +++ b/wowup-electron/src/app/components/common/footer/footer.component.spec.ts @@ -11,7 +11,7 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { ElectronService } from "../../../services"; import { LinkService } from "../../../services/links/link.service"; import { SessionService } from "../../../services/session/session.service"; diff --git a/wowup-electron/src/app/components/common/progress-button/progress-button.component.spec.ts b/wowup-electron/src/app/components/common/progress-button/progress-button.component.spec.ts index af8ee851..297f48a5 100644 --- a/wowup-electron/src/app/components/common/progress-button/progress-button.component.spec.ts +++ b/wowup-electron/src/app/components/common/progress-button/progress-button.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { ProgressButtonComponent } from "./progress-button.component"; describe("ProgressButtonComponent", () => { diff --git a/wowup-electron/src/app/components/common/telemetry-dialog/telemetry-dialog.component.spec.ts b/wowup-electron/src/app/components/common/telemetry-dialog/telemetry-dialog.component.spec.ts index e55d74a0..f1a11483 100644 --- a/wowup-electron/src/app/components/common/telemetry-dialog/telemetry-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/common/telemetry-dialog/telemetry-dialog.component.spec.ts @@ -5,8 +5,8 @@ import { HttpClient, HttpClientModule } from "@angular/common/http"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; -import { MatModule } from "../../../mat-module"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; +import { MatModule } from "../../../modules/mat-module"; describe("TelemetryDialogComponent", () => { let component: TelemetryDialogComponent; diff --git a/wowup-electron/src/app/components/common/titlebar/titlebar.component.spec.ts b/wowup-electron/src/app/components/common/titlebar/titlebar.component.spec.ts index ff854b26..6f39e3d9 100644 --- a/wowup-electron/src/app/components/common/titlebar/titlebar.component.spec.ts +++ b/wowup-electron/src/app/components/common/titlebar/titlebar.component.spec.ts @@ -8,7 +8,7 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { ElectronService } from "../../../services"; import { WowUpService } from "../../../services/wowup/wowup.service"; import { TitlebarComponent } from "./titlebar.component"; diff --git a/wowup-electron/src/app/components/options/about/about.component.spec.ts b/wowup-electron/src/app/components/options/about/about.component.spec.ts index e58af9f3..99a8ffd3 100644 --- a/wowup-electron/src/app/components/options/about/about.component.spec.ts +++ b/wowup-electron/src/app/components/options/about/about.component.spec.ts @@ -7,7 +7,6 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; import { ElectronService } from "../../../services"; import { DialogFactory } from "../../../services/dialog/dialog.factory"; import { LinkService } from "../../../services/links/link.service"; @@ -15,6 +14,7 @@ import { SessionService } from "../../../services/session/session.service"; import { PatchNotesService } from "../../../services/wowup/patch-notes.service"; import { WowUpService } from "../../../services/wowup/wowup.service"; import { AboutComponent } from "./about.component"; +import { MatModule } from "../../../modules/mat-module"; describe("AboutComponent", () => { let component: AboutComponent; diff --git a/wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.spec.ts b/wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.spec.ts index d4460062..2bbf6e1e 100644 --- a/wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.spec.ts +++ b/wowup-electron/src/app/components/options/options-addon-section/options-addon-section.component.spec.ts @@ -1,7 +1,7 @@ import { HttpClientModule } from "@angular/common/http"; import { ComponentFixture, TestBed } from "@angular/core/testing"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; -import { MatModule } from "../../../mat-module"; +import { MatModule } from "../../../modules/mat-module"; import { AddonService } from "../../../services/addons/addon.service"; import { WowUpService } from "../../../services/wowup/wowup.service"; import { createTranslateModule } from "../../../utils/test.utils"; diff --git a/wowup-electron/src/app/components/options/options-app-section/options-app-section.component.spec.ts b/wowup-electron/src/app/components/options/options-app-section/options-app-section.component.spec.ts index 0082ffdc..0484c0e9 100644 --- a/wowup-electron/src/app/components/options/options-app-section/options-app-section.component.spec.ts +++ b/wowup-electron/src/app/components/options/options-app-section/options-app-section.component.spec.ts @@ -6,7 +6,6 @@ import { FormsModule } from "@angular/forms"; import { MatDialog } from "@angular/material/dialog"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { MatModule } from "../../../mat-module"; import { ElectronService } from "../../../services"; import { AddonService } from "../../../services/addons/addon.service"; import { AnalyticsService } from "../../../services/analytics/analytics.service"; @@ -16,6 +15,7 @@ import { WowUpService } from "../../../services/wowup/wowup.service"; import { ZoomService } from "../../../services/zoom/zoom.service"; import { createTranslateModule } from "../../../utils/test.utils"; import { OptionsAppSectionComponent } from "./options-app-section.component"; +import { MatModule } from "../../../modules/mat-module"; describe("OptionsAppSectionComponent", () => { let component: OptionsAppSectionComponent; diff --git a/wowup-electron/src/app/components/options/options-debug-section/options-debug-section.component.spec.ts b/wowup-electron/src/app/components/options/options-debug-section/options-debug-section.component.spec.ts index 5f242eb7..5404f0a3 100644 --- a/wowup-electron/src/app/components/options/options-debug-section/options-debug-section.component.spec.ts +++ b/wowup-electron/src/app/components/options/options-debug-section/options-debug-section.component.spec.ts @@ -6,8 +6,8 @@ import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-transl import { HttpClient, HttpClientModule } from "@angular/common/http"; import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; +import { MatModule } from "../../../modules/mat-module"; describe("OptionsDebugSectionComponent", () => { let component: OptionsDebugSectionComponent; diff --git a/wowup-electron/src/app/components/options/options-wow-section/options-wow-section.component.spec.ts b/wowup-electron/src/app/components/options/options-wow-section/options-wow-section.component.spec.ts index 343da36d..67054ce8 100644 --- a/wowup-electron/src/app/components/options/options-wow-section/options-wow-section.component.spec.ts +++ b/wowup-electron/src/app/components/options/options-wow-section/options-wow-section.component.spec.ts @@ -10,7 +10,6 @@ import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-transl import { WowClientType } from "../../../../common/warcraft/wow-client-type"; import { AddonChannelType } from "../../../../common/wowup/models"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; import { InstalledProduct } from "../../../models/warcraft/installed-product"; import { WowUpReleaseChannelType } from "../../../models/wowup/wowup-release-channel-type"; import { WarcraftService } from "../../../services/warcraft/warcraft.service"; @@ -18,6 +17,7 @@ import { WowUpService } from "../../../services/wowup/wowup.service"; import { WowClientOptionsComponent } from "../wow-client-options/wow-client-options.component"; import { OptionsWowSectionComponent } from "./options-wow-section.component"; import { WarcraftInstallationService } from "../../../services/warcraft/warcraft-installation.service"; +import { MatModule } from "../../../modules/mat-module"; describe("OptionsWowSectionComponent", () => { let component: OptionsWowSectionComponent; diff --git a/wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.spec.ts b/wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.spec.ts index 0aaad842..e7e3dfcf 100644 --- a/wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.spec.ts +++ b/wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.spec.ts @@ -7,7 +7,6 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; -import { MatModule } from "../../../mat-module"; import { WowClientType } from "../../../../common/warcraft/wow-client-type"; import { WowClientOptionsComponent } from "./wow-client-options.component"; import { FormsModule } from "@angular/forms"; @@ -17,6 +16,7 @@ import { WarcraftService } from "../../../services/warcraft/warcraft.service"; import { mockPreload } from "../../../tests/test-helpers"; import { SessionService } from "../../../services/session/session.service"; import { BehaviorSubject, Observable } from "rxjs"; +import { MatModule } from "../../../modules/mat-module"; describe("WowClientOptionsComponent", () => { let component: WowClientOptionsComponent; diff --git a/wowup-electron/src/app/components/progress-spinner/progress-spinner.component.scss b/wowup-electron/src/app/components/progress-spinner/progress-spinner.component.scss index d6887ba5..52feb765 100644 --- a/wowup-electron/src/app/components/progress-spinner/progress-spinner.component.scss +++ b/wowup-electron/src/app/components/progress-spinner/progress-spinner.component.scss @@ -1,5 +1,3 @@ -@import "../../../variables.scss"; - .busy-container { display: flex; width: 100%; diff --git a/wowup-electron/src/app/components/progress-spinner/progress-spinner.component.spec.ts b/wowup-electron/src/app/components/progress-spinner/progress-spinner.component.spec.ts index 8219ef90..c5cc81b0 100644 --- a/wowup-electron/src/app/components/progress-spinner/progress-spinner.component.spec.ts +++ b/wowup-electron/src/app/components/progress-spinner/progress-spinner.component.spec.ts @@ -5,8 +5,8 @@ import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-transl import { httpLoaderFactory } from "../../app.module"; import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; -import { MatModule } from "../../mat-module"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; +import { MatModule } from "../../modules/mat-module"; describe("ProgressSpinnerComponent", () => { let component: ProgressSpinnerComponent; diff --git a/wowup-electron/src/app/modules/addons.module.ts b/wowup-electron/src/app/modules/addons.module.ts index 367a81eb..f3ce6ba7 100644 --- a/wowup-electron/src/app/modules/addons.module.ts +++ b/wowup-electron/src/app/modules/addons.module.ts @@ -7,7 +7,7 @@ import { AddonDetailComponent } from "../components/addons/addon-detail/addon-de import { AddonInstallButtonComponent } from "../components/addons/addon-install-button/addon-install-button.component"; import { AddonThumbnailComponent } from "../components/addons/addon-thumbnail/addon-thumbnail.component"; import { DateTooltipCellComponent } from "../components/addons/date-tooltip-cell/date-tooltip-cell.component"; -import { MatModule } from "../mat-module"; +import { MatModule } from "./mat-module"; import { CommonUiModule } from "./common-ui.module"; import { PipesModule } from "./pipes.module"; import { FundingButtonComponent } from "../components/addons/funding-button/funding-button.component"; @@ -18,6 +18,7 @@ import { MyAddonStatusColumnComponent } from "../components/addons/my-addon-stat import { InstallFromProtocolDialogComponent } from "../components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component"; import { MyAddonsAddonCellComponent } from "../components/addons/my-addons-addon-cell/my-addons-addon-cell.component"; import { InstallFromUrlDialogComponent } from "../components/addons/install-from-url-dialog/install-from-url-dialog.component"; +import { DirectiveModule } from "./directive.module"; @NgModule({ declarations: [ @@ -35,7 +36,7 @@ import { InstallFromUrlDialogComponent } from "../components/addons/install-from MyAddonsAddonCellComponent, InstallFromUrlDialogComponent, ], - imports: [CommonModule, TranslateModule, MatModule, CommonUiModule, PipesModule, LightboxModule], + imports: [CommonModule, TranslateModule, MatModule, CommonUiModule, PipesModule, DirectiveModule, LightboxModule], exports: [ AddonUpdateButtonComponent, AddonDetailComponent, diff --git a/wowup-electron/src/app/modules/common-ui.module.ts b/wowup-electron/src/app/modules/common-ui.module.ts index c490199c..d7927785 100644 --- a/wowup-electron/src/app/modules/common-ui.module.ts +++ b/wowup-electron/src/app/modules/common-ui.module.ts @@ -1,5 +1,6 @@ import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; +import { FormsModule } from "@angular/forms"; import { TranslateModule } from "@ngx-translate/core"; import { AlertDialogComponent } from "../components/common/alert-dialog/alert-dialog.component"; import { AnimatedLogoComponent } from "../components/common/animated-logo/animated-logo.component"; @@ -11,7 +12,7 @@ import { PatchNotesDialogComponent } from "../components/common/patch-notes-dial import { ProgressButtonComponent } from "../components/common/progress-button/progress-button.component"; import { TelemetryDialogComponent } from "../components/common/telemetry-dialog/telemetry-dialog.component"; import { ProgressSpinnerComponent } from "../components/progress-spinner/progress-spinner.component"; -import { MatModule } from "../mat-module"; +import { MatModule } from "./mat-module"; @NgModule({ declarations: [ @@ -27,7 +28,7 @@ import { MatModule } from "../mat-module"; CellWrapTextComponent, CenteredSnackbarComponent, ], - imports: [CommonModule, TranslateModule, MatModule], + imports: [CommonModule, FormsModule, TranslateModule, MatModule], exports: [ ProgressSpinnerComponent, ProgressButtonComponent, diff --git a/wowup-electron/src/app/directive.module.ts b/wowup-electron/src/app/modules/directive.module.ts similarity index 67% rename from wowup-electron/src/app/directive.module.ts rename to wowup-electron/src/app/modules/directive.module.ts index 035632b9..f50f93fe 100644 --- a/wowup-electron/src/app/directive.module.ts +++ b/wowup-electron/src/app/modules/directive.module.ts @@ -1,5 +1,5 @@ import { NgModule } from "@angular/core"; -import { ExternalLinkDirective } from "./directives/external-link.directive"; +import { ExternalLinkDirective } from "../directives/external-link.directive"; @NgModule({ declarations: [ExternalLinkDirective], diff --git a/wowup-electron/src/app/mat-module.ts b/wowup-electron/src/app/modules/mat-module.ts similarity index 100% rename from wowup-electron/src/app/mat-module.ts rename to wowup-electron/src/app/modules/mat-module.ts diff --git a/wowup-electron/src/app/modules/options.module.ts b/wowup-electron/src/app/modules/options.module.ts index 57c460f1..b0a3bdb3 100644 --- a/wowup-electron/src/app/modules/options.module.ts +++ b/wowup-electron/src/app/modules/options.module.ts @@ -11,7 +11,7 @@ import { OptionsDebugSectionComponent } from "../components/options/options-debu import { OptionsWowSectionComponent } from "../components/options/options-wow-section/options-wow-section.component"; import { WowClientOptionsComponent } from "../components/options/wow-client-options/wow-client-options.component"; import { WtfExplorerComponent } from "../components/options/wtf-explorer/wtf-explorer.component"; -import { MatModule } from "../mat-module"; +import { MatModule } from "./mat-module"; import { PipesModule } from "./pipes.module"; @NgModule({ diff --git a/wowup-electron/src/app/pages/get-addons/get-addons.component.scss b/wowup-electron/src/app/pages/get-addons/get-addons.component.scss index dc4ac1ad..56d23ed9 100644 --- a/wowup-electron/src/app/pages/get-addons/get-addons.component.scss +++ b/wowup-electron/src/app/pages/get-addons/get-addons.component.scss @@ -1,5 +1,3 @@ -@import "../../../variables.scss"; - .tab-container { display: flex; flex-direction: column; diff --git a/wowup-electron/src/app/pages/get-addons/get-addons.component.spec.ts b/wowup-electron/src/app/pages/get-addons/get-addons.component.spec.ts index 4a9b5104..b8ccb30e 100644 --- a/wowup-electron/src/app/pages/get-addons/get-addons.component.spec.ts +++ b/wowup-electron/src/app/pages/get-addons/get-addons.component.spec.ts @@ -10,7 +10,6 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../app.module"; -import { MatModule } from "../../mat-module"; import { WowClientType } from "../../../common/warcraft/wow-client-type"; import { ElectronService } from "../../services"; import { AddonService } from "../../services/addons/addon.service"; @@ -23,6 +22,7 @@ import { SnackbarService } from "../../services/snackbar/snackbar.service"; import { WarcraftInstallationService } from "../../services/warcraft/warcraft-installation.service"; import { DownloadCountPipe } from "../../pipes/download-count.pipe"; import { RelativeDurationPipe } from "../../pipes/relative-duration-pipe"; +import { MatModule } from "../../modules/mat-module"; describe("GetAddonsComponent", () => { let component: GetAddonsComponent; diff --git a/wowup-electron/src/app/pages/home/home.component.spec.ts b/wowup-electron/src/app/pages/home/home.component.spec.ts index 101fe3a1..003939e1 100644 --- a/wowup-electron/src/app/pages/home/home.component.spec.ts +++ b/wowup-electron/src/app/pages/home/home.component.spec.ts @@ -11,7 +11,6 @@ import { BehaviorSubject, Observable, Subject } from "rxjs"; import { HomeComponent } from "./home.component"; import { MatSnackBar } from "@angular/material/snack-bar"; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; -import { MatModule } from "../../mat-module"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { AddonScanError, AddonSyncError } from "../../errors"; import { WarcraftInstallationService } from "../../services/warcraft/warcraft-installation.service"; @@ -19,6 +18,7 @@ import { DialogFactory } from "../../services/dialog/dialog.factory"; import { AddonUpdateEvent } from "../../models/wowup/addon-update-event"; import { GalleryModule } from "ng-gallery"; import { LightboxModule } from "ng-gallery/lightbox"; +import { MatModule } from "../../modules/mat-module"; describe("HomeComponent", () => { let electronService: ElectronService; diff --git a/wowup-electron/src/app/pages/home/home.module.ts b/wowup-electron/src/app/pages/home/home.module.ts index aa193e01..b7be8eed 100644 --- a/wowup-electron/src/app/pages/home/home.module.ts +++ b/wowup-electron/src/app/pages/home/home.module.ts @@ -9,8 +9,8 @@ import { GetAddonStatusColumnComponent } from "../../components/addons/get-addon import { PotentialAddonTableColumnComponent } from "../../components/addons/potential-addon-table-column/potential-addon-table-column.component"; import { TableContextHeaderCellComponent } from "../../components/addons/table-context-header-cell/table-context-header-cell.component"; import { NewsPanelComponent } from "../../components/news-panel/news-panel.component"; -import { DirectiveModule } from "../../directive.module"; -import { MatModule } from "../../mat-module"; +import { DirectiveModule } from "../../modules/directive.module"; +import { MatModule } from "../../modules/mat-module"; import { AddonsModule } from "../../modules/addons.module"; import { CommonUiModule } from "../../modules/common-ui.module"; import { OptionsModule } from "../../modules/options.module"; diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.scss b/wowup-electron/src/app/pages/my-addons/my-addons.component.scss index 30b3442d..cf8bd045 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.scss +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.scss @@ -1,5 +1,3 @@ -@import "../../../variables.scss"; - .wu-ag-table { width: 100%; height: calc(100% - 72px); diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.spec.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.spec.ts index 9c4d2fc2..37475f0e 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.spec.ts +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.spec.ts @@ -10,7 +10,6 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../app.module"; -import { MatModule } from "../../mat-module"; import { WowClientType } from "../../../common/warcraft/wow-client-type"; import { AddonUpdateEvent } from "../../models/wowup/addon-update-event"; import { SortOrder } from "../../models/wowup/sort-order"; @@ -26,6 +25,7 @@ import { WarcraftInstallationService } from "../../services/warcraft/warcraft-in import { RelativeDurationPipe } from "../../pipes/relative-duration-pipe"; import { PushService } from "../../services/push/push.service"; import { InvertBoolPipe } from "../../pipes/inverse-bool.pipe"; +import { MatModule } from "../../modules/mat-module"; export class MockElementRef extends ElementRef { public constructor() { diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts index e9997bd3..1a3e78fc 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts @@ -428,11 +428,6 @@ export class MyAddonsComponent implements OnInit, OnDestroy, AfterViewInit { return from(this.lazyLoad()).pipe( first(), - tap(() => console.debug("TAP IT")), - // delay(400), - // map(() => { - // this.redrawRows(); - // }), catchError((e) => { console.error(e); return of(undefined); diff --git a/wowup-electron/src/app/pages/options/options.component.scss b/wowup-electron/src/app/pages/options/options.component.scss index 5f6b5a83..8e94706d 100644 --- a/wowup-electron/src/app/pages/options/options.component.scss +++ b/wowup-electron/src/app/pages/options/options.component.scss @@ -1,5 +1,3 @@ -@import "../../../variables.scss"; - .tab-container { display: flex; align-items: center; diff --git a/wowup-electron/src/app/pages/options/options.component.spec.ts b/wowup-electron/src/app/pages/options/options.component.spec.ts index 4bc65dc9..d1809a59 100644 --- a/wowup-electron/src/app/pages/options/options.component.spec.ts +++ b/wowup-electron/src/app/pages/options/options.component.spec.ts @@ -7,8 +7,8 @@ import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-transl import { httpLoaderFactory } from "../../app.module"; import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; -import { MatModule } from "../../mat-module"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; +import { MatModule } from "../../modules/mat-module"; describe("OptionsComponent", () => { let component: OptionsComponent; diff --git a/wowup-electron/src/app/tests/test-helpers.ts b/wowup-electron/src/app/tests/test-helpers.ts index b8c99268..7d4f851d 100644 --- a/wowup-electron/src/app/tests/test-helpers.ts +++ b/wowup-electron/src/app/tests/test-helpers.ts @@ -3,7 +3,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { TranslateHttpLoader } from "@ngx-translate/http-loader"; import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; -import { MatModule } from "../mat-module"; +import { MatModule } from "../modules/mat-module"; export function mockPreload(): void { window.wowup = {