From 971359a8b9f462d23703989f34c4aa83c55a8375 Mon Sep 17 00:00:00 2001
From: Boris Voropaev <boris1voropaev@gmail.com>
Date: Tue, 5 Sep 2023 10:21:33 +0300
Subject: [PATCH] news

---
 .../date/filter-field-date.component.scss     |  2 +-
 .../single/field-date-single.component.scss   |  2 +-
 .../pages/sections/page-sections.module.ts    |  1 +
 .../images/images-section.component.html      | 78 +++++++++++--------
 .../list/item/news/news.component.html        | 15 +++-
 .../list/item/news/news.component.scss        | 36 ++++-----
 src/assets/css/basics.scss                    | 10 ++-
 7 files changed, 85 insertions(+), 59 deletions(-)

diff --git a/src/app/_modules/filter-fields/types/date/filter-field-date.component.scss b/src/app/_modules/filter-fields/types/date/filter-field-date.component.scss
index 9551530..cd1d941 100644
--- a/src/app/_modules/filter-fields/types/date/filter-field-date.component.scss
+++ b/src/app/_modules/filter-fields/types/date/filter-field-date.component.scss
@@ -3,7 +3,7 @@
   flex-direction: row;
   align-items: center;
   input {
-    padding-right: 50px;
+    // padding-right: 50px;
     //background: transparent url('~src/assets/images/icons/notification_date.svg') calc(100% - 20px) 50% no-repeat;
     background-size: 16px;
   }
diff --git a/src/app/_modules/form-fields/types/date/single/field-date-single.component.scss b/src/app/_modules/form-fields/types/date/single/field-date-single.component.scss
index 51c9313..8dfe220 100644
--- a/src/app/_modules/form-fields/types/date/single/field-date-single.component.scss
+++ b/src/app/_modules/form-fields/types/date/single/field-date-single.component.scss
@@ -1,6 +1,6 @@
 input {
   max-width: 160px;
-  padding-right: 50px;
+  // padding-right: 50px;
   //background: transparent url('~src/assets/images/icons/notification_date.svg') calc(100% - 20px) 50% no-repeat;
   background-size: 16px;
 }
diff --git a/src/app/_modules/pages/sections/page-sections.module.ts b/src/app/_modules/pages/sections/page-sections.module.ts
index e71f322..8b7658d 100644
--- a/src/app/_modules/pages/sections/page-sections.module.ts
+++ b/src/app/_modules/pages/sections/page-sections.module.ts
@@ -56,6 +56,7 @@ import {PageMenuComponent} from "@app/_modules/pages/sections/menu/page-menu.com
   ],
   exports: [
     PageSectionsComponent,
+    ImagesSectionComponent
   ]
 })
 export class PageSectionsModule {
diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.html b/src/app/_modules/pages/sections/types/basic/images/images-section.component.html
index 070cee3..fc8bf37 100644
--- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.html
+++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.html
@@ -1,40 +1,52 @@
-<div class="first" [ngClass]="imageClass">
-  <img class="" [src]="items[0].links.full"  (click)="show(items[0].id)"/>
-</div>
-<div *ngIf="imageType!=='carousel'" class="items" [ngClass]="imageClass">  
-  <div class="item" *ngFor="let item of items">
-    <img [src]="item.links?.full" (click)="show(item.id)"/>
-  </div>
-</div>  
+<div *ngIf="items?.length">
 
-<div *ngIf="imageType==='carousel'" class="carousel" id="section-{{section.id}}">
-  <div class="prev">
-    <img src="/assets/images/icons/chevron_left_48dp.svg"/>
+  <div class="first" [ngClass]="imageClass">
+    <img class="" [src]="items[0].links.full"  (click)="show(items[0].id)"/>
   </div>
-  <div class="center">
-    <swiper [config]="config">
-      <ng-template ngFor let-item [ngForOf]="items">
-        <ng-template swiperSlide>
-          <div class="slide">
-            <img [src]="item?.links?.full"/>
-          </div>
+
+  <div *ngIf="imageType!=='carousel'&&items.length>1" class="items" [ngClass]="imageClass">  
+    <div class="item" *ngFor="let item of items">
+      <img [src]="item.links?.full" (click)="show(item.id)"/>
+    </div>
+  </div>  
+
+
+  <div *ngIf="imageType==='carousel'" class="carousel" id="section-{{section.id}}">
+    <div class="prev">
+      <img src="/assets/images/icons/chevron_left_48dp.svg"/>
+    </div>
+    <div class="center">
+      <swiper [config]="config">
+        <ng-template ngFor let-item [ngForOf]="items">
+          <ng-template swiperSlide>
+            <div class="slide">
+              <img [src]="item?.links?.full"/>
+            </div>
+          </ng-template>
         </ng-template>
-      </ng-template>
-    </swiper>
+      </swiper>
+    </div>
+    <div class="next">
+      <img src="/assets/images/icons/chevron_right_48dp.svg"/>
+    </div>
   </div>
-  <div class="next">
-    <img src="/assets/images/icons/chevron_right_48dp.svg"/>
+
+
+  <div *ngIf="showFullscreen" class="fullscreen">
+    <div *ngIf="items.length > 1" class="left" (click)="go('decrement')">
+      <img *ngIf="backId!==''" src="/assets/images/icons/chevron_left_white_48dp.svg"/>
+    </div>
+    <div class="center">
+      <div class="photo" (click)="showFullscreen = false"><img [src]="photo"/></div>
+    </div>
+    <div *ngIf="items.length > 1" class="right" (click)="go('increment')">
+      <img *ngIf="nextId!==''" src="/assets/images/icons/chevron_right_white_48dp.svg"/>
+    </div>
   </div>
+
 </div>
 
-<div *ngIf="showFullscreen" class="fullscreen">
-  <div *ngIf="items?.length > 1" class="left" (click)="go('decrement')">
-    <img *ngIf="backId!==''" src="/assets/images/icons/chevron_left_white_48dp.svg"/>
-  </div>
-  <div class="center">
-    <div class="photo" (click)="showFullscreen = false"><img [src]="photo"/></div>
-  </div>
-  <div *ngIf="items?.length > 1" class="right" (click)="go('increment')">
-    <img *ngIf="nextId!==''" src="/assets/images/icons/chevron_right_white_48dp.svg"/>
-  </div>
-</div>
+  <!-- <span style="white-space: pre-wrap;">
+    {{items|json}}
+  </span> -->
+
diff --git a/src/app/_modules/publications/list/item/news/news.component.html b/src/app/_modules/publications/list/item/news/news.component.html
index b8dfc4a..d942252 100644
--- a/src/app/_modules/publications/list/item/news/news.component.html
+++ b/src/app/_modules/publications/list/item/news/news.component.html
@@ -1,13 +1,20 @@
 <div class="item">
   <publications-list-item-menu [data]="item" [editMode]="editMode"></publications-list-item-menu>
   <div class="block" [class.nopublish]="!this.item.isPublished">
-    <div class="photo">
+    <!-- <div class="photo">
       <img [src]="item?.poster?.data?.links?.thumb"/>
-    </div>
+    </div>     -->
     <div class="information">
       <div class="date" [innerHTML]="item?.publishDateRus"></div>
-      <div class="title"><a [href]="item?.link" [innerText]="item?.name"></a></div>
-      <div class="description">{{item?.excerpt}}... <a [href]="item?.link">Читать далее...</a></div>
+      <div class="title">
+        <a [href]="item?.link">
+          <h2 [innerText]="item?.name"></h2>
+        </a>
+      </div>
+      <images-section [section]="item?.images"></images-section>
+      <div class="description">{{item?.excerpt}} 
+        <a [href]="item?.link">Читать далее...</a>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/_modules/publications/list/item/news/news.component.scss b/src/app/_modules/publications/list/item/news/news.component.scss
index eac0f71..60dd72e 100644
--- a/src/app/_modules/publications/list/item/news/news.component.scss
+++ b/src/app/_modules/publications/list/item/news/news.component.scss
@@ -7,6 +7,7 @@
 
   .block {
     display: flex;
+    flex-direction: column;
     column-gap: 24px;
 
     &.nopublish {
@@ -27,19 +28,14 @@
       row-gap: 16px;
 
       .date {
-        font-weight: 700;
-        font-size: 0.875rem;
+        font-size: 20px;
         line-height: 18px;
-        color: #86898E;
+        color: #6C6C6C;
       }
 
-      .title {
-        a {
-          font-weight: 400;
-          font-size: 1.5rem;
-          line-height: 30px;
-          color: var(--grey-7);
-        }
+      .title a h2 {
+        padding-top: 0;
+        padding-bottom: 8px;
       }
 
       .description {
@@ -49,15 +45,17 @@
         font-weight: 400;
         line-height: 32px; /* 160% */
         color: var(--dark-1);
-        a::after{
-          vertical-align: -4px;
-          margin-right: 4px;
-          margin-top: 24px;
-          display: inline-block;
-          content: "";
-          width: 20px;
-          height: 20px;
-          background: url('~src/assets/images/icons/chevron_right_24dp.svg') no-repeat center;
+        a{ display: block;
+          ::after{
+            vertical-align: -4px;
+            margin-right: 4px;
+            margin-top: 24px;
+            display: inline-block;
+            content: "";
+            width: 20px;
+            height: 20px;
+            background: url('~src/assets/images/icons/chevron_right_24dp.svg') no-repeat center;
+          }
         }
       }
     }
diff --git a/src/assets/css/basics.scss b/src/assets/css/basics.scss
index 64fe8cc..8a97a7c 100644
--- a/src/assets/css/basics.scss
+++ b/src/assets/css/basics.scss
@@ -1,9 +1,17 @@
 @import "~@angular/material/prebuilt-themes/indigo-pink.css";
 
-.mat-calendar-body-selected {
+ .mat-calendar-body-selected {
   background-color: #0079c2;
 }
 
+button.mat-calendar-body-cell:hover{
+  background-color: transparent;
+  border: none;
+}
+.mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical){
+  background-color: rgba(0, 162, 255,0.3);
+}
+
 .tox-promotion, .tox-statusbar__branding {
   display: none!important;
 }