From 9502b9c8eda745fc394676c67d7b66eabc6e4174 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 18 Sep 2023 04:48:55 +0000 Subject: [PATCH] Add reset password email in new theme --- .../tailwind/reset-password-illustration.png | Bin 0 -> 9262 bytes ...ssword_instructions_current_theme.html.erb | 19 +++ ...t_password_instructions_new_theme.html.erb | 142 ++++++++++++++++++ .../reset_password_instructions.html.erb | 24 +-- .../previews/login_and_account_preview.rb | 7 + 5 files changed, 173 insertions(+), 19 deletions(-) create mode 100644 app/assets/images/tailwind/reset-password-illustration.png create mode 100644 app/views/devise/mailer/_reset_password_instructions_current_theme.html.erb create mode 100644 app/views/devise/mailer/_reset_password_instructions_new_theme.html.erb diff --git a/app/assets/images/tailwind/reset-password-illustration.png b/app/assets/images/tailwind/reset-password-illustration.png new file mode 100644 index 0000000000000000000000000000000000000000..d393a95e81aba41d5ec1734dc56856838a9818db GIT binary patch literal 9262 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 literal 0 HcmV?d00001 diff --git a/app/views/devise/mailer/_reset_password_instructions_current_theme.html.erb b/app/views/devise/mailer/_reset_password_instructions_current_theme.html.erb new file mode 100644 index 000000000..e103fec00 --- /dev/null +++ b/app/views/devise/mailer/_reset_password_instructions_current_theme.html.erb @@ -0,0 +1,19 @@ + + + + + + + <% if resource.name.present? %> +

Hello <%= resource.name %>!

+ <% else %> +

Hello!

+ <% end %> + +

Please click the link below and follow the instructions. We'll have you up and running with a new password in no time.

+ +

<%= link_to "Reset password", edit_password_url(resource, reset_password_token: token) %>

+ +

Didn't request this email? Then you can safely ignore it.

+ + diff --git a/app/views/devise/mailer/_reset_password_instructions_new_theme.html.erb b/app/views/devise/mailer/_reset_password_instructions_new_theme.html.erb new file mode 100644 index 000000000..fdba5bcb2 --- /dev/null +++ b/app/views/devise/mailer/_reset_password_instructions_new_theme.html.erb @@ -0,0 +1,142 @@ + + + + + + + + + + + Reset password instructions + + + + + + +
+ Please click the button below and follow the instructions. We'll have you up and running with a new password in no time. +  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ +
+
+
+ + + + +
+ + + + + + + +
+ + + + +
+

Planning Alerts

+
+ + + + +
Email alerts of planning applications near you
+
+
‍
+

Hello,

+

Please click the button below and follow the instructions. + We'll have you up and running with a new password in no time. +

+

Thanks,
Planning Alerts team

+
‍
+ +
‍
+ + + + +
+ " alt="Illustration of a woman with glasses using her laptop" style="max-width: 100%; vertical-align: middle; line-height: 1; border: 0"> +
+
‍
+

Didn't request this email? Then you can safely ignore it.

+
‍
+

+ Planning Alerts + is a free service where anyone can find out what is being built and knocked down in their area. +

+

+ The service + is run by the independent charity + OpenAustralia Foundation. +

+

+ Contact us +

+
+
+
+ + \ No newline at end of file diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index 4551534b3..4a2b1726d 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -1,19 +1,5 @@ - - - - - - - <% if @resource.name.present? %> -

Hello <%= @resource.name %>!

- <% else %> -

Hello!

- <% end %> - -

Please click the link below and follow the instructions. We'll have you up and running with a new password in no time.

- -

<%= link_to "Reset password", edit_password_url(@resource, reset_password_token: @token) %>

- -

Didn't request this email? Then you can safely ignore it.

- - +<% if @resource.tailwind_theme %> + <%= render "reset_password_instructions_new_theme", resource: @resource, token: @token %> +<% else %> + <%= render "reset_password_instructions_current_theme", resource: @resource, token: @token %> +<% end %> diff --git a/spec/mailers/previews/login_and_account_preview.rb b/spec/mailers/previews/login_and_account_preview.rb index 73153608a..945131e4b 100644 --- a/spec/mailers/previews/login_and_account_preview.rb +++ b/spec/mailers/previews/login_and_account_preview.rb @@ -19,6 +19,13 @@ def reset_password_instructions Devise::Mailer.reset_password_instructions(user, "faketoken") end + # It shows a different email address in the "to" and the body of the email. + # TODO: Figure out what's going on and fix it + def reset_password_instructions_new_theme + user = FactoryBot.build_stubbed(:user, name: "Matthew", tailwind_theme: true) + Devise::Mailer.reset_password_instructions(user, "faketoken") + end + def activate_account_instructions user = FactoryBot.build_stubbed(:user) Users::ActivationMailer.notify(user, "faketoken")