diff --git a/projects/app-vniigaz/src/assets/css/grid.scss b/projects/app-vniigaz/src/assets/css/grid.scss index a01a97a..7a7b61b 100644 --- a/projects/app-vniigaz/src/assets/css/grid.scss +++ b/projects/app-vniigaz/src/assets/css/grid.scss @@ -126,4 +126,8 @@ } } + +.main-content edit-switch{ + display: none; +} \ No newline at end of file diff --git a/projects/app-vniigaz/src/assets/html/left-content.component.html b/projects/app-vniigaz/src/assets/html/left-content.component.html index 6c8d3b5..03e8643 100644 --- a/projects/app-vniigaz/src/assets/html/left-content.component.html +++ b/projects/app-vniigaz/src/assets/html/left-content.component.html @@ -12,9 +12,4 @@ -
-
- Режим редактирования - -
-
+ diff --git a/projects/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/projects/app/_modules/layout/header/user-bar/header-user-bar.component.ts index 366cb09..7f74903 100644 --- a/projects/app/_modules/layout/header/user-bar/header-user-bar.component.ts +++ b/projects/app/_modules/layout/header/user-bar/header-user-bar.component.ts @@ -21,7 +21,6 @@ export class HeaderUserBarComponent { private router: Router, private pagesService: PagesService) { this.subscriptionUser = this.authService.user.subscribe(user => { - console.log(user) this.user = user; }); } diff --git a/projects/app/_modules/layout/left-content/left-content.component.ts b/projects/app/_modules/layout/left-content/left-content.component.ts index a8b02b1..59d31be 100644 --- a/projects/app/_modules/layout/left-content/left-content.component.ts +++ b/projects/app/_modules/layout/left-content/left-content.component.ts @@ -31,38 +31,18 @@ export class LeftContentComponent { } ngOnInit(){ - this.routeSubscription = this.router.events.subscribe(event => { - if (event instanceof NavigationEnd) this.onNavigationEnd(event); - }); this.pagesService.editMode.subscribe( mode => { this.editMode = mode; } ) - } - - onNavigationEnd(event: NavigationEnd) { - let url = event.url.split('(')[0]; - url = url.split('?')[0]; - if (url !== this.url) { - this.url = url; - this.fetch() - } - } - - fetch(){ - let include = [ - 'permissions', - 'parents' - ]; - this.pagesService.find(this.url, {include: include.join(',')}).subscribe( - resp => { - let page = resp?.data; + this.pagesService.currentPage.subscribe( + page => { if (page){ this.background = page.image?.data?.links?.full; if (this.background) this.background = `url(${this.background})`; - this.pageName = (page.parents.data[2]||page).name; - this.editable = page.permissions.edit || page.permissions.anything; + this.pageName = (page.parents?.data[2]||page).name; + this.editable = page.permissions?.edit || page.permissions?.anything; this.pageID = page.id }else{ this.pageName = null; @@ -73,10 +53,6 @@ export class LeftContentComponent { ) } - toggleEditMode(){ - this.pagesService.editMode.next(!this.editMode) - } - editBackground() { this.formsService.createModel('page-background', {extraProps: {attach: {pageId: this.pageID}}}); } diff --git a/projects/app/_modules/pages/page/page.component.html b/projects/app/_modules/pages/page/page.component.html index eef2677..106cf1e 100644 --- a/projects/app/_modules/pages/page/page.component.html +++ b/projects/app/_modules/pages/page/page.component.html @@ -1,10 +1,13 @@
-
+ + + +
diff --git a/projects/app/_modules/pages/page/page.component.ts b/projects/app/_modules/pages/page/page.component.ts index 3e5086a..042763c 100644 --- a/projects/app/_modules/pages/page/page.component.ts +++ b/projects/app/_modules/pages/page/page.component.ts @@ -45,6 +45,11 @@ export class PageComponent { this.listsService.controls().subscribe(res => { this.inited ? this.fetch() : this.inited = true; }); + this.pagesService.editMode.subscribe( + mode => { + this.editMode = mode; + } + ) } ngOnDestroy() { @@ -75,16 +80,13 @@ export class PageComponent { ]; this.pagesService.find(this.url, {include: include.join(',')}).subscribe(res => { this.page = res?.data; + this.pagesService.currentPage.next(this.page) this.loading = false; }, error => { this.loading = false; }); } - toggleEditMode() { - this.editMode = !this.editMode; - } - editBackground() { this.formsService.createModel('page-background', {extraProps: {attach: {pageId: this.page.id}}}); } diff --git a/projects/app/_modules/pages/pages-routing.module.ts b/projects/app/_modules/pages/pages-routing.module.ts index 7ad0be4..0eb466a 100644 --- a/projects/app/_modules/pages/pages-routing.module.ts +++ b/projects/app/_modules/pages/pages-routing.module.ts @@ -34,7 +34,7 @@ const routes: Routes = [ PageSidebarsModule, RegistriesModule, PublicationsModule, - VigetModule + VigetModule, ], declarations: [ PageComponent, @@ -43,10 +43,10 @@ const routes: Routes = [ ContentPageComponent, PublicationsPageComponent, RegistryPageComponent, - TkStructurePageComponent + TkStructurePageComponent, ], exports: [ - RouterModule + RouterModule, ] }) export class PagesRoutingModule {} diff --git a/projects/app/_modules/pages/pages.module.ts b/projects/app/_modules/pages/pages.module.ts index cba93cd..639e079 100644 --- a/projects/app/_modules/pages/pages.module.ts +++ b/projects/app/_modules/pages/pages.module.ts @@ -19,6 +19,7 @@ import {SortablejsModule} from "@dustfoundation/ngx-sortablejs"; import { VigetModule } from '../viget/viget.module'; import { SliderMenuComponent } from './menu/slider-menu/slider-menu.component'; + @NgModule({ imports: [ CommonModule, @@ -41,13 +42,13 @@ import { SliderMenuComponent } from './menu/slider-menu/slider-menu.component'; PagesTreeItemComponent, SearchSectionsComponent, SearchSectionsItemComponent, - SliderMenuComponent, + SliderMenuComponent ], exports: [ PagesMenuComponent, PagesListComponent, SearchSectionsComponent, - PagesTreeComponent, + PagesTreeComponent ] }) export class PagesModule {} diff --git a/projects/app/_modules/pages/sections/menu/page-menu.component.ts b/projects/app/_modules/pages/sections/menu/page-menu.component.ts index 8179b7f..b1378b9 100644 --- a/projects/app/_modules/pages/sections/menu/page-menu.component.ts +++ b/projects/app/_modules/pages/sections/menu/page-menu.component.ts @@ -18,7 +18,7 @@ export class PageMenuComponent { } ngOnInit() { - //console.log(this.section) + } diff --git a/projects/app/_modules/pages/sections/types/basic/document/document-section.component.ts b/projects/app/_modules/pages/sections/types/basic/document/document-section.component.ts index 70b134f..d9dff07 100644 --- a/projects/app/_modules/pages/sections/types/basic/document/document-section.component.ts +++ b/projects/app/_modules/pages/sections/types/basic/document/document-section.component.ts @@ -13,7 +13,6 @@ export class DocumentSectionComponent { } ngOnInit() { - // console.log(this.section); } get title(){ diff --git a/projects/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts b/projects/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts index d49784b..e3a9664 100644 --- a/projects/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts +++ b/projects/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts @@ -15,7 +15,7 @@ export class ImageGroupSectionComponent { } ngOnInit() { - // console.log(this.section); + } diff --git a/projects/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts b/projects/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts index 912b317..4c78b80 100644 --- a/projects/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts +++ b/projects/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts @@ -30,7 +30,6 @@ export class MemberSectionListComponent { } }) }) - console.log(fields['member-doc'].links.download); return fields } diff --git a/projects/app/_modules/publications/list/item/menu/menu.component.ts b/projects/app/_modules/publications/list/item/menu/menu.component.ts index ac8ddd7..acbc7eb 100644 --- a/projects/app/_modules/publications/list/item/menu/menu.component.ts +++ b/projects/app/_modules/publications/list/item/menu/menu.component.ts @@ -23,7 +23,7 @@ export class PublicationsListItemMenuComponent { } ngOnInit() { - //console.log(this.data); + } edit(id: string) { diff --git a/projects/app/_modules/viget/edit-switch/edit-switch.component.html b/projects/app/_modules/viget/edit-switch/edit-switch.component.html new file mode 100644 index 0000000..3ff941d --- /dev/null +++ b/projects/app/_modules/viget/edit-switch/edit-switch.component.html @@ -0,0 +1,6 @@ +
+
+ Режим редактирования + +
+
\ No newline at end of file diff --git a/projects/app/_modules/viget/edit-switch/edit-switch.component.scss b/projects/app/_modules/viget/edit-switch/edit-switch.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/projects/app/_modules/viget/edit-switch/edit-switch.component.ts b/projects/app/_modules/viget/edit-switch/edit-switch.component.ts new file mode 100644 index 0000000..e346258 --- /dev/null +++ b/projects/app/_modules/viget/edit-switch/edit-switch.component.ts @@ -0,0 +1,36 @@ +import {Component,OnInit} from '@angular/core'; +import {PagesService} from "@app/_services/pages.service"; +import {Subscription} from "rxjs"; + +@Component({ + selector: 'edit-switch', + templateUrl: 'edit-switch.component.html', + styleUrls: ['edit-switch.component.scss'] +}) +export class EditSwitch implements OnInit { + public editMode = false; + public editable:string; + + constructor( + private pagesService: PagesService, + // private subscription: Subscription + ) {} + + ngOnInit(){ + console.log('es',this.pagesService.currentPage) + this.pagesService.currentPage.subscribe( page =>{ + console.log('PAGE',page) + this.editable = page.permissions?.edit || page.permissions?.anything; + }); + this.pagesService.editMode.subscribe( + editMode => this.editMode = editMode + ) + } + + + toggle(){ + this.pagesService.editMode.next(!this.editMode) + } + + +} diff --git a/projects/app/_modules/viget/viget.module.ts b/projects/app/_modules/viget/viget.module.ts index ce88bf0..ad1f84a 100644 --- a/projects/app/_modules/viget/viget.module.ts +++ b/projects/app/_modules/viget/viget.module.ts @@ -6,6 +6,7 @@ import { QRCodeModule } from "angularx-qrcode"; import {DropDownComponent } from "./drop-down/drop-down.component"; import { SliderComponent } from './slider/slider.component'; import { SwitchComponent } from './switch/switch.component'; +import { EditSwitch } from "./edit-switch/edit-switch.component"; @NgModule({ @@ -19,13 +20,15 @@ import { SwitchComponent } from './switch/switch.component'; DropDownComponent, SliderComponent, SwitchComponent, + EditSwitch ], exports: [ IcoComponent, QRCodeComponent, DropDownComponent, SliderComponent, - SwitchComponent + SwitchComponent, + EditSwitch ] }) export class VigetModule { diff --git a/projects/app/_services/authentication.service.ts b/projects/app/_services/authentication.service.ts index a021adc..a929617 100644 --- a/projects/app/_services/authentication.service.ts +++ b/projects/app/_services/authentication.service.ts @@ -50,10 +50,8 @@ export class AuthenticationService { } checkUser(params?: any) { - console.log('checkUser',params) if (this.token.value) { if (!params) params = {include: 'avatar,privileges'}; - console.log('URL',environment.apiUrl) this.http.get(`${environment.apiUrl}/api/me`, {params: params}).subscribe((res: any) => { this.user.next(res?.data); }); diff --git a/projects/app/_services/pages.service.ts b/projects/app/_services/pages.service.ts index c536f8e..1fc43c4 100644 --- a/projects/app/_services/pages.service.ts +++ b/projects/app/_services/pages.service.ts @@ -13,6 +13,7 @@ export class PagesService { public pagesTree: BehaviorSubject public editMode = new BehaviorSubject(false); + public currentPage = new BehaviorSubject({data:[]}) changedPages(){ let include = ['children.children.children.children.children.children.children']; diff --git a/projects/app/app.module.ts b/projects/app/app.module.ts index 8c5769f..da45da1 100644 --- a/projects/app/app.module.ts +++ b/projects/app/app.module.ts @@ -15,7 +15,7 @@ import {ApplicationsModule} from "@app/_modules/applications/applications.module import {UsersModule} from "@app/_modules/users/users.module"; import {SearchModule} from "@app/_modules/search/search.module"; import {PagesRoutingModule} from "@app/_modules/pages/pages-routing.module"; - + @NgModule({ imports: [ BrowserModule,