diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.html b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.html index 3f4a6d2..7c1ec8c 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.html +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.html @@ -2,5 +2,8 @@
{{header}}
{{subheader}}
{{text}}
- +
+ +
+ \ No newline at end of file diff --git a/src/environments/gbu.env.prod.ts b/src/environments/gbu.env.prod.ts index 3e62b8a..12676bd 100644 --- a/src/environments/gbu.env.prod.ts +++ b/src/environments/gbu.env.prod.ts @@ -1,9 +1,9 @@ export const environment = { production: true, - apiUrl: 'https://nirgroup.testnir.ru', + apiUrl: 'https://gbu.testnir.ru', clientId: 2, - clientSecret: 'iqt55TXiXIkIiuUfZ8xnW5CQzOsnKllLebes9sN1', + clientSecret: 'N6YSSL2DqyC67SY5gQah2eX6pQXbsZjesQPzOXWK', project: null, - licence: 'ZL0ZKY9GSZDV', + licence: 'XDIR5Z6WXY39', defaultLocale: 'ru' }; diff --git a/src/gbu/component/layout/grid/grid.component.ts b/src/gbu/component/layout/grid/grid.component.ts index a35cd85..e0bef32 100644 --- a/src/gbu/component/layout/grid/grid.component.ts +++ b/src/gbu/component/layout/grid/grid.component.ts @@ -33,10 +33,12 @@ export class GridComponent { this.pagesService.find(currentPage.link,{include: 'children.children'}).subscribe( resp=> { let children = resp.data.children.data; - + console.log('children',children) this.news = children.find( (child:any) => { - if (!child.children) { + console.log('child',child) + if (!child.children.data.length) { + console.log('notChild',child) return false } else { return child.children.data.reduce( @@ -47,7 +49,7 @@ export class GridComponent { } } ).children.data - + this.news.forEach(page => { this.publicationsService.list({ page:1, @@ -60,7 +62,7 @@ export class GridComponent { page.publications = resp.data.slice(0,3).map( publication => ({ name: publication.name, - img: publication.posters.data[0].links.thumb, + img: publication.posters.data[0]?publication.posters.data[0].links.thumb:null, link: publication.link }) ); diff --git a/src/gbu/component/layout/jumbotron/jumbotron.component.html b/src/gbu/component/layout/jumbotron/jumbotron.component.html index ede75d7..7c72393 100644 --- a/src/gbu/component/layout/jumbotron/jumbotron.component.html +++ b/src/gbu/component/layout/jumbotron/jumbotron.component.html @@ -1,9 +1,9 @@
-
+
- + {{parent.name}} diff --git a/src/gbu/component/layout/jumbotron/jumbotron.component.ts b/src/gbu/component/layout/jumbotron/jumbotron.component.ts index 16fcf30..1f9a79e 100644 --- a/src/gbu/component/layout/jumbotron/jumbotron.component.ts +++ b/src/gbu/component/layout/jumbotron/jumbotron.component.ts @@ -45,34 +45,12 @@ export class JumbotronComponent { if(this.currentPage){ name = this.currentPage?.h1 || this.currentPage?.name; let parents = this.currentPage?.parents?.data - if (parents&&parents[1]) name = parents[1].h1|| parents[1].name + if (parents&&parents[2]) name = parents[2].h1|| parents[2].name } return name } - get bgStyle(){ - let height = 70; - let pictURL:string; - if (this.pagePicture){ - height = 150; - pictURL = this.pagePicture; - } - - return { - 'background-image' : `url(${pictURL})`||'none', - 'height': (this.mainPage?700:pictURL?400:height) + 'px' - } - } - get h1Style(){ - return { - 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, - 'border-bottom':this.mainPage?null:'12px solid #2EB2E8' - } - } get mainPage(){ return this.currentPage?.parents?.data.length === 0; diff --git a/src/gbu/css/_grid.scss b/src/gbu/css/_grid.scss index 385cdf6..6832759 100644 --- a/src/gbu/css/_grid.scss +++ b/src/gbu/css/_grid.scss @@ -160,6 +160,7 @@ jumbotron{ } .main-content{ width: 990px; + background-color: #FFF; } } @@ -197,7 +198,8 @@ pages-menu-item{ } .pages{ - width: 100%; + margin: 32px; + width: calc( 100% - 64px ); } .jumbotron-edit-field{ @@ -205,6 +207,7 @@ pages-menu-item{ } .main-news{ + margin: 32px; .main-news-item{ display: flex; flex-wrap: wrap; diff --git a/src/gbu/css/_pages-section.scss b/src/gbu/css/_pages-section.scss index 5d90c93..b220b27 100644 --- a/src/gbu/css/_pages-section.scss +++ b/src/gbu/css/_pages-section.scss @@ -1,8 +1,7 @@ + page-sections{ display: flex; flex-direction: column; - background-color: #FFF; - padding: 32px; .section{ display: flex; @@ -587,7 +586,7 @@ publications-list{ publications-list-item { display: block; background-color: #FFF; - padding: 32px 32px 0 32px; + .publication-content{ width: 100%; display: flex; @@ -658,7 +657,6 @@ publications-list{ publication-page { background-color: #FFF; display: block; - padding: 32px; .date{ color: var(--second); margin-bottom: 16px; diff --git a/src/gbu/css/_registry.scss b/src/gbu/css/_registry.scss index 5e91c1d..ab2608c 100644 --- a/src/gbu/css/_registry.scss +++ b/src/gbu/css/_registry.scss @@ -10,7 +10,6 @@ registry-page{ .registry { background-color: #ffffff; - padding: 32px; .filters{ display: flex; gap:24px; diff --git a/src/gbu/index.html b/src/gbu/index.html index 6ce3a9e..4ca4098 100644 --- a/src/gbu/index.html +++ b/src/gbu/index.html @@ -2,7 +2,7 @@ - ЧУ СЦ ВНИИГАЗ-Сертификат + ГБУ Жилищник diff --git a/src/nir/css/_main-menu.scss b/src/nir/css/_main-menu.scss index f4c92f1..336a77f 100644 --- a/src/nir/css/_main-menu.scss +++ b/src/nir/css/_main-menu.scss @@ -69,6 +69,10 @@ header{ .burger{ align-items: center; height: 32px; + padding: 8px; + height: 100%; + display: none; + align-items: center; } .header-login{ @@ -112,7 +116,7 @@ header{ slider[side="left"]{ .slider-bar{ background-color: var(--bg-lt); - width: 360px; + width: 240px; max-width: 100vw; .header{ box-shadow: none; @@ -157,6 +161,13 @@ slider[side="left"]{ pages-menu{ display: none !important; } + .header-login{ + margin-right: -8px; + } + .burger{ + display: flex; + margin-inline: -8px 8px; + } } } @@ -168,7 +179,8 @@ slider[side="left"]{ .burger{ display: none; - } + } + } } diff --git a/src/nir/css/_pages-section.scss b/src/nir/css/_pages-section.scss index 9a6a5f9..fb01a10 100644 --- a/src/nir/css/_pages-section.scss +++ b/src/nir/css/_pages-section.scss @@ -706,7 +706,7 @@ cards-section{ cards-section-item{ display: flex; width: 100%; - height: 274px; + min-height: 274px; padding: 24px; border-radius: 16px; border: 1px solid var(--light); @@ -734,10 +734,18 @@ cards-section{ object-fit: cover; display: block; top: 56px; - border-radius: 8px; - border: 1px solid var(--bk22); + order: 1; margin-bottom: -120px; + background-image: url("/assets/images/card_slider_img_holder.svg"); + background-size: contain; + img{ + width: 100%; + height: 100%; + object-fit: cover; + border-radius: 8px; + border: 1px solid var(--bk22); + } } .card-text{ order: 2; @@ -815,6 +823,15 @@ cards-section{ margin-left: 0px; margin-right: 0px; + align-items: end; + .card-slide{ + flex-direction: column; + flex-wrap: nowrap; + .card-image{ + margin-bottom: 8px; + align-self: flex-start; + } + } } } diff --git a/src/nir/images/card_slider_img_holder.svg b/src/nir/images/card_slider_img_holder.svg new file mode 100644 index 0000000..f523e37 --- /dev/null +++ b/src/nir/images/card_slider_img_holder.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file