IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

You could've just asked...

Browse Source
This commit is contained in:
James Cole 2024-05-21 17:48:54 +02:00
parent dfe055732d
commit 477524a8ae
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
4 changed files with 1711 additions and 1702 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/HomeController.php
View File

@ -141,6 +141,7 @@ class HomeController extends Controller
private function indexV1(AccountRepositoryInterface $repository): mixed private function indexV1(AccountRepositoryInterface $repository): mixed
{ {
$types = config('firefly.accountTypesByIdentifier.asset'); $types = config('firefly.accountTypesByIdentifier.asset');
$pageTitle = (string) trans('firefly.main_dashboard_page_title');
$count = $repository->count($types); $count = $repository->count($types);
$subTitle = (string) trans('firefly.welcome_back'); $subTitle = (string) trans('firefly.welcome_back');
$transactions = []; $transactions = [];
@ -177,12 +178,13 @@ class HomeController extends Controller
$user = auth()->user(); $user = auth()->user();
event(new RequestedVersionCheckStatus($user)); event(new RequestedVersionCheckStatus($user));
return view('index', compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today')); return view('index', compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today', 'pageTitle'));
} }
private function indexV2(): mixed private function indexV2(): mixed
{ {
$subTitle = (string) trans('firefly.welcome_back'); $subTitle = (string) trans('firefly.welcome_back');
$pageTitle = (string) trans('firefly.main_dashboard_page_title');
$start = session('start', today(config('app.timezone'))->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
$end = session('end', today(config('app.timezone'))->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
@ -191,6 +193,6 @@ class HomeController extends Controller
$user = auth()->user(); $user = auth()->user();
event(new RequestedVersionCheckStatus($user)); event(new RequestedVersionCheckStatus($user));
return view('index', compact('subTitle', 'start', 'end')); return view('index', compact('subTitle', 'start', 'end', 'pageTitle'));
} }
} }

1
resources/lang/en_US/firefly.php
View File

@ -42,6 +42,7 @@ return [
'year_to_date' => 'Year to date', 'year_to_date' => 'Year to date',
'YTD' => 'YTD', 'YTD' => 'YTD',
'welcome_back' => 'What\'s playing?', 'welcome_back' => 'What\'s playing?',
'main_dashboard_page_title' => 'Home',
'everything' => 'Everything', 'everything' => 'Everything',
'today' => 'today', 'today' => 'today',
'customRange' => 'Custom range', 'customRange' => 'Custom range',

5
resources/views/layout/default.twig
View File

@ -14,7 +14,10 @@
<meta name="color-scheme" content="light dark"> <meta name="color-scheme" content="light dark">
<title> <title>
{% if subTitle %} {% if pageTitle %}
{{ pageTitle }} »
{% endif %}
{% if subTitle and not pageTitle %}
{{ subTitle }} » {{ subTitle }} »
{% endif %} {% endif %}
{% if title != "Firefly III" %} {% if title != "Firefly III" %}

5
resources/views/v2/partials/layout/head.blade.php
View File

@ -56,9 +56,12 @@
</script> </script>
<title> <title>
@if($subTitle) @if($subTitle && null === ($pageTitle ?? null))
{{ $subTitle }} » {{ $subTitle }} »
@endif @endif
@if(null !== ($pageTitle ?? null))
{{ $pageTitle }} »
@endif
@if($title !== 'Firefly III') @if($title !== 'Firefly III')
{{ $title }} » {{ $title }} »