Move sidebar components to separate module

Signed-off-by: trivernis <trivernis@protonmail.com>
pull/4/head
trivernis 3 years ago
parent 823628e5bd
commit 4c1c13d4cd

@ -22,6 +22,7 @@ import {NgIconsModule} from "@ng-icons/core";
import * as materialIcons from "@ng-icons/material-icons"; import * as materialIcons from "@ng-icons/material-icons";
import {MatMenuModule} from "@angular/material/menu"; import {MatMenuModule} from "@angular/material/menu";
import {InputModule} from "../shared/input/input.module"; import {InputModule} from "../shared/input/input.module";
import {SidebarModule} from "../shared/sidebar/sidebar.module";
@NgModule({ @NgModule({
@ -54,6 +55,7 @@ import {InputModule} from "../shared/input/input.module";
MatMenuModule, MatMenuModule,
MatRippleModule, MatRippleModule,
InputModule, InputModule,
SidebarModule,
] ]
}) })
export class CoreModule { export class CoreModule {

@ -12,9 +12,9 @@ import {Tag} from "../../../../models/Tag";
import {TagService} from "../../../../services/tag/tag.service"; import {TagService} from "../../../../services/tag/tag.service";
import {FileService} from "../../../../services/file/file.service"; import {FileService} from "../../../../services/file/file.service";
import {File} from "../../../../models/File"; 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 {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"; import {clipboard} from "@tauri-apps/api";
@Component({ @Component({

@ -3,17 +3,17 @@ import {CommonModule} from "@angular/common";
import {RepositoryCardComponent} from "../core/repositories-tab/repository-card/repository-card.component"; import {RepositoryCardComponent} from "../core/repositories-tab/repository-card/repository-card.component";
import {FileGridComponent} from "./file-multiview/file-grid/file-grid.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 {FileGridEntryComponent} from "./file-multiview/file-grid/file-grid-entry/file-grid-entry.component";
import {FileSearchComponent} from "./file-search/file-search.component"; import {FileSearchComponent} from "./sidebar/file-search/file-search.component";
import {SortDialogComponent} from "./file-search/sort-dialog/sort-dialog.component"; import {SortDialogComponent} from "./sidebar/file-search/sort-dialog/sort-dialog.component";
import {FileGalleryComponent} from "./file-multiview/file-gallery/file-gallery.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 {FileGalleryEntryComponent} from "./file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component";
import {ContentAwareImageComponent} from "./content-aware-image/content-aware-image.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 {AddRepositoryDialogComponent} from "../core/repositories-tab/add-repository-dialog/add-repository-dialog.component";
import {ConfirmDialogComponent} from "./confirm-dialog/confirm-dialog.component"; import {ConfirmDialogComponent} from "./confirm-dialog/confirm-dialog.component";
import {TagItemComponent} from "./tag-item/tag-item.component"; import {TagItemComponent} from "./tag-item/tag-item.component";
import {FileEditComponent} from "./file-edit/file-edit.component"; import {FileEditComponent} from "./sidebar/file-edit/file-edit.component";
import {FilterDialogComponent} from "./file-search/filter-dialog/filter-dialog.component"; import {FilterDialogComponent} from "./sidebar/file-search/filter-dialog/filter-dialog.component";
import {TagFilterListItemComponent} from "./file-search/filter-dialog/tag-filter-list-item/tag-filter-list-item.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 {ContextMenuComponent} from "./context-menu/context-menu.component";
import {FileContextMenuComponent} from "./context-menu/file-context-menu/file-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 {ContentViewerComponent} from "./file-multiview/file-gallery/content-viewer/content-viewer.component";
@ -63,7 +63,6 @@ import {InputModule} from "./input/input.module";
RepositoryCardComponent, RepositoryCardComponent,
FileGridComponent, FileGridComponent,
FileGridEntryComponent, FileGridEntryComponent,
FileSearchComponent,
SortDialogComponent, SortDialogComponent,
FileGalleryComponent, FileGalleryComponent,
FileGalleryEntryComponent, FileGalleryEntryComponent,
@ -71,7 +70,6 @@ import {InputModule} from "./input/input.module";
AddRepositoryDialogComponent, AddRepositoryDialogComponent,
ConfirmDialogComponent, ConfirmDialogComponent,
TagItemComponent, TagItemComponent,
FileEditComponent,
FilterDialogComponent, FilterDialogComponent,
TagFilterListItemComponent, TagFilterListItemComponent,
ContextMenuComponent, ContextMenuComponent,
@ -87,9 +85,7 @@ import {InputModule} from "./input/input.module";
exports: [ exports: [
FileMultiviewComponent, FileMultiviewComponent,
BusyIndicatorComponent, BusyIndicatorComponent,
FileSearchComponent,
TagItemComponent, TagItemComponent,
FileEditComponent,
ContextMenuComponent, ContextMenuComponent,
RepositoryCardComponent RepositoryCardComponent
], ],

@ -7,11 +7,11 @@ import {
SimpleChanges, SimpleChanges,
ViewChild ViewChild
} from "@angular/core"; } from "@angular/core";
import {File} from "../../../models/File"; import {File} from "../../../../models/File";
import {Tag} from "../../../models/Tag"; import {Tag} from "../../../../models/Tag";
import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling"; import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling";
import {TagService} from "../../../services/tag/tag.service"; import {TagService} from "../../../../services/tag/tag.service";
import {FileService} from "../../../services/file/file.service"; import {FileService} from "../../../../services/file/file.service";
@Component({ @Component({
selector: "app-file-edit", selector: "app-file-edit",

@ -1,5 +1,5 @@
@use 'sass:map'; @use 'sass:map';
@use '../../../../../node_modules/@angular/material/index' as mat; @use '../../../../../../node_modules/@angular/material/index' as mat;
@mixin color($theme) { @mixin color($theme) {
$color-config: mat.get-color-config($theme); $color-config: mat.get-color-config($theme);

@ -8,18 +8,18 @@ import {
Output, Output,
ViewChild ViewChild
} from "@angular/core"; } from "@angular/core";
import {FileService} from "../../../services/file/file.service"; import {FileService} from "../../../../services/file/file.service";
import {TagQuery} from "../../../models/TagQuery"; import {TagQuery} from "../../../../models/TagQuery";
import {SortKey} from "../../../models/SortKey"; import {SortKey} from "../../../../models/SortKey";
import {MatDialog} from "@angular/material/dialog"; import {MatDialog} from "@angular/material/dialog";
import {SortDialogComponent} from "./sort-dialog/sort-dialog.component"; 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 { import {
FilterExpression, FilterExpression,
SingleFilterExpression SingleFilterExpression
} from "../../../models/FilterExpression"; } from "../../../../models/FilterExpression";
import {FilterDialogComponent} from "./filter-dialog/filter-dialog.component"; import {FilterDialogComponent} from "./filter-dialog/filter-dialog.component";
import {Tag} from "../../../models/Tag"; import {Tag} from "../../../../models/Tag";
@Component({ @Component({

@ -5,11 +5,11 @@ import {
FilterExpression, FilterExpression,
OrFilterExpression, OrFilterExpression,
SingleFilterExpression SingleFilterExpression
} from "../../../../models/FilterExpression"; } from "../../../../../models/FilterExpression";
import {TagQuery} from "../../../../models/TagQuery"; import {TagQuery} from "../../../../../models/TagQuery";
import {Tag} from "../../../../models/Tag"; import {Tag} from "../../../../../models/Tag";
import {TagFilterListItemComponent} from "./tag-filter-list-item/tag-filter-list-item.component"; import {TagFilterListItemComponent} from "./tag-filter-list-item/tag-filter-list-item.component";
import {Selectable} from "../../../../models/Selectable"; import {Selectable} from "../../../../../models/Selectable";
@Component({ @Component({
selector: "app-filter-dialog", selector: "app-filter-dialog",

@ -10,9 +10,9 @@ import {
FilterExpression, FilterExpression,
OrFilterExpression, OrFilterExpression,
SingleFilterExpression SingleFilterExpression
} from "../../../../../models/FilterExpression"; } from "../../../../../../models/FilterExpression";
import {TagQuery} from "../../../../../models/TagQuery"; import {TagQuery} from "../../../../../../models/TagQuery";
import {Selectable} from "../../../../../models/Selectable"; import {Selectable} from "../../../../../../models/Selectable";
@Component({ @Component({
selector: "app-tag-filter-list-item", selector: "app-tag-filter-list-item",

@ -1,6 +1,6 @@
import {Component, Inject} from "@angular/core"; import {Component, Inject} from "@angular/core";
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; 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"; import {CdkDragDrop, moveItemInArray} from "@angular/cdk/drag-drop";
@Component({ @Component({

@ -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 {
}

@ -2,7 +2,7 @@
@use "~@angular/material" as mat; @use "~@angular/material" as mat;
@use 'src/app/app.component-theme' as app; @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-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; @use "app/components/shared/file-multiview/file-gallery/file-gallery-entry/file-gallery-entry.component-theme" as gallery-entry;
@include mat.core(); @include mat.core();

Loading…
Cancel
Save