diff --git a/mediarepo-ui/src/app/components/core/core.module.ts b/mediarepo-ui/src/app/components/core/core.module.ts index 1430513..045ebbb 100644 --- a/mediarepo-ui/src/app/components/core/core.module.ts +++ b/mediarepo-ui/src/app/components/core/core.module.ts @@ -6,7 +6,7 @@ import {FilesTabComponent} from "./files-tab/files-tab.component"; import {FilesTabSidebarComponent} from "./files-tab/files-tab-sidebar/files-tab-sidebar.component"; import {ImportTabComponent} from "./import-tab/import-tab.component"; import {ImportTabSidebarComponent} from "./import-tab/import-tab-sidebar/import-tab-sidebar.component"; -import {FilesystemImportComponent} from "./import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component"; +import {FilesystemImportComponent} from "../shared/sidebar/file-import/filesystem-import/filesystem-import.component"; import {MatButtonModule} from "@angular/material/button"; import {MatSidenavModule} from "@angular/material/sidenav"; import {MatProgressBarModule} from "@angular/material/progress-bar"; @@ -43,12 +43,11 @@ import {TagModule} from "../shared/tag/tag.module"; FilesTabSidebarComponent, ImportTabComponent, ImportTabSidebarComponent, - FilesystemImportComponent, RepositoryCardComponent, AddRepositoryDialogComponent, ], exports: [ - CoreComponent + CoreComponent, ], imports: [ CommonModule, diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html index 980e407..069b7f7 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html @@ -1,21 +1,7 @@
-
-
- - Import Type - - Filesystem - - - -
-
- -
-
+
diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.scss b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.scss index 048876d..b6d4f1c 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.scss +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.scss @@ -10,26 +10,3 @@ mat-tab-group, mat-tab { height: 100%; overflow: hidden; } - -.import-type-select-wrapper { - width: 100%; - - .import-type-select { - width: calc(100% - 2em); - height: calc(100% - 2em); - margin: 1em; - - mat-select { - height: 100%; - } - } -} - -.import-sidebar-tab-inner { - width: 100%; - height: 100%; -} - -.import-configuration { - padding: 1em; -} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.html new file mode 100644 index 0000000..39a6bad --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.html @@ -0,0 +1,15 @@ +
+
+ + Import Type + + Filesystem + + + +
+
+ +
+
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.scss new file mode 100644 index 0000000..01f4456 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.scss @@ -0,0 +1,22 @@ +.import-type-select-wrapper { + width: 100%; + + .import-type-select { + width: calc(100% - 2em); + height: calc(100% - 2em); + margin: 1em; + + mat-select { + height: 100%; + } + } +} + +.file-import-inner { + width: 100%; + height: 100%; +} + +.import-configuration { + padding: 1em; +} diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts new file mode 100644 index 0000000..e28b214 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FileImportComponent } from './file-import.component'; + +describe('FileImportComponent', () => { + let component: FileImportComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ FileImportComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(FileImportComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.ts new file mode 100644 index 0000000..a6927e4 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.ts @@ -0,0 +1,16 @@ +import {Component, EventEmitter, OnInit, Output} from "@angular/core"; +import {File} from "../../../../models/File"; + +@Component({ + selector: "app-file-import", + templateUrl: "./file-import.component.html", + styleUrls: ["./file-import.component.scss"] +}) +export class FileImportComponent { + + @Output() fileImported = new EventEmitter(); + @Output() importFinished = new EventEmitter(); + + constructor() { + } +} diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.html similarity index 100% rename from mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.html rename to mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.html diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.scss rename to mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.scss diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.spec.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.spec.ts diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts similarity index 100% rename from mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.ts rename to mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts 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 5927d6f..f2d08d8 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts @@ -21,6 +21,10 @@ import {MatDialogModule} from "@angular/material/dialog"; import {AppCommonModule} from "../app-common/app-common.module"; import {DragDropModule} from "@angular/cdk/drag-drop"; import {TagModule} from "../tag/tag.module"; +import { FileImportComponent } from "./file-import/file-import.component"; +import {FilesystemImportComponent} from "./file-import/filesystem-import/filesystem-import.component"; +import {MatCheckboxModule} from "@angular/material/checkbox"; +import {MatProgressBarModule} from "@angular/material/progress-bar"; @NgModule({ @@ -30,10 +34,13 @@ import {TagModule} from "../tag/tag.module"; TagFilterListItemComponent, SortDialogComponent, FilterDialogComponent, + FileImportComponent, + FilesystemImportComponent, ], exports: [ FileEditComponent, - FileSearchComponent + FileSearchComponent, + FileImportComponent ], imports: [ CommonModule, @@ -59,6 +66,8 @@ import {TagModule} from "../tag/tag.module"; AppCommonModule, DragDropModule, TagModule, + MatCheckboxModule, + MatProgressBarModule, ] }) export class SidebarModule {