diff --git a/src/app/_modules/auth/login/login.component.html b/src/app/_modules/auth/login/login.component.html index 482cb7b..2a114a0 100644 --- a/src/app/_modules/auth/login/login.component.html +++ b/src/app/_modules/auth/login/login.component.html @@ -24,7 +24,7 @@
- +
diff --git a/src/app/_modules/form-fields/types/date/form-field-date.component.spec.ts b/src/app/_modules/form-fields/types/date/form-field-date.component.spec.ts new file mode 100644 index 0000000..56a044e --- /dev/null +++ b/src/app/_modules/form-fields/types/date/form-field-date.component.spec.ts @@ -0,0 +1,10 @@ +import { Injectable } from "@angular/core"; +import { NativeDateAdapter } from "@angular/material/core"; + +@Injectable() export class FormDateAdapter extends NativeDateAdapter{ + getFirstDayOfWeek(): number { + return 1; + } +} + +export const DATE_FORMAT = {} \ No newline at end of file diff --git a/src/app/_modules/form-fields/types/date/form-field-date.module.ts b/src/app/_modules/form-fields/types/date/form-field-date.module.ts index 2b1847e..90c3d8b 100644 --- a/src/app/_modules/form-fields/types/date/form-field-date.module.ts +++ b/src/app/_modules/form-fields/types/date/form-field-date.module.ts @@ -10,6 +10,8 @@ import {MatFormFieldModule} from "@angular/material/form-field"; import {MatNativeDateModule} from "@angular/material/core"; import {MatInputModule} from "@angular/material/input"; import {NoopAnimationsModule} from "@angular/platform-browser/animations"; +import { DateAdapter } from '@angular/material/core'; +import { FormDateAdapter } from './form-field-date.component.spec'; @NgModule({ imports: [ @@ -31,7 +33,8 @@ import {NoopAnimationsModule} from "@angular/platform-browser/animations"; FieldDateSingleComponent ], providers: [ - DatePipe + DatePipe, + { provide: DateAdapter, useClass: FormDateAdapter } ] }) export class FormFieldDateModule {} 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 ce62dc3..48eab06 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,7 +55,7 @@ .values { .item { - background: transparent url('~src/assets/images/icons/document_pdf_60dp.svg') 0 0 no-repeat; + background: transparent url('~src/assets/images/icons/document/document_pdf_60dp.svg') 0 0 no-repeat; min-height: 60px; padding-left: 72px; font-size: 20px; diff --git a/src/app/_modules/layout/footer/footer.component.html b/src/app/_modules/layout/footer/footer.component.html index 191018b..d2484c7 100644 --- a/src/app/_modules/layout/footer/footer.component.html +++ b/src/app/_modules/layout/footer/footer.component.html @@ -24,27 +24,27 @@
- О компании + О компании
- Добровольная сертификация + Добровольная сертификация
- Обязательная сертификация + Обязательная сертификация
- Испытания + Испытания
- Валидация и верификация + Валидация и верификация
- Стандартизация + Стандартизация
- Новости + Новости
Вход для зарегистрированных пользователей diff --git a/src/app/_modules/layout/footer/footer.component.scss b/src/app/_modules/layout/footer/footer.component.scss index f4ea69b..28c7dde 100644 --- a/src/app/_modules/layout/footer/footer.component.scss +++ b/src/app/_modules/layout/footer/footer.component.scss @@ -1,5 +1,5 @@ .footer { - margin-top: 120px; + width: 100%; padding: 40px 100px; background-color: var(--blue-3); diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html index 4ad4edb..c00094d 100644 --- a/src/app/_modules/layout/header/header.component.html +++ b/src/app/_modules/layout/header/header.component.html @@ -1,44 +1,36 @@ -
- - +
-
+
- diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss index 7be1d8f..9fc93ed 100644 --- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss @@ -36,13 +36,18 @@ } .image { - img { + img{ width: 273px; object-fit: cover; height: 204px; border-radius: 12px; + border: 1px solid rgba(45, 45, 45, 0.27); + } + a { + img { border: 2px solid var(--blue-4); cursor: pointer; + } } } .name { 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 09ba90a..e25b153 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 @@ -4,7 +4,8 @@
-
+
@@ -33,11 +34,12 @@
+
-
+
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 f6107ab..baf57ef 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 @@ -4,6 +4,8 @@ display: block; width: 663px; height: 468px; + max-width: 80dvw; + max-height: 49dvw; margin-bottom: 8px; border-radius: 12px; border: 1px solid rgba(45, 45, 45, 0.27); @@ -136,6 +138,17 @@ align-items: center; justify-content: center; background-color: rgba(37, 46, 52, 60%); + .close{ + position: absolute; + top:24px; + right: 24px; + width: 48px; + height: 48px; + border-radius: 24px; + background: url('~src/assets/images/icons/close_blue_24dp.svg') center no-repeat; + background-color: #fff; + border: 2px solid var(--blue-1); + } .left { width: 72px; flex-grow: 0; diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html index b9edad6..58e3ddc 100644 --- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html @@ -1,10 +1,12 @@

- +

Документ

{{email}}

{{phone}}

+ + 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 16eeb20..8362c50 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_pdf_60dp.svg') top left no-repeat; + background: url('~src/assets/images/icons/document/document_pdf_60dp.svg') top left no-repeat; padding-left: 62px; min-height: 60px; } @@ -29,4 +29,17 @@ border: 1px solid rgba(45, 45, 45, 0.27); } + + } +.full-screen{ + position: fixed; + top:0; + z-index: 200; + left: 0; + background-color: rgba(45, 45, 45, 0.63); + width: 100dvw; + height: 100vh; + object-fit: contain; + cursor: pointer; +} \ No newline at end of file diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts index 4d08453..77027f4 100644 --- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts @@ -18,6 +18,7 @@ export class MemberSectionItemComponent { } public item: any; + public fullScreen: boolean; ngOnInit() { this.fetch(); 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 d38ee63..67f5ebb 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 @@ -5,19 +5,28 @@
+ +
- - - -
-
-
- - -
Подробнее
- + +
+
+ + +
+ +
+ +
+
+
+ Подробнее +
+ +
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 3dc97d2..e5d4877 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 @@ -26,22 +26,45 @@ } .list { margin: 32px 0; - display: flex; - gap: 40px; + width: 100%; + display: flex; + flex-direction: row; flex-wrap: wrap; + justify-content: flex-start; + align-items: flex-start; + align-content: flex-start; + gap: 40px; + .item { object-fit: cover; display: flex; flex-direction: column; - grid-gap: 16px; - flex-basis: 30%; + flex-grow: 0; + flex-basis: 270px; + gap: 16px; + overflow: hidden; + >*{ + width: 100%; + } + >div{ + >*{margin-bottom: 16px;} + } .menu { } .image { - background: url("/assets/images/view-man.svg") center no-repeat; + // background: url("/assets/images/view-man.svg") center no-repeat; + + object-fit: cover; + height: 370px; + border-radius: 12px; + border: 1px solid rgba(45, 45, 45, 0.27); + + } + .image { + // background: url("/assets/images/view-man.svg") center no-repeat; img { width: 273px; object-fit: cover; @@ -62,6 +85,45 @@ } .more { font-size: 20px; + img{ + vertical-align: -6px; + } + } + .link{ + font-size: 20px; + display: block; + } + + + .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-size: contain; + } + .doc-link{ + flex-shrink: 0; + flex-grow: 0; + flex-basis: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow:ellipsis; + } + a{ + font-size: 20px; + + } + .description{ + color: #6C6C6C; + } } } } 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 06db534..da10129 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 @@ -21,6 +21,23 @@ export class MemberSectionListComponent { ngOnInit() { } + // + // + + getFields(member){ + + let fields:any = {}; + member.groups.data.forEach(group =>{ + group.fields.data.forEach(field =>{ + if(field.name&&field?.value?.data[0]){ + + fields[field.name] = field?.value?.data[0] + } + }) + }) + return fields + } + get title() { return this.section?.groups?.data[0]?.fields?.data[0]?.value?.data[0]; @@ -38,10 +55,16 @@ export class MemberSectionListComponent { return this.section.id; } + iconUrl(name:string){ + return `url(/assets/images/icons/document/${name.toUpperCase()}.svg)` + } + get modelType() { return 'object'; } + public cover = '/assets/images/icons/view_man_273_370dp.svg'; + add() { let attach = {modelType: 'object', group: 'sections', modelId: this.section.id, ord: this.ord}; diff --git a/src/app/_modules/pages/sidebars/item/page-sidebar.component.scss b/src/app/_modules/pages/sidebars/item/page-sidebar.component.scss index da8a492..1bc1da7 100644 --- a/src/app/_modules/pages/sidebars/item/page-sidebar.component.scss +++ b/src/app/_modules/pages/sidebars/item/page-sidebar.component.scss @@ -33,7 +33,7 @@ height: 20px; margin-right: 8px; flex-shrink: 0; - background: transparent url("~src/assets/images/icons/document_20dp.svg") center no-repeat; + background: transparent url("~src/assets/images/icons/document/document_20dp.svg") center no-repeat; content: ''; } } diff --git a/src/app/_modules/pages/tree/pages-tree.component.html b/src/app/_modules/pages/tree/pages-tree.component.html index b269be5..fc86949 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.html +++ b/src/app/_modules/pages/tree/pages-tree.component.html @@ -1,14 +1,16 @@ -
+
-
-
- +
+
-
-
+
+
+ +

Главная страница

+
+
+
+
diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss index 6b36c40..fe3e516 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.scss +++ b/src/app/_modules/pages/tree/pages-tree.component.scss @@ -1,4 +1,26 @@ + +.item.home .bar .mid .info .logo::before{ + background-image: url('~src/assets/images/icons/home_page_24dp.svg'); +} + +.item:not(.home){ + .bar{ + padding-left: 50px; + + } + .item .bar{ + padding-left: 100px; + } + .item .item .bar{ + padding-left: 150px; + } + } + + + .item { + + .bar { display: flex; flex-direction: row; @@ -49,6 +71,7 @@ width: 24px; height: 24px; } + img { width: 100%; height: 100%; @@ -75,7 +98,7 @@ display: flex; flex-direction: row; align-items: center; - flex-shrink: 0; + flex-shrink: 1; button { margin-left: 24px; &.edit { @@ -93,10 +116,13 @@ } } } + .right-home { + width: 144px; + } } .items { display: none; - padding-left: 50px; + } &.active { >.bar { diff --git a/src/assets/css/basics.scss b/src/assets/css/basics.scss index 0239850..d2afd00 100644 --- a/src/assets/css/basics.scss +++ b/src/assets/css/basics.scss @@ -7,9 +7,16 @@ button.mat-calendar-body-cell:hover{ background-color: transparent; border: none; + font-weight: 400; } + +button.mat-calendar-body-cell{ + font-weight: 400; +} + .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); + font-weight: 400; } .tox-promotion, .tox-statusbar__branding { @@ -97,7 +104,7 @@ a { height: 20px; margin-right: 8px; flex-shrink: 0; - background: transparent url('~src/assets/images/icons/document_20.svg') 50% 50% no-repeat; + background: transparent url('~src/assets/images/icons/document/document_20.svg') 50% 50% no-repeat; content: ''; } } diff --git a/src/assets/css/documents-lists.scss b/src/assets/css/documents-lists.scss index 380fa8e..953a2c2 100644 --- a/src/assets/css/documents-lists.scss +++ b/src/assets/css/documents-lists.scss @@ -1,5 +1,5 @@ .documents.list.default { - background: transparent url('~src/assets/images/icons/document_pdf_60dp.svg') 0 0 no-repeat; + background: transparent url('~src/assets/images/icons/document/document_pdf_60dp.svg') 0 0 no-repeat; min-height: 60px; padding-left: 72px; font-size: 20px; diff --git a/src/assets/css/main-menu.scss b/src/assets/css/main-menu.scss index 995a67d..cf8d50a 100644 --- a/src/assets/css/main-menu.scss +++ b/src/assets/css/main-menu.scss @@ -121,9 +121,11 @@ } } } - .grid-menu>pages-menu>pages-menu-item>a.active:not(:hover)>span { + .grid-menu>pages-menu>pages-menu-item>a.active:not(:hover)>span, + .grid-menu>pages-menu>pages-menu-item.hidden>a.active>span { padding-top: 2px; border-bottom: 2px solid var(--blue-1) ; + color: var(--blue-1); } // level 1 @@ -147,7 +149,7 @@ text-align: center; padding: 0 20px; margin: 0 -4px; - &:hover { + &:hover:not(.hidden) { background-color: #004077; a{ color: #FFF; @@ -166,11 +168,11 @@ line-height: 32px; - &:hover { - text-decoration: none; - color: white; - background: #004077; - } + // &:hover { + // text-decoration: none; + // color: white; + // background: #004077; + // } } &>:hover { diff --git a/src/assets/images/icons/document/DOC.svg b/src/assets/images/icons/document/DOC.svg new file mode 100644 index 0000000..7d8972d --- /dev/null +++ b/src/assets/images/icons/document/DOC.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons/document/JPG.svg b/src/assets/images/icons/document/JPG.svg new file mode 100644 index 0000000..59e2799 --- /dev/null +++ b/src/assets/images/icons/document/JPG.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons/document/PDF.svg b/src/assets/images/icons/document/PDF.svg new file mode 100644 index 0000000..801b3a3 --- /dev/null +++ b/src/assets/images/icons/document/PDF.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons/document/PPT.svg b/src/assets/images/icons/document/PPT.svg new file mode 100644 index 0000000..f49c9e0 --- /dev/null +++ b/src/assets/images/icons/document/PPT.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons/document/XLS.svg b/src/assets/images/icons/document/XLS.svg new file mode 100644 index 0000000..ab2f9e1 --- /dev/null +++ b/src/assets/images/icons/document/XLS.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons/document_20.svg b/src/assets/images/icons/document/document_20.svg similarity index 100% rename from src/assets/images/icons/document_20.svg rename to src/assets/images/icons/document/document_20.svg diff --git a/src/assets/images/icons/document_20dp.svg b/src/assets/images/icons/document/document_20dp.svg similarity index 100% rename from src/assets/images/icons/document_20dp.svg rename to src/assets/images/icons/document/document_20dp.svg diff --git a/src/assets/images/icons/document_pdf_60dp.svg b/src/assets/images/icons/document/document_pdf_60dp.svg similarity index 100% rename from src/assets/images/icons/document_pdf_60dp.svg rename to src/assets/images/icons/document/document_pdf_60dp.svg diff --git a/src/assets/images/icons/home_page_24dp.svg b/src/assets/images/icons/home_page_24dp.svg new file mode 100644 index 0000000..cbf395b --- /dev/null +++ b/src/assets/images/icons/home_page_24dp.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icons/view_man_273_370dp.svg b/src/assets/images/icons/view_man_273_370dp.svg new file mode 100644 index 0000000..eb6993d --- /dev/null +++ b/src/assets/images/icons/view_man_273_370dp.svg @@ -0,0 +1,20 @@ + + + + + + + + + Layer 1 + + + + + + + + + + + \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 40e04c9..c8304c4 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: 'AbV5mDVEimNQb2dKJTx9PYALFCiiYOHTsbeMEtp2', + clientSecret: 'XVBDBzHcJu52dGI5qctg8l6aT7Q8Ms9PKiAUHOVp', }; /*