update to phoenix 1.6

This commit is contained in:
2022-01-21 20:36:25 -05:00
parent f9e66d1336
commit 094e214a55
39 changed files with 621 additions and 340 deletions

View File

@ -3,6 +3,7 @@ defmodule CanneryWeb.UserAuth do
import Phoenix.Controller
alias Cannery.Accounts
alias CanneryWeb.{HomeLive}
alias CanneryWeb.Router.Helpers, as: Routes
# Make the remember me cookie valid for 60 days.
@ -138,7 +139,7 @@ defmodule CanneryWeb.UserAuth do
|> halt()
end
end
@doc """
Used for routes that require the user to be an admin.
"""
@ -149,7 +150,7 @@ defmodule CanneryWeb.UserAuth do
conn
|> put_flash(:error, "You are not authorized to view this page.")
|> maybe_store_return_to()
|> redirect(to: Routes.home_path(conn, :index))
|> redirect(to: Routes.live_path(conn, HomeLive))
|> halt()
end
end

View File

@ -3,7 +3,7 @@ defmodule CanneryWeb.UserRegistrationController do
alias Cannery.{Accounts, Invites}
alias Cannery.Accounts.User
alias CanneryWeb.UserAuth
alias CanneryWeb.{HomeLive, UserAuth}
def new(conn, %{"invite" => invite_token}) do
invite = Invites.get_invite_by_token(invite_token)
@ -13,7 +13,7 @@ defmodule CanneryWeb.UserRegistrationController do
else
conn
|> put_flash(:error, "Sorry, this invite was not found or expired")
|> redirect(to: Routes.home_path(CanneryWeb.Endpoint, :index))
|> redirect(to: Routes.live_path(CanneryWeb.Endpoint, HomeLive))
end
end
@ -23,7 +23,7 @@ defmodule CanneryWeb.UserRegistrationController do
else
conn
|> put_flash(:error, "Sorry, public registration is disabled")
|> redirect(to: Routes.home_path(CanneryWeb.Endpoint, :index))
|> redirect(to: Routes.live_path(CanneryWeb.Endpoint, HomeLive))
end
end
@ -41,7 +41,7 @@ defmodule CanneryWeb.UserRegistrationController do
else
conn
|> put_flash(:error, "Sorry, this invite was not found or expired")
|> redirect(to: Routes.home_path(CanneryWeb.Endpoint, :index))
|> redirect(to: Routes.live_path(CanneryWeb.Endpoint, HomeLive))
end
end
@ -51,7 +51,7 @@ defmodule CanneryWeb.UserRegistrationController do
else
conn
|> put_flash(:error, "Sorry, public registration is disabled")
|> redirect(to: Routes.home_path(CanneryWeb.Endpoint, :index))
|> redirect(to: Routes.live_path(CanneryWeb.Endpoint, HomeLive))
end
end

View File

@ -2,7 +2,7 @@ defmodule CanneryWeb.UserSettingsController do
use CanneryWeb, :controller
alias Cannery.Accounts
alias CanneryWeb.UserAuth
alias CanneryWeb.{HomeLive, UserAuth}
plug :assign_email_and_password_changesets
@ -70,7 +70,7 @@ defmodule CanneryWeb.UserSettingsController do
conn
|> put_flash(:error, "Your account has been deleted")
|> redirect(to: Routes.home_path(conn, :index))
|> redirect(to: Routes.live_path(conn, HomeLive))
else
conn
|> put_flash(:error, "Unable to delete user")