We'll send you an email with instructions to reset your password.
<%= form_for :user, Routes.user_reset_password_path(@conn, :create), [class: "needs-validation", novalidate: true], fn f -> %>
diff --git a/lib/bones73k_web/templates/user_session/new.html.eex b/lib/bones73k_web/templates/user_session/new.html.eex
index f251bf3..c5762ce 100644
--- a/lib/bones73k_web/templates/user_session/new.html.eex
+++ b/lib/bones73k_web/templates/user_session/new.html.eex
@@ -1,10 +1,10 @@
-
+
<%= icon_div @conn, "bi-door-open", [class: "icon baseline"] %>
Log in
-
+
Who goes there?
<%= form_for @conn, Routes.user_session_path(@conn, :create), [as: :user, class: "needs-validation", novalidate: true], fn f -> %>
@@ -41,7 +41,7 @@
password is required
-
+
<%= checkbox f, :remember_me, class: "form-check-input" %>
<%= label f, :remember_me, "Keep me logged in for 60 days", class: "form-check-label" %>
diff --git a/lib/bones73k_web/views/icon_helpers.ex b/lib/bones73k_web/views/icon_helpers.ex
index 7a18631..e86389d 100644
--- a/lib/bones73k_web/views/icon_helpers.ex
+++ b/lib/bones73k_web/views/icon_helpers.ex
@@ -13,6 +13,8 @@ defmodule Bones73kWeb.IconHelpers do
end
def icon_svg(conn, name, opts \\ []) do
+ opts = aria_hidden?(opts)
+
content_tag(:svg, tag_opts(name, opts)) do
tag(:use, "xlink:href": Routes.static_path(conn, "/images/icons.svg##{name}"))
end
@@ -21,4 +23,13 @@ defmodule Bones73kWeb.IconHelpers do
defp tag_opts(name, opts) do
Keyword.update(opts, :class, name, fn c -> "#{c} #{name}" end)
end
+
+ defp aria_hidden?(opts) do
+ case Keyword.get(opts, :aria_hidden) do
+ "false" -> Keyword.drop(opts, [:aria_hidden])
+ false -> Keyword.drop(opts, [:aria_hidden])
+ "true" -> opts
+ _ -> Keyword.put(opts, :aria_hidden, "true")
+ end
+ end
end
diff --git a/test/bones73k_web/controllers/user_confirmation_controller_test.exs b/test/bones73k_web/controllers/user_confirmation_controller_test.exs
index 1681306..ec8812f 100644
--- a/test/bones73k_web/controllers/user_confirmation_controller_test.exs
+++ b/test/bones73k_web/controllers/user_confirmation_controller_test.exs
@@ -13,7 +13,7 @@ defmodule Bones73kWeb.UserConfirmationControllerTest do
test "renders the confirmation page", %{conn: conn} do
conn = get(conn, Routes.user_confirmation_path(conn, :new))
response = html_response(conn, 200)
- assert response =~ "Resend confirmation instructions\n "
+ assert response =~ "Resend confirmation instructions\n "
end
end
diff --git a/test/bones73k_web/controllers/user_registration_controller_test.exs b/test/bones73k_web/controllers/user_registration_controller_test.exs
index 5466e1d..9d05391 100644
--- a/test/bones73k_web/controllers/user_registration_controller_test.exs
+++ b/test/bones73k_web/controllers/user_registration_controller_test.exs
@@ -7,7 +7,7 @@ defmodule Bones73kWeb.UserRegistrationControllerTest do
test "renders registration page", %{conn: conn} do
conn = get(conn, Routes.user_registration_path(conn, :new))
response = html_response(conn, 200)
- assert response =~ "Register\n "
+ assert response =~ "Register\n "
assert response =~ "Log in\n"
assert response =~ "Register\n"
end
diff --git a/test/bones73k_web/controllers/user_reset_password_controller_test.exs b/test/bones73k_web/controllers/user_reset_password_controller_test.exs
index 6e173ae..c09eb1c 100644
--- a/test/bones73k_web/controllers/user_reset_password_controller_test.exs
+++ b/test/bones73k_web/controllers/user_reset_password_controller_test.exs
@@ -13,7 +13,7 @@ defmodule Bones73kWeb.UserResetPasswordControllerTest do
test "renders the reset password page", %{conn: conn} do
conn = get(conn, Routes.user_reset_password_path(conn, :new))
response = html_response(conn, 200)
- assert response =~ "Forgot your password?\n "
+ assert response =~ "Forgot your password?\n "
end
test "redirects if already logged in", %{conn: conn} do
@@ -61,7 +61,7 @@ defmodule Bones73kWeb.UserResetPasswordControllerTest do
test "renders reset password with user_id in session", %{conn: conn, token: token, user: user} do
conn = get(conn, Routes.user_reset_password_path(conn, :edit, token))
assert get_session(conn, "user_id") == user.id
- assert html_response(conn, 200) =~ "Reset password\n "
+ assert html_response(conn, 200) =~ "Reset password\n "
end
test "does not render reset password with invalid token", %{conn: conn} do
diff --git a/test/bones73k_web/controllers/user_session_controller_test.exs b/test/bones73k_web/controllers/user_session_controller_test.exs
index 464b6ee..763cd6b 100644
--- a/test/bones73k_web/controllers/user_session_controller_test.exs
+++ b/test/bones73k_web/controllers/user_session_controller_test.exs
@@ -11,7 +11,7 @@ defmodule Bones73kWeb.UserSessionControllerTest do
test "renders log in page", %{conn: conn} do
conn = get(conn, Routes.user_session_path(conn, :new))
response = html_response(conn, 200)
- assert response =~ "\n Log in\n "
+ assert response =~ "\n Log in\n "
assert response =~ "Register\n"
assert response =~ "Log in\n"
end
@@ -61,7 +61,7 @@ defmodule Bones73kWeb.UserSessionControllerTest do
})
response = html_response(conn, 200)
- assert response =~ "\n Log in\n "
+ assert response =~ "\n Log in\n "
assert response =~ "Invalid email or password"
end
end
@@ -108,7 +108,7 @@ defmodule Bones73kWeb.UserSessionControllerTest do
})
response = html_response(conn, 200)
- assert response =~ "\n Log in\n "
+ assert response =~ "\n Log in\n "
assert response =~ "Invalid email or password"
end
end
diff --git a/test/bones73k_web/controllers/user_settings_controller_test.exs b/test/bones73k_web/controllers/user_settings_controller_test.exs
index dde5fb6..55815e6 100644
--- a/test/bones73k_web/controllers/user_settings_controller_test.exs
+++ b/test/bones73k_web/controllers/user_settings_controller_test.exs
@@ -10,7 +10,7 @@ defmodule Bones73kWeb.UserSettingsControllerTest do
test "renders settings page", %{conn: conn} do
conn = get(conn, Routes.user_settings_path(conn, :edit))
response = html_response(conn, 200)
- assert response =~ "User Settings\n"
+ assert response =~ "User Settings\n"
end
test "redirects if user is not logged in" do
diff --git a/test/bones73k_web/live/user/registration_test.exs b/test/bones73k_web/live/user/registration_test.exs
index 76b72a2..88b747c 100644
--- a/test/bones73k_web/live/user/registration_test.exs
+++ b/test/bones73k_web/live/user/registration_test.exs
@@ -17,7 +17,7 @@ defmodule Bones73kWeb.UserLive.RegistrationTest do
test "displays registration form", %{conn: conn} do
{:ok, _view, html} = live_isolated(conn, Bones73kWeb.UserLive.Registration)
- assert html =~ "Register\n "
+ assert html =~ "Register\n "
assert html =~ "Email"
end
@@ -29,7 +29,7 @@ defmodule Bones73kWeb.UserLive.RegistrationTest do
|> form("#reg_form", %{"user" => %{"email" => "abc", "password" => "abc"}})
|> render_change()
- assert html =~ "Register\n "
+ assert html =~ "Register\n "
assert html =~ "must be a valid email address"
assert html =~ "should be at least #{User.min_password()} character(s)"
assert html =~ "type=\"submit\" disabled=\"disabled\""
diff --git a/test/bones73k_web/live/user/reset_password_test.exs b/test/bones73k_web/live/user/reset_password_test.exs
index 3526766..c6d9be5 100644
--- a/test/bones73k_web/live/user/reset_password_test.exs
+++ b/test/bones73k_web/live/user/reset_password_test.exs
@@ -17,7 +17,7 @@ defmodule Bones73kWeb.UserLive.ResetPasswordTest do
test "displays registration form", %{conn: conn, user: user} do
{:ok, _view, html} = live_isolated(conn, Bones73kWeb.UserLive.ResetPassword)
- assert html =~ "Reset password\n "
+ assert html =~ "Reset password\n "
assert html =~ user.email
assert html =~ "New password"
end
@@ -28,7 +28,7 @@ defmodule Bones73kWeb.UserLive.ResetPasswordTest do
form_data = %{"user" => %{"password" => "abc", "password_confirmation" => "def"}}
html = form(view, "#pw_reset_form", form_data) |> render_change()
- assert html =~ "Reset password\n "
+ assert html =~ "Reset password\n "
assert html =~ "should be at least #{User.min_password()} character(s)"
assert html =~ "does not match password"
assert html =~ "type=\"submit\" disabled=\"disabled\""