From 8e8f2356264940e8af9fc507bc272436bf6a49e0 Mon Sep 17 00:00:00 2001
From: Boris Voropaev <boris1voropaev@gmail.com>
Date: Mon, 11 Sep 2023 16:35:44 +0300
Subject: [PATCH] User Bar

---
 .../layout/header/header.component.html       |  9 ++---
 .../layout/header/header.component.scss       | 38 ++++++++-----------
 .../user-bar/header-user-bar.component.html   |  6 +--
 .../user-bar/header-user-bar.component.scss   |  7 +++-
 .../user-bar/header-user-bar.component.ts     | 11 +++---
 .../pages/tree/pages-tree.component.scss      |  2 +-
 6 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html
index 23eaeb6..1f5f409 100644
--- a/src/app/_modules/layout/header/header.component.html
+++ b/src/app/_modules/layout/header/header.component.html
@@ -4,18 +4,15 @@
     <div class="main-menu-btn" (click)="showBottom=true">
       <button class=" clear"></button>
     </div>
-    <a href="/glavnaia/">
-      <div class="logo">
-        <header-user-bar *ngIf="user" [user]="user"></header-user-bar>
-      </div>
-    </a>    
+    <a href="/glavnaia/" class="logo hidemobile"></a>    
     <div class="grid-menu" >
       <button class="close" (click)="showBottom=false"></button>
       <pages-menu [items]="menuItems" (onSelected)="itemSelect($event)"></pages-menu>
       <a class="ais">АИС СЦ ВНИИГАЗ</a>
     </div>
     <div class="right" style="position: relative;">
-      <a class="btn" href="https://ais.vniigaz-cert.ru/" target="_blank">АИС СЦ ВНИИГАЗ</a>
+      <a href="/glavnaia/" class="logo showmobile"></a>
+      <a class="btn hidemobile" href="https://ais.vniigaz-cert.ru/" target="_blank">АИС СЦ ВНИИГАЗ</a>
       <header-user-bar *ngIf="user" [user]="user"></header-user-bar>
     </div>
   </div>
diff --git a/src/app/_modules/layout/header/header.component.scss b/src/app/_modules/layout/header/header.component.scss
index abd3ef4..35134d1 100644
--- a/src/app/_modules/layout/header/header.component.scss
+++ b/src/app/_modules/layout/header/header.component.scss
@@ -1,11 +1,11 @@
 @media screen and (max-width: 1264px){
 
 .hidemobile{
-  display: none;
+  display: none !important;
 }
 .header{
   flex-grow: 1;
-  padding: 12px 24px;
+  padding: 0px 24px;
   background-color: #FFF;
   min-height: 100%;
 
@@ -22,19 +22,14 @@
         background: url('~src/assets/images/icons/burger_blue_40dp.svg') no-repeat center;;  
       }
     }
-    .logo{
-      width: 114px;
+    .logo { 
+      display: inline-flex;
+      width:114px; 
       height: 80px;
-      background: url('~src/assets/images/logo_vniigaz_1163x816.svg') no-repeat center;;
+      margin: 12px 24px 12px 40px;
+      background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg');
       background-size: contain;
-      header-user-bar{
-        position: absolute;
-        top:144px;
-        right: 24px;
-        *{
-          display: none;
-        }
-      }
+      flex-shrink: 0;
     }
     .fog{
       flex-grow: 1;
@@ -91,7 +86,7 @@
   
   }
   .right{
-    display: none;    
+   
   }
   
 }
@@ -144,9 +139,6 @@
         background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg');
         background-size: contain;
         flex-shrink: 0;
-        header-user-bar{
-          display: none;
-        }
       }
         .grid-menu{
           display: flex;
@@ -183,9 +175,11 @@
       }
     }
   }
-  header-user-bar{
-    position: absolute;
-    right: 0;
-    bottom: -96px;
-  }
+
+}
+
+header-user-bar{
+  position: absolute;
+  right: 0;
+  bottom: -96px;
 }
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 1be297f..0ace074 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,10 +1,10 @@
-<div class="user">
+<div class="user" (click)="ddHidden=!ddHidden"  (mouseover)="ddHidden=false" (mouseleave)="ddHidden=true" >
   <div class="avatar">
     <img *ngIf="avatar" [src]="avatar.links?.thumb" />
     <span *ngIf="!avatar" class="initials">{{user.initials}}</span>
   </div>
-  <div class="dropdown" [class.hidden]="ddHidden" (mouseleave)="close()">
-    <ul>
+  <div class="dropdown" [class.hidden]="ddHidden" (click)="close()">
+    <ul >
       <li (click)="link('profile')">Личный кабинет</li>
       <!-- <li *ngIf="isJournalVisible" (click)="link('applications')">Журнал заявок</li> -->
       <li *ngIf="authService.isAdmin" (click)="link('administrate')">Структура сайта</li>
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 4812d19..2fb9adb 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,7 @@
 .user {
+  .ddHidden{
+    display: none;
+  }
   position: relative;
   display: flex;
   padding: 11px;
@@ -47,7 +50,7 @@
     display: none;
   }
 
-  &:hover {
+
     .dropdown {
       display: block;
       width: 250px;
@@ -92,7 +95,7 @@
 
     }
 
-  }
+
 }
 @media screen and (max-width: 1264px) {
   .user {
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 1f85c5a..30aad37 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
@@ -10,7 +10,7 @@ import {Router} from "@angular/router";
 export class HeaderUserBarComponent {
   @Input() user: any;
   public menuItems = <any>[];
-  public ddHidden = false;
+  public ddHidden = true;
 
   constructor(public authService: AuthenticationService, private router: Router) {
   }
@@ -28,10 +28,12 @@ export class HeaderUserBarComponent {
 
 
   close() {
-    this.ddHidden = true;
-    setTimeout(() => {this.ddHidden = false}, 10);
+    setTimeout(() => {
+      this.ddHidden = true;
+    }, 10);    
   }
 
+
   logout() {
     if (confirm('Вы деествительно хотите выйти из системы?')) {
       this.authService.logout();
@@ -41,8 +43,7 @@ export class HeaderUserBarComponent {
   }
 
   link(link: string) {
-    console.log(link)
-    this.ddHidden = true;
+    this.close()
     this.router.navigate([link]).then();
   }
 }
diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss
index b4c4c71..044ae78 100644
--- a/src/app/_modules/pages/tree/pages-tree.component.scss
+++ b/src/app/_modules/pages/tree/pages-tree.component.scss
@@ -146,7 +146,7 @@
 }
 
 
-@media screen and (max-width: 767px) {
+@media screen and (max-width: 1264px) {
   .item {
     .bar {
       .mid {