From e877c36a3d2264b6c6ccf0b58abf151c102f903c Mon Sep 17 00:00:00 2001 From: ewandor Date: Sat, 18 Mar 2023 17:07:29 +0100 Subject: [PATCH] Moving contracts/drafts to contract-drafts --- front/app/src/app/app-routing.module.ts | 6 ++- .../app/layout/sidenav/sidenav.component.ts | 2 +- .../contract-drafts-routing.module.ts | 44 +++++++++++++++++++ .../contract-drafts/contract-drafts.module.ts | 42 ++++++++++++++++++ .../drafts.component.ts | 0 .../contracts/contracts-routing.module.ts | 32 +------------- .../app/views/contracts/contracts.module.ts | 5 --- 7 files changed, 93 insertions(+), 38 deletions(-) create mode 100644 front/app/src/app/views/contract-drafts/contract-drafts-routing.module.ts create mode 100644 front/app/src/app/views/contract-drafts/contract-drafts.module.ts rename front/app/src/app/views/{contracts => contract-drafts}/drafts.component.ts (100%) diff --git a/front/app/src/app/app-routing.module.ts b/front/app/src/app/app-routing.module.ts index 24e5d86f..6b9746d0 100644 --- a/front/app/src/app/app-routing.module.ts +++ b/front/app/src/app/app-routing.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import {ContractsModule} from "./views/contracts/contracts.module"; const routes: Routes = [ { @@ -30,6 +29,11 @@ const routes: Routes = [ loadChildren: () => import('./views/templates/templates.module').then((m) => m.TemplatesModule) }, + { + path: 'contract-drafts', + loadChildren: () => + import('./views/contract-drafts/contract-drafts.module').then((m) => m.ContractDraftsModule) + }, { path: 'contracts', loadChildren: () => diff --git a/front/app/src/app/layout/sidenav/sidenav.component.ts b/front/app/src/app/layout/sidenav/sidenav.component.ts index 1cddfaea..7d6dfc2c 100644 --- a/front/app/src/app/layout/sidenav/sidenav.component.ts +++ b/front/app/src/app/layout/sidenav/sidenav.component.ts @@ -40,7 +40,7 @@ export class SidenavComponent { }, { title: $localize`Contracts Drafts`, - link: "/contracts/drafts", + link: "/contract-drafts", icon: IconNamesEnum.PencilSquare }, { diff --git a/front/app/src/app/views/contract-drafts/contract-drafts-routing.module.ts b/front/app/src/app/views/contract-drafts/contract-drafts-routing.module.ts new file mode 100644 index 00000000..5ea4df5d --- /dev/null +++ b/front/app/src/app/views/contract-drafts/contract-drafts-routing.module.ts @@ -0,0 +1,44 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DraftsCardComponent, DraftsListComponent, DraftsNewComponent } from "./drafts.component"; + + +const routes: Routes = [ + { + path: '', + data: { + title: 'Contract Drafts', + }, + children: [ + { path: '', redirectTo: 'list', pathMatch: 'full' }, + { + path: 'list', + component: DraftsListComponent, + data: { + title: 'List', + }, + }, + { + path: 'new', + component: DraftsNewComponent, + data: { + title: 'New', + }, + }, + { + path: ':id', + component: DraftsCardComponent, + data: { + title: 'Card', + }, + }, + ], + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ContractDraftsRoutingModule {} diff --git a/front/app/src/app/views/contract-drafts/contract-drafts.module.ts b/front/app/src/app/views/contract-drafts/contract-drafts.module.ts new file mode 100644 index 00000000..69ac0969 --- /dev/null +++ b/front/app/src/app/views/contract-drafts/contract-drafts.module.ts @@ -0,0 +1,42 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; + +import { BaseViewModule } from "../base-view/base-view.module"; +import { ContractDraftsRoutingModule } from './contract-drafts-routing.module'; +import { DraftsCardComponent, DraftsListComponent, DraftsNewComponent, DraftsNewFormComponent } from "./drafts.component"; +import { FormlyModule } from "@ngx-formly/core"; +import { FormlyBootstrapModule } from "@ngx-formly/bootstrap"; +import { ForeignkeyTypeComponent } from "@common/crud/types/foreignkey.type"; +import { CrudService, ImageUploaderCrudService } from "@common/crud/crud.service"; + +import { NgbAccordionModule, NgbCollapseModule } from "@ng-bootstrap/ng-bootstrap"; +import { allIcons, NgxBootstrapIconsModule } from "ngx-bootstrap-icons"; +import { ClipboardModule } from "@angular/cdk/clipboard"; + + +@NgModule({ + imports: [ + CommonModule, + BaseViewModule, + ContractDraftsRoutingModule, + NgbAccordionModule, + NgbCollapseModule, + NgxBootstrapIconsModule.pick(allIcons), + FormlyModule.forRoot({ + types: [ + { name: 'foreign-key', component: ForeignkeyTypeComponent } + ] + }), + FormlyBootstrapModule, + ClipboardModule, + ], + declarations: [ + DraftsListComponent, + DraftsNewComponent, + DraftsCardComponent, + DraftsNewFormComponent + ], + providers: [CrudService, ImageUploaderCrudService] +}) +export class ContractDraftsModule { +} diff --git a/front/app/src/app/views/contracts/drafts.component.ts b/front/app/src/app/views/contract-drafts/drafts.component.ts similarity index 100% rename from front/app/src/app/views/contracts/drafts.component.ts rename to front/app/src/app/views/contract-drafts/drafts.component.ts diff --git a/front/app/src/app/views/contracts/contracts-routing.module.ts b/front/app/src/app/views/contracts/contracts-routing.module.ts index d543b1cf..6b2fc258 100644 --- a/front/app/src/app/views/contracts/contracts-routing.module.ts +++ b/front/app/src/app/views/contracts/contracts-routing.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { DraftsCardComponent, DraftsListComponent, DraftsNewComponent } from "./drafts.component"; import { ContractsCardComponent, ContractsListComponent, ContractsNewComponent, ContractsSignatureComponent} from "./contracts.component"; @@ -13,6 +12,7 @@ const routes: Routes = [ }, children: [ { path: '', redirectTo: 'list', pathMatch: 'full' }, + { path: 'drafts', redirectTo: '/contract-drafts/list' }, { path: 'list', component: ContractsListComponent, @@ -34,36 +34,6 @@ const routes: Routes = [ title: 'New', }, }, - { - path: 'drafts', - data: { - title: 'Drafts', - }, - children: [ - { path: '', redirectTo: 'list', pathMatch: 'full' }, - { - path: 'list', - component: DraftsListComponent, - data: { - title: 'List', - }, - }, - { - path: 'new', - component: DraftsNewComponent, - data: { - title: 'New', - }, - }, - { - path: ':id', - component: DraftsCardComponent, - data: { - title: 'Card', - }, - }, - ], - }, { path: ':id', component: ContractsCardComponent, diff --git a/front/app/src/app/views/contracts/contracts.module.ts b/front/app/src/app/views/contracts/contracts.module.ts index 060cfa90..57aa4f54 100644 --- a/front/app/src/app/views/contracts/contracts.module.ts +++ b/front/app/src/app/views/contracts/contracts.module.ts @@ -3,7 +3,6 @@ import { NgModule } from '@angular/core'; import { BaseViewModule } from "../base-view/base-view.module"; import { ContractsRoutingModule } from './contracts-routing.module'; -import { DraftsCardComponent, DraftsListComponent, DraftsNewComponent, DraftsNewFormComponent } from "./drafts.component"; import { FormlyModule } from "@ngx-formly/core"; import { FormlyBootstrapModule } from "@ngx-formly/bootstrap"; import { ForeignkeyTypeComponent } from "@common/crud/types/foreignkey.type"; @@ -33,10 +32,6 @@ import { ClipboardModule } from "@angular/cdk/clipboard"; ClipboardModule, ], declarations: [ - DraftsListComponent, - DraftsNewComponent, - DraftsCardComponent, - DraftsNewFormComponent, ContractsListComponent, ContractsNewComponent, ContractsCardComponent,