From ff737ae05efe9f79f38af4dd109747eb92fd3fd2 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 5 Aug 2023 06:34:28 +0200
Subject: [PATCH] Clean up views, add top bar

---
 resources/views/v2/layout/v2.blade.php        |  27 +----
 .../views/v2/partials/layout/footer.blade.php |   2 +-
 .../views/v2/partials/layout/head.blade.php   |  13 ---
 .../v2/partials/layout/scripts.blade.php      |  15 +--
 .../v2/partials/layout/sidebar.blade.php      |  24 ----
 .../views/v2/partials/layout/topbar.blade.php | 106 ++++++++++++++++++
 6 files changed, 109 insertions(+), 78 deletions(-)
 create mode 100644 resources/views/v2/partials/layout/topbar.blade.php

diff --git a/resources/views/v2/layout/v2.blade.php b/resources/views/v2/layout/v2.blade.php
index 4847625ba1..a69f18fc1b 100644
--- a/resources/views/v2/layout/v2.blade.php
+++ b/resources/views/v2/layout/v2.blade.php
@@ -72,32 +72,7 @@
                 </li>
                 <!-- end date range drop down -->
                 <!-- user menu -->
-
-                <!--begin::Notifications Dropdown Menu-->
-                <li class="nav-item dropdown">
-                    <a class="nav-link" data-bs-toggle="dropdown" href="#">
-                        <i class="fa-solid fa-user"></i>
-                    </a>
-                    <div class="dropdown-menu dropdown-menu-lg dropdown-menu-end">
-                        <span class="dropdown-item dropdown-header">{{ auth()->user()->email }}</span>
-                        <div class="dropdown-divider"></div>
-                        <a href="{{ route('profile.index') }}" class="dropdown-item">
-                            <em class="fa-regular fa-user me-2"></em>
-                            {{ __('firefly.profile') }}
-                        </a>
-                        <div class="dropdown-divider"></div>
-                        <a href="{{ route('preferences.index') }}" class="dropdown-item">
-                            <i class="fa-solid fa-user-gear me-2"></i>
-                            {{ __('firefly.preferences') }}
-                        </a>
-                        <div class="dropdown-divider"></div>
-                        <a href="#" class="dropdown-item">
-                            <i class="fa-solid fa-money-bill-transfer me-2"></i>
-                            TODO {{ __('firefly.administrations_index_menu') }}
-                        </a>
-                    </div>
-                </li>
-                <!-- end user menu -->
+                @include('partials.layout.topbar')
             </ul>
             <!--end::End Navbar Links-->
         </div>
diff --git a/resources/views/v2/partials/layout/footer.blade.php b/resources/views/v2/partials/layout/footer.blade.php
index 3fcff51069..f152aa21f2 100644
--- a/resources/views/v2/partials/layout/footer.blade.php
+++ b/resources/views/v2/partials/layout/footer.blade.php
@@ -1,7 +1,7 @@
 <footer class="app-footer">
     <!--begin::To the end-->
     <div class="float-end d-none d-sm-inline">
-        v<a href="{{ route('debug') }}">{{ $FF_VERSION }}</a>
+        <a href="{{ route('debug') }}">v{{ $FF_VERSION }}</a>
     </div>
     <!--end::To the end-->
     <!--begin::Copyright-->
diff --git a/resources/views/v2/partials/layout/head.blade.php b/resources/views/v2/partials/layout/head.blade.php
index 70afbfa2d2..60bb75f945 100644
--- a/resources/views/v2/partials/layout/head.blade.php
+++ b/resources/views/v2/partials/layout/head.blade.php
@@ -19,7 +19,6 @@
             'use strict'
             // todo store just happens to store in localStorage but if not, this would break.
             const getStoredTheme = () => JSON.parse(localStorage.getItem('darkMode'))
-            const setStoredTheme = theme => localStorage.setItem('darkMode', theme)
 
             const getPreferredTheme = () => {
                 const storedTheme = getStoredTheme()
@@ -71,18 +70,6 @@
     <link href="v2/css/fonts.css" rel="stylesheet">
     <!--end::Fonts-->
 
-    <!--begin::Third Party Plugin(OverlayScrollbars)-->
-    {{--
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/overlayscrollbars@2.1.0/styles/overlayscrollbars.min.css"
-          integrity="sha256-LWLZPJ7X1jJLI5OG5695qDemW1qQ7lNdbTfQ64ylbUY=" crossorigin="anonymous">
-    --}}
-    <!--end::Third Party Plugin(OverlayScrollbars)-->
-    <!--begin::Third Party Plugin(Bootstrap Icons)-->
-    {{--
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.min.css"
-          integrity="sha256-BicZsQAhkGHIoR//IB2amPN5SrRb3fHB8tFsnqRAwnk=" crossorigin="anonymous">
-    --}}
-    <!--end::Third Party Plugin(Bootstrap Icons)-->
     <!--begin::Required Plugin(AdminLTE)-->
     <link rel="stylesheet" href="v2/css/adminlte.css">
     <!--end::Required Plugin(AdminLTE)-->
diff --git a/resources/views/v2/partials/layout/scripts.blade.php b/resources/views/v2/partials/layout/scripts.blade.php
index 561919f75d..71141793c3 100644
--- a/resources/views/v2/partials/layout/scripts.blade.php
+++ b/resources/views/v2/partials/layout/scripts.blade.php
@@ -1,16 +1,3 @@
-<!--begin::Required Plugin(popperjs for Bootstrap 5)-->
-{{--
-<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.7/dist/umd/popper.min.js"
-        integrity="sha384-zYPOMqeu1DAVkHiLqWBUTcbYfZ8osu1Nd6Z89ify25QV9guujx43ITvfi12/QExE"
-        crossorigin="anonymous"></script>
---}}
-<!--end::Required Plugin(popperjs for Bootstrap 5)-->
-<!--begin::Required Plugin(Bootstrap 5)-->
-{{--
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.min.js"
-        integrity="sha384-Y4oOpwW3duJdCWv5ly8SCFYWqFDsfob/3GkgExXKV4idmbt98QcxXYs9UoXAB7BZ"
-        crossorigin="anonymous"></script>
---}}
-<!--end::Required Plugin(Bootstrap 5)--><!--begin::Required Plugin(AdminLTE)-->
+<!--begin::Required Plugin(AdminLTE)-->
 <script src="v2/js/adminlte.js"></script>
 <!--end::Required Plugin(AdminLTE)-->
diff --git a/resources/views/v2/partials/layout/sidebar.blade.php b/resources/views/v2/partials/layout/sidebar.blade.php
index 0fb4e00176..987bcf266e 100644
--- a/resources/views/v2/partials/layout/sidebar.blade.php
+++ b/resources/views/v2/partials/layout/sidebar.blade.php
@@ -192,30 +192,6 @@
                     </a>
                 </li>
 
-                <li class="nav-item">
-                    <a href="#" class="nav-link">
-                        <i class="nav-icon fa-solid fa-sliders"></i>
-                        <p>
-                            {{ __('firefly.options') }}
-                            <i class="nav-arrow fa-solid fa-chevron-right"></i>
-                        </p>
-                    </a>
-                    <ul class="nav nav-treeview">
-                        <li class="nav-item">
-                            <a href="{{ route('currencies.index') }}" class="nav-link">
-                                <i class="nav-icon fa-solid fa-euro-sign"></i>
-                                <p>{{ __('firefly.currencies') }}</p>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="{{ route('admin.index') }}" class="nav-link">
-                                <i class="nav-icon bi bi-circle"></i>
-                                <p>{{ __('firefly.system_settings') }}</p>
-                            </a>
-                        </li>
-                    </ul>
-                </li>
-
                 <li class="nav-item">
                     <a href="{{ route('logout') }}" class="nav-link logout-link">
                         <i class="nav-icon fa-solid fa-arrow-right-from-bracket"></i>
diff --git a/resources/views/v2/partials/layout/topbar.blade.php b/resources/views/v2/partials/layout/topbar.blade.php
new file mode 100644
index 0000000000..0105abb46a
--- /dev/null
+++ b/resources/views/v2/partials/layout/topbar.blade.php
@@ -0,0 +1,106 @@
+<li class="nav-item dropdown">
+    <a class="nav-link" data-bs-toggle="dropdown" href="#">
+        <i class="fa-solid fa-gears"></i>
+    </a>
+    <div class="dropdown-menu dropdown-menu-lg dropdown-menu-end">
+        <div class="dropdown-divider"></div>
+        <a href="{{ route('admin.index') }}" class="dropdown-item">
+            <em class="fa-regular fa-user me-2"></em>
+            TODO {{ __('firefly.admin') }}
+        </a>
+        <div class="dropdown-divider"></div>
+        <a href="{{ route('currencies.index') }}" class="dropdown-item">
+            <em class="fa-solid fa-user-gear me-2"></em>
+            TODO {{ __('firefly.currencies') }}
+        </a>
+        <div class="dropdown-divider"></div>
+        <a href="#" class="dropdown-item">
+            <em class="fa-solid fa-money-bill-transfer me-2"></em>
+            TODO {{ __('firefly.administrations_index_menu') }}
+        </a>
+    </div>
+</li>
+<li class="nav-item dropdown">
+    <a class="nav-link" data-bs-toggle="dropdown" href="#">
+        <i class="fa-solid fa-user"></i>
+    </a>
+    <div class="dropdown-menu dropdown-menu-lg dropdown-menu-end">
+        <span class="dropdown-item dropdown-header">{{ auth()->user()->email }}</span>
+        <div class="dropdown-divider"></div>
+        <a href="{{ route('profile.index') }}" class="dropdown-item">
+            <em class="fa-regular fa-user me-2"></em>
+            {{ __('firefly.profile') }}
+        </a>
+        <div class="dropdown-divider"></div>
+        <a href="{{ route('preferences.index') }}" class="dropdown-item">
+            <em class="fa-solid fa-user-gear me-2"></em>
+            {{ __('firefly.preferences') }}
+        </a>
+        <div class="dropdown-divider"></div>
+        <a href="#" class="dropdown-item">
+            <em class="fa-solid fa-money-bill-transfer me-2"></em>
+            TODO {{ __('firefly.administrations_index_menu') }}
+        </a>
+    </div>
+</li>
+<li class="nav-item dropdown">
+    <a class="nav-link" data-bs-toggle="dropdown" href="#">
+        <i class="fa-solid fa-plus-circle"></i>
+    </a>
+    <div class="dropdown-menu dropdown-menu-lg dropdown-menu-end">
+        <!-- withdrawal, deposit, transfer -->
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            {{ __('firefly.create_new_transaction') }}
+        </a>
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <div class="dropdown-divider"></div>
+
+        <!-- asset, liability -->
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <div class="dropdown-divider"></div>
+
+        <!-- budget, category, piggy -->
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <div class="dropdown-divider"></div>
+
+        <!-- contract, rule, recurring -->
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+        <a href="{{ route('transactions.create', ['withdrawal']) }}" class="dropdown-item">
+            <em class="fa-regular fa-plus me-2"></em>
+            TODO {{ __('firefly.create_new_transaction') }}
+        </a>
+    </div>
+</li>