mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
You could've just asked...
This commit is contained in:
parent
dfe055732d
commit
477524a8ae
@ -65,7 +65,7 @@ class HomeController extends Controller
|
|||||||
$stringEnd = '';
|
$stringEnd = '';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$stringStart = e((string)$request->get('start'));
|
$stringStart = e((string) $request->get('start'));
|
||||||
$start = Carbon::createFromFormat('Y-m-d', $stringStart);
|
$start = Carbon::createFromFormat('Y-m-d', $stringStart);
|
||||||
} catch (InvalidFormatException $e) {
|
} catch (InvalidFormatException $e) {
|
||||||
app('log')->error(sprintf('Start: could not parse date string "%s" so ignore it.', $stringStart));
|
app('log')->error(sprintf('Start: could not parse date string "%s" so ignore it.', $stringStart));
|
||||||
@ -73,7 +73,7 @@ class HomeController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$stringEnd = e((string)$request->get('end'));
|
$stringEnd = e((string) $request->get('end'));
|
||||||
$end = Carbon::createFromFormat('Y-m-d', $stringEnd);
|
$end = Carbon::createFromFormat('Y-m-d', $stringEnd);
|
||||||
} catch (InvalidFormatException $e) {
|
} catch (InvalidFormatException $e) {
|
||||||
app('log')->error(sprintf('End could not parse date string "%s" so ignore it.', $stringEnd));
|
app('log')->error(sprintf('End could not parse date string "%s" so ignore it.', $stringEnd));
|
||||||
@ -92,7 +92,7 @@ class HomeController extends Controller
|
|||||||
app('log')->debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
|
app('log')->debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
|
||||||
// check if the label is "everything" or "Custom range" which will betray
|
// check if the label is "everything" or "Custom range" which will betray
|
||||||
// a possible problem with the budgets.
|
// a possible problem with the budgets.
|
||||||
if ($label === (string)trans('firefly.everything') || $label === (string)trans('firefly.customRange')) {
|
if ($label === (string) trans('firefly.everything') || $label === (string) trans('firefly.customRange')) {
|
||||||
$isCustomRange = true;
|
$isCustomRange = true;
|
||||||
app('log')->debug('Range is now marked as "custom".');
|
app('log')->debug('Range is now marked as "custom".');
|
||||||
}
|
}
|
||||||
@ -100,7 +100,7 @@ class HomeController extends Controller
|
|||||||
$diff = $start->diffInDays($end, true) + 1;
|
$diff = $start->diffInDays($end, true) + 1;
|
||||||
|
|
||||||
if ($diff > 366) {
|
if ($diff > 366) {
|
||||||
$request->session()->flash('warning', (string)trans('firefly.warning_much_data', ['days' => (int)$diff]));
|
$request->session()->flash('warning', (string) trans('firefly.warning_much_data', ['days' => (int) $diff]));
|
||||||
}
|
}
|
||||||
|
|
||||||
$request->session()->put('is_custom_range', $isCustomRange);
|
$request->session()->put('is_custom_range', $isCustomRange);
|
||||||
@ -128,10 +128,10 @@ class HomeController extends Controller
|
|||||||
return redirect(route('new-user.index'));
|
return redirect(route('new-user.index'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('v1' === (string)config('view.layout')) {
|
if ('v1' === (string) config('view.layout')) {
|
||||||
return $this->indexV1($repository);
|
return $this->indexV1($repository);
|
||||||
}
|
}
|
||||||
if ('v2' === (string)config('view.layout')) {
|
if ('v2' === (string) config('view.layout')) {
|
||||||
return $this->indexV2();
|
return $this->indexV2();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,8 +141,9 @@ 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 = [];
|
||||||
$frontpage = app('preferences')->getFresh('frontpageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray());
|
$frontpage = app('preferences')->getFresh('frontpageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray());
|
||||||
$frontpageArray = $frontpage->data;
|
$frontpageArray = $frontpage->data;
|
||||||
@ -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'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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',
|
||||||
|
@ -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" %}
|
||||||
|
@ -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 }} »
|
||||||
|
Loading…
Reference in New Issue
Block a user