diff --git a/mediarepo-ui/src/app/components/core/core.module.ts b/mediarepo-ui/src/app/components/core/core.module.ts index 1c3a9cc..998d6d9 100644 --- a/mediarepo-ui/src/app/components/core/core.module.ts +++ b/mediarepo-ui/src/app/components/core/core.module.ts @@ -22,6 +22,7 @@ import {NgIconsModule} from "@ng-icons/core"; 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"; @NgModule({ @@ -54,6 +55,7 @@ import {InputModule} from "../shared/input/input.module"; MatMenuModule, MatRippleModule, InputModule, + SidebarModule, ] }) export class CoreModule { diff --git a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts index 27d9a5b..83dbdc4 100644 --- a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts +++ b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts @@ -12,9 +12,9 @@ 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 {FileSearchComponent} from "../../../shared/file-search/file-search.component"; +import {FileSearchComponent} from "../../../shared/sidebar/file-search/file-search.component"; import {RepositoryService} from "../../../../services/repository/repository.service"; -import {FileEditComponent} from "../../../shared/file-edit/file-edit.component"; +import {FileEditComponent} from "../../../shared/sidebar/file-edit/file-edit.component"; import {clipboard} from "@tauri-apps/api"; @Component({ diff --git a/mediarepo-ui/src/app/components/shared/shared.module.ts b/mediarepo-ui/src/app/components/shared/shared.module.ts index 1bae818..4702210 100644 --- a/mediarepo-ui/src/app/components/shared/shared.module.ts +++ b/mediarepo-ui/src/app/components/shared/shared.module.ts @@ -3,17 +3,17 @@ 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 "./file-search/file-search.component"; -import {SortDialogComponent} from "./file-search/sort-dialog/sort-dialog.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 "./file-edit/file-edit.component"; -import {FilterDialogComponent} from "./file-search/filter-dialog/filter-dialog.component"; -import {TagFilterListItemComponent} from "./file-search/filter-dialog/tag-filter-list-item/tag-filter-list-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"; @@ -63,7 +63,6 @@ import {InputModule} from "./input/input.module"; RepositoryCardComponent, FileGridComponent, FileGridEntryComponent, - FileSearchComponent, SortDialogComponent, FileGalleryComponent, FileGalleryEntryComponent, @@ -71,7 +70,6 @@ import {InputModule} from "./input/input.module"; AddRepositoryDialogComponent, ConfirmDialogComponent, TagItemComponent, - FileEditComponent, FilterDialogComponent, TagFilterListItemComponent, ContextMenuComponent, @@ -87,9 +85,7 @@ import {InputModule} from "./input/input.module"; exports: [ FileMultiviewComponent, BusyIndicatorComponent, - FileSearchComponent, TagItemComponent, - FileEditComponent, ContextMenuComponent, RepositoryCardComponent ], diff --git a/mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.html rename to mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.scss rename to mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.spec.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.ts similarity index 95% rename from mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.ts index dc5c59a..0bd4341 100644 --- a/mediarepo-ui/src/app/components/shared/file-edit/file-edit.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.ts @@ -7,11 +7,11 @@ import { SimpleChanges, ViewChild } from "@angular/core"; -import {File} from "../../../models/File"; -import {Tag} from "../../../models/Tag"; +import {File} from "../../../../models/File"; +import {Tag} from "../../../../models/Tag"; import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling"; -import {TagService} from "../../../services/tag/tag.service"; -import {FileService} from "../../../services/file/file.service"; +import {TagService} from "../../../../services/tag/tag.service"; +import {FileService} from "../../../../services/file/file.service"; @Component({ selector: "app-file-edit", diff --git a/mediarepo-ui/src/app/components/shared/file-search/file-search.component-theme.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component-theme.scss similarity index 91% rename from mediarepo-ui/src/app/components/shared/file-search/file-search.component-theme.scss rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component-theme.scss index 2bddab0..282dde1 100644 --- a/mediarepo-ui/src/app/components/shared/file-search/file-search.component-theme.scss +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.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-search/file-search.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/file-search.component.html rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-search/file-search.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/file-search.component.scss rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-search/file-search.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/file-search.component.spec.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts similarity index 91% rename from mediarepo-ui/src/app/components/shared/file-search/file-search.component.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts index 06a6fbb..7245669 100644 --- a/mediarepo-ui/src/app/components/shared/file-search/file-search.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts @@ -8,18 +8,18 @@ import { Output, ViewChild } from "@angular/core"; -import {FileService} from "../../../services/file/file.service"; -import {TagQuery} from "../../../models/TagQuery"; -import {SortKey} from "../../../models/SortKey"; +import {FileService} from "../../../../services/file/file.service"; +import {TagQuery} from "../../../../models/TagQuery"; +import {SortKey} from "../../../../models/SortKey"; import {MatDialog} from "@angular/material/dialog"; import {SortDialogComponent} from "./sort-dialog/sort-dialog.component"; -import {ErrorBrokerService} from "../../../services/error-broker/error-broker.service"; +import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; import { FilterExpression, SingleFilterExpression -} from "../../../models/FilterExpression"; +} from "../../../../models/FilterExpression"; import {FilterDialogComponent} from "./filter-dialog/filter-dialog.component"; -import {Tag} from "../../../models/Tag"; +import {Tag} from "../../../../models/Tag"; @Component({ diff --git a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.html rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.scss rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.spec.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.ts similarity index 96% rename from mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.ts index 1355820..0db9725 100644 --- a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/filter-dialog.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.ts @@ -5,11 +5,11 @@ import { FilterExpression, OrFilterExpression, SingleFilterExpression -} from "../../../../models/FilterExpression"; -import {TagQuery} from "../../../../models/TagQuery"; -import {Tag} from "../../../../models/Tag"; +} from "../../../../../models/FilterExpression"; +import {TagQuery} from "../../../../../models/TagQuery"; +import {Tag} from "../../../../../models/Tag"; import {TagFilterListItemComponent} from "./tag-filter-list-item/tag-filter-list-item.component"; -import {Selectable} from "../../../../models/Selectable"; +import {Selectable} from "../../../../../models/Selectable"; @Component({ selector: "app-filter-dialog", diff --git a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.html rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.scss rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.spec.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.ts similarity index 92% rename from mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.ts index 1b9934d..0fd8b07 100644 --- a/mediarepo-ui/src/app/components/shared/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.component.ts @@ -10,9 +10,9 @@ import { FilterExpression, OrFilterExpression, SingleFilterExpression -} from "../../../../../models/FilterExpression"; -import {TagQuery} from "../../../../../models/TagQuery"; -import {Selectable} from "../../../../../models/Selectable"; +} from "../../../../../../models/FilterExpression"; +import {TagQuery} from "../../../../../../models/TagQuery"; +import {Selectable} from "../../../../../../models/Selectable"; @Component({ selector: "app-tag-filter-list-item", diff --git a/mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.html rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.html diff --git a/mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.scss rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.scss diff --git a/mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.spec.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts similarity index 95% rename from mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts index fc8d48e..3f55069 100644 --- a/mediarepo-ui/src/app/components/shared/file-search/sort-dialog/sort-dialog.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/sort-dialog/sort-dialog.component.ts @@ -1,6 +1,6 @@ import {Component, Inject} from "@angular/core"; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; -import {SortKey} from "../../../../models/SortKey"; +import {SortKey} from "../../../../../models/SortKey"; import {CdkDragDrop, moveItemInArray} from "@angular/cdk/drag-drop"; @Component({ diff --git a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts new file mode 100644 index 0000000..492de1b --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts @@ -0,0 +1,51 @@ +import {NgModule} from "@angular/core"; +import {CommonModule} from "@angular/common"; +import {FileEditComponent} from "./file-edit/file-edit.component"; +import {FileSearchComponent} from "./file-search/file-search.component"; +import {NgIconsModule} from "@ng-icons/core"; +import {MatRemove, MatChangeCircle, MatAddCircle, MatRemoveCircle, MatDeleteSweep, MatFilterAlt} from "@ng-icons/material-icons"; +import {MatRippleModule} from "@angular/material/core"; +import {MatButtonModule} from "@angular/material/button"; +import {InputModule} from "../input/input.module"; +import {ScrollingModule} from "@angular/cdk/scrolling"; +import {MatFormFieldModule} from "@angular/material/form-field"; +import {SharedModule} from "../shared.module"; +import {MatDividerModule} from "@angular/material/divider"; +import {FlexModule} from "@angular/flex-layout"; +import {MatSelectModule} from "@angular/material/select"; +import {MatInputModule} from "@angular/material/input"; + + +@NgModule({ + declarations: [ + FileEditComponent, + FileSearchComponent, + ], + exports: [ + FileEditComponent, + FileSearchComponent + ], + imports: [ + CommonModule, + NgIconsModule.withIcons({ + MatRemove, + MatChangeCircle, + MatAddCircle, + MatRemoveCircle, + MatDeleteSweep, + MatFilterAlt + }), + MatRippleModule, + MatButtonModule, + InputModule, + ScrollingModule, + MatFormFieldModule, + SharedModule, + MatDividerModule, + FlexModule, + MatSelectModule, + MatInputModule, + ] +}) +export class SidebarModule { +} diff --git a/mediarepo-ui/src/styles.scss b/mediarepo-ui/src/styles.scss index dac3ef6..e4ea147 100644 --- a/mediarepo-ui/src/styles.scss +++ b/mediarepo-ui/src/styles.scss @@ -2,7 +2,7 @@ @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-search/file-search.component-theme' as file-search; +@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; @include mat.core();