From 18fc283dd0ec7ce4a6a67224a9481a7c7d6cbef2 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Fri, 1 Sep 2023 13:38:53 +0300 Subject: [PATCH 1/7] images-section styling --- .../user-bar/header-user-bar.component.ts | 2 +- .../images/images-section.component.html | 11 ++-- .../images/images-section.component.scss | 66 +++++++++++++++++-- .../basic/images/images-section.component.ts | 10 ++- src/environments/environment.ts | 2 +- 5 files changed, 78 insertions(+), 13 deletions(-) diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts index afd7266..313ab6c 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts @@ -23,7 +23,7 @@ export class HeaderUserBarComponent { } ngOnInit() { - console.log(this.user) + } 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 60f0160..070cee3 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,8 +1,11 @@ -
-
+
+ +
+
+
-
+
- - diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss index a2d7404..90774ac 100644 --- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss @@ -1,18 +1,74 @@ +.first{ + display: none; + &.large-preview{ + display: block; + width: 663px; + height: 468px; + margin-bottom: 8px; + border-radius: 12px; + border: 1px solid rgba(45, 45, 45, 0.27); + overflow: hidden; + img{ + object-fit: cover; + width: 100%; + height: 100%; + } + } +} + + .items { display: flex; flex-direction: row; flex-wrap: wrap; width: 100%; - gap: 20px; - margin-bottom: 20px; + gap: 8px; + + &.small{ + + display: flex; + flex-direction: column; + .item{ + margin-bottom: 16px; + img{ + max-height: 273px; + max-width: 273px; + } + } + } + + &.large{ + display: flex; + flex-direction: column; + .item{ + margin-bottom: 32px; + img{ + max-height: 468px; + max-width: 900px; + } + } + } + + &.large-preview{ + display: flex; + flex-direction: row; + .item{ + width: 72px; + height: 52px; + border: 1px solid var(--blue-1); + img{ + object-fit: cover; + width: 100%; + height: 100%; + } + } + } .item { + position: relative; img { - width: 128px; - height: 128px; - object-fit: cover; cursor: pointer; } diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.ts b/src/app/_modules/pages/sections/types/basic/images/images-section.component.ts index 0c0ed10..d7815bd 100644 --- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.ts +++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.ts @@ -38,7 +38,6 @@ export class ImagesSectionComponent { }, 300) } - get items() { return this.objectsService.getValue(this.section, 'images-required'); } @@ -46,6 +45,13 @@ export class ImagesSectionComponent { let type = this.objectsService.getValue(this.section, 'image-type'); return type.name; } + get imageClass(){ + return { + small : this.imageType=='small', + large : this.imageType=='large', + 'large-preview': this.imageType=='large-preview' + } + } set photo(activePhoto: string) { this.activePhoto = activePhoto } @@ -54,6 +60,8 @@ export class ImagesSectionComponent { } + + parsed(): void { this.tmpNumber = 0 this.parsedPhotos = this.items || [] diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4add497..d2de143 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiUrl: 'http://api.vniigazv2.lc', clientId: 2, - clientSecret: '5Q8Pe95YrQBwa7o7XDDIatg30ELu3dpS40Uo6jHi', + clientSecret: 'Mq5VXetkQ0XifT5Tao019rupEq5dQFbAhaw29Ei4', }; /* From 4bd7e86bf1a0f4cffbbbb005306acfbf0a2eda53 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Fri, 1 Sep 2023 14:30:04 +0300 Subject: [PATCH 2/7] fix mai menu --- src/app/_modules/pages/page/page.component.html | 14 +++++++------- src/app/_modules/pages/page/page.component.ts | 3 +++ src/assets/css/main-menu.scss | 14 +++++++++++++- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/app/_modules/pages/page/page.component.html b/src/app/_modules/pages/page/page.component.html index 533f348..95ec3f7 100644 --- a/src/app/_modules/pages/page/page.component.html +++ b/src/app/_modules/pages/page/page.component.html @@ -1,15 +1,15 @@
-
-
+
+
-
-
+
+
-

{{page?.name}}

+

{{pageTopName||page?.name}}

-
+
@@ -32,4 +32,4 @@
- + \ No newline at end of file diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts index a3aeec0..5b337ba 100644 --- a/src/app/_modules/pages/page/page.component.ts +++ b/src/app/_modules/pages/page/page.component.ts @@ -35,6 +35,9 @@ export class PageComponent { get isEditable() { return this.permissions?.edit || this.permissions?.anything; } + get pageTopName(){ + return this.page?.parents?.data[1]?.name; + } diff --git a/src/assets/css/main-menu.scss b/src/assets/css/main-menu.scss index cde230d..d266fce 100644 --- a/src/assets/css/main-menu.scss +++ b/src/assets/css/main-menu.scss @@ -89,10 +89,20 @@ @media screen and (min-width: 961px){ pages-menu { - animation: slide-from-top-and-fade-in 0.2s; + pages-menu-item { + a { transition: all 0.3s; + &:not(:hover).active{ + + >span{ + padding-top: 2px; + display: inline-block; + box-sizing: border-box; + border-bottom: 2px solid var(--blue-1) ; + } + } } &:hover { &>pages-menu { @@ -109,6 +119,7 @@ // level 1 pages-menu { + width: 100%; display: flex; align-items: stretch; @@ -116,6 +127,7 @@ margin: 0 4px; &>pages-menu-item { + animation: slide-from-top-and-fade-in 0.2s; display: flex; flex-direction: row; flex-wrap: nowrap; From 62b8306f0f2faa24f303286489d3ba58f3f1f14c Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Fri, 1 Sep 2023 14:55:16 +0300 Subject: [PATCH 3/7] fix document-section --- .../types/basic/document/document-section.component.html | 4 ++-- .../types/basic/document/document-section.component.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/_modules/pages/sections/types/basic/document/document-section.component.html b/src/app/_modules/pages/sections/types/basic/document/document-section.component.html index 95b759e..1d9f132 100644 --- a/src/app/_modules/pages/sections/types/basic/document/document-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/document/document-section.component.html @@ -1,6 +1,6 @@ - +
\ No newline at end of file diff --git a/src/app/_modules/pages/sections/types/basic/document/document-section.component.ts b/src/app/_modules/pages/sections/types/basic/document/document-section.component.ts index e66f3ae..25061c7 100644 --- a/src/app/_modules/pages/sections/types/basic/document/document-section.component.ts +++ b/src/app/_modules/pages/sections/types/basic/document/document-section.component.ts @@ -20,10 +20,14 @@ export class DocumentSectionComponent { return this.section.groups.data[0].fields.data[1].title; } - get description(){ + get name(){ return this.section.groups.data[0].fields.data[1].value.data[0]; } + get description(){ + return this.section.groups.data[0].fields.data[2].value.data[0]; + } + get download(){ return this.section.groups.data[0].fields.data[0].value.data[0].links.download; } From 979bf6973caa34a98abc9ddf9fc643e8e932cbc9 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Fri, 1 Sep 2023 15:10:23 +0300 Subject: [PATCH 4/7] fix litle --- .../layout/header/user-bar/header-user-bar.component.html | 2 +- .../layout/header/user-bar/header-user-bar.component.scss | 4 +++- src/assets/css/main-menu.scss | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html index b2e535e..e61de5c 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html @@ -6,7 +6,7 @@
  • Личный кабинет
    • -
  • Журнал заявок
    • +
  • Панель управления
  • Выход из системы
diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss index c1d7c4e..52edac7 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss @@ -32,7 +32,9 @@ .name{ margin: 8px 4px 0 12px; - color: #2D2D2D + color: #2D2D2D; + white-space: nowrap; + } .toggle{ height: 24px; diff --git a/src/assets/css/main-menu.scss b/src/assets/css/main-menu.scss index d266fce..1a07c65 100644 --- a/src/assets/css/main-menu.scss +++ b/src/assets/css/main-menu.scss @@ -93,6 +93,7 @@ pages-menu-item { a { + height: 100%; transition: all 0.3s; &:not(:hover).active{ From fdcdce648d07e9e1984c81c09b6f70edfeeb2a6f Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Fri, 1 Sep 2023 15:59:36 +0300 Subject: [PATCH 5/7] feedback css --- .../feedback/feedback-section.component.html | 9 ++++++--- .../feedback/feedback-section.component.scss | 16 ++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html b/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html index dd33fb2..370cb92 100644 --- a/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html @@ -1,12 +1,15 @@