From 7b4d8f7fb002499c2266544a19501691ccd1983c Mon Sep 17 00:00:00 2001
From: chris <christiansteinle@arcor.de>
Date: Mon, 10 Feb 2025 14:51:50 +0100
Subject: [PATCH] Restructure navigation.

---
 lang/de/configuration.php                    |   1 +
 lang/de/incoming.php                         |   1 +
 lang/de/invoice.php                          |   1 +
 resources/views/layouts/navigation.blade.php | 135 ++++++++++++-------
 4 files changed, 86 insertions(+), 52 deletions(-)

diff --git a/lang/de/configuration.php b/lang/de/configuration.php
index 3e082c3..2b97548 100644
--- a/lang/de/configuration.php
+++ b/lang/de/configuration.php
@@ -63,6 +63,7 @@ return [
     'Tooltip Mail username' => 'Meist die Email Adresse.',
     'Tooltip Mail password' => 'Das Passwort um Deine Emails abzurufen.',
     'Tooltip Bcc copy' => 'Die Email Übertragung per smtp lässt eine Speicherung der Nachricht in ihrem Postfach nicht zu.<br/>Falls Du eine Kopie der Nachricht in Deinem Postfach erhalten willst, kannst Du die Nachricht als Bcc Empfänger erhalten.',
+    'Common options' => 'Allgemeine Einstellungen',
 
 
 ];
diff --git a/lang/de/incoming.php b/lang/de/incoming.php
index 51943c0..c3049bd 100644
--- a/lang/de/incoming.php
+++ b/lang/de/incoming.php
@@ -25,5 +25,6 @@ return [
     'Incoming data' => 'Daten der Eingangsrechnung',
     'Select supplier' => 'Lieferant wählen',
     'Create incoming' => 'Neue Eingangsrechnung anlegen',
+    'Incoming invoices' => 'Eingangsrechnungen',
 
 ];
diff --git a/lang/de/invoice.php b/lang/de/invoice.php
index 9327c7a..521263b 100644
--- a/lang/de/invoice.php
+++ b/lang/de/invoice.php
@@ -14,6 +14,7 @@ return [
 
     'Invoices' => 'Rechnungen',
     'Invoice' => 'Rechnung',
+    'Outgoing' => 'Ausgang',
     'Add new invoice' => 'Neue Rechnung erstellen',
     'Add new invoice by clicking add' => 'Durch Klick auf "Anlegen" neue Rechnung erstellen',
     'Existing invoices' => 'Bestehende Rechnungen',
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php
index a333a2e..b6eefbc 100644
--- a/resources/views/layouts/navigation.blade.php
+++ b/resources/views/layouts/navigation.blade.php
@@ -12,55 +12,91 @@
 
                 <!-- Navigation Links -->
                 <div class="hidden space-x-8 sm:-my-px sm:ms-10 sm:flex">
-                    <x-nav-link :href="route('customer.index')"
-                                :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), 'customer.') || \Illuminate\Support\Str::startsWith(request()->route()->getName(), 'address.')">
-                        {{ __('customer.Customers') }}
-                    </x-nav-link>
-                    <x-nav-link :href="route('project.index')"
-                                :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), 'project.')">
-                        {{ __('project.Projects') }}
-                    </x-nav-link>
-                    <x-nav-link :href="route('invoice.index')"
-                                :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), 'invoice.')">
-                        {{ __('invoice.Invoices') }}
-                    </x-nav-link>
-                    <x-nav-link :href="route('payment.index')"
-                                :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), 'payment.')">
-                        {{ __('invoice.Payments') }}
-                    </x-nav-link>
-                    <x-nav-link :href="route('taxrate.index')"
-                                :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), 'taxrate.')">
-                        {{ __('configuration.Taxrates') }}
-                    </x-nav-link>
                     <div class="hidden sm:flex sm:items-center sm:ms-6">
-                        <x-dropdown align="right" width="48">
-                        <x-slot name="trigger">
-                            <x-nav-link href=""
-                                        :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), ['incoming.', 'supplier.'])"
-                            @click.prevent="">
-                                {{ __('incoming.Incoming') }}
-                                <div class="ms-1">
-                                    <x-down-icon/>
-                                </div>
-                            </x-nav-link>
-                        </x-slot>
-
-                        <x-slot name="content">
-                            <x-dropdown-link :href="route('incoming.index')">
-                                {{ __('incoming.Incoming') }}
-                            </x-dropdown-link>
-                            <x-dropdown-link :href="route('supplier.index')">
-                                {{ __('supplier.Suppliers') }}
-                            </x-dropdown-link>
-                       </x-slot>
-                    </x-dropdown>
+                        <x-nav-link :href="route('customer.index')"
+                                    :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), ['customer.', 'address.'])">
+                            {{ __('customer.Customers') }}
+                        </x-nav-link>
                     </div>
-                    <x-nav-link :href="route('option.index')"
-                                :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), 'option.')">
-                        {{ __('configuration.Options') }}
-                    </x-nav-link>
-                </div>
+                    <div class="hidden sm:flex sm:items-center sm:ms-6">
+                        <x-nav-link :href="route('project.index')"
+                                    :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), 'project.')">
+                            {{ __('project.Projects') }}
+                        </x-nav-link>
+                    </div>
+                    <!-- Invoice dropdown -->
+                    <div class="hidden sm:flex sm:items-center sm:ms-6">
+                        <x-dropdown align="left" width="48">
+                            <x-slot name="trigger">
+                                <x-nav-link href=""
+                                            :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), ['invoice.', 'payment.'])"
+                                            @click.prevent="">
+                                    {{ __('invoice.Outgoing') }}
+                                    <div class="ms-1">
+                                        <x-down-icon/>
+                                    </div>
+                                </x-nav-link>
+                            </x-slot>
 
+                            <x-slot name="content">
+                                <x-dropdown-link :href="route('invoice.index')">
+                                    {{ __('invoice.Invoices') }}
+                                </x-dropdown-link>
+                                <x-dropdown-link :href="route('payment.index')">
+                                    {{ __('invoice.Payments') }}
+                                </x-dropdown-link>
+                            </x-slot>
+                        </x-dropdown>
+                    </div>
+                    <!-- Incoming dropdown -->
+                    <div class="hidden sm:flex sm:items-center sm:ms-6">
+                        <x-dropdown align="left" width="48">
+                            <x-slot name="trigger">
+                                <x-nav-link href=""
+                                            :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), ['incoming.', 'supplier.'])"
+                                            @click.prevent="">
+                                    {{ __('incoming.Incoming') }}
+                                    <div class="ms-1">
+                                        <x-down-icon/>
+                                    </div>
+                                </x-nav-link>
+                            </x-slot>
+
+                            <x-slot name="content">
+                                <x-dropdown-link :href="route('incoming.index')">
+                                    {{ __('incoming.Incoming invoices') }}
+                                </x-dropdown-link>
+                                <x-dropdown-link :href="route('supplier.index')">
+                                    {{ __('supplier.Suppliers') }}
+                                </x-dropdown-link>
+                            </x-slot>
+                        </x-dropdown>
+                    </div>
+                    <!-- Configuration dropdown -->
+                    <div class="hidden sm:flex sm:items-center sm:ms-6">
+                        <x-dropdown align="left" width="48">
+                            <x-slot name="trigger">
+                                <x-nav-link href=""
+                                            :active="\Illuminate\Support\Str::startsWith(request()->route()->getName(), ['option.', 'taxrate.'])"
+                                            @click.prevent="">
+                                    {{ __('configuration.Options') }}
+                                    <div class="ms-1">
+                                        <x-down-icon/>
+                                    </div>
+                                </x-nav-link>
+                            </x-slot>
+
+                            <x-slot name="content">
+                                <x-dropdown-link :href="route('option.index')">
+                                    {{ __('configuration.Common options') }}
+                                </x-dropdown-link>
+                                <x-dropdown-link :href="route('taxrate.index')">
+                                    {{ __('configuration.Taxrates') }}
+                                </x-dropdown-link>
+                            </x-slot>
+                        </x-dropdown>
+                    </div>
+                </div>
             </div>
 
             <!-- Settings Dropdown -->
@@ -72,12 +108,7 @@
                             <div>{{ Auth::user()->name }}</div>
 
                             <div class="ms-1">
-                                <svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg"
-                                     viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd"
-                                          d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
-                                          clip-rule="evenodd"/>
-                                </svg>
+                                <x-down-icon/>
                             </div>
                         </button>
                     </x-slot>