diff --git a/app/controllers/join_codes_controller.rb b/app/controllers/join_codes_controller.rb index 6a13bef2f..a4b6768b9 100644 --- a/app/controllers/join_codes_controller.rb +++ b/app/controllers/join_codes_controller.rb @@ -4,6 +4,8 @@ class JoinCodesController < ApplicationController before_action :set_join_code before_action :ensure_join_code_is_valid + layout "public" + def new @account_name = ApplicationRecord.with_tenant(tenant) { Account.sole.name } end diff --git a/app/controllers/users/joins_controller.rb b/app/controllers/users/joins_controller.rb index d811a6203..73a9ae296 100644 --- a/app/controllers/users/joins_controller.rb +++ b/app/controllers/users/joins_controller.rb @@ -3,6 +3,8 @@ class Users::JoinsController < ApplicationController before_action :set_join_code, :ensure_join_code_is_valid + layout "public" + def new end diff --git a/app/mailers/magic_link_mailer.rb b/app/mailers/magic_link_mailer.rb index 391e64f6d..c56872f4a 100644 --- a/app/mailers/magic_link_mailer.rb +++ b/app/mailers/magic_link_mailer.rb @@ -3,7 +3,7 @@ class MagicLinkMailer < ApplicationMailer @magic_link = magic_link @identity = @magic_link.identity - mail to: @identity.email_address, subject: "Sign in to Fizzy" + mail to: @identity.email_address, subject: "Confirm your email" end private diff --git a/app/views/join_codes/new.html.erb b/app/views/join_codes/new.html.erb index 5974c16ba..c4d933b8b 100644 --- a/app/views/join_codes/new.html.erb +++ b/app/views/join_codes/new.html.erb @@ -1,12 +1,7 @@ -<% @page_title = "Join #{@account_name}" %> +<% @page_title = "Join #{@account_name} in Fizzy" %>
-
-

- <%= @page_title %> -

-

Enter your email address to continue

-
+

<%= @page_title %>

<%= form_with url: join_path(code: params[:code], tenant: params[:tenant]), class: "flex flex-column gap txt-medium", data: { controller: "form" } do |form| %>
@@ -16,7 +11,7 @@
<% end %> diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 5e3c6e69f..564fe55b2 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -63,7 +63,7 @@ background: #2d71e5; border-color: #2d71e5; border-radius: 3rem; - color: #ffffff; + color: #ffffff !important; font-weight: 500; padding: 0.5em 1em; text-decoration: none; diff --git a/app/views/mailers/identity_mailer/email_change_confirmation.html.erb b/app/views/mailers/identity_mailer/email_change_confirmation.html.erb index 438dc18e9..dd55d602e 100644 --- a/app/views/mailers/identity_mailer/email_change_confirmation.html.erb +++ b/app/views/mailers/identity_mailer/email_change_confirmation.html.erb @@ -1,5 +1,4 @@ -

Confirm your email address change

-

Hit the button below to use this email address in Fizzy.

+

Confirm your email address change

<%= link_to "Yes use use this email address", email_address_confirmation_url(membership_id: @membership.id, email_address_token: @token), class: "btn" %> diff --git a/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb b/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb index b966ecfa6..6033b6165 100644 --- a/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb +++ b/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb @@ -1,9 +1,8 @@ -

Sign in to Fizzy

-

Hit the button below to sign in to Fizzy on this device

+

Hit the button below to confirm your email.

-<%= link_to "Sign in to Fizzy", session_magic_link_url(code: @magic_link.code), class: "btn" %> +<%= link_to "Confirm and return to Fizzy", session_magic_link_url(code: @magic_link.code), class: "btn" %> -

If you’re signing in on another device, enter this special code: +

If Fizzy is on another device, enter this special code instead:
<%= @magic_link.code %>

diff --git a/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb b/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb index f44e1c908..215508029 100644 --- a/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb +++ b/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb @@ -1,8 +1,6 @@ -Sign in to Fizzy -<%= "=" * 80 %> +Hit the button below to confirm your email: -Open this link in your browser to login on this device: <%= session_magic_link_url(code: @magic_link.code) %> -If you're signing in on another device, enter this code: +If Fizzy is on another device, enter this special code instead: <%= @magic_link.code %> diff --git a/app/views/memberships/email_addresses/new.html.erb b/app/views/memberships/email_addresses/new.html.erb index f88456679..e99596471 100644 --- a/app/views/memberships/email_addresses/new.html.erb +++ b/app/views/memberships/email_addresses/new.html.erb @@ -13,7 +13,7 @@

<%= @page_title %>

-

Enter your new email address. We'll send you a confirmation to verify it.

+

Enter your new email address, then hit the link to confirm it

<%= form_with url: email_addresses_path(membership_id: @membership.id), method: :post, class: "flex flex-column gap", data: { controller: "form", turbo: false } do |form| %> @@ -23,8 +23,8 @@
- <% end %> diff --git a/app/views/sessions/magic_links/show.html.erb b/app/views/sessions/magic_links/show.html.erb index 7af4e6e20..445b3233a 100644 --- a/app/views/sessions/magic_links/show.html.erb +++ b/app/views/sessions/magic_links/show.html.erb @@ -3,7 +3,7 @@
">

<%= @page_title %>

-

We just emailed you a link to sign in.

+

Then hit the link to continue

If your email is on a different device, enter the code included in the email below.

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index be35c17b1..eb47bfe4f 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,4 +1,4 @@ -<% @page_title = "Sign in" %> +<% @page_title = "Enter your email" %>

<%= @page_title %>

diff --git a/app/views/users/joins/new.html.erb b/app/views/users/joins/new.html.erb index adf795ece..a5601b7a7 100644 --- a/app/views/users/joins/new.html.erb +++ b/app/views/users/joins/new.html.erb @@ -1,24 +1,17 @@ -<% @page_title = "Join #{Account.sole.name}" %> +<% @page_title = "Great! Now enter your name" %>
-
-

- <%= @page_title %> -

- -

Enter your name to continue

-
+

<%= @page_title %>

<%= form_with scope: "user", url: users_joins_path(membership: params[:membership]), class: "flex flex-column gap txt-medium", data: { controller: "form" } do |form| %>
<% end %> diff --git a/gems/fizzy-saas/app/views/signup/memberships/new.html.erb b/gems/fizzy-saas/app/views/signup/memberships/new.html.erb index 416e9d8f2..97f253266 100644 --- a/gems/fizzy-saas/app/views/signup/memberships/new.html.erb +++ b/gems/fizzy-saas/app/views/signup/memberships/new.html.erb @@ -1,12 +1,12 @@ -<% @page_title = "Create your account" %> +<% @page_title = "Create your new Fizzy account" %> -
"> -

<%= @page_title %>

+
"> +

<%= @page_title %>

<%= form_with model: @signup, url: saas.signup_membership_path, scope: "signup", class: "flex flex-column gap", data: { controller: "form" } do |form| %> <%= form.hidden_field :new_user %> - <%= form.text_field :full_name, class: "input", autocomplete: "name", placeholder: "Your name", autofocus: true, required: true %> + <%= form.text_field :full_name, class: "input", autocomplete: "name", placeholder: "Full name", autofocus: true, required: true %> <% if @signup.errors.any? %>