From 44ee28d209cbc963fd0a670b4bd6c74076168480 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Thu, 23 Nov 2023 17:39:19 +0300 Subject: [PATCH] menu service delete --- .../form/slider/slider-form.component.ts | 9 ++-- .../menu/item/pages-menu-item.component.ts | 2 - .../widjet/locale/locale.component.ts | 4 +- src/app/_services/menu.service.ts | 45 ------------------- .../layout/header/header.component.ts | 5 --- 5 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 src/app/_services/menu.service.ts diff --git a/src/app/_modules/objects/form/slider/slider-form.component.ts b/src/app/_modules/objects/form/slider/slider-form.component.ts index b475a70..911d35f 100644 --- a/src/app/_modules/objects/form/slider/slider-form.component.ts +++ b/src/app/_modules/objects/form/slider/slider-form.component.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; import {FormControl, FormGroup} from "@angular/forms"; import {FormsService, ListsService} from "@app/_services"; -import { MenuService } from '@app/_services/menu.service'; + import { PagesService } from '@app/_services/pages.service'; @@ -32,8 +32,7 @@ export class SliderFormComponent { private route: ActivatedRoute, private formsService: FormsService, private listsService: ListsService, - private pagesService: PagesService, - private menuService: MenuService + private pagesService: PagesService ) { } @@ -133,9 +132,7 @@ export class SliderFormComponent { } else { this.listsService.refresh(this.list); if(this.type=='page') this.pagesService.root({include:'children'}).subscribe( - res => { this.pagesService.rootPages = res }, - err => {console.log(err)}, - ()=>console.log('COMPLETE') + res => { this.pagesService.rootPages = res } ) this.close(); } diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts index aa9c02f..7a7574e 100644 --- a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts +++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts @@ -1,5 +1,4 @@ import {Component, Input} from '@angular/core'; -import { MenuService } from '@app/_services/menu.service'; import { PagesService } from '@app/_services/pages.service'; import { Router } from '@angular/router'; @@ -14,7 +13,6 @@ export class PagesMenuItemComponent { open=false constructor( - private menuService: MenuService, private pagesService: PagesService, private router: Router ) {} diff --git a/src/app/_modules/widjet/locale/locale.component.ts b/src/app/_modules/widjet/locale/locale.component.ts index 34f8952..3739da9 100644 --- a/src/app/_modules/widjet/locale/locale.component.ts +++ b/src/app/_modules/widjet/locale/locale.component.ts @@ -19,10 +19,8 @@ export class LocaleComponent { ){} ngOnInit() { - this.pagesService.rootPagesSubject.subscribe( - + this.rootSubscription = this.pagesService.rootPagesSubject.subscribe( res=>{ - console.log(res) this.locales = res?.data } ) diff --git a/src/app/_services/menu.service.ts b/src/app/_services/menu.service.ts deleted file mode 100644 index 911e8f5..0000000 --- a/src/app/_services/menu.service.ts +++ /dev/null @@ -1,45 +0,0 @@ -import {Injectable} from '@angular/core'; -import {BehaviorSubject} from "rxjs"; - -import { PagesService } from './pages.service'; - - - -@Injectable({providedIn: 'root'}) -export class MenuService { - constructor( - private pagesService: PagesService - ){} - - public pagesTree = new BehaviorSubject({data:[]}); - public navURL:string; - - - - setPagesTree(pageURL?:any){ - let include = {include: 'hasChildren, children.hasChildren'}; - if (pageURL){ - this.pagesService.find(pageURL,include).subscribe( - res => { - this.pagesTree.next({data:[res.data]}) - } - ) - }else{ - this.pagesService.root(include).subscribe( - res => { - this.pagesTree.next(res) - } - ); - } - } - - findChildren(item){ - let include = {include: 'hasChildren, children.hasChildren'}; - if (!item.children && item.hasChildren) this.pagesService.find(item.link,include).subscribe( - res=>{ - item.children = res.data.children - } - ) - } - -} \ No newline at end of file diff --git a/src/vniigaz-v2/component/layout/header/header.component.ts b/src/vniigaz-v2/component/layout/header/header.component.ts index acaa26e..a6be0a9 100644 --- a/src/vniigaz-v2/component/layout/header/header.component.ts +++ b/src/vniigaz-v2/component/layout/header/header.component.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; import {Router} from "@angular/router"; -import { MenuService} from '@app/_services/menu.service'; import { PagesService } from '@app/_services/pages.service'; @@ -15,15 +14,11 @@ export class HeaderComponent { constructor( private router: Router, - private menuService: MenuService, private pagesServices: PagesService ) { } - ngOnInit() { - this.menuService.setPagesTree(); - } openMobileMenu(){ this.router.navigate([{outlets: {slider: 'pages-menu'}}], {skipLocationChange: true}).then();