diff --git a/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.scss b/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.scss index 962255efa..9ade72b01 100644 --- a/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.scss +++ b/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.scss @@ -1,7 +1,3 @@ :host { display: block; -} - -.item { - --background: var(--ion-color-medium-shade); -} +} \ No newline at end of file diff --git a/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.ts b/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.ts index a861ec493..549b0b581 100644 --- a/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.ts +++ b/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.ts @@ -4,47 +4,47 @@ import { EventEmitter, Input, Output, -} from "@angular/core"; -import { ItemReorderEventDetail } from "@ionic/core"; -import { PackageDataEntry } from "src/app/services/patch-db/data-model"; -import { map } from "rxjs/operators"; +} from '@angular/core' +import { ItemReorderEventDetail } from '@ionic/core' +import { PackageDataEntry } from 'src/app/services/patch-db/data-model' +import { map } from 'rxjs/operators' import { ConnectionFailure, ConnectionService, -} from "src/app/services/connection.service"; +} from 'src/app/services/connection.service' @Component({ - selector: "app-list-reorder", - templateUrl: "app-list-reorder.component.html", - styleUrls: ["app-list-reorder.component.scss"], + selector: 'app-list-reorder', + templateUrl: 'app-list-reorder.component.html', + styleUrls: ['app-list-reorder.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) export class AppListReorderComponent { @Input() - reordering = false; + reordering = false @Input() - pkgs: readonly PackageDataEntry[] = []; + pkgs: readonly PackageDataEntry[] = [] @Output() - readonly reorderingChange = new EventEmitter(); + readonly reorderingChange = new EventEmitter() @Output() - readonly pkgsChange = new EventEmitter(); + readonly pkgsChange = new EventEmitter() readonly connectionFailure$ = this.connectionService .watchFailure$() - .pipe(map((failure) => failure !== ConnectionFailure.None)); + .pipe(map((failure) => failure !== ConnectionFailure.None)) - constructor(private readonly connectionService: ConnectionService) {} + constructor (private readonly connectionService: ConnectionService) { } - toggle() { - this.reordering = !this.reordering; - this.reorderingChange.emit(this.reordering); + toggle () { + this.reordering = !this.reordering + this.reorderingChange.emit(this.reordering) } - reorder({ detail }: CustomEvent): void { - this.pkgs = detail.complete([...this.pkgs]); - this.pkgsChange.emit(this.pkgs); + reorder ({ detail }: CustomEvent): void { + this.pkgs = detail.complete([...this.pkgs]) + this.pkgsChange.emit(this.pkgs) } } diff --git a/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/ui/src/app/pages/apps-routes/app-show/app-show.page.ts index 02de67c17..d8cd4be16 100644 --- a/ui/src/app/pages/apps-routes/app-show/app-show.page.ts +++ b/ui/src/app/pages/apps-routes/app-show/app-show.page.ts @@ -15,7 +15,10 @@ import { ErrorToastService } from 'src/app/services/error-toast.service' import { AppConfigPage } from 'src/app/modals/app-config/app-config.page' import { filter } from 'rxjs/operators' import { MarkdownPage } from 'src/app/modals/markdown/markdown.page' +<<<<<<< HEAD import { Pipe, PipeTransform } from '@angular/core' +======= +>>>>>>> 19161705 (drew water edits) import { packageLoadingProgress, ProgressData } from 'src/app/util/package-loading-progress' @Component({