diff --git a/app/mailers/identity_mailer.rb b/app/mailers/identity_mailer.rb index d327c94c..4e6b5c0b 100644 --- a/app/mailers/identity_mailer.rb +++ b/app/mailers/identity_mailer.rb @@ -3,7 +3,7 @@ def v2_login_code(login_code) @login_code = login_code @identity = login_code.identity @first_name = @identity.first_name - @code = login_code.pretty + @code = login_code.code @env_prefix = env_prefix @preview_text = "Your code is #{@code}" diff --git a/app/models/identity/v2_login_code.rb b/app/models/identity/v2_login_code.rb index 005128ee..58cf3958 100644 --- a/app/models/identity/v2_login_code.rb +++ b/app/models/identity/v2_login_code.rb @@ -13,8 +13,6 @@ def self.generate(identity, purpose: "login", **attrs) create!(identity:, purpose:, **attrs) end - def pretty = code&.scan(/.../)&.join("-") - private def generate_code diff --git a/app/views/identity_mailer/v2_login_code.html.erb b/app/views/identity_mailer/v2_login_code.html.erb index 56def6ea..0b104f28 100644 --- a/app/views/identity_mailer/v2_login_code.html.erb +++ b/app/views/identity_mailer/v2_login_code.html.erb @@ -2,7 +2,7 @@

<%= t(".body") %>

-
<%= @code %>
+
<% @code.scan(/.{1,3}/).each do |group| %><%= group %><% end %>

<%= t(".triple_click") %>

<%= t(".expiry") %>

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 835fcada..3054d146 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -104,6 +104,17 @@ box-shadow: inset 0 2px 4px rgba(0,0,0,0.08); } + .code-block .code { + display: inline-block; + -webkit-user-select: all; + user-select: all; + margin-right: -0.25em; + } + + .code-block .code-group + .code-group { + margin-left: 0.6em; + } + .reason-block { background-color: #fef9e7; border-left: 3px solid #d97706; diff --git a/config/locales/en.yml b/config/locales/en.yml index 2aa1bc4e..eed1f184 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -7,7 +7,7 @@ en: subject: "%{code} is your Hack Club login code" greeting: "Hey %{first_name}!" body: "Here's the code to sign into your Hack Club Account:" - triple_click: "(triple-click to copy it quicker!)" + triple_click: "(click to copy it quicker!)" expiry: "This code expires in 30 minutes." not_you: "Didn't request this? You can safely ignore this email." signature: "– Hack Club"