diff --git a/src/app/_modules/layout/header/header.component.ts b/src/app/_modules/layout/header/header.component.ts index b3e378f..700de46 100644 --- a/src/app/_modules/layout/header/header.component.ts +++ b/src/app/_modules/layout/header/header.component.ts @@ -16,7 +16,7 @@ export class HeaderComponent { } // ngOnInit(){ // this.pagesService.root().subscribe( - // resp=> this.pagesService.rootPage = resp + // resp=> this.pagesService.rootPages = resp // ) // } @@ -27,5 +27,4 @@ export class HeaderComponent { openMobileMenu(){ this.router.navigate([{outlets: {slider: 'pages-menu'}}], {skipLocationChange: true}).then(); } - -} +} \ No newline at end of file diff --git a/src/app/_modules/pages/menu/pages-menu.component.ts b/src/app/_modules/pages/menu/pages-menu.component.ts index f96d1cd..d8df33b 100644 --- a/src/app/_modules/pages/menu/pages-menu.component.ts +++ b/src/app/_modules/pages/menu/pages-menu.component.ts @@ -24,10 +24,10 @@ export class PagesMenuComponent implements OnInit { this.subscription = combineLatest([ this.pagesService.currentPageSubject, - this.pagesService.rootPageSubject + this.pagesService.rootPagesSubject ]).subscribe( resp=>{ - let [currentPage, rootPage] = resp + let [currentPage, rootPages] = resp if(currentPage){ let menuTree = currentPage.parents.data.reduceRight( (menuTree,item)=>{ @@ -39,7 +39,7 @@ export class PagesMenuComponent implements OnInit { }, currentPage); this.items = menuTree.children.data; }else{ - this.items = rootPage?.data[0].children.data + this.items = rootPages?.data[0].children.data } } ) diff --git a/src/app/_modules/pages/menu/slider-menu/slider-menu.component.html b/src/app/_modules/pages/menu/slider-menu/slider-menu.component.html index 66082c8..ba5f5c3 100644 --- a/src/app/_modules/pages/menu/slider-menu/slider-menu.component.html +++ b/src/app/_modules/pages/menu/slider-menu/slider-menu.component.html @@ -1,7 +1,7 @@
- +
!!! diff --git a/src/app/_modules/pages/menu/slider-menu/slider-menu.component.ts b/src/app/_modules/pages/menu/slider-menu/slider-menu.component.ts index 01b3c31..f2592bf 100644 --- a/src/app/_modules/pages/menu/slider-menu/slider-menu.component.ts +++ b/src/app/_modules/pages/menu/slider-menu/slider-menu.component.ts @@ -15,8 +15,8 @@ export class SliderMenuComponent { ) { } - get rootPage() { - return this.pagesService.rootPage; + get rootPages() { + return this.pagesService.rootPages; } } diff --git a/src/app/_modules/widjet/locale/locale.component.ts b/src/app/_modules/widjet/locale/locale.component.ts index 1d98ece..34f8952 100644 --- a/src/app/_modules/widjet/locale/locale.component.ts +++ b/src/app/_modules/widjet/locale/locale.component.ts @@ -19,7 +19,7 @@ export class LocaleComponent { ){} ngOnInit() { - this.pagesService.rootPageSubject.subscribe( + this.pagesService.rootPagesSubject.subscribe( res=>{ console.log(res) @@ -32,8 +32,13 @@ export class LocaleComponent { this.rootSubscription.unsubscribe() } - get rootPage() { - return this.pagesService.rootPage; + + get rootPage(){ + return this.pagesService.rootPage + } + + get rootPages() { + return this.pagesService.rootPages; } flag(localeName:string){ diff --git a/src/app/_services/pages.service.ts b/src/app/_services/pages.service.ts index 415825b..c2565d8 100644 --- a/src/app/_services/pages.service.ts +++ b/src/app/_services/pages.service.ts @@ -7,29 +7,30 @@ import {Observable, BehaviorSubject} from "rxjs"; @Injectable({providedIn: 'root'}) export class PagesService { public currentPageSubject = new BehaviorSubject(null); - public rootPageSubject = new BehaviorSubject(null); + public rootPagesSubject = new BehaviorSubject(null); public metaSubject = new BehaviorSubject({title: '', description: '', keywords: ''}); public editModeSubject = new BehaviorSubject(false); public showDeletedSubject = new BehaviorSubject(false); public menuSelectedLink: string; constructor(private http: HttpClient) { - //this.find('/').subscribe(res => {this.rootPage = res.data}); + //this.find('/').subscribe(res => {this.rootPages = res.data}); } + rootPage:any get currentPage() { return this.currentPageSubject.value; } set currentPage(val: any) { this.currentPageSubject.next(val); - // this.rootPage = val?.parents?.data[0] || val; + this.rootPage = val?.parents?.data[0] || val; this.setMetaFromPage(val); } - get rootPage() { - return this.rootPageSubject.value; + get rootPages() { + return this.rootPagesSubject.value; } - set rootPage(val: any) { - this.rootPageSubject.next(val); + set rootPages(val: any) { + this.rootPagesSubject.next(val); } get editMode() { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3f91a51..833981b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -21,10 +21,11 @@ export class AppComponent { ngOnInit() { this.rootSubscription = this.pagesService.root({include:'children'}).subscribe(res => { - this.pagesService.rootPage = res + this.pagesService.rootPages = res }); } + ngOnDestroy() { this.subscription?.unsubscribe(); this.rootSubscription.unsubscribe()