Andrey
/
object-type-constructor-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gbu bugfix

master
Boris Voropaev 2024-01-30 17:20:12 +03:00
parent b1757b13d2
commit b140299c0a
13 changed files with 147 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/_modules/pages/menu/item/pages-menu-item.component.ts
View File

@ -85,9 +85,9 @@ export class PagesMenuItemComponent {
toggle(event){
this.pagesService.menuSelectedLink = this.selected ? null : this.item.link
this.open = event;
if(event){
this.findChildren()
}
// if(event){
// this.findChildren()
// }
}
select(){
@ -100,6 +100,7 @@ export class PagesMenuItemComponent {
}
ngOnInit(){
this.findChildren()
this.open = this.current || this.parent || this.selected
}

3
src/gbu/component/layout/grid/grid.component.html
View File

@ -14,7 +14,8 @@
<h3>{{publications.name}}</h3>
</a>
<a *ngFor="let page of publications.publications" class="main-news-item-card" [routerLink]="page.link">
<img src="{{page.img}}" alt="">
<img src="{{page.img}}">
<span>{{page.date}}</span>
<h4>{{page.name}}</h4>
</a>
</div>

3
src/gbu/component/layout/grid/grid.component.ts
View File

@ -66,7 +66,8 @@ export class GridComponent {
publication => ({
name: publication.name,
img: publication.posters.data[0]?publication.posters.data[0].links.thumb:null,
link: publication.link
link: publication.link,
date: publication.publishDateRus
})
);
}

39
src/gbu/component/layout/jumbotron/jumbotron.component.html
View File

@ -32,26 +32,31 @@
<div class="root-menu">
<div class="root-menu-item">
<img src="assets/images/root_menu_services.jpg" alt="">
<div>Услуги</div>
<a class="root-menu-item" routerLink="kommunalnye-uslugi">
<div class="root-menu-img">
<img src="assets/images/root_menu_services.jpg" alt="">
</div>
<div class="root-menu-name">Услуги</div>
</a>
<div class="root-menu-item" routerLink="otzyvy">
<div class="root-menu-img">
<img src="assets/images/root_menu_replies.png" alt="">
</div>
<div class="root-menu-name">Отзывы</div>
</div>
<div class="root-menu-item">
<img src="assets/images/root_menu_replies.png" alt="">
<div>Отзывы</div>
<div class="root-menu-item" routerLink="platnye-uslugi">
<div class="root-menu-img">
<img src="assets/images/root_menu_payment.png" alt="">
</div>
<div class="root-menu-name">Платные услуги</div>
</div>
<div class="root-menu-item">
<img src="assets/images/root_menu_payment.png" alt="">
<div>Платные услуги</div>
<div class="root-menu-item" routerLink="planovye-i-avariinye-otklyuceniya">
<div class="root-menu-img">
<img src="assets/images/root_menu_disabling.png" alt="">
</div>
<div class="root-menu-name">Плановые и аварийные отключения</div>
</div>
<div class="root-menu-item">
<img src="assets/images/root_menu_disabling.png" alt="">
<div>Плановые и аварийные отключения</div>
</div>
</div>
</div>
</div>
</div>

2
src/gbu/component/layout/jumbotron/jumbotron.component.ts
View File

@ -2,6 +2,7 @@ import { Component } from '@angular/core';
import { PagesService } from '@app/_services/pages.service';
import { Subscription } from 'rxjs';
import { AuthenticationService } from '@app/_services';
import { Router } from '@angular/router';
@Component({
selector: 'jumbotron',
@ -18,6 +19,7 @@ export class JumbotronComponent {
constructor(
private pagesService: PagesService,
public authService: AuthenticationService,
private router: Router
){}
ngOnInit(){

10
src/gbu/component/layout/right-content/right-content.component.html
View File

@ -2,22 +2,22 @@
<ico ico="web_req_48" [size]="48"></ico>
<span>Электронное обращение</span>
</a>
<a class="right-card">
<a class="right-card" href="https://www.mos.ru/pgu/ru/app/mosenergo/counters/#step_1" target="_blank" >
<ico ico="lightbulb_48" [size]="48"></ico>
<span>Прием показаний и оплата электроэнергии</span>
</a>
<a class="right-card">
<a class="right-card" href="https://www.mos.ru/services/pokazaniya-vodi-i-tepla/" target="_blank" >
<ico ico="water_48" [size]="48"></ico>
<span>Прием показаний приборов учета воды</span>
</a>
<a class="right-card">
<a class="right-card" href="https://www.mos.ru/pgu/ru/services/link/2170/" target="_blank">
<ico ico="get_n_pay_48" [size]="48"></ico>
<span>Получить и оплатить ЕПД</span>
</a>
<a class="right-baner">
<a class="right-baner" href="https://ag.mos.ru/home" target="_blank">
<img src="assets/images/adv_00.png">
</a>
<a class="right-baner">
<a class="right-baner" href="https://crowd.mos.ru/propose" target="_blank">
<img src="assets/images/adv_01.png">
</a>

16
src/gbu/css/_buttons.scss
View File

@ -1,20 +1,22 @@
button, .btn, a.btn {
display: inline-flex;
padding: 8px 24px;
padding: 7px 24px 8px;
justify-content: center;
align-items: center;
gap: 10px;
cursor: pointer;
border-radius: 12px;
border-radius: 4px;
border: 1px solid var(--prime);
background:var(--prime);
color: #FFF;
font-family: PT Sans Narrow;
font-size: 24px;
color: var(--Black-FFFFFF, #FFF);
font-family: Golos;
font-size: 14px;
font-style: normal;
font-weight: 700;
line-height: 32px; /* 133.333% */
letter-spacing: 0.24px;
font-weight: 400;
line-height: 21px; /* 150% */
letter-spacing: 0.42px;
text-transform: uppercase;
&:hover{
border: 1px solid var(--prime-hov);

2
src/gbu/css/_forms.scss
View File

@ -2,7 +2,7 @@ input, select, textarea {
width: 100%;
height: 40px;
padding: 8px 16px;
border-radius: 12px;
border-radius: 4px;
border: solid 1px var(--second-dis);
font-family: "PT Sans";
font-size: 20px;

51
src/gbu/css/_grid.scss
View File

@ -71,16 +71,30 @@ jumbotron{
margin-bottom: 24px;
border-radius: 4px;
overflow: hidden;
img{
cursor: pointer;
.root-menu-img{
width: 50%;
height: 100%;
object-fit: cover;
background-color: var(--light);
overflow: hidden;
img{
width: 100%;
height: 100%;
object-fit: cover;
transition: transform 0.5s;
}
}
div{
.root-menu-name{
padding: 16px;
color: #fff;
}
&:hover{
img{
transform: scale(1.25);
}
}
}
.root-menu-item:first-child{
display: flex;
@ -89,10 +103,9 @@ jumbotron{
height: 100%;
align-items: center;
margin-bottom: 0;
img{
.root-menu-img{
height: 532px;
width: 100%;
object-fit: cover;
}
}
@ -122,6 +135,7 @@ jumbotron{
.content-sapce{
flex-grow: 1;
.content-grid{
@ -151,9 +165,14 @@ jumbotron{
padding: 24px;
gap:16px;
border-radius: 4px;
border: 1px solid transparent;
span{
text-align: center;
}
&:hover{
border: 1px solid var(--prime);
}
}
img{
width: 100%;
@ -167,6 +186,14 @@ jumbotron{
}
}
.this-root-page .main-content{
background-color: transparent !important;
.main-news{
margin: 0 !important;
}
}
@media screen and (min-width: 1330px){
@ -223,21 +250,31 @@ pages-menu-item{
}
.main-news-item-card{
width: 308px;
width: 250px;
flex-grow: 1;
display: flex;
flex-direction: column;
background-color: #fff;
border-radius: 4px;
overflow: hidden;
border-radius: 4px;
img {
width: 100%;
height: 308px;
object-fit: cover;
}
span{
margin: 16px 16px 0;
color: #969595;
}
h4{
margin: 16px;
}
&:hover{
h4{
color: var(--prime);
}
}
}
}
}

8
src/gbu/css/_main-menu.scss
View File

@ -103,6 +103,7 @@ header{
a{
color: #000;
margin-top: 0;
}
&.parent,&.current{
padding-bottom: 10px;
@ -112,6 +113,11 @@ header{
}
border-bottom: 4px solid var(--prime);
}
&:hover{
a{
color: var(--prime);
}
}
}
pages-menu{
@ -148,7 +154,7 @@ header{
.header.layout-corral{
pages-menu.lvl-0{
>pages-menu-item:hover{
pages-menu.selected{
pages-menu{
display: flex;
};
}

32
src/gbu/css/_pages-section.scss
View File

@ -586,6 +586,12 @@ publications-list{
publications-list-item {
display: block;
background-color: #FFF;
padding-top: 32px;
&:last-child{
.publication-content{
border-bottom-color: transparent;
}
}
.publication-content{
width: 100%;
@ -594,6 +600,8 @@ publications-list{
position: relative;
min-height: 232px;
border-bottom: solid 1px #E5E5E5;
gellery{
display: block;
order: 0;
@ -614,6 +622,9 @@ publications-list{
border-radius: 0;
}
}
.gellery-fullscreen{
display: none;
}
}
.date{
margin-left: 232px;
@ -779,6 +790,27 @@ video-section{
}
contact-section{
.contact{
display: flex;
flex-direction: column;
gap: 24px;
}
h2{
font-family: "PT Serif";
font-size: 24px;
font-style: normal;
font-weight: 400;
line-height: 30px;
margin: 0;
}
p{
margin-top: -16px;
}
}
.pagination {

23
src/gbu/css/_registry.scss
View File

@ -47,17 +47,16 @@ registry-page{
registry-category {
display: block;
.bar{
background-color: var(--light);
border-top: 1px solid var(--second-dis);
border-bottom: 1px solid var(--second-dis);
background-color: var(--second);
.name{
color: var(--dark);
color: #fff;
}
.menu{
svg{
color: var(--second);
}
svg{
color: #fff;
}
}
}
@ -82,12 +81,11 @@ registry-page{
height: 40px;
padding: 8px 52px 8px 16px;
border: 1px solid (--second-dis);
border-radius: 12px;
background: #ffffff url('~src/assets/images/icons/search_24dp.svg') calc(100% - 12px) 50% no-repeat;
}
}
.advanced {
margin-left: 24px;
display: none;
}
}
}
@ -102,7 +100,7 @@ registry-category{
display: flex;
flex-direction: row;
align-items: center;
padding: 12px 24px;
padding: 12px 16px;
cursor: pointer;
.name {
margin-right: auto;
@ -145,7 +143,7 @@ registry-entry {
}
.main {
.name {
margin-right: 24px;
margin-right: 8px;
a{
display: inline-flex;
align-items: flex-start;
@ -195,7 +193,6 @@ registry-entry {
&.row {
display: flex;
flex-direction: row;
align-items: center;
}
}

7
src/vniigaz-v2/css/_main-menu.scss
View File

@ -265,6 +265,7 @@ slider-menu{
}
}
right-content{
drop-down{
display: none;
}
@ -318,6 +319,9 @@ right-content{
background-color: #EDEDED;
}
}
pages-menu:not(.open){
display: none;
}
}
@ -355,6 +359,9 @@ right-content{
background-color: #EDEDED;
}
}
pages-menu:not(.open){
display: none;
}
}