PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-27 13:47:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

add missing session-related links (philomena-dev/philomena#23)

Browse source
This commit is contained in:
byte[] 2020-09-27 00:03:34 -04:00
parent 9fbff24bd7
commit f01a9cf20b
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/philomena_web/controllers/session_controller.ex
View file

@ -20,9 +20,11 @@ defmodule PhilomenaWeb.SessionController do
cond do cond do
not is_nil(user) and is_nil(user.confirmed_at) -> not is_nil(user) and is_nil(user.confirmed_at) ->
conn render(
|> put_flash(:error, "You must confirm your account before logging in.") conn,
|> redirect(to: "/") "new.html",
error_message: "You must confirm your account before logging in."
)
not is_nil(user) -> not is_nil(user) ->
conn conn
@ -30,7 +32,12 @@ defmodule PhilomenaWeb.SessionController do
|> UserAuth.log_in_user(user, user_params) |> UserAuth.log_in_user(user, user_params)
true -> true ->
render(conn, "new.html", error_message: "Invalid email or password") render(
conn,
"new.html",
error_message:
"Invalid email or password. If you're seeing this more than usual, your account may be locked."
)
end end
end end

5
lib/philomena_web/templates/session/new.html.slime
View file

@ -4,6 +4,8 @@ h1 Sign in
= if @error_message do = if @error_message do
.alert.alert-danger .alert.alert-danger
p = @error_message p = @error_message
p = link "Resend unlock instructions", to: Routes.unlock_path(@conn, :new)
p = link "Resend confirmation email", to: Routes.confirmation_path(@conn, :new)
p = link "Forgot your password?", to: Routes.password_path(@conn, :new) p = link "Forgot your password?", to: Routes.password_path(@conn, :new)
@ -16,9 +18,10 @@ h1 Sign in
= error_tag f, :password = error_tag f, :password
.field .field
= checkbox f, :remember_me => checkbox f, :remember_me
= label f, :remember_me, "Remember me" = label f, :remember_me, "Remember me"
.actions
= submit "Sign in", class: "button" = submit "Sign in", class: "button"
p p