From 97bee863425e3cc7a656424bb8f3095d1708d874 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Tue, 26 Dec 2023 16:01:21 +0300 Subject: [PATCH] bugfix --- .../administrate-site-pages.component.ts | 5 +- .../login/auth-form-login.component.html | 2 +- src/app/_modules/pages/page/page.component.ts | 3 +- .../publication-page.component.html | 6 ++ .../publication/publication-page.component.ts | 9 ++- .../widjet/locale/locale.component.html | 2 +- .../widjet/locale/locale.component.ts | 10 ++- src/app/_services/licence.service.ts | 4 +- src/app/_services/pages.service.ts | 5 +- .../layout/footer/footer.component.html | 8 +-- .../layout/header/header.component.html | 2 +- .../layout/jumbotron/jumbotron.component.html | 10 +-- .../layout/jumbotron/jumbotron.component.ts | 33 +++++----- .../slider-menu/slider-menu.component.html | 3 + src/vniigaz-v2/css/_basics.scss | 24 +------ src/vniigaz-v2/css/_grid.scss | 13 ++++ src/vniigaz-v2/css/_main-menu.scss | 16 ++++- src/vniigaz-v2/css/_pages-section.scss | 7 ++ src/vniigaz-v2/images/logo_vniigaz.svg | 66 +++++++++++++++++++ 19 files changed, 169 insertions(+), 59 deletions(-) create mode 100644 src/vniigaz-v2/images/logo_vniigaz.svg 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 index 22442a7..26798d4 100644 --- a/src/app/_modules/administration/site-pages/administrate-site-pages.component.ts +++ b/src/app/_modules/administration/site-pages/administrate-site-pages.component.ts @@ -2,6 +2,7 @@ import {Component} from '@angular/core'; import {PagesService} from "@app/_services/pages.service"; import { FormsService } from '@app/_services'; import {LicenceService} from "@app/_services/licence.service"; +import { DialogService } from '@app/_services/dialog.service'; @Component({ selector: 'administrate-site-pages', @@ -9,7 +10,7 @@ import {LicenceService} from "@app/_services/licence.service"; styleUrls: ['administrate-site-pages.component.scss'] }) export class AdministrateSitePagesComponent { - constructor(private pagesService: PagesService, private formsService: FormsService, public licenceService: LicenceService) { + constructor(private pagesService: PagesService, private formsService: FormsService, public licenceService: LicenceService, private dialog: DialogService) { } get isLicenceActive() { @@ -33,7 +34,7 @@ export class AdministrateSitePagesComponent { addLocale() { if (this.isMultilang) this.formsService.createModel('localePage', null, 'pages-tree-root'); - else alert('Отсутствует необходимая опция'); + else this.dialog.alert('Данная опция не входит в Вашу лицензию. Для включения опции обратитесь в службу поддержки НИР (+7 499 490 04 65, help@nirgroup.ru)'); } toggle() { diff --git a/src/app/_modules/auth/forms/login/auth-form-login.component.html b/src/app/_modules/auth/forms/login/auth-form-login.component.html index 5984341..47ef81f 100644 --- a/src/app/_modules/auth/forms/login/auth-form-login.component.html +++ b/src/app/_modules/auth/forms/login/auth-form-login.component.html @@ -18,7 +18,7 @@
- +
diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts index c681756..a42f1a1 100644 --- a/src/app/_modules/pages/page/page.component.ts +++ b/src/app/_modules/pages/page/page.component.ts @@ -49,7 +49,7 @@ export class PageComponent { ngOnDestroy() { this.routeSubscription?.unsubscribe(); - this.listSubscription.unsubscribe() + this.listSubscription?.unsubscribe() } onNavigationEnd(event: NavigationEnd) { @@ -65,6 +65,7 @@ export class PageComponent { this.loading = true; let include = [ 'parents.children', + 'parents.picture', 'children', 'sections.type', 'sections.groups.fields.value', diff --git a/src/app/_modules/publications/publication/publication-page.component.html b/src/app/_modules/publications/publication/publication-page.component.html index 683ffb2..c360a6f 100644 --- a/src/app/_modules/publications/publication/publication-page.component.html +++ b/src/app/_modules/publications/publication/publication-page.component.html @@ -2,9 +2,15 @@

{{page.name}}

+
+ + + Назад + + diff --git a/src/app/_modules/publications/publication/publication-page.component.ts b/src/app/_modules/publications/publication/publication-page.component.ts index 148dbb9..33bca66 100644 --- a/src/app/_modules/publications/publication/publication-page.component.ts +++ b/src/app/_modules/publications/publication/publication-page.component.ts @@ -1,4 +1,5 @@ import {Component, Input} from '@angular/core'; +import { Router } from '@angular/router'; @Component({ selector: 'publication-page', @@ -9,13 +10,19 @@ export class PublicationPageComponent { @Input() page: any; @Input() editMode: boolean; - constructor() { + constructor( + private router: Router + ) { } get posters() { return this.page.posters?.data; } + back(): void { + window.history.back(); +} + ngOnInit() { } } diff --git a/src/app/_modules/widjet/locale/locale.component.html b/src/app/_modules/widjet/locale/locale.component.html index 4ac9254..9c9cc06 100644 --- a/src/app/_modules/widjet/locale/locale.component.html +++ b/src/app/_modules/widjet/locale/locale.component.html @@ -6,7 +6,7 @@
-
+
{{locale.name}} diff --git a/src/app/_modules/widjet/locale/locale.component.ts b/src/app/_modules/widjet/locale/locale.component.ts index 3f3bc81..77ef058 100644 --- a/src/app/_modules/widjet/locale/locale.component.ts +++ b/src/app/_modules/widjet/locale/locale.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { Router } from '@angular/router'; import {PagesService} from "@app/_services/pages.service"; import { environment } from '@environments/environment'; import {Subscription} from "rxjs"; @@ -15,7 +16,8 @@ export class LocaleComponent { private rootSubscription: Subscription constructor( - public pagesService: PagesService + public pagesService: PagesService, + private router: Router ){} ngOnInit() { @@ -49,4 +51,10 @@ export class LocaleComponent { }, 10); } + select(locale){ + let link = locale.link + this.router.navigate([{outlets: {slider: null}}]).then(() => { + this.router.navigate([link])}); + } + } diff --git a/src/app/_services/licence.service.ts b/src/app/_services/licence.service.ts index 7040abd..c0296f6 100644 --- a/src/app/_services/licence.service.ts +++ b/src/app/_services/licence.service.ts @@ -59,8 +59,8 @@ export class LicenceService { public checkEditAvailability(page?: any) { if (!this.isActive) return this.error('Licence not active'); - if ((page?.type?.name === 'registry') && !this.hasOption('registries')) return this.error('Registries option required'); - if ((page?.type?.name === 'publications') && !this.hasOption('publications')) return this.error('Publications option required'); + if ((page?.type?.name === 'registry') && !this.hasOption('registries')) return this.error('Срок действия лицензии истек. Режим редактирования не доступен. Продлите лицензию или обратитесь в службу поддержки НИР (+7 499 490 04 65, help@nirgroup.ru)'); + if ((page?.type?.name === 'publications') && !this.hasOption('publications')) return this.error('Данная опция не входит в Вашу лицензию. Для включения опции обратитесь в службу поддержки НИР (+7 499 490 04 65, help@nirgroup.ru)'); return null; } diff --git a/src/app/_services/pages.service.ts b/src/app/_services/pages.service.ts index 3aa9e49..7aa5192 100644 --- a/src/app/_services/pages.service.ts +++ b/src/app/_services/pages.service.ts @@ -3,6 +3,7 @@ import {HttpClient} from '@angular/common/http'; import {environment} from '@environments/environment'; import {Observable, BehaviorSubject} from "rxjs"; import {LicenceService} from "@app/_services/licence.service"; +import { DialogService } from '@app/_services/dialog.service'; @Injectable({providedIn: 'root'}) @@ -16,7 +17,7 @@ export class PagesService { public rootPage = {link:'', slug:environment.defaultLocale}; - constructor(private http: HttpClient, private licenceService: LicenceService) { + constructor(private http: HttpClient, private licenceService: LicenceService, private dialog: DialogService) { //this.find('/').subscribe(res => {this.rootPages = res.data}); } @@ -42,7 +43,7 @@ export class PagesService { if (value) { let error = this.licenceService.checkEditAvailability(this.currentPage); if (error) { - alert(error); + this.dialog.alert(error); return; } } diff --git a/src/vniigaz-v2/component/layout/footer/footer.component.html b/src/vniigaz-v2/component/layout/footer/footer.component.html index 65b5845..b647a4c 100644 --- a/src/vniigaz-v2/component/layout/footer/footer.component.html +++ b/src/vniigaz-v2/component/layout/footer/footer.component.html @@ -2,7 +2,7 @@
- 142717, Российская Федерация, Московская область,
г. Видное, посёлок Развилка, ВНИИГАЗ + 142717, Российская Федерация, Московская область, г. Видное, посёлок Развилка, ВНИИГАЗ
@@ -35,8 +35,8 @@
© 1998–{{year}} ЧУ СЦ ВНИИГАЗ-Сертификат
-
- Работает на платформе НИР +
+ Работает на платформе НИР
diff --git a/src/vniigaz-v2/component/layout/header/header.component.html b/src/vniigaz-v2/component/layout/header/header.component.html index d39da19..8ad4398 100644 --- a/src/vniigaz-v2/component/layout/header/header.component.html +++ b/src/vniigaz-v2/component/layout/header/header.component.html @@ -4,7 +4,7 @@ diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html index dbab32e..4635a82 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html @@ -2,11 +2,11 @@
-

{{name}}

-

+

{{name}}

+ +

Учреждено в 1998

@@ -20,4 +20,4 @@
-
\ No newline at end of file +
diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts index ccebaec..fef0b6d 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts @@ -11,7 +11,9 @@ import { AuthenticationService } from '@app/_services'; export class JumbotronComponent { private subscription:Subscription public currentPage:any; - public contentPage:any; + public pagePicture:any; + + constructor( private pagesService: PagesService, @@ -22,21 +24,16 @@ export class JumbotronComponent { this.subscription = this.pagesService.currentPageSubject.subscribe( resp=> { this.currentPage = resp; + console.log(this.currentPage) if (this.currentPage) { if(this.currentPage.picture){ - this.contentPage = this.currentPage + this.pagePicture = this.currentPage.picture.data.links.open }else{ - let include = [ - 'parents.picture', - ]; - let url = this.currentPage.link; - if (url) this.pagesService.find(url, {include: include.join(',')}).subscribe(res => { - this.contentPage = res.data.parents.data.findLast(page=>page.picture) - }, error => { - console.log(error) - }); + let parents = this.currentPage.parents.data + let content = parents.map(page=>page.picture).filter(page=>page) + this.pagePicture = content.pop()?.data.links.open } - }else{this.contentPage = null;} + }else{this.pagePicture = null;} } ) } @@ -47,7 +44,7 @@ export class JumbotronComponent { get name(){ let name:string if(this.currentPage){ - name = this.currentPage?.h1 || this.currentPage?.name + name = this.currentPage?.h1 || this.currentPage?.name; let parents = this.currentPage?.parents?.data if(parents){ if (parents[1]?.type.name=='nav-page'){ @@ -63,9 +60,9 @@ export class JumbotronComponent { get bgStyle(){ let height = 70; let pictURL:string; - if (this.contentPage){ + if (this.pagePicture){ height = 150; - pictURL = this.contentPage?.picture?.data.links.open; + pictURL = this.pagePicture; } return { @@ -76,7 +73,7 @@ export class JumbotronComponent { get h1Style(){ return { - color: this.contentPage?.picture?'var(--white)':'var(--second-act)', + color: this.pagePicture?'var(--white)':'var(--second-act)', 'align-self': this.mainPage?'center':'flex-start', 'text-align': this.mainPage?'center':'left', 'width': this.mainPage?'900px':null, @@ -104,4 +101,8 @@ export class JumbotronComponent { return !this.pagesService.currentPage?.parents.data.length && this.pagesService.currentPage } + get since(){ + return this.currentPage?.link === '/' + } + } diff --git a/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.html b/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.html index 383a03d..94ee5fe 100644 --- a/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.html +++ b/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.html @@ -8,6 +8,9 @@ Личный кабинет (АИС СЦ)
+
+ +
\ No newline at end of file diff --git a/src/vniigaz-v2/css/_basics.scss b/src/vniigaz-v2/css/_basics.scss index 44541e9..c4544e7 100644 --- a/src/vniigaz-v2/css/_basics.scss +++ b/src/vniigaz-v2/css/_basics.scss @@ -311,27 +311,9 @@ header{ width:27px; object-fit: cover; border: 1px solid lightgray; - } - } -} - -footer{ - .locale{ - position: relative; - .locale-btn{ - display: inline-flex; - } - .dropdown{ - top: auto; - left: -96px; - bottom: 27px; - - } - img{ - height:18px; - width:27px; - object-fit: cover; - border: 1px solid lightgray; + &:hover{ + border-color: var(--prime-act); + } } } } diff --git a/src/vniigaz-v2/css/_grid.scss b/src/vniigaz-v2/css/_grid.scss index 842749b..0ffa652 100644 --- a/src/vniigaz-v2/css/_grid.scss +++ b/src/vniigaz-v2/css/_grid.scss @@ -59,6 +59,8 @@ jumbotron{ .jumbotron-content-center{ align-self: center; align-items: center; + max-width: 100%; + width: 768px; h1{ font-size: 80px; @@ -192,6 +194,8 @@ footer{ &>div{ padding-bottom: 40px; + max-width: fit-content; + flex-basis: 400px; } >div{ display: block; @@ -222,6 +226,12 @@ footer{ font-style: normal; font-weight: 400; margin: 40px 0; + .nir a{ + color: #6C6C6C; + &:hover{ + color: #7c7c7c; + } + } } } } @@ -256,6 +266,9 @@ pages-menu-item{ @media screen and (max-width: 1330px){ .footer{ padding: 40px 24px; + .footer-login{ + display: none; + } } .space{ .layout-corral{ diff --git a/src/vniigaz-v2/css/_main-menu.scss b/src/vniigaz-v2/css/_main-menu.scss index b3bd5cc..e51a7c9 100644 --- a/src/vniigaz-v2/css/_main-menu.scss +++ b/src/vniigaz-v2/css/_main-menu.scss @@ -163,7 +163,9 @@ slider[side="left"]{ } .btn-menu{ - display: block; + display: flex; + flex-direction: column; + gap:40px; padding: 20px 0 0 ; border-top: 1px solid var(--prime); a{ @@ -174,6 +176,18 @@ slider[side="left"]{ letter-spacing: 0.24px; color: #FFF; } + locale{ + img{ + width: 27px; + } + .dropdown{ + left: 48px; + top:-24px; + img{ + border: 1px solid var(--second-dis); + } + } + } } } diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss index 6dd85f2..e63796a 100644 --- a/src/vniigaz-v2/css/_pages-section.scss +++ b/src/vniigaz-v2/css/_pages-section.scss @@ -443,6 +443,13 @@ publication-page { flex-direction: column; gap: $p; }; + + .publication-page-back { + display: inline-flex; + align-items: center; + gap: 8px; + margin-top: 24px; + } } diff --git a/src/vniigaz-v2/images/logo_vniigaz.svg b/src/vniigaz-v2/images/logo_vniigaz.svg new file mode 100644 index 0000000..5ee4e80 --- /dev/null +++ b/src/vniigaz-v2/images/logo_vniigaz.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +