diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts index 2c2ff08..3e5086a 100644 --- a/src/app/_modules/pages/page/page.component.ts +++ b/src/app/_modules/pages/page/page.component.ts @@ -10,7 +10,7 @@ import {FormsService, ListsService} from "@app/_services"; }) export class PageComponent { public page: any; - public editMode = false; + public editMode: boolean; public loading = false; private url: string; private inited = false; @@ -64,10 +64,17 @@ export class PageComponent { fetch() { this.loading = true; - let include = ['parents', 'sections.type', 'sections.groups.fields.value', 'sidebars.groups.fields.value', 'sidebars.type', 'permissions']; + let include = [ + 'parents', + 'sections.type', + 'sections.groups.fields.value', + 'sections.objectables.groups.fields.value', + 'sidebars.groups.fields.value', + 'sidebars.type', + 'permissions' + ]; this.pagesService.find(this.url, {include: include.join(',')}).subscribe(res => { this.page = res?.data; - console.log(this.page?.image); this.loading = false; }, error => { this.loading = false; @@ -85,7 +92,7 @@ export class PageComponent { removeBackground() { if (confirm('Вы деествительно хотите удалить этот фон?')) { this.pagesService.deleteBackground(this.page.id).subscribe(res => { - console.log(res); + //console.log(res); // this.listsService.refresh(this.listId, true); }); } diff --git a/src/app/_modules/pages/page/types/content/content-page.component.ts b/src/app/_modules/pages/page/types/content/content-page.component.ts index 4748538..6985e2a 100644 --- a/src/app/_modules/pages/page/types/content/content-page.component.ts +++ b/src/app/_modules/pages/page/types/content/content-page.component.ts @@ -7,11 +7,15 @@ import {Component, Input} from '@angular/core'; }) export class ContentPageComponent { @Input() page: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor() { } + ngOnInit() { + } + + get sections() { return this.page?.sections?.data; } @@ -19,10 +23,4 @@ export class ContentPageComponent { get sidebars() { return this.page?.sidebars?.data; } - - - ngOnInit() { - } - - } diff --git a/src/app/_modules/pages/page/types/publications/publications-page.component.ts b/src/app/_modules/pages/page/types/publications/publications-page.component.ts index 645a188..9d009c8 100644 --- a/src/app/_modules/pages/page/types/publications/publications-page.component.ts +++ b/src/app/_modules/pages/page/types/publications/publications-page.component.ts @@ -7,7 +7,7 @@ import {Component, Input} from '@angular/core'; }) export class PublicationsPageComponent { @Input() page: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor() { } diff --git a/src/app/_modules/pages/page/types/registry/registry-page.component.ts b/src/app/_modules/pages/page/types/registry/registry-page.component.ts index ab25765..5e6f2a1 100644 --- a/src/app/_modules/pages/page/types/registry/registry-page.component.ts +++ b/src/app/_modules/pages/page/types/registry/registry-page.component.ts @@ -8,7 +8,7 @@ import {PagesService} from "@app/_services/pages.service"; }) export class RegistryPageComponent { @Input() page: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor(private pagesService: PagesService) { } diff --git a/src/app/_modules/pages/page/types/tk-structure/tk-structure-page.component.ts b/src/app/_modules/pages/page/types/tk-structure/tk-structure-page.component.ts index 6ad1449..d836300 100644 --- a/src/app/_modules/pages/page/types/tk-structure/tk-structure-page.component.ts +++ b/src/app/_modules/pages/page/types/tk-structure/tk-structure-page.component.ts @@ -8,7 +8,7 @@ import {AdvisoriesService} from "@app/_services/advisories.service"; }) export class TkStructurePageComponent { @Input() page: any; - @Input() editMode = false; + @Input() editMode: boolean; public mainCommittee: any; public activeAdvisories = {}; diff --git a/src/app/_modules/pages/sections/item/page-section.component.html b/src/app/_modules/pages/sections/item/page-section.component.html index f008754..ec57989 100644 --- a/src/app/_modules/pages/sections/item/page-section.component.html +++ b/src/app/_modules/pages/sections/item/page-section.component.html @@ -1,6 +1,6 @@
- +
@@ -14,8 +14,8 @@ - - + +

section {{type?.name}} is undefined

diff --git a/src/app/_modules/pages/sections/item/page-section.component.ts b/src/app/_modules/pages/sections/item/page-section.component.ts index 500cd89..2e96938 100644 --- a/src/app/_modules/pages/sections/item/page-section.component.ts +++ b/src/app/_modules/pages/sections/item/page-section.component.ts @@ -9,7 +9,7 @@ export class PageSectionComponent { @Input() page: any; @Input() section: any; @Input() index: number; - @Input() editMode = false; + @Input() editMode: boolean; @Input() modelType: string; constructor() { @@ -26,4 +26,8 @@ export class PageSectionComponent { get ord() { return this.section?.pivot?.ord; } + + get modelId() { + return this.page.id; + } } diff --git a/src/app/_modules/pages/sections/list/page-sections.component.ts b/src/app/_modules/pages/sections/list/page-sections.component.ts index 9b5c9de..e1ba035 100644 --- a/src/app/_modules/pages/sections/list/page-sections.component.ts +++ b/src/app/_modules/pages/sections/list/page-sections.component.ts @@ -7,18 +7,17 @@ import {Component, Input} from '@angular/core'; }) export class PageSectionsComponent { @Input() page: any; - @Input() editMode = false; + @Input() editMode: boolean; @Input() modelType: string = 'page'; constructor() { } + ngOnInit() { + } + + get sections() { return this.page?.sections?.data; } - - ngOnInit() { - - } - } diff --git a/src/app/_modules/pages/sections/menu/page-menu.component.ts b/src/app/_modules/pages/sections/menu/page-menu.component.ts index 99fc4ec..8179b7f 100644 --- a/src/app/_modules/pages/sections/menu/page-menu.component.ts +++ b/src/app/_modules/pages/sections/menu/page-menu.component.ts @@ -9,13 +9,19 @@ import {FormsService, ListsService, ObjectsService} from "@app/_services"; export class PageMenuComponent { @Input() page: any; @Input() section: any; - @Input() editMode = false; + @Input() editMode: boolean; @Input() index: number; + @Input() modelId: string; @Input() modelType: string; constructor(private formsService: FormsService, private objectsService: ObjectsService, private listsService: ListsService) { } + ngOnInit() { + //console.log(this.section) + } + + get ord() { return this.section?.pivot?.ord; } @@ -38,7 +44,7 @@ export class PageMenuComponent { } move(ord) { - this.objectsService.move(this.section.id, {modelType: this.modelType, modelId: this.page.id, ord: ord}).subscribe(res => { + this.objectsService.move(this.section.id, {modelType: this.modelType, modelId: this.modelId, ord: ord}).subscribe(res => { this.listsService.refresh(); }); } diff --git a/src/app/_modules/pages/sections/page-sections.module.ts b/src/app/_modules/pages/sections/page-sections.module.ts index e71f322..44f5223 100644 --- a/src/app/_modules/pages/sections/page-sections.module.ts +++ b/src/app/_modules/pages/sections/page-sections.module.ts @@ -21,9 +21,11 @@ import {FeedbackSectionComponent} from "@app/_modules/pages/sections/types/basic import {ContactSectionComponent} from "@app/_modules/pages/sections/types/basic/contact/contact-section.component"; import {MapsSectionComponent} from "@app/_modules/pages/sections/types/basic/maps/maps-section.component"; import {MemberSectionComponent} from "@app/_modules/pages/sections/types/basic/member/member-section.component"; -import {ImageSectionComponent} from "@app/_modules/pages/sections/types/basic/image/image-section.component"; import {DocumentSectionComponent} from "@app/_modules/pages/sections/types/basic/document/document-section.component"; import {PageMenuComponent} from "@app/_modules/pages/sections/menu/page-menu.component"; +import {ImageGroupSectionComponent} from "@app/_modules/pages/sections/types/basic/image-group/image-group-section.component"; +import {MemberSectionItemComponent} from "@app/_modules/pages/sections/types/basic/member/item/member-section-item.component"; +import {MemberSectionListComponent} from "@app/_modules/pages/sections/types/basic/member/list/member-section-list.component"; @NgModule({ imports: [ @@ -51,8 +53,10 @@ import {PageMenuComponent} from "@app/_modules/pages/sections/menu/page-menu.com ContactSectionComponent, MapsSectionComponent, MemberSectionComponent, - ImageSectionComponent, + ImageGroupSectionComponent, DocumentSectionComponent, + MemberSectionItemComponent, + MemberSectionListComponent, ], exports: [ PageSectionsComponent, 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 new file mode 100644 index 0000000..7ce6aa7 --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html @@ -0,0 +1,16 @@ +
+
+
+
+
+
+
+ + +
+ +
+
+
+
+
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 new file mode 100644 index 0000000..429bf50 --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss @@ -0,0 +1,55 @@ +.member { + display: flex; + flex-direction: column; + width: 100%; + max-width: 900px; + .add { + padding: 16px 12px; + display: flex; + justify-content: space-between; + width: 100%; + border-top: 1px solid #C0C0C0; + border-bottom: 1px solid #C0C0C0; + .title { + color: #6C6C6C; + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 24px; + } + .toggle { + width: 24px; + height: 24px; + cursor: pointer; + background: url('~src/assets/images/icons/add_cirle_24dp.svg') center no-repeat; + } + } + .list { + margin: 32px 0; + display: grid; + gap: 32px 40px; + width: 100%; + grid-template-columns: repeat(3, 1fr); + .item { + object-fit: cover; + .menu { + + } + .image { + img { + width: calc(100%); + border-radius: 12px; + } + } + .name { + + } + .description { + + } + .more { + + } + } + } +} diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts new file mode 100644 index 0000000..6b1d96e --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts @@ -0,0 +1,55 @@ +import {Component, Input} from '@angular/core'; +import {FormsService} from "@app/_services"; + +@Component({ + selector: 'image-group-section', + templateUrl: 'image-group-section.component.html', + styleUrls: ['image-group-section.component.scss'] +}) +export class ImageGroupSectionComponent { + @Input() section: any; + @Input() editMode: boolean; + @Input() page: any; + + constructor(private formsService: FormsService) { + } + + ngOnInit() { + console.log(this.section); + } + + + get title() { + return this.section?.groups?.data[0]?.fields?.data[0]?.value?.data[0]; + } + + get members() { + return this.section?.objectables?.data; + } + + get ord() { + return this.members.length + 1; + } + + get modelId() { + return this.section.id; + } + + get modelType() { + return 'object'; + } + + + add() { + let attach = {modelType: 'object', group: 'sections', modelId: this.section.id, ord: this.ord}; + this.formsService.createObject('page-section-list-image', {extraProps: {attach: attach}}); + } + + getLink(group: any) { + return group?.fields?.data[1]?.value?.data[0]; + } + + getImg(group: any) { + return group?.fields?.data[0]?.value?.data[0]?.links?.full; + } +} diff --git a/src/app/_modules/pages/sections/types/basic/image/image-section.component.html b/src/app/_modules/pages/sections/types/basic/image/image-section.component.html deleted file mode 100644 index 957ad2e..0000000 --- a/src/app/_modules/pages/sections/types/basic/image/image-section.component.html +++ /dev/null @@ -1 +0,0 @@ -Image Section diff --git a/src/app/_modules/pages/sections/types/basic/image/image-section.component.scss b/src/app/_modules/pages/sections/types/basic/image/image-section.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/_modules/pages/sections/types/basic/image/image-section.component.ts b/src/app/_modules/pages/sections/types/basic/image/image-section.component.ts deleted file mode 100644 index faf2c4f..0000000 --- a/src/app/_modules/pages/sections/types/basic/image/image-section.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import {Component, Input} from '@angular/core'; - -@Component({ - selector: 'image-section', - templateUrl: 'image-section.component.html', - styleUrls: ['image-section.component.scss'] -}) -export class ImageSectionComponent { - @Input() section: any; - - constructor( - ) { - } - - ngOnInit() { - console.log(this.section); - } -} 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 new file mode 100644 index 0000000..6b6f12b --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html @@ -0,0 +1,10 @@ +
+
{{item | json}}
+

+ +

+

Документ

+

{{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 new file mode 100644 index 0000000..9087971 --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss @@ -0,0 +1,3 @@ +.member { + +} 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 new file mode 100644 index 0000000..fa52800 --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts @@ -0,0 +1,59 @@ +import {Component, Input} from '@angular/core'; +import {FormsService, ObjectsService} from "@app/_services"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'member-section-item', + templateUrl: 'member-section-item.component.html', + styleUrls: ['member-section-item.component.scss'] +}) +export class MemberSectionItemComponent { + @Input() id: any; + + constructor( + private formsService: FormsService, + private router: Router, + private objectsService: ObjectsService, + ) { + } + + public item: any; + + ngOnInit() { + this.fetch(); + } + + fetch() { + this.objectsService.fetchObject(this.id, {include: 'groups.fields.value'}).subscribe(res => { + this.item = res.data; + }) + } + + get name() { + return 'Иванов Иван Иванович'; + } + + get photo() { + return '/assets/images/_remove/photo1.png'; + } + + get position() { + return 'Директор по развитию' + } + + get document() { + return '/assets/images/_remove/photo1.png' + } + + get phone() { + return '+7(999)999-99-99' + } + + get email() { + return 'ivan@ivanov.ru' + } + + get description () { + return 'Описание описание описание описание описание описание описание описание описание описание описание ' + } +} 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 new file mode 100644 index 0000000..ff8df0b --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html @@ -0,0 +1,21 @@ +
+
+
+
+
+
+
+ + + + +
+
+
+
+
+ +
+
+
+
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 new file mode 100644 index 0000000..a833c0d --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss @@ -0,0 +1,55 @@ +.members { + display: flex; + flex-direction: column; + width: 100%; + max-width: 900px; + .add { + padding: 16px 12px; + display: flex; + justify-content: space-between; + width: 100%; + border-top: 1px solid #C0C0C0; + border-bottom: 1px solid #C0C0C0; + .title { + color: #6C6C6C; + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 24px; + } + .toggle { + width: 24px; + height: 24px; + cursor: pointer; + background: url('~src/assets/images/icons/add_cirle_24dp.svg') center no-repeat; + } + } + .list { + margin: 32px 0; + display: grid; + gap: 32px 40px; + width: 100%; + grid-template-columns: repeat(3, 1fr); + .item { + object-fit: cover; + .menu { + + } + .image { + img { + width: calc(100%); + border-radius: 12px; + } + } + .name { + + } + .description { + + } + .more { + + } + } + } +} 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 new file mode 100644 index 0000000..06db534 --- /dev/null +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts @@ -0,0 +1,54 @@ +import {Component, Input} from '@angular/core'; +import {FormsService} from "@app/_services"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'member-section-list', + templateUrl: 'member-section-list.component.html', + styleUrls: ['member-section-list.component.scss'] +}) +export class MemberSectionListComponent { + @Input() section: any; + @Input() editMode: boolean; + @Input() page: any; + + constructor( + private formsService: FormsService, + private router: Router, + ) { + } + + ngOnInit() { + } + + + get title() { + return this.section?.groups?.data[0]?.fields?.data[0]?.value?.data[0]; + } + + get members() { + return this.section?.objectables?.data; + } + + get ord() { + return this.members.length + 1; + } + + get modelId() { + return this.section.id; + } + + get modelType() { + return 'object'; + } + + + add() { + let attach = {modelType: 'object', group: 'sections', modelId: this.section.id, ord: this.ord}; + this.formsService.createObject('page-section-list-member', {extraProps: {attach: attach}}); + } + + getLink(id: any) { + return this.router.url + '?id=' + id; + } +} diff --git a/src/app/_modules/pages/sections/types/basic/member/member-section.component.html b/src/app/_modules/pages/sections/types/basic/member/member-section.component.html index 66028df..b66b923 100644 --- a/src/app/_modules/pages/sections/types/basic/member/member-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/member/member-section.component.html @@ -1,15 +1,2 @@ -
-
-
-
-
-
-
- -
-
Давид Мерабович Гоготишвили
-
Генеральный директор ЧУ СЦ «ВНИИГАЗ-Сертификат»
- -
-
-
+ + diff --git a/src/app/_modules/pages/sections/types/basic/member/member-section.component.scss b/src/app/_modules/pages/sections/types/basic/member/member-section.component.scss index 8b339c8..e69de29 100644 --- a/src/app/_modules/pages/sections/types/basic/member/member-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/member-section.component.scss @@ -1,55 +0,0 @@ -.member { - display: flex; - flex-direction: column; - width: 100%; - max-width: 900px; - .add { - padding: 16px 12px; - display: flex; - justify-content: space-between; - width: 100%; - border-top: 1px solid #C0C0C0; - border-bottom: 1px solid #C0C0C0; - .title { - color: #6C6C6C; - font-size: 20px; - font-style: normal; - font-weight: 400; - line-height: 24px; - } - .toggle { - width: 24px; - height: 24px; - cursor: pointer; - background: url('~src/assets/images/icons/add_cirle_24dp.svg') center no-repeat; - } - } - .list { - margin: 32px 0; - display: grid; - gap: 32px 40px; - width: 100%; - grid-template-columns: repeat(3, 1fr); - .item { - object-fit: cover; - .menu { - - } - .photo { - img { - width: calc(100%); - border-radius: 12px; - } - } - .name { - - } - .description { - - } - .more { - - } - } - } -} diff --git a/src/app/_modules/pages/sections/types/basic/member/member-section.component.ts b/src/app/_modules/pages/sections/types/basic/member/member-section.component.ts index dea0d7c..4f17389 100644 --- a/src/app/_modules/pages/sections/types/basic/member/member-section.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/member-section.component.ts @@ -1,5 +1,6 @@ import {Component, Input} from '@angular/core'; -import {FormsService} from "@app/_services"; +import {FormsService, ObjectsService} from "@app/_services"; +import {ActivatedRoute, Router} from "@angular/router"; @Component({ selector: 'member-section', @@ -8,24 +9,26 @@ import {FormsService} from "@app/_services"; }) export class MemberSectionComponent { @Input() section: any; - @Input() editMode = false; + @Input() editMode: boolean; + @Input() page: any; - constructor(private formsService: FormsService,) { + constructor( + private formsService: FormsService, + private router: Router, + private objectsService: ObjectsService, + ) { } + public id: string = ''; + public item: any; + ngOnInit() { - console.log(); - } - - get title() { - return this.section?.groups?.data[0]?.fields?.data[0]?.value?.data[0]; - } - - add() { - this.formsService.createObject('page-section-list-member'); - } - - getLink(slug: string) { - return '' + slug; + let links = this.router.url.split('?'); + if (links.length > 0) { + this.id = links[1]?.split('=')[1]; + this.objectsService.fetchObject(this.id, {include: 'groups.fields.value'}).subscribe(res => { + this.item = res.data; + }) + } } } diff --git a/src/app/_modules/pages/sidebars/item/page-sidebar.component.ts b/src/app/_modules/pages/sidebars/item/page-sidebar.component.ts index d89a95c..99514e9 100644 --- a/src/app/_modules/pages/sidebars/item/page-sidebar.component.ts +++ b/src/app/_modules/pages/sidebars/item/page-sidebar.component.ts @@ -10,7 +10,7 @@ export class PageSidebarComponent { @Input() page: any; @Input() sidebar: any; @Input() index: number; - @Input() editMode = false; + @Input() editMode: boolean; constructor(private objectsService: ObjectsService, private formsService: FormsService, private listsService: ListsService) { } diff --git a/src/app/_modules/pages/sidebars/list/page-sidebars.component.ts b/src/app/_modules/pages/sidebars/list/page-sidebars.component.ts index 78e61d9..08aaca0 100644 --- a/src/app/_modules/pages/sidebars/list/page-sidebars.component.ts +++ b/src/app/_modules/pages/sidebars/list/page-sidebars.component.ts @@ -7,7 +7,7 @@ import {Component, Input} from '@angular/core'; }) export class PageSidebarsComponent { @Input() page: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor() { } diff --git a/src/app/_modules/publications/list/item/item.component.ts b/src/app/_modules/publications/list/item/item.component.ts index 089bcbf..8994490 100644 --- a/src/app/_modules/publications/list/item/item.component.ts +++ b/src/app/_modules/publications/list/item/item.component.ts @@ -7,7 +7,7 @@ import {Component, Input} from '@angular/core'; }) export class PublicationsListItemComponent { @Input() item: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor( ) { diff --git a/src/app/_modules/publications/list/item/menu/menu.component.ts b/src/app/_modules/publications/list/item/menu/menu.component.ts index 6338bd9..ac8ddd7 100644 --- a/src/app/_modules/publications/list/item/menu/menu.component.ts +++ b/src/app/_modules/publications/list/item/menu/menu.component.ts @@ -9,7 +9,7 @@ import {PublicationsService} from "@app/_services/publications.service"; }) export class PublicationsListItemMenuComponent { @Input() data: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor( private formsService: FormsService, diff --git a/src/app/_modules/publications/list/item/news/news.component.ts b/src/app/_modules/publications/list/item/news/news.component.ts index 7e30c9f..6ffeb6a 100644 --- a/src/app/_modules/publications/list/item/news/news.component.ts +++ b/src/app/_modules/publications/list/item/news/news.component.ts @@ -7,7 +7,7 @@ import {Component, Input} from '@angular/core'; }) export class PublicationsListItemNewsComponent { @Input() item: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor() { } diff --git a/src/app/_modules/publications/list/item/photos/photos.component.ts b/src/app/_modules/publications/list/item/photos/photos.component.ts index b1371a6..e615bb3 100644 --- a/src/app/_modules/publications/list/item/photos/photos.component.ts +++ b/src/app/_modules/publications/list/item/photos/photos.component.ts @@ -7,7 +7,7 @@ import {Component, Input} from '@angular/core'; }) export class PublicationsListItemPhotosComponent { @Input() item: any; - @Input() editMode = false; + @Input() editMode: boolean; public parsedPhotos: any[] = []; public activePhoto: string = ''; diff --git a/src/app/_modules/publications/list/item/portfolio/portfolio.component.ts b/src/app/_modules/publications/list/item/portfolio/portfolio.component.ts index 7a4ecdb..42cfacb 100644 --- a/src/app/_modules/publications/list/item/portfolio/portfolio.component.ts +++ b/src/app/_modules/publications/list/item/portfolio/portfolio.component.ts @@ -7,7 +7,7 @@ import {Component, Input} from '@angular/core'; }) export class PublicationsListItemPortfolioComponent { @Input() item: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor() { } diff --git a/src/app/_modules/publications/list/item/smi/smi.component.ts b/src/app/_modules/publications/list/item/smi/smi.component.ts index 6980b56..8eb2c86 100644 --- a/src/app/_modules/publications/list/item/smi/smi.component.ts +++ b/src/app/_modules/publications/list/item/smi/smi.component.ts @@ -7,7 +7,7 @@ import {Component, Input} from '@angular/core'; }) export class PublicationsListItemSmiComponent { @Input() item: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor() { } diff --git a/src/app/_modules/publications/list/item/video/video.component.ts b/src/app/_modules/publications/list/item/video/video.component.ts index 4735847..99a3ee2 100644 --- a/src/app/_modules/publications/list/item/video/video.component.ts +++ b/src/app/_modules/publications/list/item/video/video.component.ts @@ -8,7 +8,7 @@ import {DomSanitizer} from "@angular/platform-browser"; }) export class PublicationsListItemVideoComponent { @Input() item: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor( private sanitized: DomSanitizer diff --git a/src/app/_modules/publications/list/list.component.ts b/src/app/_modules/publications/list/list.component.ts index fc767d4..a2a1eb4 100644 --- a/src/app/_modules/publications/list/list.component.ts +++ b/src/app/_modules/publications/list/list.component.ts @@ -10,7 +10,7 @@ import {PublicationsService} from "@app/_services/publications.service"; }) export class PublicationsListComponent { @Input() page: any; - @Input() editMode = false; + @Input() editMode: boolean; controlsSubscription?: Subscription; resultsSubscription?: Subscription; diff --git a/src/app/_modules/publications/publication/publication.component.ts b/src/app/_modules/publications/publication/publication.component.ts index 9bc0927..8b39ec5 100644 --- a/src/app/_modules/publications/publication/publication.component.ts +++ b/src/app/_modules/publications/publication/publication.component.ts @@ -7,7 +7,7 @@ import {Component, Input} from '@angular/core'; }) export class PublicationsPublicationComponent { @Input() page: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor( ) { diff --git a/src/app/_modules/registries/registry/categories/category/registry-category.component.ts b/src/app/_modules/registries/registry/categories/category/registry-category.component.ts index 07626c7..abdbab2 100644 --- a/src/app/_modules/registries/registry/categories/category/registry-category.component.ts +++ b/src/app/_modules/registries/registry/categories/category/registry-category.component.ts @@ -11,7 +11,7 @@ export class RegistryCategoryComponent { @Input() registry: any; @Input() parent: any; @Input() category: any; - @Input() editMode = false; + @Input() editMode: boolean; public isExpanded = false; constructor(private categoriesService: RegistryCategoriesService, private formsService: FormsService, private listsService: ListsService) { diff --git a/src/app/_modules/registries/registry/categories/registry-categories.component.ts b/src/app/_modules/registries/registry/categories/registry-categories.component.ts index 65977d3..a4003c6 100644 --- a/src/app/_modules/registries/registry/categories/registry-categories.component.ts +++ b/src/app/_modules/registries/registry/categories/registry-categories.component.ts @@ -12,7 +12,7 @@ import {SortableOptions} from "sortablejs"; export class RegistryCategoriesComponent { @Input() registry: any; @Input() parent: any; - @Input() editMode = false; + @Input() editMode: boolean; public categories = []; public options: SortableOptions = { diff --git a/src/app/_modules/registries/registry/entries/entry/registry-entry.component.ts b/src/app/_modules/registries/registry/entries/entry/registry-entry.component.ts index fbfa625..cd40015 100644 --- a/src/app/_modules/registries/registry/entries/entry/registry-entry.component.ts +++ b/src/app/_modules/registries/registry/entries/entry/registry-entry.component.ts @@ -12,7 +12,7 @@ export class RegistryEntryComponent { @Input() registry: any; @Input() category: any; @Input() entry: any; - @Input() editMode = false; + @Input() editMode: boolean; public isExpanded = false; diff --git a/src/app/_modules/registries/registry/entries/registry-entries.component.ts b/src/app/_modules/registries/registry/entries/registry-entries.component.ts index 57a50f7..a629f71 100644 --- a/src/app/_modules/registries/registry/entries/registry-entries.component.ts +++ b/src/app/_modules/registries/registry/entries/registry-entries.component.ts @@ -12,7 +12,7 @@ import {SortableOptions} from "sortablejs"; export class RegistryEntriesComponent { @Input() registry: any; @Input() category: any; - @Input() editMode = false; + @Input() editMode: boolean; public entries = []; public options: SortableOptions = { diff --git a/src/app/_modules/registries/registry/operations/entry-operations.component.ts b/src/app/_modules/registries/registry/operations/entry-operations.component.ts index 0258014..7694987 100644 --- a/src/app/_modules/registries/registry/operations/entry-operations.component.ts +++ b/src/app/_modules/registries/registry/operations/entry-operations.component.ts @@ -10,7 +10,7 @@ import {RegistryEntriesService} from "@app/_services/registry-entries.service"; }) export class EntryOperationsComponent { @Input() entry: any; - @Input() editMode = false; + @Input() editMode: boolean; subscription: Subscription; diff --git a/src/app/_modules/registries/registry/operations/operation/entry-operation.component.ts b/src/app/_modules/registries/registry/operations/operation/entry-operation.component.ts index 6a9af79..c018168 100644 --- a/src/app/_modules/registries/registry/operations/operation/entry-operation.component.ts +++ b/src/app/_modules/registries/registry/operations/operation/entry-operation.component.ts @@ -10,7 +10,7 @@ import {DatePipe} from "@angular/common"; export class EntryOperationComponent { @Input() entry: any; @Input() operation: any; - @Input() editMode = false; + @Input() editMode: boolean; constructor(private formsService: FormsService, private listsService: ListsService, private objectsService: ObjectsService, private datePipe: DatePipe) { diff --git a/src/app/_modules/registries/registry/registry.component.ts b/src/app/_modules/registries/registry/registry.component.ts index 1e42538..0c05766 100644 --- a/src/app/_modules/registries/registry/registry.component.ts +++ b/src/app/_modules/registries/registry/registry.component.ts @@ -11,7 +11,7 @@ import {debounceTime} from "rxjs/operators"; }) export class RegistryComponent { @Input() registry: any; - @Input() editMode = false; + @Input() editMode: boolean; public filters: FormGroup; public isFiltersApplied = false; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 77d8956..4fb6843 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: 'ibcsrXeGLmzmilvgKw53otrIB8RdrhXsheW3aaWd', + clientSecret: 'tTuEbUSla2RfgM5ailI0TvHmekaR6YMTDr4aswhW', }; /*