mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Continued work on v4
This commit is contained in:
		| @@ -8,8 +8,29 @@ | ||||
|         <!--begin::Container--> | ||||
|         <div class="container-fluid"> | ||||
|             @include('partials.dashboard.boxes') | ||||
|             <!-- row with account data --> | ||||
|             <div class="row"> | ||||
|                 <div class="col-xl-8 col-lg-12 col-sm-12 col-xs-12"> | ||||
|                     Graph | ||||
|                 </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> | ||||
|                 </div> | ||||
| 
 | ||||
| 
 | ||||
|             </div> | ||||
|         </div> | ||||
| 
 | ||||
|     </div> | ||||
|   | ||||
| @@ -30,37 +30,37 @@ | ||||
|             <!--end::Start Navbar Links--> | ||||
| 
 | ||||
|             <!--begin::End Navbar Links--> | ||||
|             <ul class="navbar-nav ms-auto"> | ||||
|             <ul class="navbar-nav ms-auto" x-data="dates"> | ||||
| 
 | ||||
|                 <!-- begin date range drop down --> | ||||
|                 <li class="nav-item dropdown"> | ||||
|                     <a class="nav-link daterange-holder" data-bs-toggle="dropdown" href="#"></a> | ||||
|                     <div class="dropdown-menu dropdown-menu-lg dropdown-menu-end" x-data=""> | ||||
|                         <a href="#" class="dropdown-item daterange-current" @click="app.changeDateRange"> | ||||
|                     <div class="dropdown-menu dropdown-menu-lg dropdown-menu-end"> | ||||
|                         <a href="#" class="dropdown-item daterange-current" @click="changeDateRange"> | ||||
| 
 | ||||
|                         </a> | ||||
|                         <div class="dropdown-divider"></div> | ||||
|                         <a href="#" @click="app.changeDateRange" class="dropdown-item daterange-next"> | ||||
|                         <a href="#" @click="changeDateRange" class="dropdown-item daterange-next"> | ||||
|                             next | ||||
|                         </a> | ||||
|                         <div class="dropdown-divider"></div> | ||||
|                         <a href="#" class="dropdown-item daterange-prev" @click="app.changeDateRange"> | ||||
|                         <a href="#" class="dropdown-item daterange-prev" @click="changeDateRange"> | ||||
|                             prev | ||||
|                         </a> | ||||
|                         <div class="dropdown-divider"></div> | ||||
|                         <a href="#" class="dropdown-item daterange-7d" @click="app.changeDateRange"> | ||||
|                         <a href="#" class="dropdown-item daterange-7d" @click="changeDateRange"> | ||||
|                             {{ __('firefly.last_seven_days') }} | ||||
|                         </a> | ||||
|                         <div class="dropdown-divider"></div> | ||||
|                         <a href="#" class="dropdown-item daterange-90d" @click="app.changeDateRange"> | ||||
|                         <a href="#" class="dropdown-item daterange-90d" @click="changeDateRange"> | ||||
|                             {{ __('firefly.last_thirty_days') }} | ||||
|                         </a> | ||||
|                         <div class="dropdown-divider"></div> | ||||
|                         <a href="#" class="dropdown-item daterange-mtd" @click="app.changeDateRange"> | ||||
|                         <a href="#" class="dropdown-item daterange-mtd" @click="changeDateRange"> | ||||
|                             {{ __('firefly.month_to_date') }} | ||||
|                         </a> | ||||
|                         <div class="dropdown-divider"></div> | ||||
|                         <a href="#" class="dropdown-item daterange-ytd" @click="app.changeDateRange"> | ||||
|                         <a href="#" class="dropdown-item daterange-ytd" @click="changeDateRange"> | ||||
|                             {{ __('firefly.year_to_date') }} | ||||
|                         </a> | ||||
|                         <div class="dropdown-divider"></div> | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| <div class="row" x-data="boxes"> | ||||
|     <!--begin::Col--> | ||||
|     <div class="col-lg-3 col-6"> | ||||
|     <div class="col-xl-3 col-lg-6 col-md-12 col-sm-12"> | ||||
|         <!--begin::Small Box Widget 1--> | ||||
|         <div class="small-box text-bg-primary"> | ||||
|             <div class="inner"> | ||||
| @@ -33,7 +33,7 @@ | ||||
|         <!--end::Small Box Widget 1--> | ||||
|     </div> | ||||
|     <!--end::Col--> | ||||
|     <div class="col-lg-3 col-6"> | ||||
|     <div class="col-xl-3 col-lg-6 col-md-12 col-sm-12"> | ||||
|         <!--begin::Small Box Widget 2--> | ||||
|         <div class="small-box text-bg-success"> | ||||
|             <div class="inner"> | ||||
| @@ -64,7 +64,7 @@ | ||||
|         <!--end::Small Box Widget 2--> | ||||
|     </div> | ||||
|     <!--end::Col--> | ||||
|     <div class="col-lg-3 col-6"> | ||||
|     <div class="col-xl-3 col-lg-6 col-md-12 col-sm-12"> | ||||
|         <!--begin::Small Box Widget 3--> | ||||
|         <div class="small-box text-bg-warning"> | ||||
|             <div class="inner"> | ||||
| @@ -83,13 +83,19 @@ | ||||
|                 <em class="fa-solid fa-money-check-dollar"></em> | ||||
|             </span> | ||||
|             <span class="small-box-footer"> | ||||
|                 {{ __('firefly.per_day') }}: TODO amount | ||||
|                 {{ __('firefly.per_day') }}: | ||||
|                  <template x-for="(amount, index) in leftBox.perDay" :key="index"> | ||||
|                         <span> | ||||
|                             <span x-text="amount"></span><span | ||||
|                                 :class="{ 'invisible': (leftBox.perDay.length == index+1) }">, </span> | ||||
|                         </span> | ||||
|                     </template> | ||||
|             </span> | ||||
|         </div> | ||||
|         <!--end::Small Box Widget 3--> | ||||
|     </div> | ||||
|     <!--end::Col--> | ||||
|     <div class="col-lg-3 col-6"> | ||||
|     <div class="col-xl-3 col-lg-6 col-md-12 col-sm-12"> | ||||
|         <!--begin::Small Box Widget 4--> | ||||
|         <div class="small-box text-bg-danger"> | ||||
|             <div class="inner"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user