From 86519f22a173d13a29e9ddded977853f0c57332e Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 27 Nov 2021 12:05:29 +0100 Subject: [PATCH] Move common and file related components to app-common and file module Signed-off-by: trivernis --- .../src/app/components/core/core.module.ts | 21 ++++++ .../repository-card.component.ts | 4 +- .../shared/app-common/app-common.module.ts | 37 ++++++++++ .../busy-indicator.component.html | 0 .../busy-indicator.component.scss | 0 .../busy-indicator.component.spec.ts | 0 .../busy-indicator.component.ts | 0 .../confirm-dialog.component.html | 0 .../confirm-dialog.component.scss | 0 .../confirm-dialog.component.spec.ts | 0 .../confirm-dialog.component.ts | 0 .../content-aware-image.component.html | 0 .../content-aware-image.component.scss | 0 .../content-aware-image.component.spec.ts | 0 .../content-aware-image.component.ts | 0 .../context-menu/context-menu.component.html | 0 .../context-menu/context-menu.component.scss | 0 .../context-menu.component.spec.ts | 0 .../context-menu/context-menu.component.ts | 0 .../audio-viewer/audio-viewer.component.html | 0 .../audio-viewer/audio-viewer.component.scss | 0 .../audio-viewer.component.spec.ts | 0 .../audio-viewer/audio-viewer.component.ts | 0 .../content-viewer.component.html | 0 .../content-viewer.component.scss | 0 .../content-viewer.component.spec.ts | 0 .../content-viewer.component.ts | 10 +-- .../image-viewer/image-viewer.component.html | 0 .../image-viewer/image-viewer.component.scss | 0 .../image-viewer.component.spec.ts | 0 .../image-viewer/image-viewer.component.ts | 0 .../video-viewer/video-viewer.component.html | 0 .../video-viewer/video-viewer.component.scss | 0 .../video-viewer.component.spec.ts | 0 .../video-viewer/video-viewer.component.ts | 0 .../file-context-menu.component.html | 0 .../file-context-menu.component.scss | 0 .../file-context-menu.component.spec.ts | 0 .../file-context-menu.component.ts | 2 +- .../file-gallery-entry.component-theme.scss | 2 +- .../file-gallery-entry.component.html | 1 - .../file-gallery-entry.component.scss | 0 .../file-gallery-entry.component.spec.ts | 0 .../file-gallery-entry.component.ts | 8 +-- .../file-gallery/file-gallery.component.html | 0 .../file-gallery/file-gallery.component.scss | 0 .../file-gallery.component.spec.ts | 0 .../file-gallery/file-gallery.component.ts | 8 +-- .../file-grid/file-grid-entry/GridEntry.ts | 2 +- .../file-grid-entry.component-theme.scss | 2 +- .../file-grid-entry.component.html | 0 .../file-grid-entry.component.scss | 0 .../file-grid-entry.component.spec.ts | 0 .../file-grid-entry.component.ts | 4 +- .../file-grid/file-grid.component.html | 0 .../file-grid/file-grid.component.scss | 0 .../file-grid/file-grid.component.spec.ts | 0 .../file-grid/file-grid.component.ts | 6 +- .../file-multiview.component.html | 0 .../file-multiview.component.scss | 0 .../file-multiview.component.spec.ts | 0 .../file-multiview.component.ts | 2 +- .../file-thumbnail.component.html | 0 .../file-thumbnail.component.scss | 0 .../file-thumbnail.component.spec.ts | 0 .../file-thumbnail.component.ts | 6 +- .../app/components/shared/file/file.module.ts | 68 +++++++++++++++++++ .../app/components/shared/shared.module.ts | 48 +------------ .../shared/sidebar/sidebar.module.ts | 14 ++++ mediarepo-ui/src/styles.scss | 4 +- 70 files changed, 172 insertions(+), 77 deletions(-) create mode 100644 mediarepo-ui/src/app/components/shared/app-common/app-common.module.ts rename mediarepo-ui/src/app/components/shared/{ => app-common}/busy-indicator/busy-indicator.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/busy-indicator/busy-indicator.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/busy-indicator/busy-indicator.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/busy-indicator/busy-indicator.component.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/confirm-dialog/confirm-dialog.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/confirm-dialog/confirm-dialog.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/confirm-dialog/confirm-dialog.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/confirm-dialog/confirm-dialog.component.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/content-aware-image/content-aware-image.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/content-aware-image/content-aware-image.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/content-aware-image/content-aware-image.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/content-aware-image/content-aware-image.component.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/context-menu/context-menu.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/context-menu/context-menu.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/context-menu/context-menu.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => app-common}/context-menu/context-menu.component.ts (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/audio-viewer/audio-viewer.component.html (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/audio-viewer/audio-viewer.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/audio-viewer/audio-viewer.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/audio-viewer/audio-viewer.component.ts (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/content-viewer.component.html (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/content-viewer.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/content-viewer.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/content-viewer.component.ts (88%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/image-viewer/image-viewer.component.html (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/image-viewer/image-viewer.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/image-viewer/image-viewer.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/image-viewer/image-viewer.component.ts (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/video-viewer/video-viewer.component.html (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/video-viewer/video-viewer.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/video-viewer/video-viewer.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{file-multiview/file-gallery => file}/content-viewer/video-viewer/video-viewer.component.ts (100%) rename mediarepo-ui/src/app/components/shared/{context-menu => file}/file-context-menu/file-context-menu.component.html (100%) rename mediarepo-ui/src/app/components/shared/{context-menu => file}/file-context-menu/file-context-menu.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{context-menu => file}/file-context-menu/file-context-menu.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{context-menu => file}/file-context-menu/file-context-menu.component.ts (93%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme.scss (88%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.html (72%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.ts (84%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-gallery/file-gallery.component.ts (95%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid-entry/GridEntry.ts (56%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme.scss (88%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.ts (92%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-grid/file-grid.component.ts (97%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-multiview.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-multiview.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-multiview.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-multiview/file-multiview.component.ts (96%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-thumbnail/file-thumbnail.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-thumbnail/file-thumbnail.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-thumbnail/file-thumbnail.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => file}/file-thumbnail/file-thumbnail.component.ts (87%) create mode 100644 mediarepo-ui/src/app/components/shared/file/file.module.ts diff --git a/mediarepo-ui/src/app/components/core/core.module.ts b/mediarepo-ui/src/app/components/core/core.module.ts index 998d6d9..6daf133 100644 --- a/mediarepo-ui/src/app/components/core/core.module.ts +++ b/mediarepo-ui/src/app/components/core/core.module.ts @@ -23,6 +23,17 @@ import * as materialIcons from "@ng-icons/material-icons"; import {MatMenuModule} from "@angular/material/menu"; import {InputModule} from "../shared/input/input.module"; import {SidebarModule} from "../shared/sidebar/sidebar.module"; +import {FileModule} from "../shared/file/file.module"; +import {AppCommonModule} from "../shared/app-common/app-common.module"; +import {MatFormFieldModule} from "@angular/material/form-field"; +import {FormsModule, ReactiveFormsModule} from "@angular/forms"; +import {RepositoryCardComponent} from "./repositories-tab/repository-card/repository-card.component"; +import {AddRepositoryDialogComponent} from "./repositories-tab/add-repository-dialog/add-repository-dialog.component"; +import {MatCardModule} from "@angular/material/card"; +import {MatListModule} from "@angular/material/list"; +import {MatDialogModule} from "@angular/material/dialog"; +import {MatTooltipModule} from "@angular/material/tooltip"; +import {MatInputModule} from "@angular/material/input"; @NgModule({ @@ -34,6 +45,8 @@ import {SidebarModule} from "../shared/sidebar/sidebar.module"; ImportTabComponent, ImportTabSidebarComponent, FilesystemImportComponent, + RepositoryCardComponent, + AddRepositoryDialogComponent, ], exports: [ CoreComponent @@ -56,6 +69,14 @@ import {SidebarModule} from "../shared/sidebar/sidebar.module"; MatRippleModule, InputModule, SidebarModule, + FileModule, + AppCommonModule, + ReactiveFormsModule, + MatCardModule, + MatListModule, + MatDialogModule, + MatTooltipModule, + MatInputModule, ] }) export class CoreModule { diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/repository-card/repository-card.component.ts b/mediarepo-ui/src/app/components/core/repositories-tab/repository-card/repository-card.component.ts index 2d52f79..e3adbdb 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/repository-card/repository-card.component.ts +++ b/mediarepo-ui/src/app/components/core/repositories-tab/repository-card/repository-card.component.ts @@ -4,8 +4,8 @@ import {RepositoryService} from "../../../../services/repository/repository.serv import {Router} from "@angular/router"; import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; import {MatDialog} from "@angular/material/dialog"; -import {ConfirmDialogComponent} from "../../../shared/confirm-dialog/confirm-dialog.component"; -import {BusyIndicatorComponent} from "../../../shared/busy-indicator/busy-indicator.component"; +import {ConfirmDialogComponent} from "../../../shared/app-common/confirm-dialog/confirm-dialog.component"; +import {BusyIndicatorComponent} from "../../../shared/app-common/busy-indicator/busy-indicator.component"; @Component({ selector: "app-repository-card", diff --git a/mediarepo-ui/src/app/components/shared/app-common/app-common.module.ts b/mediarepo-ui/src/app/components/shared/app-common/app-common.module.ts new file mode 100644 index 0000000..ccf0213 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/app-common/app-common.module.ts @@ -0,0 +1,37 @@ +import {NgModule} from "@angular/core"; +import {ConfirmDialogComponent} from "./confirm-dialog/confirm-dialog.component"; +import {BusyIndicatorComponent} from "./busy-indicator/busy-indicator.component"; +import {ContextMenuComponent} from "./context-menu/context-menu.component"; +import {CommonModule} from "@angular/common"; +import {NgIconsModule} from "@ng-icons/core"; +import {MatProgressSpinnerModule} from "@angular/material/progress-spinner"; +import {MatButtonModule} from "@angular/material/button"; +import {MatDialogModule} from "@angular/material/dialog"; +import {MatMenuModule} from "@angular/material/menu"; +import {ContentAwareImageComponent} from "./content-aware-image/content-aware-image.component"; + + +@NgModule({ + declarations: [ + ConfirmDialogComponent, + BusyIndicatorComponent, + ContextMenuComponent, + ContentAwareImageComponent, + ], + exports: [ + ConfirmDialogComponent, + BusyIndicatorComponent, + ContextMenuComponent, + ContentAwareImageComponent, + ], + imports: [ + CommonModule, + NgIconsModule.withIcons({}), + MatProgressSpinnerModule, + MatButtonModule, + MatDialogModule, + MatMenuModule + ] +}) +export class AppCommonModule { +} diff --git a/mediarepo-ui/src/app/components/shared/busy-indicator/busy-indicator.component.html b/mediarepo-ui/src/app/components/shared/app-common/busy-indicator/busy-indicator.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/busy-indicator/busy-indicator.component.html rename to mediarepo-ui/src/app/components/shared/app-common/busy-indicator/busy-indicator.component.html diff --git a/mediarepo-ui/src/app/components/shared/busy-indicator/busy-indicator.component.scss b/mediarepo-ui/src/app/components/shared/app-common/busy-indicator/busy-indicator.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/busy-indicator/busy-indicator.component.scss rename to mediarepo-ui/src/app/components/shared/app-common/busy-indicator/busy-indicator.component.scss diff --git a/mediarepo-ui/src/app/components/shared/busy-indicator/busy-indicator.component.spec.ts b/mediarepo-ui/src/app/components/shared/app-common/busy-indicator/busy-indicator.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/busy-indicator/busy-indicator.component.spec.ts rename to mediarepo-ui/src/app/components/shared/app-common/busy-indicator/busy-indicator.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/busy-indicator/busy-indicator.component.ts b/mediarepo-ui/src/app/components/shared/app-common/busy-indicator/busy-indicator.component.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/busy-indicator/busy-indicator.component.ts rename to mediarepo-ui/src/app/components/shared/app-common/busy-indicator/busy-indicator.component.ts diff --git a/mediarepo-ui/src/app/components/shared/confirm-dialog/confirm-dialog.component.html b/mediarepo-ui/src/app/components/shared/app-common/confirm-dialog/confirm-dialog.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/confirm-dialog/confirm-dialog.component.html rename to mediarepo-ui/src/app/components/shared/app-common/confirm-dialog/confirm-dialog.component.html diff --git a/mediarepo-ui/src/app/components/shared/confirm-dialog/confirm-dialog.component.scss b/mediarepo-ui/src/app/components/shared/app-common/confirm-dialog/confirm-dialog.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/confirm-dialog/confirm-dialog.component.scss rename to mediarepo-ui/src/app/components/shared/app-common/confirm-dialog/confirm-dialog.component.scss diff --git a/mediarepo-ui/src/app/components/shared/confirm-dialog/confirm-dialog.component.spec.ts b/mediarepo-ui/src/app/components/shared/app-common/confirm-dialog/confirm-dialog.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/confirm-dialog/confirm-dialog.component.spec.ts rename to mediarepo-ui/src/app/components/shared/app-common/confirm-dialog/confirm-dialog.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/confirm-dialog/confirm-dialog.component.ts b/mediarepo-ui/src/app/components/shared/app-common/confirm-dialog/confirm-dialog.component.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/confirm-dialog/confirm-dialog.component.ts rename to mediarepo-ui/src/app/components/shared/app-common/confirm-dialog/confirm-dialog.component.ts diff --git a/mediarepo-ui/src/app/components/shared/content-aware-image/content-aware-image.component.html b/mediarepo-ui/src/app/components/shared/app-common/content-aware-image/content-aware-image.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/content-aware-image/content-aware-image.component.html rename to mediarepo-ui/src/app/components/shared/app-common/content-aware-image/content-aware-image.component.html diff --git a/mediarepo-ui/src/app/components/shared/content-aware-image/content-aware-image.component.scss b/mediarepo-ui/src/app/components/shared/app-common/content-aware-image/content-aware-image.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/content-aware-image/content-aware-image.component.scss rename to mediarepo-ui/src/app/components/shared/app-common/content-aware-image/content-aware-image.component.scss diff --git a/mediarepo-ui/src/app/components/shared/content-aware-image/content-aware-image.component.spec.ts b/mediarepo-ui/src/app/components/shared/app-common/content-aware-image/content-aware-image.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/content-aware-image/content-aware-image.component.spec.ts rename to mediarepo-ui/src/app/components/shared/app-common/content-aware-image/content-aware-image.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/content-aware-image/content-aware-image.component.ts b/mediarepo-ui/src/app/components/shared/app-common/content-aware-image/content-aware-image.component.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/content-aware-image/content-aware-image.component.ts rename to mediarepo-ui/src/app/components/shared/app-common/content-aware-image/content-aware-image.component.ts diff --git a/mediarepo-ui/src/app/components/shared/context-menu/context-menu.component.html b/mediarepo-ui/src/app/components/shared/app-common/context-menu/context-menu.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/context-menu/context-menu.component.html rename to mediarepo-ui/src/app/components/shared/app-common/context-menu/context-menu.component.html diff --git a/mediarepo-ui/src/app/components/shared/context-menu/context-menu.component.scss b/mediarepo-ui/src/app/components/shared/app-common/context-menu/context-menu.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/context-menu/context-menu.component.scss rename to mediarepo-ui/src/app/components/shared/app-common/context-menu/context-menu.component.scss diff --git a/mediarepo-ui/src/app/components/shared/context-menu/context-menu.component.spec.ts b/mediarepo-ui/src/app/components/shared/app-common/context-menu/context-menu.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/context-menu/context-menu.component.spec.ts rename to mediarepo-ui/src/app/components/shared/app-common/context-menu/context-menu.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/context-menu/context-menu.component.ts b/mediarepo-ui/src/app/components/shared/app-common/context-menu/context-menu.component.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/context-menu/context-menu.component.ts rename to mediarepo-ui/src/app/components/shared/app-common/context-menu/context-menu.component.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component.html b/mediarepo-ui/src/app/components/shared/file/content-viewer/audio-viewer/audio-viewer.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component.html rename to mediarepo-ui/src/app/components/shared/file/content-viewer/audio-viewer/audio-viewer.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component.scss b/mediarepo-ui/src/app/components/shared/file/content-viewer/audio-viewer/audio-viewer.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component.scss rename to mediarepo-ui/src/app/components/shared/file/content-viewer/audio-viewer/audio-viewer.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/audio-viewer/audio-viewer.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/content-viewer/audio-viewer/audio-viewer.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/audio-viewer/audio-viewer.component.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component.ts rename to mediarepo-ui/src/app/components/shared/file/content-viewer/audio-viewer/audio-viewer.component.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.html b/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.html rename to mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.scss b/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.scss rename to mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.ts similarity index 88% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.ts rename to mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.ts index 897d3bc..670f285 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/content-viewer.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.ts @@ -8,11 +8,11 @@ import { ViewChild } from "@angular/core"; import {SafeResourceUrl} from "@angular/platform-browser"; -import {File} from "../../../../../models/File"; -import {FileService} from "../../../../../services/file/file.service"; -import {FileHelper} from "../../../../../services/file/file.helper"; -import {ErrorBrokerService} from "../../../../../services/error-broker/error-broker.service"; -import {BusyIndicatorComponent} from "../../../busy-indicator/busy-indicator.component"; +import {File} from "../../../../models/File"; +import {FileService} from "../../../../services/file/file.service"; +import {FileHelper} from "../../../../services/file/file.helper"; +import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; +import {BusyIndicatorComponent} from "../../app-common/busy-indicator/busy-indicator.component"; type ContentType = "image" | "video" | "audio" | "other"; diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component.html b/mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component.html rename to mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component.scss b/mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component.scss rename to mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component.ts rename to mediarepo-ui/src/app/components/shared/file/content-viewer/image-viewer/image-viewer.component.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component.html b/mediarepo-ui/src/app/components/shared/file/content-viewer/video-viewer/video-viewer.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component.html rename to mediarepo-ui/src/app/components/shared/file/content-viewer/video-viewer/video-viewer.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component.scss b/mediarepo-ui/src/app/components/shared/file/content-viewer/video-viewer/video-viewer.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component.scss rename to mediarepo-ui/src/app/components/shared/file/content-viewer/video-viewer/video-viewer.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/video-viewer/video-viewer.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/content-viewer/video-viewer/video-viewer.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/video-viewer/video-viewer.component.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component.ts rename to mediarepo-ui/src/app/components/shared/file/content-viewer/video-viewer/video-viewer.component.ts diff --git a/mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.html b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.html rename to mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.html diff --git a/mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.scss b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.scss rename to mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.scss diff --git a/mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.ts b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts similarity index 93% rename from mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.ts rename to mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts index 2cdec53..b28f4e2 100644 --- a/mediarepo-ui/src/app/components/shared/context-menu/file-context-menu/file-context-menu.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts @@ -1,6 +1,6 @@ import {Component, ViewChild} from "@angular/core"; import {File} from "../../../../models/File"; -import {ContextMenuComponent} from "../context-menu.component"; +import {ContextMenuComponent} from "../../app-common/context-menu/context-menu.component"; import {clipboard} from "@tauri-apps/api"; import {FileService} from "../../../../services/file/file.service"; import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme.scss b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme.scss similarity index 88% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme.scss rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme.scss index 1317f49..a3e05a9 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme.scss +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme.scss @@ -1,5 +1,5 @@ @use 'sass:map'; -@use '../../../../../../../node_modules/@angular/material/index' as mat; +@use '../../../../../../../../node_modules/@angular/material/index' as mat; @mixin color($theme) { $color-config: mat.get-color-config($theme); diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.html b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.html similarity index 72% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.html rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.html index db630c7..6fd5788 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.html +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.html @@ -1,4 +1,3 @@
-
diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.scss b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.scss rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.ts similarity index 84% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.ts index 2835f83..91df5f9 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component.ts @@ -8,11 +8,11 @@ import { Output, SimpleChanges } from "@angular/core"; -import {File} from "../../../../../models/File"; -import {FileService} from "../../../../../services/file/file.service"; +import {File} from "../../../../../../models/File"; +import {FileService} from "../../../../../../services/file/file.service"; import {DomSanitizer, SafeResourceUrl} from "@angular/platform-browser"; -import {ErrorBrokerService} from "../../../../../services/error-broker/error-broker.service"; -import {Selectable} from "../../../../../models/Selectable"; +import {ErrorBrokerService} from "../../../../../../services/error-broker/error-broker.service"; +import {Selectable} from "../../../../../../models/Selectable"; @Component({ selector: "app-file-gallery-entry", diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.html b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.html rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.scss b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.scss rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.ts similarity index 95% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.ts index 20fb75d..ba58e47 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-gallery/file-gallery.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.ts @@ -9,12 +9,12 @@ import { SimpleChanges, ViewChild } from "@angular/core"; -import {File} from "../../../../models/File"; -import {FileService} from "../../../../services/file/file.service"; +import {File} from "../../../../../models/File"; +import {FileService} from "../../../../../services/file/file.service"; import {SafeResourceUrl} from "@angular/platform-browser"; -import {Selectable} from "../../../../models/Selectable"; +import {Selectable} from "../../../../../models/Selectable"; import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling"; -import {TabService} from "../../../../services/tab/tab.service"; +import {TabService} from "../../../../../services/tab/tab.service"; @Component({ selector: "app-file-gallery", diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/GridEntry.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/GridEntry.ts similarity index 56% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/GridEntry.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/GridEntry.ts index c2efa5d..ce7965f 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/GridEntry.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/GridEntry.ts @@ -1,4 +1,4 @@ -import {File} from "../../../../../models/File"; +import {File} from "../../../../../../models/File"; export type GridEntry = { file: File, diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme.scss b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme.scss similarity index 88% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme.scss rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme.scss index 31cbb09..1ac9cbb 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme.scss +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme.scss @@ -1,5 +1,5 @@ @use 'sass:map'; -@use '../../../../../../../node_modules/@angular/material/index' as mat; +@use '../../../../../../../../node_modules/@angular/material/index' as mat; @mixin color($theme) { $color-config: mat.get-color-config($theme); diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.html b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.html rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.scss b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.scss rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.ts similarity index 92% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.ts index 8dcb26a..82e322d 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component.ts @@ -9,8 +9,8 @@ import { SimpleChanges, ViewChild } from "@angular/core"; -import {File} from "../../../../../models/File"; -import {FileService} from "../../../../../services/file/file.service"; +import {File} from "../../../../../../models/File"; +import {FileService} from "../../../../../../services/file/file.service"; import {SafeResourceUrl} from "@angular/platform-browser"; import {GridEntry} from "./GridEntry"; diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.html b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.html rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.scss b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.scss rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.ts similarity index 97% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.ts index ffbd050..fba4a8e 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-grid/file-grid.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.ts @@ -10,12 +10,12 @@ import { SimpleChanges, ViewChild } from "@angular/core"; -import {File} from "../../../../models/File"; +import {File} from "../../../../../models/File"; import {FileGridEntryComponent} from "./file-grid-entry/file-grid-entry.component"; import {GridEntry} from "./file-grid-entry/GridEntry"; import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling"; -import {TabService} from "../../../../services/tab/tab.service"; -import {FileService} from "../../../../services/file/file.service"; +import {TabService} from "../../../../../services/tab/tab.service"; +import {FileService} from "../../../../../services/file/file.service"; @Component({ selector: "app-file-grid", diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.html b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.html rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.scss b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.scss rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts similarity index 96% rename from mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.ts rename to mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts index 580b7bd..5f30323 100644 --- a/mediarepo-ui/src/app/components/shared/file-multiview/file-multiview.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts @@ -1,5 +1,5 @@ import {Component, EventEmitter, Input, Output} from "@angular/core"; -import {File} from "../../../models/File"; +import {File} from "../../../../models/File"; @Component({ selector: "app-file-multiview", diff --git a/mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.html b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.html rename to mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.scss b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.scss rename to mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.spec.ts b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.spec.ts rename to mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.ts b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.ts similarity index 87% rename from mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.ts rename to mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.ts index d25c8a5..9eb62bb 100644 --- a/mediarepo-ui/src/app/components/shared/file-thumbnail/file-thumbnail.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.ts @@ -5,9 +5,9 @@ import { OnInit, SimpleChanges } from "@angular/core"; -import {File} from "../../../models/File"; -import {FileService} from "../../../services/file/file.service"; -import {FileHelper} from "../../../services/file/file.helper"; +import {File} from "../../../../models/File"; +import {FileService} from "../../../../services/file/file.service"; +import {FileHelper} from "../../../../services/file/file.helper"; import {SafeResourceUrl} from "@angular/platform-browser"; @Component({ diff --git a/mediarepo-ui/src/app/components/shared/file/file.module.ts b/mediarepo-ui/src/app/components/shared/file/file.module.ts new file mode 100644 index 0000000..4ff4118 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/file/file.module.ts @@ -0,0 +1,68 @@ +import { NgModule } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import {FileMultiviewComponent} from "./file-multiview/file-multiview.component"; +import {FileGridComponent} from "./file-multiview/file-grid/file-grid.component"; +import {FileGalleryComponent} from "./file-multiview/file-gallery/file-gallery.component"; +import {FileGalleryEntryComponent} from "./file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component"; +import {FileGridEntryComponent} from "./file-multiview/file-grid/file-grid-entry/file-grid-entry.component"; +import {FileContextMenuComponent} from "./file-context-menu/file-context-menu.component"; +import {FileThumbnailComponent} from "./file-thumbnail/file-thumbnail.component"; +import {ContentViewerComponent} from "./content-viewer/content-viewer.component"; +import {AudioViewerComponent} from "./content-viewer/audio-viewer/audio-viewer.component"; +import {ImageViewerComponent} from "./content-viewer/image-viewer/image-viewer.component"; +import {VideoViewerComponent} from "./content-viewer/video-viewer/video-viewer.component"; +import {AppCommonModule} from "../app-common/app-common.module"; +import {MatSliderModule} from "@angular/material/slider"; +import {NgIconsModule} from "@ng-icons/core"; +import {MatRefresh, MatClose, MatImage, MatMovie, MatGif, MatAudiotrack, MatDescription} from "@ng-icons/material-icons"; +import {DragDropModule} from "@angular/cdk/drag-drop"; +import {MatButtonModule} from "@angular/material/button"; +import {MatMenuModule} from "@angular/material/menu"; +import {MatDividerModule} from "@angular/material/divider"; +import {FlexModule} from "@angular/flex-layout"; +import {ScrollingModule} from "@angular/cdk/scrolling"; +import {MatProgressSpinnerModule} from "@angular/material/progress-spinner"; +import {MatCardModule} from "@angular/material/card"; + + +@NgModule({ + declarations: [ + FileMultiviewComponent, + FileGridComponent, + FileGalleryComponent, + FileGalleryEntryComponent, + FileGridEntryComponent, + FileContextMenuComponent, + FileThumbnailComponent, + ContentViewerComponent, + AudioViewerComponent, + ImageViewerComponent, + VideoViewerComponent, + ], + exports: [ + FileMultiviewComponent + ], + imports: [ + CommonModule, + AppCommonModule, + MatSliderModule, + NgIconsModule.withIcons({ + MatRefresh, + MatClose, + MatImage, + MatMovie, + MatGif, + MatAudiotrack, + MatDescription + }), + DragDropModule, + MatButtonModule, + MatMenuModule, + MatDividerModule, + FlexModule, + ScrollingModule, + MatProgressSpinnerModule, + MatCardModule + ] +}) +export class FileModule { } diff --git a/mediarepo-ui/src/app/components/shared/shared.module.ts b/mediarepo-ui/src/app/components/shared/shared.module.ts index 4702210..bae4428 100644 --- a/mediarepo-ui/src/app/components/shared/shared.module.ts +++ b/mediarepo-ui/src/app/components/shared/shared.module.ts @@ -1,28 +1,6 @@ import {NgModule} from "@angular/core"; import {CommonModule} from "@angular/common"; -import {RepositoryCardComponent} from "../core/repositories-tab/repository-card/repository-card.component"; -import {FileGridComponent} from "./file-multiview/file-grid/file-grid.component"; -import {FileGridEntryComponent} from "./file-multiview/file-grid/file-grid-entry/file-grid-entry.component"; -import {FileSearchComponent} from "./sidebar/file-search/file-search.component"; -import {SortDialogComponent} from "./sidebar/file-search/sort-dialog/sort-dialog.component"; -import {FileGalleryComponent} from "./file-multiview/file-gallery/file-gallery.component"; -import {FileGalleryEntryComponent} from "./file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component"; -import {ContentAwareImageComponent} from "./content-aware-image/content-aware-image.component"; -import {AddRepositoryDialogComponent} from "../core/repositories-tab/add-repository-dialog/add-repository-dialog.component"; -import {ConfirmDialogComponent} from "./confirm-dialog/confirm-dialog.component"; import {TagItemComponent} from "./tag-item/tag-item.component"; -import {FileEditComponent} from "./sidebar/file-edit/file-edit.component"; -import {FilterDialogComponent} from "./sidebar/file-search/filter-dialog/filter-dialog.component"; -import {TagFilterListItemComponent} from "./sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component"; -import {ContextMenuComponent} from "./context-menu/context-menu.component"; -import {FileContextMenuComponent} from "./context-menu/file-context-menu/file-context-menu.component"; -import {ContentViewerComponent} from "./file-multiview/file-gallery/content-viewer/content-viewer.component"; -import {ImageViewerComponent} from "./file-multiview/file-gallery/content-viewer/image-viewer/image-viewer.component"; -import {VideoViewerComponent} from "./file-multiview/file-gallery/content-viewer/video-viewer/video-viewer.component"; -import {AudioViewerComponent} from "./file-multiview/file-gallery/content-viewer/audio-viewer/audio-viewer.component"; -import {BusyIndicatorComponent} from "./busy-indicator/busy-indicator.component"; -import {FileThumbnailComponent} from "./file-thumbnail/file-thumbnail.component"; -import {FileMultiviewComponent} from "./file-multiview/file-multiview.component"; import {MatCardModule} from "@angular/material/card"; import {MatListModule} from "@angular/material/list"; import {MatButtonModule} from "@angular/material/button"; @@ -56,38 +34,15 @@ import {AppRoutingModule} from "../../app-routing.module"; import {NgIconsModule} from "@ng-icons/core"; import * as materialIcons from "@ng-icons/material-icons"; import {InputModule} from "./input/input.module"; +import {AppCommonModule} from "./app-common/app-common.module"; @NgModule({ declarations: [ - RepositoryCardComponent, - FileGridComponent, - FileGridEntryComponent, - SortDialogComponent, - FileGalleryComponent, - FileGalleryEntryComponent, - ContentAwareImageComponent, - AddRepositoryDialogComponent, - ConfirmDialogComponent, TagItemComponent, - FilterDialogComponent, - TagFilterListItemComponent, - ContextMenuComponent, - FileContextMenuComponent, - ContentViewerComponent, - ImageViewerComponent, - VideoViewerComponent, - AudioViewerComponent, - BusyIndicatorComponent, - FileThumbnailComponent, - FileMultiviewComponent, ], exports: [ - FileMultiviewComponent, - BusyIndicatorComponent, TagItemComponent, - ContextMenuComponent, - RepositoryCardComponent ], imports: [ CommonModule, @@ -124,6 +79,7 @@ import {InputModule} from "./input/input.module"; AppRoutingModule, NgIconsModule.withIcons({...materialIcons}), InputModule, + AppCommonModule, ] }) export class SharedModule { diff --git a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts index 492de1b..0ec097f 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts @@ -14,12 +14,22 @@ import {MatDividerModule} from "@angular/material/divider"; import {FlexModule} from "@angular/flex-layout"; import {MatSelectModule} from "@angular/material/select"; import {MatInputModule} from "@angular/material/input"; +import {TagFilterListItemComponent} from "./file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component"; +import {SortDialogComponent} from "./file-search/sort-dialog/sort-dialog.component"; +import {FilterDialogComponent} from "./file-search/filter-dialog/filter-dialog.component"; +import {MatListModule} from "@angular/material/list"; +import {MatDialogModule} from "@angular/material/dialog"; +import {AppCommonModule} from "../app-common/app-common.module"; +import {DragDropModule} from "@angular/cdk/drag-drop"; @NgModule({ declarations: [ FileEditComponent, FileSearchComponent, + TagFilterListItemComponent, + SortDialogComponent, + FilterDialogComponent, ], exports: [ FileEditComponent, @@ -45,6 +55,10 @@ import {MatInputModule} from "@angular/material/input"; FlexModule, MatSelectModule, MatInputModule, + MatListModule, + MatDialogModule, + AppCommonModule, + DragDropModule, ] }) export class SidebarModule { diff --git a/mediarepo-ui/src/styles.scss b/mediarepo-ui/src/styles.scss index e4ea147..44e654a 100644 --- a/mediarepo-ui/src/styles.scss +++ b/mediarepo-ui/src/styles.scss @@ -1,9 +1,9 @@ @use 'sass:map'; @use "~@angular/material" as mat; @use 'src/app/app.component-theme' as app; -@use 'app/components/shared/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme' as file-grid-entry; +@use 'app/components/shared/file/file-multiview/file-grid/file-grid-entry/file-grid-entry.component-theme' as file-grid-entry; @use 'app/components/shared/sidebar/file-search/file-search.component-theme' as file-search; -@use "app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme" as gallery-entry; +@use "app/components/shared/file/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme" as gallery-entry; @include mat.core();