From 8728fcdc71ba081ae6b275a5568833be68b727fc Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 27 Nov 2021 12:16:22 +0100 Subject: [PATCH] Move tag-item to separate module and delete the now empty shared module Signed-off-by: trivernis --- mediarepo-ui/src/app/app-routing.module.ts | 13 --- mediarepo-ui/src/app/app.component.ts | 2 - mediarepo-ui/src/app/app.module.ts | 2 + .../src/app/components/core/core.module.ts | 7 +- .../repository-card.component.ts | 2 - .../app/components/shared/shared.module.ts | 86 ------------------- .../shared/sidebar/sidebar.module.ts | 4 +- .../tag-item/tag-item.component.html | 0 .../tag-item/tag-item.component.scss | 0 .../tag-item/tag-item.component.spec.ts | 0 .../{ => tag}/tag-item/tag-item.component.ts | 2 +- .../app/components/shared/tag/tag.module.ts | 14 +++ 12 files changed, 22 insertions(+), 110 deletions(-) delete mode 100644 mediarepo-ui/src/app/app-routing.module.ts delete mode 100644 mediarepo-ui/src/app/components/shared/shared.module.ts rename mediarepo-ui/src/app/components/shared/{ => tag}/tag-item/tag-item.component.html (100%) rename mediarepo-ui/src/app/components/shared/{ => tag}/tag-item/tag-item.component.scss (100%) rename mediarepo-ui/src/app/components/shared/{ => tag}/tag-item/tag-item.component.spec.ts (100%) rename mediarepo-ui/src/app/components/shared/{ => tag}/tag-item/tag-item.component.ts (89%) create mode 100644 mediarepo-ui/src/app/components/shared/tag/tag.module.ts diff --git a/mediarepo-ui/src/app/app-routing.module.ts b/mediarepo-ui/src/app/app-routing.module.ts deleted file mode 100644 index 84df263..0000000 --- a/mediarepo-ui/src/app/app-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {NgModule} from "@angular/core"; -import {RouterModule, Routes} from "@angular/router"; -import {CoreComponent} from "./components/core/core.component"; - -const routes: Routes = [ - {path: "", component: CoreComponent}]; - -@NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule] -}) -export class AppRoutingModule { -} diff --git a/mediarepo-ui/src/app/app.component.ts b/mediarepo-ui/src/app/app.component.ts index ab1fbed..3885fcc 100644 --- a/mediarepo-ui/src/app/app.component.ts +++ b/mediarepo-ui/src/app/app.component.ts @@ -1,5 +1,4 @@ import {Component, OnInit} from "@angular/core"; -import {Router} from "@angular/router"; import {RepositoryService} from "./services/repository/repository.service"; import {MatSnackBar} from "@angular/material/snack-bar"; import {ErrorBrokerService} from "./services/error-broker/error-broker.service"; @@ -13,7 +12,6 @@ export class AppComponent implements OnInit { title = "mediarepo-ui"; constructor( - private router: Router, private snackBar: MatSnackBar, private errorBroker: ErrorBrokerService, private repoService: RepositoryService, diff --git a/mediarepo-ui/src/app/app.module.ts b/mediarepo-ui/src/app/app.module.ts index f5897a1..7ec2283 100644 --- a/mediarepo-ui/src/app/app.module.ts +++ b/mediarepo-ui/src/app/app.module.ts @@ -3,6 +3,7 @@ import {BrowserModule} from "@angular/platform-browser"; import {AppComponent} from "./app.component"; import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; import {CoreModule} from "./components/core/core.module"; +import {MatSnackBarModule} from "@angular/material/snack-bar"; @NgModule({ declarations: [ @@ -12,6 +13,7 @@ import {CoreModule} from "./components/core/core.module"; BrowserModule, BrowserAnimationsModule, CoreModule, + MatSnackBarModule, ], providers: [], bootstrap: [AppComponent] diff --git a/mediarepo-ui/src/app/components/core/core.module.ts b/mediarepo-ui/src/app/components/core/core.module.ts index 6daf133..1430513 100644 --- a/mediarepo-ui/src/app/components/core/core.module.ts +++ b/mediarepo-ui/src/app/components/core/core.module.ts @@ -16,7 +16,6 @@ import {FlexModule} from "@angular/flex-layout"; import {MatOptionModule, MatRippleModule} from "@angular/material/core"; import {MatSelectModule} from "@angular/material/select"; import {MatCheckboxModule} from "@angular/material/checkbox"; -import {SharedModule} from "../shared/shared.module"; import {MatDividerModule} from "@angular/material/divider"; import {NgIconsModule} from "@ng-icons/core"; import * as materialIcons from "@ng-icons/material-icons"; @@ -25,8 +24,7 @@ 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 {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"; @@ -34,6 +32,7 @@ import {MatListModule} from "@angular/material/list"; import {MatDialogModule} from "@angular/material/dialog"; import {MatTooltipModule} from "@angular/material/tooltip"; import {MatInputModule} from "@angular/material/input"; +import {TagModule} from "../shared/tag/tag.module"; @NgModule({ @@ -53,7 +52,6 @@ import {MatInputModule} from "@angular/material/input"; ], imports: [ CommonModule, - SharedModule, MatTabsModule, MatSidenavModule, MatOptionModule, @@ -77,6 +75,7 @@ import {MatInputModule} from "@angular/material/input"; MatDialogModule, MatTooltipModule, MatInputModule, + TagModule, ] }) 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 e3adbdb..77eeb02 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 @@ -1,7 +1,6 @@ import {Component, Input, OnDestroy, OnInit, ViewChild} from "@angular/core"; import {Repository} from "../../../../models/Repository"; import {RepositoryService} from "../../../../services/repository/repository.service"; -import {Router} from "@angular/router"; import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; import {MatDialog} from "@angular/material/dialog"; import {ConfirmDialogComponent} from "../../../shared/app-common/confirm-dialog/confirm-dialog.component"; @@ -23,7 +22,6 @@ export class RepositoryCardComponent implements OnInit, OnDestroy { constructor( public repoService: RepositoryService, - private router: Router, private errorBroker: ErrorBrokerService, public dialog: MatDialog) { } diff --git a/mediarepo-ui/src/app/components/shared/shared.module.ts b/mediarepo-ui/src/app/components/shared/shared.module.ts deleted file mode 100644 index bae4428..0000000 --- a/mediarepo-ui/src/app/components/shared/shared.module.ts +++ /dev/null @@ -1,86 +0,0 @@ -import {NgModule} from "@angular/core"; -import {CommonModule} from "@angular/common"; -import {TagItemComponent} from "./tag-item/tag-item.component"; -import {MatCardModule} from "@angular/material/card"; -import {MatListModule} from "@angular/material/list"; -import {MatButtonModule} from "@angular/material/button"; -import {MatToolbarModule} from "@angular/material/toolbar"; -import {MatSnackBarModule} from "@angular/material/snack-bar"; -import {MatFormFieldModule} from "@angular/material/form-field"; -import {MatInputModule} from "@angular/material/input"; -import {ReactiveFormsModule} from "@angular/forms"; -import {MatSidenavModule} from "@angular/material/sidenav"; -import {MatGridListModule} from "@angular/material/grid-list"; -import {MatProgressBarModule} from "@angular/material/progress-bar"; -import {MatPaginatorModule} from "@angular/material/paginator"; -import {ScrollingModule} from "@angular/cdk/scrolling"; -import {MatChipsModule} from "@angular/material/chips"; -import {MatAutocompleteModule} from "@angular/material/autocomplete"; -import {MatTabsModule} from "@angular/material/tabs"; -import {FlexModule, GridModule} from "@angular/flex-layout"; -import {MatRippleModule} from "@angular/material/core"; -import {MatDialogModule} from "@angular/material/dialog"; -import {MatSelectModule} from "@angular/material/select"; -import {MatProgressSpinnerModule} from "@angular/material/progress-spinner"; -import {BlockUIModule} from "primeng/blockui"; -import {PanelModule} from "primeng/panel"; -import {DragDropModule} from "@angular/cdk/drag-drop"; -import {MatSliderModule} from "@angular/material/slider"; -import {MatTooltipModule} from "@angular/material/tooltip"; -import {MatMenuModule} from "@angular/material/menu"; -import {MatExpansionModule} from "@angular/material/expansion"; -import {MatCheckboxModule} from "@angular/material/checkbox"; -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: [ - TagItemComponent, - ], - exports: [ - TagItemComponent, - ], - imports: [ - CommonModule, - MatCardModule, - MatListModule, - MatButtonModule, - MatToolbarModule, - MatSnackBarModule, - MatFormFieldModule, - MatInputModule, - ReactiveFormsModule, - MatSidenavModule, - MatGridListModule, - MatProgressBarModule, - MatPaginatorModule, - ScrollingModule, - MatChipsModule, - MatAutocompleteModule, - MatTabsModule, - FlexModule, - GridModule, - MatRippleModule, - MatDialogModule, - MatSelectModule, - MatProgressSpinnerModule, - BlockUIModule, - PanelModule, - DragDropModule, - MatSliderModule, - MatTooltipModule, - MatMenuModule, - MatExpansionModule, - MatCheckboxModule, - 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 0ec097f..5927d6f 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts @@ -9,7 +9,6 @@ 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"; @@ -21,6 +20,7 @@ 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"; +import {TagModule} from "../tag/tag.module"; @NgModule({ @@ -50,7 +50,6 @@ import {DragDropModule} from "@angular/cdk/drag-drop"; InputModule, ScrollingModule, MatFormFieldModule, - SharedModule, MatDividerModule, FlexModule, MatSelectModule, @@ -59,6 +58,7 @@ import {DragDropModule} from "@angular/cdk/drag-drop"; MatDialogModule, AppCommonModule, DragDropModule, + TagModule, ] }) export class SidebarModule { diff --git a/mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.html b/mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.html similarity index 100% rename from mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.html rename to mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.html diff --git a/mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.scss b/mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.scss similarity index 100% rename from mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.scss rename to mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.scss diff --git a/mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.spec.ts b/mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.spec.ts similarity index 100% rename from mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.spec.ts rename to mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.spec.ts diff --git a/mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.ts b/mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.ts similarity index 89% rename from mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.ts rename to mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.ts index 6afe7d6..2557654 100644 --- a/mediarepo-ui/src/app/components/shared/tag-item/tag-item.component.ts +++ b/mediarepo-ui/src/app/components/shared/tag/tag-item/tag-item.component.ts @@ -1,5 +1,5 @@ import {Component, Input} from "@angular/core"; -import {Tag} from "../../../models/Tag"; +import {Tag} from "../../../../models/Tag"; @Component({ selector: "app-tag-item", diff --git a/mediarepo-ui/src/app/components/shared/tag/tag.module.ts b/mediarepo-ui/src/app/components/shared/tag/tag.module.ts new file mode 100644 index 0000000..f3dddd4 --- /dev/null +++ b/mediarepo-ui/src/app/components/shared/tag/tag.module.ts @@ -0,0 +1,14 @@ +import {NgModule} from "@angular/core"; +import {CommonModule} from "@angular/common"; +import {TagItemComponent} from "./tag-item/tag-item.component"; + + +@NgModule({ + declarations: [TagItemComponent], + exports: [TagItemComponent], + imports: [ + CommonModule + ] +}) +export class TagModule { +}