From 22c474aeae67e764971493224301d249c3188167 Mon Sep 17 00:00:00 2001
From: Boris Voropaev <boris1voropaev@gmail.com>
Date: Mon, 28 Aug 2023 18:05:53 +0300
Subject: [PATCH] small fix

---
 src/app/_modules/layout/footer/footer.component.html |  2 +-
 src/app/_modules/layout/header/header.component.html |  2 ++
 src/app/_modules/layout/header/header.component.scss |  4 ++++
 .../header/user-bar/header-user-bar.component.html   |  2 +-
 .../header/user-bar/header-user-bar.component.scss   |  2 ++
 .../header/user-bar/header-user-bar.component.ts     |  4 ++--
 src/app/_modules/pages/page/page.component.ts        |  2 ++
 .../pages/sections/add/add-section.component.html    |  2 +-
 .../pages/sections/add/add-section.component.scss    | 12 +++++++++---
 .../icons/{add_circle_24.svg => add_cirle_24.svg}    |  0
 10 files changed, 24 insertions(+), 8 deletions(-)
 rename src/assets/images/icons/{add_circle_24.svg => add_cirle_24.svg} (100%)

diff --git a/src/app/_modules/layout/footer/footer.component.html b/src/app/_modules/layout/footer/footer.component.html
index af71b53..191018b 100644
--- a/src/app/_modules/layout/footer/footer.component.html
+++ b/src/app/_modules/layout/footer/footer.component.html
@@ -46,7 +46,7 @@
       <div>
         <a href="#">Новости</a>
       </div>
-      <div>
+      <div *ngIf="!user">
         <a (click)="login()">Вход для зарегистрированных пользователей</a>
       </div>
     </div>
diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html
index 25d5b9e..4bd7a3c 100644
--- a/src/app/_modules/layout/header/header.component.html
+++ b/src/app/_modules/layout/header/header.component.html
@@ -17,6 +17,7 @@
       </div>
     </div>
   </div> -->
+  
   <div class="bottom" [ngClass]="{hidemobile:!showBottom,showmobile:showBottom}">
     <div class="logo">
     </div>
@@ -29,3 +30,4 @@
     </div>
   </div>
 </div>
+<header-user-bar *ngIf="user" [user]="user"></header-user-bar>
diff --git a/src/app/_modules/layout/header/header.component.scss b/src/app/_modules/layout/header/header.component.scss
index 399993a..d56a20a 100644
--- a/src/app/_modules/layout/header/header.component.scss
+++ b/src/app/_modules/layout/header/header.component.scss
@@ -118,6 +118,10 @@
       }
     }
   }
+  header-user-bar{
+    position: absolute;
+    right: 0;
+  }
 }
 
 
diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html
index 3009aef..412a4de 100644
--- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html
+++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html
@@ -1,4 +1,4 @@
-<div class="user" *ngIf="user">
+<div class="user">
   <div class="avatar">
     <img *ngIf="avatar" [src]="avatar.links?.thumb" />
     <span *ngIf="!avatar" class="initials">{{user.initials}}</span>
diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss
index 00d1657..27dadb8 100644
--- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss
+++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss
@@ -1,4 +1,6 @@
 .user {
+  width: 100px;
+  height: 100px;
   position: relative;
   .avatar {
     width: 40px;
diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts
index a465f7f..afd7266 100644
--- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts
+++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts
@@ -1,5 +1,5 @@
 import {Component, Input} from '@angular/core';
-import {AuthenticationService, ListsService} from "@app/_services";
+import {AuthenticationService} from "@app/_services";
 import {Router} from "@angular/router";
 
 @Component({
@@ -23,7 +23,7 @@ export class HeaderUserBarComponent {
   }
 
   ngOnInit() {
-
+    console.log(this.user)
   }
 
 
diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts
index 0abbcf1..e793d1f 100644
--- a/src/app/_modules/pages/page/page.component.ts
+++ b/src/app/_modules/pages/page/page.component.ts
@@ -15,6 +15,7 @@ export class PageComponent {
   private url: string;
   private inited = false;
   routeSubscription?: Subscription;
+  subscription: Subscription;
 
   constructor(private router: Router, private pagesService: PagesService, private listsService: ListsService) {
     this.routeSubscription = this.router.events.subscribe(event => {
@@ -23,6 +24,7 @@ export class PageComponent {
   }
 
 
+
   get permissions() {
     return this.page?.permissions;
   }
diff --git a/src/app/_modules/pages/sections/add/add-section.component.html b/src/app/_modules/pages/sections/add/add-section.component.html
index d15eb2c..4013871 100644
--- a/src/app/_modules/pages/sections/add/add-section.component.html
+++ b/src/app/_modules/pages/sections/add/add-section.component.html
@@ -1,6 +1,6 @@
 <div class="add">
   <div class="toggle" (click)="toggleDD()">Добавить элемент</div>
-  <div class="dropdown" [class.active]="ddVisible" (mouseleave)="hideDD()">
+  <div class="dropdown active" [class.active]="ddVisible" (mouseleave)="hideDD()">
     <div class="menu">
       <div *ngFor="let type of types" class="type">
         <div class="row" *ngIf="type?.children?.data?.length > 0; else addItem" (click)="submenu(type)">
diff --git a/src/app/_modules/pages/sections/add/add-section.component.scss b/src/app/_modules/pages/sections/add/add-section.component.scss
index a8f1197..4ca1caf 100644
--- a/src/app/_modules/pages/sections/add/add-section.component.scss
+++ b/src/app/_modules/pages/sections/add/add-section.component.scss
@@ -61,10 +61,16 @@
         }
         &:last-child {
           border-radius: 0 0 12px 12px;
+          .row {
+            border-bottom: none;
+          }
           a, span {
             border-bottom: none;
           }
         }
+        >&:hover {
+          background-color: #f7f7f7;
+        }
         .row {
           display: flex;
           flex-direction: row;
@@ -74,11 +80,11 @@
           column-gap: 12px;
           cursor: pointer;
           color: #2D2D2D;
+          background: transparent;
           
           
-          &:hover {
-            background-color: #f7f7f7;
-          }
+          
+
         }
 
         .sub-row {
diff --git a/src/assets/images/icons/add_circle_24.svg b/src/assets/images/icons/add_cirle_24.svg
similarity index 100%
rename from src/assets/images/icons/add_circle_24.svg
rename to src/assets/images/icons/add_cirle_24.svg