From 2ce383d7b1b0aeec607fe2a382ac44b316c644d7 Mon Sep 17 00:00:00 2001 From: panabonic Date: Sun, 19 Nov 2023 13:04:20 +0300 Subject: [PATCH] few updates --- .../administration/administration.module.ts | 18 +++---- .../administrate-site-pages.component.html | 20 +------- .../administrate-site-pages.component.ts | 26 +++++----- .../user-bar/header-user-bar.component.ts | 8 ++-- .../layout/jumbotron/jumbotron.component.ts | 4 +- .../left-content/left-content.component.ts | 14 +++--- src/app/_modules/pages/page/page.component.ts | 12 ++--- .../_modules/pages/pages-routing.module.ts | 1 - .../tree/item/pages-tree-item.component.html | 17 +++---- .../tree/item/pages-tree-item.component.scss | 2 + .../tree/item/pages-tree-item.component.ts | 28 +++++++---- .../pages/tree/pages-tree.component.html | 2 +- .../pages/tree/pages-tree.component.scss | 5 ++ .../pages/tree/pages-tree.component.ts | 47 ++++++++----------- src/app/_services/lists.service.ts | 6 +-- src/app/_services/pages.service.ts | 27 +++++++++-- src/environments/environment.ts | 2 +- 17 files changed, 120 insertions(+), 119 deletions(-) diff --git a/src/app/_modules/administration/administration.module.ts b/src/app/_modules/administration/administration.module.ts index 3c85d69..62df16f 100644 --- a/src/app/_modules/administration/administration.module.ts +++ b/src/app/_modules/administration/administration.module.ts @@ -10,6 +10,7 @@ import {AdvisoriesModule} from "@app/_modules/advisories/advisories.module"; import {CompaniesModule} from "@app/_modules/companies/companies.module"; import {AdministrateSitePagesComponent} from "@app/_modules/administration/site-pages/administrate-site-pages.component"; import {PagesModule} from "@app/_modules/pages/pages.module"; +import {WidjetModule} from "@app/_modules/widjet/widjet.module"; type PathMatch = "full" | "prefix" | undefined; const routes = [ @@ -18,14 +19,15 @@ const routes = [ ]; @NgModule({ - imports: [ - BrowserModule, - CommonModule, - RouterModule.forRoot(routes), - AdvisoriesModule, - CompaniesModule, - PagesModule, - ], + imports: [ + BrowserModule, + CommonModule, + RouterModule.forRoot(routes), + AdvisoriesModule, + CompaniesModule, + PagesModule, + WidjetModule, + ], declarations: [ AdministrationPageComponent, AdministrateCompanyComponent, diff --git a/src/app/_modules/administration/site-pages/administrate-site-pages.component.html b/src/app/_modules/administration/site-pages/administrate-site-pages.component.html index 8e88e23..ac13a87 100644 --- a/src/app/_modules/administration/site-pages/administrate-site-pages.component.html +++ b/src/app/_modules/administration/site-pages/administrate-site-pages.component.html @@ -1,19 +1,3 @@ - - - + + Показать удаленные diff --git a/src/app/_modules/administration/site-pages/administrate-site-pages.component.ts b/src/app/_modules/administration/site-pages/administrate-site-pages.component.ts index c222b4e..333f91f 100644 --- a/src/app/_modules/administration/site-pages/administrate-site-pages.component.ts +++ b/src/app/_modules/administration/site-pages/administrate-site-pages.component.ts @@ -8,26 +8,26 @@ import { FormsService } from '@app/_services'; styleUrls: ['administrate-site-pages.component.scss'] }) export class AdministrateSitePagesComponent { - constructor( - private pagesService: PagesService, - private formsService: FormsService, - ) {} + constructor(private pagesService: PagesService, private formsService: FormsService) { + } - public mainPage:any; + get showDeleted() { + return this.pagesService.showDeleted; + } ngOnInit() { - this.fetchRootPage(); } - fetchRootPage() { - let include = ['children.children','parent.children']; - this.pagesService.root({include: include}).subscribe(res => { - this.mainPage = res.data[0].parent?.data; - }); + ngOnDestroy() { + this.pagesService.showDeleted = false; } - addLocale(){ - this.formsService.createModel('page', null, null); + addLocale() { + this.formsService.createModel('localePage', null, 'pages-tree-root'); + } + + toggle() { + this.pagesService.showDeleted = !this.pagesService.showDeleted; } } diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts index 7f74903..f933e4a 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts @@ -17,7 +17,7 @@ export class HeaderUserBarComponent { subscriptionUser: Subscription; constructor( - public authService: AuthenticationService, + public authService: AuthenticationService, private router: Router, private pagesService: PagesService) { this.subscriptionUser = this.authService.user.subscribe(user => { @@ -33,7 +33,7 @@ export class HeaderUserBarComponent { } ngOnInit() { - + } ngOnDestroy() { @@ -44,13 +44,13 @@ export class HeaderUserBarComponent { close() { setTimeout(() => { this.ddHidden = true; - }, 10); + }, 10); } logout() { if (confirm('Вы деествительно хотите выйти из системы?')) { - this.pagesService.editMode.next(false) + this.pagesService.editMode = false; this.authService.logout(); this.ddHidden = true; this.router.navigate(['']).then(); diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.ts b/src/app/_modules/layout/jumbotron/jumbotron.component.ts index e85ab77..195837e 100644 --- a/src/app/_modules/layout/jumbotron/jumbotron.component.ts +++ b/src/app/_modules/layout/jumbotron/jumbotron.component.ts @@ -30,11 +30,11 @@ export class JumbotronComponent { } get editMode(){ - return this.pagesService.editMode.value + return this.pagesService.editMode; } toggleEditMode(){ - this.pagesService.editMode.next(!this.editMode) + this.pagesService.editMode = !this.pagesService.editMode; } } diff --git a/src/app/_modules/layout/left-content/left-content.component.ts b/src/app/_modules/layout/left-content/left-content.component.ts index b6b1732..4cef22f 100644 --- a/src/app/_modules/layout/left-content/left-content.component.ts +++ b/src/app/_modules/layout/left-content/left-content.component.ts @@ -15,7 +15,6 @@ export class LeftContentComponent { public background:string; public pageName:string; public editable:string; - public editMode: boolean = false; private pageID: string; private routeSubscription: Subscription; @@ -28,12 +27,11 @@ export class LeftContentComponent { } + get editMode() { + return this.pagesService.editMode; + } + ngOnInit(){ - this.pagesService.editMode.subscribe( - mode => { - this.editMode = mode; - } - ); this.pagesService.currentPageSubject.subscribe( page => this.fetch(page) ) @@ -49,12 +47,12 @@ export class LeftContentComponent { }else{ this.pageName = null; this.editable = null; - this.pagesService.editMode.next(false) + this.pagesService.editMode = false; } } toggleEditMode(){ - this.pagesService.editMode.next(!this.editMode) + this.pagesService.editMode = !this.pagesService.editMode; } editBackground() { diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts index d988d75..6cb4169 100644 --- a/src/app/_modules/pages/page/page.component.ts +++ b/src/app/_modules/pages/page/page.component.ts @@ -10,7 +10,6 @@ import {ListsService} from "@app/_services"; }) export class PageComponent { public page: any; - public editMode: boolean; public loading = false; private url: string; private inited = false; @@ -27,6 +26,9 @@ export class PageComponent { } + get editMode() { + return this.pagesService.editMode; + } get permissions() { return this.page?.permissions; @@ -41,9 +43,6 @@ export class PageComponent { this.listsService.controls().subscribe(res => { this.inited ? this.fetch() : this.inited = true; }); - this.pagesService.editMode.subscribe( - mode=>this.editMode = mode - ) } ngOnDestroy() { @@ -51,12 +50,11 @@ export class PageComponent { } onNavigationEnd(event: NavigationEnd) { - let url = event.url.split('(')[0]; - url = url.split('?')[0]; + let url = event.url.split('(')[0].split('?')[0]; if (url !== this.url) { this.url = url; this.fetch(); - this.pagesService.editMode.next(false); + this.pagesService.editMode = false; } } diff --git a/src/app/_modules/pages/pages-routing.module.ts b/src/app/_modules/pages/pages-routing.module.ts index 62c0816..65262d1 100644 --- a/src/app/_modules/pages/pages-routing.module.ts +++ b/src/app/_modules/pages/pages-routing.module.ts @@ -2,7 +2,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {RouterModule, Routes} from "@angular/router"; import {PageNotFoundComponent} from "@app/_modules/pages/not-found/page-not-found.component"; -import {HomepageComponent} from "@app/_modules/pages/home/homepage.component"; import {PageComponent} from "@app/_modules/pages/page/page.component"; import {pageBreadcrumbsComponent} from "@app/_modules/pages/page/breadcrumbs/page-breadcrumbs.component"; import {PageSectionsModule} from "@app/_modules/pages/sections/page-sections.module"; diff --git a/src/app/_modules/pages/tree/item/pages-tree-item.component.html b/src/app/_modules/pages/tree/item/pages-tree-item.component.html index 3c11a93..c1c5004 100644 --- a/src/app/_modules/pages/tree/item/pages-tree-item.component.html +++ b/src/app/_modules/pages/tree/item/pages-tree-item.component.html @@ -1,24 +1,21 @@ -
+
- +
- -

+ +

{{page.name}}

-
- + + - +
diff --git a/src/app/_modules/pages/tree/item/pages-tree-item.component.scss b/src/app/_modules/pages/tree/item/pages-tree-item.component.scss index e69de29..fe51608 100644 --- a/src/app/_modules/pages/tree/item/pages-tree-item.component.scss +++ b/src/app/_modules/pages/tree/item/pages-tree-item.component.scss @@ -0,0 +1,2 @@ +.red {color: #ff0000;} +.hidden {display: none;} diff --git a/src/app/_modules/pages/tree/item/pages-tree-item.component.ts b/src/app/_modules/pages/tree/item/pages-tree-item.component.ts index 86c830c..6d7749a 100644 --- a/src/app/_modules/pages/tree/item/pages-tree-item.component.ts +++ b/src/app/_modules/pages/tree/item/pages-tree-item.component.ts @@ -1,5 +1,4 @@ import {Component, Input} from '@angular/core'; -import {Router} from "@angular/router"; import {PagesService} from "@app/_services/pages.service"; import {FormsService, ListsService} from "@app/_services"; import {Subscription} from "rxjs"; @@ -16,11 +15,7 @@ export class PagesTreeItemComponent { public touched = false; public subscription: Subscription; - constructor( - private router: Router, - private pagesService: - PagesService, private formsService: FormsService, - private listsService: ListsService) { + constructor(public pagesService: PagesService, private formsService: FormsService, private listsService: ListsService) { } ngOnInit() { @@ -29,6 +24,10 @@ export class PagesTreeItemComponent { }); } + ngOnDestroy() { + this.subscription?.unsubscribe(); + } + get listId() { return this.page.id; @@ -50,9 +49,16 @@ export class PagesTreeItemComponent { return this.page.children?.data; } + get isDeleted() { + return !!this.page.deletedAt; + } + get showDeleted() { + return this.pagesService.showDeleted; + } + fetch() { - let include = ['children.children']; + let include = ['children']; this.pagesService.show(this.page.id, {include: include.join(',')}).subscribe(res => { this.page = res.data; }); @@ -70,12 +76,16 @@ export class PagesTreeItemComponent { delete() { if (confirm('r u sure?')) this.pagesService.delete(this.page.id).subscribe(res => { this.listsService.refresh(this.parentListId); - this.listsService.changed.next(this.page); + }); + } + + clone() { + if (confirm(`Копировать страницу ${this.page.name}?`)) this.pagesService.clone(this.page.id, {recursive: true}).subscribe(res => { + this.listsService.refresh(this.parentListId); }); } toggle() { this.active = !this.active; - if (this.active) this.fetch(); } } diff --git a/src/app/_modules/pages/tree/pages-tree.component.html b/src/app/_modules/pages/tree/pages-tree.component.html index be31208..6174cc6 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.html +++ b/src/app/_modules/pages/tree/pages-tree.component.html @@ -1,3 +1,3 @@ -
+
diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss index d891ba1..22ccffe 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.scss +++ b/src/app/_modules/pages/tree/pages-tree.component.scss @@ -61,6 +61,7 @@ border-radius: 100px; background-color: var(--prime); color: #ffffff; + cursor: move; span{ display: none; @@ -117,6 +118,10 @@ background-image: url('~src/assets/images/icons/drag-n-drop_24.svg'); cursor: move; } + &.clone { + width: 24px; + background-color: #dedede; + } } .orphan{ margin-right: 48px; diff --git a/src/app/_modules/pages/tree/pages-tree.component.ts b/src/app/_modules/pages/tree/pages-tree.component.ts index eb9a429..0581df4 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.ts +++ b/src/app/_modules/pages/tree/pages-tree.component.ts @@ -15,34 +15,30 @@ export class PagesTreeComponent { public pages = []; subscription: Subscription; - public options: SortableOptions = { + public optionsPages: SortableOptions = { group: 'site-pages', - handle: '.move', - onUpdate: (event: any) => { - this.move(event); - }, - onAdd: (event: any) => { - this.move(event); - } + handle: '.logo', + onUpdate: (event: any) => {this.move(event)}, + onAdd: (event: any) => {this.move(event)} + }; + public optionsLocales: SortableOptions = { + group: 'site-locales', + handle: '.logo', + onUpdate: (event: any) => {this.move(event)}, + onAdd: (event: any) => {this.move(event)} }; - constructor(private router: Router, private pagesService: PagesService, private listsService: ListsService, private formsService: FormsService) { } get listId() { - return 'pages-tree-root'; + return this.parent?.id || 'pages-tree-root'; } ngOnInit() { - this.fetch() - // if (!this.parent) this.subscription = this.listsService.controls(this.listId).subscribe(res => { - // this.fetch(); - // }); - } - - ngOnChanges() { - this.pages = this.parent?.children?.data; + this.subscription = this.listsService.controls(this.listId).subscribe(res => { + this.fetch(); + }); } ngOnDestroy() { @@ -55,30 +51,27 @@ export class PagesTreeComponent { fetchRootPages() { let include = ['children']; - this.pagesService.root({include: include}).subscribe(res => { + this.pagesService.root({include: include.join(','), withTrashed: true}).subscribe(res => { this.pages = res.data; }); } fetchSubpages() { - let include = ['children.children']; - this.pagesService.show(this.parent.id, {include: include.join(',')}).subscribe(res => { + let include = ['children']; + this.pagesService.show(this.parent.id, {include: include.join(','), withTrashed: true}).subscribe(res => { this.pages = res.data?.children?.data; }); } add() { - //this.listsService.result('headerMenu').next(result); this.formsService.createModel('page', null, this.listId); } move(event: any) { - if(this.parent?.id) { - this.pagesService.move(event.item.id, {parent: this.parent?.id, ord: event.newIndex}).subscribe(res => { - this.listsService.changed.next(event); - }); - } + this.pagesService.move(event.item.id, {parent: this.parent?.id, ord: event.newIndex}).subscribe(res => { + this.listsService.refresh(this.parent?.id); + }); } } diff --git a/src/app/_services/lists.service.ts b/src/app/_services/lists.service.ts index 2de4c4e..fd8c580 100644 --- a/src/app/_services/lists.service.ts +++ b/src/app/_services/lists.service.ts @@ -4,11 +4,7 @@ import {BehaviorSubject} from "rxjs"; @Injectable({providedIn: 'root'}) export class ListsService { public lists: any = {}; - public changed: BehaviorSubject - constructor( - - ) { - this.changed =new BehaviorSubject({}) + constructor() { } diff --git a/src/app/_services/pages.service.ts b/src/app/_services/pages.service.ts index 077c960..c8e5e60 100644 --- a/src/app/_services/pages.service.ts +++ b/src/app/_services/pages.service.ts @@ -9,7 +9,8 @@ export class PagesService { public currentPageSubject = new BehaviorSubject(null); public rootPageSubject = new BehaviorSubject(null); public metaSubject = new BehaviorSubject({title: '', description: '', keywords: ''}); - public editMode = new BehaviorSubject(false); + public editModeSubject = new BehaviorSubject(false); + public showDeletedSubject = new BehaviorSubject(false); constructor(private http: HttpClient) { //this.find('/').subscribe(res => {this.rootPage = res.data}); @@ -30,9 +31,22 @@ export class PagesService { this.rootPageSubject.next(val); } + get editMode() { + return this.editModeSubject.value; + } + set editMode(value: boolean) { + this.editModeSubject.next(value); + } + + get showDeleted() { + return this.showDeletedSubject.value; + } + set showDeleted(value: boolean) { + this.showDeletedSubject.next(value); + } - root(params?: {}): Observable { + root(params?: any): Observable { return this.http.get(`${environment.apiUrl}/api/pages/root`, {params: params}); } @@ -42,11 +56,11 @@ export class PagesService { return this.http.get(`${environment.apiUrl}/api/pages/find`, {params: params}); } - list(params?: {}): Observable { + list(params?: any): Observable { return this.http.get(`${environment.apiUrl}/api/pages`, {params: params}); } - show(id: string, params?: {}): Observable { + show(id: string, params?: any): Observable { return this.http.get(`${environment.apiUrl}/api/pages/${id}`, {params: params}); } @@ -59,9 +73,12 @@ export class PagesService { } move(id: string, data: any): Observable { - return this.http.put(`${environment.apiUrl}/api/pages/${id}`, data); + return this.http.put(`${environment.apiUrl}/api/pages/move/${id}`, data); } + clone(id: string, data: any): Observable { + return this.http.put(`${environment.apiUrl}/api/pages/clone/${id}`, data); + } setMetaFromPage(page: any) { this.setMeta({title: page?.title || page?.name, description: page?.description || '', keywords: page?.keywords || ''}); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3c540fb..204af52 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiUrl: 'http://api.nircms.lc', clientId: 2, - clientSecret: 'Q0p5wSWfodfhFdQ2xHpzFOBuQEJy090ho10Deh4O', + clientSecret: 'kzZNPvuxFIhDmJkzdC6ug4b6TplrzGrnCqi0Zgr9', project: null, defaultLocale: 'ru' };