diff --git a/src/app/_modules/form-fields/types/document/form-field-document.component.scss b/src/app/_modules/form-fields/types/document/form-field-document.component.scss index 48eab06..f7b512e 100644 --- a/src/app/_modules/form-fields/types/document/form-field-document.component.scss +++ b/src/app/_modules/form-fields/types/document/form-field-document.component.scss @@ -55,8 +55,9 @@ .values { .item { - background: transparent url('~src/assets/images/icons/document/document_pdf_60dp.svg') 0 0 no-repeat; - min-height: 60px; + background: transparent url('~src/assets/images/icons/document/document_60dp.svg') 0 0 no-repeat; + background-size: contain; + height: 60px; padding-left: 72px; font-size: 20px; display: flex; diff --git a/src/app/_modules/form-fields/types/document/single/field-document-single.component.html b/src/app/_modules/form-fields/types/document/single/field-document-single.component.html index 6e082f1..5e67bf0 100644 --- a/src/app/_modules/form-fields/types/document/single/field-document-single.component.html +++ b/src/app/_modules/form-fields/types/document/single/field-document-single.component.html @@ -10,8 +10,8 @@
-
+
{{asset.name}}
-
+
\ No newline at end of file diff --git a/src/app/_modules/form-fields/types/document/single/field-document-single.component.ts b/src/app/_modules/form-fields/types/document/single/field-document-single.component.ts index b9b48bd..13b3460 100644 --- a/src/app/_modules/form-fields/types/document/single/field-document-single.component.ts +++ b/src/app/_modules/form-fields/types/document/single/field-document-single.component.ts @@ -52,6 +52,9 @@ export class FieldDocumentSingleComponent { this.asset = asset; this.control?.setValue(asset?.id); } + get extension(){ + return `url(/assets/images/icons/document/${ICON_TYPE[this.asset.extension]}.svg)` + } @@ -87,3 +90,17 @@ export class FieldDocumentSingleComponent { }); } } + +const ICON_TYPE:any={ + rtf:'DOC', + docx:'DOC', + doc:'DOC', + xl:'XLS', + xls:'XLS', + xlsx:'XLS', + ppt:'PPT', + pptx:'PPT', + jpg:'JPG', + jpeg:'JPG', + pdf:'PDF' +} diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html index 686199b..0f420ec 100644 --- a/src/app/_modules/layout/header/header.component.html +++ b/src/app/_modules/layout/header/header.component.html @@ -3,18 +3,15 @@
- - - +
АИС СЦ ВНИИГАЗ
- АИС СЦ ВНИИГАЗ + + АИС СЦ ВНИИГАЗ
diff --git a/src/app/_modules/layout/header/header.component.scss b/src/app/_modules/layout/header/header.component.scss index abd3ef4..35134d1 100644 --- a/src/app/_modules/layout/header/header.component.scss +++ b/src/app/_modules/layout/header/header.component.scss @@ -1,11 +1,11 @@ @media screen and (max-width: 1264px){ .hidemobile{ - display: none; + display: none !important; } .header{ flex-grow: 1; - padding: 12px 24px; + padding: 0px 24px; background-color: #FFF; min-height: 100%; @@ -22,19 +22,14 @@ background: url('~src/assets/images/icons/burger_blue_40dp.svg') no-repeat center;; } } - .logo{ - width: 114px; + .logo { + display: inline-flex; + width:114px; height: 80px; - background: url('~src/assets/images/logo_vniigaz_1163x816.svg') no-repeat center;; + margin: 12px 24px 12px 40px; + background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg'); background-size: contain; - header-user-bar{ - position: absolute; - top:144px; - right: 24px; - *{ - display: none; - } - } + flex-shrink: 0; } .fog{ flex-grow: 1; @@ -91,7 +86,7 @@ } .right{ - display: none; + } } @@ -144,9 +139,6 @@ background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg'); background-size: contain; flex-shrink: 0; - header-user-bar{ - display: none; - } } .grid-menu{ display: flex; @@ -183,9 +175,11 @@ } } } - header-user-bar{ - position: absolute; - right: 0; - bottom: -96px; - } + +} + +header-user-bar{ + position: absolute; + right: 0; + bottom: -96px; } diff --git a/src/app/_modules/layout/header/header.component.ts b/src/app/_modules/layout/header/header.component.ts index a85d630..5d30059 100644 --- a/src/app/_modules/layout/header/header.component.ts +++ b/src/app/_modules/layout/header/header.component.ts @@ -71,6 +71,7 @@ export class HeaderComponent { } itemSelect(event:any){ - if(!event.children?.data.length) this.showBottom = false; + // if(!event.children?.data.length) + this.showBottom = false; } } 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 1be297f..0ace074 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 @@ -1,10 +1,10 @@ -
+
{{user.initials}}
-
-
    +
    +
    • Личный кабинет
    • Структура сайта
      • 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 4812d19..2fb9adb 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 @@ -1,4 +1,7 @@ .user { + .ddHidden{ + display: none; + } position: relative; display: flex; padding: 11px; @@ -47,7 +50,7 @@ display: none; } - &:hover { + .dropdown { display: block; width: 250px; @@ -92,7 +95,7 @@ } - } + } @media screen and (max-width: 1264px) { .user { 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 313ab6c..30aad37 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 @@ -10,7 +10,7 @@ import {Router} from "@angular/router"; export class HeaderUserBarComponent { @Input() user: any; public menuItems = []; - public ddHidden = false; + public ddHidden = true; constructor(public authService: AuthenticationService, private router: Router) { } @@ -28,10 +28,12 @@ export class HeaderUserBarComponent { close() { - this.ddHidden = true; - setTimeout(() => {this.ddHidden = false}, 10); + setTimeout(() => { + this.ddHidden = true; + }, 10); } + logout() { if (confirm('Вы деествительно хотите выйти из системы?')) { this.authService.logout(); @@ -41,7 +43,7 @@ export class HeaderUserBarComponent { } link(link: string) { - this.ddHidden = true; + this.close() this.router.navigate([link]).then(); } } diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.html b/src/app/_modules/pages/menu/item/pages-menu-item.component.html index 9d6ea55..bf62322 100644 --- a/src/app/_modules/pages/menu/item/pages-menu-item.component.html +++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.html @@ -1,6 +1,6 @@
      -{{item.name}} { this.inited ? this.fetch() : this.inited = true; @@ -51,7 +51,6 @@ export class PageComponent { this.routeSubscription?.unsubscribe(); } - onNavigationEnd(event: NavigationEnd) { let url = event.url.split('(')[0]; url = url.split('?')[0]; diff --git a/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss b/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss index 4e0f3eb..c948ad0 100644 --- a/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss @@ -7,7 +7,7 @@ align-items: flex-start; height: 60px; background: center no-repeat; - background-image: url('~src/assets/images/icons/document/document_pdf_60dp.svg'); + background-image: url('~src/assets/images/icons/document/document_60dp.svg'); background-size: contain; } a{ 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 46db145..5a5dfcf 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 @@ -29,12 +29,29 @@ export class DocumentSectionComponent { } get docIcon(){ - const ext = this.section.groups.data[0].fields.data[0].value.data[0].extension.toUpperCase(); + const ext = ICON_TYPE[ + this.section.groups.data[0].fields.data[0].value.data[0].extension + ] return `url('/assets/images/icons/document/${ext}.svg')` - // return `url('/assets/images/icons/document/document_pdf_60dp.svg')` + } get download(){ return this.section.groups.data[0].fields.data[0].value.data[0].links.download; } } + +const ICON_TYPE:any={ + rtf:'DOC', + docx:'DOC', + doc:'DOC', + xl:'XLS', + xls:'XLS', + xlsx:'XLS', + ppt:'PPT', + pptx:'PPT', + jpg:'JPG', + jpeg:'JPG', + pdf:'PDF' +} + diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html index 5890e18..8296117 100644 --- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html @@ -1,9 +1,9 @@
      -
      +
      -

      +
      -
      +
      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 6231e34..16c2636 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 @@ -18,7 +18,7 @@ } } .large img{ - max-width: 100%; + border-radius: 12px; border: 1px solid rgba(45, 45, 45, 0.27); } @@ -46,11 +46,13 @@ &.large{ display: flex; flex-direction: column; + .item{ + max-width: 100%; margin-bottom: 32px; img{ max-height: 468px; - max-width: 900px; + max-width: 100%; } } } @@ -168,6 +170,7 @@ width: auto; height: 100%; max-height: calc(100vh - 2 * 24px); + background-color: #fff; } } .right { diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss index 0cd390f..26f7ffc 100644 --- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss @@ -19,7 +19,7 @@ } .doc{ display: block; - background: url('~src/assets/images/icons/document/document_pdf_60dp.svg') top left no-repeat; + background: url('~src/assets/images/icons/document/document_60dp.svg') top left no-repeat; padding-left: 62px; min-height: 60px; } @@ -32,14 +32,3 @@ } -.full-screen{ - position: fixed; - top:0; - z-index: 200; - left: 0; - background-color: rgba(45, 45, 45, 0.63); - width: 100vw; - height: 100vh; - object-fit: contain; - cursor: pointer; -} \ No newline at end of file diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html index 2aaae6e..294db4e 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html @@ -1,32 +1,35 @@
      -
      +
      -

      +
      -
      +
      - -
      -
      +
      - +
      - - + +
      - -
      - -
      +
      +
      + +
      -
      - Подробнее -
      +
      + + + Подробнее + +
      +
      +
      +
      + +
      - -
      diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss index e5d4877..cf7db25 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss @@ -4,7 +4,7 @@ width: 100%; max-width: 900px; .add { - padding: 16px 12px; + padding: 16px ; display: flex; justify-content: space-between; width: 100%; @@ -64,6 +64,7 @@ } .image { + cursor: pointer; // background: url("/assets/images/view-man.svg") center no-repeat; img { width: 273px; @@ -91,28 +92,46 @@ } .link{ font-size: 20px; - display: block; + display: inline-block; + &.tel::before{ + content: ''; + width: 24px; + height: 24px; + display: inline-block; + vertical-align: -3px; + margin-right: 4px; + background: url('~src/assets/images/icons/phone_blue_24dp.svg') center no-repeat; + } + &.mail::before{ + content: ''; + width: 24px; + height: 24px; + display: inline-block; + vertical-align: -5px; + margin-right: 4px; + background: url('~src/assets/images/icons/mail_blue_24dp.svg') center no-repeat; + } + + } .doc{ width: 100%; display: flex; - overflow: hidden; - text-overflow:ellipsis; .doc-icon{ flex-basis: 60px; align-items: flex-start; flex-shrink: 0; height: 60px; background: center no-repeat; - background-image: url('~src/assets/images/icons/document/document_pdf_60dp.svg'); + background-image: url('~src/assets/images/icons/document/document_60dp.svg'); background-size: contain; } .doc-link{ flex-shrink: 0; flex-grow: 0; - flex-basis: 100%; + flex-basis: 200px; white-space: nowrap; overflow: hidden; text-overflow:ellipsis; @@ -127,4 +146,41 @@ } } } -} + + .full-screen{ + position: fixed; + top:0; + z-index: 200; + left: 0; + background-color: rgba(45, 45, 45, 0.63); + width: 100vw; + height: 100vh; + object-fit: contain; + cursor: pointer; + + } + .modal{ + position: fixed; + top:0; + z-index: 200; + left: 0; + background-color: rgba(45, 45, 45, 0.63); + width: 100vw; + height: 100vh; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + div{ + background-color: #fff; + width: 50vw; + min-width: 400px; + border-radius: 12px; + padding: 0 24px; + } + } + .hidden{ + display: none; + } + } + diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts index 912b317..b087ecf 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts @@ -12,6 +12,9 @@ export class MemberSectionListComponent { @Input() editMode: boolean; @Input() page: any; + public showImage:boolean[] = []; + public showDescription = false; + constructor( private formsService: FormsService, private router: Router, @@ -51,8 +54,9 @@ export class MemberSectionListComponent { return this.section.id; } - iconUrl(name: string) { - return `url(/assets/images/icons/document/${name.toUpperCase()}.svg)` + + iconUrl(name:string) { + if (name) return ICON_TYPE[name] && `url(/assets/images/icons/document/${ICON_TYPE[name]}.svg)` } get modelType() { @@ -70,4 +74,23 @@ export class MemberSectionListComponent { getLink(id: any) { return this.router.url + '?id=' + id; } + + photo(member) { + return this.getFields(member)['member-image'].links.open + } +} + + +const ICON_TYPE:any={ + rtf:'DOC', + docx:'DOC', + doc:'DOC', + xl:'XLS', + xls:'XLS', + xlsx:'XLS', + ppt:'PPT', + pptx:'PPT', + jpg:'JPG', + jpeg:'JPG', + pdf:'PDF' } diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss index 1dfe339..b44e8d4 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.scss +++ b/src/app/_modules/pages/tree/pages-tree.component.scss @@ -14,6 +14,13 @@ .item .item .bar{ padding-left: 150px; } + .item .item .item .bar{ + padding-left: 200px; + } + + .item .item .item .item .bar{ + padding-left: 250px; + } } @@ -137,7 +144,7 @@ } -@media screen and (max-width: 767px) { +@media screen and (max-width: 1264px) { .item { .bar { .mid { 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 60dd72e..3bcdf64 100644 --- a/src/app/_modules/publications/list/item/news/news.component.scss +++ b/src/app/_modules/publications/list/item/news/news.component.scss @@ -1,7 +1,11 @@ +:host-context(publications-list-item:not(:last-child)){ + .item { + border-bottom: 1px solid #C0C0C0; + } +} + .item { - border-top: 1px solid #E8E8E8; - margin-top: 24px; - padding-top: 24px; + padding: 24px 0; display: flex; flex-direction: column; diff --git a/src/app/_modules/publications/list/list.component.scss b/src/app/_modules/publications/list/list.component.scss index f7f6583..5223c45 100644 --- a/src/app/_modules/publications/list/list.component.scss +++ b/src/app/_modules/publications/list/list.component.scss @@ -1,5 +1,4 @@ .items { - border-bottom: 1px solid #E8E8E8; padding-bottom: 24px; margin-bottom: 24px; .add { diff --git a/src/assets/css/main-menu.scss b/src/assets/css/main-menu.scss index cf8d50a..86163c7 100644 --- a/src/assets/css/main-menu.scss +++ b/src/assets/css/main-menu.scss @@ -74,12 +74,11 @@ margin-right: 16px; } .toggle{ - background: url('~src/assets/images/icons/expand_less_24.svg') center no-repeat; - transform: rotateZ(90deg); + background: url('~src/assets/images/icons/chevron_cirle_right_24dp.svg') center no-repeat; transition: transform 0.3s; } .open { - transform: rotateZ(180deg); + transform: rotateZ(90deg); } diff --git a/src/assets/images/icons/chevron_cirle_right_24dp.svg b/src/assets/images/icons/chevron_cirle_right_24dp.svg new file mode 100644 index 0000000..60f0d33 --- /dev/null +++ b/src/assets/images/icons/chevron_cirle_right_24dp.svg @@ -0,0 +1,9 @@ + + + + + Layer 1 + + + + \ No newline at end of file diff --git a/src/assets/images/icons/document/document_60dp.svg b/src/assets/images/icons/document/document_60dp.svg new file mode 100644 index 0000000..b0e563a --- /dev/null +++ b/src/assets/images/icons/document/document_60dp.svg @@ -0,0 +1,20 @@ + + + + background + + + + Layer 1 + + + + + + + + + + FILE + + \ No newline at end of file diff --git a/src/assets/images/icons/mail_orange_24dp.svg b/src/assets/images/icons/mail_blue_24dp.svg similarity index 90% rename from src/assets/images/icons/mail_orange_24dp.svg rename to src/assets/images/icons/mail_blue_24dp.svg index c1877f6..a33d91a 100644 --- a/src/assets/images/icons/mail_orange_24dp.svg +++ b/src/assets/images/icons/mail_blue_24dp.svg @@ -1,6 +1,6 @@ - + diff --git a/src/assets/images/icons/phone_orange_24dp.svg b/src/assets/images/icons/phone_blue_24dp.svg similarity index 96% rename from src/assets/images/icons/phone_orange_24dp.svg rename to src/assets/images/icons/phone_blue_24dp.svg index 8746520..a9a3ad7 100644 --- a/src/assets/images/icons/phone_orange_24dp.svg +++ b/src/assets/images/icons/phone_blue_24dp.svg @@ -3,7 +3,7 @@ - +