mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Lots of new code.
This commit is contained in:
		| @@ -11,22 +11,113 @@ | ||||
|             <!-- row with account data --> | ||||
|             <div class="row"> | ||||
|                 <div class="col-xl-8 col-lg-12 col-sm-12 col-xs-12"> | ||||
|                     Graph | ||||
|                     <div class="row mb-2"> | ||||
|                         <div class="col"> | ||||
| 
 | ||||
|                             <div class="card"> | ||||
|                                 <div class="card-header"> | ||||
|                                     <h3 class="card-title"><a href="{{ route('accounts.index',['asset']) }}" | ||||
|                                                               title="{{ __('firefly.yourAccounts') }}">{{ __('firefly.yourAccounts') }}</a> | ||||
|                                     </h3> | ||||
|                                 </div> | ||||
|                                 <div class="card-body"> | ||||
|                                     <div id="account-chart"></div> | ||||
|                                 </div> | ||||
|                             </div> | ||||
| 
 | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="row mb-2"> | ||||
|                         <div class="col"> | ||||
|                             <div class="card"> | ||||
|                                 <div class="card-header"> | ||||
|                                     <h3 class="card-title"><a href="{{ route('accounts.index',['asset']) }}" | ||||
|                                                               title="{{ __('firefly.yourAccounts') }}">budget</a> | ||||
|                                     </h3> | ||||
|                                 </div> | ||||
|                                 <div class="card-body"> | ||||
|                                     <div id="budget-chart"></div> | ||||
|                                 </div> | ||||
|                             </div> | ||||
| 
 | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="row mb-2"> | ||||
|                         <div class="col"> | ||||
|                             <div class="card"> | ||||
|                                 <div class="card-header"> | ||||
|                                     <h3 class="card-title"><a href="{{ route('accounts.index',['asset']) }}" | ||||
|                                                               title="{{ __('firefly.yourAccounts') }}">cat</a> | ||||
|                                     </h3> | ||||
|                                 </div> | ||||
|                                 <div class="card-body"> | ||||
|                                     <div id="category-chart"></div> | ||||
|                                 </div> | ||||
|                             </div> | ||||
| 
 | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="col-xl-4 col-lg-12 col-sm-12 col-xs-12"> | ||||
|                     <div class="row"> | ||||
|                         <div class="col-12"> | ||||
|                             Account1 | ||||
|                         </div> | ||||
|                         <div class="col-12"> | ||||
|                             Account2 | ||||
|                         </div> | ||||
|                         <div class="col-12"> | ||||
|                             Account3 | ||||
|                         </div> | ||||
|                         <div class="col-12"> | ||||
|                             Account4 | ||||
|                         </div> | ||||
|                     <div class="row" x-data="accounts"> | ||||
|                         <template x-for="account in accountList"> | ||||
|                             <div class="col-12 mb-2"> | ||||
|                                 <div class="card"> | ||||
|                                     <div class="card-header"> | ||||
|                                         <h3 class="card-title"> | ||||
|                                             <a :href="'{{ route('accounts.show','') }}/' + account.id" | ||||
|                                                x-text="account.name"></a> | ||||
| 
 | ||||
|                                             <span class="small text-muted">(<span | ||||
|                                                     x-text="account.balance"></span>)</span> | ||||
|                                         </h3> | ||||
|                                     </div> | ||||
|                                     <div class="card-body p-0"> | ||||
|                                         <table class="table table-sm"> | ||||
|                                             <tbody> | ||||
|                                             <template x-for="group in account.groups"> | ||||
|                                                 <tr> | ||||
|                                                     <td> | ||||
|                                                         <template x-if="group.title"> | ||||
|                                                             <span><a | ||||
|                                                                     :href="'{{route('transactions.show', '') }}/' + group.id" | ||||
|                                                                     x-text="group.title"></a><br/></span> | ||||
|                                                         </template> | ||||
|                                                         <template x-for="transaction in group.transactions"> | ||||
|                                                             <span> | ||||
|                                                                 <template x-if="group.title"> | ||||
|                                                                     <span>- | ||||
|                                                                         <span | ||||
|                                                                             x-text="transaction.description"></span><br> | ||||
|                                                                     </span> | ||||
|                                                                 </template> | ||||
|                                                                 <template x-if="!group.title"> | ||||
|                                                                     <span><a | ||||
|                                                                             :href="'{{route('transactions.show', '') }}/' + group.id" | ||||
|                                                                             x-text="transaction.description"></a><br> | ||||
|                                                                     </span> | ||||
|                                                                 </template> | ||||
|                                                             </span> | ||||
|                                                         </template> | ||||
|                                                     </td> | ||||
|                                                     <td style="width:30%;" class="text-end"> | ||||
|                                                         <template x-if="group.title"> | ||||
|                                                             <span><br/></span> | ||||
|                                                         </template> | ||||
|                                                         <template x-for="transaction in group.transactions"> | ||||
|                                                             <span> | ||||
|                                                                 <span x-text="transaction.amount"></span><br> | ||||
|                                                             </span> | ||||
|                                                         </template> | ||||
|                                                     </td> | ||||
|                                                 </tr> | ||||
|                                             </template> | ||||
|                                             </tbody> | ||||
|                                         </table> | ||||
|                                     </div> | ||||
|                                 </div> | ||||
|                             </div> | ||||
|                         </template> | ||||
|                     </div> | ||||
|                 </div> | ||||
| 
 | ||||
|   | ||||
| @@ -1,5 +1,6 @@ | ||||
| <!DOCTYPE html> | ||||
| <html lang="{{ trans('config.html_language') }}"> | ||||
| <!--  data-bs-theme="dark" --> | ||||
| <!--begin::Head--> | ||||
| @include('partials.layout.head') | ||||
| <!--end::Head--> | ||||
| @@ -85,7 +86,7 @@ | ||||
|                             {{ __('firefly.profile') }} | ||||
|                         </a> | ||||
|                         <div class="dropdown-divider"></div> | ||||
|                         <a href="#" class="dropdown-item"> | ||||
|                         <a href="{{ route('preferences.index') }}" class="dropdown-item"> | ||||
|                             <i class="fa-solid fa-user-gear me-2"></i> | ||||
|                             {{ __('firefly.preferences') }} | ||||
|                         </a> | ||||
|   | ||||
| @@ -8,6 +8,51 @@ | ||||
|     <meta name="apple-mobile-web-app-capable" content="yes"> | ||||
|     <meta name="color-scheme" content="light dark"> | ||||
| 
 | ||||
|     <script type="text/javascript"> | ||||
|         /*! | ||||
|  * Color mode toggler for Bootstrap's docs (https://getbootstrap.com/) | ||||
|  * Copyright 2011-2023 The Bootstrap Authors | ||||
|  * Licensed under the Creative Commons Attribution 3.0 Unported License. | ||||
|  */ | ||||
| 
 | ||||
|         (() => { | ||||
|             '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() | ||||
|                 if (storedTheme) { | ||||
|                     return storedTheme | ||||
|                 } | ||||
| 
 | ||||
|                 return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light' | ||||
|             } | ||||
| 
 | ||||
|             const setTheme = theme => { | ||||
|                 if (theme === 'browser' && window.matchMedia('(prefers-color-scheme: dark)').matches) { | ||||
|                     document.documentElement.setAttribute('data-bs-theme', 'dark') | ||||
|                     return; | ||||
|                 } | ||||
|                 if (theme === 'browser' && window.matchMedia('(prefers-color-scheme: light)').matches) { | ||||
|                     document.documentElement.setAttribute('data-bs-theme', 'light') | ||||
|                     return; | ||||
|                 } | ||||
|                 document.documentElement.setAttribute('data-bs-theme', theme) | ||||
|             } | ||||
| 
 | ||||
|             setTheme(getPreferredTheme()) | ||||
| 
 | ||||
|             window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { | ||||
|                 const storedTheme = getStoredTheme() | ||||
|                 if (storedTheme !== 'light' && storedTheme !== 'dark') { | ||||
|                     setTheme(getPreferredTheme()) | ||||
|                 } | ||||
|             }) | ||||
|         })() | ||||
|     </script> | ||||
| 
 | ||||
|     <title> | ||||
|         @if($subTitle) | ||||
|             {{ $subTitle }} » | ||||
| @@ -23,7 +68,7 @@ | ||||
|     <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||||
| 
 | ||||
|     <!--begin::Fonts--> | ||||
|     <link href="v4/css/fonts.css" rel="stylesheet"> | ||||
|     <link href="v2/css/fonts.css" rel="stylesheet"> | ||||
|     <!--end::Fonts--> | ||||
| 
 | ||||
|     <!--begin::Third Party Plugin(OverlayScrollbars)--> | ||||
| @@ -39,7 +84,7 @@ | ||||
|     --}} | ||||
|     <!--end::Third Party Plugin(Bootstrap Icons)--> | ||||
|     <!--begin::Required Plugin(AdminLTE)--> | ||||
|     <link rel="stylesheet" href="v4/css/adminlte.css"> | ||||
|     <link rel="stylesheet" href="v2/css/adminlte.css"> | ||||
|     <!--end::Required Plugin(AdminLTE)--> | ||||
|     @yield('vite') | ||||
| 
 | ||||
|   | ||||
| @@ -12,5 +12,5 @@ | ||||
|         crossorigin="anonymous"></script> | ||||
| --}} | ||||
| <!--end::Required Plugin(Bootstrap 5)--><!--begin::Required Plugin(AdminLTE)--> | ||||
| <script src="v4/js/adminlte.js"></script> | ||||
| <script src="v2/js/adminlte.js"></script> | ||||
| <!--end::Required Plugin(AdminLTE)--> | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|         <!--begin::Brand Link--> | ||||
|         <a href="{{route('index') }}" class="brand-link"> | ||||
|             <!--begin::Brand Image--> | ||||
|             <img src="v4/i/logo.png" alt="Firefly III Logo" | ||||
|             <img src="v2/i/logo.png" alt="Firefly III Logo" | ||||
|                  class="brand-image opacity-75 shadow"> | ||||
|             <!--end::Brand Image--> | ||||
|             <!--begin::Brand Text--> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user