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 @@
-
+
[];
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'
};