From 2a3b49394998d7bb72133470dbb9b363e91c3f72 Mon Sep 17 00:00:00 2001 From: sergeybodin Date: Mon, 4 Sep 2023 09:51:03 +0300 Subject: [PATCH] major --- .../administration/administration.module.ts | 10 +- .../page/administration-page.component.html | 7 +- .../page/administration-page.component.ts | 15 ++- .../administrate-site-pages.component.html | 1 + .../administrate-site-pages.component.scss | 0 .../administrate-site-pages.component.ts | 15 +++ .../user-bar/header-user-bar.component.html | 2 +- .../_modules/pages/home/homepage.component.ts | 1 + .../page-breadcrumbs.component.html | 1 - src/app/_modules/pages/pages.module.ts | 13 +- .../sections/add/add-section.component.ts | 1 + .../sections/item/page-section.component.html | 11 +- .../sections/item/page-section.component.ts | 42 +----- .../sections/menu/page-menu.component.html | 8 ++ .../sections/menu/page-menu.component.scss | 0 .../sections/menu/page-menu.component.ts | 52 ++++++++ .../pages/sections/page-sections.module.ts | 2 + .../member/member-section.component.html | 16 ++- .../member/member-section.component.scss | 55 ++++++++ .../basic/member/member-section.component.ts | 19 ++- .../tree/item/pages-tree-item.component.html | 28 ++++ .../tree/item/pages-tree-item.component.scss | 0 .../tree/item/pages-tree-item.component.ts | 76 +++++++++++ .../pages/tree/pages-tree.component.html | 17 +++ .../pages/tree/pages-tree.component.scss | 124 ++++++++++++++++++ .../pages/tree/pages-tree.component.ts | 81 ++++++++++++ .../publications/list/list.component.scss | 7 +- src/app/_services/authentication.service.ts | 4 +- src/app/_services/pages.service.ts | 4 + src/assets/images/_remove/photo1.png | Bin 0 -> 849276 bytes src/environments/environment.prod.ts | 4 +- src/environments/environment.ts | 2 +- 32 files changed, 545 insertions(+), 73 deletions(-) create mode 100644 src/app/_modules/administration/site-pages/administrate-site-pages.component.html create mode 100644 src/app/_modules/administration/site-pages/administrate-site-pages.component.scss create mode 100644 src/app/_modules/administration/site-pages/administrate-site-pages.component.ts create mode 100644 src/app/_modules/pages/sections/menu/page-menu.component.html create mode 100644 src/app/_modules/pages/sections/menu/page-menu.component.scss create mode 100644 src/app/_modules/pages/sections/menu/page-menu.component.ts create mode 100644 src/app/_modules/pages/tree/item/pages-tree-item.component.html create mode 100644 src/app/_modules/pages/tree/item/pages-tree-item.component.scss create mode 100644 src/app/_modules/pages/tree/item/pages-tree-item.component.ts create mode 100644 src/app/_modules/pages/tree/pages-tree.component.html create mode 100644 src/app/_modules/pages/tree/pages-tree.component.scss create mode 100644 src/app/_modules/pages/tree/pages-tree.component.ts create mode 100644 src/assets/images/_remove/photo1.png diff --git a/src/app/_modules/administration/administration.module.ts b/src/app/_modules/administration/administration.module.ts index de3a9cd..3c85d69 100644 --- a/src/app/_modules/administration/administration.module.ts +++ b/src/app/_modules/administration/administration.module.ts @@ -8,10 +8,12 @@ import {AdministrateCompanyComponent} from "@app/_modules/administration/company import {AdministrateCommitteeComponent} from "@app/_modules/administration/committee/administrate-committee.component"; 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"; type PathMatch = "full" | "prefix" | undefined; const routes = [ - {path: 'administrate', redirectTo: 'administrate/company', pathMatch: 'full' as PathMatch}, + {path: 'administrate', redirectTo: 'administrate/site-pages', pathMatch: 'full' as PathMatch}, {path: 'administrate/:tab', component: AdministrationPageComponent, canActivate: [AuthGuard]} ]; @@ -21,12 +23,14 @@ const routes = [ CommonModule, RouterModule.forRoot(routes), AdvisoriesModule, - CompaniesModule + CompaniesModule, + PagesModule, ], declarations: [ AdministrationPageComponent, AdministrateCompanyComponent, - AdministrateCommitteeComponent + AdministrateCommitteeComponent, + AdministrateSitePagesComponent ], exports: [ RouterModule diff --git a/src/app/_modules/administration/page/administration-page.component.html b/src/app/_modules/administration/page/administration-page.component.html index 4d1002d..550f198 100644 --- a/src/app/_modules/administration/page/administration-page.component.html +++ b/src/app/_modules/administration/page/administration-page.component.html @@ -1,11 +1,12 @@

Панель управления

- +
-
+
+ +

Страница не найдена

diff --git a/src/app/_modules/administration/page/administration-page.component.ts b/src/app/_modules/administration/page/administration-page.component.ts index d22610c..e6a2944 100644 --- a/src/app/_modules/administration/page/administration-page.component.ts +++ b/src/app/_modules/administration/page/administration-page.component.ts @@ -1,16 +1,17 @@ import {Component} from '@angular/core'; import {ActivatedRoute, NavigationEnd, Router} from "@angular/router"; import {Subscription} from "rxjs"; +import {AuthenticationService} from "@app/_services"; @Component({ templateUrl: 'administration-page.component.html', styleUrls: ['administration-page.component.scss'] }) export class AdministrationPageComponent { - public tabs = [{name: 'company', title: 'Структура ФАУ «ФЦС»'}, {name: 'committee', title: 'Структура ТК 465'}]; + public tabs = []; routeSubscription: Subscription; - constructor(private route: ActivatedRoute, private router: Router) { + constructor(private route: ActivatedRoute, private router: Router, private authService: AuthenticationService) { this.routeSubscription = this.router.events.subscribe(event => { if (event instanceof NavigationEnd && (this.route.snapshot.paramMap.get('tab') !== this.tab?.name)) this.switchTab(this.route.snapshot.paramMap.get('tab')); }); @@ -21,13 +22,21 @@ export class AdministrationPageComponent { } ngOnInit() { - + this.authService.user.subscribe(val => { + this.makeTabs(); + }); } ngOnDestroy() { this.routeSubscription?.unsubscribe(); } + makeTabs() { + //this.tabs = [{name: 'company', title: 'Структура ФАУ «ФЦС»'}, {name: 'committee', title: 'Структура ТК 465'}]; + //if (this.authService.isSuperAdmin) this.tabs.push({name: 'site-pages', title: 'Структура сайта'}); + this.tabs = [{name: 'site-pages', title: 'Структура сайта'}]; + this.switchTab(this.route.snapshot.paramMap.get('tab')); + } switchTab(name: string) { this.tabs.map(tab => {tab.active = tab.name === name}); 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 new file mode 100644 index 0000000..d6e71e0 --- /dev/null +++ b/src/app/_modules/administration/site-pages/administrate-site-pages.component.html @@ -0,0 +1 @@ + diff --git a/src/app/_modules/administration/site-pages/administrate-site-pages.component.scss b/src/app/_modules/administration/site-pages/administrate-site-pages.component.scss new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..b391d23 --- /dev/null +++ b/src/app/_modules/administration/site-pages/administrate-site-pages.component.ts @@ -0,0 +1,15 @@ +import {Component} from '@angular/core'; + +@Component({ + selector: 'administrate-site-pages', + templateUrl: 'administrate-site-pages.component.html', + styleUrls: ['administrate-site-pages.component.scss'] +}) +export class AdministrateSitePagesComponent { + constructor() { + } + + ngOnInit() { + } + +} diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html index b2e535e..3741055 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html @@ -6,7 +6,7 @@