From 0d7325b3dc1f10a7c3a29645502ad28e3479f474 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 9 Mar 2024 12:21:45 +0100
Subject: [PATCH] Fix CSS and JS (on dashboard)

---
 resources/views/v2/index.blade.php                   | 7 ++++---
 resources/views/v2/layout/v2.blade.php               | 5 -----
 resources/views/v2/partials/layout/head.blade.php    | 8 +++-----
 resources/views/v2/partials/layout/scripts.blade.php | 4 ++++
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/resources/views/v2/index.blade.php b/resources/views/v2/index.blade.php
index b74aec8b22..8390c5d60a 100644
--- a/resources/views/v2/index.blade.php
+++ b/resources/views/v2/index.blade.php
@@ -1,7 +1,4 @@
 @extends('layout.v2')
-@section('vite')
-    @vite(['resources/assets/v2/sass/app.scss', 'resources/assets/v2/pages/dashboard/dashboard.js'])
-@endsection
 @section('content')
 
     <div class="app-content">
@@ -56,3 +53,7 @@
     </div>
 
 @endsection
+@section('scripts')
+    <!-- hier load -->
+    @vite(['resources/assets/v2/pages/dashboard/dashboard.js'])
+@endsection
diff --git a/resources/views/v2/layout/v2.blade.php b/resources/views/v2/layout/v2.blade.php
index 935afa1c07..4518fa0f71 100644
--- a/resources/views/v2/layout/v2.blade.php
+++ b/resources/views/v2/layout/v2.blade.php
@@ -120,12 +120,7 @@
 
     <!--end::Footer-->
 </div>
-<!--end::App Wrapper-->
-<!--begin::Script-->
 @include('partials.layout.scripts')
-<!--end::Script-->
-
 </body>
-<!--end::Body-->
 
 </html>
diff --git a/resources/views/v2/partials/layout/head.blade.php b/resources/views/v2/partials/layout/head.blade.php
index dac01efd19..2820a1124c 100644
--- a/resources/views/v2/partials/layout/head.blade.php
+++ b/resources/views/v2/partials/layout/head.blade.php
@@ -67,10 +67,8 @@
     </title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <!--
-    <link href="v2/css/fonts.css" rel="stylesheet">
-    <link rel="stylesheet" href="v2/css/adminlte.css">
-    -->
-    @yield('vite')
+    @yield('styles')
+    @vite(['resources/assets/v2/sass/app.scss'])
+
 
 </head>
diff --git a/resources/views/v2/partials/layout/scripts.blade.php b/resources/views/v2/partials/layout/scripts.blade.php
index fff4dd921e..b499159e01 100644
--- a/resources/views/v2/partials/layout/scripts.blade.php
+++ b/resources/views/v2/partials/layout/scripts.blade.php
@@ -1 +1,5 @@
+
+<!--
 <script src="v2/js/adminlte.js" nonce="{{ $JS_NONCE }}"></script>
+-->
+@yield('scripts')