Merge pull request #1015 from WowUp/code-cleanup

More tidying
This commit is contained in:
jliddev
2021-09-13 09:01:58 -05:00
committed by GitHub
39 changed files with 39 additions and 50 deletions

View File

@@ -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";

View File

@@ -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";

View File

@@ -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;

View File

@@ -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";

View File

@@ -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", () => {

View File

@@ -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";

View File

@@ -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";

View File

@@ -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";

View File

@@ -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";

View File

@@ -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", () => {

View File

@@ -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", () => {

View File

@@ -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", () => {

View File

@@ -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";

View File

@@ -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", () => {

View File

@@ -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;

View File

@@ -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";

View File

@@ -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;

View File

@@ -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";

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,5 +1,3 @@
@import "../../../variables.scss";
.busy-container {
display: flex;
width: 100%;

View File

@@ -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;

View File

@@ -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,

View File

@@ -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,

View File

@@ -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],

View File

@@ -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({

View File

@@ -1,5 +1,3 @@
@import "../../../variables.scss";
.tab-container {
display: flex;
flex-direction: column;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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";

View File

@@ -1,5 +1,3 @@
@import "../../../variables.scss";
.wu-ag-table {
width: 100%;
height: calc(100% - 72px);

View File

@@ -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() {

View File

@@ -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);

View File

@@ -1,5 +1,3 @@
@import "../../../variables.scss";
.tab-container {
display: flex;
align-items: center;

View File

@@ -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;

View File

@@ -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 = {