diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.html b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.html index e1384c2..82362f7 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.html +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.html @@ -5,4 +5,14 @@
{{position}}
{{phone}}
{{email}}
+
...
+ +

{{name}}

+ +
{{position}}
+
{{phone}}
+
{{email}}
+
+ +
diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.ts b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.ts index d282462..b904841 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.ts +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/persons/cards-item-persons.component.ts @@ -8,6 +8,7 @@ import {ObjectsService} from "@app/_services"; }) export class CardsItemPersonsComponent { @Input() card: any; + public showModal = false; constructor(private objectsService: ObjectsService) { } @@ -27,6 +28,13 @@ export class CardsItemPersonsComponent { get email() { return this.objectsService.getValue(this.card, 'contact-email'); } + get html() { + return this.objectsService.getValue(this.card, 'html'); + } + + get textOnly(){ + return this.html.replace(/<[^>]*>?/gm, '').replace(/\s/g, "").replace(/\ /gm,''); + } ngOnInit() { } diff --git a/src/app/_modules/widget/modal/modal.component.html b/src/app/_modules/widget/modal/modal.component.html new file mode 100644 index 0000000..decdfe6 --- /dev/null +++ b/src/app/_modules/widget/modal/modal.component.html @@ -0,0 +1 @@ +

modal works!

diff --git a/src/app/_modules/widget/modal/modal.component.scss b/src/app/_modules/widget/modal/modal.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/_modules/widget/modal/modal.component.spec.ts b/src/app/_modules/widget/modal/modal.component.spec.ts new file mode 100644 index 0000000..1b71c6b --- /dev/null +++ b/src/app/_modules/widget/modal/modal.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ModalComponent } from './modal.component'; + +describe('ModalComponent', () => { + let component: ModalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ModalComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/_modules/widget/modal/modal.component.ts b/src/app/_modules/widget/modal/modal.component.ts new file mode 100644 index 0000000..cf6338f --- /dev/null +++ b/src/app/_modules/widget/modal/modal.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-modal', + templateUrl: './modal.component.html', + styleUrls: ['./modal.component.scss'] +}) +export class ModalComponent { + +} diff --git a/src/app/_modules/widjet/modal/modal.component.html b/src/app/_modules/widjet/modal/modal.component.html new file mode 100644 index 0000000..0729738 --- /dev/null +++ b/src/app/_modules/widjet/modal/modal.component.html @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/src/app/_modules/widjet/modal/modal.component.scss b/src/app/_modules/widjet/modal/modal.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/_modules/widjet/modal/modal.component.ts b/src/app/_modules/widjet/modal/modal.component.ts new file mode 100644 index 0000000..b8ec710 --- /dev/null +++ b/src/app/_modules/widjet/modal/modal.component.ts @@ -0,0 +1,25 @@ +import { Component, Output, EventEmitter } from '@angular/core'; +import {WindowScrollingService} from "@app/_services/window-scrolling.service"; + +@Component({ + selector: 'modal', + templateUrl: './modal.component.html', + styleUrls: ['./modal.component.scss'] +}) +export class ModalComponent { + + @Output() close = new EventEmitter(); + + constructor( private windowScrollingService: WindowScrollingService ){} + + ngOnInit(){ + this.windowScrollingService.disable(); + } + ngOnDestroy(){ + this.windowScrollingService.enable(); + } + + cls(){ + this.close.emit('close') + } +} diff --git a/src/app/_modules/widjet/widjet.module.ts b/src/app/_modules/widjet/widjet.module.ts index c836d44..e3c84af 100644 --- a/src/app/_modules/widjet/widjet.module.ts +++ b/src/app/_modules/widjet/widjet.module.ts @@ -9,6 +9,7 @@ import { SliderComponent } from './slider/slider.component'; import { SwitchComponent } from './switch/switch.component'; import { LocaleComponent } from './locale/locale.component'; import { FileIcoComponent } from './file-ico/file-ico.component'; +import { ModalComponent } from './modal/modal.component'; @NgModule({ @@ -25,6 +26,7 @@ import { FileIcoComponent } from './file-ico/file-ico.component'; SwitchComponent, LocaleComponent, FileIcoComponent, + ModalComponent, ], exports: [ IcoComponent, @@ -33,7 +35,8 @@ import { FileIcoComponent } from './file-ico/file-ico.component'; SliderComponent, SwitchComponent, LocaleComponent, - FileIcoComponent + FileIcoComponent, + ModalComponent ] }) export class WidjetModule { diff --git a/src/assets/css/_basics.scss b/src/assets/css/_basics.scss index 54100b4..c438a1a 100644 --- a/src/assets/css/_basics.scss +++ b/src/assets/css/_basics.scss @@ -414,3 +414,47 @@ file-ico{ height: 60px; display: inline-flex; } + + +modal{ + position: fixed; + width: 100vw; + height: 100vh; + left: 0; + top: 0; + display: flex; + align-items: center; + justify-content: center; + .modal-overlay{ + position: fixed; + width: 100vw; + height: 100vh; + left: 0; + top: 0; + background-color: rgba(62, 61, 64, 0.7); + } + .modal-bar{ + max-width: 800px; + max-height: 100vh; + background-color: var(--white); + border: 1px solid var(--second-dis); + display: flex; + flex-direction: column; + z-index: 1; + .modal-header{ + display: flex; + justify-content: space-between; + margin-top: -1px; + border-bottom: 1px solid var(--second-dis); + } + .modal-body{ + + } + .modal-footer{ + display: flex; + justify-content: space-between; + margin-bottom: -1px; + border-top: 1px solid var(--second-dis); + } + } +} diff --git a/src/vniigaz-v2/css/_basics.scss b/src/vniigaz-v2/css/_basics.scss index 5a1b4b8..e8ac6ca 100644 --- a/src/vniigaz-v2/css/_basics.scss +++ b/src/vniigaz-v2/css/_basics.scss @@ -449,3 +449,56 @@ file-ico{ height: 60px; display: inline-flex; } + + +modal{ + position: fixed; + width: 100vw; + height: 100vh; + left: 0; + top: 0; + display: flex; + align-items: center; + justify-content: center; + .modal-overlay{ + position: fixed; + width: 100vw; + height: 100vh; + left: 0; + top: 0; + background-color: rgba(62, 61, 64, 0.7); + } + .modal-bar{ + max-width: 800px; + max-height: 100vh; + background-color: var(--white); + border: 1px solid var(--second-dis); + display: flex; + flex-direction: column; + z-index: 1; + .modal-header{ + display: flex; + justify-content: space-between; + align-items: center; + margin-top: -1px; + border-bottom: 1px solid var(--second-dis); + padding: 14px 24px; + h4{ + margin: 0; + } + } + .modal-body{ + padding: 36px 24px; + overflow-y: auto; + img{ + max-width: 330px; + } + } + .modal-footer{ + display: flex; + justify-content: space-between; + margin-bottom: -1px; + border-top: 1px solid var(--second-dis); + } + } +} \ No newline at end of file