From c1c50c74c14075f661beab2bbe86d942a0e25aa2 Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bra.patrik@gmail.com>
Date: Thu, 2 Mar 2023 00:01:07 +0100
Subject: [PATCH] refactoring navigation bar #587

---
 src/frontend/app/ui/frame/frame.component.html     | 13 +------------
 src/frontend/app/ui/frame/frame.component.ts       |  2 --
 src/frontend/app/ui/gallery/gallery.component.html |  8 +++++++-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/frontend/app/ui/frame/frame.component.html b/src/frontend/app/ui/frame/frame.component.html
index 834818c1..f7d139f9 100644
--- a/src/frontend/app/ui/frame/frame.component.html
+++ b/src/frontend/app/ui/frame/frame.component.html
@@ -7,7 +7,7 @@
       <strong class="d-none d-lg-inline-block">{{title}}</strong>
     </a>
     <div class="collapse navbar-collapse text-center" id="navbarCollapse" [collapse]="collapsed">
-      <ul class="navbar-nav mb-0 me-2 text-lg-start d-none d-md-flex">
+      <ul class="navbar-nav mb-0 me-4 text-lg-start d-none d-md-flex">
         <ng-container *ngFor="let link of navbarLinks">
           <li class="nav-item" *ngIf="link.type === NavigationLinkTypes.albums && isAlbumsAvailable()">
             <a class="nav-link" [routerLink]="['/albums']" [class.active]="isLinkActive('/albums')" i18n>Albums</a>
@@ -33,23 +33,12 @@
         <ul class="navbar-nav">
           <li class="flex-grow-1"></li>
           <ng-content select="[navbar]"></ng-content>
-          <li class="nav-item w-100" *ngIf="showSearch">
-            <app-gallery-search></app-gallery-search>
-          </li>
-          <li class="nav-item" *ngIf="showShare">
-            <app-gallery-share></app-gallery-share>
-          </li>
-          <li class="nav-item divider-vertical  d-xl-block d-none"
-              *ngIf="authenticationRequired && user.value && showShare">
-          </li>
           <ng-container *ngIf="authenticationRequired && user.value">
             <li class="nav-item me-2 ms-2 navbar-text d-xl-block d-none">
              <span style="white-space: nowrap;">
                 <span class="oi oi-person"></span> {{user.value.name}}
               </span>
             </li>
-            <li class="nav-item divider-vertical  d-xl-block d-none">
-            </li>
           </ng-container>
           <li class="nav-item d-xl-block d-none">
             <span>
diff --git a/src/frontend/app/ui/frame/frame.component.ts b/src/frontend/app/ui/frame/frame.component.ts
index 88477d90..8bc96217 100644
--- a/src/frontend/app/ui/frame/frame.component.ts
+++ b/src/frontend/app/ui/frame/frame.component.ts
@@ -18,8 +18,6 @@ import {Utils} from '../../../../common/Utils';
   encapsulation: ViewEncapsulation.Emulated,
 })
 export class FrameComponent {
-  @Input() showSearch = false;
-  @Input() showShare = false;
   public readonly user: BehaviorSubject<UserDTO>;
   public readonly authenticationRequired = Config.Users.authenticationRequired;
   public readonly title = Config.Server.applicationTitle;
diff --git a/src/frontend/app/ui/gallery/gallery.component.html b/src/frontend/app/ui/gallery/gallery.component.html
index 37e572c9..7c9312d4 100644
--- a/src/frontend/app/ui/gallery/gallery.component.html
+++ b/src/frontend/app/ui/gallery/gallery.component.html
@@ -1,5 +1,5 @@
 <app-gallery-lightbox #lightbox></app-gallery-lightbox>
-<app-frame [showSearch]="showSearchBar" [showShare]="showShare">
+<app-frame>
 
   <ng-container navbar>
     <li class="nav-item navbar-text"  *ngIf="countDown">
@@ -12,6 +12,12 @@
         :{{("0" + countDown.second).slice(-2)}}
       </span>
     </li>
+    <li  class="nav-item  w-100" *ngIf="showSearchBar">
+      <app-gallery-search></app-gallery-search>
+    </li>
+    <li class="nav-item"  *ngIf="showShare">
+      <app-gallery-share></app-gallery-share>
+    </li>
   </ng-container>
 
   <ng-container navbar-menu>