kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 19:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Make it easier to switch between v1/v2 layout.

Browse Source
This commit is contained in:
James Cole
2021-02-01 06:29:45 +01:00
parent be05513ecd
commit f9220b8999
39 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Api/V1/Controllers/RecurrenceController.php
View File

@@ -101,7 +101,7 @@ class RecurrenceController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getAll();
@@ -180,7 +180,7 @@ class RecurrenceController extends Controller
*/
public function transactions(Request $request, Recurrence $recurrence): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
@@ -243,11 +243,8 @@ class RecurrenceController extends Controller
if (false === $result) {
return response()->json([], 204);
}
if (true === $result) {
return response()->json();
}
return response()->json([], 418); // @codeCoverageIgnore
return response()->json();
}
/**

8
app/Http/Controllers/JavascriptController.php
View File

@@ -69,7 +69,7 @@ class JavascriptController extends Controller
}
return response()
->view('javascript.accounts', $data)
->view('v1.javascript.accounts', $data)
->header('Content-Type', 'text/javascript');
}
@@ -92,7 +92,7 @@ class JavascriptController extends Controller
}
return response()
->view('javascript.currencies', $data)
->view('v1.javascript.currencies', $data)
->header('Content-Type', 'text/javascript');
}
@@ -116,7 +116,7 @@ class JavascriptController extends Controller
];
return response()
->view('javascript.variables', $data)
->view('v2.javascript.variables', $data)
->header('Content-Type', 'text/javascript');
}
@@ -158,7 +158,7 @@ class JavascriptController extends Controller
$request->session()->keep(['two-factor-secret']);
return response()
->view('javascript.variables', $data)
->view('v1.javascript.variables', $data)
->header('Content-Type', 'text/javascript');
}

2
app/Mail/AccessTokenCreatedMail.php
View File

@@ -62,7 +62,7 @@ class AccessTokenCreatedMail extends Mailable
*/
public function build(): self
{
return $this->view('emails.access-token-created-html')->text('emails.access-token-created-text')
return $this->view('v1.emails.access-token-created-html')->text('v1.emails.access-token-created-text')
->subject((string) trans('email.access_token_created_subject'));
}
}

2
app/Mail/AdminTestMail.php
View File

@@ -61,7 +61,7 @@ class AdminTestMail extends Mailable
*/
public function build(): self
{
return $this->view('emails.admin-test-html')->text('emails.admin-test-text')
return $this->view('v1.emails.admin-test-html')->text('v1.emails.admin-test-text')
->subject((string) trans('email.admin_test_subject'));
}
}

2
app/Mail/ConfirmEmailChangeMail.php
View File

@@ -69,7 +69,7 @@ class ConfirmEmailChangeMail extends Mailable
*/
public function build(): self
{
return $this->view('emails.confirm-email-change-html')->text('emails.confirm-email-change-text')
return $this->view('v1.emails.confirm-email-change-html')->text('v1.emails.confirm-email-change-text')
->subject((string) trans('email.email_change_subject'));
}
}

2
app/Mail/NewIPAddressWarningMail.php
View File

@@ -83,7 +83,7 @@ class NewIPAddressWarningMail extends Mailable
$this->host = $hostName;
}
return $this->view('emails.new-ip-html')->text('emails.new-ip-text')
return $this->view('v1.emails.new-ip-html')->text('v1.emails.new-ip-text')
->subject((string) trans('email.login_from_new_ip'));
}
}

2
app/Mail/OAuthTokenCreatedMail.php
View File

@@ -66,7 +66,7 @@ class OAuthTokenCreatedMail extends Mailable
*/
public function build(): self
{
return $this->view('emails.oauth-client-created-html')->text('emails.oauth-client-created-text')
return $this->view('v1.emails.oauth-client-created-html')->text('v1.emails.oauth-client-created-text')
->subject((string) trans('email.oauth_created_subject'));
}
}

2
app/Mail/RegisteredUser.php
View File

@@ -61,6 +61,6 @@ class RegisteredUser extends Mailable
*/
public function build(): self
{
return $this->view('emails.registered-html')->text('emails.registered-text')->subject((string) trans('email.registered_subject'));
return $this->view('v1.emails.registered-html')->text('v1.emails.registered-text')->subject((string) trans('email.registered_subject'));
}
}

2
app/Mail/ReportNewJournalsMail.php
View File

@@ -72,7 +72,7 @@ class ReportNewJournalsMail extends Mailable
{
$this->transform();
return $this->view('emails.report-new-journals-html')->text('emails.report-new-journals-text')
return $this->view('v1.emails.report-new-journals-html')->text('v1.emails.report-new-journals-text')
->subject((string) trans_choice('email.new_journals_subject', $this->groups->count()));
}

2
app/Mail/RequestedNewPassword.php
View File

@@ -60,6 +60,6 @@ class RequestedNewPassword extends Mailable
*/
public function build(): self
{
return $this->view('emails.password-html')->text('emails.password-text')->subject((string) trans('email.reset_pw_subject'));
return $this->view('v1.emails.password-html')->text('v1.emails.password-text')->subject((string) trans('email.reset_pw_subject'));
}
}

2
app/Mail/UndoEmailChangeMail.php
View File

@@ -67,7 +67,7 @@ class UndoEmailChangeMail extends Mailable
*/
public function build(): self
{
return $this->view('emails.undo-email-change-html')->text('emails.undo-email-change-text')
return $this->view('v1.emails.undo-email-change-html')->text('v1.emails.undo-email-change-text')
->subject((string) trans('email.email_change_subject'));
}
}