From 1abbd7e96d043f37d7d6d842122af15672b09043 Mon Sep 17 00:00:00 2001
From: "m.epshtein" <m.epshtein@micord.ru>
Date: Fri, 14 Jun 2024 09:27:43 +0300
Subject: [PATCH] logout

---
 frontend/src/resources/css/components-lkrp.css   | 16 ++++++++++++++--
 frontend/src/resources/css/inbox-lkrp.css        | 11 +++++++++--
 frontend/src/resources/img/svg/pin.svg           | 10 ++++++++++
 .../template/app/component/app_header.html       |  1 +
 .../template/app/component/log_out.html          |  7 +++----
 5 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/resources/img/svg/pin.svg

diff --git a/frontend/src/resources/css/components-lkrp.css b/frontend/src/resources/css/components-lkrp.css
index f2c06a74..4bc45290 100644
--- a/frontend/src/resources/css/components-lkrp.css
+++ b/frontend/src/resources/css/components-lkrp.css
@@ -20,8 +20,15 @@
     padding: 14px 40px;
     border: 0;
     border-radius: 4px;
-    background: var(--color-primary);
-    box-shadow: none;  
+    background: var(--color-link);
+    box-shadow: none;
+
+	&:not(:disabled):not(.disabled):hover,
+	&:not(:disabled):not(.disabled):active,
+	&:not(:disabled):not(.disabled):focus {
+	    color: var(--white);
+	    background-color: var(--color-link-hover);
+	}
 }
 
 .webbpm.ervu_lkrp_ul .fieldset {
@@ -39,4 +46,9 @@
 	    	padding: 0;
 		}
     }
+    .link {
+    	font-size: var(--size-text-secondary);
+    	padding-left: 20px;
+    	background: url(../img/svg/pin.svg);
+    }
 }
diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css
index 8d43f09f..36a5e092 100644
--- a/frontend/src/resources/css/inbox-lkrp.css
+++ b/frontend/src/resources/css/inbox-lkrp.css
@@ -31,8 +31,9 @@ body {
 
 .webbpm.ervu_lkrp_ul {
     --color-text-primary: #1d1e21;
+    --color-link: #c64e1b;
+    --color-link-hover: #fa773f;
     --color-bg-main: #223d36;
-    --color-primary: #c64e1b;
     --bg-light: #fafafa;
     --border-light: #d2d2d2;
 
@@ -56,11 +57,17 @@ body {
             width: 24px;
             height: 24px;
             background: url(../img/svg/logo.svg) no-repeat 0 50%;
-        }        
+        .main-page {
+            font-family: 'InterSB';
+            margin-left: calc(32px + 24px);
+        }             
     }
     .header-menu {
         margin-right: 75px;
 
+        .logout.show {
+            max-width: max-content;
+        }
         .user-info {
             flex-direction: row;
             align-items: center;
diff --git a/frontend/src/resources/img/svg/pin.svg b/frontend/src/resources/img/svg/pin.svg
new file mode 100644
index 00000000..4ae67ca6
--- /dev/null
+++ b/frontend/src/resources/img/svg/pin.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_260_4922)">
+<path d="M15.5469 6.42773C15.375 6.59961 15.2083 6.75586 15.0469 6.89648C14.8854 7.03711 14.7135 7.15951 14.5312 7.26367C14.349 7.36784 14.1589 7.44336 13.9609 7.49023C13.763 7.53711 13.5312 7.56576 13.2656 7.57617C13.0885 7.57617 12.9193 7.56055 12.7578 7.5293L9.79688 10.4902C9.86458 10.6882 9.91406 10.8913 9.94531 11.0996C9.97656 11.3079 9.99219 11.5163 9.99219 11.7246C9.99219 12.0632 9.95833 12.3704 9.89062 12.6465C9.82292 12.9225 9.72656 13.1829 9.60156 13.4277C9.47656 13.6725 9.32031 13.9043 9.13281 14.123C8.94531 14.3418 8.73958 14.5684 8.51562 14.8027L5.5 11.7871L1.0625 16.2324L0 16.584L0.351562 15.5215L4.79688 11.084L1.78125 8.06836C2.01042 7.83919 2.23438 7.63346 2.45312 7.45117C2.67188 7.26888 2.90365 7.11523 3.14844 6.99023C3.39323 6.86523 3.65365 6.76628 3.92969 6.69336C4.20573 6.62044 4.51562 6.58659 4.85938 6.5918C5.06771 6.5918 5.27604 6.60742 5.48438 6.63867C5.69271 6.66992 5.89583 6.7194 6.09375 6.78711L9.05469 3.82617C9.02344 3.66471 9.00781 3.49544 9.00781 3.31836C9.00781 3.06315 9.03385 2.83398 9.08594 2.63086C9.13802 2.42773 9.21615 2.23503 9.32031 2.05273C9.42448 1.87044 9.54427 1.70117 9.67969 1.54492C9.8151 1.38867 9.97396 1.2194 10.1562 1.03711L15.5469 6.42773Z" fill="#ACACAC"/>
+</g>
+<defs>
+<clipPath id="clip0_260_4922">
+<rect width="16" height="16" fill="white" transform="translate(0 0.583984)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/frontend/src/resources/template/app/component/app_header.html b/frontend/src/resources/template/app/component/app_header.html
index 4270787f..4a109d49 100644
--- a/frontend/src/resources/template/app/component/app_header.html
+++ b/frontend/src/resources/template/app/component/app_header.html
@@ -1,6 +1,7 @@
 <nav class="header" *ngIf="currentSession | async as session" id="webbpm-header">
     <div class="header-logo">
         <div class="logo"><a routerLink="/"></a></div>
+        <div class="main-page"><a routerLink="/">Главная</a></div>        
     </div>
     <div class="header-menu">
 <!--        
diff --git a/frontend/src/resources/template/app/component/log_out.html b/frontend/src/resources/template/app/component/log_out.html
index 5f1ee17f..ac02b6d1 100644
--- a/frontend/src/resources/template/app/component/log_out.html
+++ b/frontend/src/resources/template/app/component/log_out.html
@@ -1,11 +1,10 @@
-
 <button class="user-info" ngbDropdownToggle *ngIf="currentSession | async as session">{{session.fullUserName}}</button>
 <div ngbDropdownMenu *ngIf="currentSession | async as session">
 <!--	
 	<div class="user-info">
-	    <div class="user-login">{{session.username}}</div>
-		<div class="user-department">{{getOrgUnitName()}}</div>
+	    <div class="user-login">{{session.username}}</div>		
 	</div>
 -->	
-    <button ngbDropdownItem *ngIf="isLogoutButtonVisible()" (click)="logout()">Выход</button>
+	<div class="user-department">{{getOrgUnitName()}}</div>
+    <button ngbDropdownItem *ngIf="isLogoutButtonVisible()" (click)="logout()">Выйти</button>
 </div>
\ No newline at end of file