From 8a4aa7ddb5e2dfde788a6bb477e2a1211d27d3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Tue, 2 Nov 2021 14:57:23 +0100
Subject: [PATCH] Move export to top menu and toggle menu responsive fix

---
 resources/sass/_layout.scss                   |  2 +-
 resources/views/layouts/app.blade.php         |  2 +-
 .../views/layouts/backend/navbar.blade.php    | 35 ++++++++++++-------
 .../views/layouts/backend/sidenav.blade.php   | 15 ++------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index 4b2e2f3..4de2c97 100644
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -6,7 +6,7 @@
 
 #app {
     & > .navbar {
-        height: $navBarHeight;
+        min-height: $navBarHeight;
     }
     #footer {
         height: $footerHeight;
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index c93ef72..73c92ab 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -7,7 +7,7 @@
     </head>
     <body>
     <div id="app">
-    @include('layouts.backend.navbar')
+        @include('layouts.backend.navbar')
         <div class="container-fluid">
             <div class="row">
                 @if(isset($modelsClasses))
diff --git a/resources/views/layouts/backend/navbar.blade.php b/resources/views/layouts/backend/navbar.blade.php
index fd8e991..29ef539 100644
--- a/resources/views/layouts/backend/navbar.blade.php
+++ b/resources/views/layouts/backend/navbar.blade.php
@@ -1,26 +1,37 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark sticky-top">
     <div class="container-fluid">
         <a class="navbar-brand" href="{{ route('home') }}">{{ config('app.name') }}</a>
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarScroll" aria-controls="navbarScroll" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
+            aria-controls="navbarNav" aria-expanded="false" aria-label="{{ __('Activer la navigation') }}">
             <span class="navbar-toggler-icon"></span>
         </button>
-        <div class="collapse navbar-collapse" id="navbarScroll">
-            <ul class="navbar-nav ms-auto my-2 my-lg-0 navbar-nav-scroll " style="--bs-scroll-height: 100px;">
+        <div class="collapse navbar-collapse" id="navbarNav">
+            <ul class="navbar-nav me-auto">
+                {{-- <li class="nav-item">Sample</li> --}}
+            </ul>
+            <ul class="navbar-nav ms-auto">
                 @auth()
                 <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" id="navbarDarkDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">{{
-                        __('Bonjour :firstname :lastname', [
-                            'firstname' => auth()->user()->firstname,
-                            'lastname' => auth()->user()->lastname
-                        ])
-                    }}</a>
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDarkDropdownExport" role="button"
+                        data-bs-toggle="dropdown"
+                        aria-expanded="false">{{ __('Exports') }}</a>
+                    <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDarkDropdownExport">
+                        <li><a class="nav-link" href="{{ route('customers.export') }}">{{ __('Exporter un fichier CSV (newsletter)') }}</a></li>
+                        <li><a class="nav-link" href="{{ route('questions.export') }}">{{ __('Exporter des questions') }}</a></li>
+                    </ul>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDarkDropdownMenuLink" role="button"
+                        data-bs-toggle="dropdown"
+                        aria-expanded="false">{{ __('Bonjour :firstname :lastname', [
+                        'firstname' => auth()->user()->firstname,
+                        'lastname' => auth()->user()->lastname,
+                    ]) }}</a>
                     <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDarkDropdownMenuLink">
                         <li>
                             <a class="dropdown-item" href="{{ route('logout') }}"
                                 onclick="event.preventDefault();
-                                document.getElementById('logout-form').submit();">{{
-                                    __('Déconnexion')
-                            }}</a>
+                                    document.getElementById('logout-form').submit();">{{ __('Déconnexion') }}</a>
                             <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
                                 @csrf
                             </form>
diff --git a/resources/views/layouts/backend/sidenav.blade.php b/resources/views/layouts/backend/sidenav.blade.php
index 235be7f..6100497 100644
--- a/resources/views/layouts/backend/sidenav.blade.php
+++ b/resources/views/layouts/backend/sidenav.blade.php
@@ -38,22 +38,11 @@
                 <li class="nav-item"><a class="nav-link" href="{{ route(sprintf('%s%s.create', $prefix ?? '', $crudModel->getTable())) }}">{{ __('Ajouter') }}</a></li>
                 @endcan
             </ul>
+            @if(!$loop->last)
             <hr>
+            @endif
             @endcan
             @endforeach
-            <h6 class="sidebar-heading px-3 mb-1 text-muted">
-                <span>{{ __('Export de segmentation') }}</span>
-            </h6>
-            <ul class="nav flex-column mb-2">
-                <li class="nav-item"><a class="nav-link" href="{{ route('questions.export') }}">{{ __('Exporter des questions') }}</a></li>
-            </ul>
-            <hr>
-            <h6 class="sidebar-heading px-3 mb-1 text-muted">
-                <span>{{ __('Export pour newsletter') }}</span>
-            </h6>
-            <ul class="nav flex-column mb-2">
-                <li class="nav-item"><a class="nav-link" href="{{ route('customers.export') }}">{{ __('Exporter un fichier CSV') }}</a></li>
-            </ul>
         </div>
     </div>
 </nav>