Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Replace a bunch of icons.
James Coled5ad06c8852d
diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.phpindex 331b5ff0de..11248e50ff 100644--- a/app/Http/Controllers/NewUserController.php+++ b/app/Http/Controllers/NewUserController.php@@ -66,7 +66,7 @@ final class NewUserController extends Controllerpublic function index(): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse{app('view')->share('title', (string) trans('firefly.welcome'));- app('view')->share('mainTitleIcon', 'fa-fire');+ app('view')->share('mainTitleIcon', 'bi-fire');$types = config('firefly.accountTypesByIdentifier.asset');$count = $this->repository->count($types);diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.phpindex 9d2b0cd591..a67b600e73 100644--- a/app/Http/Controllers/PreferencesController.php+++ b/app/Http/Controllers/PreferencesController.php@@ -62,7 +62,7 @@ final class PreferencesController extends Controller$this->middleware(static function ($request, $next) {app('view')->share('title', (string) trans('firefly.preferences'));- app('view')->share('mainTitleIcon', 'fa-gear');+ app('view')->share('mainTitleIcon', 'bi-gear-wide-connected');return $next($request);});diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.phpindex 492d789e94..2c38d74ed2 100644--- a/app/Http/Controllers/ProfileController.php+++ b/app/Http/Controllers/ProfileController.php@@ -73,7 +73,7 @@ final class ProfileController extends Controller$this->middleware(static function ($request, $next) {app('view')->share('title', (string) trans('firefly.profile'));- app('view')->share('mainTitleIcon', 'fa-user');+ app('view')->share('mainTitleIcon', 'bi-person');return $next($request);});@@ -98,7 +98,7 @@ final class ProfileController extends Controller$title = auth()->user()->email;$email = auth()->user()->email;$subTitle = (string) trans('firefly.change_your_email');- $subTitleIcon = 'fa-envelope';+ $subTitleIcon = 'bi-envelope';return view('profile.change-email', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'email' => $email]);}@@ -118,7 +118,7 @@ final class ProfileController extends Controller$title = auth()->user()->email;$subTitle = (string) trans('firefly.change_your_password');- $subTitleIcon = 'fa-key';+ $subTitleIcon = 'bi-key';return view('profile.change-password', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]);}@@ -171,7 +171,7 @@ final class ProfileController extends Controller}$title = auth()->user()->email;$subTitle = (string) trans('firefly.delete_account');- $subTitleIcon = 'fa-trash';+ $subTitleIcon = 'bi-trash';return view('profile.delete-account', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]);}diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.phpindex 45e99c41e9..b8b78ff12a 100644--- a/app/Http/Controllers/ReportController.php+++ b/app/Http/Controllers/ReportController.php@@ -62,8 +62,8 @@ final class ReportController extends Controller$this->middleware(function ($request, $next) {app('view')->share('title', (string) trans('firefly.reports'));- app('view')->share('mainTitleIcon', 'fa-bar-chart');- app('view')->share('subTitleIcon', 'fa-calendar');+ app('view')->share('mainTitleIcon', 'bi-bar-chart');+ app('view')->share('subTitleIcon', 'bi-calendar');$this->helper = app(ReportHelperInterface::class);$this->repository = app(BudgetRepositoryInterface::class);diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.phpindex f2403c6fd4..cec1b553dc 100644--- a/app/Http/Controllers/SearchController.php+++ b/app/Http/Controllers/SearchController.php@@ -46,7 +46,7 @@ final class SearchController extends Controllerparent::__construct();app('view')->share('showCategory', true);$this->middleware(static function ($request, $next) {- app('view')->share('mainTitleIcon', 'fa-search');+ app('view')->share('mainTitleIcon', 'bi-search');app('view')->share('title', (string) trans('firefly.search'));return $next($request);diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.phpindex 3a17ffb74f..b3c9ae946c 100644--- a/app/Http/Controllers/TagController.php+++ b/app/Http/Controllers/TagController.php@@ -61,7 +61,7 @@ final class TagController extends Controller$this->middleware(function ($request, $next) {app('view')->share('title', (string) trans('firefly.tags'));- app('view')->share('mainTitleIcon', 'fa-tag');+ app('view')->share('mainTitleIcon', 'bi-tags');$this->attachmentsHelper = app(AttachmentHelperInterface::class);$this->repository = app(TagRepositoryInterface::class);@@ -78,7 +78,7 @@ final class TagController extends Controllerpublic function create(Request $request): Factory|\Illuminate\Contracts\View\View{$subTitle = (string) trans('firefly.new_tag');- $subTitleIcon = 'fa-tag';+ $subTitleIcon = 'bi-tag';// location info:$hasOldInput = null !== $request->old('_token');@@ -137,7 +137,7 @@ final class TagController extends Controllerpublic function edit(Tag $tag): Factory|\Illuminate\Contracts\View\View{$subTitle = (string) trans('firefly.edit_tag', ['tag' => $tag->tag]);- $subTitleIcon = 'fa-tag';+ $subTitleIcon = 'bi-tag';$location = $this->repository->getLocation($tag);$latitude = $location instanceof Location ? $location->latitude : config('firefly.default_location.latitude');@@ -228,7 +228,7 @@ final class TagController extends Controllerpublic function show(Request $request, Tag $tag, ?Carbon $start = null, ?Carbon $end = null): Factory|\Illuminate\Contracts\View\View{// default values:- $subTitleIcon = 'fa-tag';+ $subTitleIcon = 'bi-tag';$page = (int) $request->input('page');$pageSize = (int) Preferences::get('listPageSize', 50)->data;$start ??= session('start');@@ -296,7 +296,7 @@ final class TagController extends Controllerpublic function showAll(Request $request, Tag $tag): Factory|\Illuminate\Contracts\View\View{// default values:- $subTitleIcon = 'fa-tag';+ $subTitleIcon = 'bi-tag';$page = (int) $request->input('page');$page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;diff --git a/resources/assets/v2/views/v2/accounts/index.blade.php b/resources/assets/v2/views/v2/accounts/index.blade.phpdeleted file mode 100644index fda8a32293..0000000000--- a/resources/assets/v2/views/v2/accounts/index.blade.php+++ /dev/null@@ -1,512 +0,0 @@-@extends('layout.v2')-@section('content')- <div class="app-content">- <div class="container-fluid" x-data="index">- <x-messages></x-messages>- <div class="row mb-3">- <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">{{ __('firefly.net_worth') }}</h3>- </div>- <div class="card-body">- Not yet implemented.- </div>- </div>- </div>- <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">{{ __('firefly.in_out_period') }}</h3>- </div>- <div class="card-body">- Not yet implemented.- </div>- </div>- </div>- <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">Not yet implemented.</h3>- </div>- <div class="card-body">- Not yet implemented.- </div>- </div>- </div>- </div>- <div class="row mb-3">- <div class="col">- <div x-html="pageNavigation">- </div>- </div>- <template x-for="(set, rootIndex) in accounts" :key="rootIndex">- <div class="row mb-3">- <div class="col-xl-12 col-lg-12 col-md-12 col-sm-12 col-xs-12">- <div class="card mb-3">- <div class="card-header">- <div class="row">- <div class="col">- <h3 class="card-title">- <span x-show="null === set.group.id">{{ __('firefly.undefined_accounts') }}</span>- <span x-show="null !== set.group.id" x-text="set.group.title"></span>- </h3>- </div>- <div class="col text-end">- </div>- </div>- </div>- <div class="card-body p-0">- <table class="table">- <thead>- <tr x-show="hasFilters()">- <td x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled">- - </td>- <td x-show="tableColumns.active.visible && tableColumns.active.enabled"> </td>- <td x-show="tableColumns.name.visible && tableColumns.name.enabled">- <em x-show="'' !== filters.name && null !== filters.name">"<span x-text="filters.name"></span>"</em>- <a href="#" @click.prevent="removeFilter('name')"><em class="text-danger bi bi-trash-can"></em></a>- </td>- <td x-show="tableColumns.type.visible && tableColumns.type.enabled"> </td>- <td x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled">- - </td>- <td x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled">- - </td>- <td x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled">- - </td>- <td x-show="tableColumns.number.visible && tableColumns.number.enabled">- - </td>- <td x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled">- - </td>- <td x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">- - </td>- <td x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">- - </td>- <td x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled">- - </td>- <td x-show="tableColumns.menu.visible && tableColumns.menu.enabled"> </td>- </tr>- <tr>- <th x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled">- - </th>- <th x-show="tableColumns.active.visible && tableColumns.active.enabled">- <a href="#" x-on:click.prevent="sort('active')">{{ __('list.active') }}</a>- <em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'asc'"- class="fa-solid fa-arrow-down-short-wide"></em>- <em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'desc'"- class="fa-solid fa-arrow-down-wide-short"></em>- </th>- <th x-show="tableColumns.name.visible && tableColumns.name.enabled">- <a href="#" x-on:click.prevent="sort('name')">{{ __('list.name') }}</a>- <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'asc'"- class="fa-solid fa-arrow-down-a-z"></em>- <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'desc'" class="fa-solid fa-arrow-down-z-a"></em>- <a @click.prevent="showFilterDialog('name')" href="#" data-bs-toggle="modal" data-bs-target="#filterModal"><em class="fa-solid fa-magnifying-glass"></em></a>-- </th>- <th x-show="tableColumns.type.visible && tableColumns.type.enabled">{{ __('list.type') }}</th>- <th x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled">- {{ __('list.liability_type') }}- </th>- <th x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled">- {{ __('list.liability_direction') }}- </th>- <th x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled">- {{ __('list.interest') }}- </th>- <th x-show="tableColumns.number.visible && tableColumns.number.enabled">- <a href="#" x-on:click.prevent="sort('account_number')">- {{ __('list.account_number') }}- </a>- <em x-show="pageOptions.sortingColumn === 'account_number' && pageOptions.sortDirection === 'asc'"- class="fa-solid fa-arrow-down-a-z"></em>- <em x-show="pageOptions.sortingColumn === 'account_number' && pageOptions.sortDirection === 'desc'"- class="fa-solid fa-arrow-down-z-a"></em>- </th>- <th x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled">- <a href="#" x-on:click.prevent="sort('balance')">- {{ __('list.current_balance') }}- </a>- <em x-show="pageOptions.sortingColumn === 'balance' && pageOptions.sortDirection === 'asc'"- class="fa-solid fa-arrow-down-9-1"></em>- <em x-show="pageOptions.sortingColumn === 'balance' && pageOptions.sortDirection === 'desc'"- class="fa-solid fa-arrow-down-1-9"></em>- </th>- <th x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">- <a href="#" x-on:click.prevent="sort('current_debt')">- {{ __('list.amount_due') }}- </a>- <em x-show="pageOptions.sortingColumn === 'current_debt' && pageOptions.sortDirection === 'asc'"- class="fa-solid fa-arrow-down-wide-short"></em>- <em x-show="pageOptions.sortingColumn === 'current_debt' && pageOptions.sortDirection === 'desc'"- class="fa-solid fa-arrow-up-wide-short"></em>- </th>- <th x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">- <a href="#" x-on:click.prevent="sort('last_activity')">- {{ __('list.last_activity') }}- </a>- <em x-show="pageOptions.sortingColumn === 'last_activity' && pageOptions.sortDirection === 'asc'"- class="fa-solid fa-arrow-down-wide-short"></em>- <em x-show="pageOptions.sortingColumn === 'last_activity' && pageOptions.sortDirection === 'desc'"- class="fa-solid fa-arrow-up-wide-short"></em>- </th>- <th x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled">- <a href="#" x-on:click.prevent="sort('balance_difference')">- {{ __('list.balance_difference') }}</a>- <em x-show="pageOptions.sortingColumn === 'balance_difference' && pageOptions.sortDirection === 'asc'"- class="fa-solid fa-arrow-down-wide-short"></em>- <em x-show="pageOptions.sortingColumn === 'balance_difference' && pageOptions.sortDirection === 'desc'"- class="fa-solid fa-arrow-up-wide-short"></em>- </th>- <th x-show="tableColumns.menu.visible && tableColumns.menu.enabled"> </th>- </tr>- <tr x-show="pageOptions.isLoading">- <td colspan="13" class="text-center">- <span class="fa fa-spin fa-spinner"></span>- </td>- </tr>- </thead>- <tbody>- <template x-for="(account, index) in set.accounts" :key="index">- <tr>- <td x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled">- <em class="fa-solid fa-bars"></em>- </td>- <td x-show="tableColumns.active.visible && tableColumns.active.enabled">- <template x-if="account.active">- <em class="text-success fa-solid fa-check"></em>- - </template>- <template x-if="!account.active">- <em class="text-danger fa-solid fa-xmark"></em>- - </template>- </td>- <td x-show="tableColumns.name.visible && tableColumns.name.enabled">- <!-- render content using a function -->- <span x-html="renderObjectValue('name', account)"- x-show="!account.nameEditorVisible"></span>-- <!-- edit buttons -->- <em x-show="!account.nameEditorVisible" :data-id="account.id"- :data-index="index" @click="triggerEdit" data-type="text"- class="hidden-edit-button inline-edit-button fa-solid fa-pencil"- :data-id="account.id"></em>-- <!-- edit things -->- <div class="row" x-show="account.nameEditorVisible">- <div class="col-8">- <input :data-index="index" data-field="name" autocomplete="off"- type="text" class="form-control form-control-sm" id="input"- name="name" :value="account.name"- :placeholder="account.value" autofocus>- </div>- <div class="col-4">- <div class="btn-group btn-group-sm" role="group"- aria-label="Options">- <button :data-index="index" :data-id="account.id"- data-field="name" type="button"- @click="cancelInlineEdit" class="btn btn-danger"><em- class="fa-solid fa-xmark text-white"></em></button>- <button :data-index="index" :data-id="account.id"- data-field="name" type="submit"- @click="submitInlineEdit" class="btn btn-success"><em- class="fa-solid fa-check"></em></button>- </div>- </div>- </div>- </td>- <td x-show="tableColumns.type.visible && tableColumns.type.enabled">- <template x-if="null === account.role || '' === account.role">- <span><em>{{ __('firefly.no_account_role') }}</em></span>- </template>- <template x-if="null !== account.role && '' !== account.role">- <span x-text="accountRole(account.role)"></span>"- </template>- </td>- <td x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled">- <span x-text="$t('firefly.account_type_' + account.liability_type)"></span>- </td>- <td x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled">- <span x-text="$t('firefly.liability_direction_' + account.liability_direction + '_short')"></span>- </td>- <td x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled">- <span x-text="account.interest"></span>%- (<span x-text="$t('firefly.interest_calc_' + account.interest_period)"></span>)- </td>- <td x-show="tableColumns.number.visible && tableColumns.number.enabled">- <!-- IBAN and no account nr -->- <template x-if="'' === account.account_number && '' !== account.iban">- <span x-text="account.iban"></span>- </template>- <!-- no IBAN and account nr -->- <template x-if="'' !== account.account_number && '' === account.iban">- <span x-text="account.account_number"></span>- </template>- <!-- both -->- <template x-if="'' !== account.account_number && '' !== account.iban">- <span>- <span x-text="account.iban"></span>- (<span x-text="account.account_number"></span>)- </span>- </template>- </td>- <td x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled">- <span x-show="parseFloat(account.current_balance) < 0.0" class="text-danger"- x-text="formatMoney(account.current_balance, account.primary_currency_code)"></span>- <span x-show="parseFloat(account.current_balance) === 0.0" class="text-muted"- x-text="formatMoney(account.current_balance, account.primary_currency_code)"></span>- <span x-show="parseFloat(account.current_balance) > 0.0" class="text-success"- x-text="formatMoney(account.current_balance, account.primary_currency_code)"></span>- <template x-if="null !== account.pc_current_balance">- <span>(- <span x-show="parseFloat(account.pc_current_balance) < 0.0" class="text-danger"- x-text="formatMoney(account.pc_current_balance, account.primary_currency_code)"></span>- <span x-show="parseFloat(account.pc_current_balance) === 0.0" class="text-muted"- x-text="formatMoney(account.pc_current_balance, account.primary_currency_code)"></span>- <span x-show="parseFloat(account.pc_current_balance) > 0.0" class="text-success"- x-text="formatMoney(account.pc_current_balance, account.primary_currency_code)"></span>- )- </span>- </template>- </td>- <td x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">- <template x-if="null !== account.debt_amount">- <span>- <span x-show="null != account.debt_amount && account.debt_amount < 0" class="text-danger"- x-text="formatMoney(account.debt_amount, account.currency_code)"></span>- <span x-show="null != account.debt_amount && account.debt_amount == 0" class="text-muted"- x-text="formatMoney(account.debt_amount, account.currency_code)"></span>- <span x-show="null != account.debt_amount && account.debt_amount > 0" class="text-success"- x-text="formatMoney(account.debt_amount, account.currency_code)"></span>- </span>-- <template x-if="null !== account.pc_debt_amount">- <span>(- <span x-show="parseFloat(account.pc_debt_amount) < 0.0" class="text-danger"- x-text="formatMoney(account.pc_debt_amount, account.primary_currency_code)"></span>- <span x-show="parseFloat(account.pc_debt_amount) === 0.0" class="text-muted"- x-text="formatMoney(account.pc_debt_amount, account.primary_currency_code)"></span>- <span x-show="parseFloat(account.pc_debt_amount) > 0.0" class="text-success"- x-text="formatMoney(account.pc_debt_amount, account.primary_currency_code)"></span>- )- </span>- </template>- </template>-- </td>- <td x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">- <span x-text="account.last_activity"></span>- </td>- <td x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled">- <template x-if="null !== account.balance_difference">- <span>- <span x-show="null != account.balance_difference && account.balance_difference < 0" class="text-danger"- x-text="formatMoney(account.balance_difference, account.currency_code)"></span>- <span x-show="null != account.balance_difference && account.balance_difference == 0" class="text-muted"- x-text="formatMoney(account.balance_difference, account.currency_code)"></span>- <span x-show="null != account.balance_difference && account.balance_difference > 0" class="text-success"- x-text="formatMoney(account.balance_difference, account.currency_code)"></span>- </span>-- <template x-if="null !== account.pc_balance_difference">- <span>(- <span x-show="parseFloat(account.pc_balance_difference) < 0.0" class="text-danger"- x-text="formatMoney(account.pc_balance_difference, account.primary_currency_code)"></span>- <span x-show="parseFloat(account.pc_balance_difference) === 0.0" class="text-muted"- x-text="formatMoney(account.pc_balance_difference, account.primary_currency_code)"></span>- <span x-show="parseFloat(account.pc_balance_difference) > 0.0" class="text-success"- x-text="formatMoney(account.pc_balance_difference, account.primary_currency_code)"></span>- )- </span>- </template>-- </template>- </td>- <td x-show="tableColumns.menu.visible && tableColumns.menu.enabled">- <div class="btn-group btn-group-sm">- <a :href="'./accounts/edit/' + account.id" class="btn btn-sm btn-light"><em- class="fa-solid fa-pencil"></em></a>- <button type="button"- class="btn btn-light dropdown-toggle dropdown-toggle-split"- data-bs-toggle="dropdown" aria-expanded="false">- <span- class="visually-hidden">{{ __('firefly.toggle_dropdown') }}</span>- </button>- <ul class="dropdown-menu">- <li><a class="dropdown-item"- :href="'./accounts/show/' + account.id"><em- class="fa-solid fa-eye"></em> {{ __('firefly.show') }}- </a></li>- <li><a class="dropdown-item"- :href="'./accounts/reconcile/' + account.id"><em- class="fa-solid fa-calculator"></em> {{ __('firefly.reconcile_selected') }}- </a></li>- <li><a class="dropdown-item"- :href="'./accounts/delete/' + account.id"><em- class="fa-solid fa-trash"></em> {{ __('firefly.delete') }}- </a></li>- </ul>- </div>- </td>- </tr>- </template>- </tbody>-- </table>- </div>- </div>-- </div>- </div>- </template>- <div class="row mb-3">- <div class="col">- <div x-html="pageNavigation">- </div>- </div>- <!-- TODO repeated thing -->- <!-- Internal settings modal -->- <div class="modal fade" id="internalsModal" tabindex="-1" aria-labelledby="internalsModalLabel"- aria-hidden="true">- <div class="modal-dialog modal-lg">- <div class="modal-content">- <div class="modal-header">- <h1 class="modal-title fs-5" id="internalsModalLabel">{{ __('firefly.page_settings_header') }}</h1>- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>- </div>- <div class="modal-body">- <div class="row mb-3">- <label class="col-sm-4 col-form-label">{{ __('firefly.visible_columns') }}</label>- <div class="col-sm-8">- <template x-for="(column, key) in tableColumns" :key="key">- <div class="form-check form-switch form-check-inline" x-show="column.visible">- <label>- <input class="form-check-input" type="checkbox" x-model="column.enabled"- @change="saveColumnSettings"> <span- x-text="$t('list.'+key)"></span>- </label>- </div>- </template>- </div>- </div>- <div class="row mb-3">- <label class="col-sm-4 col-form-label">{{ __('firefly.accounts_to_show') }}</label>- <div class="col-sm-8">- <select @change="saveActiveFilter" class="form-control">- <option value="active" :selected="true === filters.active" label="{{ __('firefly.active_accounts_only') }}">{{ __('firefly.active_accounts_only') }}</option>- <option value="inactive" :selected="false === filters.active" label="{{ __('firefly.inactive_accounts_only') }}">{{ __('firefly.inactive_accounts_only') }}- </option>- <option value="both" :selected="null === filters.active" label="{{ __('firefly.show_all_accounts') }}">{{ __('firefly.show_all_accounts') }}</option>- </select>- </div>- </div>- <div class="row mb-3">- <label class="col-sm-4 col-form-label">{{ __('firefly.group_accounts') }}</label>- <div class="col-sm-8">- <div class="form-check form-switch">- <label>- <input class="form-check-input" type="checkbox" @change="saveGroupedAccounts"- x-model="pageOptions.groupedAccounts"><span>{{ __('firefly.group_accounts') }}</span>- </label>- </div>- </div>- </div>- <!--- <div class="row mb-3">- <label for="inputEmail3" class="col-sm-4 col-form-label">Show info boxes</label>- <div class="col-sm-8">- <div class="form-check form-switch form-check-inline">- <label>- <input class="form-check-input" type="checkbox"> <span>Box A</span>- </label>- </div>- <div class="form-check form-switch form-check-inline">- <label>- <input class="form-check-input" type="checkbox"> <span>Box B</span>- </label>- </div>- <div class="form-check form-switch form-check-inline">- <label>- <input class="form-check-input" type="checkbox"> <span>Box C</span>- </label>- </div>- </div>- </div>- -->- </div>- <div class="modal-footer">- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>- </div>- </div>- </div>- </div>- </div>- </div>-- <!-- TODO this is a repeated piece of code -->- <div class="modal fade" id="filterModal" tabindex="-1" aria-labelledby="filterModalLabel" aria-hidden="true">- <div class="modal-dialog modal-sm">- <div class="modal-content">- <div class="modal-header">- <h1 class="modal-title fs-5" id="filterModalLabel">TODO Filter field</h1>- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>- </div>- <div class="modal-body">- <div class="mb-3">- <label for="filterInput" class="form-label">Search in column: <span x-text="lastClickedFilter"></span></label>- <input @keyup.enter="applyFilter" type="text" class="form-control" id="filterInput" placeholder="" x-model="lastFilterInput">- </div>- </div>- <div class="modal-footer">- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><em- class="fa-solid fa-right-from-bracket"></em> Cancel- </button>- <button @click="applyFilter" type="button" class="btn btn-primary" data-bs-dismiss="modal"><em- class="fa-solid fa-magnifying-glass"></em> Search- </button>-- </div>- </div>- </div>- </div>-- <!-- TODO this is a repeated piece of code -->- <div class="modal fade" id="wizardModal" tabindex="-1" aria-labelledby="wizardModalLabel" aria-hidden="true">- <div class="modal-dialog modal-lg">- <div class="modal-content">- <div class="modal-header">- <h1 class="modal-title fs-5" id="wizardModalLabel">TODO Would you like to know more?</h1>- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>- </div>- <div class="modal-body">- Quick intro about this page<br><br>- Need to learn what's on this page?<br>- Take me to the help pages (opens in a new window or tab)- </div>- <div class="modal-footer">- <button type="button" class="btn btn-primary" data-bs-dismiss="modal"><em- class="fa-solid fa-hat-wizard"></em> Show me around- </button>- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><em- class="fa-solid fa-right-from-bracket"></em> Take me to the documentation- </button>- </div>- </div>- </div>- </div>--@endsection-@section('scripts')- @vite(['src/pages/accounts/index.js'])-@endsectiondiff --git a/resources/assets/v2/views/v2/administrations/create.blade.php b/resources/assets/v2/views/v2/administrations/create.blade.phpdeleted file mode 100644index d1c9597f6b..0000000000--- a/resources/assets/v2/views/v2/administrations/create.blade.php+++ /dev/null@@ -1,57 +0,0 @@-@extends('layout.v2')-@section('scripts')- @vite(['src/pages/administrations/create.js'])-@endsection-@section('content')- <div class="app-content">- <!--begin::Container-->- <div class="container-fluid" x-data="administrations" id="form">- <x-messages></x-messages>- <div class="row mb-3">- <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title"- >{{ __('firefly.basic_administration_information') }}</h3>- </div>- <div class="card-body">- <!-- TITLE -->- @include('partials.form.title')- </div>- </div>- </div>- </div>- <div class="row mb-3">- <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">- {{ __('firefly.submission_options') }}- </h3>- </div>- <div class="card-body">- @include('partials.form.submission-options')- </div>- <div class="card-footer">- <div class="row">- <div class="col text-end">- <div class="btn-group">- <button @click="cancelForm()" class="btn btn-danger text-white"- :disabled="formStates.isSubmitting">- <em class="fa-solid fa-arrow-left"></em>- {{ __('firefly.cancel') }}</button>- <button class="btn btn-primary text-white" :disabled="formStates.isSubmitting"- @click="submitForm()">- <em class="fa-regular fa-circle-check"></em>- {{ __('firefly.submit') }}</button>- </div>- </div>- </div>- </div>- </div>- </div>- </div>- </div>- </div>--@endsectiondiff --git a/resources/assets/v2/views/v2/administrations/edit.blade.php b/resources/assets/v2/views/v2/administrations/edit.blade.phpdeleted file mode 100644index cf0201eb3b..0000000000--- a/resources/assets/v2/views/v2/administrations/edit.blade.php+++ /dev/null@@ -1,57 +0,0 @@-@extends('layout.v2')-@section('scripts')- @vite(['src/pages/administrations/edit.js'])-@endsection-@section('content')- <div class="app-content">- <!--begin::Container-->- <div class="container-fluid" x-data="administrations" id="form">- <x-messages></x-messages>- <div class="row mb-3">- <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title"- >{{ __('firefly.basic_administration_information') }}</h3>- </div>- <div class="card-body">- <!-- TITLE -->- @include('partials.form.title')- </div>- </div>- </div>- </div>- <div class="row mb-3">- <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">- {{ __('firefly.submission_options') }}- </h3>- </div>- <div class="card-body">- @include('partials.form.submission-options')- </div>- <div class="card-footer">- <div class="row">- <div class="col text-end">- <div class="btn-group">- <button @click="cancelForm()" class="btn btn-danger text-white"- :disabled="formStates.isSubmitting">- <em class="fa-solid fa-arrow-left"></em>- {{ __('firefly.cancel') }}</button>- <button class="btn btn-primary text-white" :disabled="formStates.isSubmitting"- @click="submitForm()">- <em class="fa-regular fa-circle-check"></em>- {{ __('firefly.submit') }}</button>- </div>- </div>- </div>- </div>- </div>- </div>- </div>- </div>- </div>--@endsectiondiff --git a/resources/assets/v2/views/v2/administrations/index.blade.php b/resources/assets/v2/views/v2/administrations/index.blade.phpdeleted file mode 100644index 0afc3eb2cb..0000000000--- a/resources/assets/v2/views/v2/administrations/index.blade.php+++ /dev/null@@ -1,101 +0,0 @@-@extends('layout.v2')-@section('scripts')- @vite(['src/pages/administrations/index.js'])-@endsection-@section('content')- <div class="app-content">- <div class="container-fluid" x-data="index">- <x-messages></x-messages>- <div class="row mb-3">- <div class="col">- <p>- <a href="{{route('administrations.create')}}"- class="btn btn-primary">{{ __('firefly.create_administration') }}</a>- </p>- </div>- </div>- <div class="row mb-3">- <template x-for="(group, index) in userGroups" :key="index">- <div class="col-xl-4 col-lg-4 col-sm-6 col-xs-12 mb-3">- <div :class="{'card': true, 'card-primary': group.in_use}">- <div class="card-header">- <h3 class="card-title">- <template x-if="group.in_use">- <em class="fa-regular fa-square-check"></em>- </template>- Administration "<span x-text="group.title"></span>"</h3>- </div>- <div class="card-body">- <ul>- <template x-if="'' !== group.owner">- <li x-text="group.owner"></li>- </template>- <template x-if="'' !== group.you">- <li x-text="group.you"></li>- </template>- </ul>- <template x-if="group.memberCountExceptYou > 0">- <div>- <h5>{{ __('firefly.other_users_in_admin') }}</h5>- <ul>- <template x-for="(member, jndex) in group.members" :key="jndex">- <li>- <span x-text="member.email"></span>- <ul>- <template x-for="(role, kndex) in member.roles" :key="kndex">- <li x-text="role"></li>- </template>- </ul>- </li>- </template>- </ul>- </div>- </template>- TODO Last changes: date<br>- TODO features in use (icons)- </div>- <div class="card-footer">- <div class="btn-group">- <template x-if="false === group.in_use">- <button @click="useAdministration(group.id)" class="btn btn-primary">- <em class="fa-solid fa-coins"></em> Use- </button>- </template>- <template x-if="true === group.isOwner">- <a :href="'{{route('administrations.edit', [''])}}/' + group.id" class="btn btn-primary">- <em class="fa-solid fa-pencil"></em> {{ __('firefly.edit') }}- </a>- </template>- <template x-if="true === group.isOwner">- <a href="#" class="btn btn-primary">- <em class="fa-solid fa-users"></em> Access rights- </a>- </template>- <template x-if="true === group.isOwner">- <a href="#" class="btn btn-danger text-white">- <em class="fa-solid fa-trash"></em> Delete- </a>- </template>- <template x-if="true !== group.isOwner">- <a href="#" class="btn btn-warning">- <em class="fa-solid fa-person-walking-dashed-line-arrow-right"></em> Leave- </a>- </template>- </div>- </div>- </div>- </div>- </template>- </div>- <div class="row mb-3">- <div class="col">- <p>- <a href="{{route('administrations.create')}}"- class="btn btn-primary">{{ __('firefly.create_administration') }}</a>- </p>- </div>- </div>- </div>- </div>--@endsectiondiff --git a/resources/assets/v2/views/v2/components/messages.blade.php b/resources/assets/v2/views/v2/components/messages.blade.phpdeleted file mode 100644index 2d90bd8d00..0000000000--- a/resources/assets/v2/views/v2/components/messages.blade.php+++ /dev/null@@ -1,33 +0,0 @@-<div class="row mb-2">- <div class="col">- <template x-if="notifications.success.show">- <div class="alert alert-success alert-dismissible fade show" role="alert">- <template x-if="notifications.success.url != ''">- <a :href="notifications.success.url" class="alert-link" x-text="notifications.success.text"></a>- </template>- <template x-if="notifications.success.url == ''">- <span x-text="notifications.success.text"></span>- </template>- <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>- </div>- </template>- <template x-if="notifications.error.show">- <div class="alert alert-danger alert-dismissible fade show" role="alert">- <template x-if="notifications.error.url != ''">- <a :href="notifications.error.url" class="alert-link" x-text="notifications.error.text"></a>- </template>- <template x-if="notifications.error.url == ''">- <span x-text="notifications.error.text"></span>- </template>- <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>- </div>- </template>- <template x-if="notifications.wait.show">- <div class="alert alert-info alert-dismissible fade show" role="alert">- <em class="fa-solid fa-spinner fa-spin"></em>- <span x-text="notifications.wait.text"></span>- <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>- </div>- </template>- </div>-</div>diff --git a/resources/assets/v2/views/v2/components/transaction-split.blade.php b/resources/assets/v2/views/v2/components/transaction-split.blade.phpdeleted file mode 100644index e03ae6837e..0000000000--- a/resources/assets/v2/views/v2/components/transaction-split.blade.php+++ /dev/null@@ -1,132 +0,0 @@-<div :class="{'tab-pane fade pt-2':true, 'show active': index ===0}" :id="'split-'+index+'-pane'" role="tabpanel"- :aria-labelledby="'split-'+index+'-tab'" tabindex="0" x-init="addedSplit()">- <div class="row mb-2">- <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12 mb-2">- <!-- BASIC TRANSACTION INFORMATION -->- <div class="card">- <div class="card-header">- <h3 class="card-title"- >{{ __('firefly.basic_journal_information') }}</h3>- </div>- <div class="card-body">- <!-- DESCRIPTION -->- @include('partials.form.transaction.description')-- <!-- SOURCE ACCOUNT -->- @include('partials.form.transaction.source-account')-- <!-- DESTINATION ACCOUNT -->- @include('partials.form.transaction.destination-account')-- <!-- DATE AND TIME -->- @include('partials.form.transaction.date-time')- </div>- </div>- </div>- <div class="col-xl-6 col-lg-6 col-md-12 col-xs-12 mb-2">-- <!-- AMOUNTS -->- <div class="card">- <div class="card-header">- <h3 class="card-title">- {{ __('firefly.transaction_journal_amount') }}- </h3>- </div>- <div class="card-body">- <!-- AMOUNT -->- @include('partials.form.transaction.amount')-- <!-- FOREIGN AMOUNT -->- @include('partials.form.transaction.foreign-amount')- </div>- </div>- </div>- <!-- META DATA -->- <div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">- <div class="card">- <div class="card-header">- <h3 class="card-title">- {{ __('firefly.transaction_journal_meta') }}- </h3>- </div>- <div class="card-body">- <!-- BUDGET -->- @include('partials.form.transaction.budget')-- <!-- CATEGORY -->- @include('partials.form.transaction.category')-- <!-- PIGGY BANK -->- @include('partials.form.transaction.piggy-bank')-- <!-- SUBSCRIPTION -->- @include('partials.form.transaction.subscription')-- <!-- TAGS -->- @include('partials.form.transaction.tags')-- <!-- NOTES -->- @include('partials.form.transaction.notes')- </div>- </div>-- </div>- <!-- EXTRA THINGS -->- <div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">- <div class="card">- <div class="card-header">- <h3 class="card-title">- {{ __('firefly.transaction_journal_extra') }}- </h3>- </div>- <div class="card-body">- <!-- ATTACHMENTS -->- @include('partials.form.transaction.attachments')-- <!-- INTERNAL REFERENCE -->- @include('partials.form.transaction.internal-reference')-- <!-- EXTERNAL URL -->- @include('partials.form.transaction.external-url')-- <!-- LOCATION -->- @include('partials.form.transaction.location')-- <!-- DATE FIELDS -->- @include('partials.form.transaction.date-fields')- </div>- </div>- </div>- <div class="col-xl-4 col-lg-6 col-md-12 col-xs-12 mb-2">- <div class="card">- <div class="card-header">- <h3 class="card-title">- {{ __('firefly.submission_options') }}- </h3>- </div>- <div class="card-body">- @include('partials.form.transaction.submission-options')- </div>- <div class="card-footer">- <div class="row">- <div class="col text-end">- <div class="btn-group">- <button @click="addSplit()" class="btn btn-secondary"- :disabled="formStates.isSubmitting">{{ __('firefly.add_another_split') }}</button>- <template x-if="1 !== entries.length">- <button :disabled="formStates.isSubmitting" class="btn btn-danger text-white"- @click="removeSplit(index)">{{ __('firefly.transaction_remove_split') }}</button>- </template>- <button class="btn btn-success text-white" :disabled="formStates.isSubmitting"- @click="submitTransaction()">{{ __('firefly.submit') }}</button>- </div>- </div>- </div>- </div>- </div>- </div>- <div class="col-12">-- </div>- </div>-</div>diff --git a/resources/assets/v2/views/v2/components/transaction-tab-list.blade.php b/resources/assets/v2/views/v2/components/transaction-tab-list.blade.phpdeleted file mode 100644index a930ade908..0000000000--- a/resources/assets/v2/views/v2/components/transaction-tab-list.blade.php+++ /dev/null@@ -1,32 +0,0 @@-<div class="row">- <div class="col">- <ul class="nav nav-tabs" id="splitTabs" role="tablist">- <template x-for="transaction,index in entries">- <li class="nav-item" role="presentation">- <button :id="'split-'+index+'-tab'"- :class="{'nav-link': true, 'active': index === 0 }"- data-bs-toggle="tab"- :data-bs-target="'#split-'+index+'-pane'"- type="button" role="tab"- :aria-controls="'split-'+index+'-pane'"- aria-selected="true">{{ __('firefly.single_split') }} #- <span x-text="index+1"></span>- </button>- </li>- </template>- <li class="nav-item" role="presentation">- <button class="nav-link" type="button" role="tab" @click="addSplit()"- ><em class="fa-solid fa-plus-circle"></em>- </button>- </li>- <li class="nav-item">- <a class="nav-link disabled" aria-disabled="true">- {{ __('firefly.total') }}:- <span x-text="formattedTotalAmount()"></span>- </a>- </li>--- </ul>-</div>-</div>diff --git a/resources/assets/v2/views/v2/errors/FireflyException.blade.php b/resources/assets/v2/views/v2/errors/FireflyException.blade.phpdeleted file mode 100644index b5f8a322f0..0000000000--- a/resources/assets/v2/views/v2/errors/FireflyException.blade.php+++ /dev/null@@ -1,64 +0,0 @@-@extends('views.layout.v2.error')-@section('status_code','500')-@section('status','Internal Server Error')-@section('sub_title', trans('errors.error_occurred'))-@section('content')- <div class="row">- <div class="col">- <p>- {{ trans('errors.error_not_recoverable') }}- </p>- <p class="text-danger">- {{ $exception->getMessage() ?? 'General unknown error' }}- </p>- <p>- {!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' => $exception->getLine(), 'code' => $exception->getCode() ]) !!}- </p>- </div>- </div>- @if(!$debug)- <div class="row">- <div class="col">- <h4>- {{ trans('errors.more_info') }}- </h4>- <p>- {!! trans('errors.collect_info') !!}- {!! trans('errors.collect_info_more') !!}- </p>- <h4>- {{ trans('errors.github_help') }}- </h4>- <p>- {!! trans('errors.github_instructions') !!}- </p>- <ol>- <li>{{ trans('errors.use_search') }}</li>- <li>{!! trans('errors.include_info', ['link' => route('debug') ]) !!}</li>- <li>{{ trans('errors.tell_more') }}</li>- <li>{{ trans('errors.include_logs') }}</li>- <li>{{ trans('errors.what_did_you_do') }}</li>- </ol>- </div>- </div>- @endif- @if($debug)- <div class="row">- <div class="col">- <h4>{{ trans('errors.error') }}</h4>- <p>- {!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' => $exception->getLine(), 'code' => $exception->getCode() ]) !!}- </p>- <h4>- {{ trans('errors.stacktrace') }}- </h4>- <div class="monospace">- {!! nl2br($exception->getTraceAsString()) !!}- </div>- </div>- </div>- @endif--@endsection--diff --git a/resources/assets/v2/views/v2/index.blade.php b/resources/assets/v2/views/v2/index.blade.phpdeleted file mode 100644index baa97f179e..0000000000--- a/resources/assets/v2/views/v2/index.blade.php+++ /dev/null@@ -1,87 +0,0 @@-@extends('layout.v2')-@section('content')-- <div class="app-content">- <!--begin::Container-->- <div class="container-fluid">- @include('partials.dashboard.boxes')-- <!-- row with account, budget and category data -->- <div class="row mb-2" x-data="accounts" x-bind="eventListeners">- <!-- column with 3 charts -->- <div class="col-xl-8 col-lg-12 col-sm-12 col-xs-12">- <!-- row with account chart -->- @include('partials.dashboard.account-chart')- <!-- row with budget chart -->- @include('partials.dashboard.budget-chart')- <!-- row with category chart -->- @include('partials.dashboard.category-chart')- </div>- <div class="col-xl-4 col-lg-12 col-sm-12 col-xs-12">- <!-- row with accounts list -->- @include('partials.dashboard.account-list')- </div>-- </div>- <!-- row with sankey chart -->- <div class="row mb-2">- @include('partials.dashboard.sankey')- </div>- <!-- row with piggy banks, subscriptions and empty box -->- <div class="row mb-2">- <!-- column with subscriptions -->- @include('partials.dashboard.subscriptions')- <!-- column with piggy banks -->- @include('partials.dashboard.piggy-banks')- <!-- column with to do things -->- <div class="col">- <div class="card">- <div class="card-header">- <h3 class="card-title"><a href="#" title="Something">Income + sum</a></h3>- </div>- <div class="card-body">- <p>- List of income + sum- </p>- </div>- </div>- </div>- </div>- </div>-- <div x-data="index" class="modal fade" id="internalsModal" tabindex="-1" aria-labelledby="internalsModalLabel"- aria-hidden="true">- <div class="modal-dialog modal-lg">- <div class="modal-content">- <div class="modal-header">- <h1 class="modal-title fs-5" id="internalsModalLabel">{{ __('firefly.page_settings_header') }}</h1>- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>- </div>- <div class="modal-body">- <div class="row mb-3">- <label class="col-sm-4 col-form-label">Convert to primary</label>- <div class="col-sm-8">- <div class="form-check form-switch form-check-inline">- <label>- <input class="form-check-input" x-model="convertToPrimary" type="checkbox" @change="savePrimarySettings"> <span- >Yes no</span>- </label>- </div>- </div>- </div>- </div>- <div class="modal-footer">- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>- </div>- </div>- </div>- </div>-- </div>----@endsection-@section('scripts')- @vite(['src/pages/dashboard/dashboard.js'])-@endsectiondiff --git a/resources/assets/v2/views/v2/layout/v2.blade.php b/resources/assets/v2/views/v2/layout/v2.blade.phpdeleted file mode 100644index 43796d2d1f..0000000000--- a/resources/assets/v2/views/v2/layout/v2.blade.php+++ /dev/null@@ -1,140 +0,0 @@-<!DOCTYPE html>-<html lang="{{ trans('config.html_language') }}">-<!-- data-bs-theme="dark" -->-<!--begin::Head-->-@include('partials.layout.head')-<!--end::Head-->--<!--begin::Body-->-<body class="layout-fixed sidebar-expand-lg bg-body-tertiary">-<!--begin::App Wrapper-->-<div class="app-wrapper">- <!--begin::Header-->- <nav class="app-header navbar navbar-expand bg-body">- <!--begin::Container-->- <div class="container-fluid">- <!--begin::Start Navbar Links-->- <ul class="navbar-nav">- <li class="nav-item">- <a class="nav-link" data-lte-toggle="sidebar" href="#" role="button">- <em class="fa-solid fa-bars"></em>- </a>- </li>- <!--begin::Navbar Search-->- <li class="nav-item">- <a class="nav-link" data-widget="navbar-search" href="#" role="button">- <em class="fa-solid fa-magnifying-glass"></em>- </a>- </li>- <li class="nav-item">- <a class="nav-link" href="#">- Size:- <span class="d-inline d-sm-none">xs</span>- <span class="d-none d-sm-inline d-md-none">sm</span>- <span class="d-none d-md-inline d-lg-none">md</span>- <span class="d-none d-lg-inline d-xl-none">lg</span>- <span class="d-none d-xl-inline d-xxl-none">xl</span>- <span class="d-none d-xxl-inline">xxl</span>- </a>- </li>- <!--end::Navbar Search-->- </ul>- <!--end::Start Navbar Links-->-- <!--begin::End Navbar Links-->- <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 d-none d-sm-block" data-bs-toggle="dropdown" href="#"></a>- <a class="nav-link daterange-icon d-block d-sm-none" data-bs-toggle="dropdown" href="#">- <em class="fa-regular fa-calendar-days"></em>- </a>- <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="changeDateRange" class="dropdown-item daterange-next">- next- </a>- <div class="dropdown-divider"></div>- <a href="#" class="dropdown-item daterange-prev" @click="changeDateRange">- prev- </a>- <div class="dropdown-divider"></div>- <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="changeDateRange">- {{ __('firefly.last_thirty_days') }}- </a>- <div class="dropdown-divider"></div>- <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="changeDateRange">- {{ __('firefly.year_to_date') }}- </a>- <div class="dropdown-divider"></div>- <a href="#" class="dropdown-item dropdown-footer daterange-custom" @click="app.doCustomRange">- TODO {{ __('firefly.customRange') }}- </a>- </div>- </li>- <!-- end date range drop down -->- <!-- user menu -->- @include('partials.layout.topbar')- </ul>- <!--end::End Navbar Links-->- </div>- <!--end::Container-->- </nav>- <!--end::Header-->- <!--begin::Sidebar-->- @include('partials.layout.sidebar')- <!--end::Sidebar-->- <!--begin::App Main-->- <main class="app-main">- <!--begin::App Content Header-->- <div class="app-content-header">- <!--begin::Container-->- <div class="container-fluid">- <!--begin::Row-->- <div class="row">- <div class="col-sm-6">- <h3 class="mb-0">- @if($mainTitleIcon)- <em class="fa {{ $mainTitleIcon }}"></em>- @endif- {{ $title }} @if($subTitle)- <small class="text-muted" id="pageSubTitle">- {{$subTitle}}</small>- @endif</h3>- </div>- <div class="col-sm-6">- {{ Breadcrumbs::render() }}- </div>- </div>- <!--end::Row-->- </div>- <!--end::Container-->- </div>- <!--end::App Content Header-->- <!--begin::App Content-->- @yield('content')- <!--end::App Content-->- </main>- <!--end::App Main-->-- <!--begin::Footer-->- @include('partials.layout.footer')-- <!--end::Footer-->-</div>-@include('partials.layout.scripts')-</body>--</html>diff --git a/resources/assets/v2/views/v2/partials/dashboard/account-chart.blade.php b/resources/assets/v2/views/v2/partials/dashboard/account-chart.blade.phpdeleted file mode 100644index d2fbd67559..0000000000--- a/resources/assets/v2/views/v2/partials/dashboard/account-chart.blade.php+++ /dev/null@@ -1,15 +0,0 @@-<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 p-0" style="position: relative;height:400px;">- <canvas id="account-chart"></canvas>- </div>- </div>-- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/dashboard/account-list.blade.php b/resources/assets/v2/views/v2/partials/dashboard/account-list.blade.phpdeleted file mode 100644index 55170d2466..0000000000--- a/resources/assets/v2/views/v2/partials/dashboard/account-list.blade.php+++ /dev/null@@ -1,85 +0,0 @@-<div class="row mb-2">- <template x-if="loadingAccounts">- <p class="text-center">- <em class="fa-solid fa-spinner fa-spin"></em>- </p>- </template>- <template x-for="account in accountList">- <div class="col-12 mb-2" x-model="account">- <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">- <span class="text-muted">(<span x-text="account.current_balance"></span>)</span>- <template x-if="null !== account.pc_current_balance"><span class="text-muted">(<span x-text="account.pc_current_balance"></span>)</span></template>- </span>- </h3>- </div>- <div class="card-body p-0">- <p class="text-center small" x-show="account.groups.length < 1">- {{ __('firefly.no_transactions_period') }}- </p>- <table class="table table-sm" x-show="account.groups.length > 0">- <tbody>- <template x-for="group in account.groups">- <tr>- <td>- <template x-if="group.title">- <span>- <template x-if="group.transactions[0].type === 'withdrawal'">- <span class="text-muted fa-solid fa-arrow-left fa-fw"></span>- </template>- <template x-if="group.transactions[0].type === 'deposit'">- <span class="text-muted fa-solid fa-arrow-right fa-fw"></span>- </template>- <template x-if="group.transactions[0].type === 'transfer'">- <span class="text-muted fa-solid fa-arrows-rotate fa-fw"></span>- </template>- <a :href="'{{route('transactions.show', '') }}/' + group.id" x-text="group.title"></a><br/></span>- </template>- <ul class="list-unstyled list-no-margin">- <template x-for="transaction in group.transactions">- <li :class="{'list-indent': group.title}">- <template x-if="group.title">- <span x-text="transaction.description"></span>- </template>- <template x-if="!group.title">- <span>- <template x-if="transaction.type == 'withdrawal'">- <span class="text-muted fa-solid fa-arrow-left fa-fw"></span>- </template>- <template x-if="transaction.type == 'deposit'">- <span class="text-muted fa-solid fa-arrow-right fa-fw"></span>- </template>- <template x-if="transaction.type == 'transfer'">- <span class="text-muted fa-solid fa-arrows-rotate fa-fw"></span>- </template>- <a :href="'{{route('transactions.show', '') }}/' + group.id" x-text="transaction.description"></a>- </span>- </template>- </li>- </template>- </ul>- </td>- <td style="width:30%;" class="text-end">- <template x-if="group.title">- <span><br/></span>- </template>- <ul class="list-unstyled list-no-margin">- <template x-for="transaction in group.transactions">- <li>- @include('partials.elements.amount', ['convertToPrimary' => $convertToPrimary,'type' => 'transaction.type','amount' => 'transaction.amount', 'primary' => 'transaction.pc_amount'])- </li>- </template>- </ul>- </td>- </tr>- </template>- </tbody>- </table>- </div>- </div>- </div>- </template>-</div>diff --git a/resources/assets/v2/views/v2/partials/dashboard/boxes.blade.php b/resources/assets/v2/views/v2/partials/dashboard/boxes.blade.phpdeleted file mode 100644index 05d2d61f70..0000000000--- a/resources/assets/v2/views/v2/partials/dashboard/boxes.blade.php+++ /dev/null@@ -1,187 +0,0 @@-<div class="row mb-2" x-data="boxes" x-bind="eventListeners">- <div class="col-xl-3 col-lg-6 col-md-12 col-sm-12">- <div class="small-box text-bg-primary">- <div class="inner balance-box">- <h4 class="hover-expand">- <template x-if="0 === balanceBox.amounts.length">- <span> </span>- </template>- <template x-for="(amount, index) in balanceBox.amounts" :key="index">- <span>- <span x-text="amount"></span><span- :class="{ 'invisible': (balanceBox.amounts.length == index+1) }">, </span>- </span>- </template>- </h4>- <template x-if="loading">- <p class="d-none d-xs-block">- <em class="fa-solid fa-spinner fa-spin"></em>- </p>- </template>- <template x-if="!loading && 0 !== balanceBox.amounts.length">- <p class="d-none d-sm-block">- <a href="{{ route('reports.report.default', ['allAssetAccounts',$start->format('Ymd'),$end->format('Ymd')]) }}">{{ __('firefly.in_out_period') }}</a>- </p>- </template>- <template x-if="!loading && 0 === balanceBox.amounts.length">- <p class="d-none d-sm-block">- TODO (no money in or out)- </p>- </template>- </div>- <span class="small-box-icon">- <i class="fa-solid fa-scale-balanced"></i>- </span>-- <div class="small-box-footer hover-footer d-none d-xl-block">- <template x-if="0 === balanceBox.subtitles.length">- <span> </span>- </template>- <template x-for="(subtitle, index) in balanceBox.subtitles" :key="index">- <span>- <span x-text="subtitle"></span><span- :class="{ 'invisible': (balanceBox.amounts.length == index+1) }"> & </span>- </span>- </template>- </div>- </div>- <!--end::Small Box Widget 1-->- </div>- <!--end::Col-->- <div class="col-xl-3 col-lg-6 col-md-12 col-sm-12" style="flex-grow: 1;">- <!--begin::Small Box Widget 2-->- <div class="small-box text-bg-success">- <div class="inner">- <template x-if="0 === billBox.unpaid.length">- <h4> </h4>- </template>- <template x-if="billBox.unpaid.length > 0">- <h4 class="hover-expand">- <template x-for="(amount, index) in billBox.unpaid" :key="index">- <span>- <span x-text="amount"></span><span- :class="{ 'invisible': (billBox.unpaid.length == index+1) }">, </span>- </span>- </template>- </h4>- </template>- <template x-if="loading">- <p class="d-none d-sm-block">- <em class="fa-solid fa-spinner fa-spin"></em>- </p>- </template>- <template x-if="!loading && billBox.unpaid.length > 0">- <p class="d-none d-sm-block"><a href="{{ route('subscriptions.index') }}">{{ __('firefly.bills_to_pay') }}</a></p>- </template>- <template x-if="0 === billBox.unpaid.length && !loading">- <p class="d-none d-sm-block">TODO No subscriptions are waiting to be paid</p>- </template>- </div>- <span class="small-box-icon">- <em class="fa-regular fa-calendar"></em>- </span>- <span class="small-box-footer d-none d-xl-block">- <template x-if="0 === billBox.paid.length">- <span> </span>- </template>- <template x-if="billBox.paid.length > 0">- <span>- {{ __('firefly.paid') }}:- <template x-for="(amount, index) in billBox.paid" :key="index">- <span>- <span x-text="amount"></span><span- :class="{ 'invisible': (billBox.paid.length == index+1) }">, </span>- </span>- </template>- </span>- </template>- </span>- </div>- <!--end::Small Box Widget 2-->- </div>- <!--end::Col-->- <div class="col-xl-3 col-lg-6 col-md-12 col-sm-12" style="flex-grow: 1;">- <!--begin::Small Box Widget 3-->- <div class="small-box text-bg-warning">- <div class="inner">- <h4 class="hover-expand">- <template x-if="0 === leftBox.left.length">- <span> </span>- </template>- <template x-for="(amount, index) in leftBox.left" :key="index">- <span>- <span x-text="amount"></span><span- :class="{ 'invisible': (leftBox.left.length == index+1) }">, </span>- </span>- </template>- </h4>-- <template x-if="loading">- <p class="d-none d-sm-block">- <em class="fa-solid fa-spinner fa-spin"></em>- </p>- </template>- <template x-if="!loading && 0 !== leftBox.left.length">- <p class="d-none d-sm-block"><a href="{{ route('budgets.index') }}">{{ __('firefly.left_to_spend') }}</a></p>- </template>- <template x-if="!loading && 0 === leftBox.left.length">- <p class="d-none d-sm-block">TODO no money is budgeted in this period</p>- </template>- </div>- <span class="small-box-icon">- <em class="fa-solid fa-money-check-dollar"></em>- </span>- <span class="small-box-footer d-none d-xl-block">- <template x-if="0 !== leftBox.perDay.length">- <span>{{ __('firefly.per_day') }}:</span>- </template>- <template x-if="0 === leftBox.perDay.length">- <span> </span>- </template>- <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-xl-3 col-lg-6 col-md-12 col-sm-12" style="flex-grow: 1;">- <!--begin::Small Box Widget 4-->- <div class="small-box text-bg-danger">- <div class="inner">- <h4 class="hover-expand">- <template x-for="(amount, index) in netBox.net" :key="index">- <span>- <span x-text="amount"></span><span- :class="{ 'invisible': (netBox.net.length == index+1) }">, </span>- </span>- </template>- </h4>-- <template x-if="loading">- <p class="d-none d-sm-block">- <em class="fa-solid fa-spinner fa-spin"></em>- </p>- </template>- <template x-if="!loading">- <p class="d-none d-sm-block">- <a href="{{ route('reports.report.default', ['allAssetAccounts','currentYearStart','currentYearEnd']) }}">{{ __('firefly.net_worth') }}</a>- </p>- </template>- </div>- <span class="small-box-icon">- <i class="fa-solid fa-chart-line"></i>- </span>- <span class="small-box-footer d-none d-xl-block">- - </span>- </div>- <!--end::Small Box Widget 4-->- </div>- <!--end::Col-->-</div>-<!--end::Row-->diff --git a/resources/assets/v2/views/v2/partials/dashboard/budget-chart.blade.php b/resources/assets/v2/views/v2/partials/dashboard/budget-chart.blade.phpdeleted file mode 100644index 33e81a7c9c..0000000000--- a/resources/assets/v2/views/v2/partials/dashboard/budget-chart.blade.php+++ /dev/null@@ -1,15 +0,0 @@-<div class="row mb-2" x-data="budgets" x-bind="eventListeners">- <div class="col">- <div class="card">- <div class="card-header">- <h3 class="card-title"><a href="{{ route('budgets.index') }}"- title="{{ __('firefly.go_to_budgets') }}">{{ __('firefly.budgetsAndSpending') }}</a>- </h3>- </div>- <div class="card-body p-0" style="position: relative;height:350px;">- <canvas id="budget-chart"></canvas>- </div>- </div>-- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/dashboard/category-chart.blade.php b/resources/assets/v2/views/v2/partials/dashboard/category-chart.blade.phpdeleted file mode 100644index f5e10fdd08..0000000000--- a/resources/assets/v2/views/v2/partials/dashboard/category-chart.blade.php+++ /dev/null@@ -1,14 +0,0 @@-<div class="row mb-2" x-data="categories" x-bind="eventListeners">- <div class="col">- <div class="card">- <div class="card-header">- <h3 class="card-title"><a href="{{ route('categories.index') }}"- title="{{ __('firefly.go_to_categories') }}">{{ __('firefly.categories') }}</a>- </h3>- </div>- <div class="card-body p-0" style="position: relative;height:350px;">- <canvas id="category-chart"></canvas>- </div>- </div>- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/dashboard/piggy-banks.blade.php b/resources/assets/v2/views/v2/partials/dashboard/piggy-banks.blade.phpdeleted file mode 100644index 53bdd2a23f..0000000000--- a/resources/assets/v2/views/v2/partials/dashboard/piggy-banks.blade.php+++ /dev/null@@ -1,26 +0,0 @@-<div class="col" x-data="piggies">-- <template x-for="group in piggies">- <div class="card mb-2">- <div class="card-header">- <h3 class="card-title"><a href="{{ route('piggy-banks.index') }}" title="{{ __('firefly.go_to_piggies') }}">{{ __('firefly.piggy_banks') }}- (<span x-text="group.title"></span>)</a></h3>- </div>- <ul class="list-group list-group-flush">- <template x-for="piggy in group.piggies">- <li class="list-group-item">- <strong x-text="piggy.name"></strong>- <div class="progress" role="progressbar" aria-label="Info example"- :aria-valuenow="piggy.percentage" aria-valuemin="0" aria-valuemax="100">- <div class="progress-bar bg-info text-dark"- :style="'width: ' + piggy.percentage +'%'">- <span x-text="piggy.percentage + '%'"></span>- </div>- </div>- </li>- </template>- </ul>- </div>- </template>--</div>diff --git a/resources/assets/v2/views/v2/partials/dashboard/sankey.blade.php b/resources/assets/v2/views/v2/partials/dashboard/sankey.blade.phpdeleted file mode 100644index a1f622b7dc..0000000000--- a/resources/assets/v2/views/v2/partials/dashboard/sankey.blade.php+++ /dev/null@@ -1,13 +0,0 @@-<div class="col">- <div class="card">- <div class="card-header">- <h3 class="card-title"><a href="{{ route('reports.index') }}"- title="{{ __('firefly.income_and_expense') }}"- >{{ __('firefly.income_and_expense') }}</a>- </h3>- </div>- <div class="card-body" x-data="sankey" x-bind="eventListeners">- <canvas id="sankey-chart"></canvas>- </div>- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/dashboard/subscriptions.blade.php b/resources/assets/v2/views/v2/partials/dashboard/subscriptions.blade.phpdeleted file mode 100644index a1850cd124..0000000000--- a/resources/assets/v2/views/v2/partials/dashboard/subscriptions.blade.php+++ /dev/null@@ -1,164 +0,0 @@-<div class="col" x-data="subscriptions" x-bind="eventListeners">- <template x-for="group in subscriptions">- <div class="card mb-2">- <div class="card-header">- <h3 class="card-title">- <a href="{{ route('subscriptions.index') }}" title="{{ __('firefly.go_to_subscriptions') }}">- <span x-text="group.title"></span>- </a>- </h3>- </div>- <div class="card-body">- <template x-for="pi in group.payment_info">- <div class="row mb-2">- <div class="col">- <div class="progress" role="progressbar" aria-label="Example with label"- :aria-valuenow="(pi.paid*-1/pi.unpaid)*100" aria-valuemin="0" aria-valuemax="100">- <div class="progress-bar progress-bar-striped" :style="'width: ' + (pi.paid*-1/pi.unpaid)*100 + '%'">- <span x-text="formatMoney(pi.paid*-1,pi.currency_code)"></span>- </div>- </div>- <p>- <small>~ <span x-text="formatMoney(pi.unpaid, pi.currency_code)"></span> {{ __('firefly.left_to_pay_lc') }}</small>- </p>- </div>- </div>- </template>- <div class="row mb-2">- <table class="table table-striped table-hover">- <thead>- <tr>- <th>{{ __('firefly.subscription') }}</th>- <th>{{ __('firefly.expected_amount') }}</th>- </tr>- </thead>- <tbody>- <template x-for="bill in group.bills">- <tr>- <td>- <a :href="'{{ route('subscriptions.show',['']) }}/' + bill.id" :title="bill.name"><span x-text="bill.name"></span></a>- <template x-if="bill.paid">- <small class="text-muted"><br>{{ __('firefly.paid') }}</small>- </template>- <template x-if="!bill.paid">- <small class="text-muted"><br>{{ __('firefly.unpaid') }}</small>- </template>- </td>- <td>- <template x-if="!bill.paid">- <span>- <template x-if="1 === bill.pay_dates.length">- <span x-text="'~ ' + bill.expected_amount"></span>- </template>- <template x-if="bill.pay_dates.length > 1">- <span>- <span x-text="bill.expected_times"></span>- </span>- </template>- </span>- </template>- <template x-if="bill.paid">- <ul class="list-unstyled">- <template x-for="transaction in bill.transactions">- <li>- <span :title="transaction.amount" x-text="transaction.amount"></span>- <template x-if="transaction.percentage < 0">- <span>- (<span :title="transaction.percentage + '% {{ __("firefly.less_than_expected") }}'" x-text="transaction.percentage"></span>%)- </span>- </template>- <template x-if="transaction.percentage > 0">- <span>- (<span :title="transaction.percentage + '% {{ __("firefly.more_than_expected") }}'" x-text="transaction.percentage"></span>%)- </span>- </template>- </li>- </template>- </ul>- </template>- </td>- </tr>- </template>- </tbody>- </table>- </div>- </div>- </div>- </template>- <template x-if="loading">- <p class="text-center">- <em class="fa-solid fa-spinner fa-spin"></em>- </p>- </template>- {{--- <div class="card mb-2">- <div class="card-header">- <h3 class="card-title"><a href="{{ route('subscriptions.index') }}"- title="{{ __('firefly.go_to_subscriptions') }}">{{ __('firefly.subscriptions') }}</a>- </h3>- </div>- <div class="card-body">- <div class="row">- <div class="col-6 offset-3">- <canvas id="subscriptions-chart"></canvas>- </div>- </div>- </div>- </div>- <div class="card mb-2">- <div class="card-header">- <h3 class="card-title"><a href="{{ route('subscriptions.index') }}"- title="{{ __('firefly.go_to_subscriptions') }}">{{ __('firefly.subscriptions') }}</a>- </h3>- </div>- <div class="card-body p-0">- <div class="row mb-2">- <div class="col-6">- <div class="col-6 offset-3">- PIE CHART HIER- </div>- </div>- </div>- <table class="table table-striped table-hover">- <thead>- <tr>- <th>Subscription</th>- <th>(Expected) amount</th>- </tr>- </thead>- <tbody>- <tr>- <td>- Subscription name- </td>- <td>- Expected: X- </td>- </tr>- <tr>- <td>- Subscription name- </td>- <td>- 3,33 ( + 10%)- </td>- </tr>- </tbody>- </table>- </div>- </div>- <div class="card">- <div class="card-header">- <h3 class="card-title"><a href="{{ route('subscriptions.index') }}"- title="{{ __('firefly.go_to_subscriptions') }}">{{ __('firefly.subscriptions') }}- (TO DO group)</a>- </h3>- </div>- <div class="card-body">- Tabel: per item verwacht in deze periode betaald niet betaald<br>- if betaald dan percentage over / onder.-- </div>- </div>---}}-</div>diff --git a/resources/assets/v2/views/v2/partials/elements/amount.blade.php b/resources/assets/v2/views/v2/partials/elements/amount.blade.phpdeleted file mode 100644index a1e847f988..0000000000--- a/resources/assets/v2/views/v2/partials/elements/amount.blade.php+++ /dev/null@@ -1,87 +0,0 @@-@if($convertToPrimary)- <template x-if="convertToPrimary">- <span>- <template x-if="{{ $primary }}_raw < 0">- <span class="text-danger">- <span x-text="{{ $primary }}"></span>- </span>- </template>- <template x-if="{{ $primary }}_raw >= 0">- <template x-if="'transfer' === {{ $type }}">- <span class="text-primary">- <span x-text="{{ $primary }}"></span>- </span>- </template>- <template x-if="'transfer' !== {{ $type }}">- <span class="text-success">- <span x-text="{{ $primary }}"></span>- </span>- </template>- </template>- </span>- </template>- <template x-if="!convertToPrimary">- <span>- <template x-if="{{ $amount }}_raw < 0">-- <span>- <template x-if="'transfer' === {{ $type }}">- <span class="text-primary">- <span x-text="{{ $primary }}"></span>- </span>- </template>- <template x-if="'transfer' !== {{ $type }}">- <span class="text-danger">- <span x-text="{{ $primary }}"></span>- </span>- </template>- </span>--- </template>- <template x-if="{{ $amount }}_raw >= 0">- <span>- <template x-if="'transfer' === {{ $type }}">- <span class="text-primary">- <span x-text="{{ $primary }}"></span>- </span>- </template>- <template x-if="'transfer' !== {{ $type }}">- <span class="text-success">- <span x-text="{{ $primary }}"></span>- </span>- </template>- </span>- </template>- </span>- </template>-@else- <template x-if="{{ $amount }}_raw < 0">- <span>- <template x-if="'transfer' === {{ $type }}">- <span class="text-primary">- <span x-text="{{ $amount }}"></span>- </span>- </template>- <template x-if="'transfer' !== {{ $type }}">- <span class="text-danger">- <span x-text="{{ $amount }}"></span>- </span>- </template>- </span>- </template>- <template x-if="{{ $amount }}_raw >= 0">- <span>- <template x-if="'transfer' === {{ $type }}">- <span class="text-primary">- <span x-text="{{ $amount }}"></span>- </span>- </template>- <template x-if="'transfer' !== {{ $type }}">- <span class="text-success">- <span x-text="{{ $amount }}"></span>- </span>- </template>- </span>- </template>-@endifdiff --git a/resources/assets/v2/views/v2/partials/favicons.blade.php b/resources/assets/v2/views/v2/partials/favicons.blade.phpdeleted file mode 100644index 3d7760d7e3..0000000000--- a/resources/assets/v2/views/v2/partials/favicons.blade.php+++ /dev/null@@ -1,11 +0,0 @@-<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">-<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png?v=3e8AboOwbd">-<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png?v=3e8AboOwbd">-<link rel="manifest" href="manifest.webmanifest?v=3e8AboOwbd">-<link rel="mask-icon" href="safari-pinned-tab.svg" color="#3c8dbc">-<link rel="shortcut icon" href="favicon.ico?v=3e8AboOwbd">-<meta name="apple-mobile-web-app-title" content="Firefly III">-<meta name="application-name" content="Firefly III">-<meta name="msapplication-TileColor" content="#3c8dbc">-<meta name="msapplication-TileImage" content="mstile-144x144.png?v=3e8AboOwbd">-<meta name="theme-color" content="#3c8dbc">diff --git a/resources/assets/v2/views/v2/partials/form/submission-options.blade.php b/resources/assets/v2/views/v2/partials/form/submission-options.blade.phpdeleted file mode 100644index 0fde63b3c7..0000000000--- a/resources/assets/v2/views/v2/partials/form/submission-options.blade.php+++ /dev/null@@ -1,29 +0,0 @@-<!-- RETURN HERE AFTER CREATE -->-<template x-if="'create' === formBehaviour.formType">- <div class="form-check">- <input class="form-check-input" x-model="formStates.returnHereButton" type="checkbox" id="returnButton">- <label class="form-check-label" for="returnButton"><em class="fa-solid fa-arrow-rotate-left"></em> {{ __('firefly.create_another') }}</label>- </div>-</template>--<!-- RESET AFTER -->-<template x-if="'create' === formBehaviour.formType">- <div class="form-check">- <input class="form-check-input" x-model="formStates.resetButton" type="checkbox" id="resetButton" :disabled="!formStates.returnHereButton">- <label class="form-check-label" for="resetButton"><em class="fa-regular fa-file"></em> {{ __('firefly.reset_after') }}</label>- </div>-</template>-<!-- RETURN HERE AFTER UPDATE -->-<template x-if="'update' === formBehaviour.formType">- <div class="form-check">- <input class="form-check-input" x-model="formStates.returnHereButton" type="checkbox" id="returnButton">- <label class="form-check-label" for="returnButton"><em class="fa-solid fa-arrow-rotate-left"></em> {{ __('firefly.after_update_create_another') }}</label>- </div>-</template>-<!-- CLONE INSTEAD OF UPDATE -->-<template x-if="'update' === formBehaviour.formType">- <div class="form-check">- <input class="form-check-input" x-model="formStates.saveAsNewButton" type="checkbox" id="saveAsNewButton">- <label class="form-check-label" for="saveAsNewButton">{{ __('firefly.store_as_new') }}</label>- </div>-</template>diff --git a/resources/assets/v2/views/v2/partials/form/title.blade.php b/resources/assets/v2/views/v2/partials/form/title.blade.phpdeleted file mode 100644index 964d7cec06..0000000000--- a/resources/assets/v2/views/v2/partials/form/title.blade.php+++ /dev/null@@ -1,19 +0,0 @@-<div class="row mb-3">- <label for="title" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.title') }}" class="fa-solid fa-font"></em>- </label>- <div class="col-sm-10">- <input type="text" class="form-control ac-title"- id="title"- @change="changedTitle"- @keyup.enter="submitForm()"- x-model="title"- :class="{'is-invalid': errors.title.length > 0, 'form-control': true}"- placeholder="{{ __('form.title') }}">- <template x-if="errors.title.length > 0">- <div class="invalid-feedback"- x-text="errors.title[0]">- </div>- </template>- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/amount.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/amount.blade.phpdeleted file mode 100644index 0d6884f45f..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/amount.blade.php+++ /dev/null@@ -1,34 +0,0 @@-<div class="row mb-3">- <!-- select for currency -->- <div class="col-sm-3">- <!-- is loading currencies -->- <template x-if="formStates.loadingCurrencies">- <span class="form-control-plaintext"><em class="fa-solid fa-spinner fa-spin"></em></span>- </template>- <!-- is no longer loading currencies -->- <template x-if="!formStates.loadingCurrencies">- <select class="form-control" :id="'currency_code_' + index" x-model="transaction.currency_code">- <template x-for="currency in formData.primaryCurrencies">- <option :selected="currency.id == formData.primaryCurrency.id"- :label="currency.name" :value="currency.code"- x-text="currency.name"></option>- </template>- </select>- </template>- </div>- <!-- actual amount -->- <div class="col-sm-9">- <input type="number" step="any" min="0"- :id="'amount_' + index"- :data-index="index"- :class="{'is-invalid': transaction.errors.amount.length > 0, 'input-mask' : true, 'form-control': true}"- x-model="transaction.amount"- @keyup.enter="submitTransaction()"- @change="changedAmount"- placeholder="0.00">- <template x-if="transaction.errors.amount.length > 0">- <div class="invalid-feedback"- x-text="transaction.errors.amount[0]"></div>- </template>- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/attachments.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/attachments.blade.phpdeleted file mode 100644index cdf5aa2d4d..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/attachments.blade.php+++ /dev/null@@ -1,16 +0,0 @@-@if(true === $optionalFields['attachments'])- <div class="row mb-3">- <label :for="'attachments_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.attachments') }}" class="fa-solid fa-file-import"></em>- </label>- <div class="col-sm-10">- <input type="file" multiple- class="form-control attachments"- :id="'attachments_' + index"- :data-index="index"- name="attachments[]"- >- </div>- </div>-@endifdiff --git a/resources/assets/v2/views/v2/partials/form/transaction/budget.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/budget.blade.phpdeleted file mode 100644index deb3c48755..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/budget.blade.php+++ /dev/null@@ -1,25 +0,0 @@-<template x-if="groupProperties.transactionType != 'deposit' && groupProperties.transactionType != 'transfer'">- <div class="row mb-3">- <label :for="'budget_id_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.budget') }}" class="fa-solid fa-chart-pie"></em>- </label>- <div class="col-sm-10">- <template x-if="formStates.loadingBudgets">- <span class="form-control-plaintext"><em class="fa-solid fa-spinner fa-spin"></em></span>- </template>- <template x-if="!formStates.loadingBudgets">- <select class="form-control"- :id="'budget_id_' + index"- x-model="transaction.budget_id"- @keyup.enter="submitTransaction()"- >- <template x-for="budget in formData.budgets">- <option :label="budget.name" :value="budget.id" :selected="budget.id == transaction.budget_id"- x-text="budget.name"></option>- </template>- </select>- </template>- </div>- </div>-</template>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/category.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/category.blade.phpdeleted file mode 100644index 9cc204a2ff..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/category.blade.php+++ /dev/null@@ -1,14 +0,0 @@-<div class="row mb-3">- <label :for="'category_name_' + index" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.category') }}" class="fa-solid fa-bookmark"></em>- </label>- <div class="col-sm-10">- <input type="search"- class="form-control ac-category"- :id="'category_name_' + index"- @keyup="keyUpFromCategory"- x-model="transaction.category_name"- :data-index="index"- placeholder="{{ __('firefly.category') }}">- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/date-fields.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/date-fields.blade.phpdeleted file mode 100644index 758d33147f..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/date-fields.blade.php+++ /dev/null@@ -1,18 +0,0 @@-@foreach($optionalDateFields as $name => $enabled)- @if($enabled)- <div class="row mb-1">- <label :for="'{{ $name }}_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em class="fa-solid fa-calendar-alt" title="{{ __('firefly.pref_optional_tj_' . $name) }}"></em>- </label>- <div class="col-sm-10">- <input type="date"- class="form-control"- :id="'{{ $name }}_' + index"- x-model="transaction.{{ $name }}"- :data-index="index"- placeholder="">- </div>- </div>- @endif-@endforeachdiff --git a/resources/assets/v2/views/v2/partials/form/transaction/date-time.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/date-time.blade.phpdeleted file mode 100644index a70ba8e98c..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/date-time.blade.php+++ /dev/null@@ -1,12 +0,0 @@-<div class="row mb-3">- <label :for="'date_' + index" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.date_and_time') }}" class="fa-solid fa-calendar"></em>- </label>- <div class="col-sm-10">- <input type="datetime-local" class="form-control" :id="'date_' + index"- @change="changedDateTime"- @keyup.enter="submitTransaction()"- x-model="transaction.date"- >- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/description.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/description.blade.phpdeleted file mode 100644index 6cdb0daed6..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/description.blade.php+++ /dev/null@@ -1,20 +0,0 @@-<div class="row mb-3">- <label :for="'description_' + index" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.description') }}" class="fa-solid fa-font"></em>- </label>- <div class="col-sm-10">- <input type="text" class="form-control ac-description"- :id="'description_' + index"- @change="changedDescription"- @keyup.enter="submitTransaction()"- x-model="transaction.description"- :class="{'is-invalid': transaction.errors.description.length > 0, 'form-control': true}"- :data-index="index"- placeholder="{{ __('firefly.description') }}">- <template x-if="transaction.errors.description.length > 0">- <div class="invalid-feedback"- x-text="transaction.errors.description[0]">- </div>- </template>- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/destination-account.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/destination-account.blade.phpdeleted file mode 100644index 6c507e78e6..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/destination-account.blade.php+++ /dev/null@@ -1,20 +0,0 @@-<div class="row mb-3">- <label :for="'dest_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.destination_account') }}" class="fa-solid fa-arrow-right"></em>- </label>- <div class="col-sm-10">- <input type="text"- :class="{'is-invalid': transaction.errors.destination_account.length > 0, 'form-control': true, 'ac-dest': true}"- :id="'dest_' + index"- x-model="transaction.destination_account.alpine_name"- :data-index="index"- @changed="changedDestinationAccount"- placeholder="{{ __('firefly.destination_account') }}">- <template x-if="transaction.errors.destination_account.length > 0">- <div class="invalid-feedback"- x-text="transaction.errors.destination_account[0]">- </div>- </template>- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/external-url.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/external-url.blade.phpdeleted file mode 100644index 9ea19b445c..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/external-url.blade.php+++ /dev/null@@ -1,23 +0,0 @@-@if(true === $optionalFields['external_url'])-<div class="row mb-3">- <label :for="'external_url_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.external_url') }}" class="fa-solid fa-link"></em>- </label>- <div class="col-sm-10">- <input type="text"- class="form-control"- :id="'external_url_' + index"- x-model="transaction.external_url"- :data-index="index"- :class="{'is-invalid': transaction.errors.external_url.length > 0, 'form-control': true}"- placeholder="{{ __('firefly.external_url') }}" />- <template x-if="transaction.errors.external_url.length > 0">- <div class="invalid-feedback"- x-text="transaction.errors.external_url[0]">-- </div>- </template>- </div>-</div>-@endifdiff --git a/resources/assets/v2/views/v2/partials/form/transaction/foreign-amount.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/foreign-amount.blade.phpdeleted file mode 100644index 39ab0e93df..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/foreign-amount.blade.php+++ /dev/null@@ -1,38 +0,0 @@-<template x-if="formBehaviour.foreignCurrencyEnabled">- <div class="row mb-3">- <div class="col-sm-3">- <label class="form-label"> </label>- <template x-if="formStates.loadingCurrencies">- <span class="form-control-plaintext"><em class="fa-solid fa-spinner fa-spin"></em></span>- </template>- <template x-if="!formStates.loadingCurrencies">- <select class="form-control"- :id="'foreign_currency_code_' + index"- x-model="transaction.foreign_currency_code">- <template x-for="currency in formData.foreignCurrencies">- <option :label="currency.name" :value="currency.code"- x-text="currency.name"></option>- </template>- </select>- </template>- </div>- <div class="col-sm-9">- <template x-if="groupProperties.transactionType != 'transfer'">- <label class="small form-label">{{ __('firefly.amount_foreign_if') }}</label>- </template>- <template x-if="groupProperties.transactionType == 'transfer'">- <label class="small form-label">{{ __('firefly.amount_destination_account') }}</label>- </template>- <input type="number" step="any" min="0"- :id="'amount_' + index"- :data-index="index"- :class="{'is-invalid': transaction.errors.foreign_amount.length > 0, 'input-mask' : true, 'form-control': true}"- x-model="transaction.foreign_amount"- @change="changedAmount"- placeholder="0.00">- <template x-if="transaction.errors.foreign_amount.length > 0">- <div class="invalid-feedback" x-text="transaction.errors.foreign_amount[0]"></div>- </template>- </div>- </div>-</template>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/internal-reference.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/internal-reference.blade.phpdeleted file mode 100644index 4c106ce415..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/internal-reference.blade.php+++ /dev/null@@ -1,16 +0,0 @@-@if(true === $optionalFields['internal_reference'])-<div class="row mb-3">- <label :for="'internal_reference_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.internal_reference') }}" class="fa-solid fa-anchor"></em>- </label>- <div class="col-sm-10">- <input type="search"- class="form-control"- :id="'internal_reference_' + index"- x-model="transaction.internal_reference"- :data-index="index"- placeholder="{{ __('firefly.internal_reference') }}">- </div>-</div>-@endifdiff --git a/resources/assets/v2/views/v2/partials/form/transaction/location.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/location.blade.phpdeleted file mode 100644index 159b9236e1..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/location.blade.php+++ /dev/null@@ -1,29 +0,0 @@-@if(true === $optionalFields['location'])- <div class="row mb-3">- <label :for="'map_' + index" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.location') }}" class="fa-solid fa-earth-europe"></em>- </label>- <template x-if="index > 0">- <div class="col-sm-10">- <label class="custom-control-label small">{{ __('firefly.location_first_split') }}</label>- </div>- </template>- <template x-if="0 === index">- <div class="col-sm-10">- <div- data-latitude="{{ $latitude }}"- data-longitude="{{ $longitude }}"- data-zoom-level="{{ $zoomLevel }}"- id="location_map" class="map-size" :data-index="index"></div>- <span class="muted small">- <template x-if="!transaction.hasLocation">- <span>{{ __('firefly.click_tap_location') }}</span>- </template>- <template x-if="transaction.hasLocation">- <a :data-index="index" href="#" @click="clearLocation">{{ __('firefly.clear_location') }}</a>- </template>- </span>- </div>- </template>- </div>-@endifdiff --git a/resources/assets/v2/views/v2/partials/form/transaction/notes.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/notes.blade.phpdeleted file mode 100644index dfeb71833e..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/notes.blade.php+++ /dev/null@@ -1,13 +0,0 @@-@if(true === $optionalFields['notes'])-<div class="row mb-3">- <label :for="'notes_' + index" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.notes') }}" class="fa-solid fa-font"></em>- </label>- <div class="col-sm-10">- <textarea class="form-control"- :id="'notes_' + index"- x-model="transaction.notes"- placeholder="{{ __('firefly.notes') }}"></textarea>- </div>-</div>-@endifdiff --git a/resources/assets/v2/views/v2/partials/form/transaction/piggy-bank.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/piggy-bank.blade.phpdeleted file mode 100644index 4ca86948a8..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/piggy-bank.blade.php+++ /dev/null@@ -1,29 +0,0 @@-<template x-if="groupProperties.transactionType != 'deposit' && groupProperties.transactionType != 'withdrawal'">- <div class="row mb-3">- <label :for="'piggy_bank_id_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.piggy_bank') }}" class="fa-solid fa-piggy-bank"></em>- </label>- <div class="col-sm-10">- <template x-if="formStates.loadingPiggyBanks">- <span class="form-control-plaintext"><em class="fa-solid fa-spinner fa-spin"></em></span>- </template>- <template x-if="!formStates.loadingPiggyBanks">- <select class="form-control"- :id="'piggy_bank_id_' + index"- @keyup.enter="submitTransaction()"- x-model="transaction.piggy_bank_id">- <template x-for="group in formData.piggyBanks">- <optgroup :label="group.name">- <template x-for="piggyBank in group.piggyBanks">- <option :label="piggyBank.name"- :value="piggyBank.id"- x-text="piggyBank.name"></option>- </template>- </optgroup>- </template>- </select>- </template>- </div>- </div>-</template>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/source-account.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/source-account.blade.phpdeleted file mode 100644index fe3c0f5e52..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/source-account.blade.php+++ /dev/null@@ -1,20 +0,0 @@-<div class="row mb-3">- <label :for="'source_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.source_account') }}" class="fa-solid fa-arrow-left"></em>- </label>- <div class="col-sm-10">- <input type="text"- :class="{'is-invalid': transaction.errors.source_account.length > 0, 'form-control': true, 'ac-source': true}"- :id="'source_' + index"- x-model="transaction.source_account.alpine_name"- :data-index="index"- @changed="changedSourceAccount"- placeholder="{{ __('firefly.source_account') }}">- <template x-if="transaction.errors.source_account.length > 0">- <div class="invalid-feedback"- x-text="transaction.errors.source_account[0]">- </div>- </template>- </div>-</div>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/submission-options.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/submission-options.blade.phpdeleted file mode 100644index bd7f635ba4..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/submission-options.blade.php+++ /dev/null@@ -1,39 +0,0 @@-<!-- RETURN HERE AFTER CREATE TRANSACTION -->-<template x-if="'create' === formBehaviour.formType">- <div class="form-check">- <input class="form-check-input" x-model="formStates.returnHereButton" type="checkbox" id="returnButton">- <label class="form-check-label" for="returnButton">{{ __('firefly.create_another') }}</label>- </div>-</template>--<!-- RESET AFTER -->-<template x-if="'create' === formBehaviour.formType">- <div class="form-check">- <input class="form-check-input" x-model="formStates.resetButton" type="checkbox" id="resetButton" :disabled="!formStates.returnHereButton">- <label class="form-check-label" for="resetButton">{{ __('firefly.reset_after') }}</label>- </div>-</template>-<!-- RETURN HERE AFTER EDIT TRANSACTION -->-<template x-if="'edit' === formBehaviour.formType">- <div class="form-check">- <input class="form-check-input" x-model="formStates.returnHereButton" type="checkbox" id="returnButton">- <label class="form-check-label" for="returnButton">{{ __('firefly.after_update_create_another') }}</label>- </div>-</template>-<!-- CLONE INSTEAD OF EDIT CURRENT TRANSACTION -->-<template x-if="'edit' === formBehaviour.formType">- <div class="form-check">- <input class="form-check-input" x-model="formStates.saveAsNewButton" type="checkbox" id="saveAsNewButton">- <label class="form-check-label" for="saveAsNewButton">{{ __('firefly.store_as_new') }}</label>- </div>-</template>--<div class="form-check">- <input class="form-check-input" type="checkbox" id="rulesButton" :checked="formStates.rulesButton">- <label class="form-check-label" for="rulesButton">{{ __('firefly.apply_rules_checkbox') }}</label>-</div>--<div class="form-check">- <input class="form-check-input" type="checkbox" id="webhooksButton" :checked="formStates.webhooksButton">- <label class="form-check-label" for="webhooksButton">{{ __('firefly.fire_webhooks_checkbox') }}</label>-</div>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/subscription.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/subscription.blade.phpdeleted file mode 100644index c9c7e92731..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/subscription.blade.php+++ /dev/null@@ -1,30 +0,0 @@-<template x-if="groupProperties.transactionType != 'transfer' && groupProperties.transactionType != 'deposit'">- <div class="row mb-3">- <label :for="'bill_id_' + index" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.subscription') }}" class="fa-solid fa-calendar"></em>- </label>- <div class="col-sm-10">- <template x-if="formStates.loadingSubscriptions">- <span class="form-control-plaintext"><em class="fa-solid fa-spinner fa-spin"></em></span>- </template>- <template x-if="!formStates.loadingSubscriptions">- <select class="form-control"- :id="'bill_id_' + index"- @keyup.enter="submitTransaction()"- x-model="transaction.bill_id">- <template x-for="group in formData.subscriptions">- <optgroup :label="group.name">- <template- x-for="subscription in group.subscriptions">- <option :label="subscription.name"- :value="subscription.id"- :selected="subscription.id == transaction.bill_id"- x-text="subscription.name"></option>- </template>- </optgroup>- </template>- </select>- </template>- </div>- </div>-</template>diff --git a/resources/assets/v2/views/v2/partials/form/transaction/tags.blade.php b/resources/assets/v2/views/v2/partials/form/transaction/tags.blade.phpdeleted file mode 100644index 4f2a55b3bc..0000000000--- a/resources/assets/v2/views/v2/partials/form/transaction/tags.blade.php+++ /dev/null@@ -1,23 +0,0 @@-<div class="row mb-3">- <label :for="'tags_' + index"- class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.tags') }}" class="fa-solid fa-tag"></em>- </label>- <div class="col-sm-10">- <select- class="form-select ac-tags"- :id="'tags_' + index"- :name="'tags['+index+'][]'"- multiple>- <option value="">{{ __('firefly.select_tag') }}</option>- </select>-- </div>-</div>--<!--- :value="tag"-<template x-for="(tag, index) in transaction.tags" :key="index">- <option value="bla">bla</option>- </template>- -->diff --git a/resources/assets/v2/views/v2/partials/layout/breadcrumbs.blade.php b/resources/assets/v2/views/v2/partials/layout/breadcrumbs.blade.phpdeleted file mode 100644index bf01fd5f98..0000000000--- a/resources/assets/v2/views/v2/partials/layout/breadcrumbs.blade.php+++ /dev/null@@ -1,11 +0,0 @@-@if(count($breadcrumbs) > 0)- <ol class="breadcrumb float-sm-end">- @foreach ($breadcrumbs as $bc)- @if($bc->url and !$loop->last)- <li class="breadcrumb-item"><a href="{{ $bc->url }}">{{ $bc->title }}</a></li>- @else- <li class="breadcrumb-item active">{{ $bc->title }}</li>- @endif- @endforeach- </ol>-@endifdiff --git a/resources/assets/v2/views/v2/partials/layout/footer.blade.php b/resources/assets/v2/views/v2/partials/layout/footer.blade.phpdeleted file mode 100644index 1cc7d32408..0000000000--- a/resources/assets/v2/views/v2/partials/layout/footer.blade.php+++ /dev/null@@ -1,17 +0,0 @@-<footer class="app-footer">- <!--begin::To the end-->- <div class="float-end d-none d-sm-inline">- <a href="{{ route('debug') }}">- @if(str_starts_with($FF_VERSION, 'develop'))- <span class="text-danger">{{ $FF_VERSION }}</span>- @else- v{{ $FF_VERSION }}- @endif- </a>- </div>- <!--end::To the end-->- <!--begin::Copyright-->- <a href="https://github.com/firefly-iii/firefly-iii/">Firefly III</a> © James Cole,- <a href="https://github.com/firefly-iii/firefly-iii/blob/main/LICENSE">AGPL-3.0-or-later</a>- <!--end::Copyright-->-</footer>diff --git a/resources/assets/v2/views/v2/partials/layout/head.blade.php b/resources/assets/v2/views/v2/partials/layout/head.blade.phpdeleted file mode 100644index 354371511f..0000000000--- a/resources/assets/v2/views/v2/partials/layout/head.blade.php+++ /dev/null@@ -1,78 +0,0 @@-<head>- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">- <base href="{{ route('index') }}/">- <meta charset="UTF-8">- <meta http-equiv="X-UA-Compatible" content="IE=edge">- <meta name="csrf-token" content="{{ csrf_token() }}">- <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">- <meta name="apple-mobile-web-app-capable" content="yes">- <meta name="mobile-web-app-capable" content="yes">- <meta name="color-scheme" content="light dark">-- <script type="text/javascript" nonce="{{ $JS_NONCE }}">- /*!- * 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 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')- window.theme = 'dark';- return;- }- if (theme === 'browser' && window.matchMedia('(prefers-color-scheme: light)').matches) {- window.theme = 'light';- document.documentElement.setAttribute('data-bs-theme', 'light')- return;- }- document.documentElement.setAttribute('data-bs-theme', theme)- window.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 && null === ($pageTitle ?? null))- {{ $subTitle }} »- @endif- @if(null !== ($pageTitle ?? null))- {{ $pageTitle }} »- @endif-- @if($title !== 'Firefly III')- {{ $title }} »- @endif- Firefly III- </title>-- <meta name="viewport" content="width=device-width, initial-scale=1.0">- @yield('styles')- @vite(['src/sass/app.scss'])---</head>diff --git a/resources/assets/v2/views/v2/partials/layout/scripts.blade.php b/resources/assets/v2/views/v2/partials/layout/scripts.blade.phpdeleted file mode 100644index fee4f58180..0000000000--- a/resources/assets/v2/views/v2/partials/layout/scripts.blade.php+++ /dev/null@@ -1 +0,0 @@-@yield('scripts')diff --git a/resources/assets/v2/views/v2/partials/layout/sidebar.blade.php b/resources/assets/v2/views/v2/partials/layout/sidebar.blade.phpdeleted file mode 100644index ac6f54c458..0000000000--- a/resources/assets/v2/views/v2/partials/layout/sidebar.blade.php+++ /dev/null@@ -1,208 +0,0 @@-<aside class="app-sidebar bg-body-secondary shadow" data-bs-theme="dark">- <!--begin::Sidebar Brand-->- <div class="sidebar-brand">- <!--begin::Brand Link-->- <a href="{{route('index') }}" class="brand-link">- <!--begin::Brand Image-->- <img src="images/logo.png" alt="Firefly III Logo"- class="brand-image opacity-75 shadow">- <!--end::Brand Image-->- <!--begin::Brand Text-->- <span class="brand-text fw-light">Firefly III</span>- <!--end::Brand Text-->- </a>- <!--end::Brand Link-->- </div>- <!--end::Sidebar Brand-->- <!--begin::Sidebar Wrapper-->-- <div class="sidebar-wrapper">- <nav class="mt-2">- <!--begin::Sidebar Menu-->- <ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu"- data-accordion="false">- <li class="nav-item menu-open">- <a href="{{ route('index') }}" class="nav-link active">- <em class="nav-icon fa-solid fa-gauge-high"></em>- <p>- {{ __('firefly.dashboard') }}- </p>- </a>- </li>- <li class="nav-header">{{ strtoupper(__('firefly.financial_control')) }}</li>- <li class="nav-item">- <a href="{{ route('budgets.index') }}" class="nav-link">- <em class="nav-icon fa-solid fa-chart-pie"></em>- <p>{{ __('firefly.budgets') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('subscriptions.index') }}" class="nav-link">- <i class="nav-icon fa-regular fa-calendar"></i>- <p>{{ __('firefly.subscriptions') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('piggy-banks.index') }}" class="nav-link">- <em class="nav-icon fa-solid fa-piggy-bank"></em>- <p>{{ __('firefly.piggy_banks') }}</p>- </a>- </li>- <li class="nav-header">{{ strtoupper(__('firefly.accounting')) }}</li>- <li class="nav-item @partialroute('transactions') menu-open @endpartialroute">- <a href="#" class="nav-link @partialroute('transactions') active @endpartialroute">- <em class="nav-icon fa-solid fa-arrow-right-arrow-left"></em>- <p>- {{ __('firefly.transactions') }}- <i class="nav-arrow fa-solid fa-chevron-right"></i>- </p>- </a>- <ul class="nav nav-treeview">- <li class="nav-item">- <a href="{{ route('transactions.index',['withdrawal']) }}" class="nav-link @partialroute('transactions', 'withdrawal') active @endpartialroute">- <em class="nav-icon fa-solid fa-arrow-left"></em>- <p>{{ __('firefly.expenses') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('transactions.index', ['deposit']) }}" class="nav-link @partialroute('transactions', 'deposit') active @endpartialroute">- <em class="nav-icon fa-solid fa-arrow-right"></em>- <p>{{ __('firefly.income') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('transactions.index', ['transfers']) }}" class="nav-link @partialroute('transactions', 'transfers') active @endpartialroute">- <i class="nav-icon fa-solid fa-arrows-rotate"></i>- <p>{{ __('firefly.transfers') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('transactions.index', ['all']) }}" class="nav-link @partialroute('transactions', 'all') active @endpartialroute">- <i class="nav-icon fa-solid fa-arrows-turn-to-dots"></i>- <p>{{ __('firefly.all_transactions') }}</p>- </a>- </li>- </ul>- </li>- <li class="nav-item">- <a href="#" class="nav-link">- <i class="nav-icon fa-solid fa-microchip"></i>- <p>- {{ __('firefly.automation') }}- <i class="nav-arrow fa-solid fa-chevron-right"></i>- </p>- </a>- <ul class="nav nav-treeview">- <li class="nav-item">- <a href="{{ route('rules.index') }}" class="nav-link">- <i class="nav-icon fa-solid fa-shuffle"></i>- <p>{{ __('firefly.rules') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('recurring.index') }}" class="nav-link">- <i class="nav-icon fa-solid fa-repeat"></i>- <p>{{ __('firefly.recurrences') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('webhooks.index') }}" class="nav-link">- <i class="nav-icon fa-solid fa-bolt-lightning"></i>- <p>{{ __('firefly.webhooks') }}</p>- </a>- </li>- </ul>- </li>- <li class="nav-header">{{ strtoupper(__('firefly.others')) }}</li>- <li class="nav-item @partialroute('accounts') menu-open @endpartialroute">- <a href="#" class="nav-link @partialroute('accounts') active @endpartialroute">- <i class="nav-icon fa-regular fa-credit-card"></i>- <p>- {{ __('firefly.accounts') }}- <i class="nav-arrow fa-solid fa-chevron-right"></i>- </p>- </a>- <ul class="nav nav-treeview">- <li class="nav-item">- <a href="{{ route('accounts.index', ['asset']) }}" class="nav-link @partialroute('accounts', 'asset') active @endpartialroute">- <i class="nav-icon fa-solid fa-money-bills"></i>- <p>{{ __('firefly.asset_accounts') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('accounts.index', ['expense']) }}" class="nav-link @partialroute('accounts', 'expense') active @endpartialroute">- <i class="nav-icon fa-solid fa-cart-shopping"></i>- <p>{{ __('firefly.expense_accounts') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('accounts.index', ['revenue']) }}" class="nav-link @partialroute('accounts', 'assset') revenue @endpartialroute">- <i class="nav-icon fa-solid fa-money-bill-trend-up"></i>- <p>{{ __('firefly.revenue_accounts') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('accounts.index', ['liabilities']) }}" class="nav-link @partialroute('accounts', 'liabilities') active @endpartialroute">- <i class="nav-icon fa-solid fa-landmark"></i>- <p>{{ __('firefly.liabilities') }}</p>- </a>- </li>- </ul>- </li>- <li class="nav-item">- <a href="#" class="nav-link">- <i class="nav-icon fa-solid fa-tags"></i>- <p>- {{ __('firefly.classification') }}- <i class="nav-arrow fa-solid fa-chevron-right"></i>- </p>- </a>- <ul class="nav nav-treeview">- <li class="nav-item">- <a href="{{ route('categories.index') }}" class="nav-link">- <i class="nav-icon fa-regular fa-bookmark"></i>- <p>{{ __('firefly.categories') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('tags.index') }}" class="nav-link">- <i class="nav-icon fa-solid fa-tag"></i>- <p>{{ __('firefly.tags') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('object-groups.index') }}" class="nav-link">- <i class="nav-icon fa-regular fa-envelope"></i>- <p>{{ __('firefly.object_groups') }}</p>- </a>- </li>- </ul>- </li>-- <li class="nav-item">- <a href="{{ route('reports.index') }}" class="nav-link">- <i class="nav-icon fa-solid fa-chart-column"></i>- <p>{{ __('firefly.reports') }}</p>- </a>- </li>- <li class="nav-item">- <a href="{{ route('export.index') }}" class="nav-link">- <i class="nav-icon fa-solid fa-upload"></i>- <p>{{ __('firefly.export_data_menu') }}</p>- </a>- </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>- <p>TODO {{ __('firefly.logout') }}</p>- </a>- </li>- </ul>- <!--end::Sidebar Menu-->- </nav>- </div>- <!--end::Sidebar Wrapper-->-</aside>--<!-- simple script for logout thing -->diff --git a/resources/assets/v2/views/v2/partials/layout/topbar.blade.php b/resources/assets/v2/views/v2/partials/layout/topbar.blade.phpdeleted file mode 100644index 960d91a6ea..0000000000--- a/resources/assets/v2/views/v2/partials/layout/topbar.blade.php+++ /dev/null@@ -1,115 +0,0 @@-<li class="nav-item">- <a class="nav-link" href="{{ route(Route::current()->getName(), Route::current()->parameters()) }}?force_default_layout=true">- <i class="fa-solid fa-landmark"></i>- </a>-</li>-<li class="nav-item toggle-page-internals d-none">- <a class="nav-link" href="#" data-bs-toggle="modal" data-bs-target="#internalsModal">- <em class="fa-solid fa-sliders"></em>- </a>-</li>-<li class="nav-item toggle-page-wizard d-none">- <a class="nav-link" href="#" data-bs-toggle="modal" data-bs-target="#wizardModal">- <em class="fa-solid fa-hat-wizard"></em>- </a>-</li>-<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">- <a href="{{ route('settings.index') }}" class="dropdown-item">- <em class="fa-regular fa-user me-2 fa-fw"></em>- {{ __('firefly.system_settings') }}- </a>- <div class="dropdown-divider"></div>- <a href="{{ route('currencies.index') }}" class="dropdown-item">- <em class="fa-solid fa-euro-sign me-2 fa-fw"></em>- {{ __('firefly.currencies') }}- </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="{{ route('administrations.index') }}" class="dropdown-item">- <em class="fa-solid fa-money-bill-transfer me-2"></em>- {{ __('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">-- <a href="{{ route('transactions.create', ['deposit']) }}" class="dropdown-item">- <em class="fa-solid fa-arrow-right fa-fw me-2"></em>- {{ __('firefly.create_new_deposit') }}- </a>- <a href="{{ route('transactions.create', ['transfer']) }}" class="dropdown-item">- <em class="fa-solid fa-arrows-rotate fa-fw me-2"></em>- {{ __('firefly.create_new_transfer') }}- </a>- <div class="dropdown-divider"></div>-- <!-- asset, liability -->- <a href="{{ route('accounts.create', ['asset']) }}" class="dropdown-item">- <em class="fa-solid fa-money-bills fa-fw me-2"></em>- {{ __('firefly.create_new_asset') }}- </a>- <a href="{{ route('accounts.create', ['liabilities']) }}" class="dropdown-item">- <em class="fa-solid fa-landmark fa-fw me-2"></em>- {{ __('firefly.create_new_liabilities') }}- </a>- <div class="dropdown-divider"></div>-- <!-- budget, category, piggy -->- <a href="{{ route('budgets.create') }}" class="dropdown-item">- <em class="fa-solid fa-pie-chart fa-fw me-2"></em>- {{ __('firefly.create_new_budget') }}- </a>- <a href="{{ route('categories.create') }}" class="dropdown-item">- <em class="fa-regular fa-bookmark fa-fw me-2"></em>- {{ __('firefly.create_new_category') }}- </a>- <a href="{{ route('piggy-banks.create') }}" class="dropdown-item">- <em class="fa-solid fa-piggy-bank fa-fw me-2"></em>- {{ __('firefly.create_new_piggy_bank') }}- </a>- <div class="dropdown-divider"></div>-- <!-- contract, rule, recurring -->- <a href="{{ route('subscriptions.create') }}" class="dropdown-item">- <em class="fa-regular fa-calendar fa-fw me-2"></em>- {{ __('firefly.create_new_subscription') }}- </a>- <a href="{{ route('rules.create') }}" class="dropdown-item">- <em class="fa-solid fa-shuffle fa-fw me-2"></em>- {{ __('firefly.create_new_rule') }}- </a>- <a href="{{ route('recurring.create') }}" class="dropdown-item">- <em class="fa-solid fa-repeat fa-fw me-2"></em>- {{ __('firefly.create_new_recurrence') }}- </a>- <a href="{{ route('webhooks.create') }}" class="dropdown-item">- <em class="fa-solid fa-bolt-lightning fa-fw me-2"></em>- {{ __('firefly.create_new_webhook') }}- </a>- </div>-</li>diff --git a/resources/assets/v2/views/v2/transactions/create.blade.php b/resources/assets/v2/views/v2/transactions/create.blade.phpdeleted file mode 100644index 5ad6f22e1f..0000000000--- a/resources/assets/v2/views/v2/transactions/create.blade.php+++ /dev/null@@ -1,24 +0,0 @@-@extends('layout.v2')-@section('scripts')- @vite(['src/pages/transactions/create.js'])-@endsection-@section('content')- <div class="app-content">- <!--begin::Container-->- <div class="container-fluid" x-data="transactions" id="form">- <x-messages></x-messages>- <x-transaction-tab-list></x-transaction-tab-list>- <div class="tab-content" id="splitTabsContent">- <template x-for="transaction,index in entries">- <x-transaction-split- :zoomLevel="$zoomLevel"- :latitude="$latitude"- :longitude="$longitude"- :optionalFields="$optionalFields"- :optionalDateFields="$optionalDateFields"></x-transaction-split>- </template>- </div>- </div>- </div>--@endsectiondiff --git a/resources/assets/v2/views/v2/transactions/edit.blade.php b/resources/assets/v2/views/v2/transactions/edit.blade.phpdeleted file mode 100644index ce5e5a2f58..0000000000--- a/resources/assets/v2/views/v2/transactions/edit.blade.php+++ /dev/null@@ -1,24 +0,0 @@-@extends('layout.v2')-@section('scripts')- @vite(['src/pages/transactions/edit.js'])-@endsection-@section('content')- <div class="app-content">- <!--begin::Container-->- <div class="container-fluid" x-data="transactions" id="form">- <x-messages></x-messages>- <x-transaction-tab-list></x-transaction-tab-list>- <div class="tab-content" id="splitTabsContent">- <template x-for="transaction,index in entries">- <x-transaction-split- :zoomLevel="$zoomLevel"- :latitude="$latitude"- :longitude="$longitude"- :optionalFields="$optionalFields"- :optionalDateFields="$optionalDateFields"></x-transaction-split>- </template>- </div>- </div>- </div>--@endsectiondiff --git a/resources/assets/v2/views/v2/transactions/index.blade.php b/resources/assets/v2/views/v2/transactions/index.blade.phpdeleted file mode 100644index 7463e4c60f..0000000000--- a/resources/assets/v2/views/v2/transactions/index.blade.php+++ /dev/null@@ -1,193 +0,0 @@-@extends('layout.v2')-@section('scripts')- @vite(['src/pages/transactions/index.js'])-@endsection-@section('content')- <div class="app-content">- <div class="container-fluid" x-data="index">- <x-messages></x-messages>- <div class="row mb-3">- <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">Info</h3>- </div>- <div class="card-body">- some chart- </div>- </div>- </div>- <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">Info</h3>- </div>- <div class="card-body">- Same- </div>- </div>- </div>- <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">Info</h3>- </div>- <div class="card-body">- Same- </div>- </div>- </div>- </div>- <div class="row mb-3">- <div class="col">-- </div>- </div>- <div class="row mb-3">- <div class="col-xl-10 col-lg-12 col-md-12 col-sm-12 col-xs-12">- <template x-if="!notifications.wait.show">- <nav aria-label="TODO Page navigation">- <ul class="pagination">- <template x-if="page > 1">- <li class="page-item"><a class="page-link" @click.prevent="previousPage">Previous</a></li>- </template>- <template x-for="i in totalPages">- <li :class="{'page-item': true, 'active': i === page}">- <a class="page-link" href="#" x-text="i" @click.prevent="gotoPage(i)"></a>- </li>- </template>- <template x-if="page < totalPages">- <li class="page-item"><a class="page-link" @click.prevent="nextPage" href="#">Next</a></li>- </template>- </ul>- </nav>- </template>-- <div class="card">- <div class="card-header">- <div class="row">- <h3 class="card-title">Transactions</h3>- </div>- </div>- <div class="card-body p-0">--- <table class="table table-hover table-striped">- <thead>- <tr>- <th>- Icon- </th>- <template x-if="tableColumns.description.enabled">- <th>Description</th>- </template>- <template x-if="tableColumns.source.enabled">- <th>From</th>- </template>- <template x-if="tableColumns.destination.enabled">- <th>To</th>- </template>- <template x-if="tableColumns.amount.enabled">- <th>Amount</th>- </template>- </tr>- </thead>- <tbody>- <template x-for="transaction in transactions">- <tr>- <td>- <template x-if="'withdrawal' === transaction.type">- <em class="fa fa-solid fa-arrow-left"- title="TODO TRANSLATION"></em>- </template>-- <template x-if="'deposit' === transaction.type">- <em class="fa-solid fa-arrow-right"- :title="transaction.typeTranslated"></em>- </template>-- <template x-if="'transfer' === transaction.type">- <em class="fa-solid fa-rotate"- :title="transaction.typeTranslated"></em>- </template>- <template- x-if="'transfer' !== transaction.type && 'deposit' !== transaction.type && 'withdrawal' !== transaction.type">- <span>TODO missing ICON</span>- </template>- </td>- <template x-if="tableColumns.description.enabled">- <td>- <template x-if="transaction.split">- <span>I AM SPLIT</span>- </template>- <template x-if="transaction.split && transaction.firstSplit">- <span>I AM FIRST SPLIT</span>- </template>- <a :href="'./transactions/show/' + transaction.id"- x-text="transaction.description"></a>- </td>- </template>- <template x-if="tableColumns.source.enabled">- <td>- <a :href="'./accounts/show/' + transaction.source_id"- x-text="transaction.source_name"></a>- </td>- </template>- <template x-if="tableColumns.destination.enabled">- <td>- <a :href="'./accounts/show/' + transaction.destination_id"- x-text="transaction.destination_name"></a>- </td>- </template>- <template x-if="tableColumns.amount.enabled">- <td>-- <template x-if="'withdrawal' === transaction.type">- <span class="text-danger"- x-text="formatMoney(transaction.amount*-1, transaction.currency_code)"></span>- </template>--- <template x-if="'deposit' === transaction.type">- <span class="text-success"- x-text="formatMoney(transaction.amount, transaction.currency_code)"></span>- </template>-- <template x-if="'transfer' === transaction.type">- <span class="text-info"- x-text="formatMoney(transaction.amount, transaction.currency_code)"></span>- </template>- <template- x-if="'transfer' !== transaction.type && 'deposit' !== transaction.type && 'withdrawal' !== transaction.type">- <span>TODO PARSE MISSING AMOUNT</span>- </template>- </td>- </template>- </tr>- </template>- </tbody>- </table>- </div>- </div>- </div>-- <div class="col-xl-2 col-lg-12 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">Sidebar</h3>- </div>- <div class="card-body">- I like sidebar- </div>- </div>- </div>- </div>- <div class="row mb-3">- <div class="col">- Nav- </div>- </div>- </div>- </div>--@endsectiondiff --git a/resources/assets/v2/views/v2/transactions/show.blade.php b/resources/assets/v2/views/v2/transactions/show.blade.phpdeleted file mode 100644index a921e2641a..0000000000--- a/resources/assets/v2/views/v2/transactions/show.blade.php+++ /dev/null@@ -1,316 +0,0 @@-@extends('layout.v2')-@section('scripts')- @vite(['src/pages/transactions/show.js'])-@endsection-@section('content')- <div class="app-content">- <div class="container-fluid" x-data="show">- <x-messages></x-messages>- <div class="row">- <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">{{ __('firefly.basic_journal_information') }}</h3>- </div>- <div class="card-body p-0">- <table class="table table-x table-hover">- <tbody>- <tr>- <th class="ten">- <template x-if="'withdrawal' === groupProperties.transactionType">- <em class="fa fa-solid fa-arrow-left"- :title="groupProperties.transactionTypeTranslated"></em>- </template>-- <template x-if="'deposit' === groupProperties.transactionType">- <em class="fa-solid fa-arrow-right"- :title="groupProperties.transactionTypeTranslated"></em>- </template>-- <template x-if="'transfer' === groupProperties.transactionType">- <em class="fa-solid fa-rotate"- :title="groupProperties.transactionTypeTranslated"></em>- </template>- <template- x-if="'transfer' !== groupProperties.transactionType && 'deposit' !== groupProperties.transactionType && 'withdrawal' !== groupProperties.transactionType">- <span x-text="groupProperties.transactionType"></span>- </template>- </th>- <td><span class="group_title" :data-group="groupProperties.id" x-text="groupProperties.title"></span></td>- </tr>- <tr>- <th><em class="fa-solid fa-calendar-alt" title="{{ __('list.date') }}"/></th>- <td><span x-text="format(groupProperties.date)"></span></td>- </tr>- </tbody>- </table>- </div>- <div class="card-footer text-end">- <div class="btn-group btn-group-sm">- <a class="btn btn-primary" :href="'./transactions/edit/' + groupProperties.id">- <em class="fa-solid fa-edit"></em> {{ __('firefly.edit') }}- </a>- <a class="btn btn-danger" :href="'./transactions/delete/' + groupProperties.id">- <em class="fa-solid fa-trash"></em> {{ __('firefly.delete') }}- </a>- <div class="btn-group btn-group-sm" role="group">- <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">- {{ __('firefly.actions') }}- </button>- <ul class="dropdown-menu">- <li x-show="'withdrawal' !== groupProperties.transactionType"><a class="dropdown-item" href="{{ route('transactions.convert.index', ['withdrawal', $transactionGroup['id']]) }}">{{ __('firefly.convert_to_withdrawal') }}</a></li>- <li x-show="'deposit' !== groupProperties.transactionType"><a class="dropdown-item" href="{{ route('transactions.convert.index', ['deposit', $transactionGroup['id']]) }}">{{ __('firefly.convert_to_deposit') }}</a></li>- <li x-show="'transfer' !== groupProperties.transactionType"><a class="dropdown-item" href="{{ route('transactions.convert.index', ['transfer', $transactionGroup['id']]) }}">{{ __('firefly.convert_to_transfer') }}</a></li>- <li><a class="dropdown-item" href="#">{{ __('firefly.clone') }}</a></li>- <li><a class="dropdown-item" href="#">{{ __('firefly.clone_and_edit') }}</a></li>- </ul>- </div>- </div>- </div>- </div>- </div>- <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12 col-xs-12">- <div class="card">- <div class="card-header">- <h3 class="card-title">{{ __('firefly.transaction_journal_meta') }}</h3>- </div>- <div class="card-body p-0">- <table class="table table-x table-hover">- <tbody>- <tr>- <th class="ten">- <em class="fa-solid fa-money-bill-wave" title="{{ __('firefly.amount') }}"></em>- </th>- <td>- <template x-if="'withdrawal' === groupProperties.transactionType">- <template x-for="(amount, code) in amounts">- <span class="text-danger" x-text="formatMoney(amount*-1, code)"></span>- </template>- </template>-- <template x-if="'deposit' === groupProperties.transactionType">- <template x-for="(amount, code) in amounts">- <span class="text-success" x-text="formatMoney(amount, code)"></span>- </template>- </template>-- <template x-if="'transfer' === groupProperties.transactionType">- <template x-for="(amount, code) in amounts">- <span class="text-info" x-text="formatMoney(amount, code)"></span>- </template>- </template>- <template- x-if="'transfer' !== groupProperties.transactionType && 'deposit' !== groupProperties.transactionType && 'withdrawal' !== groupProperties.transactionType">- <span>TODO PARSE MISSING AMOUNT</span>- </template>- </td>- </tr>- <tr>- <th>- <em title="{{ __('firefly.source_account') }}"- class="fa-solid fa-arrow-left"></em>- </th>- <td>- <template x-for="entry in entries">- <a :href="'./accounts/show/' + entry.source_account.id"- :title="entry.source_account.name"- x-text="entry.source_account.name"></a>- </template>- </td>- </tr>- <tr>- <th>- <em title="{{ __('firefly.destination_account') }}"- class="fa-solid fa-arrow-right"></em>- </th>- <td>- <template x-for="entry in entries">- <a :href="'./accounts/show/' + entry.destination_account.id"- :title="entry.destination_account.name"- x-text="entry.destination_account.name"></a>- </template>- </td>- </tr>- </tbody>- </table>- </div>- </div>- </div>- </div>- <div class="row mt-3">- <div class="col">- <h4>{{ __('firefly.transaction_journal_information') }}</h4>- </div>- </div>- <div class="row">- <template x-for="(entry, index) in entries">- <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">---- <div class="card mb-3">- <div class="card-header">- <h3 class="card-title">- <span- class="journal_description"- data-type="text"- data-pk="0"- :data-length="entries.length"- :data-id="entry.transaction_journal_id"- :data-group="entry.transaction_group_id"- data-title="{{ __('firefly.description') }}"- x-text="entry.description"></span>- <template x-if="entries.length > 1">- <span class="badge bg-secondary">- <span x-text="index + 1"></span> / <span x-text="entries.length"></span>- </span>- </template>- </h3>- </div>- <div class="card-body p-0">- <table class="table table-x table-hover">- <tbody>- <tr>- <td colspan="2" class="text-center">- <a :href="'./accounts/show/' + entry.source_account.id"- :title="entry.source_account.name"- x-text="entry.source_account.name"></a>- →- <template x-if="'withdrawal' === groupProperties.transactionType">- <span class="text-danger"- x-text="formatMoney(entry.amount*-1, entry.currency_code)"></span>- </template>-- <template x-if="'deposit' === groupProperties.transactionType">- <span class="text-success"- x-text="formatMoney(entry.amount, entry.currency_code)"></span>- </template>-- <template x-if="'transfer' === groupProperties.transactionType">- <span class="text-info"- x-text="formatMoney(entry.amount, entry.currency_code)"></span>- </template>- <template- x-if="null !== entry.foreign_currency_code && '' !== entry.foreign_currency_code && 'withdrawal' === groupProperties.transactionType">- <span class="text-muted"- x-text="formatMoney(entry.foreign_amount*-1, entry.foreign_currency_code) + 'y'"></span>- </template>- <template- x-if="null !== entry.foreign_currency_code && '' !== entry.foreign_currency_code && 'withdrawal' !== groupProperties.transactionType">- <span class="text-muted"- x-text="formatMoney(entry.foreign_amount, entry.foreign_currency_code) + 'x'"></span>- </template>-- <template- x-if="'transfer' !== groupProperties.transactionType && 'deposit' !== groupProperties.transactionType && 'withdrawal' !== groupProperties.transactionType">- <span>TODO PARSE MISSING AMOUNT</span>- </template>- →- <a :href="'./accounts/show/' + entry.destination_account.id"- :title="entry.destination_account.name"- x-text="entry.destination_account.name"></a>- </td>- </tr>- <template x-if="null !== entry.category_name">- <tr>- <th class="ten">- <em title="{{ __('firefly.category') }}"- class="fa-solid fa-bookmark"></em>- </th>- <td><a :href="'./categories/show/' + entry.category_id"- :title="entry.category_name" x-text="entry.category_name"></a></td>- </tr>- </template>- <template x-if="null !== entry.budget_name">- <tr>- <th><em title="{{ __('firefly.budget') }}"- class="fa-solid fa-chart-pie"></em></th>- <td>- <a :href="'./budgets/show/' + entry.budget_id"- :title="entry.budget_name" x-text="entry.budget_name"></a></td>- </tr>- </template>- <template x-if="null !== entry.bill_name">- <tr>- <td><em title="{{ __('firefly.subscription') }}"- class="fa-solid fa-calendar"></em></td>- <td>- <a :href="'./bills/show/' + entry.bill_id" :title="entry.bill_name"- x-text="entry.bill_name"></a></td>- </tr>- </template>- <template x-for="date in dateFields">- <template x-if="null !== entry[date]">- <tr>- <th><span x-text="date"></span></th>- <td><span x-text="entry[date]"></span></td>- </tr>- </template>- </template>- <template x-for="meta in metaFields">- <template x-if="typeof entry[meta] !== 'undefined' && null !== entry[meta] && '' !== entry[meta]">- <tr>- <th><span x-text="meta"></span></th>- <td><span x-text="entry[meta]"></span></td>- </tr>- </template>- </template>- <tr>- <th>recurring things</th>- <td>TODO recurring</td>- </tr>- <template x-if="entry.tags.length > 0">- <tr>- <th><em title="{{ __('firefly.tags') }}" class="fa-solid fa-tag"></em></th>- <td>- <template x-for="tag in entry.tags">- <a class="badge text-bg-info" :href="'./tags/show/' + tag"- :title="tag" x-text="tag"></a>- </template>- </td>- </tr>- </template>- <template x-if="'' !== entry.notes && null !== entry.notes">- <tr>- <td colspan="2" x-text="entry.notes"></td>- </tr>- </template>- </tbody>- </table>- </div>- </div>- <div class="card mb-3">- <div class="card-header">- <h3 class="card-title">Transaction links TODO</h3>- </div>- <div class="card-body p-0">- </div>- </div>- <div class="card mb-3">- <div class="card-header">- <h3 class="card-title">Piggy bank events TODO</h3>- </div>- <div class="card-body p-0">- </div>- </div>- <div class="card mb-3">- <div class="card-header">- <h3 class="card-title">Attachments TODO</h3>- </div>- <div class="card-body p-0">- </div>- </div>- <div class="card mb-3">- <div class="card-header">- <h3 class="card-title">Audit log entries TODO</h3>- </div>- <div class="card-body p-0">- </div>- </div>- </div>- </template>- </div>- </div>- </div>--@endsectiondiff --git a/resources/views/object-groups/index.blade.php b/resources/views/object-groups/index.blade.phpindex e26d1f78ff..2b40edc000 100644--- a/resources/views/object-groups/index.blade.php+++ b/resources/views/object-groups/index.blade.php@@ -25,7 +25,7 @@<tbody>@foreach($objectGroups as $objectGroup)<tr class="group-sortable" data-id="{{ $objectGroup['id'] }}" data-name="{{ e($objectGroup['title']) }}" data-order="{{ $objectGroup['order'] }}">- <td><span class="fa fa-bars group-handle"></span></td>+ <td><span class="bi bi-list group-handle"></span></td><td><strong>{{ $objectGroup['title'] }}</strong><br/>@foreach($objectGroup['piggyBanks'] as $piggyBank)diff --git a/resources/views/partials/form/transaction/date-time.blade.php b/resources/views/partials/form/transaction/date-time.blade.phpindex a70ba8e98c..948316496d 100644--- a/resources/views/partials/form/transaction/date-time.blade.php+++ b/resources/views/partials/form/transaction/date-time.blade.php@@ -1,6 +1,6 @@<div class="row mb-3"><label :for="'date_' + index" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.date_and_time') }}" class="fa-solid fa-calendar"></em>+ <em title="{{ __('firefly.date_and_time') }}" class="bi bi-calendar"></em></label><div class="col-sm-10"><input type="datetime-local" class="form-control" :id="'date_' + index"diff --git a/resources/views/partials/form/transaction/notes.blade.php b/resources/views/partials/form/transaction/notes.blade.phpindex dfeb71833e..06a17ccf35 100644--- a/resources/views/partials/form/transaction/notes.blade.php+++ b/resources/views/partials/form/transaction/notes.blade.php@@ -1,7 +1,7 @@@if(true === $optionalFields['notes'])<div class="row mb-3"><label :for="'notes_' + index" class="col-sm-1 col-form-label d-none d-sm-block">- <em title="{{ __('firefly.notes') }}" class="fa-solid fa-font"></em>+ <em title="{{ __('firefly.notes') }}" class="bi bi-fonts"></em></label><div class="col-sm-10"><textarea class="form-control"diff --git a/resources/views/profile/delete-account.blade.php b/resources/views/profile/delete-account.blade.phpindex 90e9c2e008..1603de5e4e 100644--- a/resources/views/profile/delete-account.blade.php+++ b/resources/views/profile/delete-account.blade.php@@ -1,9 +1,4 @@@extends('layout.v3.session')--- {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}-@endsection-@section('content')<form method="POST" action="{{ route('profile.delete-account.post') }}" accept-charset="UTF-8" class="form-horizontal" id="delete-account"><input name="_token" type="hidden" value="{{ csrf_token() }}">@@ -12,39 +7,38 @@<div class="col-lg-6 col-md-12 col-sm-12"><div class="card card-danger card-outline"><div class="card-header">- <h3 class="card-title">{{ 'delete_your_account'|_ }}</h3>+ <h3 class="card-title">{{ __('firefly.delete_your_account') }}</h3></div><div class="card-body"><p class="text-danger">- {{ 'delete_your_account_help'|_ }}+ {!! __('firefly.delete_your_account_help') !!}</p><p class="text-danger">- {{ 'delete_your_account_password'|_ }}+ {{ __('firefly.delete_your_account_password') }}</p>-- {% if errors|length > 0 %}+ @if(count($errors) > 0)<ul>- {% for error in errors.all %}- <li class="text-danger">{{ error }}</li>+ @foreach ($errors->all() as $error)+ <li class="text-danger">{{ $error }}</li>@endforeach</ul>@endif<div class="form-group">- <label for="password" class="col-sm-4 control-label">{{ 'password'|_ }}</label>+ <label for="password" class="col-sm-4 control-label">{{ __('firefly.password') }}</label><div class="col-sm-8">- <input type="password" class="form-control" id="password" placeholder="{{ 'password'|_ }}" name="password" spellcheck="false">+ <input type="password" class="form-control" id="password" placeholder="{{ __('firefly.password') }}" name="password" spellcheck="false"></div></div></div>- <div class="card-footer">- <button type="submit" class="btn btn-danger text-end delete-profile">- {{ 'delete_account_button'|_ }}+ <div class="card-footer text-end">+ <button type="submit" class="btn btn-danger delete-profile">+ {{ __('firefly.delete_account_button') }}</button></div></div>@@ -57,7 +51,7 @@@vite(['js/pages/generic.js'])<!-- just a bit of inline code --><script type="text/javascript" nonce="{{ $JS_NONCE }}">- var confirmText= '{{ 'are_you_sure'|_|escape('js') }}';+ var confirmText= '{{ __('firefly.are_you_sure') }}';$(function () {"use strict";$('.delete-profile').click(function () {diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.phpindex 2bfb881c41..1af422834a 100644--- a/resources/views/profile/index.blade.php+++ b/resources/views/profile/index.blade.php@@ -131,24 +131,24 @@<button type="button"data-success="{{ trans('firefly.deleted_all_bills') }}"data-type="bills" class="confirm btn btn-danger btn-sm"><span- class="bi bi-calendar-o"></span> {{ __('firefly.delete_all_bills') }}</button>+ class="bi bi-calendar"></span> {{ __('firefly.delete_all_bills') }}</button><button type="button"data-success="{{ trans('firefly.deleted_all_piggy_banks') }}"data-type="piggy_banks" class="confirm btn btn-danger btn-sm"><span- class="fa fa-bullseye"></span> {{ __('firefly.delete_all_piggy_banks') }}</button>+ class="bi bi-bullseye"></span> {{ __('firefly.delete_all_piggy_banks') }}</button></div><h4>{{ __('firefly.automation') }}</h4><div class="btn-group"><button type="button"data-success="{{ trans('firefly.deleted_all_rules') }}"data-type="rules" class="confirm btn btn-danger btn-sm"><span- class="fa fa-random"></span> {{ __('firefly.delete_all_rules') }}</button>+ class="bi bi-shuffle"></span> {{ __('firefly.delete_all_rules') }}</button><button type="button"data-success="{{ trans('firefly.deleted_all_recurring') }}"data-type="recurring" class="confirm btn btn-danger btn-sm"><span- class="fa fa-paint-brush"></span> {{ __('firefly.delete_all_recurring') }}+ class="bi bi-paint-bucket"></span> {{ __('firefly.delete_all_recurring') }}</button></div>@@ -167,7 +167,7 @@<button type="button"data-success="{{ trans('firefly.deleted_all_object_groups') }}"data-type="object_groups" class="confirm btn btn-danger btn-sm"><span- class="fa fa-envelope-o"></span> {{ __('firefly.delete_all_object_groups') }}+ class="bi bi-envelope"></span> {{ __('firefly.delete_all_object_groups') }}</button></div>@@ -179,7 +179,7 @@<button type="button"data-success="{{ trans('firefly.deleted_all_accounts') }}"data-type="accounts" class="confirm btn btn-danger btn-sm"><span- class="fa fa-credit-card"></span> {{ __('firefly.delete_all_accounts') }}</button>+ class="bi bi-credit-card"></span> {{ __('firefly.delete_all_accounts') }}</button><button type="button"data-success="{{ trans('firefly.deleted_all_asset_accounts') }}"@@ -189,7 +189,7 @@<button type="button"data-success="{{ trans('firefly.deleted_all_expense_accounts') }}"data-type="expense_accounts" class="confirm btn btn-danger btn-sm"><span- class="fa fa-shopping-cart"></span> {{ __('firefly.delete_all_expense_accounts') }}+ class="bi bi-cart"></span> {{ __('firefly.delete_all_expense_accounts') }}</button><button type="button"data-success="{{ trans('firefly.deleted_all_revenue_accounts') }}"@@ -200,7 +200,7 @@<button type="button"data-success="{{ trans('firefly.deleted_all_liabilities') }}"data-type="liabilities" class="confirm btn btn-danger btn-sm"><span- class="fa fa-ticket"></span> {{ __('firefly.delete_all_liabilities') }}</button>+ class="bi bi-ticket-detailed"></span> {{ __('firefly.delete_all_liabilities') }}</button></div><h4>{{ __('firefly.accounts') }}</h4><p>@@ -212,7 +212,7 @@<button type="button"data-success="{{ trans('firefly.deleted_all_unused_accounts') }}"data-type="unused_accounts" class="confirm btn btn-warning btn-sm"><span- class="fa fa-credit-card"></span> {{ __('firefly.delete_all_unused_accounts') }}+ class="bi bi-credit-card"></span> {{ __('firefly.delete_all_unused_accounts') }}</button></div>@@ -272,7 +272,7 @@return false;}var link = $(e.currentTarget);- var classes = link.find('i').attr('class');+ // var classes = link.find('i').attr('class');var url = deleteAPIRoute + '?objects=' + link.data('type');// different URL for purge route:if (link.data('type') === 'purge') {@@ -284,7 +284,7 @@// replace icon with loading thinglink.prop('disabled', true);- link.find('i').removeClass().addClass('fa fa-spin fa-spinner');+ // link.find('span').removeClass().addClass('bi bi-lfa fa-spin fa-spinner');// call API:$.ajax({@@ -294,11 +294,11 @@function () {// enable button again:link.prop('disabled', false);- link.find('i').removeClass().addClass(classes);+ // link.find('i').removeClass().addClass(classes);alert(link.data('success'));}).fail(function () {- link.find('i').removeClass().addClass('fa fa-exclamation-triangle');+ // link.find('i').removeClass().addClass('fa fa-exclamation-triangle');alert('Could not delete. Sorry.');});return false;diff --git a/resources/views/profile/mfa/index.blade.php b/resources/views/profile/mfa/index.blade.phpindex fed97a87d0..83ac77cdec 100644--- a/resources/views/profile/mfa/index.blade.php+++ b/resources/views/profile/mfa/index.blade.php@@ -26,7 +26,7 @@</p>@if(true === $enabledMFA)<div class="btn-group">- <a href="{{ route('profile.mfa.disableMFA') }}" class="btn btn-danger"><em class="fa fa-unlock-alt"></em> {{ __('firefly.pref_two_factor_auth_disable_2fa') }}</a>+ <a href="{{ route('profile.mfa.disableMFA') }}" class="btn btn-danger"><em class="bi bi-unlock"></em> {{ __('firefly.pref_two_factor_auth_disable_2fa') }}</a><a href="{{ route('profile.mfa.backup-codes') }}" class="btn btn-outline-secondary"><em class="bi bi-calculator"></em> {{ __('firefly.pref_two_factor_new_backup_codes') }}</a></div>@endifdiff --git a/resources/views/profile/oauth/index.blade.php b/resources/views/profile/oauth/index.blade.phpindex 0803dac996..755b76117d 100644--- a/resources/views/profile/oauth/index.blade.php+++ b/resources/views/profile/oauth/index.blade.php@@ -84,7 +84,7 @@class="btn btn-default btn-sm"@click="regenerateSecret(client)"><em :title="i18next.t('firefly.regenerate_secret')"- class="fa fa-retweet"></em>+ class="bi bi-arrow-clockwise"></em>{{ __('firefly.regenerate_secret') }}</a></template>@@ -92,13 +92,13 @@:title="i18next.t('firefly.edit')" tabindex="-1"@click="edit(client)"><em :title="i18next.t('firefly.edit')"- class="fa fa-pencil"></em>+ class="bi bi-pencil"></em>{{ __('firefly.edit') }}</a><a :title="i18next.t('firefly.delete')"class="btn btn-sm btn-danger" @click="destroy(client)"><em :title="i18next.t('firefly.delete')"- class="fa fa-trash"></em>+ class="bi bi-trash"></em>{{ __('firefly.delete') }}</a></div>diff --git a/resources/views/reports/partials/budget-period.blade.php b/resources/views/reports/partials/budget-period.blade.phpindex d1d3698dde..7e63ce6374 100644--- a/resources/views/reports/partials/budget-period.blade.php+++ b/resources/views/reports/partials/budget-period.blade.php@@ -14,9 +14,9 @@<tr><td data-value="{{ $info['name'] }}">@if($info['id'] !== 0)- <a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.show', [$info['id']]) }}"><span class="fa fa-external-link"></span></a>+ <a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.show', [$info['id']]) }}"><span class="bi bi-box-arrow-up-right"></span></a>@else- <a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.no-budget') }}"><span class="fa fa-external-link"></span></a>+ <a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.no-budget') }}"><span class="bi bi-box-arrow-up-right"></span></a>@endif</td><td data-value="{{ $info['name'] }}">diff --git a/resources/views/reports/partials/category-period.blade.php b/resources/views/reports/partials/category-period.blade.phpindex bdde1dd860..a0cedbe780 100644--- a/resources/views/reports/partials/category-period.blade.php+++ b/resources/views/reports/partials/category-period.blade.php@@ -13,9 +13,9 @@<tr><td data-value="{{ $info['title'] }}">@if($info['id'] !== 0)- <a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.show', [$info['id']]) }}"><span class="fa fa-external-link"></span></a>+ <a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.show', [$info['id']]) }}"><span class="bi bi-box-arrow-up-right"></span></a>@else- <a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.no-category') }}"><span class="fa fa-external-link"></span></a>+ <a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.no-category') }}"><span class="bi bi-box-arrow-up-right"></span></a>@endif</td><td data-value="{{ $info['title'] }}">diff --git a/resources/views/rules/rule/create.blade.php b/resources/views/rules/rule/create.blade.phpindex 5a23c2be8a..328db7dcb0 100644--- a/resources/views/rules/rule/create.blade.php+++ b/resources/views/rules/rule/create.blade.php@@ -79,7 +79,7 @@<p><br/><button type="button" class="btn btn-outline-secondary add_rule_trigger">{{ __('firefly.add_rule_trigger') }}</button>- <a href="#" class="btn btn-outline-secondary test_rule_triggers"><span class="fa fa-flask"></span> {{ __('firefly.test_rule_triggers') }}</a>+ <a href="#" class="btn btn-outline-secondary test_rule_triggers"><span class="bi bi-flask"></span> {{ __('firefly.test_rule_triggers') }}</a></p></div></div>diff --git a/resources/views/rules/rule/edit.blade.php b/resources/views/rules/rule/edit.blade.phpindex d6a9bcb586..f647bb7844 100644--- a/resources/views/rules/rule/edit.blade.php+++ b/resources/views/rules/rule/edit.blade.php@@ -63,7 +63,7 @@<br/><a href="#" class="btn btn-outline-secondary add_rule_trigger">{{ __('firefly.add_rule_trigger') }}</a><a href="#" class="btn btn-outline-secondary test_rule_triggers"><span- class="fa fa-flask"></span> {{ __('firefly.test_rule_triggers') }}</a>+ class="bi bi-flask"></span> {{ __('firefly.test_rule_triggers') }}</a></p></div></div>diff --git a/resources/views/search/index.blade.php b/resources/views/search/index.blade.phpindex 792227b68d..34936bc09c 100644--- a/resources/views/search/index.blade.php+++ b/resources/views/search/index.blade.php@@ -25,7 +25,7 @@</div><div class="form-group"><div class="col-sm-offset-1 col-sm-10">- <button type="submit" class="btn btn-info"><span class="fa fa-search"></span> {{ __('firefly.search') }}</button>+ <button type="submit" class="btn btn-info"><span class="bi bi-search"></span> {{ __('firefly.search') }}</button>@if($ruleId > 0 && $ruleChanged)<a href="{{ route('rules.edit', [$ruleId]) }}?from_query={{ $fullQuery }}"class="btn btn-outline-secondary">{{ trans('firefly.update_rule_from_query', ['rule' => $rule->title]) }}</a>@@ -112,7 +112,7 @@<div class="mass_buttons btn-group btn-group text-end"><a href="#" class="btn btn-outline-secondary mass_select"><spanclass="bi bi-check-square-o"></span> {{ __('firefly.select_transactions') }}</a>- <a href="#" class="btn btn-outline-secondary mass_stop_select hidden"><span class="fa faw-fw fa-square-o"+ <a href="#" class="btn btn-outline-secondary mass_stop_select hidden"><span class="bi bi-app"></span> {{ __('firefly.stop_selection') }}</a></div></div>diff --git a/resources/views/transactions/bulk/edit.blade.php b/resources/views/transactions/bulk/edit.blade.phpindex 72f9edd25a..4313450735 100644--- a/resources/views/transactions/bulk/edit.blade.php+++ b/resources/views/transactions/bulk/edit.blade.php@@ -79,7 +79,7 @@</td><td>@if($journal['journals_in_group'] > 1)- <span title="{{ __('firefly.part_of_split') }}" class="text-danger fa fa-exclamation-triangle"></span>+ <span title="{{ __('firefly.part_of_split') }}" class="text-danger bi bi-exclamation-triangle"></span>@endif</td></tr>diff --git a/resources/views/transactions/show.blade.php b/resources/views/transactions/show.blade.phpindex 367faf0ead..424d1c880c 100644--- a/resources/views/transactions/show.blade.php+++ b/resources/views/transactions/show.blade.php@@ -225,7 +225,7 @@@endif@if($journal['reconciled'])<li><a class="dropdown-item" class="reconcile-button" href="{{ route('transactions.unreconcile', [$journal['transaction_journal_id']]) }}"><span- class="fa fa-history"></span> {{ __('firefly.unreconcile') }}</a></li>+ class="bi bi-clock-history"></span> {{ __('firefly.unreconcile') }}</a></li>@endif@if($groupArray['transactions'][0]['type'] !== 'reconciliation' && $groupArray['transactions'][0]['type'] !== 'opening balance' && $groupArray['transactions'][0]['type'] !== 'liability credit')<li role="separator" class="divider"></li>@@ -266,11 +266,11 @@<li role="separator" class="divider"></li><li><a class="dropdown-item" href="{{ route('rules.create-from-journal', [$journal['transaction_journal_id']]) }}"><span- class="fa fa-random"></span>{{ __('firefly.create_rule_from_transaction') }}+ class="bi bi-shuffle"></span>{{ __('firefly.create_rule_from_transaction') }}</a></li><li><a class="dropdown-item" href="{{ route('recurring.create-from-journal', [$journal['transaction_journal_id']]) }}"><span- class="fa fa-paint-brush"></span>{{ __('firefly.create_recurring_from_transaction') }}+ class="bi bi-paint-bucket"></span>{{ __('firefly.create_recurring_from_transaction') }}</a></li>@endif</ul>diff --git a/resources/views/webhooks/show.blade.php b/resources/views/webhooks/show.blade.phpindex 10228b186a..6215ea3e98 100644--- a/resources/views/webhooks/show.blade.php+++ b/resources/views/webhooks/show.blade.php@@ -142,10 +142,14 @@</template></div><template x-if="loading">- <div class="card-body">- <p class="text-center">- <em class="fa fa-spin fa-spinner"></em>- </p>+ <div class="card-body">+ <div class="text-center">+ <span class="form-control-plaintext">+ <div class="spinner-border spinner-border-sm text-primary" role="status">+ <span class="visually-hidden">Loading...</span>+ </div>+ </span>+ </div></div></template><template x-if="messages.length > 0 && !loading">@@ -177,16 +181,16 @@<span x-text="message.uuid"></span></td><td>- <em class="fa fa-check text-success" x-show="message.success"></em>- <em class="fa fa-times text-danger" x-show="!message.success"></em>+ <em class="bi bi-check text-success" x-show="message.success"></em>+ <em class="bi bi-x text-danger" x-show="!message.success"></em></td><td><a @click="showWebhookMessage(message.id)" class="btn btn-default">- <em class="fa fa-envelope"></em>+ <em class="bi bi-envelope"></em>{{ __('firefly.view_message') }}</a><a @click="showWebhookAttempts(message.id)" class="btn btn-default">- <em class="fa fa-cloud-upload"></em>+ <em class="bi bi-cloud-arrow-up"></em>{{ __('firefly.view_attempts') }}</a></td>