diff --git a/angular.json b/angular.json index cd081bf..a4486e7 100644 --- a/angular.json +++ b/angular.json @@ -34,7 +34,10 @@ "src/favicon.ico", "src/assets" ], - "styles": ["src/styles.scss"], + "styles": [ + "src/styles.scss", + "node_modules/swiper/swiper-bundle.css" + ], "stylePreprocessorOptions": { "includePaths": [ "src/assets/css" @@ -106,7 +109,10 @@ "src/vniigaz-v2/css" ] }, - "styles": ["src/styles.scss"], + "styles": [ + "src/styles.scss", + "node_modules/swiper/swiper-bundle.css" + ], "index": "src/vniigaz-v2/index.html" } }, @@ -146,7 +152,8 @@ "src/assets" ], "styles": [ - "src/styles.scss" + "src/styles.scss", + "node_modules/swiper/swiper-bundle.css" ], "scripts": [] } 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 6056df3..8b13789 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 @@ -1,72 +1 @@ -.area { - position: relative; - display: flex; - height: 100px; - padding: 16px; - border: var(--prime) dashed 1px; - border-radius: 4px; - overflow: hidden; - font-size: 20px; - &.hover { - background-color: #e0e0e0; - } - p { - margin: auto; - color: var(--second-dis); - text-align: center; - span { - color: var(--orange-2); - cursor: pointer; - } - } - input { - display: none; - } - .indicator { - display: flex; - flex-direction: column; - justify-content: center; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - padding: 16px; - background-color: #f7f7f7; - .label { - margin-bottom: 4px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - .progress { - height: 4px; - background-color: #dfdfdf; - overflow: hidden; - .fill { - width: 0; - height: 100%; - background-color: #3ca128; - } - } - } -} -.values { - - .item { - 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; - flex-direction: row; - align-items: center; - margin-top: 10px; - button{ - margin-left: 10px; - } - - } -} diff --git a/src/app/_modules/form-fields/types/document/form-field-document.module.ts b/src/app/_modules/form-fields/types/document/form-field-document.module.ts index 272b98c..20991b1 100644 --- a/src/app/_modules/form-fields/types/document/form-field-document.module.ts +++ b/src/app/_modules/form-fields/types/document/form-field-document.module.ts @@ -5,11 +5,13 @@ import {FormFieldDocumentComponent} from "@app/_modules/form-fields/types/docume import {FieldDocumentReadonlyComponent} from "@app/_modules/form-fields/types/document/readonly/field-document-readonly.component"; import {FieldDocumentSingleComponent} from "@app/_modules/form-fields/types/document/single/field-document-single.component"; import {FieldDocumentMultipleComponent} from "@app/_modules/form-fields/types/document/multiple/field-document-multiple.component"; +import { WidjetModule } from '@app/_modules/widjet/widjet.module'; @NgModule({ imports: [ CommonModule, - ReactiveFormsModule + ReactiveFormsModule, + WidjetModule ], declarations: [ FormFieldDocumentComponent, diff --git a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html index 26d99d5..152796c 100644 --- a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html +++ b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html @@ -11,7 +11,8 @@
+ {{asset.name}} - +
diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.html b/src/app/_modules/layout/jumbotron/jumbotron.component.html index 81564b8..2840be7 100644 --- a/src/app/_modules/layout/jumbotron/jumbotron.component.html +++ b/src/app/_modules/layout/jumbotron/jumbotron.component.html @@ -2,7 +2,6 @@

{{name}}

- {{currentPage|json}}
diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts index 792eff5..f980d17 100644 --- a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts +++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts @@ -90,7 +90,6 @@ export class PagesMenuItemComponent { } select(){ - console.log(this.item) this.pagesService.menuSelectedLink = this.item.link if (this.item.type.name == 'nav-page'){ this.toggle(!this.open) diff --git a/src/app/_modules/pages/menu/pages-menu.component.ts b/src/app/_modules/pages/menu/pages-menu.component.ts index caa1eb4..f96d1cd 100644 --- a/src/app/_modules/pages/menu/pages-menu.component.ts +++ b/src/app/_modules/pages/menu/pages-menu.component.ts @@ -34,7 +34,7 @@ export class PagesMenuComponent implements OnInit { let fothersSonID = item.children.data.findIndex( child => child.id == menuTree.id ) - item.children.data[fothersSonID] = menuTree + item.children.data[fothersSonID] = JSON.parse(JSON.stringify(menuTree)) return item }, currentPage); this.items = menuTree.children.data; diff --git a/src/app/_modules/pages/sections/types/basic/documents/documents-section.component.html b/src/app/_modules/pages/sections/types/basic/documents/documents-section.component.html index 254247e..a4d89ae 100644 --- a/src/app/_modules/pages/sections/types/basic/documents/documents-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/documents/documents-section.component.html @@ -1,5 +1,8 @@
- +
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 0f24474..786bc1d 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,9 +1,5 @@
-
- -
-
@@ -12,11 +8,11 @@
-