Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Replace icons, clean up list.
James Cole69f3aa064a23
diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.phpindex 560a12a317..3ab1fe3e8a 100644--- a/app/Http/Controllers/PiggyBank/AmountController.php+++ b/app/Http/Controllers/PiggyBank/AmountController.php@@ -53,7 +53,7 @@ final class AmountController extends Controller$this->middleware(function ($request, $next) {app('view')->share('title', (string) trans('firefly.piggyBanks'));- app('view')->share('mainTitleIcon', 'bi-target');+ app('view')->share('mainTitleIcon', 'bi-piggy-bank');$this->piggyRepos = app(PiggyBankRepositoryInterface::class);diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.phpindex 8c935f19bb..6657aa71a4 100644--- a/app/Http/Controllers/PiggyBank/CreateController.php+++ b/app/Http/Controllers/PiggyBank/CreateController.php@@ -53,7 +53,7 @@ final class CreateController extends Controller$this->middleware(function ($request, $next) {app('view')->share('title', (string) trans('firefly.piggyBanks'));- app('view')->share('mainTitleIcon', 'bi-target');+ app('view')->share('mainTitleIcon', 'bi-piggy-bank');$this->attachments = app(AttachmentHelperInterface::class);$this->piggyRepos = app(PiggyBankRepositoryInterface::class);diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.phpindex b7237297f1..a347ce3ea9 100644--- a/app/Http/Controllers/PiggyBank/DeleteController.php+++ b/app/Http/Controllers/PiggyBank/DeleteController.php@@ -48,7 +48,7 @@ final class DeleteController extends Controller$this->middleware(function ($request, $next) {app('view')->share('title', (string) trans('firefly.piggyBanks'));- app('view')->share('mainTitleIcon', 'bi-target');+ app('view')->share('mainTitleIcon', 'bi-piggy-bank');$this->piggyRepos = app(PiggyBankRepositoryInterface::class);diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.phpindex 3be6f01a49..caeba1380e 100644--- a/app/Http/Controllers/PiggyBank/EditController.php+++ b/app/Http/Controllers/PiggyBank/EditController.php@@ -53,7 +53,7 @@ final class EditController extends Controller$this->middleware(function ($request, $next) {app('view')->share('title', (string) trans('firefly.piggyBanks'));- app('view')->share('mainTitleIcon', 'bi-target');+ app('view')->share('mainTitleIcon', 'bi-piggy-bank');$this->attachments = app(AttachmentHelperInterface::class);$this->piggyRepos = app(PiggyBankRepositoryInterface::class);diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.phpindex 34e67be816..37b50dea9b 100644--- a/app/Http/Controllers/PiggyBank/IndexController.php+++ b/app/Http/Controllers/PiggyBank/IndexController.php@@ -60,7 +60,7 @@ final class IndexController extends Controller$this->middleware(function ($request, $next) {app('view')->share('title', (string) trans('firefly.piggyBanks'));- app('view')->share('mainTitleIcon', 'bi-target');+ app('view')->share('mainTitleIcon', 'bi-piggy-bank');$this->piggyRepos = app(PiggyBankRepositoryInterface::class);diff --git a/app/Http/Controllers/PiggyBank/ShowController.php b/app/Http/Controllers/PiggyBank/ShowController.phpindex 204b1d467e..957e7151cd 100644--- a/app/Http/Controllers/PiggyBank/ShowController.php+++ b/app/Http/Controllers/PiggyBank/ShowController.php@@ -52,7 +52,7 @@ final class ShowController extends Controller$this->middleware(function ($request, $next) {app('view')->share('title', (string) trans('firefly.piggyBanks'));- app('view')->share('mainTitleIcon', 'bi-target');+ app('view')->share('mainTitleIcon', 'bi-piggy-bank');$this->piggyRepos = app(PiggyBankRepositoryInterface::class);diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepository.php b/app/Repositories/ObjectGroup/ObjectGroupRepository.phpindex 856810125f..72a9f07475 100644--- a/app/Repositories/ObjectGroup/ObjectGroupRepository.php+++ b/app/Repositories/ObjectGroup/ObjectGroupRepository.php@@ -79,7 +79,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface, UserGrouppublic function get(): Collection{return $this->user->objectGroups()- ->with(['piggyBanks', 'bills'])+ ->with(['piggyBanks', 'bills','accounts'])->orderBy('order', 'ASC')->orderBy('title', 'ASC')->get()diff --git a/resources/views/components/layout/create-menu.blade.php b/resources/views/components/layout/create-menu.blade.phpindex e0fc20356d..b183c4019f 100644--- a/resources/views/components/layout/create-menu.blade.php+++ b/resources/views/components/layout/create-menu.blade.php@@ -98,7 +98,7 @@<div class="grow"><h3 class="dropdown-item-title"><!-- withdrawal, deposit, transfer -->- <em class="bi bi-bullseye me-2"></em>+ <em class="bi bi-piggy-bank me-2"></em>{{ __('firefly.create_new_piggy_bank') }}</h3></div>diff --git a/resources/views/components/layout/sidebar.blade.php b/resources/views/components/layout/sidebar.blade.phpindex 29029df201..50fa07a347 100644--- a/resources/views/components/layout/sidebar.blade.php+++ b/resources/views/components/layout/sidebar.blade.php@@ -53,7 +53,7 @@</li><li class="nav-item"><a href="{{ route('piggy-banks.index') }}" class="nav-link {{ menu_item_active_partial('piggy-banks.') }}">- <em class="nav-icon bi bi-bullseye"></em>+ <em class="nav-icon bi bi-piggy-bank"></em><p>{{ __('firefly.piggyBanks') }}</p>diff --git a/resources/views/index.blade.php b/resources/views/index.blade.phpindex 7bdc1ef312..dc7a1a4ed0 100644--- a/resources/views/index.blade.php+++ b/resources/views/index.blade.php@@ -204,7 +204,7 @@<div class="card-footer text-end d-print-none"><a href="{{ route('piggy-banks.index') }}" title="{{ __('firefly.go_to_piggies') }}"class="btn btn-primary btn-sm"><span- class="bi bi-bullseye"></span> {{ __('firefly.go_to_piggies') }}</a>+ class="bi bi-piggy-bank"></span> {{ __('firefly.go_to_piggies') }}</a></div></div></div>diff --git a/resources/views/object-groups/index.blade.php b/resources/views/object-groups/index.blade.phpindex a0048cf4da..6efd4f01a4 100644--- a/resources/views/object-groups/index.blade.php+++ b/resources/views/object-groups/index.blade.php@@ -13,11 +13,11 @@<table class="table table-valign-middle table-sm" id="sortable"><thead><tr>- <th> </th>- <th>+ <th class="w-10"> </th>+ <th class="w-80">{{ __('firefly.object_group_title') }}</th>- <th>+ <th class="w-10"> </th></tr>@@ -27,13 +27,31 @@<tr class="group-sortable" data-id="{{ $objectGroup['id'] }}" data-name="{{ e($objectGroup['title']) }}" data-order="{{ $objectGroup['order'] }}"><td><span class="btn btn-sm btn-outline-secondary bi bi-list group-handle"></span></td><td>+<strong>{{ $objectGroup['title'] }}</strong><br/>+ <div class="row">@foreach($objectGroup['piggyBanks'] as $piggyBank)- - {{ __('firefly.piggy_bank') }}: <a href="{{ route('piggy-banks.show', [$piggyBank['id']]) }}">{{ $piggyBank['name'] }}</a><br>+ <div class="col-3 big-line">+ <a style="font-size:0.9em;" class="badge text-bg-success text-truncate d-inline-block" title="{{ $piggyBank->title }}" href="{{ route('piggy-banks.show',[$piggyBank->id]) }}">+ <span class="bi bi-piggy-bank"></span> {{ $piggyBank->name }}</a></div>+ {{-- {{ __('firefly.piggy_bank') }}: <a href="{{ route('piggy-banks.show', [$piggyBank['id']]) }}">{{ $piggyBank['name'] }}</a><br> --}}@endforeach+@foreach($objectGroup['bills'] as $subscription)- - {{ __('firefly.bill') }}: <a href="{{ route('subscriptions.show', [$subscription['id']]) }}">{{ $subscription['name'] }}</a><br>+ <div class="col-3 big-line">+ <a style="font-size:0.9em;" class="badge text-bg-primary text-truncate d-inline-block" title="{{ $subscription->title }}" href="{{ route('subscriptions.show',[$subscription->id]) }}">+ <span class="bi bi-calendar"></span> {{ $subscription->name }}</a></div>++ {{-- - {{ __('firefly.bill') }}: <a href="{{ route('subscriptions.show', [$subscription['id']]) }}">{{ $subscription['name'] }}</a><br> --}}@endforeach+ @foreach($objectGroup['accounts'] as $account)+ <div class="col-3 big-line">+ <a style="font-size:0.9em;" class="badge text-bg-teal text-truncate d-inline-block" title="{{ $account->title }}" href="{{ route('accounts.show',[$account->id]) }}">+ <span class="bi bi-cash"></span> {{ $account->name }}</a></div>++ {{-- - {{ __('firefly.account') }}: <a href="{{ route('accounts.show', [$account['id']]) }}">{{ $account['name'] }}</a><br> --}}+ @endforeach+ </div></td><td class="text-end"><div class="dropdown">diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.phpindex 9cb414c96d..52259c9b99 100644--- a/resources/views/profile/index.blade.php+++ b/resources/views/profile/index.blade.php@@ -136,7 +136,7 @@<button type="button"data-success="{{ trans('firefly.deleted_all_piggy_banks') }}"data-type="piggy_banks" class="confirm btn btn-danger btn-sm"><span- class="bi bi-bullseye"></span> {{ __('firefly.delete_all_piggy_banks') }}</button>+ class="bi bi-piggy-bank"></span> {{ __('firefly.delete_all_piggy_banks') }}</button></div><h4>{{ __('firefly.automation') }}</h4><div class="btn-group">