upgrade to phoenix 1.7
This commit is contained in:
parent
1796fb822f
commit
1037f37be2
@ -1,6 +1,6 @@
|
||||
[
|
||||
import_deps: [:ecto, :phoenix],
|
||||
inputs: ["*.{heex,ex,exs}", "priv/*/seeds.exs", "{config,lib,test}/**/*.{heex,ex,exs}"],
|
||||
import_deps: [:ecto, :ecto_sql, :phoenix],
|
||||
inputs: ["*.{heex,ex,exs}", "{config,lib,test}/**/*.{heex,ex,exs}", "priv/*/seeds.exs"],
|
||||
subdirectories: ["priv/*/migrations"],
|
||||
plugins: [Phoenix.LiveView.HTMLFormatter]
|
||||
]
|
||||
|
@ -59,8 +59,7 @@ config :cannery, CanneryWeb.Endpoint,
|
||||
patterns: [
|
||||
~r"priv/static/.*(js|css|png|jpeg|jpg|gif|svg)$",
|
||||
~r"priv/gettext/.*(po)$",
|
||||
~r"lib/cannery_web/(live|views)/.*(ex)$",
|
||||
~r"lib/cannery_web/templates/.*(eex)$"
|
||||
~r"lib/cannery_web/*/.*(ex)$"
|
||||
]
|
||||
]
|
||||
|
||||
|
@ -12,7 +12,7 @@ if System.get_env("PHX_SERVER") && System.get_env("RELEASE_NAME") do
|
||||
config :cannery, CanneryWeb.Endpoint, server: true
|
||||
end
|
||||
|
||||
config :cannery, CanneryWeb.ViewHelpers, shibao_mode: System.get_env("SHIBAO_MODE") == "true"
|
||||
config :cannery, CanneryWeb.HTMLHelpers, shibao_mode: System.get_env("SHIBAO_MODE") == "true"
|
||||
|
||||
# Set default locale
|
||||
config :gettext, :default_locale, System.get_env("LOCALE", "en_US")
|
||||
|
@ -374,8 +374,8 @@ defmodule Cannery.Accounts do
|
||||
@doc """
|
||||
Deletes the signed token with the given context.
|
||||
"""
|
||||
@spec delete_session_token(token :: String.t()) :: :ok
|
||||
def delete_session_token(token) do
|
||||
@spec delete_user_session_token(token :: String.t()) :: :ok
|
||||
def delete_user_session_token(token) do
|
||||
UserToken.token_and_context_query(token, "session") |> Repo.delete_all()
|
||||
:ok
|
||||
end
|
||||
|
@ -3,14 +3,15 @@ defmodule Cannery.Email do
|
||||
Emails that can be sent using Swoosh.
|
||||
|
||||
You can find the base email templates at
|
||||
`lib/cannery_web/templates/layout/email.html.heex` for html emails and
|
||||
`lib/cannery_web/templates/layout/email.txt.heex` for text emails.
|
||||
`lib/cannery_web/components/layouts/email_html.html.heex` for html emails and
|
||||
`lib/cannery_web/components/layouts/email_text.txt.eex` for text emails.
|
||||
"""
|
||||
|
||||
use Phoenix.Swoosh, view: CanneryWeb.EmailView, layout: {CanneryWeb.LayoutView, :email}
|
||||
import Swoosh.Email
|
||||
import CanneryWeb.Gettext
|
||||
import Phoenix.Template
|
||||
alias Cannery.Accounts.User
|
||||
alias CanneryWeb.EmailView
|
||||
alias CanneryWeb.{EmailHTML, Layouts}
|
||||
|
||||
@typedoc """
|
||||
Represents an HTML and text body email that can be sent
|
||||
@ -28,21 +29,33 @@ defmodule Cannery.Email do
|
||||
def generate_email("welcome", user, %{"url" => url}) do
|
||||
user
|
||||
|> base_email(dgettext("emails", "Confirm your Cannery account"))
|
||||
|> render_body("confirm_email.html", %{user: user, url: url})
|
||||
|> text_body(EmailView.render("confirm_email.txt", %{user: user, url: url}))
|
||||
|> html_email(:confirm_email_html, %{user: user, url: url})
|
||||
|> text_email(:confirm_email_text, %{user: user, url: url})
|
||||
end
|
||||
|
||||
def generate_email("reset_password", user, %{"url" => url}) do
|
||||
user
|
||||
|> base_email(dgettext("emails", "Reset your Cannery password"))
|
||||
|> render_body("reset_password.html", %{user: user, url: url})
|
||||
|> text_body(EmailView.render("reset_password.txt", %{user: user, url: url}))
|
||||
|> html_email(:reset_password_html, %{user: user, url: url})
|
||||
|> text_email(:reset_password_text, %{user: user, url: url})
|
||||
end
|
||||
|
||||
def generate_email("update_email", user, %{"url" => url}) do
|
||||
user
|
||||
|> base_email(dgettext("emails", "Update your Cannery email"))
|
||||
|> render_body("update_email.html", %{user: user, url: url})
|
||||
|> text_body(EmailView.render("update_email.txt", %{user: user, url: url}))
|
||||
|> html_email(:update_email_html, %{user: user, url: url})
|
||||
|> text_email(:update_email_text, %{user: user, url: url})
|
||||
end
|
||||
|
||||
defp html_email(email, atom, assigns) do
|
||||
heex = apply(EmailHTML, atom, [assigns])
|
||||
html = render_to_string(Layouts, "email_html", "html", email: email, inner_content: heex)
|
||||
email |> html_body(html)
|
||||
end
|
||||
|
||||
defp text_email(email, atom, assigns) do
|
||||
heex = apply(EmailHTML, atom, [assigns])
|
||||
text = render_to_string(Layouts, "email_text", "text", email: email, inner_content: heex)
|
||||
email |> text_body(text)
|
||||
end
|
||||
end
|
||||
|
@ -1,53 +1,61 @@
|
||||
defmodule CanneryWeb do
|
||||
@moduledoc """
|
||||
The entrypoint for defining your web interface, such
|
||||
as controllers, views, channels and so on.
|
||||
as controllers, components, channels, and so on.
|
||||
|
||||
This can be used in your application as:
|
||||
|
||||
use CanneryWeb, :controller
|
||||
use CanneryWeb, :view
|
||||
use CanneryWeb, :html
|
||||
|
||||
The definitions below will be executed for every view,
|
||||
controller, etc, so keep them short and clean, focused
|
||||
The definitions below will be executed for every controller,
|
||||
component, etc, so keep them short and clean, focused
|
||||
on imports, uses and aliases.
|
||||
|
||||
Do NOT define functions inside the quoted expressions
|
||||
below. Instead, define any helper function in modules
|
||||
and import those modules here.
|
||||
below. Instead, define additional modules and import
|
||||
those modules here.
|
||||
"""
|
||||
|
||||
def controller do
|
||||
quote do
|
||||
use Phoenix.Controller, namespace: CanneryWeb
|
||||
def static_paths, do: ~w(css js fonts images favicon.ico robots.txt)
|
||||
|
||||
def router do
|
||||
quote do
|
||||
use Phoenix.Router, helpers: false
|
||||
|
||||
# Import common connection and controller functions to use in pipelines
|
||||
import Plug.Conn
|
||||
import CanneryWeb.Gettext
|
||||
alias CanneryWeb.Router.Helpers, as: Routes
|
||||
import Phoenix.Controller
|
||||
import Phoenix.LiveView.Router
|
||||
end
|
||||
end
|
||||
|
||||
def view do
|
||||
def channel do
|
||||
quote do
|
||||
use Phoenix.View,
|
||||
root: "lib/cannery_web/templates",
|
||||
namespace: CanneryWeb
|
||||
use Phoenix.Channel
|
||||
end
|
||||
end
|
||||
|
||||
# Import convenience functions from controllers
|
||||
import Phoenix.Controller,
|
||||
only: [get_flash: 1, get_flash: 2, view_module: 1, view_template: 1]
|
||||
def controller do
|
||||
quote do
|
||||
use Phoenix.Controller,
|
||||
formats: [:html, :json],
|
||||
layouts: [html: CanneryWeb.Layouts]
|
||||
|
||||
# Include shared imports and aliases for views
|
||||
unquote(view_helpers())
|
||||
# credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
|
||||
import Plug.Conn
|
||||
import CanneryWeb.Gettext
|
||||
|
||||
unquote(verified_routes())
|
||||
end
|
||||
end
|
||||
|
||||
def live_view do
|
||||
quote do
|
||||
use Phoenix.LiveView, layout: {CanneryWeb.LayoutView, :live}
|
||||
use Phoenix.LiveView,
|
||||
layout: {CanneryWeb.Layouts, :app}
|
||||
|
||||
on_mount CanneryWeb.InitAssigns
|
||||
unquote(view_helpers())
|
||||
unquote(html_helpers())
|
||||
end
|
||||
end
|
||||
|
||||
@ -55,49 +63,46 @@ defmodule CanneryWeb do
|
||||
quote do
|
||||
use Phoenix.LiveComponent
|
||||
|
||||
unquote(view_helpers())
|
||||
unquote(html_helpers())
|
||||
end
|
||||
end
|
||||
|
||||
def component do
|
||||
def html do
|
||||
quote do
|
||||
use Phoenix.Component
|
||||
|
||||
unquote(view_helpers())
|
||||
# Import convenience functions from controllers
|
||||
import Phoenix.Controller,
|
||||
only: [get_csrf_token: 0, view_module: 1, view_template: 1]
|
||||
|
||||
# Include general helpers for rendering HTML
|
||||
unquote(html_helpers())
|
||||
end
|
||||
end
|
||||
|
||||
def router do
|
||||
defp html_helpers do
|
||||
quote do
|
||||
use Phoenix.Router
|
||||
|
||||
import Phoenix.{Controller, LiveView.Router}
|
||||
# credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
|
||||
import Plug.Conn
|
||||
end
|
||||
end
|
||||
|
||||
def channel do
|
||||
quote do
|
||||
use Phoenix.Channel
|
||||
# credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
|
||||
import CanneryWeb.Gettext
|
||||
end
|
||||
end
|
||||
|
||||
defp view_helpers do
|
||||
quote do
|
||||
# Use all HTML functionality (forms, tags, etc)
|
||||
# credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
|
||||
use Phoenix.HTML
|
||||
|
||||
# Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
|
||||
# Import basic rendering functionality (render, render_layout, etc)
|
||||
import CanneryWeb.{ErrorHelpers, Gettext, CoreComponents, ViewHelpers}
|
||||
import Phoenix.{Component, View}
|
||||
# credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
|
||||
import Phoenix.Component
|
||||
import CanneryWeb.{ErrorHelpers, Gettext, CoreComponents, HTMLHelpers}
|
||||
|
||||
alias CanneryWeb.Endpoint
|
||||
alias CanneryWeb.Router.Helpers, as: Routes
|
||||
# Shortcut for generating JS commands
|
||||
alias Phoenix.LiveView.JS
|
||||
|
||||
# Routes generation with the ~p sigil
|
||||
unquote(verified_routes())
|
||||
end
|
||||
end
|
||||
|
||||
def verified_routes do
|
||||
quote do
|
||||
use Phoenix.VerifiedRoutes,
|
||||
endpoint: CanneryWeb.Endpoint,
|
||||
router: CanneryWeb.Router,
|
||||
statics: CanneryWeb.static_paths()
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -109,14 +109,12 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
|
||||
end
|
||||
|
||||
@spec get_value_for_key(atom(), Container.t(), extra_data :: map) :: any()
|
||||
defp get_value_for_key(:name, %{id: id, name: container_name}, _extra_data) do
|
||||
assigns = %{id: id, container_name: container_name}
|
||||
|
||||
defp get_value_for_key(:name, %{name: container_name} = assigns, _extra_data) do
|
||||
{container_name,
|
||||
~H"""
|
||||
<div class="flex flex-wrap justify-center items-center">
|
||||
<.link navigate={Routes.container_show_path(Endpoint, :show, @id)} class="link">
|
||||
<%= @container_name %>
|
||||
<.link navigate={~p"/container/#{@id}"} class="link">
|
||||
<%= @name %>
|
||||
</.link>
|
||||
</div>
|
||||
"""}
|
||||
|
@ -3,11 +3,11 @@ defmodule CanneryWeb.CoreComponents do
|
||||
Provides core UI components.
|
||||
"""
|
||||
use Phoenix.Component
|
||||
import CanneryWeb.{Gettext, ViewHelpers}
|
||||
use CanneryWeb, :verified_routes
|
||||
import CanneryWeb.{Gettext, HTMLHelpers}
|
||||
alias Cannery.{Accounts, Accounts.Invite, Accounts.User}
|
||||
alias Cannery.{Ammo, Ammo.Pack}
|
||||
alias Cannery.{Containers.Container, Containers.Tag}
|
||||
alias CanneryWeb.{Endpoint, HomeLive}
|
||||
alias CanneryWeb.Router.Helpers, as: Routes
|
||||
alias Phoenix.LiveView.{JS, Rendered}
|
||||
|
||||
@ -29,13 +29,13 @@ defmodule CanneryWeb.CoreComponents do
|
||||
|
||||
## Examples
|
||||
|
||||
<.modal return_to={Routes.<%= schema.singular %>_index_path(Endpoint, :index)}>
|
||||
<.modal return_to={~p"/\#{<%= schema.plural %>}"}>
|
||||
<.live_component
|
||||
module={<%= inspect context.web_module %>.<%= inspect Module.concat(schema.web_namespace, schema.alias) %>Live.FormComponent}
|
||||
id={@<%= schema.singular %>.id || :new}
|
||||
title={@page_title}
|
||||
action={@live_action}
|
||||
return_to={Routes.<%= schema.singular %>_index_path(Endpoint, :index)}
|
||||
return_to={~p"/\#{<%= schema.singular %>}"}
|
||||
<%= schema.singular %>: @<%= schema.singular %>
|
||||
/>
|
||||
</.modal>
|
||||
|
@ -5,7 +5,7 @@
|
||||
border border-gray-400 rounded-lg shadow-lg hover:shadow-md
|
||||
transition-all duration-300 ease-in-out"
|
||||
>
|
||||
<.link navigate={Routes.container_show_path(Endpoint, :show, @container)} class="link">
|
||||
<.link navigate={~p"/container/#{@container}"} class="link">
|
||||
<h1 class="px-4 py-2 rounded-lg title text-xl">
|
||||
<%= @container.name %>
|
||||
</h1>
|
||||
|
@ -23,7 +23,7 @@
|
||||
<% end %>
|
||||
|
||||
<.qr_code
|
||||
content={Routes.user_registration_url(Endpoint, :new, invite: @invite.token)}
|
||||
content={url(CanneryWeb.Endpoint, ~p"/users/register?invite=#{@invite.token}")}
|
||||
filename={@invite.name}
|
||||
/>
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
id={"code-#{@invite.id}"}
|
||||
class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
|
||||
phx-no-format
|
||||
><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %></code>
|
||||
><%= url(CanneryWeb.Endpoint, ~p"/users/register?invite=#{@invite.token}") %></code>
|
||||
<%= if @code_actions, do: render_slot(@code_actions) %>
|
||||
</div>
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
border border-gray-400 rounded-lg shadow-lg hover:shadow-md
|
||||
transition-all duration-300 ease-in-out"
|
||||
>
|
||||
<.link navigate={Routes.pack_show_path(Endpoint, :show, @pack)} class="mb-2 link">
|
||||
<.link navigate={~p"/ammo/show/#{@pack}"} class="mb-2 link">
|
||||
<h1 class="title text-xl title-primary-500">
|
||||
<%= @pack.type.name %>
|
||||
</h1>
|
||||
@ -55,7 +55,7 @@
|
||||
<span :if={@container} class="rounded-lg title text-lg">
|
||||
<%= gettext("Container:") %>
|
||||
|
||||
<.link navigate={Routes.container_show_path(Endpoint, :show, @container)} class="link">
|
||||
<.link navigate={~p"/container/#{@container}"} class="link">
|
||||
<%= @container.name %>
|
||||
</.link>
|
||||
</span>
|
||||
|
@ -1,12 +1,9 @@
|
||||
<nav role="navigation" class="mb-8 px-8 py-4 w-full bg-primary-500">
|
||||
<div class="flex flex-col sm:flex-row justify-between items-center">
|
||||
<div class="mb-4 sm:mb-0 sm:mr-8 flex flex-row justify-start items-center space-x-2">
|
||||
<.link
|
||||
navigate={Routes.live_path(Endpoint, HomeLive)}
|
||||
class="inline mx-2 my-1 leading-5 text-xl text-white"
|
||||
>
|
||||
<.link navigate={~p"/"} class="inline mx-2 my-1 leading-5 text-xl text-white">
|
||||
<img
|
||||
src={Routes.static_path(Endpoint, "/images/cannery.svg")}
|
||||
src={~p"/images/cannery.svg"}
|
||||
alt={gettext("Cannery logo")}
|
||||
class="inline-block h-8 mx-1"
|
||||
/>
|
||||
@ -27,64 +24,43 @@
|
||||
text-lg text-white text-ellipsis">
|
||||
<%= if @current_user do %>
|
||||
<li class="mx-2 my-1">
|
||||
<.link
|
||||
navigate={Routes.tag_index_path(Endpoint, :index)}
|
||||
class="text-white hover:underline"
|
||||
>
|
||||
<.link navigate={~p"/tags"} class="text-white hover:underline">
|
||||
<%= gettext("Tags") %>
|
||||
</.link>
|
||||
</li>
|
||||
<li class="mx-2 my-1">
|
||||
<.link
|
||||
navigate={Routes.container_index_path(Endpoint, :index)}
|
||||
class="text-white hover:underline"
|
||||
>
|
||||
<.link navigate={~p"/containers"} class="text-white hover:underline">
|
||||
<%= gettext("Containers") %>
|
||||
</.link>
|
||||
</li>
|
||||
<li class="mx-2 my-1">
|
||||
<.link
|
||||
navigate={Routes.type_index_path(Endpoint, :index)}
|
||||
class="text-white hover:underline"
|
||||
>
|
||||
<.link navigate={~p"/catalog"} class="text-white hover:underline">
|
||||
<%= gettext("Catalog") %>
|
||||
</.link>
|
||||
</li>
|
||||
<li class="mx-2 my-1">
|
||||
<.link
|
||||
navigate={Routes.pack_index_path(Endpoint, :index)}
|
||||
class="text-white hover:underline"
|
||||
>
|
||||
<.link navigate={~p"/ammo"} class="text-white hover:underline">
|
||||
<%= gettext("Ammo") %>
|
||||
</.link>
|
||||
</li>
|
||||
<li class="mx-2 my-1">
|
||||
<.link
|
||||
navigate={Routes.range_index_path(Endpoint, :index)}
|
||||
class="text-white hover:underline"
|
||||
>
|
||||
<.link navigate={~p"/range"} class="text-white hover:underline">
|
||||
<%= gettext("Range") %>
|
||||
</.link>
|
||||
</li>
|
||||
<li :if={@current_user |> Accounts.is_already_admin?()} class="mx-2 my-1">
|
||||
<.link
|
||||
navigate={Routes.invite_index_path(Endpoint, :index)}
|
||||
class="text-white hover:underline"
|
||||
>
|
||||
<.link navigate={~p"/invites"} class="text-white hover:underline">
|
||||
<%= gettext("Invites") %>
|
||||
</.link>
|
||||
</li>
|
||||
<li class="mx-2 my-1">
|
||||
<.link
|
||||
href={Routes.user_settings_path(Endpoint, :edit)}
|
||||
class="text-white hover:underline truncate"
|
||||
>
|
||||
<.link href={~p"/users/settings"} class="text-white hover:underline truncate">
|
||||
<%= @current_user.email %>
|
||||
</.link>
|
||||
</li>
|
||||
<li class="mx-2 my-1">
|
||||
<.link
|
||||
href={Routes.user_session_path(Endpoint, :delete)}
|
||||
href={~p"/users/log_out"}
|
||||
method="delete"
|
||||
data-confirm={dgettext("prompts", "Are you sure you want to log out?")}
|
||||
aria-label={gettext("Log out")}
|
||||
@ -100,7 +76,7 @@
|
||||
class="mx-2 my-1"
|
||||
>
|
||||
<.link
|
||||
navigate={Routes.live_dashboard_path(Endpoint, :home)}
|
||||
navigate={~p"/dashboard"}
|
||||
class="text-white hover:underline"
|
||||
aria-label={gettext("Live Dashboard")}
|
||||
>
|
||||
@ -109,18 +85,12 @@
|
||||
</li>
|
||||
<% else %>
|
||||
<li :if={Accounts.allow_registration?()} class="mx-2 my-1">
|
||||
<.link
|
||||
href={Routes.user_registration_path(Endpoint, :new)}
|
||||
class="text-white hover:underline truncate"
|
||||
>
|
||||
<.link href={~p"/users/register"} class="text-white hover:underline truncate">
|
||||
<%= dgettext("actions", "Register") %>
|
||||
</.link>
|
||||
</li>
|
||||
<li class="mx-2 my-1">
|
||||
<.link
|
||||
href={Routes.user_session_path(Endpoint, :new)}
|
||||
class="text-white hover:underline truncate"
|
||||
>
|
||||
<.link href={~p"/users/log_in"} class="text-white hover:underline truncate">
|
||||
<%= dgettext("actions", "Log in") %>
|
||||
</.link>
|
||||
</li>
|
||||
|
10
lib/cannery_web/components/email_html.ex
Normal file
10
lib/cannery_web/components/email_html.ex
Normal file
@ -0,0 +1,10 @@
|
||||
defmodule CanneryWeb.EmailHTML do
|
||||
@moduledoc """
|
||||
Renders email templates
|
||||
"""
|
||||
|
||||
use CanneryWeb, :html
|
||||
|
||||
embed_templates "email_html/*.html", suffix: "_html"
|
||||
embed_templates "email_html/*.txt", suffix: "_text"
|
||||
end
|
@ -9,4 +9,4 @@
|
||||
|
||||
<%= dgettext("emails",
|
||||
"If you didn't create an account at %{url}, please ignore this.",
|
||||
url: Routes.live_url(Endpoint, HomeLive)) %>
|
||||
url: ~p"/") %>
|
@ -7,4 +7,4 @@
|
||||
|
||||
<%= dgettext("emails",
|
||||
"If you didn't request this change from %{url}, please ignore this.",
|
||||
url: Routes.live_url(Endpoint, HomeLive)) %>
|
||||
url: ~p"/") %>
|
@ -7,4 +7,4 @@
|
||||
|
||||
<%= dgettext("emails",
|
||||
"If you didn't request this change from %{url}, please ignore this.",
|
||||
url: Routes.live_url(Endpoint, HomeLive)) %>
|
||||
url: ~p"/") %>
|
17
lib/cannery_web/components/layouts.ex
Normal file
17
lib/cannery_web/components/layouts.ex
Normal file
@ -0,0 +1,17 @@
|
||||
defmodule CanneryWeb.Layouts do
|
||||
@moduledoc """
|
||||
The root layouts for the entire application
|
||||
"""
|
||||
|
||||
use CanneryWeb, :html
|
||||
|
||||
embed_templates "layouts/*"
|
||||
|
||||
def get_title(%{assigns: %{title: title}}) when title not in [nil, ""] do
|
||||
gettext("Cannery | %{title}", title: title)
|
||||
end
|
||||
|
||||
def get_title(_conn) do
|
||||
gettext("Cannery")
|
||||
end
|
||||
end
|
@ -3,11 +3,11 @@
|
||||
<.topbar current_user={assigns[:current_user]} />
|
||||
|
||||
<div class="mx-8 my-2 flex flex-col space-y-4 text-center">
|
||||
<p :if={get_flash(@conn, :info)} class="alert alert-info" role="alert">
|
||||
<%= get_flash(@conn, :info) %>
|
||||
<p :if={@flash["info"]} class="alert alert-info" role="alert">
|
||||
<%= @flash["info"] %>
|
||||
</p>
|
||||
<p :if={get_flash(@conn, :error)} class="alert alert-danger" role="alert">
|
||||
<%= get_flash(@conn, :error) %>
|
||||
<p :if={@flash["error"]} class="alert alert-danger" role="alert">
|
||||
<%= @flash["error"] %>
|
||||
</p>
|
||||
</div>
|
||||
</header>
|
@ -9,7 +9,7 @@
|
||||
|
||||
<hr style="margin: 2em auto; border-width: 1px; border-color: rgb(212, 212, 216); width: 100%; max-width: 42rem;" />
|
||||
|
||||
<a style="color: rgb(31, 31, 31);" href={Routes.live_url(Endpoint, HomeLive)}>
|
||||
<a style="color: rgb(31, 31, 31);" href={~p"/"}>
|
||||
<%= dgettext(
|
||||
"emails",
|
||||
"This email was sent from Cannery, the self-hosted firearm tracker website."
|
@ -8,4 +8,4 @@
|
||||
|
||||
<%= dgettext("emails",
|
||||
"This email was sent from Cannery at %{url}, the self-hosted firearm tracker website.",
|
||||
url: Routes.live_url(Endpoint, HomeLive)) %>
|
||||
url: ~p"/") %>
|
@ -5,21 +5,12 @@
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<%= csrf_meta_tag() %>
|
||||
<link
|
||||
rel="shortcut icon"
|
||||
type="image/jpg"
|
||||
href={Routes.static_path(@conn, "/images/cannery.svg")}
|
||||
/>
|
||||
<link rel="shortcut icon" type="image/jpg" href={~p"/images/cannery.svg"} />
|
||||
<.live_title suffix={" | #{gettext("Cannery")}"}>
|
||||
<%= assigns[:page_title] || gettext("Cannery") %>
|
||||
</.live_title>
|
||||
<link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
|
||||
<script
|
||||
defer
|
||||
phx-track-static
|
||||
type="text/javascript"
|
||||
src={Routes.static_path(@conn, "/js/app.js")}
|
||||
>
|
||||
<link phx-track-static rel="stylesheet" href={~p"/css/app.css"} />
|
||||
<script defer phx-track-static type="text/javascript" src={~p"/js/app.js"}>
|
||||
</script>
|
||||
</head>
|
||||
|
@ -5,7 +5,6 @@ defmodule CanneryWeb.Components.MovePackComponent do
|
||||
|
||||
use CanneryWeb, :live_component
|
||||
alias Cannery.{Accounts.User, Ammo, Ammo.Pack, Containers, Containers.Container}
|
||||
alias CanneryWeb.Endpoint
|
||||
alias Ecto.Changeset
|
||||
alias Phoenix.LiveView.Socket
|
||||
|
||||
@ -84,7 +83,7 @@ defmodule CanneryWeb.Components.MovePackComponent do
|
||||
<%= display_emoji("😔") %>
|
||||
</h2>
|
||||
|
||||
<.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
|
||||
<.link navigate={~p"/containers/new"} class="btn btn-primary">
|
||||
<%= dgettext("actions", "Add another container!") %>
|
||||
</.link>
|
||||
<% else %>
|
||||
|
@ -98,7 +98,7 @@ defmodule CanneryWeb.Components.ShotRecordTableComponent do
|
||||
|
||||
{pack.type.name,
|
||||
~H"""
|
||||
<.link navigate={Routes.pack_show_path(Endpoint, :show, @pack)} class="link">
|
||||
<.link navigate={~p"/ammo/show/#{@pack}"} class="link">
|
||||
<%= @pack.type.name %>
|
||||
</.link>
|
||||
"""}
|
||||
|
@ -261,13 +261,11 @@ defmodule CanneryWeb.Components.TypeTableComponent do
|
||||
end
|
||||
end
|
||||
|
||||
defp get_type_value(:name, _key, %{name: type_name} = type, _other_data) do
|
||||
assigns = %{type: type}
|
||||
|
||||
defp get_type_value(:name, _key, %{name: type_name} = assigns, _other_data) do
|
||||
{type_name,
|
||||
~H"""
|
||||
<.link navigate={Routes.type_show_path(Endpoint, :show, @type)} class="link">
|
||||
<%= @type.name %>
|
||||
<.link navigate={~p"/type/#{@id}"} class="link">
|
||||
<%= @name %>
|
||||
</.link>
|
||||
"""}
|
||||
end
|
||||
|
@ -6,7 +6,8 @@ defmodule CanneryWeb.EmailController do
|
||||
use CanneryWeb, :controller
|
||||
alias Cannery.Accounts.User
|
||||
|
||||
plug :put_layout, {CanneryWeb.LayoutView, :email}
|
||||
plug :put_root_layout, html: {CanneryWeb.Layouts, :email_html}
|
||||
plug :put_layout, false
|
||||
|
||||
@sample_assigns %{
|
||||
email: %{subject: "Example subject"},
|
||||
@ -18,6 +19,6 @@ defmodule CanneryWeb.EmailController do
|
||||
Debug route used to preview emails
|
||||
"""
|
||||
def preview(conn, %{"id" => template}) do
|
||||
render(conn, "#{template |> to_string()}.html", @sample_assigns)
|
||||
render(conn, String.to_existing_atom(template), @sample_assigns)
|
||||
end
|
||||
end
|
||||
|
16
lib/cannery_web/controllers/error_html.ex
Normal file
16
lib/cannery_web/controllers/error_html.ex
Normal file
@ -0,0 +1,16 @@
|
||||
defmodule CanneryWeb.ErrorHTML do
|
||||
use CanneryWeb, :html
|
||||
|
||||
embed_templates "error_html/*"
|
||||
|
||||
def render(template, _assigns) do
|
||||
error_string =
|
||||
case template do
|
||||
"404.html" -> dgettext("errors", "Not found")
|
||||
"401.html" -> dgettext("errors", "Unauthorized")
|
||||
_other_path -> dgettext("errors", "Internal server error")
|
||||
end
|
||||
|
||||
error(%{error_string: error_string})
|
||||
end
|
||||
end
|
@ -24,10 +24,7 @@
|
||||
|
||||
<hr class="w-full hr" />
|
||||
|
||||
<.link
|
||||
href={Routes.live_path(Endpoint, HomeLive)}
|
||||
class="link title text-primary-600 text-lg"
|
||||
>
|
||||
<.link href={~p"/"} class="link title text-primary-600 text-lg">
|
||||
<%= dgettext("errors", "Go back home") %>
|
||||
</.link>
|
||||
</div>
|
14
lib/cannery_web/controllers/error_json.ex
Normal file
14
lib/cannery_web/controllers/error_json.ex
Normal file
@ -0,0 +1,14 @@
|
||||
defmodule CanneryWeb.ErrorJSON do
|
||||
import CanneryWeb.Gettext
|
||||
|
||||
def render(template, _assigns) do
|
||||
error_string =
|
||||
case template do
|
||||
"404.json" -> dgettext("errors", "Not found")
|
||||
"401.json" -> dgettext("errors", "Unauthorized")
|
||||
_other_path -> dgettext("errors", "Internal server error")
|
||||
end
|
||||
|
||||
%{errors: %{detail: error_string}}
|
||||
end
|
||||
end
|
@ -1,11 +0,0 @@
|
||||
defmodule CanneryWeb.HomeController do
|
||||
@moduledoc """
|
||||
Controller for home page
|
||||
"""
|
||||
|
||||
use CanneryWeb, :controller
|
||||
|
||||
def index(conn, _params) do
|
||||
render(conn, "index.html")
|
||||
end
|
||||
end
|
5
lib/cannery_web/controllers/home_html.ex
Normal file
5
lib/cannery_web/controllers/home_html.ex
Normal file
@ -0,0 +1,5 @@
|
||||
defmodule CanneryWeb.HomeHTML do
|
||||
use CanneryWeb, :html
|
||||
|
||||
embed_templates "home_html/*"
|
||||
end
|
@ -3,12 +3,11 @@ defmodule CanneryWeb.UserAuth do
|
||||
Functions for user session and authentication
|
||||
"""
|
||||
|
||||
use CanneryWeb, :verified_routes
|
||||
import Plug.Conn
|
||||
import Phoenix.Controller
|
||||
import CanneryWeb.Gettext
|
||||
alias Cannery.{Accounts, Accounts.User}
|
||||
alias CanneryWeb.HomeLive
|
||||
alias CanneryWeb.Router.Helpers, as: Routes
|
||||
|
||||
# Make the remember me cookie valid for 60 days.
|
||||
# If you want bump or reduce this value, also change
|
||||
@ -39,7 +38,7 @@ defmodule CanneryWeb.UserAuth do
|
||||
dgettext("errors", "You must confirm your account and 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
|
||||
|
||||
@ -49,8 +48,7 @@ defmodule CanneryWeb.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 || signed_in_path(conn))
|
||||
end
|
||||
@ -96,7 +94,7 @@ defmodule CanneryWeb.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
|
||||
CanneryWeb.Endpoint.broadcast(live_socket_id, "disconnect", %{})
|
||||
@ -105,7 +103,7 @@ defmodule CanneryWeb.UserAuth do
|
||||
conn
|
||||
|> renew_session()
|
||||
|> delete_resp_cookie(@remember_me_cookie)
|
||||
|> redirect(to: "/")
|
||||
|> redirect(to: ~p"/")
|
||||
end
|
||||
|
||||
@doc """
|
||||
@ -119,19 +117,110 @@ defmodule CanneryWeb.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 CanneryWeb.PageLive do
|
||||
use CanneryWeb, :live_view
|
||||
|
||||
on_mount {CanneryWeb.UserAuth, :mount_current_user}
|
||||
...
|
||||
end
|
||||
|
||||
Or use the `live_session` of your router to invoke the on_mount callback:
|
||||
|
||||
live_session :authenticated, on_mount: [{CanneryWeb.UserAuth, :ensure_authenticated}] do
|
||||
live "/profile", ProfileLive, :index
|
||||
end
|
||||
"""
|
||||
def on_mount(:mount_current_user, _params, session, socket) do
|
||||
{:cont, mount_current_user(session, socket)}
|
||||
end
|
||||
|
||||
def on_mount(:ensure_authenticated, _params, session, socket) do
|
||||
socket = mount_current_user(session, socket)
|
||||
|
||||
if socket.assigns.current_user do
|
||||
{:cont, socket}
|
||||
else
|
||||
error_flash = dgettext("errors", "You must log in to access this page.")
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> Phoenix.LiveView.put_flash(:error, error_flash)
|
||||
|> Phoenix.LiveView.redirect(to: ~p"/users/log_in")
|
||||
|
||||
{:halt, socket}
|
||||
end
|
||||
end
|
||||
|
||||
def on_mount(:ensure_admin, _params, session, socket) do
|
||||
socket = mount_current_user(session, socket)
|
||||
|
||||
if socket.assigns.current_user && socket.assigns.current_user.role == :admin do
|
||||
{:cont, socket}
|
||||
else
|
||||
error_flash = dgettext("errors", "You must log in as an administrator to access this page.")
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> Phoenix.LiveView.put_flash(:error, error_flash)
|
||||
|> 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(session, socket)
|
||||
|
||||
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(session, socket) 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.
|
||||
"""
|
||||
@ -161,7 +250,7 @@ defmodule CanneryWeb.UserAuth do
|
||||
dgettext("errors", "You must confirm your account and 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
|
||||
@ -176,16 +265,34 @@ defmodule CanneryWeb.UserAuth do
|
||||
conn
|
||||
|> put_flash(:error, dgettext("errors", "You are not authorized to view this page."))
|
||||
|> maybe_store_return_to()
|
||||
|> redirect(to: Routes.live_path(conn, HomeLive))
|
||||
|> redirect(to: ~p"/")
|
||||
|> halt()
|
||||
end
|
||||
end
|
||||
|
||||
def put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, _opts) do
|
||||
default = Application.fetch_env!(:gettext, :default_locale)
|
||||
Gettext.put_locale(locale || default)
|
||||
conn |> put_session(:locale, locale || default)
|
||||
end
|
||||
|
||||
def put_user_locale(conn, _opts) do
|
||||
default = Application.fetch_env!(:gettext, :default_locale)
|
||||
Gettext.put_locale(default)
|
||||
conn |> put_session(:locale, default)
|
||||
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
|
||||
|
@ -5,14 +5,14 @@ defmodule CanneryWeb.UserConfirmationController do
|
||||
alias Cannery.Accounts
|
||||
|
||||
def new(conn, _params) do
|
||||
render(conn, "new.html", page_title: gettext("Confirm your account"))
|
||||
render(conn, :new, page_title: gettext("Confirm your account"))
|
||||
end
|
||||
|
||||
def create(conn, %{"user" => %{"email" => email}}) do
|
||||
if user = Accounts.get_user_by_email(email) do
|
||||
Accounts.deliver_user_confirmation_instructions(
|
||||
user,
|
||||
&Routes.user_confirmation_url(conn, :confirm, &1)
|
||||
fn token -> url(CanneryWeb.Endpoint, ~p"/users/confirm/#{token}") end
|
||||
)
|
||||
end
|
||||
|
||||
@ -22,11 +22,10 @@ defmodule CanneryWeb.UserConfirmationController do
|
||||
:info,
|
||||
dgettext(
|
||||
"prompts",
|
||||
"If your email is in our system and it has not been confirmed yet, " <>
|
||||
"you will receive an email with instructions shortly."
|
||||
"If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
|
||||
)
|
||||
)
|
||||
|> redirect(to: "/")
|
||||
|> redirect(to: ~p"/")
|
||||
end
|
||||
|
||||
# Do not log in the user after confirmation to avoid a
|
||||
@ -36,7 +35,7 @@ defmodule CanneryWeb.UserConfirmationController do
|
||||
{:ok, %{email: email}} ->
|
||||
conn
|
||||
|> put_flash(:info, dgettext("prompts", "%{email} confirmed successfully.", email: email))
|
||||
|> redirect(to: "/")
|
||||
|> redirect(to: ~p"/")
|
||||
|
||||
:error ->
|
||||
# If there is a current user and the account was already confirmed,
|
||||
@ -45,7 +44,7 @@ defmodule CanneryWeb.UserConfirmationController do
|
||||
# a warning message.
|
||||
case conn.assigns do
|
||||
%{current_user: %{confirmed_at: confirmed_at}} when not is_nil(confirmed_at) ->
|
||||
redirect(conn, to: "/")
|
||||
redirect(conn, to: ~p"/")
|
||||
|
||||
%{} ->
|
||||
conn
|
||||
@ -53,7 +52,7 @@ defmodule CanneryWeb.UserConfirmationController do
|
||||
:error,
|
||||
dgettext("errors", "User confirmation link is invalid or it has expired.")
|
||||
)
|
||||
|> redirect(to: "/")
|
||||
|> redirect(to: ~p"/")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
6
lib/cannery_web/controllers/user_confirmation_html.ex
Normal file
6
lib/cannery_web/controllers/user_confirmation_html.ex
Normal file
@ -0,0 +1,6 @@
|
||||
defmodule CanneryWeb.UserConfirmationHTML do
|
||||
use CanneryWeb, :html
|
||||
alias Cannery.Accounts
|
||||
|
||||
embed_templates "user_confirmation_html/*"
|
||||
end
|
@ -7,7 +7,7 @@
|
||||
:let={f}
|
||||
for={%{}}
|
||||
as={:user}
|
||||
action={Routes.user_confirmation_path(@conn, :create)}
|
||||
action={~p"/users/confirm"}
|
||||
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||
>
|
||||
<%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
|
||||
@ -21,14 +21,10 @@
|
||||
<hr class="hr" />
|
||||
|
||||
<div class="flex flex-row justify-center items-center space-x-4">
|
||||
<.link
|
||||
:if={Accounts.allow_registration?()}
|
||||
href={Routes.user_registration_path(@conn, :new)}
|
||||
class="btn btn-primary"
|
||||
>
|
||||
<.link :if={Accounts.allow_registration?()} href={~p"/users/register"} class="btn btn-primary">
|
||||
<%= dgettext("actions", "Register") %>
|
||||
</.link>
|
||||
<.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
|
||||
<.link href={~p"/users/log_in"} class="btn btn-primary">
|
||||
<%= dgettext("actions", "Log in") %>
|
||||
</.link>
|
||||
</div>
|
@ -2,7 +2,6 @@ defmodule CanneryWeb.UserRegistrationController do
|
||||
use CanneryWeb, :controller
|
||||
import CanneryWeb.Gettext
|
||||
alias Cannery.{Accounts, Accounts.Invites}
|
||||
alias CanneryWeb.{Endpoint, HomeLive}
|
||||
alias Ecto.Changeset
|
||||
|
||||
def new(conn, %{"invite" => invite_token}) do
|
||||
@ -11,7 +10,7 @@ defmodule CanneryWeb.UserRegistrationController do
|
||||
else
|
||||
conn
|
||||
|> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
|
||||
|> redirect(to: Routes.live_path(Endpoint, HomeLive))
|
||||
|> redirect(to: ~p"/")
|
||||
end
|
||||
end
|
||||
|
||||
@ -21,13 +20,13 @@ defmodule CanneryWeb.UserRegistrationController do
|
||||
else
|
||||
conn
|
||||
|> put_flash(:error, dgettext("errors", "Sorry, public registration is disabled"))
|
||||
|> redirect(to: Routes.live_path(Endpoint, HomeLive))
|
||||
|> redirect(to: ~p"/")
|
||||
end
|
||||
end
|
||||
|
||||
# renders new user registration page
|
||||
defp render_new(conn, invite_token \\ nil) do
|
||||
render(conn, "new.html",
|
||||
render(conn, :new,
|
||||
changeset: Accounts.change_user_registration(),
|
||||
invite_token: invite_token,
|
||||
page_title: gettext("Register")
|
||||
@ -40,7 +39,7 @@ defmodule CanneryWeb.UserRegistrationController do
|
||||
else
|
||||
conn
|
||||
|> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
|
||||
|> redirect(to: Routes.live_path(Endpoint, HomeLive))
|
||||
|> redirect(to: ~p"/")
|
||||
end
|
||||
end
|
||||
|
||||
@ -50,7 +49,7 @@ defmodule CanneryWeb.UserRegistrationController do
|
||||
else
|
||||
conn
|
||||
|> put_flash(:error, dgettext("errors", "Sorry, public registration is disabled"))
|
||||
|> redirect(to: Routes.live_path(Endpoint, HomeLive))
|
||||
|> redirect(to: ~p"/")
|
||||
end
|
||||
end
|
||||
|
||||
@ -59,17 +58,17 @@ defmodule CanneryWeb.UserRegistrationController do
|
||||
{:ok, user} ->
|
||||
Accounts.deliver_user_confirmation_instructions(
|
||||
user,
|
||||
&Routes.user_confirmation_url(conn, :confirm, &1)
|
||||
fn token -> url(CanneryWeb.Endpoint, ~p"/users/confirm/#{token}") end
|
||||
)
|
||||
|
||||
conn
|
||||
|> put_flash(:info, dgettext("prompts", "Please check your email to verify your account"))
|
||||
|> redirect(to: Routes.user_session_path(Endpoint, :new))
|
||||
|> redirect(to: ~p"/users/log_in")
|
||||
|
||||
{:error, :invalid_token} ->
|
||||
conn
|
||||
|> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
|
||||
|> redirect(to: Routes.live_path(Endpoint, HomeLive))
|
||||
|> redirect(to: ~p"/")
|
||||
|
||||
{:error, %Changeset{} = changeset} ->
|
||||
conn |> render("new.html", changeset: changeset, invite_token: invite_token)
|
||||
|
5
lib/cannery_web/controllers/user_registration_html.ex
Normal file
5
lib/cannery_web/controllers/user_registration_html.ex
Normal file
@ -0,0 +1,5 @@
|
||||
defmodule CanneryWeb.UserRegistrationHTML do
|
||||
use CanneryWeb, :html
|
||||
|
||||
embed_templates "user_registration_html/*"
|
||||
end
|
@ -6,7 +6,7 @@
|
||||
<.form
|
||||
:let={f}
|
||||
for={@changeset}
|
||||
action={Routes.user_registration_path(@conn, :create)}
|
||||
action={~p"/users/register"}
|
||||
class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
|
||||
>
|
||||
<p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
|
||||
@ -40,10 +40,10 @@
|
||||
<hr class="hr" />
|
||||
|
||||
<div class="flex flex-row justify-center items-center space-x-4">
|
||||
<.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
|
||||
<.link href={~p"/users/log_in"} class="btn btn-primary">
|
||||
<%= dgettext("actions", "Log in") %>
|
||||
</.link>
|
||||
<.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
|
||||
<.link href={~p"/users/reset_password"} class="btn btn-primary">
|
||||
<%= dgettext("actions", "Forgot your password?") %>
|
||||
</.link>
|
||||
</div>
|
@ -6,14 +6,14 @@ defmodule CanneryWeb.UserResetPasswordController do
|
||||
plug :get_user_by_reset_password_token when action in [:edit, :update]
|
||||
|
||||
def new(conn, _params) do
|
||||
render(conn, "new.html", page_title: gettext("Forgot your password?"))
|
||||
render(conn, :new, page_title: gettext("Forgot your password?"))
|
||||
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)
|
||||
fn token -> url(CanneryWeb.Endpoint, ~p"/users/reset_password/#{token}") end
|
||||
)
|
||||
end
|
||||
|
||||
@ -23,15 +23,14 @@ defmodule CanneryWeb.UserResetPasswordController do
|
||||
:info,
|
||||
dgettext(
|
||||
"prompts",
|
||||
"If your email is in our system, you will receive instructions to " <>
|
||||
"reset your password shortly."
|
||||
"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",
|
||||
render(conn, :edit,
|
||||
changeset: Accounts.change_user_password(conn.assigns.user),
|
||||
page_title: gettext("Reset your password")
|
||||
)
|
||||
@ -44,10 +43,10 @@ defmodule CanneryWeb.UserResetPasswordController do
|
||||
{:ok, _} ->
|
||||
conn
|
||||
|> put_flash(:info, dgettext("prompts", "Password reset successfully."))
|
||||
|> redirect(to: Routes.user_session_path(conn, :new))
|
||||
|> redirect(to: ~p"/users/log_in")
|
||||
|
||||
{:error, changeset} ->
|
||||
render(conn, "edit.html", changeset: changeset)
|
||||
render(conn, :edit, changeset: changeset)
|
||||
end
|
||||
end
|
||||
|
||||
@ -62,7 +61,7 @@ defmodule CanneryWeb.UserResetPasswordController do
|
||||
:error,
|
||||
dgettext("errors", "Reset password link is invalid or it has expired.")
|
||||
)
|
||||
|> redirect(to: "/")
|
||||
|> redirect(to: ~p"/")
|
||||
|> halt()
|
||||
end
|
||||
end
|
||||
|
6
6