From d699ca3f2871d3fbdc38564fc56d22b3aad49eda Mon Sep 17 00:00:00 2001
From: Boris Voropaev <boris1voropaev@gmail.com>
Date: Tue, 21 Nov 2023 15:58:10 +0300
Subject: [PATCH] root menu

---
 .../_modules/layout/header/header.component.ts   |  5 +++++
 .../left-content/left-content.component.ts       | 16 ----------------
 .../pages/menu/item/pages-menu-item.component.ts |  4 ++--
 .../_modules/pages/menu/pages-menu.component.ts  |  2 ++
 .../basic/images/images-section.component.scss   |  2 +-
 .../_modules/widjet/locale/locale.component.ts   |  3 ++-
 src/assets/css/_basics.scss                      |  2 +-
 src/assets/css/_pages-section.scss               |  8 +++++++-
 8 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/app/_modules/layout/header/header.component.ts b/src/app/_modules/layout/header/header.component.ts
index 2b713e1..b3e378f 100644
--- a/src/app/_modules/layout/header/header.component.ts
+++ b/src/app/_modules/layout/header/header.component.ts
@@ -14,6 +14,11 @@ export class HeaderComponent {
     public pagesService: PagesService
     ) {
   }
+  // ngOnInit(){
+  //   this.pagesService.root().subscribe(
+  //     resp=> this.pagesService.rootPage = resp
+  //   )
+  // }
 
   get rootPage() {
     return this.pagesService.rootPage;
diff --git a/src/app/_modules/layout/left-content/left-content.component.ts b/src/app/_modules/layout/left-content/left-content.component.ts
index 54b7b27..d338c95 100644
--- a/src/app/_modules/layout/left-content/left-content.component.ts
+++ b/src/app/_modules/layout/left-content/left-content.component.ts
@@ -1,6 +1,4 @@
 import {Component} from '@angular/core';
-import {Router} from "@angular/router";
-import {PagesService} from "@app/_services/pages.service";
 
 @Component({
   selector: 'left-content',
@@ -9,20 +7,6 @@ import {PagesService} from "@app/_services/pages.service";
 })
 export class LeftContentComponent {
 
-  constructor(
-    private router: Router,
-    public pagesService: PagesService
-    ) {
-  }
-
-  get rootPage() {
-    return this.pagesService.rootPage;
-  }
-
-  openMobileMenu(){
-    this.router.navigate([{outlets: {slider: 'pages-menu'}}], {skipLocationChange: true}).then();
-  }
-
 }
 
 
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 f980d17..aa9c02f 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
@@ -28,7 +28,7 @@ export class PagesMenuItemComponent {
   }
 
   get current(){
-    return this.item.link == this.pagesService.currentPage.link
+    return this.item.link == this.pagesService.currentPage?.link
   }
 
   get selected(){
@@ -36,7 +36,7 @@ export class PagesMenuItemComponent {
   }
 
   get parent(){
-    return !this.current && this.pagesService.currentPage.link.startsWith(this.item.link)
+    return !this.current && this.pagesService.currentPage?.link.startsWith(this.item.link)
   }
 
   get nav(){
diff --git a/src/app/_modules/pages/menu/pages-menu.component.ts b/src/app/_modules/pages/menu/pages-menu.component.ts
index f96d1cd..639abd5 100644
--- a/src/app/_modules/pages/menu/pages-menu.component.ts
+++ b/src/app/_modules/pages/menu/pages-menu.component.ts
@@ -27,6 +27,7 @@ export class PagesMenuComponent implements OnInit {
         this.pagesService.rootPageSubject
       ]).subscribe(
         resp=>{    
+          console.log(resp)
           let [currentPage, rootPage] = resp     
           if(currentPage){
             let menuTree = currentPage.parents.data.reduceRight(
@@ -39,6 +40,7 @@ export class PagesMenuComponent implements OnInit {
               }, currentPage);
             this.items = menuTree.children.data;
           }else{
+            console.log(rootPage)
             this.items = rootPage?.data[0].children.data
           }
         }     
diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss
index 14d628e..c1903cf 100644
--- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss
+++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss
@@ -71,7 +71,7 @@
 }
 
 .carousel {
-
+  width: 100%;
   display: flex;
   align-items: center;
   justify-content:center;
diff --git a/src/app/_modules/widjet/locale/locale.component.ts b/src/app/_modules/widjet/locale/locale.component.ts
index 3057c8c..b9ec9b1 100644
--- a/src/app/_modules/widjet/locale/locale.component.ts
+++ b/src/app/_modules/widjet/locale/locale.component.ts
@@ -17,8 +17,9 @@ export class LocaleComponent {
   ){}
 
   ngOnInit() {
-    this.pagesService.root().subscribe(res => {
+    this.pagesService.root({include:'children'}).subscribe(res => {
       this.locales = res.data;
+      this.pagesService.rootPage = res
     });
   }
 
diff --git a/src/assets/css/_basics.scss b/src/assets/css/_basics.scss
index d7a1904..f16489e 100644
--- a/src/assets/css/_basics.scss
+++ b/src/assets/css/_basics.scss
@@ -19,7 +19,7 @@
 // }
 
 .toggle-hide{
-  visibility: collapse;
+  display: none;
 }
 
 .inline{
diff --git a/src/assets/css/_pages-section.scss b/src/assets/css/_pages-section.scss
index 90eada3..d54b882 100644
--- a/src/assets/css/_pages-section.scss
+++ b/src/assets/css/_pages-section.scss
@@ -6,20 +6,26 @@ add-section{
         display: flex;
         gap:8px;
         align-items: center;
+        padding-bottom: 8px;
         drop-down{
           margin-top: 4px;
         }
+        
         &.active{
           a{
             color: var(--prime-act);
           }
         }
       }
+      .dropdown{
+        left:48px;
+        top:32px;
+      }
     }
 }
 
 
-.cards-section-items{
+cards-section-items{
     .items {
         display: flex;
         flex-direction: row;