"""
end
diff --git a/lib/aprsme_web/live/user_reset_password_live.ex b/lib/aprsme_web/live/user_reset_password_live.ex
index 2d17479..cf82113 100644
--- a/lib/aprsme_web/live/user_reset_password_live.ex
+++ b/lib/aprsme_web/live/user_reset_password_live.ex
@@ -6,36 +6,75 @@ defmodule AprsmeWeb.UserResetPasswordLive do
def render(assigns) do
~H"""
-
- <.header class="text-center" />
+
+
+
+
+
+
Reset Password
+
Enter your new password below
- <.simple_form
- :let={f}
- for={@changeset}
- id="reset_password_form"
- phx-submit="reset_password"
- phx-change="validate"
- >
- <.error :if={@changeset.action == :insert}>
- Oops, something went wrong! Please check the errors below.
-
+ <.simple_form
+ :let={f}
+ for={@changeset}
+ id="reset_password_form"
+ phx-submit="reset_password"
+ phx-change="validate"
+ >
+
+ Oops, something went wrong! Please check the errors below.
+
- <.input field={{f, :password}} type="password" label="New password" required />
- <.input
- field={{f, :password_confirmation}}
- type="password"
- label="Confirm new password"
- required
- />
- <:actions>
- <.button phx-disable-with="Resetting..." class="w-full">Reset Password
-
-
+
+
+
+
-
- <.link navigate={~p"/users/register"}>Register
- | <.link navigate={~p"/users/log_in"}>Log in
-
+
+
+
+
+
+
+
+
+
+
+
OR
+
+
+ <.link navigate={~p"/users/register"} class="link link-primary">
+ Register
+
+ |
+ <.link navigate={~p"/users/log_in"} class="link link-primary">
+ Log in
+
+
+
+
+
+
"""
end
diff --git a/lib/aprsme_web/live/user_settings_live.ex b/lib/aprsme_web/live/user_settings_live.ex
index 75590a9..c508aad 100644
--- a/lib/aprsme_web/live/user_settings_live.ex
+++ b/lib/aprsme_web/live/user_settings_live.ex
@@ -6,68 +6,147 @@ defmodule AprsmeWeb.UserSettingsLive do
def render(assigns) do
~H"""
- <.header />
+
+
+
+
Account Settings
+
Update your email address and password
+
- <.simple_form
- :let={f}
- id="email_form"
- for={@email_changeset}
- phx-submit="update_email"
- phx-change="validate_email"
- >
- <.error :if={@email_changeset.action == :insert}>
- Oops, something went wrong! Please check the errors below.
-
+
+
+
+
+
Change Email
- <.input field={{f, :email}} type="email" label="Email" required />
+ <.simple_form
+ :let={f}
+ id="email_form"
+ for={@email_changeset}
+ phx-submit="update_email"
+ phx-change="validate_email"
+ >
+
+ Oops, something went wrong! Please check the errors below.
+
- <.input
- field={{f, :current_password}}
- name="current_password"
- id="current_password_for_email"
- type="password"
- label="Current password"
- value={@email_form_current_password}
- required
- />
- <:actions>
- <.button phx-disable-with="Changing...">Change Email
-
-
+
+
+
+
- <.header />
+
+
+
+
- <.simple_form
- :let={f}
- id="password_form"
- for={@password_changeset}
- action={~p"/users/log_in?_action=password_updated"}
- method="post"
- phx-change="validate_password"
- phx-submit="update_password"
- phx-trigger-action={@trigger_submit}
- >
- <.error :if={@password_changeset.action == :insert}>
- Oops, something went wrong! Please check the errors below.
-
+
+
+
+
+
+
+
+
+
+
+
Change Password
- <.input field={{f, :email}} type="hidden" value={@current_email} />
+ <.simple_form
+ :let={f}
+ id="password_form"
+ for={@password_changeset}
+ action={~p"/users/log_in?_action=password_updated"}
+ method="post"
+ phx-change="validate_password"
+ phx-submit="update_password"
+ phx-trigger-action={@trigger_submit}
+ >
+
+ Oops, something went wrong! Please check the errors below.
+
- <.input field={{f, :password}} type="password" label="New password" required />
- <.input field={{f, :password_confirmation}} type="password" label="Confirm new password" />
- <.input
- field={{f, :current_password}}
- name="current_password"
- type="password"
- label="Current password"
- id="current_password_for_password"
- value={@current_password}
- required
- />
- <:actions>
- <.button phx-disable-with="Changing...">Change Password
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
"""
end
diff --git a/lib/aprsme_web/router.ex b/lib/aprsme_web/router.ex
index 0b02588..4590d78 100644
--- a/lib/aprsme_web/router.ex
+++ b/lib/aprsme_web/router.ex
@@ -51,10 +51,37 @@ defmodule AprsmeWeb.Router do
get "/status.json", PageController, :status_json
end
+ ## Authentication routes
+
+ scope "/", AprsmeWeb do
+ pipe_through [:browser, :redirect_if_user_is_authenticated]
+
+ live_session :redirect_if_user_is_authenticated,
+ on_mount: [{AprsmeWeb.UserAuth, :redirect_if_user_is_authenticated}, {AprsmeWeb.LocaleHook, :set_locale}] do
+ live "/users/register", UserRegistrationLive, :new
+ live "/users/log_in", UserLoginLive, :new
+ live "/users/reset_password", UserForgotPasswordLive, :new
+ live "/users/reset_password/:token", UserResetPasswordLive, :edit
+ end
+
+ post "/users/log_in", UserSessionController, :create
+ end
+
+ scope "/", AprsmeWeb do
+ pipe_through [:browser, :require_authenticated_user]
+
+ live_session :require_authenticated_user,
+ on_mount: [{AprsmeWeb.UserAuth, :ensure_authenticated}, {AprsmeWeb.LocaleHook, :set_locale}] do
+ live "/users/settings", UserSettingsLive, :edit
+ live "/users/settings/confirm_email/:token", UserSettingsLive, :confirm_email
+ end
+ end
+
scope "/", AprsmeWeb do
pipe_through :browser
- live_session :regular_pages, on_mount: [{AprsmeWeb.LocaleHook, :set_locale}] do
+ live_session :regular_pages,
+ on_mount: [{AprsmeWeb.UserAuth, :mount_current_user}, {AprsmeWeb.LocaleHook, :set_locale}] do
live "/status", StatusLive.Index, :index
live "/packets", PacketsLive.Index, :index
live "/packets/:callsign", PacketsLive.CallsignView, :index
@@ -89,30 +116,4 @@ defmodule AprsmeWeb.Router do
forward "/mailbox", Plug.Swoosh.MailboxPreview
end
end
-
- ## Authentication routes
-
- scope "/", AprsmeWeb do
- pipe_through [:browser, :redirect_if_user_is_authenticated]
-
- live_session :redirect_if_user_is_authenticated,
- on_mount: [{AprsmeWeb.UserAuth, :redirect_if_user_is_authenticated}, {AprsmeWeb.LocaleHook, :set_locale}] do
- live "/users/register", UserRegistrationLive, :new
- live "/users/log_in", UserLoginLive, :new
- live "/users/reset_password", UserForgotPasswordLive, :new
- live "/users/reset_password/:token", UserResetPasswordLive, :edit
- end
-
- post "/users/log_in", UserSessionController, :create
- end
-
- scope "/", AprsmeWeb do
- pipe_through [:browser, :require_authenticated_user]
-
- live_session :require_authenticated_user,
- on_mount: [{AprsmeWeb.UserAuth, :ensure_authenticated}, {AprsmeWeb.LocaleHook, :set_locale}] do
- live "/users/settings", UserSettingsLive, :edit
- live "/users/settings/confirm_email/:token", UserSettingsLive, :confirm_email
- end
- end
end