From 4420df6e5d15fa95084471395cb3892f1698e52b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Nov 2018 11:31:02 +0100 Subject: [PATCH] New views for password reset, login and other user forms. --- .../Auth/ForgotPasswordController.php | 3 +- .../Controllers/Auth/RegisterController.php | 7 +- .../Auth/ResetPasswordController.php | 18 ++- app/Services/Password/PwndVerifierV2.php | 2 +- .../Http/Controllers/RequestInformation.php | 2 +- resources/lang/en_US/firefly.php | 17 +-- resources/lang/en_US/validation.php | 2 +- .../views/v1/partials/password-modal.twig | 14 +-- resources/views/v2/auth/login.twig | 73 ++++++------ resources/views/v2/auth/passwords/email.twig | 62 +++++++++++ resources/views/v2/auth/passwords/reset.twig | 105 ++++++++++++++++++ resources/views/v2/auth/register.twig | 78 +++++++++++++ .../v2/emails/access-token-created-html.twig | 13 +++ .../v2/emails/access-token-created-text.twig | 7 ++ .../views/v2/emails/admin-test-html.twig | 5 + .../views/v2/emails/admin-test-text.twig | 3 + .../views/v2/emails/confirm-account-html.twig | 20 ++++ .../views/v2/emails/confirm-account-text.twig | 11 ++ .../v2/emails/confirm-email-change-html.twig | 18 +++ .../v2/emails/confirm-email-change-text.twig | 9 ++ resources/views/v2/emails/error-html.twig | 47 ++++++++ resources/views/v2/emails/error-text.twig | 31 ++++++ resources/views/v2/emails/footer-html.twig | 13 +++ resources/views/v2/emails/footer-text.twig | 6 + resources/views/v2/emails/header-html.twig | 10 ++ resources/views/v2/emails/header-text.twig | 2 + .../v2/emails/oauth-client-created-html.twig | 14 +++ .../v2/emails/oauth-client-created-text.twig | 9 ++ resources/views/v2/emails/password-html.twig | 13 +++ resources/views/v2/emails/password-text.twig | 7 ++ .../views/v2/emails/registered-html.twig | 18 +++ .../views/v2/emails/registered-text.twig | 20 ++++ .../v2/emails/report-new-journals-html.twig | 34 ++++++ .../v2/emails/report-new-journals-text.twig | 25 +++++ .../v2/emails/undo-email-change-html.twig | 18 +++ .../v2/emails/undo-email-change-text.twig | 12 ++ resources/views/v2/error.twig | 35 ++++++ resources/views/v2/layout/auth.twig | 29 +++++ resources/views/v2/layout/default.twig | 14 +-- resources/views/v2/partials/favicons.twig | 7 +- .../views/v2/partials/password_modal.twig | 35 ++++++ 41 files changed, 792 insertions(+), 76 deletions(-) create mode 100644 resources/views/v2/auth/passwords/email.twig create mode 100644 resources/views/v2/auth/passwords/reset.twig create mode 100644 resources/views/v2/auth/register.twig create mode 100644 resources/views/v2/emails/access-token-created-html.twig create mode 100644 resources/views/v2/emails/access-token-created-text.twig create mode 100644 resources/views/v2/emails/admin-test-html.twig create mode 100644 resources/views/v2/emails/admin-test-text.twig create mode 100644 resources/views/v2/emails/confirm-account-html.twig create mode 100644 resources/views/v2/emails/confirm-account-text.twig create mode 100644 resources/views/v2/emails/confirm-email-change-html.twig create mode 100644 resources/views/v2/emails/confirm-email-change-text.twig create mode 100644 resources/views/v2/emails/error-html.twig create mode 100644 resources/views/v2/emails/error-text.twig create mode 100644 resources/views/v2/emails/footer-html.twig create mode 100644 resources/views/v2/emails/footer-text.twig create mode 100644 resources/views/v2/emails/header-html.twig create mode 100644 resources/views/v2/emails/header-text.twig create mode 100644 resources/views/v2/emails/oauth-client-created-html.twig create mode 100644 resources/views/v2/emails/oauth-client-created-text.twig create mode 100644 resources/views/v2/emails/password-html.twig create mode 100644 resources/views/v2/emails/password-text.twig create mode 100644 resources/views/v2/emails/registered-html.twig create mode 100644 resources/views/v2/emails/registered-text.twig create mode 100644 resources/views/v2/emails/report-new-journals-html.twig create mode 100644 resources/views/v2/emails/report-new-journals-text.twig create mode 100644 resources/views/v2/emails/undo-email-change-html.twig create mode 100644 resources/views/v2/emails/undo-email-change-text.twig create mode 100644 resources/views/v2/error.twig create mode 100644 resources/views/v2/partials/password_modal.twig diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index c8fe3b60fe..f950b0a99b 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -109,10 +109,11 @@ class ForgotPasswordController extends Controller $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $userCount = User::count(); $allowRegistration = true; + $pageTitle = (string)trans('firefly.forgot_pw_page_title'); if (true === $singleUserMode && $userCount > 0) { $allowRegistration = false; } - return view('auth.passwords.email')->with(compact('allowRegistration')); + return view('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle')); } } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 0f09de03b4..fec1f10e5a 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -72,7 +72,7 @@ class RegisterController extends Controller { // is allowed to? $allowRegistration = true; - $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent'); + $loginProvider = envNonEmpty('LOGIN_PROVIDER', 'eloquent'); $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $userCount = User::count(); if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) { @@ -113,10 +113,11 @@ class RegisterController extends Controller public function showRegistrationForm(Request $request) { $allowRegistration = true; - $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent'); + $loginProvider = envNonEmpty('LOGIN_PROVIDER', 'eloquent'); $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $userCount = User::count(); + $pageTitle = (string)trans('firefly.register_page_title'); if (true === $isDemoSite) { $allowRegistration = false; @@ -138,7 +139,7 @@ class RegisterController extends Controller $email = $request->old('email'); - return view('auth.register', compact('isDemoSite', 'email')); + return view('auth.register', compact('isDemoSite', 'email', 'pageTitle')); } } diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index a54db5b1a6..fc420866e5 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -78,18 +78,18 @@ class ResetPasswordController extends Controller return view('error', compact('message')); } - // is allowed to register? $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $userCount = User::count(); $allowRegistration = true; + $pageTitle = (string)trans('firefly.reset_pw_page_title'); if (true === $singleUserMode && $userCount > 0) { $allowRegistration = false; } /** @noinspection PhpUndefinedFieldInspection */ return view('auth.passwords.reset')->with( - ['token' => $token, 'email' => $request->email, 'allowRegistration' => $allowRegistration] + ['token' => $token, 'email' => $request->email, 'allowRegistration' => $allowRegistration,'pageTitle' => $pageTitle] ); } @@ -129,5 +129,17 @@ class ResetPasswordController extends Controller : $this->sendResetFailedResponse($request, $response); } - + /** + * Get the password reset validation rules. + * + * @return array + */ + protected function rules() + { + return [ + 'token' => 'required', + 'email' => 'required|email', + 'password' => 'required|confirmed|min:6|secure_password', + ]; + } } diff --git a/app/Services/Password/PwndVerifierV2.php b/app/Services/Password/PwndVerifierV2.php index 156d2f8b17..a5727ca004 100644 --- a/app/Services/Password/PwndVerifierV2.php +++ b/app/Services/Password/PwndVerifierV2.php @@ -58,7 +58,7 @@ class PwndVerifierV2 implements Verifier $uri = sprintf('https://api.pwnedpasswords.com/range/%s', $prefix); $opt = [ 'headers' => ['User-Agent' => 'Firefly III v' . config('firefly.version')], - 'timeout' => 2]; + 'timeout' => 5]; Log::debug(sprintf('hash prefix is %s', $prefix)); Log::debug(sprintf('rest is %s', $rest)); diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php index 01c561f731..76004eddfa 100644 --- a/app/Support/Http/Controllers/RequestInformation.php +++ b/app/Support/Http/Controllers/RequestInformation.php @@ -394,7 +394,7 @@ trait RequestInformation $data, [ 'email' => 'required|string|email|max:255|unique:users', - 'password' => 'required|string|secure_password|confirmed', + 'password' => 'required|string|min:6|secure_password|confirmed', ] ); } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 58ef7a4455..77df14cb97 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -177,6 +177,10 @@ return [ 'reset_button' => 'Reset', 'want_to_login' => 'I want to login', 'login_page_title' => 'Login to Firefly III', + 'register_page_title' => 'Register at Firefly III', + 'forgot_pw_page_title' => 'Forgot your password for Firefly III', + 'reset_pw_page_title' => 'Reset your password for Firefly III', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demo user.', 'button_register' => 'Register', 'authorization' => 'Authorization', 'active_bills_only' => 'active bills only', @@ -535,14 +539,13 @@ return [ 'invalid_password' => 'Invalid password!', 'what_is_pw_security' => 'What is "verify password security"?', 'secure_pw_title' => 'How to choose a secure password', - 'secure_pw_history' => 'In August 2017 well known security researcher Troy Hunt released a list of 306 million stolen passwords. These passwords were stolen during breakins at companies like LinkedIn, Adobe and NeoPets (and many more).', - 'secure_pw_check_box' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.', - 'secure_pw_sha1' => 'But I thought SHA1 was broken?', - 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another digest that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', - 'secure_pw_hash_security' => 'This digest would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and only the first five characters of this digest are sent over HTTPS.', + 'secure_pw_history' => 'Not a week goes by that you read in the news about a site losing the passwords of its users. Hackers and thieves use these passwords to try to steal your private information. This information is valuable.', + 'secure_pw_ff' => 'Do you use the same password all over the internet? If one site loses your password, hackers have access to all your data. Firefly III relies on you to choose a strong and unique password to protect your financial records.', + 'secure_pw_check_box' => 'To help you do that Firefly III can check if the password you want to use has been stolen in the past. If this is the case, Firefly III advises you NOT to use that password.', + 'secure_pw_working_title' => 'How does it work?', + 'secure_pw_working' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.', 'secure_pw_should' => 'Should I check the box?', - 'secure_pw_long_password' => 'If you just generated a long, single-use password for Firefly III using some kind of password generator: no.', - 'secure_pw_short' => 'If you just entered the password you always use: Please yes.', + 'secure_pw_long_password' => 'Yes. Always verify your password is safe.', 'command_line_token' => 'Command line token', 'explain_command_line_token' => 'You need this token to perform command line options, such as importing or exporting data. Without it, such sensitive commands will not work. Do not share your command line token. Nobody will ask you for this token, not even me. If you fear you lost this, or when you\'re paranoid, regenerate this token using the button.', 'regenerate_command_line_token' => 'Regenerate command line token', diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php index 9f8f7b9d50..f1aff6e459 100644 --- a/resources/lang/en_US/validation.php +++ b/resources/lang/en_US/validation.php @@ -123,7 +123,7 @@ return [ 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero.', 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', - 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password-security', 'valid_recurrence_rep_type' => 'Invalid repetition type for recurring transactions.', 'valid_recurrence_rep_moment' => 'Invalid repetition moment for this type of repetition.', 'invalid_account_info' => 'Invalid account information.', diff --git a/resources/views/v1/partials/password-modal.twig b/resources/views/v1/partials/password-modal.twig index 8237612199..cdb8c48654 100644 --- a/resources/views/v1/partials/password-modal.twig +++ b/resources/views/v1/partials/password-modal.twig @@ -11,23 +11,21 @@

{{ 'secure_pw_history'|_ }}

+

+ {{ 'secure_pw_ff'|_ }} +

{{ 'secure_pw_check_box'|_ }}

-

{{ 'secure_pw_sha1'|_ }}

+ +

{{ 'secure_pw_working_title'|_ }}

- {{ 'secure_pw_hash_speed'|_ }} -

-

- {{ 'secure_pw_hash_security'|_ }} + {{ 'secure_pw_working'|_ }}

{{ 'secure_pw_should'|_ }}

{{ 'secure_pw_long_password'|_ }}

-

- {{ 'secure_pw_short'|_ }} -

diff --git a/resources/views/v2/auth/login.twig b/resources/views/v2/auth/login.twig index 0b61e282d2..ff48d5c8e1 100644 --- a/resources/views/v2/auth/login.twig +++ b/resources/views/v2/auth/login.twig @@ -1,39 +1,28 @@ - - - - - - - - - - {# favicons #} - {% include('partials.favicons') %} - - TODO replace meLogin - - - - - - - - - - - -
-
+{% extends "./layout/auth" %} +{% block content %} +
-
- - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/resources/views/v2/auth/passwords/email.twig b/resources/views/v2/auth/passwords/email.twig new file mode 100644 index 0000000000..69dd90b18c --- /dev/null +++ b/resources/views/v2/auth/passwords/email.twig @@ -0,0 +1,62 @@ +{% extends "./layout/auth" %} +{% block content %} +
+
+
+ +
+
+
+{% endblock %} \ No newline at end of file diff --git a/resources/views/v2/auth/passwords/reset.twig b/resources/views/v2/auth/passwords/reset.twig new file mode 100644 index 0000000000..b213dbc9f0 --- /dev/null +++ b/resources/views/v2/auth/passwords/reset.twig @@ -0,0 +1,105 @@ +{% extends "./layout/auth" %} +{% block content %} +
+
+
+ +
+
+
+ + + + {# modal #} + + +{% endblock %} \ No newline at end of file diff --git a/resources/views/v2/auth/register.twig b/resources/views/v2/auth/register.twig new file mode 100644 index 0000000000..ba3442781f --- /dev/null +++ b/resources/views/v2/auth/register.twig @@ -0,0 +1,78 @@ +{% extends "./layout/auth" %} +{% block content %} +
+
+
+ +
+
+
+{% endblock %} \ No newline at end of file diff --git a/resources/views/v2/emails/access-token-created-html.twig b/resources/views/v2/emails/access-token-created-html.twig new file mode 100644 index 0000000000..1c88099a1d --- /dev/null +++ b/resources/views/v2/emails/access-token-created-html.twig @@ -0,0 +1,13 @@ +{% include 'emails.header-html' %} +

+ Somebody (hopefully you) just created a new Firefly III API Access Token for your user account. +

+ +

+ With this token, they can access all of your financial records through the Firefly III API. +

+ +

+ If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}. +

+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/access-token-created-text.twig b/resources/views/v2/emails/access-token-created-text.twig new file mode 100644 index 0000000000..5ea41eb0fe --- /dev/null +++ b/resources/views/v2/emails/access-token-created-text.twig @@ -0,0 +1,7 @@ +{% include 'emails.header-text' %} +Somebody (hopefully you) just created a new Firefly III API Access Token for your user account. + +With this token, they can access all of your financial records through the Firefly III API. + +If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}. +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/admin-test-html.twig b/resources/views/v2/emails/admin-test-html.twig new file mode 100644 index 0000000000..0862786993 --- /dev/null +++ b/resources/views/v2/emails/admin-test-html.twig @@ -0,0 +1,5 @@ +{% include 'emails.header-html' %} +

+ This is a test message from your Firefly III instance. It was sent to {{ email }}. +

+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/admin-test-text.twig b/resources/views/v2/emails/admin-test-text.twig new file mode 100644 index 0000000000..23c246e694 --- /dev/null +++ b/resources/views/v2/emails/admin-test-text.twig @@ -0,0 +1,3 @@ +{% include 'emails.header-text' %} + This is a test message from your Firefly III instance. It was sent to {{ email }}. +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/confirm-account-html.twig b/resources/views/v2/emails/confirm-account-html.twig new file mode 100644 index 0000000000..9dacd4e6a5 --- /dev/null +++ b/resources/views/v2/emails/confirm-account-html.twig @@ -0,0 +1,20 @@ +{% include 'emails.header-html' %} +

+ To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is + valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is! +

+ +

+ To active your account please follow the link below. +

+

+ PLEASE verify that this activation link goes to the Firefly III installation you expect it to be: +

+

+ {{ route }} +

+ +

+ You should be redirected to the index page right away. The link expires in about four hours. +

+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/confirm-account-text.twig b/resources/views/v2/emails/confirm-account-text.twig new file mode 100644 index 0000000000..ca8f3a1e1b --- /dev/null +++ b/resources/views/v2/emails/confirm-account-text.twig @@ -0,0 +1,11 @@ +{% include 'emails.header-text' %} +To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is! + +To active your account please follow the link below. + +PLEASE verify that this activation link goes to the Firefly III installation you expect it to be: + +{{ route }} + +You should be redirected to the index page right away. The link expires in about four hours. +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/confirm-email-change-html.twig b/resources/views/v2/emails/confirm-email-change-html.twig new file mode 100644 index 0000000000..aa946b88ea --- /dev/null +++ b/resources/views/v2/emails/confirm-email-change-html.twig @@ -0,0 +1,18 @@ +{% include 'emails.header-html' %} +

+ You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it. +

+

+ The old email addres was: {{ oldEmail }} +

+

+ The new email address is: {{ newEmail }} +

+

+ You cannot use Firefly III until you confirm this change. Please follow the link below to do so. +

+ +

+ {{ uri }} +

+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/confirm-email-change-text.twig b/resources/views/v2/emails/confirm-email-change-text.twig new file mode 100644 index 0000000000..cea4fd7c08 --- /dev/null +++ b/resources/views/v2/emails/confirm-email-change-text.twig @@ -0,0 +1,9 @@ +{% include 'emails.header-text' %} +You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it. + +The old email addres was: {{ oldEmail }} + +The new email address is: {{ newEmail }} + +You cannot use Firefly III until you confirm this change. Please follow the link to do so: {{ uri }} +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/error-html.twig b/resources/views/v2/emails/error-html.twig new file mode 100644 index 0000000000..0e0f2004f0 --- /dev/null +++ b/resources/views/v2/emails/error-html.twig @@ -0,0 +1,47 @@ +{% include 'emails.header-html' %} +

+ Firefly III v{{ version }} ran into an error: {{ errorMessage }} +

+ +

+ The error was of type "{{ class }}". +

+ +

+ The error occured on/at: {{ time }}. +

+ +

+ This error occured in file {{ file }} on line {{ line }} with code {{ code }}. +

+ +

+ {% if loggedIn %} + The error was encountered by user #{{ user.id }}, {{ user.email }}. + {% else %} + There was no user logged in for this error or no user was detected. + {% endif %} +

+ +

+ The IP address related to this error is: {{ ip }}
+ URL is: {{ url }}
+ User agent: {{ userAgent }} +

+ +

+ The full stacktrace is below. If you think this is a bug in Firefly III, you + can forward this message to + thegrumpydictator@gmail.com. + This can help fix the bug you just encountered. +

+

+ If you prefer, you can also open a new issue on GitHub. +

+ +

+ The full stacktrace is below:

+

+ {{ stackTrace|nl2br }} +

+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/error-text.twig b/resources/views/v2/emails/error-text.twig new file mode 100644 index 0000000000..6cc100d81a --- /dev/null +++ b/resources/views/v2/emails/error-text.twig @@ -0,0 +1,31 @@ +{% include 'emails.header-text' %} +Firefly III v{{ version }} ran into an error: {{ errorMessage }}. + +The error was of type "{{ class }}". + +The error occured on/at: {{ time }}. + +This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}. + +{% if loggedIn %} + The error was encountered by user #{{ user.id }}, {{ user.email }}. +{% else %} + There was no user logged in for this error or no user was detected. +{% endif %} + +The IP address related to this error is: {{ ip }} +URL is: {{ url }} +User agent: {{ userAgent }} + +The full stacktrace is below. If you think this is a bug in Firefly III, you +can forward this message to thegrumpydictator@gmail.com. This can help fix +the bug you just encountered. + +If you prefer, you can also open a new issue here: + +https://github.com/firefly-iii/firefly-iii/issues + +The full stacktrace is below: + +{{ stackTrace }} +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/footer-html.twig b/resources/views/v2/emails/footer-html.twig new file mode 100644 index 0000000000..6e2ca37007 --- /dev/null +++ b/resources/views/v2/emails/footer-html.twig @@ -0,0 +1,13 @@ +

+ Beep boop, +

+

+ The Firefly III Mail Robot +

+ +

+ PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it. +

+ + + diff --git a/resources/views/v2/emails/footer-text.twig b/resources/views/v2/emails/footer-text.twig new file mode 100644 index 0000000000..e2ec3ff9d4 --- /dev/null +++ b/resources/views/v2/emails/footer-text.twig @@ -0,0 +1,6 @@ + +Beep boop, + +The Firefly III Mail Robot + +PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it. diff --git a/resources/views/v2/emails/header-html.twig b/resources/views/v2/emails/header-html.twig new file mode 100644 index 0000000000..f3a4e8edc7 --- /dev/null +++ b/resources/views/v2/emails/header-html.twig @@ -0,0 +1,10 @@ + + + + + + + +

+ Hi there, +

diff --git a/resources/views/v2/emails/header-text.twig b/resources/views/v2/emails/header-text.twig new file mode 100644 index 0000000000..e60df7e024 --- /dev/null +++ b/resources/views/v2/emails/header-text.twig @@ -0,0 +1,2 @@ +Hi there, + diff --git a/resources/views/v2/emails/oauth-client-created-html.twig b/resources/views/v2/emails/oauth-client-created-html.twig new file mode 100644 index 0000000000..f49cd54b34 --- /dev/null +++ b/resources/views/v2/emails/oauth-client-created-html.twig @@ -0,0 +1,14 @@ +{% include 'emails.header-html' %} +

+ Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" + and has callback URL {{ client.redirect }}. +

+ +

+ With this client, they can access all of your financial records through the Firefly III API. +

+ +

+ If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}. +

+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/oauth-client-created-text.twig b/resources/views/v2/emails/oauth-client-created-text.twig new file mode 100644 index 0000000000..d74222d0f4 --- /dev/null +++ b/resources/views/v2/emails/oauth-client-created-text.twig @@ -0,0 +1,9 @@ +{% include 'emails.header-text' %} +Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" and has callback URL: + +{{ client.redirect }} + +With this client, they can access all of your financial records through the Firefly III API. + +If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}. +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/password-html.twig b/resources/views/v2/emails/password-html.twig new file mode 100644 index 0000000000..2b15f16191 --- /dev/null +++ b/resources/views/v2/emails/password-html.twig @@ -0,0 +1,13 @@ +{% include 'emails.header-html' %} +

+ Somebody tried to reset your password. If it was you, please follow the link below to do so. +

+ +

+ PLEASE verify that the link actually goes to the Firefly III you expect it to go! +

+ +

+ {{ url }} +

+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/password-text.twig b/resources/views/v2/emails/password-text.twig new file mode 100644 index 0000000000..0e67dd735b --- /dev/null +++ b/resources/views/v2/emails/password-text.twig @@ -0,0 +1,7 @@ +{% include 'emails.header-text' %} +Somebody tried to reset your password. If it was you, please follow the link below to do so. + +PLEASE verify that the link actually goes to the Firefly III you expect it to go! + +{{ url }} +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/registered-html.twig b/resources/views/v2/emails/registered-html.twig new file mode 100644 index 0000000000..5274b801b7 --- /dev/null +++ b/resources/views/v2/emails/registered-html.twig @@ -0,0 +1,18 @@ +{% include 'emails.header-html' %} +

+ Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay! +

+ +
    +
  • + If you have forgotten your password already, please reset it using + the password reset tool. +
    • +
  • + There is a help-icon in the top right corner of each page. If you need help, click it! +
    • +
  • + If you haven't already, please read the full description. +
    • +
+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/registered-text.twig b/resources/views/v2/emails/registered-text.twig new file mode 100644 index 0000000000..c750538f65 --- /dev/null +++ b/resources/views/v2/emails/registered-text.twig @@ -0,0 +1,20 @@ +{% include 'emails.header-text' %} +Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay! + +* If you have forgotten your password already, please reset it using the password reset tool. +* There is a help-icon in the top right corner of each page. If you need help, click it! +* If you haven't already, please read the first use guide and the full description. + +Enjoy! + +Firefly III: +{{ address }} + +Password reset: +{{ address }}/password/reset + +Documentation: +https://github.com/firefly-iii/firefly-iii +https://firefly-iii.org/ + +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/report-new-journals-html.twig b/resources/views/v2/emails/report-new-journals-html.twig new file mode 100644 index 0000000000..a3022d0775 --- /dev/null +++ b/resources/views/v2/emails/report-new-journals-html.twig @@ -0,0 +1,34 @@ +{% include 'emails.header-html' %} +

+ {% if journals.count == 1 %} + Firefly III has created a transaction for you. + {% endif %} + {% if journals.count > 1 %} + Firefly III has created {{ journals.count }} transactions for you. + {% endif %} +

+ + +{% if journals.count == 1 %} +

+ You can find it in your Firefly III installation:
+ {% for journal in journals %} + {{ journal.description }} ({{ journal|journalTotalAmount }}) + {% endfor %} +

+{% endif %} + +{% if journals.count > 1 %} +

+ You can find them in your Firefly III installation: +

+ +{% endif %} + +{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/report-new-journals-text.twig b/resources/views/v2/emails/report-new-journals-text.twig new file mode 100644 index 0000000000..81faa232d5 --- /dev/null +++ b/resources/views/v2/emails/report-new-journals-text.twig @@ -0,0 +1,25 @@ +{% include 'emails.header-text' %} +{% if journals.count == 1 %} +Firefly III has created a transaction for you. + +{% endif %} +{% if journals.count > 1 %} +Firefly III has created {{ journals.count }} transactions for you. +{% endif %} +{% if journals.count == 1 %} +You can find in in your Firefly III installation: + +{% for journal in journals %} +{{ journal.description }}: {{ route('transactions.show', journal.id) }} ({{ journal|journalTotalAmountPlain }}) +{% endfor %} +{% endif %} + +{% if journals.count > 1 %} +You can find them in your Firefly III installation: + +{% for journal in journals %} +- {{ journal.description }}: {{ route('transactions.show', journal.id) }} ({{ journal|journalTotalAmountPlain }}) +{% endfor %} +{% endif %} + +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/emails/undo-email-change-html.twig b/resources/views/v2/emails/undo-email-change-html.twig new file mode 100644 index 0000000000..8d6021ee64 --- /dev/null +++ b/resources/views/v2/emails/undo-email-change-html.twig @@ -0,0 +1,18 @@ +{% include 'emails.header-html' %} +

+ You or somebody with access to your Firefly III account has changed your email address. + If you did not expect this to happen, you must follow the "undo"-link below to protect your account! +

+

+ If you initiated this change, you may safely ignore this message. +

+

+ The old email addres was: {{ oldEmail }} +

+

+ The new email address is: {{ newEmail }} +

+

+ To undo the change, follow this link: {{ uri }} +

+{% include 'emails.footer-html' %} diff --git a/resources/views/v2/emails/undo-email-change-text.twig b/resources/views/v2/emails/undo-email-change-text.twig new file mode 100644 index 0000000000..8bf398ca95 --- /dev/null +++ b/resources/views/v2/emails/undo-email-change-text.twig @@ -0,0 +1,12 @@ +{% include 'emails.header-text' %} +You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, +you must follow the "undo"-link below to protect your account! + +If you initiated this change, you may safely ignore this message. + +The old email addres was: {{ oldEmail }} + +The new email address is: {{ newEmail }} + +To undo the change, follow this link: {{ uri }} +{% include 'emails.footer-text' %} diff --git a/resources/views/v2/error.twig b/resources/views/v2/error.twig new file mode 100644 index 0000000000..64c92287e8 --- /dev/null +++ b/resources/views/v2/error.twig @@ -0,0 +1,35 @@ + + + + + + + + {# favicons #} + {% include('partials.favicons') %} + + + + 500 + + + + + +
+
+
+
Firefly III error
+

{{ message |default('General unknown errror')|raw }}

+

+ If you do not know how to handle this error, please open an issue on + GitHub + or send me a message.

+ + Go back + +
+
+
+ + \ No newline at end of file diff --git a/resources/views/v2/layout/auth.twig b/resources/views/v2/layout/auth.twig index e69de29bb2..843f638c03 100644 --- a/resources/views/v2/layout/auth.twig +++ b/resources/views/v2/layout/auth.twig @@ -0,0 +1,29 @@ + + + + + + + + + + {# favicons #} + {% include('partials.favicons') %} + + {{ pageTitle|default('Firefly III') }} (v{{ FF_VERSION }}) + + + + + +
+ {% block content %}{% endblock %} + + + + + {# favicons #} + {% include('partials.password_modal') %} +
+ + \ No newline at end of file diff --git a/resources/views/v2/layout/default.twig b/resources/views/v2/layout/default.twig index 86b2c3c748..3e149284ab 100644 --- a/resources/views/v2/layout/default.twig +++ b/resources/views/v2/layout/default.twig @@ -7,19 +7,9 @@ + {# favicons #} + {% include('partials.favicons') %} - - - - - - - - - - - - {% if subTitle %} {{ subTitle }} ยป diff --git a/resources/views/v2/partials/favicons.twig b/resources/views/v2/partials/favicons.twig index 02dda3d029..6cdd818d20 100644 --- a/resources/views/v2/partials/favicons.twig +++ b/resources/views/v2/partials/favicons.twig @@ -8,4 +8,9 @@ <meta name="application-name" content="Firefly III"> <meta name="msapplication-TileColor" content="#2d89ef"> <meta name="msapplication-TileImage" content="/mstile-144x144.png?v=3e8AboOwbd"> -<meta name="theme-color" content="#ffffff"> \ No newline at end of file +<meta name="theme-color" content="#ffffff"> +<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> +<meta name="apple-mobile-web-app-capable" content="yes"> +<meta name="mobile-web-app-capable" content="yes"> +<meta name="HandheldFriendly" content="True"> +<meta name="MobileOptimized" content="320"> \ No newline at end of file diff --git a/resources/views/v2/partials/password_modal.twig b/resources/views/v2/partials/password_modal.twig new file mode 100644 index 0000000000..bf788f94e0 --- /dev/null +++ b/resources/views/v2/partials/password_modal.twig @@ -0,0 +1,35 @@ +{# modal #} +<div class="modal fade" id="pwModal" tabindex="-1" role="dialog" aria-labelledby="pwModalLabel" aria-hidden="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <h5 class="modal-title" id="exampleModalLabel">Modal title</h5> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + </button> + </div> + <div class="modal-body"> + <p> + {{ 'secure_pw_history'|_ }} + </p> + <p> + {{ 'secure_pw_ff'|_ }} + </p> + <p> + {{ 'secure_pw_check_box'|_ }} + </p> + + <h4>{{ 'secure_pw_working_title'|_ }}</h4> + <p> + {{ 'secure_pw_working'|_ }} + </p> + <h4>{{ 'secure_pw_should'|_ }}</h4> + <p> + {{ 'secure_pw_long_password'|_ }} + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-primary" data-dismiss="modal">{{ 'close'|_ }}</button> + </div> + </div> + </div> +</div> \ No newline at end of file