Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Updated views
Sander Dorigo1e228bfad687
diff --git a/package-lock.json b/package-lock.jsonindex fe20757965..a9cc67811a 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,5 +1,5 @@{- "name": "firefly-iii",+ "name": "release","lockfileVersion": 3,"requires": true,"packages": {diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.phpindex a6ff27d2ac..9571d26492 100644--- a/resources/lang/en_US/firefly.php+++ b/resources/lang/en_US/firefly.php@@ -2914,7 +2914,8 @@ return [// debug page'debug_page' => 'Debug page',- 'debug_submit_instructions' => 'If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub issue</a>. It will generate a beautiful table that can be used to quickly diagnose your problem.',+ 'debug_submit_instructions' => 'If you are running into problems, you can use the information in the boxes below to help the developers debug the issue. Please copy-and-paste into a new or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub issue</a>. It will generate a beautiful table that can be used to quickly diagnose your problem.',+ 'debug_no_private' => 'Sharing this information will NOT compromise your security and it will not reveal any financial or personal information.','debug_pretty_table' => 'If you copy/paste the box below into a GitHub issue it will generate a table. Please do not surround this text with backticks or quotes.','debug_additional_data' => 'You may also share the content of the box below. You can also copy-and-paste this into a new or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub issue</a>. However, the content of this box may contain private information such as account names, transaction details or email addresses.',diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.phpindex 6649102182..104c62216f 100644--- a/resources/views/budgets/index.blade.php+++ b/resources/views/budgets/index.blade.php@@ -199,6 +199,7 @@<th class="quarter">{{ __('firefly.budgeted') }}</th><th class="hidden-sm hidden-xs">{{ __('firefly.spent') }} ({{ strtolower(__('firefly.per_day')) }})</th><th>{{ __('firefly.left') }} ({{ strtolower(__('firefly.per_day')) }})</th>+ <th class="hidden-sm hidden-xs ten"> </th></tr></thead><tbody>@@ -206,12 +207,8 @@@foreach($budgets as $budget)<tr data-id="{{ $budget['id'] }}">- <td class="hidden-sm hidden-xs">- <div class="btn-group btn-group-sm">- <a href="#" class="handle object-handle btn btn-outline-primary"><span class="bi bi-list"></span></a>- <a href="{{ route('budgets.edit', $budget['id']) }}" class="btn btn-outline-primary"><span class="bi bi-pencil"></span></a>- <a href="{{ route('budgets.delete', $budget['id']) }}" class="btn btn-xs btn-outline-danger"><span class="bi bi-trash"></span></a>- </div>+ <td>+ <a href="#" class="handle object-handle btn btn-sm"><span class="bi bi-list"></span></a></td><td>@if(0 === count($budget['budgeted']))@@ -370,6 +367,23 @@</span><br />@endforeach</td>+ <td class="hidden-sm hidden-xs text-end">+++ <div class="dropdown">+ <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">+ {{ __('firefly.actions') }}+ </button>+ <ul class="dropdown-menu">+ <li>+ <a href="{{ route('budgets.edit', $budget['id']) }}" class="dropdown-item"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a>+ </li>+ <li><a href="{{ route('budgets.delete', $budget['id']) }}" class="dropdown-item text-danger">+ <span class="bi bi-trash"></span> {{ __('firefly.delete') }}+ </a></li>+ </ul>+ </div>+ </td></tr>@endforeach{{-- END OF BUDGET ROW --}}diff --git a/resources/views/components/lists/piggy-banks.blade.php b/resources/views/components/lists/piggy-banks.blade.phpindex 82717b381c..68ae19fc48 100644--- a/resources/views/components/lists/piggy-banks.blade.php+++ b/resources/views/components/lists/piggy-banks.blade.php@@ -10,8 +10,9 @@<thead><tr><th class="w-4 d-none d-md-table-cell"> </th>- <th class="w-4 d-table-cell d-md-none"></th>- <th class="w-4"></th>+ <!--+ <th class="w-4"></th> {{-- mobile handlers --}}+ --><th class="w-25" style="width:30%;">{{ __('firefly.piggy_bank') }}</th><th class="w-10 text-end">{{ __('firefly.saved_so_far') }}</th><th class="d-none d-md-table-cell"></th>@@ -20,6 +21,7 @@<th class="w-10 text-end">{{ __('firefly.target_amount') }}</th><th class="w-10 d-none d-md-table-cell text-end">{{ __('firefly.left_to_save') }}</th><th class="w-15 d-none d-md-table-cell text-end">{{ __('firefly.suggested_savings_per_month') }}</th>+ <th class="w-4"> </th></tr></thead>@if(count($objectGroup['piggy_banks']) > 0)@@ -27,21 +29,17 @@@foreach($objectGroup['piggy_banks'] as $piggy)<tr class="piggy-sortable" data-id="{{ $piggy['id'] }}" data-name="{{ $piggy['name'] }}" data-order="{{ $piggy['order'] }}"><td class="d-none d-md-table-cell">- <span class="bi bi-list piggy-handle"></span>+ <a class="btn bi bi-list piggy-handle"></a><span class="loadSpin"></span></td>+ <!--<td class="d-table-cell d-md-none"><div class="btn-group btn-group-sm"><a href="{{ route('piggy-banks.remove-money-mobile', $piggy['id']) }}" class="btn btn-secondary btn-sm"><span class="bi bi-dash"></span></a><a href="{{ route('piggy-banks.add-money-mobile', $piggy['id']) }}" class="btn btn-secondary btn-sm"><span class="bi bi-plus"></span></a></div></td>- <td style="width:100px;">- <div class="btn-group btn-group-sm">- <a href="{{ route('piggy-banks.edit', $piggy['id']) }}" class="btn btn-secondary btn-sm"><span class="bi bi-pencil"></span></a>- <a href="{{ route('piggy-banks.delete', $piggy['id']) }}" class="btn btn-danger btn-sm"><span class="bi bi-trash"></span></a>- </div>- </td>+ --><td><a href="{{ route('piggy-banks.show', $piggy['id']) }}" title="{{ $piggy['name'] }}">{{ $piggy['name'] }}</a>@if(count($piggy['attachments']) > 0)@@ -114,6 +112,12 @@@endif@endif</td>+ <td style="width:100px;">+ <div class="btn-group btn-group-sm">+ <a href="{{ route('piggy-banks.edit', $piggy['id']) }}" class="btn btn-secondary btn-sm"><span class="bi bi-pencil"></span></a>+ <a href="{{ route('piggy-banks.delete', $piggy['id']) }}" class="btn btn-danger btn-sm"><span class="bi bi-trash"></span></a>+ </div>+ </td></tr>@endforeach<tr>diff --git a/resources/views/components/lists/subscriptions.blade.php b/resources/views/components/lists/subscriptions.blade.phpindex 8f7de92150..f50b73d02f 100644--- a/resources/views/components/lists/subscriptions.blade.php+++ b/resources/views/components/lists/subscriptions.blade.php@@ -10,7 +10,6 @@<table class="table table-hover table-sm" id="bill-sortable"><thead><tr>- <th class="hidden-sm hidden-xs"> </th><th class="hidden-sm hidden-xs"> </th><th>{{ __('list.name') }}</th><th class="hidden-sm hidden-md hidden-xs">{{ __('list.linked_to_rules') }}</th>@@ -18,6 +17,7 @@<th class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th><th class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th><th class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>+ <th class="hidden-sm hidden-xs"> </th></tr></thead>@if(count($objectGroup['bills']) > 0)@@ -26,16 +26,7 @@<tr class="bill-sortable" data-id="{{ $entry['id'] }}" data-name="{{ $entry['name'] }}"data-order="{{ $entry['order'] }}" data-position="{{ $loop->index }}"><td class="hidden-sm hidden-xs">- <span class="bi bi-list bill-handle"></span>- </td>- <td class="hidden-sm hidden-xs">- <div class="btn-group btn-group-sm edit_tr_buttons"><a- href="{{ route('subscriptions.edit',$entry['id']) }}"- class="btn btn-secondary"><span- class="bi bi-pencil"></span></a><a- href="{{ route('subscriptions.delete',$entry['id']) }}"- class="btn btn-danger"><span- class="bi bi-trash"></span></a></div>+ <a class="btn btn-sm bi bi-list bill-handle"></a></td><td>@if(!$entry['active'])@@ -175,13 +166,24 @@@endif@endif</td>+ <td class="hidden-sm hidden-xs text-end">+ <div class="dropdown">+ <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">+ {{ __('firefly.actions') }}+ </button>+ <ul class="dropdown-menu">+ <li><a class="dropdown-item" href="{{ route('subscriptions.edit',$entry['id']) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a></li>+ <li><a class="dropdown-item text-danger" href="{{ route('subscriptions.delete',$entry['id']) }}"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}</a></li>+ </ul>+ </div>+ </td></tr>@endforeach@if(array_key_exists($objectGroupOrder, $sums))@foreach($sums[$objectGroupOrder] as $sum)@if('0' !== $sum['avg'])<tr>- <td class="hidden-sm hidden-xs" colspan="2"> </td> <!-- handle -->+ <td class="hidden-sm hidden-xs"> </td> <!-- handle --><td colspan="2" class="text-end"> <!-- title --><small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }})({{ __('firefly.active_exp_bills_only') }})</small>@@ -189,12 +191,12 @@<td class="text-end"> <!-- amount -->{!! format_amount_by_symbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}</td>- <td class="hidden-sm hidden-xs" colspan="3"> </td> <!-- handle -->+ <td class="hidden-sm hidden-xs" colspan="4"> </td> <!-- handle --></tr>@endif@if('0' !== $sum['total_left_to_pay'])<tr>- <td class="hidden-sm hidden-xs" colspan="2"> </td> <!-- handle -->+ <td class="hidden-sm hidden-xs"> </td> <!-- handle --><td colspan="2" class="text-end"> <!-- title --><small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }})({{ __('firefly.left_to_pay_active_bills') }})</small>@@ -202,12 +204,12 @@<td class="text-end"> <!-- amount -->{!! format_amount_by_symbol($sum['total_left_to_pay'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}</td>- <td class="hidden-sm hidden-xs" colspan="3"> </td> <!-- handle -->+ <td class="hidden-sm hidden-xs" colspan="4"> </td> <!-- handle --></tr>@endif@if('0' !== $sum['per_period'])<tr>- <td class="hidden-sm hidden-xs" colspan="2"> </td> <!-- handle -->+ <td class="hidden-sm hidden-xs"> </td> <!-- handle --><td colspan="2" class="text-end"> <!-- title --><small>{{ __('firefly.per_period_sum_' . $sum['period']) }}({{ $sum['currency_name'] }})@@ -216,7 +218,7 @@<td class="text-end"> <!-- amount -->{!! format_amount_by_symbol($sum['per_period'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}</td>- <td class="hidden-sm hidden-xs" colspan="3"> </td> <!-- handle -->+ <td class="hidden-sm hidden-xs" colspan="4"> </td> <!-- handle --></tr>@endif@endforeachdiff --git a/resources/views/debug.blade.php b/resources/views/debug.blade.phpindex 9db789bb66..207e31e335 100644--- a/resources/views/debug.blade.php+++ b/resources/views/debug.blade.php@@ -1,23 +1,21 @@-<!DOCTYPE html>-<html lang="{{ trans('config.html_language') }}">-<head>- <title>{{ trans('firefly.debug_page') }}</title>-</head>+@extends('layout.v3.debug')+@section('content')<style nonce="{{ $JS_NONCE }}">p.default-text {font-family:Arial, Arial, Helvetica, sans-serif;font-size:12@pt;width:600px;}p.warn-text {font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;}- textarea {font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;}+ textarea {font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt !important;}</style>-<body>--<p class="default-text">+<p>{!! trans('firefly.debug_submit_instructions') !!}</p>-<p class="default-text">- <strong>{{ trans('firefly.debug_pretty_table') }}</strong>+<p>+ {{ __('firefly.debug_no_private') }}+</p>+<p>+ {{ trans('firefly.debug_pretty_table') }}</p><label for="debug_info"></label>-<textarea rows="30" cols="100" name="debug_info" id="debug_info">+<textarea rows="30" class="form-control" name="debug_info" id="debug_info">Debug information generated at {{ $now }} for Firefly III version **{{ !$FF_IS_DEVELOP ? 'v' : '' }}{{ $FF_VERSION }}**.{{ $table }}@@ -30,23 +28,24 @@ Debug information generated at {{ $now }} for Firefly III version **{{ !$FF_IS_DtextArea.value = text;</script>-<p class=default-text">+<p><a href="{{ route('index') }}">{{ trans('firefly.back_to_index') }}</a></p>-<p class="warn-text">+<p class="text-danger">{!! trans('firefly.debug_additional_data') !!}</p>-<textarea rows="30" cols="100" name="log_info">+<textarea rows="30" class="form-control" name="log_info">```{{ $logContent }}```</textarea>-<p class=default-text">+<p><a href="{{ route('index') }}">{{ trans('firefly.back_to_index') }}</a></p></body></html>+@endsectiondiff --git a/resources/views/layout/v3/debug.blade.php b/resources/views/layout/v3/debug.blade.phpnew file mode 100644index 0000000000..a1cc13c5bb--- /dev/null+++ b/resources/views/layout/v3/debug.blade.php@@ -0,0 +1,58 @@+<!doctype html>+<html lang="{{ __('config.html_language') }}">+<head>+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>+ <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">+ <!--+ (BLANK)+ If the base href URL begins with "http://" but you are sure it should start with "https://",+ please visit the following page: https://bit.ly/FF3-broken-base-href+ -->+ <base href="{{ route('index', null, true) }}/">+ <title>{{ __('firefly.login_page_title') }}</title>+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/>+ <meta name="theme-color" content="#007bff" media="(prefers-color-scheme: light)"/>+ <meta name="theme-color" content="#1a1a1a" media="(prefers-color-scheme: dark)"/>+ <meta name="color-scheme" content="light dark">+ @vite(['sass/app.scss'])+ <x-layout.fav-icons/>+ <script nonce="{{ $JS_NONCE ?? '' }}">+ (() => {+ 'use strict'+ document.documentElement.setAttribute('data-bs-theme', (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'))+ })()+ </script>+</head>+<body class="bg-body-tertiary">+<main class="align-items-center min-vh-100 py-5">+ <div class="container">+ <div class="row justify-content-center">+ <div class="col-md-12 col-lg-8 col-xl-8">+ <p class="text-center">+ <img src="images/logo-session.png" width="68" height="100" alt="Firefly III Logo" title="Firefly III"/><br>+ </p>+ @if(str_starts_with($FF_VERSION, 'develop'))+ <h1 style="font-family: monospace;font-size:14pt;">+ <em class="bi bi-bug"></em>+ <strong>Firefly</strong> III {{ $FF_VERSION }} - Debug information</h1>+ @endif+ @if(!str_starts_with($FF_VERSION, 'develop'))+ <h1>+ <em class="bi bi-bug"></em>+ <strong>Firefly</strong> III v{{ $FF_VERSION }} - Debug information</h1>+ @endif+ <h2 class="text-danger">@yield('sub_title')</h2>+ @yield('content')+ </div>+ </div>+ </div>+</main>+@vite(['js/pages/generic.js'])++</body>+</html>