diff --git a/lib/mixer/accounts/user.ex b/lib/mixer/accounts/user.ex index 92d0927..c60280d 100644 --- a/lib/mixer/accounts/user.ex +++ b/lib/mixer/accounts/user.ex @@ -37,6 +37,7 @@ defmodule Mixer.Accounts.User do password :password do identity_field :email hash_provider AshAuthentication.BcryptProvider + require_confirmed_with :confirmed_at resettable do sender Mixer.Accounts.User.Senders.SendPasswordResetEmail diff --git a/lib/mixer_web/components/layouts/root.html.heex b/lib/mixer_web/components/layouts/root.html.heex index 2fe3362..8a7fcbf 100644 --- a/lib/mixer_web/components/layouts/root.html.heex +++ b/lib/mixer_web/components/layouts/root.html.heex @@ -5,10 +5,11 @@ - <% - meta_title = (assigns[:page_title] || "Mixer") - meta_description = assigns[:page_description] || "Mixer is a social feed for all. Come join the conversation — built with Elixir." - %> + <% meta_title = assigns[:page_title] || "Mixer" + + meta_description = + assigns[:page_description] || + "Mixer is a social feed for all. Come join the conversation — built with Elixir." %> diff --git a/lib/mixer_web/components/layouts/spa_root.html.heex b/lib/mixer_web/components/layouts/spa_root.html.heex index 4841c7f..5dea67b 100644 --- a/lib/mixer_web/components/layouts/spa_root.html.heex +++ b/lib/mixer_web/components/layouts/spa_root.html.heex @@ -9,17 +9,16 @@ SPDX-License-Identifier: MIT - <% - {spa_title, spa_description} = case @page do - "feed" -> {"Mixer · Feed", "See the latest posts from everyone on Mixer."} - "tweet" -> {"Mixer · Post", "Read this post and join the conversation on Mixer."} - "following" -> {"Mixer · Following", "Posts from the people you follow on Mixer."} - "profile" -> {"Mixer · My Profile", "View and manage your Mixer profile."} - "users" -> {"Mixer · People", "Discover and follow people on Mixer."} - "user-detail" -> {"Mixer · Profile", "View this user's profile and posts on Mixer."} - _ -> {"Mixer", "A social feed built in Elixir."} - end - %> + <% {spa_title, spa_description} = + case @page do + "feed" -> {"Mixer · Feed", "See the latest posts from everyone on Mixer."} + "tweet" -> {"Mixer · Post", "Read this post and join the conversation on Mixer."} + "following" -> {"Mixer · Following", "Posts from the people you follow on Mixer."} + "profile" -> {"Mixer · My Profile", "View and manage your Mixer profile."} + "users" -> {"Mixer · People", "Discover and follow people on Mixer."} + "user-detail" -> {"Mixer · Profile", "View this user's profile and posts on Mixer."} + _ -> {"Mixer", "A social feed built in Elixir."} + end %> diff --git a/lib/mixer_web/controllers/auth_controller.ex b/lib/mixer_web/controllers/auth_controller.ex index ef349bc..84ac085 100644 --- a/lib/mixer_web/controllers/auth_controller.ex +++ b/lib/mixer_web/controllers/auth_controller.ex @@ -35,8 +35,11 @@ defmodule MixerWeb.AuthController do You can confirm your account using the link we sent to you, or by resetting your password. """ + {_, %AshAuthentication.Errors.UnconfirmedUser{}} -> + "You must confirm your email address before signing in. Please check your inbox for a confirmation email." + _ -> - "Incorrect email or password" + "Incorrect email or password or unconfirmed email" end conn