From e6026cfd279fc575d8ae269c0d14b803410346a9 Mon Sep 17 00:00:00 2001 From: trivernis Date: Fri, 5 Nov 2021 21:34:14 +0100 Subject: [PATCH] Cleanup code Signed-off-by: trivernis --- mediarepo-ui/src/app/app.component.spec.ts | 9 +- mediarepo-ui/src/app/app.component.ts | 5 +- mediarepo-ui/src/app/app.module.ts | 14 +-- .../confirm-dialog.component.html | 10 +-- .../confirm-dialog.component.spec.ts | 10 +-- .../confirm-dialog.component.ts | 2 +- .../content-aware-image.component.html | 6 +- .../content-aware-image.component.spec.ts | 10 +-- .../content-aware-image.component.ts | 5 +- .../file-gallery-entry.component.html | 2 +- .../file-gallery-entry.component.scss | 2 +- .../file-gallery-entry.component.spec.ts | 10 +-- .../file-gallery-entry.component.ts | 13 +-- .../file-gallery/file-gallery.component.html | 28 +++--- .../file-gallery/file-gallery.component.scss | 1 + .../file-gallery.component.spec.ts | 10 +-- .../file-gallery/file-gallery.component.ts | 31 ++++--- .../file-grid-entry.component.html | 5 +- .../file-grid-entry.component.spec.ts | 10 +-- .../file-grid-entry.component.ts | 85 ++++++++++--------- .../file-grid/file-grid.component.html | 6 +- .../file-grid/file-grid.component.spec.ts | 10 +-- .../file-grid/file-grid.component.ts | 14 +-- .../file-search.component-theme.scss | 10 +-- .../file-search/file-search.component.html | 18 ++-- .../file-search/file-search.component.spec.ts | 10 +-- .../file-search/file-search.component.ts | 28 +++--- .../filter-dialog.component.html | 74 +++++++++------- .../filter-dialog.component.scss | 1 + .../filter-dialog.component.spec.ts | 10 +-- .../filter-dialog/filter-dialog.component.ts | 3 +- .../tag-item/tag-item.component.html | 4 +- .../tag-item/tag-item.component.spec.ts | 10 +-- .../components/tag-item/tag-item.component.ts | 5 +- mediarepo-ui/src/app/models/File.ts | 3 +- mediarepo-ui/src/app/models/Repository.ts | 3 +- mediarepo-ui/src/app/models/SortKey.ts | 10 ++- mediarepo-ui/src/app/models/Tag.ts | 5 +- mediarepo-ui/src/app/models/TagQuery.ts | 2 +- .../files-tab-sidebar.component.html | 11 +-- .../files-tab-sidebar.component.spec.ts | 10 +-- .../files-tab-sidebar.component.ts | 7 +- .../home/files-tab/files-tab.component.html | 17 ++-- .../files-tab/files-tab.component.spec.ts | 10 +-- .../home/files-tab/files-tab.component.ts | 8 +- .../src/app/pages/home/home.component.spec.ts | 10 +-- .../src/app/pages/home/home.component.ts | 3 +- .../add-repository-dialog.component.html | 44 +++++----- .../add-repository-dialog.component.spec.ts | 10 +-- .../add-repository-dialog.component.ts | 28 +++--- .../repositories-tab.component.html | 2 +- .../repositories-tab.component.scss | 1 + .../repositories-tab.component.spec.ts | 10 +-- .../repositories-tab.component.ts | 2 +- .../repository-card.component.html | 28 ++++-- .../repository-card.component.scss | 2 + .../repository-card.component.spec.ts | 10 +-- .../error-broker/error-broker.service.spec.ts | 4 +- .../error-broker/error-broker.service.ts | 5 +- .../app/services/file/file.service.spec.ts | 4 +- .../src/app/services/file/file.service.ts | 14 +-- .../repository/repository.service.spec.ts | 4 +- .../services/repository/repository.service.ts | 19 +++-- .../src/app/services/tag/tag.service.spec.ts | 4 +- .../src/app/services/tag/tag.service.ts | 16 ++-- mediarepo-ui/src/index.html | 8 +- mediarepo-ui/src/main.ts | 8 +- mediarepo-ui/src/polyfills.ts | 2 +- mediarepo-ui/src/styles.scss | 1 + mediarepo-ui/src/test.ts | 4 +- 70 files changed, 440 insertions(+), 360 deletions(-) diff --git a/mediarepo-ui/src/app/app.component.spec.ts b/mediarepo-ui/src/app/app.component.spec.ts index 5478d30..c9bd039 100644 --- a/mediarepo-ui/src/app/app.component.spec.ts +++ b/mediarepo-ui/src/app/app.component.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; -import { AppComponent } from './app.component'; +import {TestBed} from '@angular/core/testing'; +import {RouterTestingModule} from '@angular/router/testing'; +import {AppComponent} from './app.component'; describe('AppComponent', () => { beforeEach(async () => { @@ -30,6 +30,7 @@ describe('AppComponent', () => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.nativeElement as HTMLElement; - expect(compiled.querySelector('.content span')?.textContent).toContain('mediarepo-ui app is running!'); + expect(compiled.querySelector('.content span')?.textContent) + .toContain('mediarepo-ui app is running!'); }); }); diff --git a/mediarepo-ui/src/app/app.component.ts b/mediarepo-ui/src/app/app.component.ts index 15abd0b..dee33bc 100644 --- a/mediarepo-ui/src/app/app.component.ts +++ b/mediarepo-ui/src/app/app.component.ts @@ -9,7 +9,7 @@ import {ErrorBrokerService} from "./services/error-broker/error-broker.service"; templateUrl: './app.component.html', styleUrls: ['./app.component.scss'] }) -export class AppComponent implements OnInit{ +export class AppComponent implements OnInit { title = 'mediarepo-ui'; constructor( @@ -21,7 +21,8 @@ export class AppComponent implements OnInit{ } async ngOnInit() { - this.errorBroker.errorCb = (err: { message: string }) => this.showError(err); + this.errorBroker.errorCb = (err: { message: string }) => this.showError( + err); this.errorBroker.infoCb = (info: string) => this.showInfo(info); await this.repoService.loadRepositories(); } diff --git a/mediarepo-ui/src/app/app.module.ts b/mediarepo-ui/src/app/app.module.ts index aab9560..820afba 100644 --- a/mediarepo-ui/src/app/app.module.ts +++ b/mediarepo-ui/src/app/app.module.ts @@ -34,21 +34,21 @@ import {MatRippleModule} from "@angular/material/core"; import {FilterDialogComponent} from './components/file-search/filter-dialog/filter-dialog.component'; import {MatDialogModule} from "@angular/material/dialog"; import {MatSelectModule} from "@angular/material/select"; -import { FileGalleryComponent } from './components/file-gallery/file-gallery.component'; -import { FileGalleryEntryComponent } from './components/file-gallery/file-gallery-entry/file-gallery-entry.component'; +import {FileGalleryComponent} from './components/file-gallery/file-gallery.component'; +import {FileGalleryEntryComponent} from './components/file-gallery/file-gallery-entry/file-gallery-entry.component'; import {MatProgressSpinnerModule} from "@angular/material/progress-spinner"; import {BlockUIModule} from "primeng/blockui"; import {PanelModule} from "primeng/panel"; import {DragDropModule} from "@angular/cdk/drag-drop"; -import { ContentAwareImageComponent } from './components/content-aware-image/content-aware-image.component'; +import {ContentAwareImageComponent} from './components/content-aware-image/content-aware-image.component'; import {MatSliderModule} from "@angular/material/slider"; -import { AddRepositoryDialogComponent } from './pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component'; +import {AddRepositoryDialogComponent} from './pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component'; import {MatTooltipModule} from "@angular/material/tooltip"; import {MatMenuModule} from "@angular/material/menu"; -import { ConfirmDialogComponent } from './components/confirm-dialog/confirm-dialog.component'; -import { FilesTabSidebarComponent } from './pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component'; +import {ConfirmDialogComponent} from './components/confirm-dialog/confirm-dialog.component'; +import {FilesTabSidebarComponent} from './pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component'; import {MatExpansionModule} from "@angular/material/expansion"; -import { TagItemComponent } from './components/tag-item/tag-item.component'; +import {TagItemComponent} from './components/tag-item/tag-item.component'; @NgModule({ declarations: [ diff --git a/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.html b/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.html index 3168e8b..f0821c4 100644 --- a/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.html +++ b/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.html @@ -1,10 +1,10 @@

-{{title}} + {{title}}

-{{message}} + {{message}}
-
- - +
+ +
diff --git a/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.spec.ts b/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.spec.ts index fe08dc5..6a26a12 100644 --- a/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.spec.ts +++ b/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { ConfirmDialogComponent } from './confirm-dialog.component'; +import {ConfirmDialogComponent} from './confirm-dialog.component'; describe('ConfirmDialogComponent', () => { let component: ConfirmDialogComponent; @@ -8,9 +8,9 @@ describe('ConfirmDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ConfirmDialogComponent ] - }) - .compileComponents(); + declarations: [ConfirmDialogComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.ts b/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.ts index 0c2bda6..ad8fb39 100644 --- a/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.ts +++ b/mediarepo-ui/src/app/components/confirm-dialog/confirm-dialog.component.ts @@ -1,4 +1,4 @@ -import {Component, Inject, OnInit} from '@angular/core'; +import {Component, Inject} from '@angular/core'; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; import {ThemePalette} from "@angular/material/core"; diff --git a/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.html b/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.html index 5269d90..20718ae 100644 --- a/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.html +++ b/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.html @@ -1,5 +1,5 @@ -
- +
diff --git a/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.spec.ts b/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.spec.ts index 0aaef2b..cdb136d 100644 --- a/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.spec.ts +++ b/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { ContentAwareImageComponent } from './content-aware-image.component'; +import {ContentAwareImageComponent} from './content-aware-image.component'; describe('ContentAwareImageComponent', () => { let component: ContentAwareImageComponent; @@ -8,9 +8,9 @@ describe('ContentAwareImageComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ContentAwareImageComponent ] - }) - .compileComponents(); + declarations: [ContentAwareImageComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.ts b/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.ts index 0ba383e..81b5bbb 100644 --- a/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.ts +++ b/mediarepo-ui/src/app/components/content-aware-image/content-aware-image.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, OnInit} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {SafeResourceUrl} from "@angular/platform-browser"; @Component({ @@ -14,7 +14,8 @@ export class ContentAwareImageComponent { scaleWidth = false; - constructor() { } + constructor() { + } /** * Fits the image into the container diff --git a/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.html b/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.html index 1324653..08ea2de 100644 --- a/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.html +++ b/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.scss b/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.scss index ee1eebc..57c7b26 100644 --- a/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.scss +++ b/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.scss @@ -12,7 +12,7 @@ app-content-aware-image { padding: 10px; border-radius: 5px; cursor: pointer; - user-select:none; + user-select: none; } .image-wrapper.selected { diff --git a/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts b/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts index 5d0579b..d13c5d1 100644 --- a/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts +++ b/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { FileGalleryEntryComponent } from './file-gallery-entry.component'; +import {FileGalleryEntryComponent} from './file-gallery-entry.component'; describe('FileGalleryEntryComponent', () => { let component: FileGalleryEntryComponent; @@ -8,9 +8,9 @@ describe('FileGalleryEntryComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FileGalleryEntryComponent ] - }) - .compileComponents(); + declarations: [FileGalleryEntryComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.ts b/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.ts index 242beed..72f74a2 100644 --- a/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.ts +++ b/mediarepo-ui/src/app/components/file-gallery/file-gallery-entry/file-gallery-entry.component.ts @@ -1,10 +1,11 @@ import { Component, EventEmitter, - Input, OnChanges, - OnDestroy, + Input, + OnChanges, OnInit, - Output, SimpleChanges + Output, + SimpleChanges } from '@angular/core'; import {File} from "../../../models/File"; import {FileService} from "../../../services/file/file.service"; @@ -25,7 +26,8 @@ export class FileGalleryEntryComponent implements OnInit, OnChanges { private cachedFile: File | undefined; - constructor(private fileService: FileService, private errorBroker: ErrorBrokerService) { } + constructor(private fileService: FileService, private errorBroker: ErrorBrokerService) { + } async ngOnChanges(changes: SimpleChanges): Promise { if (changes["file"] && (!this.cachedFile || this.file.data.hash !== this.cachedFile!.hash)) { // handle changes to the file when the component is not destroyed @@ -46,7 +48,8 @@ export class FileGalleryEntryComponent implements OnInit, OnChanges { try { const hash = this.file.data.hash; const thumbnails = await this.fileService.getThumbnails(hash); - let thumbnail = thumbnails.find(t => (t.height > 250 || t.width > 250) && (t.height < 500 && t.width < 500)); + let thumbnail = thumbnails.find( + t => (t.height > 250 || t.width > 250) && (t.height < 500 && t.width < 500)); thumbnail = thumbnail ?? thumbnails[0]; if (!thumbnail) { diff --git a/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.html b/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.html index 45ff592..6db7787 100644 --- a/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.html +++ b/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.html @@ -1,22 +1,24 @@
- -
-
+
+
- +
- -
-
-
+
+
@@ -24,10 +26,10 @@
- +
- +
diff --git a/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.scss b/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.scss index e21ad47..82b0004 100644 --- a/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.scss +++ b/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.scss @@ -61,6 +61,7 @@ app-content-aware-image { width: 100%; overflow: hidden; display: flex; + mat-progress-spinner { margin: auto; } diff --git a/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.spec.ts b/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.spec.ts index 7b8f6e3..2e94f1a 100644 --- a/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.spec.ts +++ b/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { FileGalleryComponent } from './file-gallery.component'; +import {FileGalleryComponent} from './file-gallery.component'; describe('FileGalleryComponent', () => { let component: FileGalleryComponent; @@ -8,9 +8,9 @@ describe('FileGalleryComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FileGalleryComponent ] - }) - .compileComponents(); + declarations: [FileGalleryComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.ts b/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.ts index 942496e..9e9c680 100644 --- a/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.ts +++ b/mediarepo-ui/src/app/components/file-gallery/file-gallery.component.ts @@ -1,17 +1,21 @@ import { - Component, ElementRef, - EventEmitter, HostListener, + Component, + ElementRef, + EventEmitter, + HostListener, Input, OnChanges, OnInit, - Output, SimpleChanges, ViewChild + Output, + SimpleChanges, + ViewChild } from '@angular/core'; import {File} from "../../models/File"; import {FileService} from "../../services/file/file.service"; import {SafeResourceUrl} from "@angular/platform-browser"; import {Selectable} from "../../models/Selectable"; import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling"; -import {CdkDrag, CdkDragMove, DragRef, Point} from "@angular/cdk/drag-drop"; +import {CdkDragMove} from "@angular/cdk/drag-drop"; @Component({ selector: 'app-file-gallery', @@ -29,7 +33,8 @@ export class FileGalleryComponent implements OnChanges, OnInit { @ViewChild("virtualScroll") virtualScroll!: CdkVirtualScrollViewport; @ViewChild("scaledImage") scaledImage: ElementRef | undefined; - @ViewChild("imageDragContainer") imageDragContainer: ElementRef | undefined; + @ViewChild( + "imageDragContainer") imageDragContainer: ElementRef | undefined; public selectedFile: Selectable | undefined; public fileContentUrl: SafeResourceUrl | undefined; @@ -58,10 +63,12 @@ export class FileGalleryComponent implements OnChanges, OnInit { if (this.virtualScroll) { const viewportSize = this.virtualScroll.getViewportSize(); const indexAdjustment = (viewportSize / 260) / 2; // adjustment to have the selected item centered - this.virtualScroll.scrollToIndex(Math.max(selectedIndex - indexAdjustment, 0), "smooth"); + this.virtualScroll.scrollToIndex( + Math.max(selectedIndex - indexAdjustment, 0), "smooth"); if (selectedIndex > indexAdjustment) { - this.virtualScroll.scrollToOffset(this.virtualScroll.measureScrollOffset("left") + 130, "smooth"); + this.virtualScroll.scrollToOffset( + this.virtualScroll.measureScrollOffset("left") + 130, "smooth"); } } this.fileSelectEvent.emit(this.selectedFile.data); @@ -136,6 +143,11 @@ export class FileGalleryComponent implements OnChanges, OnInit { this.imagePosition = {x: 0, y: 0}; } + public onDragMoved($event: CdkDragMove): void { + this.imagePosition.x += $event.delta.x; + this.imagePosition.y += $event.delta.y; + } + @HostListener("window:keydown", ["$event"]) private async handleKeydownEvent(event: KeyboardEvent) { switch (event.key) { @@ -180,9 +192,4 @@ export class FileGalleryComponent implements OnChanges, OnInit { } return undefined; } - - public onDragMoved($event: CdkDragMove): void { - this.imagePosition.x += $event.delta.x; - this.imagePosition.y += $event.delta.y; - } } diff --git a/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.html b/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.html index 26eb763..294df4d 100644 --- a/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.html +++ b/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.html @@ -1,7 +1,8 @@ - + {{gridEntry.file?.name}} - + diff --git a/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.spec.ts b/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.spec.ts index 101b903..aaa7685 100644 --- a/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.spec.ts +++ b/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { FileGridEntryComponent } from './file-grid-entry.component'; +import {FileGridEntryComponent} from './file-grid-entry.component'; describe('FileGridEntryComponent', () => { let component: FileGridEntryComponent; @@ -8,9 +8,9 @@ describe('FileGridEntryComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FileGridEntryComponent ] - }) - .compileComponents(); + declarations: [FileGridEntryComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.ts b/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.ts index 7dc5b28..e8673ec 100644 --- a/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.ts +++ b/mediarepo-ui/src/app/components/file-grid/file-grid-entry/file-grid-entry.component.ts @@ -1,60 +1,65 @@ import { - Component, - Input, - OnInit, - ViewChild, - ElementRef, Output, EventEmitter, OnDestroy, OnChanges + Component, + ElementRef, + EventEmitter, + Input, + OnChanges, + OnInit, + Output, + ViewChild } from '@angular/core'; import {File} from "../../../models/File"; import {FileService} from "../../../services/file/file.service"; import {ErrorBrokerService} from "../../../services/error-broker/error-broker.service"; import {SafeResourceUrl} from "@angular/platform-browser"; -import {MatCard} from "@angular/material/card"; -import {Thumbnail} from "../../../models/Thumbnail"; import {GridEntry} from "./GridEntry"; @Component({ - selector: 'app-file-grid-entry', - templateUrl: './file-grid-entry.component.html', - styleUrls: ['./file-grid-entry.component.scss'] + selector: 'app-file-grid-entry', + templateUrl: './file-grid-entry.component.html', + styleUrls: ['./file-grid-entry.component.scss'] }) export class FileGridEntryComponent implements OnInit, OnChanges { - @ViewChild("card") card!: ElementRef; - @Input() public gridEntry!: GridEntry; - @Output() clickEvent = new EventEmitter(); - @Output() dblClickEvent = new EventEmitter(); + @ViewChild("card") card!: ElementRef; + @Input() public gridEntry!: GridEntry; + @Output() clickEvent = new EventEmitter(); + @Output() dblClickEvent = new EventEmitter(); - contentUrl: SafeResourceUrl | undefined; - private cachedFile: File | undefined; + contentUrl: SafeResourceUrl | undefined; + private cachedFile: File | undefined; - constructor(private fileService: FileService, private errorBroker: ErrorBrokerService) { } + constructor(private fileService: FileService, private errorBroker: ErrorBrokerService) { + } - async ngOnInit() { - this.cachedFile = this.gridEntry.file; - await this.loadImage(); - } + async ngOnInit() { + this.cachedFile = this.gridEntry.file; + await this.loadImage(); + } - async ngOnChanges() { - if (!this.cachedFile || this.gridEntry.file.hash !== this.cachedFile.hash) { - this.cachedFile = this.gridEntry.file; - await this.loadImage(); + async ngOnChanges() { + if (!this.cachedFile || this.gridEntry.file.hash !== this.cachedFile.hash) { + this.cachedFile = this.gridEntry.file; + await this.loadImage(); + } } - } - - async loadImage() { - try { - const thumbnails = await this.fileService.getThumbnails(this.gridEntry.file.hash); - let thumbnail = thumbnails.find(t => (t.height > 250 || t.width > 250) && (t.height < 500 && t.width < 500)); - thumbnail = thumbnail ?? thumbnails[0]; - - if (!thumbnail) { - console.log("Thumbnail is empty?!", thumbnails); - } else { - this.contentUrl = await this.fileService.readThumbnail(thumbnail!!); + + async loadImage() { + try { + const thumbnails = await this.fileService.getThumbnails( + this.gridEntry.file.hash); + let thumbnail = thumbnails.find( + t => (t.height > 250 || t.width > 250) && (t.height < 500 && t.width < 500)); + thumbnail = thumbnail ?? thumbnails[0]; + + if (!thumbnail) { + console.log("Thumbnail is empty?!", thumbnails); + } else { + this.contentUrl = await this.fileService.readThumbnail( + thumbnail!!); + } + } catch (err) { + this.errorBroker.showError(err); } - } catch (err) { - this.errorBroker.showError(err); } - } } diff --git a/mediarepo-ui/src/app/components/file-grid/file-grid.component.html b/mediarepo-ui/src/app/components/file-grid/file-grid.component.html index 39080b8..5a12fe0 100644 --- a/mediarepo-ui/src/app/components/file-grid/file-grid.component.html +++ b/mediarepo-ui/src/app/components/file-grid/file-grid.component.html @@ -1,8 +1,10 @@
- +
-
diff --git a/mediarepo-ui/src/app/components/file-grid/file-grid.component.spec.ts b/mediarepo-ui/src/app/components/file-grid/file-grid.component.spec.ts index 64af125..6455c78 100644 --- a/mediarepo-ui/src/app/components/file-grid/file-grid.component.spec.ts +++ b/mediarepo-ui/src/app/components/file-grid/file-grid.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { FileGridComponent } from './file-grid.component'; +import {FileGridComponent} from './file-grid.component'; describe('FileGridComponent', () => { let component: FileGridComponent; @@ -8,9 +8,9 @@ describe('FileGridComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FileGridComponent ] - }) - .compileComponents(); + declarations: [FileGridComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/file-grid/file-grid.component.ts b/mediarepo-ui/src/app/components/file-grid/file-grid.component.ts index 3f22212..004aa91 100644 --- a/mediarepo-ui/src/app/components/file-grid/file-grid.component.ts +++ b/mediarepo-ui/src/app/components/file-grid/file-grid.component.ts @@ -1,13 +1,16 @@ import { - Component, ElementRef, + Component, + ElementRef, EventEmitter, HostListener, - Input, OnChanges, + Input, + OnChanges, OnInit, - Output, QueryList, SimpleChanges, ViewChild, ViewChildren + Output, + SimpleChanges, + ViewChild } from '@angular/core'; import {File} from "../../models/File"; -import {FileService} from "../../services/file/file.service"; import {FileGridEntryComponent} from "./file-grid-entry/file-grid-entry.component"; import {GridEntry} from "./file-grid-entry/GridEntry"; import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling"; @@ -30,11 +33,10 @@ export class FileGridComponent implements OnChanges, OnInit { @ViewChild("galleryWrapper") galleryWrapper!: ElementRef; selectedEntries: GridEntry[] = []; - + partitionedGridEntries: GridEntry[][] = []; private shiftClicked = false; private ctrlClicked = false; private gridEntries: GridEntry[] = [] - partitionedGridEntries: GridEntry[][] = []; constructor() { } diff --git a/mediarepo-ui/src/app/components/file-search/file-search.component-theme.scss b/mediarepo-ui/src/app/components/file-search/file-search.component-theme.scss index 7afff2e..3b42da4 100644 --- a/mediarepo-ui/src/app/components/file-search/file-search.component-theme.scss +++ b/mediarepo-ui/src/app/components/file-search/file-search.component-theme.scss @@ -2,9 +2,9 @@ @use '~@angular/material' as mat; @mixin color($theme) { -$color-config: mat.get-color-config($theme); -$primary-palette: map.get($color-config, 'primary'); -$warn-palette: map.get($color-config, 'warn'); + $color-config: mat.get-color-config($theme); + $primary-palette: map.get($color-config, 'primary'); + $warn-palette: map.get($color-config, 'warn'); .tag-input-item { background-color: dimgrey; @@ -24,12 +24,12 @@ $warn-palette: map.get($color-config, 'warn'); } @mixin theme($theme) { -$color-config: mat.get-color-config($theme); + $color-config: mat.get-color-config($theme); @if $color-config != null { @include color($theme); } -$typography-config: mat.get-typography-config($theme); + $typography-config: mat.get-typography-config($theme); @if $typography-config != null { @include typography($theme); } diff --git a/mediarepo-ui/src/app/components/file-search/file-search.component.html b/mediarepo-ui/src/app/components/file-search/file-search.component.html index 4e52520..ccaf5c3 100644 --- a/mediarepo-ui/src/app/components/file-search/file-search.component.html +++ b/mediarepo-ui/src/app/components/file-search/file-search.component.html @@ -1,25 +1,25 @@
-
+
-
{{tag.getNormalizedTag()}}
+
{{tag.getNormalizedTag()}}
-
- + Enter tags to filter for - + matInput/> {{tag}} - + diff --git a/mediarepo-ui/src/app/components/file-search/file-search.component.spec.ts b/mediarepo-ui/src/app/components/file-search/file-search.component.spec.ts index c2d77de..ec353b8 100644 --- a/mediarepo-ui/src/app/components/file-search/file-search.component.spec.ts +++ b/mediarepo-ui/src/app/components/file-search/file-search.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { FileSearchComponent } from './file-search.component'; +import {FileSearchComponent} from './file-search.component'; describe('FileSearchComponent', () => { let component: FileSearchComponent; @@ -8,9 +8,9 @@ describe('FileSearchComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FileSearchComponent ] - }) - .compileComponents(); + declarations: [FileSearchComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/file-search/file-search.component.ts index 485e979..e58462a 100644 --- a/mediarepo-ui/src/app/components/file-search/file-search.component.ts +++ b/mediarepo-ui/src/app/components/file-search/file-search.component.ts @@ -1,7 +1,11 @@ import { AfterViewChecked, Component, - ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, + ElementRef, + EventEmitter, + Input, + OnInit, + Output, ViewChild } from '@angular/core'; import {TagService} from "../../services/tag/tag.service"; @@ -51,17 +55,6 @@ export class FileSearchComponent implements AfterViewChecked, OnInit { this.inputList.nativeElement.scrollLeft = this.inputList.nativeElement.scrollWidth; } - private filterSuggestionTag(tag: string) { - const negated = tag.startsWith("-"); - const normalizedTag = tag.replace(/^-/, ""); - - return this.validTags.filter( - t => t.includes(normalizedTag) && this.searchTags.findIndex( - s => s.name === t) < 0) - .map(t => negated ? "-" + t : t) - .slice(0, 20); - } - public async searchForFiles() { this.searchStartEvent.emit(); try { @@ -135,4 +128,15 @@ export class FileSearchComponent implements AfterViewChecked, OnInit { } }); } + + private filterSuggestionTag(tag: string) { + const negated = tag.startsWith("-"); + const normalizedTag = tag.replace(/^-/, ""); + + return this.validTags.filter( + t => t.includes(normalizedTag) && this.searchTags.findIndex( + s => s.name === t) < 0) + .map(t => negated ? "-" + t : t) + .slice(0, 20); + } } diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html index d022cb1..67978ff 100644 --- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html +++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html @@ -1,40 +1,48 @@

Sort Entries

-
-
-
-
drag_handle
- - Key - - Namespace - File Name - File Size - Time Imported - Time Created - Time Changed - File Type - Number of Tags - - - - Namespace Name - - -
- - Direction - - Ascending - Descending - - - - +
+
+
+
+ drag_handle
+ + Key + + Namespace + File Name + File Size + Time Imported + Time Created + Time Changed + File Type + Number of Tags + + + + Namespace Name + + +
+ + Direction + + Ascending + Descending + + + +
+
- - + +
diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss index 1245e67..1e67df1 100644 --- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss +++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss @@ -21,6 +21,7 @@ mat-form-field, .filler, .drag-handle { display: flex; flex-direction: row-reverse; width: 100%; + button { margin-left: 1em; } diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.spec.ts b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.spec.ts index 7c3bedb..11d7dfe 100644 --- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.spec.ts +++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { FilterDialogComponent } from './filter-dialog.component'; +import {FilterDialogComponent} from './filter-dialog.component'; describe('FilterDialogComponent', () => { let component: FilterDialogComponent; @@ -8,9 +8,9 @@ describe('FilterDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FilterDialogComponent ] - }) - .compileComponents(); + declarations: [FilterDialogComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.ts b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.ts index a4eb477..0513bb0 100644 --- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.ts +++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.ts @@ -12,7 +12,8 @@ export class FilterDialogComponent { public sortEntries: SortKey[] = [] - constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data: any) { + constructor(public dialogRef: MatDialogRef, @Inject( + MAT_DIALOG_DATA) data: any) { this.sortEntries = data.sortEntries; } diff --git a/mediarepo-ui/src/app/components/tag-item/tag-item.component.html b/mediarepo-ui/src/app/components/tag-item/tag-item.component.html index 2a540bc..952fe4b 100644 --- a/mediarepo-ui/src/app/components/tag-item/tag-item.component.html +++ b/mediarepo-ui/src/app/components/tag-item/tag-item.component.html @@ -1,4 +1,4 @@
- {{tag.namespace}}: - {{tag.name}} + {{tag.namespace}}: + {{tag.name}}
diff --git a/mediarepo-ui/src/app/components/tag-item/tag-item.component.spec.ts b/mediarepo-ui/src/app/components/tag-item/tag-item.component.spec.ts index 58b5f2b..60309e9 100644 --- a/mediarepo-ui/src/app/components/tag-item/tag-item.component.spec.ts +++ b/mediarepo-ui/src/app/components/tag-item/tag-item.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { TagItemComponent } from './tag-item.component'; +import {TagItemComponent} from './tag-item.component'; describe('TagItemComponent', () => { let component: TagItemComponent; @@ -8,9 +8,9 @@ describe('TagItemComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ TagItemComponent ] - }) - .compileComponents(); + declarations: [TagItemComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/components/tag-item/tag-item.component.ts b/mediarepo-ui/src/app/components/tag-item/tag-item.component.ts index 0cc2219..2e3f77c 100644 --- a/mediarepo-ui/src/app/components/tag-item/tag-item.component.ts +++ b/mediarepo-ui/src/app/components/tag-item/tag-item.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, OnInit} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {Tag} from "../../models/Tag"; @Component({ @@ -12,5 +12,6 @@ export class TagItemComponent { @Input() namespaceColor: string | undefined; @Input() tagColor: string | undefined; - constructor() { } + constructor() { + } } diff --git a/mediarepo-ui/src/app/models/File.ts b/mediarepo-ui/src/app/models/File.ts index 89ac1b8..d423c3f 100644 --- a/mediarepo-ui/src/app/models/File.ts +++ b/mediarepo-ui/src/app/models/File.ts @@ -9,5 +9,6 @@ export class File { public creation_time: Date, public change_time: Date, public import_time: Date, - ) {} + ) { + } } diff --git a/mediarepo-ui/src/app/models/Repository.ts b/mediarepo-ui/src/app/models/Repository.ts index bb66ac5..0e99cb6 100644 --- a/mediarepo-ui/src/app/models/Repository.ts +++ b/mediarepo-ui/src/app/models/Repository.ts @@ -4,5 +4,6 @@ export class Repository { public address: string | undefined, public path: string | undefined, public local: boolean, - ) {} + ) { + } } diff --git a/mediarepo-ui/src/app/models/SortKey.ts b/mediarepo-ui/src/app/models/SortKey.ts index 6d8c9da..1fc1523 100644 --- a/mediarepo-ui/src/app/models/SortKey.ts +++ b/mediarepo-ui/src/app/models/SortKey.ts @@ -5,7 +5,8 @@ export class SortKey { public sortType: "Namespace" | "FileName" | "FileSize" | "FileImportedTime" | "FileCreatedTime" | "FileChangeTime" | "FileType" | "NumTags", public sortDirection: "Ascending" | "Descending", public namespaceName: string | undefined - ) {} + ) { + } public toString(): string { if (this.sortType == "Namespace") { @@ -18,7 +19,12 @@ export class SortKey { public toBackendType(): any { if (this.sortType == "Namespace") { - return {"Namespace": {direction: this.sortDirection, name: this.namespaceName}} + return { + "Namespace": { + direction: this.sortDirection, + name: this.namespaceName + } + } } else { let returnObj: any = {}; returnObj[this.sortType] = this.sortDirection; diff --git a/mediarepo-ui/src/app/models/Tag.ts b/mediarepo-ui/src/app/models/Tag.ts index ce7b11d..0d6bfca 100644 --- a/mediarepo-ui/src/app/models/Tag.ts +++ b/mediarepo-ui/src/app/models/Tag.ts @@ -6,7 +6,8 @@ export class Tag { public id: number, public name: string, public namespace: string | undefined - ) {} + ) { + } public getNormalizedOutput(): string { if (!this.normalizedTag) { @@ -14,4 +15,4 @@ export class Tag { } return this.normalizedTag; } -}; +} diff --git a/mediarepo-ui/src/app/models/TagQuery.ts b/mediarepo-ui/src/app/models/TagQuery.ts index 818f0ee..e9f6bbd 100644 --- a/mediarepo-ui/src/app/models/TagQuery.ts +++ b/mediarepo-ui/src/app/models/TagQuery.ts @@ -3,6 +3,6 @@ export class TagQuery { } public getNormalizedTag(): string { - return this.negate? "-" + this.name : this.name; + return this.negate ? "-" + this.name : this.name; } } diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.html b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.html index 5a4ecdd..b5b3c49 100644 --- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.html +++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.html @@ -2,18 +2,19 @@
-
- +
+
-
+

Tags

-
+
diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.spec.ts b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.spec.ts index 7f2865f..8a52bf5 100644 --- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.spec.ts +++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { FilesTabSidebarComponent } from './files-tab-sidebar.component'; +import {FilesTabSidebarComponent} from './files-tab-sidebar.component'; describe('FilesTabSidebarComponent', () => { let component: FilesTabSidebarComponent; @@ -8,9 +8,9 @@ describe('FilesTabSidebarComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FilesTabSidebarComponent ] - }) - .compileComponents(); + declarations: [FilesTabSidebarComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts index 96d0b7c..69b2706 100644 --- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts +++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts @@ -1,16 +1,17 @@ import { Component, EventEmitter, - Input, OnChanges, + Input, + OnChanges, OnInit, - Output, SimpleChanges, + Output, + SimpleChanges, ViewChild } from '@angular/core'; import {Tag} from "../../../../models/Tag"; import {TagService} from "../../../../services/tag/tag.service"; import {FileService} from "../../../../services/file/file.service"; import {File} from "../../../../models/File"; -import {MatSelectionListChange} from "@angular/material/list"; import {FileSearchComponent} from "../../../../components/file-search/file-search.component"; import {RepositoryService} from "../../../../services/repository/repository.service"; diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.html b/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.html index 0c01846..1f9293f 100644 --- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.html +++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.html @@ -1,19 +1,20 @@ - + + (searchStartEvent)="this.contentLoading = true" + [selectedFiles]="this.selectedFiles"> - - + diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.spec.ts b/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.spec.ts index 7fb2d48..b3aaa10 100644 --- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.spec.ts +++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { FilesTabComponent } from './files-tab.component'; +import {FilesTabComponent} from './files-tab.component'; describe('SearchPageComponent', () => { let component: FilesTabComponent; @@ -8,9 +8,9 @@ describe('SearchPageComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FilesTabComponent ] - }) - .compileComponents(); + declarations: [FilesTabComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.ts b/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.ts index 9e756de..1938cc7 100644 --- a/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.ts +++ b/mediarepo-ui/src/app/pages/home/files-tab/files-tab.component.ts @@ -1,13 +1,7 @@ -import {Component, OnInit, ViewChild} from '@angular/core'; -import {Tag} from "../../../models/Tag"; +import {Component, OnInit} from '@angular/core'; import {File} from "../../../models/File"; -import {FileSearchComponent} from "../../../components/file-search/file-search.component"; import {ErrorBrokerService} from "../../../services/error-broker/error-broker.service"; import {FileService} from "../../../services/file/file.service"; -import {TagService} from "../../../services/tag/tag.service"; -import {Lightbox, LIGHTBOX_EVENT, LightboxEvent} from "ngx-lightbox"; -import {MatSelectionListChange} from "@angular/material/list"; -import {SortKey} from "../../../models/SortKey"; import {RepositoryService} from "../../../services/repository/repository.service"; @Component({ diff --git a/mediarepo-ui/src/app/pages/home/home.component.spec.ts b/mediarepo-ui/src/app/pages/home/home.component.spec.ts index 2c5a172..de03240 100644 --- a/mediarepo-ui/src/app/pages/home/home.component.spec.ts +++ b/mediarepo-ui/src/app/pages/home/home.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { HomeComponent } from './home.component'; +import {HomeComponent} from './home.component'; describe('HomeComponent', () => { let component: HomeComponent; @@ -8,9 +8,9 @@ describe('HomeComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ HomeComponent ] - }) - .compileComponents(); + declarations: [HomeComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/pages/home/home.component.ts b/mediarepo-ui/src/app/pages/home/home.component.ts index 0e106e9..ba60124 100644 --- a/mediarepo-ui/src/app/pages/home/home.component.ts +++ b/mediarepo-ui/src/app/pages/home/home.component.ts @@ -16,7 +16,8 @@ export class HomeComponent implements OnInit { @ViewChild("tabGroup") tabGroup!: MatTabGroup; - constructor(private repoService: RepositoryService, private tagService: TagService) {} + constructor(private repoService: RepositoryService, private tagService: TagService) { + } public async ngOnInit(): Promise { this.selectedRepository = this.repoService.selectedRepository.getValue(); diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.html b/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.html index bf5b3e6..fb4d91f 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.html +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.html @@ -2,35 +2,35 @@
- + Name - + - + Type - + Local Remote - Path - + - + Address - +
@@ -38,17 +38,17 @@
- - + - -
diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.spec.ts b/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.spec.ts index d7f8700..d77721e 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.spec.ts +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { AddRepositoryDialogComponent } from './add-repository-dialog.component'; +import {AddRepositoryDialogComponent} from './add-repository-dialog.component'; describe('AddRepositoryDialogComponent', () => { let component: AddRepositoryDialogComponent; @@ -8,9 +8,9 @@ describe('AddRepositoryDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ AddRepositoryDialogComponent ] - }) - .compileComponents(); + declarations: [AddRepositoryDialogComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.ts b/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.ts index a73b55b..f0d54be 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.ts +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/add-repository-dialog/add-repository-dialog.component.ts @@ -2,7 +2,8 @@ import {Component, Inject, OnInit} from '@angular/core'; import { AbstractControl, FormControl, - FormGroup, ValidationErrors, + FormGroup, + ValidationErrors, Validators } from "@angular/forms"; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; @@ -37,7 +38,8 @@ export class AddRepositoryDialogComponent implements OnInit { } ngOnInit(): void { - this.repoService.repositories.subscribe(repositories => this.repositories = repositories) + this.repoService.repositories.subscribe( + repositories => this.repositories = repositories) } public async checkRepositoryStatus() { @@ -45,11 +47,12 @@ export class AddRepositoryDialogComponent implements OnInit { const address = this.formGroup.value.address; const running = await this.repoService.checkDaemonRunning(address); console.log(running); - this.onlineStatus = running? "Online" : "Offline"; + this.onlineStatus = running ? "Online" : "Offline"; } public async checkLocalRepoExists() { - this.localRepoExists = await this.repoService.checkLocalRepositoryExists(this.formGroup.value.path); + this.localRepoExists = await this.repoService.checkLocalRepositoryExists( + this.formGroup.value.path); } public async initLocalRepository() { @@ -60,10 +63,11 @@ export class AddRepositoryDialogComponent implements OnInit { public async addRepository() { let {name, repositoryType, path, address} = this.formGroup.value; - path = repositoryType === "local"? path : undefined; - address = repositoryType === "remote"? address : undefined; + path = repositoryType === "local" ? path : undefined; + address = repositoryType === "remote" ? address : undefined; try { - await this.repoService.addRepository(name, path, address, repositoryType === "local"); + await this.repoService.addRepository(name, path, address, + repositoryType === "local"); this.dialogRef.close(); } catch (err) { this.errorBroker.showError(err); @@ -114,20 +118,22 @@ export class AddRepositoryDialogComponent implements OnInit { } validatePath(control: AbstractControl): ValidationErrors | null { - const repositoryType = control.parent?.get("repositoryType")?.value ?? "local"; + const repositoryType = control.parent?.get( + "repositoryType")?.value ?? "local"; if (repositoryType === "local") { - return control.value.length > 0? null : {valueRequired: control.value}; + return control.value.length > 0 ? null : {valueRequired: control.value}; } return null; } validateAddress(control: AbstractControl): ValidationErrors | null { - const repositoryType = control.parent?.get("repositoryType")?.value ?? "remote"; + const repositoryType = control.parent?.get( + "repositoryType")?.value ?? "remote"; if (repositoryType === "remote") { const match = /(\d+\.){3}\d+:\d+|\S+:\d+/.test(control.value) - return match? null : {invalidAddress: control.value}; + return match ? null : {invalidAddress: control.value}; } return null; diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.html b/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.html index 8c718aa..099149e 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.html +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.html @@ -1,6 +1,6 @@
- +
diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.scss b/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.scss index 660da5c..0091879 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.scss +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.scss @@ -14,6 +14,7 @@ height: 5em; display: flex; flex-direction: row-reverse; + button { margin: 1em; } diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.spec.ts b/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.spec.ts index e0407b9..b7465b4 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.spec.ts +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { RepositoriesTabComponent } from './repositories-tab.component'; +import {RepositoriesTabComponent} from './repositories-tab.component'; describe('RepositoriesComponent', () => { let component: RepositoriesTabComponent; @@ -8,9 +8,9 @@ describe('RepositoriesComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ RepositoriesTabComponent ] - }) - .compileComponents(); + declarations: [RepositoriesTabComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.ts b/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.ts index 3a6d9ab..1679dd1 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.ts +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/repositories-tab.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {Repository} from "../../../models/Repository"; import {RepositoryService} from "../../../services/repository/repository.service"; import {MatDialog} from "@angular/material/dialog"; diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.html b/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.html index 1a7c7ea..30e43a3 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.html +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.html @@ -4,18 +4,28 @@

{{this.getDaemonStatusText()}}

-

{{repository.path!}}

-

{{repository.address}}

+

{{repository.path!}}

+

{{repository.address}}

 - - - - - + + + + + - - + + diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.scss b/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.scss index a498503..0ec1c1d 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.scss +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.scss @@ -26,9 +26,11 @@ .status-local { background-color: #2e237a; } + .status-offline { background-color: #8e1e2a; } + .status-online { background-color: #1b651b; } diff --git a/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.spec.ts b/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.spec.ts index e68dc01..209e1a5 100644 --- a/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.spec.ts +++ b/mediarepo-ui/src/app/pages/home/repositories-tab/repository-card/repository-card.component.spec.ts @@ -1,6 +1,6 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import {ComponentFixture, TestBed} from '@angular/core/testing'; -import { RepositoryCardComponent } from './repository-card.component'; +import {RepositoryCardComponent} from './repository-card.component'; describe('RepositoryCardComponent', () => { let component: RepositoryCardComponent; @@ -8,9 +8,9 @@ describe('RepositoryCardComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ RepositoryCardComponent ] - }) - .compileComponents(); + declarations: [RepositoryCardComponent] + }) + .compileComponents(); }); beforeEach(() => { diff --git a/mediarepo-ui/src/app/services/error-broker/error-broker.service.spec.ts b/mediarepo-ui/src/app/services/error-broker/error-broker.service.spec.ts index 7c0368a..1425081 100644 --- a/mediarepo-ui/src/app/services/error-broker/error-broker.service.spec.ts +++ b/mediarepo-ui/src/app/services/error-broker/error-broker.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { ErrorBrokerService } from './error-broker.service'; +import {ErrorBrokerService} from './error-broker.service'; describe('ErrorBrokerService', () => { let service: ErrorBrokerService; diff --git a/mediarepo-ui/src/app/services/error-broker/error-broker.service.ts b/mediarepo-ui/src/app/services/error-broker/error-broker.service.ts index 860e14e..cd5db8d 100644 --- a/mediarepo-ui/src/app/services/error-broker/error-broker.service.ts +++ b/mediarepo-ui/src/app/services/error-broker/error-broker.service.ts @@ -1,5 +1,4 @@ -import {Injectable, OnInit} from '@angular/core'; -import {BehaviorSubject} from "rxjs"; +import {Injectable} from '@angular/core'; import {listen} from "@tauri-apps/api/event"; @Injectable({ @@ -32,7 +31,7 @@ export class ErrorBrokerService { } } - showError(error: {message: string}) { + showError(error: { message: string }) { console.error(error); if (this.errorCb) { if (!error.message) { diff --git a/mediarepo-ui/src/app/services/file/file.service.spec.ts b/mediarepo-ui/src/app/services/file/file.service.spec.ts index 35474aa..cc88625 100644 --- a/mediarepo-ui/src/app/services/file/file.service.spec.ts +++ b/mediarepo-ui/src/app/services/file/file.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { FileService } from './file.service'; +import {FileService} from './file.service'; describe('FileService', () => { let service: FileService; diff --git a/mediarepo-ui/src/app/services/file/file.service.ts b/mediarepo-ui/src/app/services/file/file.service.ts index a782dd2..dc406b1 100644 --- a/mediarepo-ui/src/app/services/file/file.service.ts +++ b/mediarepo-ui/src/app/services/file/file.service.ts @@ -1,4 +1,4 @@ -import {Inject, Injectable, Sanitizer} from '@angular/core'; +import {Inject, Injectable} from '@angular/core'; import {BehaviorSubject} from "rxjs"; import {File} from "../../models/File"; import {invoke} from "@tauri-apps/api/tauri"; @@ -24,21 +24,25 @@ export class FileService { } public async findFiles(tags: TagQuery[], sortBy: SortKey[]) { - let files = await invoke("plugin:mediarepo|find_files", {tags, sortBy: sortBy.map(k => k.toBackendType())}); + let files = await invoke("plugin:mediarepo|find_files", + {tags, sortBy: sortBy.map(k => k.toBackendType())}); this.displayedFiles.next(files); } public async readFile(file: File): Promise { - const once_uri = await invoke("plugin:mediarepo|read_file_by_hash", {hash: file.hash, mimeType: file.mime_type}); + const once_uri = await invoke("plugin:mediarepo|read_file_by_hash", + {hash: file.hash, mimeType: file.mime_type}); return this.sanitizer.bypassSecurityTrustResourceUrl(once_uri); } public async readThumbnail(thumbnail: Thumbnail): Promise { - let once_uri = await invoke("plugin:mediarepo|read_thumbnail", {hash: thumbnail.hash, mimeType: thumbnail.mime_type }); + let once_uri = await invoke("plugin:mediarepo|read_thumbnail", + {hash: thumbnail.hash, mimeType: thumbnail.mime_type}); return this.sanitizer.bypassSecurityTrustResourceUrl(once_uri); } public async getThumbnails(hash: string): Promise { - return await invoke("plugin:mediarepo|get_file_thumbnails", {hash}); + return await invoke("plugin:mediarepo|get_file_thumbnails", + {hash}); } } diff --git a/mediarepo-ui/src/app/services/repository/repository.service.spec.ts b/mediarepo-ui/src/app/services/repository/repository.service.spec.ts index 9894fbf..7eff2d6 100644 --- a/mediarepo-ui/src/app/services/repository/repository.service.spec.ts +++ b/mediarepo-ui/src/app/services/repository/repository.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { RepositoryService } from './repository.service'; +import {RepositoryService} from './repository.service'; describe('RepositoryService', () => { let service: RepositoryService; diff --git a/mediarepo-ui/src/app/services/repository/repository.service.ts b/mediarepo-ui/src/app/services/repository/repository.service.ts index 9131041..b709b47 100644 --- a/mediarepo-ui/src/app/services/repository/repository.service.ts +++ b/mediarepo-ui/src/app/services/repository/repository.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@angular/core'; +import {Injectable} from '@angular/core'; import {Repository} from "../../models/Repository"; -import {BehaviorSubject, Observable} from "rxjs"; +import {BehaviorSubject} from "rxjs"; import {invoke} from "@tauri-apps/api/tauri"; import {listen} from "@tauri-apps/api/event"; import {Info} from "../../models/Info"; @@ -11,7 +11,8 @@ import {ErrorBrokerService} from "../error-broker/error-broker.service"; }) export class RepositoryService { repositories = new BehaviorSubject([]); - public selectedRepository = new BehaviorSubject(undefined); + public selectedRepository = new BehaviorSubject( + undefined); constructor(private errorBroker: ErrorBrokerService) { this.registerListener() @@ -80,7 +81,8 @@ export class RepositoryService { * @returns {Promise} */ public async addRepository(name: string, path: string | undefined, address: string | undefined, local: boolean) { - let repos = await invoke("plugin:mediarepo|add_repository", {name, path, address, local}); + let repos = await invoke("plugin:mediarepo|add_repository", + {name, path, address, local}); this.repositories.next(repos); } @@ -90,7 +92,8 @@ export class RepositoryService { * @returns {Promise} */ public async checkDaemonRunning(address: string): Promise { - return await invoke("plugin:mediarepo|check_daemon_running", {address}); + return await invoke("plugin:mediarepo|check_daemon_running", + {address}); } /** @@ -99,7 +102,8 @@ export class RepositoryService { * @returns {Promise} */ public async checkLocalRepositoryExists(path: string): Promise { - return await invoke("plugin:mediarepo|check_local_repository_exists", {path}) + return await invoke( + "plugin:mediarepo|check_local_repository_exists", {path}) } /** @@ -126,7 +130,8 @@ export class RepositoryService { } async loadSelectedRepository() { - let active_repo = await invoke("plugin:mediarepo|get_active_repository"); + let active_repo = await invoke( + "plugin:mediarepo|get_active_repository"); this.selectedRepository.next(active_repo); } } diff --git a/mediarepo-ui/src/app/services/tag/tag.service.spec.ts b/mediarepo-ui/src/app/services/tag/tag.service.spec.ts index f091e93..448cc84 100644 --- a/mediarepo-ui/src/app/services/tag/tag.service.spec.ts +++ b/mediarepo-ui/src/app/services/tag/tag.service.spec.ts @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; +import {TestBed} from '@angular/core/testing'; -import { TagService } from './tag.service'; +import {TagService} from './tag.service'; describe('TagService', () => { let service: TagService; diff --git a/mediarepo-ui/src/app/services/tag/tag.service.ts b/mediarepo-ui/src/app/services/tag/tag.service.ts index 1e66e2a..2edde2a 100644 --- a/mediarepo-ui/src/app/services/tag/tag.service.ts +++ b/mediarepo-ui/src/app/services/tag/tag.service.ts @@ -1,7 +1,7 @@ -import { Injectable } from '@angular/core'; +import {Injectable} from '@angular/core'; import {invoke} from "@tauri-apps/api/tauri"; import {Tag} from "../../models/Tag"; -import {BehaviorSubject, Observable} from "rxjs"; +import {BehaviorSubject} from "rxjs"; @Injectable({ providedIn: 'root' @@ -10,7 +10,8 @@ export class TagService { public tags: BehaviorSubject = new BehaviorSubject([]); - constructor() { } + constructor() { + } public async loadTags() { const tags = await invoke("plugin:mediarepo|get_all_tags"); @@ -18,16 +19,19 @@ export class TagService { } public async getTagsForFile(hash: string): Promise { - const tags = await invoke("plugin:mediarepo|get_tags_for_file", {hash}); + const tags = await invoke("plugin:mediarepo|get_tags_for_file", + {hash}); return tags.map(t => new Tag(t.id, t.name, t.namespace)); } public async getTagsForFiles(hashes: string[]): Promise { let tags: Tag[] = [] if (hashes.length === 1) { - tags = await invoke("plugin:mediarepo|get_tags_for_file", {hash: hashes[0]}); + tags = await invoke("plugin:mediarepo|get_tags_for_file", + {hash: hashes[0]}); } else if (hashes.length > 0) { - tags = await invoke("plugin:mediarepo|get_tags_for_files", {hashes}); + tags = await invoke("plugin:mediarepo|get_tags_for_files", + {hashes}); } return tags.map(t => new Tag(t.id, t.name, t.namespace)); } diff --git a/mediarepo-ui/src/index.html b/mediarepo-ui/src/index.html index b186a0f..02ca7e2 100644 --- a/mediarepo-ui/src/index.html +++ b/mediarepo-ui/src/index.html @@ -4,13 +4,13 @@ MediarepoUi - - - + + + - + diff --git a/mediarepo-ui/src/main.ts b/mediarepo-ui/src/main.ts index c7b673c..484b5f3 100644 --- a/mediarepo-ui/src/main.ts +++ b/mediarepo-ui/src/main.ts @@ -1,8 +1,8 @@ -import { enableProdMode } from '@angular/core'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import {enableProdMode} from '@angular/core'; +import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; +import {AppModule} from './app/app.module'; +import {environment} from './environments/environment'; if (environment.production) { enableProdMode(); diff --git a/mediarepo-ui/src/polyfills.ts b/mediarepo-ui/src/polyfills.ts index 373f538..ae5b7a7 100644 --- a/mediarepo-ui/src/polyfills.ts +++ b/mediarepo-ui/src/polyfills.ts @@ -57,7 +57,7 @@ /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js'; // Included with Angular CLI. +import 'zone.js'; // Included with Angular CLI. /*************************************************************************************************** diff --git a/mediarepo-ui/src/styles.scss b/mediarepo-ui/src/styles.scss index a251b62..ec9e664 100644 --- a/mediarepo-ui/src/styles.scss +++ b/mediarepo-ui/src/styles.scss @@ -3,6 +3,7 @@ @use 'src/app/app.component-theme' as app; @use 'src/app/components/file-grid/file-grid-entry/file-grid-entry.component-theme' as file-grid-entry; @use 'src/app/components/file-search/file-search.component-theme' as file-search; + @include mat.core(); $theme: mat.define-dark-theme(( diff --git a/mediarepo-ui/src/test.ts b/mediarepo-ui/src/test.ts index b4dd603..7762aae 100644 --- a/mediarepo-ui/src/test.ts +++ b/mediarepo-ui/src/test.ts @@ -1,7 +1,7 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; +import {getTestBed} from '@angular/core/testing'; import { BrowserDynamicTestingModule, platformBrowserDynamicTesting @@ -18,7 +18,7 @@ declare const require: { getTestBed().initTestEnvironment( BrowserDynamicTestingModule, platformBrowserDynamicTesting(), - { teardown: { destroyAfterEach: true }}, + {teardown: {destroyAfterEach: true}}, ); // Then we find all the tests.