+ <.flash kind={:info} title={gettext("Success!")} flash={@flash} />
+ <.flash kind={:error} title={gettext("Error!")} flash={@flash} />
+ <.flash
+ id="client-error"
+ kind={:error}
+ title={gettext("We can't find the internet")}
+ phx-disconnected={show(".phx-client-error #client-error")}
+ phx-connected={hide("#client-error")}
+ hidden
+ >
+ <%= gettext("Attempting to reconnect") %>
+ <.icon name="hero-arrow-path" class="ml-1 h-3 w-3 animate-spin" />
+
+
+ <.flash
+ id="server-error"
+ kind={:error}
+ title={gettext("Something went wrong!")}
+ phx-disconnected={show(".phx-server-error #server-error")}
+ phx-connected={hide("#server-error")}
+ hidden
+ >
+ <%= gettext("Hang in there while we get back on track") %>
+ <.icon name="hero-arrow-path" class="ml-1 h-3 w-3 animate-spin" />
+
+
+ """
+ end
+
+ @doc """
+ Renders a simple form.
+
+ ## Examples
+
+ <.simple_form for={@form} phx-change="validate" phx-submit="save">
+ <.input field={@form[:email]} label="Email"/>
+ <.input field={@form[:username]} label="Username" />
+ <:actions>
+ <.button>Save
+
+
+ """
+ attr :for, :any, required: true, doc: "the datastructure for the form"
+ attr :as, :any, default: nil, doc: "the server side parameter to collect all input under"
+
+ attr :rest, :global,
+ include: ~w(autocomplete name rel action enctype method novalidate target multipart),
+ doc: "the arbitrary HTML attributes to apply to the form tag"
+
+ slot :inner_block, required: true
+ slot :actions, doc: "the slot for form actions, such as a submit button"
+
+ def simple_form(assigns) do
+ ~H"""
+ <.form :let={f} for={@for} as={@as} {@rest}>
+ ` tag
+
+ * `type="checkbox"` is used exclusively to render boolean values
+
+ * For live file uploads, see `Phoenix.Component.live_file_input/1`
+
+ See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input
+ for more information.
+
+ ## Examples
+
+ <.input field={@form[:email]} type="email" />
+ <.input name="my-input" errors={["oh no!"]} />
+ """
+ attr :id, :any, default: nil
+ attr :name, :any
+ attr :label, :string, default: nil
+ attr :value, :any
+
+ attr :type, :string,
+ default: "text",
+ values: ~w(checkbox color date datetime-local email file hidden month number password
+ range radio search select tel text textarea time url week)
+
+ attr :field, Phoenix.HTML.FormField,
+ doc: "a form field struct retrieved from the form, for example: @form[:email]"
+
+ attr :errors, :list, default: []
+ attr :checked, :boolean, doc: "the checked flag for checkbox inputs"
+ attr :prompt, :string, default: nil, doc: "the prompt for select inputs"
+ attr :options, :list, doc: "the options to pass to Phoenix.HTML.Form.options_for_select/2"
+ attr :multiple, :boolean, default: false, doc: "the multiple flag for select inputs"
+
+ attr :rest, :global,
+ include: ~w(accept autocomplete capture cols disabled form list max maxlength min minlength
+ multiple pattern placeholder readonly required rows size step)
+
+ slot :inner_block
+
+ def input(%{field: %Phoenix.HTML.FormField{} = field} = assigns) do
+ assigns
+ |> assign(field: nil, id: assigns.id || field.id)
+ |> assign(:errors, Enum.map(field.errors, &translate_error(&1)))
+ |> assign_new(:name, fn -> if assigns.multiple, do: field.name <> "[]", else: field.name end)
+ |> assign_new(:value, fn -> field.value end)
+ |> input()
+ end
+
+ def input(%{type: "checkbox"} = assigns) do
+ assigns =
+ assign_new(assigns, :checked, fn ->
+ Phoenix.HTML.Form.normalize_value("checkbox", assigns[:value])
+ end)
+
+ ~H"""
+
+
+
+ <.error :for={msg <- @errors}><%= msg %>
+
+ """
+ end
+
+ def input(%{type: "select"} = assigns) do
+ ~H"""
+
+ <.label for={@id}><%= @label %>
+
+ <%= @prompt %>
+ <%= Phoenix.HTML.Form.options_for_select(@options, @value) %>
+
+ <.error :for={msg <- @errors}><%= msg %>
+
+ """
+ end
+
+ def input(%{type: "textarea"} = assigns) do
+ ~H"""
+
+ <.label for={@id}><%= @label %>
+
+ <.error :for={msg <- @errors}><%= msg %>
+
+ """
+ end
+
+ # All other inputs text, datetime-local, url, password, etc. are handled here...
+ def input(assigns) do
+ ~H"""
+
+ <.label for={@id}><%= @label %>
+
+ """
+ end
+
+ @doc """
+ Renders a label.
+ """
+ attr :for, :string, default: nil
+ slot :inner_block, required: true
+
+ def label(assigns) do
+ ~H"""
+
+ <%= render_slot(@inner_block) %>
+
+ """
+ end
+
+ @doc """
+ Generates a generic error message.
+ """
+ slot :inner_block, required: true
+
+ def error(assigns) do
+ ~H"""
+
+ <.icon name="hero-exclamation-circle-mini" class="mt-0.5 h-5 w-5 flex-none" />
+ <%= render_slot(@inner_block) %>
+
+ """
+ end
+
+ @doc """
+ Renders a header with title.
+ """
+ attr :class, :string, default: nil
+
+ slot :inner_block, required: true
+ slot :subtitle
+ slot :actions
+
+ def header(assigns) do
+ ~H"""
+
+ """
+ end
+
+ @doc ~S"""
+ Renders a table with generic styling.
+
+ ## Examples
+
+ <.table id="users" rows={@users}>
+ <:col :let={user} label="id"><%= user.id %>
+ <:col :let={user} label="username"><%= user.username %>
+
+ """
+ attr :id, :string, required: true
+ attr :rows, :list, required: true
+ attr :row_id, :any, default: nil, doc: "the function for generating the row id"
+ attr :row_click, :any, default: nil, doc: "the function for handling phx-click on each row"
+
+ attr :row_item, :any,
+ default: &Function.identity/1,
+ doc: "the function for mapping each row before calling the :col and :action slots"
+
+ slot :col, required: true do
+ attr :label, :string
+ end
+
+ slot :action, doc: "the slot for showing user actions in the last table column"
+
+ def table(assigns) do
+ assigns =
+ with %{rows: %Phoenix.LiveView.LiveStream{}} <- assigns do
+ assign(assigns, row_id: assigns.row_id || fn {id, _item} -> id end)
+ end
+
+ ~H"""
+
+
+
+
+ <%= col[:label] %>
+
+ <%= gettext("Actions") %>
+
+
+
+
+
+
+
+
+ <%= render_slot(col, @row_item.(row)) %>
+
+
+
+
+
+
+ <%= render_slot(action, @row_item.(row)) %>
+
+
+
+
+
+
+
+
+
+
<%= item.title %>
+ <%= render_slot(item) %>
+
+
+
+ <.link
+ navigate={@navigate}
+ class="text-sm font-semibold leading-6 text-zinc-900 hover:text-zinc-700"
+ >
+ <.icon name="hero-arrow-left-solid" class="h-3 w-3" />
+ <%= render_slot(@inner_block) %>
+
+
+ """
+ end
+
+ @doc """
+ Renders a [Heroicon](https://heroicons.com).
+
+ Heroicons come in three styles – outline, solid, and mini.
+ By default, the outline style is used, but solid and mini may
+ be applied by using the `-solid` and `-mini` suffix.
+
+ You can customize the size and colors of the icons by setting
+ width, height, and background color classes.
+
+ Icons are extracted from the `deps/heroicons` directory and bundled within
+ your compiled app.css by the plugin in your `assets/tailwind.config.js`.
+
+ ## Examples
+
+ <.icon name="hero-x-mark-solid" />
+ <.icon name="hero-arrow-path" class="ml-1 w-3 h-3 animate-spin" />
+ """
+ attr :name, :string, required: true
+ attr :class, :string, default: nil
+
+ def icon(%{name: "hero-" <> _} = assigns) do
+ ~H"""
+
+
+
+
+
+
+ v<%= Application.spec(:phoenix, :vsn) %>
+
+
+
+
+
+
+ <.flash_group flash={@flash} />
+ <%= @inner_content %>
+
+
diff --git a/lib/flix_web/components/layouts/root.html.heex b/lib/flix_web/components/layouts/root.html.heex
new file mode 100644
index 0000000..b6fdf37
--- /dev/null
+++ b/lib/flix_web/components/layouts/root.html.heex
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+ Phoenix Framework
+
+ v<%= Application.spec(:phoenix, :vsn) %>
+
+
+
+ Peace of mind from prototype to production.
+
+
+ Build rich, interactive web applications quickly, with less code and fewer moving parts. Join our growing community of developers using Phoenix to craft APIs, HTML5 apps and more, for fun or at scale.
+
+
+
+
+ <.header class="text-center">Confirm account
+
+ <.simple_form for={@conn.params["user"]} as={:user} action={~p"/users/confirm/#{@token}"}>
+ <:actions>
+ <.button class="w-full">Confirm my account
+
+
+
+
+ <.link href={~p"/users/register"}>Register
+ | <.link href={~p"/users/log_in"}>Log in
+
+
+ <.header class="text-center">
+ No confirmation instructions received?
+ <:subtitle>We'll send a new confirmation link to your inbox
+
+
+ <.simple_form :let={f} for={@conn.params["user"]} as={:user} action={~p"/users/confirm"}>
+ <.input field={f[:email]} type="email" placeholder="Email" required />
+ <:actions>
+ <.button phx-disable-with="Sending..." class="w-full">
+ Resend confirmation instructions
+
+
+
+
+
+ <.link href={~p"/users/register"}>Register
+ |
+ <.link href={~p"/users/log_in"}>Log in
+
+
+ <.header class="text-center">
+ Register for an account
+ <:subtitle>
+ Already registered?
+ <.link navigate={~p"/users/log_in"} class="font-semibold text-brand hover:underline">
+ Sign in
+
+ to your account now.
+
+
+
+ <.simple_form :let={f} for={@changeset} action={~p"/users/register"}>
+ <.error :if={@changeset.action == :insert}>
+ Oops, something went wrong! Please check the errors below.
+
+
+ <.input field={f[:name]} type="text" label="Name" required="true" autofocus="true" />
+ <.input field={f[:email]} type="email" label="Email" required="true" />
+ <.input field={f[:username]} type="text" label="Username" required="true" />
+ <.input field={f[:password]} type="password" label="Password" required="true" />
+ <:actions>
+ <.button phx-disable-with="Creating account..." class="w-full">Create an account
+
+
+
diff --git a/lib/flix_web/controllers/user_reset_password_controller.ex b/lib/flix_web/controllers/user_reset_password_controller.ex
index 00ae171..3fd80c6 100644
--- a/lib/flix_web/controllers/user_reset_password_controller.ex
+++ b/lib/flix_web/controllers/user_reset_password_controller.ex
@@ -6,28 +6,27 @@ defmodule FlixWeb.UserResetPasswordController do
plug :get_user_by_reset_password_token when action in [:edit, :update]
def new(conn, _params) do
- render(conn, "new.html")
+ render(conn, :new)
end
def create(conn, %{"user" => %{"email" => email}}) do
if user = Accounts.get_user_by_email(email) do
Accounts.deliver_user_reset_password_instructions(
user,
- &Routes.user_reset_password_url(conn, :edit, &1)
+ &url(~p"/users/reset_password/#{&1}")
)
end
- # Regardless of the outcome, show an impartial success/error message.
conn
|> put_flash(
- :notice,
+ :info,
"If your email is in our system, you will receive instructions to reset your password shortly."
)
- |> redirect(to: "/")
+ |> redirect(to: ~p"/")
end
def edit(conn, _params) do
- render(conn, "edit.html", changeset: Accounts.change_user_password(conn.assigns.user))
+ render(conn, :edit, changeset: Accounts.change_user_password(conn.assigns.user))
end
# Do not log in the user after reset password to avoid a
@@ -36,11 +35,11 @@ defmodule FlixWeb.UserResetPasswordController do
case Accounts.reset_user_password(conn.assigns.user, user_params) do
{:ok, _} ->
conn
- |> put_flash(:notice, "Password reset successfully.")
- |> redirect(to: Routes.user_session_path(conn, :new))
+ |> put_flash(:info, "Password reset successfully.")
+ |> redirect(to: ~p"/users/log_in")
{:error, changeset} ->
- render(conn, "edit.html", changeset: changeset)
+ render(conn, :edit, changeset: changeset)
end
end
@@ -52,7 +51,7 @@ defmodule FlixWeb.UserResetPasswordController do
else
conn
|> put_flash(:error, "Reset password link is invalid or it has expired.")
- |> redirect(to: "/")
+ |> redirect(to: ~p"/")
|> halt()
end
end
diff --git a/lib/flix_web/controllers/user_reset_password_html.ex b/lib/flix_web/controllers/user_reset_password_html.ex
new file mode 100644
index 0000000..a24446a
--- /dev/null
+++ b/lib/flix_web/controllers/user_reset_password_html.ex
@@ -0,0 +1,5 @@
+defmodule FlixWeb.UserResetPasswordHTML do
+ use FlixWeb, :html
+
+ embed_templates "user_reset_password_html/*"
+end
diff --git a/lib/flix_web/controllers/user_reset_password_html/edit.html.heex b/lib/flix_web/controllers/user_reset_password_html/edit.html.heex
new file mode 100644
index 0000000..cd02639
--- /dev/null
+++ b/lib/flix_web/controllers/user_reset_password_html/edit.html.heex
@@ -0,0 +1,30 @@
+
+ <.header class="text-center">
+ Reset Password
+
+
+ <.simple_form :let={f} for={@changeset} action={~p"/users/reset_password/#{@token}"}>
+ <.error :if={@changeset.action}>
+ 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 href={~p"/users/register"}>Register
+ |
+ <.link href={~p"/users/log_in"}>Log in
+
+
+ <.header class="text-center">
+ Forgot your password?
+ <:subtitle>We'll send a password reset link to your inbox
+
+
+ <.simple_form :let={f} for={@conn.params["user"]} as={:user} action={~p"/users/reset_password"}>
+ <.input field={f[:email]} type="email" placeholder="Email" required />
+ <:actions>
+ <.button phx-disable-with="Sending..." class="w-full">
+ Send password reset instructions
+
+
+
+
+
+ <.link href={~p"/users/register"}>Register
+ |
+ <.link href={~p"/users/log_in"}>Log in
+
+
+ <.header class="text-center">
+ Sign in to account
+ <:subtitle>
+ Don't have an account?
+ <.link navigate={~p"/users/register"} class="font-semibold text-brand hover:underline">
+ Sign up
+
+ for an account now.
+
+
+
+ <.simple_form :let={f} for={@conn.params["user"]} as={:user} action={~p"/users/log_in"}>
+ <.error :if={@error_message}><%= @error_message %>
+
+ <.input field={f[:email]} type="email" label="Email" required />
+ <.input field={f[:password]} type="password" label="Password" required />
+ <:actions :let={f}>
+ <.input field={f[:remember_me]} type="checkbox" label="Keep me logged in" />
+ <.link href={~p"/users/reset_password"} class="text-sm font-semibold">
+ Forgot your password?
+
+
+ <:actions>
+ <.button phx-disable-with="Signing in..." class="w-full">
+ Sign in →
+
+
+
+
diff --git a/lib/flix_web/controllers/user_settings_controller.ex b/lib/flix_web/controllers/user_settings_controller.ex
index 757f646..b983662 100644
--- a/lib/flix_web/controllers/user_settings_controller.ex
+++ b/lib/flix_web/controllers/user_settings_controller.ex
@@ -7,7 +7,7 @@ defmodule FlixWeb.UserSettingsController do
plug :assign_email_and_password_changesets
def edit(conn, _params) do
- render(conn, "edit.html")
+ render(conn, :edit)
end
def update(conn, %{"action" => "update_email"} = params) do
@@ -16,21 +16,21 @@ defmodule FlixWeb.UserSettingsController do
case Accounts.apply_user_email(user, password, user_params) do
{:ok, applied_user} ->
- Accounts.deliver_update_email_instructions(
+ Accounts.deliver_user_update_email_instructions(
applied_user,
user.email,
- &Routes.user_settings_url(conn, :confirm_email, &1)
+ &url(~p"/users/settings/confirm_email/#{&1}")
)
conn
|> put_flash(
- :notice,
+ :info,
"A link to confirm your email change has been sent to the new address."
)
- |> redirect(to: Routes.user_settings_path(conn, :edit))
+ |> redirect(to: ~p"/users/settings")
{:error, changeset} ->
- render(conn, "edit.html", email_changeset: changeset)
+ render(conn, :edit, email_changeset: changeset)
end
end
@@ -41,12 +41,12 @@ defmodule FlixWeb.UserSettingsController do
case Accounts.update_user_password(user, password, user_params) do
{:ok, user} ->
conn
- |> put_flash(:notice, "Password updated successfully.")
- |> put_session(:user_return_to, Routes.user_settings_path(conn, :edit))
+ |> put_flash(:info, "Password updated successfully.")
+ |> put_session(:user_return_to, ~p"/users/settings")
|> UserAuth.log_in_user(user)
{:error, changeset} ->
- render(conn, "edit.html", password_changeset: changeset)
+ render(conn, :edit, password_changeset: changeset)
end
end
@@ -54,29 +54,13 @@ defmodule FlixWeb.UserSettingsController do
case Accounts.update_user_email(conn.assigns.current_user, token) do
:ok ->
conn
- |> put_flash(:notice, "Email changed successfully.")
- |> redirect(to: Routes.user_settings_path(conn, :edit))
+ |> put_flash(:info, "Email changed successfully.")
+ |> redirect(to: ~p"/users/settings")
:error ->
conn
|> put_flash(:error, "Email change link is invalid or it has expired.")
- |> redirect(to: Routes.user_settings_path(conn, :edit))
- end
- end
-
- def delete(conn, _params) do
- user = conn.assigns.current_user
-
- case Accounts.unregister_user(user.id) do
- {:ok, _user} ->
- conn
- |> put_flash(:notice, "Sorry to hear that you're deleting your acount.")
- |> redirect(to: Routes.movie_path(conn, :index))
-
- {:error, _error} ->
- conn
- |> put_flash(:error, "There was a problem deleting your account. Please try again.")
- |> redirect(to: Routes.movie_path(conn, :index))
+ |> redirect(to: ~p"/users/settings")
end
end
diff --git a/lib/flix_web/controllers/user_settings_html.ex b/lib/flix_web/controllers/user_settings_html.ex
new file mode 100644
index 0000000..2e0b1a5
--- /dev/null
+++ b/lib/flix_web/controllers/user_settings_html.ex
@@ -0,0 +1,5 @@
+defmodule FlixWeb.UserSettingsHTML do
+ use FlixWeb, :html
+
+ embed_templates "user_settings_html/*"
+end
diff --git a/lib/flix_web/controllers/user_settings_html/edit.html.heex b/lib/flix_web/controllers/user_settings_html/edit.html.heex
new file mode 100644
index 0000000..915c3fd
--- /dev/null
+++ b/lib/flix_web/controllers/user_settings_html/edit.html.heex
@@ -0,0 +1,63 @@
+<.header class="text-center">
+ Account Settings
+ <:subtitle>Manage your account email address and password settings
+
+
+
+
+ <.simple_form :let={f} for={@email_changeset} action={~p"/users/settings"} id="update_email">
+ <.error :if={@email_changeset.action}>
+ Oops, something went wrong! Please check the errors below.
+
+
+ <.input field={f[:action]} type="hidden" name="action" value="update_email" />
+
+ <.input field={f[:email]} type="email" label="Email" required />
+ <.input
+ field={f[:current_password]}
+ name="current_password"
+ type="password"
+ label="Current Password"
+ required
+ id="current_password_for_email"
+ />
+ <:actions>
+ <.button phx-disable-with="Changing...">Change Email
+
+
+
+
+ <.simple_form
+ :let={f}
+ for={@password_changeset}
+ action={~p"/users/settings"}
+ id="update_password"
+ >
+ <.error :if={@password_changeset.action}>
+ Oops, something went wrong! Please check the errors below.
+
+
+ <.input field={f[:action]} type="hidden" name="action" value="update_password" />
+
+ <.input field={f[:password]} type="password" label="New password" required />
+ <.input
+ field={f[:password_confirmation]}
+ type="password"
+ label="Confirm new password"
+ required
+ />
+
+ <.input
+ field={f[:current_password]}
+ name="current_password"
+ type="password"
+ label="Current password"
+ id="current_password_for_password"
+ required
+ />
+ <:actions>
+ <.button phx-disable-with="Changing...">Change Password
+
+
+
+
- <%= gettext "Welcome to %{name}!", name: "Phoenix" %>
- Peace of mind from prototype to production
-
-
-
-
- Resources
-
-
-
- Help
-
-
-
diff --git a/lib/flix_web/templates/user_confirmation/new.html.heex b/lib/flix_web/templates/user_confirmation/new.html.heex
deleted file mode 100644
index 6edb889..0000000
--- a/lib/flix_web/templates/user_confirmation/new.html.heex
+++ /dev/null
@@ -1,15 +0,0 @@
-Resend confirmation instructions
-
-<%= form_for :user, Routes.user_confirmation_path(@conn, :create), fn f -> %>
- <%= label f, :email %>
- <%= email_input f, :email, required: true %>
-
-
- <%= submit "Resend confirmation instructions", class: "btn btn-primary" %>
-
-<% end %>
-
-
- <%= link "Register", to: Routes.user_registration_path(@conn, :new) %> |
- <%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
-
diff --git a/lib/flix_web/templates/user_registration/new.html.heex b/lib/flix_web/templates/user_registration/new.html.heex
deleted file mode 100644
index 5950964..0000000
--- a/lib/flix_web/templates/user_registration/new.html.heex
+++ /dev/null
@@ -1,34 +0,0 @@
-Register
-
-<%= form_for @changeset, Routes.user_registration_path(@conn, :create), fn f -> %>
- <%= if @changeset.action do %>
-
-
Oops, something went wrong! Please check the errors below.
-
- <%= submit "Register", class: "btn btn-primary" %>
-
-<% end %>
-
-
- <%= link "Log in", to: Routes.user_session_path(@conn, :new) %> |
- <%= link "Forgot your password?", to: Routes.user_reset_password_path(@conn, :new) %>
-
diff --git a/lib/flix_web/templates/user_reset_password/edit.html.heex b/lib/flix_web/templates/user_reset_password/edit.html.heex
deleted file mode 100644
index 6e530db..0000000
--- a/lib/flix_web/templates/user_reset_password/edit.html.heex
+++ /dev/null
@@ -1,26 +0,0 @@
-Reset password
-
-<%= form_for @changeset, Routes.user_reset_password_path(@conn, :update, @token), fn f -> %>
- <%= if @changeset.action do %>
-
-
Oops, something went wrong! Please check the errors below.
-
- <%= submit "Reset password", class: "btn btn-primary" %>
-
-<% end %>
-
-
- <%= link "Register", to: Routes.user_registration_path(@conn, :new) %> |
- <%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
-
diff --git a/lib/flix_web/templates/user_reset_password/new.html.heex b/lib/flix_web/templates/user_reset_password/new.html.heex
deleted file mode 100644
index 9c09d53..0000000
--- a/lib/flix_web/templates/user_reset_password/new.html.heex
+++ /dev/null
@@ -1,15 +0,0 @@
-Forgot your password?
-
-<%= form_for :user, Routes.user_reset_password_path(@conn, :create), fn f -> %>
- <%= label f, :email %>
- <%= email_input f, :email, required: true %>
-
-
- <%= submit "Send instructions to reset password", class: "btn btn-primary" %>
-
-<% end %>
-
-
- <%= link "Register", to: Routes.user_registration_path(@conn, :new) %> |
- <%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
-
diff --git a/lib/flix_web/templates/user_session/new.html.heex b/lib/flix_web/templates/user_session/new.html.heex
deleted file mode 100644
index 043e6e4..0000000
--- a/lib/flix_web/templates/user_session/new.html.heex
+++ /dev/null
@@ -1,28 +0,0 @@
-Sign In
-
- No account yet? <%= link "Sign up!", to: Routes.user_registration_path(@conn, :new) %>
-
-
-<%= form_for @conn, Routes.user_session_path(@conn, :create), [as: :user], fn f -> %>
- <%= if @error_message do %>
-
-
<%= @error_message %>
-
- <%= link "Sign Up", to: Routes.user_registration_path(@conn, :new) %> |
- <%= link "Forgot your password?", to: Routes.user_reset_password_path(@conn, :new) %>
-
diff --git a/lib/flix_web/templates/user_settings/edit.html.heex b/lib/flix_web/templates/user_settings/edit.html.heex
deleted file mode 100644
index de18bfb..0000000
--- a/lib/flix_web/templates/user_settings/edit.html.heex
+++ /dev/null
@@ -1,53 +0,0 @@
-Settings
-
-Change email
-
-<%= form_for @email_changeset, Routes.user_settings_path(@conn, :update), fn f -> %>
- <%= if @email_changeset.action do %>
-
-
Oops, something went wrong! Please check the errors below.
-
- <%= submit "Change email", class: "btn btn-primary" %>
-
-<% end %>
-
-Change password
-
-<%= form_for @password_changeset, Routes.user_settings_path(@conn, :update), fn f -> %>
- <%= if @password_changeset.action do %>
-
-
Oops, something went wrong! Please check the errors below.
-
- <%= submit "Change password" %>
-
-<% end %>
diff --git a/lib/flix_web/controllers/user_auth.ex b/lib/flix_web/user_auth.ex
similarity index 59%
rename from lib/flix_web/controllers/user_auth.ex
rename to lib/flix_web/user_auth.ex
index 68feaee..3b73c78 100644
--- a/lib/flix_web/controllers/user_auth.ex
+++ b/lib/flix_web/user_auth.ex
@@ -1,9 +1,10 @@
defmodule FlixWeb.UserAuth do
+ use FlixWeb, :verified_routes
+
import Plug.Conn
import Phoenix.Controller
alias Flix.Accounts
- alias FlixWeb.Router.Helpers, as: Routes
# Make the remember me cookie valid for 60 days.
# If you want bump or reduce this value, also change
@@ -30,10 +31,9 @@ defmodule FlixWeb.UserAuth do
conn
|> renew_session()
- |> put_session(:user_token, token)
- |> put_session(:live_socket_id, "users_sessions:#{Base.url_encode64(token)}")
+ |> put_token_in_session(token)
|> maybe_write_remember_me_cookie(token, params)
- |> redirect(to: user_return_to || "/fans/#{user.id}")
+ |> redirect(to: user_return_to || signed_in_path(conn))
end
defp maybe_write_remember_me_cookie(conn, token, %{"remember_me" => "true"}) do
@@ -72,7 +72,7 @@ defmodule FlixWeb.UserAuth do
"""
def log_out_user(conn) do
user_token = get_session(conn, :user_token)
- user_token && Accounts.delete_session_token(user_token)
+ user_token && Accounts.delete_user_session_token(user_token)
if live_socket_id = get_session(conn, :live_socket_id) do
FlixWeb.Endpoint.broadcast(live_socket_id, "disconnect", %{})
@@ -81,7 +81,7 @@ defmodule FlixWeb.UserAuth do
conn
|> renew_session()
|> delete_resp_cookie(@remember_me_cookie)
- |> redirect(to: "/")
+ |> redirect(to: ~p"/")
end
@doc """
@@ -95,19 +95,91 @@ defmodule FlixWeb.UserAuth do
end
defp ensure_user_token(conn) do
- if user_token = get_session(conn, :user_token) do
- {user_token, conn}
+ if token = get_session(conn, :user_token) do
+ {token, conn}
else
conn = fetch_cookies(conn, signed: [@remember_me_cookie])
- if user_token = conn.cookies[@remember_me_cookie] do
- {user_token, put_session(conn, :user_token, user_token)}
+ if token = conn.cookies[@remember_me_cookie] do
+ {token, put_token_in_session(conn, token)}
else
{nil, conn}
end
end
end
+ @doc """
+ Handles mounting and authenticating the current_user in LiveViews.
+
+ ## `on_mount` arguments
+
+ * `:mount_current_user` - Assigns current_user
+ to socket assigns based on user_token, or nil if
+ there's no user_token or no matching user.
+
+ * `:ensure_authenticated` - Authenticates the user from the session,
+ and assigns the current_user to socket assigns based
+ on user_token.
+ Redirects to login page if there's no logged user.
+
+ * `:redirect_if_user_is_authenticated` - Authenticates the user from the session.
+ Redirects to signed_in_path if there's a logged user.
+
+ ## Examples
+
+ Use the `on_mount` lifecycle macro in LiveViews to mount or authenticate
+ the current_user:
+
+ defmodule FlixWeb.PageLive do
+ use FlixWeb, :live_view
+
+ on_mount {FlixWeb.UserAuth, :mount_current_user}
+ ...
+ end
+
+ Or use the `live_session` of your router to invoke the on_mount callback:
+
+ live_session :authenticated, on_mount: [{FlixWeb.UserAuth, :ensure_authenticated}] do
+ live "/profile", ProfileLive, :index
+ end
+ """
+ def on_mount(:mount_current_user, _params, session, socket) do
+ {:cont, mount_current_user(socket, session)}
+ end
+
+ def on_mount(:ensure_authenticated, _params, session, socket) do
+ socket = mount_current_user(socket, session)
+
+ if socket.assigns.current_user do
+ {:cont, socket}
+ else
+ socket =
+ socket
+ |> Phoenix.LiveView.put_flash(:error, "You must log in to access this page.")
+ |> Phoenix.LiveView.redirect(to: ~p"/users/log_in")
+
+ {:halt, socket}
+ end
+ end
+
+ def on_mount(:redirect_if_user_is_authenticated, _params, session, socket) do
+ socket = mount_current_user(socket, session)
+
+ if socket.assigns.current_user do
+ {:halt, Phoenix.LiveView.redirect(socket, to: signed_in_path(socket))}
+ else
+ {:cont, socket}
+ end
+ end
+
+ defp mount_current_user(socket, session) do
+ Phoenix.Component.assign_new(socket, :current_user, fn ->
+ if user_token = session["user_token"] do
+ Accounts.get_user_by_session_token(user_token)
+ end
+ end)
+ end
+
@doc """
Used for routes that require the user to not be authenticated.
"""
@@ -134,16 +206,22 @@ defmodule FlixWeb.UserAuth do
conn
|> put_flash(:error, "You must log in to access this page.")
|> maybe_store_return_to()
- |> redirect(to: Routes.user_session_path(conn, :new))
+ |> redirect(to: ~p"/users/log_in")
|> halt()
end
end
+ defp put_token_in_session(conn, token) do
+ conn
+ |> put_session(:user_token, token)
+ |> put_session(:live_socket_id, "users_sessions:#{Base.url_encode64(token)}")
+ end
+
defp maybe_store_return_to(%{method: "GET"} = conn) do
put_session(conn, :user_return_to, current_path(conn))
end
defp maybe_store_return_to(conn), do: conn
- defp signed_in_path(_conn), do: "/"
+ defp signed_in_path(_conn), do: ~p"/"
end
diff --git a/mix.exs b/mix.exs
index ec68355..df79a65 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,6 @@ defmodule Flix.MixProject do
version: "0.1.0",
elixir: "~> 1.16.2",
elixirc_paths: elixirc_paths(Mix.env()),
- compilers: [:gettext] ++ Mix.compilers(),
start_permanent: Mix.env() == :prod,
aliases: aliases(),
deps: deps(),
@@ -36,24 +35,32 @@ defmodule Flix.MixProject do
# Type `mix help deps` for examples and options.
defp deps do
[
- {:phoenix, "~> 1.6.16"},
+ {:phoenix, "~> 1.7.11"},
{:phoenix_ecto, "~> 4.4.3"},
{:ecto_sql, "~> 3.10.1"},
{:postgrex, "~> 0.17.5"},
- {:phoenix_html, "~> 3.3.3"},
+ {:phoenix_html, "~> 4.1.1"},
{:phoenix_live_reload, "~> 1.3.3", only: :dev},
- {:phoenix_live_view, "~> 0.17.5"},
+ {:phoenix_live_view, "~> 0.20.2"},
{:floki, ">= 0.36.1", only: :test},
- {:phoenix_live_dashboard, "~> 0.5"},
- {:esbuild, "~> 0.7.1", runtime: Mix.env() == :dev},
- {:dart_sass, "~> 0.6.0", runtime: Mix.env() == :dev},
+ {:phoenix_live_dashboard, "~> 0.8.3"},
+ {:esbuild, "~> 0.8.1", runtime: Mix.env() == :dev},
{:tailwind, "~> 0.2.2", runtime: Mix.env() == :dev},
- {:swoosh, "~> 1.11.6"},
+ {:heroicons,
+ github: "tailwindlabs/heroicons",
+ tag: "v2.1.1",
+ sparse: "optimized",
+ app: false,
+ compile: false,
+ depth: 1},
+ {:swoosh, "~> 1.16.3"},
+ {:finch, "~> 0.18.0"},
{:telemetry_metrics, "~> 0.6.2"},
{:telemetry_poller, "~> 1.0.0"},
- {:gettext, "~> 0.18.2"},
+ {:gettext, "~> 0.20.0"},
{:jason, "~> 1.3.0"},
- {:bandit, "~> 1.0.0"},
+ {:dns_cluster, "~> 0.1.1"},
+ {:bandit, "~> 1.4.1"},
{:absinthe_plug, "~> 1.5.8"},
{:cors_plug, "~> 3.0.3"},
{:bcrypt_elixir, "~> 2.0"},
@@ -67,8 +74,6 @@ defmodule Flix.MixProject do
{:hackney, "~> 1.18.2"},
{:sweet_xml, "~> 0.6"},
{:ex_parameterize, "~> 1.0"},
- {:bamboo, "~> 2.1.0"},
- {:bamboo_phoenix, "~> 1.0"},
{:credo, "~> 1.7.5", only: [:dev, :test], runtime: false},
{:mix_test_watch, "~> 1.1.2", only: [:dev, :test], runtime: false}
]
@@ -82,19 +87,15 @@ defmodule Flix.MixProject do
# See the documentation for `Mix` for more info on aliases.
defp aliases do
[
- setup: ["deps.get", "ecto.setup", "assets.build"],
+ setup: ["deps.get", "ecto.setup", "assets.setup", "assets.build"],
"ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
"ecto.reset": ["ecto.drop", "ecto.setup"],
test: ["ecto.create --quiet", "ecto.migrate --quiet", "test"],
- "assets.build": [
- "esbuild default",
- "sass default",
- "tailwind default"
- ],
+ "assets.setup": ["tailwind.install --if-missing", "esbuild.install --if-missing"],
+ "assets.build": ["tailwind flix", "esbuild flix"],
"assets.deploy": [
- "esbuild default --minify",
- "sass default --no-source-map --style=compressed",
- "tailwind default --minify",
+ "tailwind flix --minify",
+ "esbuild flix --minify",
"phx.digest"
]
]
diff --git a/mix.lock b/mix.lock
index 4927ff7..2a2105e 100644
--- a/mix.lock
+++ b/mix.lock
@@ -35,13 +35,13 @@
"idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
"jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"},
"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
- "mime": {:hex, :mime, "1.6.0", "dabde576a497cef4bbdd60aceee8160e02a6c89250d6c0b29e56c0dfb00db3d2", [:mix], [], "hexpm", "31a1a8613f8321143dde1dafc36006a17d28d02bdfecb9e95a880fa7aabd19a7"},
+ "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
"mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
"mix_test_watch": {:hex, :mix_test_watch, "1.1.2", "431bdccf20b110f1595fe2a0e3c6cffd96d8f706721def5d04d557bc0898c476", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm", "8ce79fc69a304eec81ab6c1a05de2eb026a8959f65fb47f933ce8eb56018ba35"},
"nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
"number": {:hex, :number, "1.0.4", "3e6e6032a3c1d4c3760e77a42c580a57a15545dd993af380809da30fe51a032c", [:mix], [{:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "16f7516584ef2be812af4f33f2eaf3f9b9f6ed8892f45853eb93113f83721e42"},
"parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
- "phoenix": {:hex, :phoenix, "1.6.16", "e5bdd18c7a06da5852a25c7befb72246de4ddc289182285f8685a40b7b5f5451", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"},
+ "phoenix": {:hex, :phoenix, "1.7.11", "1d88fc6b05ab0c735b250932c4e6e33bfa1c186f76dcf623d8dd52f07d6379c7", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "b1ec57f2e40316b306708fe59b92a16b9f6f4bf50ccfa41aa8c7feb79e0ec02a"},
"phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"},
"phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"},
"phoenix_html_simplified_helpers": {:hex, :phoenix_html_simplified_helpers, "2.1.0", "252c80df9a5bf8c8312b8fff57bc9735fcc07c599a2e825967d8b919b89a1eae", [:mix], [{:ecto, "~> 2.1 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:gettext, ">= 0.11.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:timex, "~> 3.2", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm", "5444ec916abfaa72e38fd57974d7ceb18a08433bbfc2c1094f0a5a5064c03165"},
@@ -54,7 +54,7 @@
"phoenix_view": {:hex, :phoenix_view, "2.0.3", "4d32c4817fce933693741deeb99ef1392619f942633dde834a5163124813aad3", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"},
"plug": {:hex, :plug, "1.15.3", "712976f504418f6dff0a3e554c40d705a9bcf89a7ccef92fc6a5ef8f16a30a97", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "cc4365a3c010a56af402e0809208873d113e9c38c401cabd88027ef4f5c01fd2"},
"plug_cowboy": {:hex, :plug_cowboy, "2.5.2", "62894ccd601cf9597e2c23911ff12798a8a18d237e9739f58a6b04e4988899fe", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "ea6e87f774c8608d60c8d34022a7d073bd7680a0a013f049fc62bf35efea1044"},
- "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
+ "plug_crypto": {:hex, :plug_crypto, "2.0.0", "77515cc10af06645abbfb5e6ad7a3e9714f805ae118fa1a70205f80d2d70fe73", [:mix], [], "hexpm", "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"},
"postgrex": {:hex, :postgrex, "0.17.5", "0483d054938a8dc069b21bdd636bf56c487404c241ce6c319c1f43588246b281", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "50b8b11afbb2c4095a3ba675b4f055c416d0f3d7de6633a595fc131a828a67eb"},
"ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
@@ -71,4 +71,5 @@
"waffle": {:hex, :waffle, "1.1.8", "9257275a10e7b58f968bf891d2433ecaeced801edc064b3c100dc510848b9760", [:mix], [{:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:ex_aws_s3, "~> 2.1", [hex: :ex_aws_s3, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:sweet_xml, "~> 0.6", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm", "30f1b00998ddb626d98f014bb7606173ff18610b1e89431ff84442dc1c94c6cd"},
"waffle_ecto": {:hex, :waffle_ecto, "0.0.12", "e5c17c49b071b903df71861c642093281123142dc4e9908c930db3e06795b040", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:waffle, "~> 1.0", [hex: :waffle, repo: "hexpm", optional: false]}], "hexpm", "585fe6371057066d2e8e3383ddd7a2437ff0668caf3f4cbf5a041e0de9837168"},
"websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
+ "websock_adapter": {:hex, :websock_adapter, "0.5.6", "0437fe56e093fd4ac422de33bf8fc89f7bc1416a3f2d732d8b2c8fd54792fe60", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "e04378d26b0af627817ae84c92083b7e97aca3121196679b73c73b99d0d133ea"},
}
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index 7ff78f5..3d012a5 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -19,51 +19,20 @@ defmodule FlixWeb.ConnCase do
using do
quote do
+ # The default endpoint for testing
+ @endpoint FlixWeb.Endpoint
+
+ use FlixWeb, :verified_routes
+
# Import conveniences for testing with connections
import Plug.Conn
import Phoenix.ConnTest
import FlixWeb.ConnCase
-
- alias FlixWeb.Router.Helpers, as: Routes
-
- # The default endpoint for testing
- @endpoint FlixWeb.Endpoint
end
end
setup tags do
- :ok = Ecto.Adapters.SQL.Sandbox.checkout(Flix.Repo)
-
- unless tags[:async] do
- Ecto.Adapters.SQL.Sandbox.mode(Flix.Repo, {:shared, self()})
- end
-
+ Flix.DataCase.setup_sandbox(tags)
{:ok, conn: Phoenix.ConnTest.build_conn()}
end
-
- @doc """
- Setup helper that registers and logs in users.
-
- setup :register_and_log_in_user
-
- It stores an updated connection and a registered user in the
- test context.
- """
- def register_and_log_in_user(%{conn: conn}) do
- user = Flix.AccountsFixtures.user_fixture()
- %{conn: log_in_user(conn, user), user: user}
- end
-
- @doc """
- Logs the given `user` into the `conn`.
-
- It returns an updated `conn`.
- """
- def log_in_user(conn, user) do
- token = Flix.Accounts.generate_user_session_token(user)
-
- conn
- |> Phoenix.ConnTest.init_test_session(%{})
- |> Plug.Conn.put_session(:user_token, token)
- end
end