angular.json

@@ -190,9 +190,7 @@
               "projects/app-vniigaz/src/assets/css/list-items.scss",
               "projects/app-vniigaz/src/assets/css/documents-lists.scss",
               "projects/app-vniigaz/src/assets/css/slider.scss",
-              "projects/app-vniigaz/src/assets/css/main-content.scss",
               "projects/app-vniigaz/src/styles.scss"
-              
             ],
             "scripts": []
           },
@@ -285,7 +283,6 @@
               "projects/app-vniigaz/src/assets/css/list-items.scss",
               "projects/app-vniigaz/src/assets/css/documents-lists.scss",
               "projects/app-vniigaz/src/assets/css/slider.scss",
-              "projects/app-vniigaz/src/assets/css/main-content.scss",
               "projects/app-vniigaz/src/styles.scss"
             ],
             "scripts": []

projects/app-vniigaz/src/assets/css/grid.scss

@@ -127,7 +127,3 @@
     
   }
   
-.main-content edit-switch{
-  display: none;
-}
-  

projects/app-vniigaz/src/assets/css/main-content.scss

@@ -1,8 +0,0 @@
-.content{
-    .nav-info{
-        .toggle{
-            display: none !important;
-        }
-        
-    }
-}

projects/app-vniigaz/src/assets/html/left-content.component.html

@@ -12,4 +12,9 @@
         </div>      
     </div>
 </div>
-<edit-switch></edit-switch>
+<div class="edit-field" *ngIf="editable">
+    <div class="edit-field-row switch-host" (click)="toggleEditMode()">
+        Режим редактирования
+        <switch [val]="editMode"></switch>
+    </div>
+</div>

projects/app/_modules/layout/header/user-bar/header-user-bar.component.ts

@@ -21,6 +21,7 @@ export class HeaderUserBarComponent {
     private router: Router,
     private pagesService: PagesService) {
       this.subscriptionUser = this.authService.user.subscribe(user => {
+        console.log(user)
         this.user = user;
       });
   }

projects/app/_modules/layout/left-content/left-content.component.ts

@@ -31,18 +31,38 @@ 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;
       }
     )
-    this.pagesService.currentPage.subscribe(
+  }
-      page => {
+
+  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;
         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.pageName = (page.parents.data[2]||page).name;
-          this.editable = page.permissions?.edit || page.permissions?.anything;
+          this.editable = page.permissions.edit || page.permissions.anything;
           this.pageID = page.id
         }else{
           this.pageName = null;
@@ -53,6 +73,10 @@ export class LeftContentComponent {
     )
   }
 
+  toggleEditMode(){
+    this.pagesService.editMode.next(!this.editMode)
+  }
+
   editBackground() {
     this.formsService.createModel('page-background', {extraProps: {attach: {pageId: this.pageID}}});
   }

projects/app/_modules/pages/page/page.component.html

@@ -1,13 +1,10 @@
 <div class="content" *ngIf="page">
-  <!-- <div class="nav-info switch-host" *ngIf="isEditable">
+  <div class="nav-info switch-host" *ngIf="isEditable">
     <div class="toggle" (click)="toggleEditMode()">
       <div class="label">Режим редактирования</div>
       <switch [val]="editMode"></switch>
     </div>
-  </div> -->
+  </div>
-
-  <edit-switch></edit-switch>
-  
   
   <div  class="limiter">
     <page-breadcrumbs [page]="page"></page-breadcrumbs>

projects/app/_modules/pages/page/page.component.ts

@@ -45,11 +45,6 @@ export class PageComponent {
     this.listsService.controls().subscribe(res => {
       this.inited ? this.fetch() : this.inited = true;
     });
-    this.pagesService.editMode.subscribe(
-      mode => {
-        this.editMode = mode;
-      }
-    )
   }
 
   ngOnDestroy() {
@@ -80,13 +75,16 @@ 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}}});
   }

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 {}

projects/app/_modules/pages/pages.module.ts

@@ -19,7 +19,6 @@ import {SortablejsModule} from "@dustfoundation/ngx-sortablejs";
 import { VigetModule } from '../viget/viget.module';
 import { SliderMenuComponent } from './menu/slider-menu/slider-menu.component';
 
-
 @NgModule({
   imports: [
     CommonModule,
@@ -42,13 +41,13 @@ import { SliderMenuComponent } from './menu/slider-menu/slider-menu.component';
     PagesTreeItemComponent,
     SearchSectionsComponent,
     SearchSectionsItemComponent,
-    SliderMenuComponent
+    SliderMenuComponent,
   ],
   exports: [
     PagesMenuComponent,
     PagesListComponent,
     SearchSectionsComponent,
-    PagesTreeComponent
+    PagesTreeComponent,
   ]
 })
 export class PagesModule {}

projects/app/_modules/pages/sections/menu/page-menu.component.ts

@@ -18,7 +18,7 @@ export class PageMenuComponent {
   }
 
   ngOnInit() {
-
+    //console.log(this.section)
   }
 
 

projects/app/_modules/pages/sections/types/basic/document/document-section.component.ts

@@ -13,6 +13,7 @@ export class DocumentSectionComponent {
   }
 
   ngOnInit() {
+    // console.log(this.section);
   }
 
   get title(){

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);
   }
 
 

projects/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts

@@ -30,6 +30,7 @@ export class MemberSectionListComponent {
         }
       })
     })
+    console.log(fields['member-doc'].links.download);
     return fields
   }
 

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) {

projects/app/_modules/viget/edit-switch/edit-switch.component.html

@@ -1,6 +0,0 @@
-<div class="edit-field" *ngIf="editable">
-  <div class="edit-field-row switch-host" (click)="toggle()">
-      Режим редактирования
-      <switch [val]="editMode"></switch>
-  </div>
-</div>

projects/app/_modules/viget/edit-switch/edit-switch.component.ts

@@ -1,36 +0,0 @@
-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)
-  }
-
-
-}

projects/app/_modules/viget/viget.module.ts

@@ -6,7 +6,6 @@ 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({
@@ -20,15 +19,13 @@ import { EditSwitch } from "./edit-switch/edit-switch.component";
         DropDownComponent,
         SliderComponent,
         SwitchComponent,
-        EditSwitch
     ],
     exports: [
         IcoComponent,
         QRCodeComponent,
         DropDownComponent,
         SliderComponent,
-        SwitchComponent,
+        SwitchComponent
-        EditSwitch
     ]
 })
 export class VigetModule {

projects/app/_services/authentication.service.ts

@@ -35,6 +35,8 @@ export class AuthenticationService {
     return this.privileges?.mainCompanyMember;
   }
 
+
+
   signup(data: any): Observable<any> {
     return this.http.post(`${environment.apiUrl}/api/signup`, data);
   }
@@ -50,20 +52,24 @@ 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);
       });
     }
   }
 
+
   logout() {
     localStorage.removeItem('oauthToken');
     this.token.next(null);
     this.user.next(null);
   }
 
+
   forget(email: string): Observable<any> {
     return this.http.post(`${environment.apiUrl}/api/passwords/reset`, {email});
   }

projects/app/_services/pages.service.ts

@@ -13,7 +13,6 @@ export class PagesService {
 
   public pagesTree: BehaviorSubject<any>
   public editMode = new BehaviorSubject<boolean>(false);
-  public currentPage =  new BehaviorSubject<any>({data:[]})
 
   changedPages(){
     let include = ['children.children.children.children.children.children.children'];