diff --git a/.gitignore b/.gitignore index e0bbc26..dba49c4 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ testem.log Thumbs.db /src/environments/environment.ts +src/vniigaz-v2/vniigaz-v2.env.dev.ts diff --git a/angular.json b/angular.json index 65e586d..456af24 100644 --- a/angular.json +++ b/angular.json @@ -85,6 +85,10 @@ { "replace": "src/environments/environment.ts", "with": "src/vniigaz-v2/vniigaz-v2.env.dev.ts" + }, + { + "replace": "src/app/_modules/layout/header/header.component.ts", + "with": "src/vniigaz-v2/component/layout/header/header.component.ts" } ], "stylePreprocessorOptions": { diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html index bf93ee2..4d4e64c 100644 --- a/src/app/_modules/layout/header/header.component.html +++ b/src/app/_modules/layout/header/header.component.html @@ -4,46 +4,12 @@ - АИС СЦ ВНИИГАЗ + !!!!!!!!!! - - - - - - - - diff --git a/src/app/_services/menu.service.ts b/src/app/_services/menu.service.ts index c33b849..cc83163 100644 --- a/src/app/_services/menu.service.ts +++ b/src/app/_services/menu.service.ts @@ -1,16 +1,22 @@ import {Injectable} from '@angular/core'; import {HttpClient} from '@angular/common/http'; -import {environment} from '@environments/environment'; import {Observable, BehaviorSubject} from "rxjs"; +import { PagesService } from './pages.service'; +import {environment} from '@environments/environment'; + + @Injectable({providedIn: 'root'}) export class MenuService { constructor( - private http: HttpClient + private http: HttpClient, + private pagesService: PagesService ){} public pagesTree = new BehaviorSubject({data:[]}); + private currentPage:any; + setPagesTree(){ diff --git a/src/assets/css/_basics.scss b/src/assets/css/_basics.scss index 3d9cc64..149e387 100644 --- a/src/assets/css/_basics.scss +++ b/src/assets/css/_basics.scss @@ -123,10 +123,10 @@ --light: #F6F6F6; - --prime: #0070BA; - --prime-hov: #005799; - --prime-act: #004077; - --prime-dis: #A1CAE5; + --prime: #00ba82; + --prime-hov: #00998c; + --prime-act: #007771; + --prime-dis: #a1e5ce; diff --git a/src/vniigaz-v2/component/layout/header/header.component.html b/src/vniigaz-v2/component/layout/header/header.component.html new file mode 100644 index 0000000..4e73f4a --- /dev/null +++ b/src/vniigaz-v2/component/layout/header/header.component.html @@ -0,0 +1,14 @@ +
+ + + + + + + АИС СЦ ВНИИГАЗ +
+ + + diff --git a/src/vniigaz-v2/component/layout/header/header.component.scss b/src/vniigaz-v2/component/layout/header/header.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/vniigaz-v2/component/layout/header/header.component.ts b/src/vniigaz-v2/component/layout/header/header.component.ts new file mode 100644 index 0000000..0670a18 --- /dev/null +++ b/src/vniigaz-v2/component/layout/header/header.component.ts @@ -0,0 +1,73 @@ +import {Component} from '@angular/core'; +import {PagesService} from "@app/_services/pages.service"; +import {AuthenticationService, ListsService} from "@app/_services"; +import {Router} from "@angular/router"; +import {Subscription} from "rxjs"; +import { MenuService } from '@app/_services/menu.service'; + +@Component({ + selector: 'header', + templateUrl: 'header.component.html', + styleUrls: ['header.component.scss'] +}) +export class HeaderComponent { + public menuItems = []; + + public loading: boolean = false; + public error: string = ''; + + showBottom = false; + + controlsSubscriptionMenu: Subscription; + resultSubscriptionMenu: Subscription; + + constructor( + private router: Router, + private pagesService: PagesService, + public authenticationService: AuthenticationService, + private listsService: ListsService, + private menuService: MenuService + ) { + + } + + ngOnInit() { + let showSettingSite = localStorage.getItem('showSettingSite'); + if (showSettingSite === null || showSettingSite === 'no') { + localStorage.setItem('showSettingSite', 'no'); + this.listsService.result('showSettingSite').next(false); + } + this.controlsSubscriptionMenu = this.listsService.controls('headerMenu').subscribe(controls => { + }); + this.resultSubscriptionMenu = this.listsService.result('headerMenu').subscribe(res => { + this.menuItems = res?.data || []; + }); + this.menuService.setPagesTree() + } + + ngOnDestroy() { + + this.controlsSubscriptionMenu?.unsubscribe(); + this.resultSubscriptionMenu?.unsubscribe(); + } + + settingsSite() { + let showSettingSite = localStorage.getItem('showSettingSite'); + showSettingSite = showSettingSite === 'yes' ? 'no' : 'yes'; + localStorage.setItem('showSettingSite', showSettingSite); + this.listsService.result('showSettingSite').next(showSettingSite==='yes'); + } + + login() { + this.authenticationService.popup('login'); + } + + itemSelect(event:any){ + // if(!event.children?.data.length) + this.showBottom = false; + } + + openMobileMenu(){ + this.router.navigate([{outlets: {slider: 'pages-menu'}}], {skipLocationChange: true}).then(); + } +} diff --git a/src/vniigaz-v2/vniigaz-v2.env.dev.ts b/src/vniigaz-v2/vniigaz-v2.env.dev.ts index 1478c68..8491685 100644 --- a/src/vniigaz-v2/vniigaz-v2.env.dev.ts +++ b/src/vniigaz-v2/vniigaz-v2.env.dev.ts @@ -4,9 +4,10 @@ export const environment = { production: false, - apiUrl: 'http://api.vniigazv2.lc', - clientId: 4, - clientSecret: 'QC09jOPEU7mpfFerpLyAJRshFUW1T28GfhsYzJHc', + apiUrl: 'http://api.nircms.lc', + clientId: 2, + clientSecret: 'm2xpjoyMM2sSAO20BpcFyPaAs4h50J4tz6so3qM2', + project: 'vniigaz-v2' };