mirror of
https://github.com/ClaperCo/Claper.git
synced 2025-12-16 20:07:59 +01:00
Update push_redirect to push_navigate
This commit is contained in:
@@ -20,7 +20,7 @@ defmodule ClaperWeb.EmbedLive.FormComponent do
|
||||
embed = Embeds.get_embed!(id)
|
||||
{:ok, _} = Embeds.delete_embed(socket.assigns.event_uuid, embed)
|
||||
|
||||
{:noreply, socket |> push_redirect(to: socket.assigns.return_to)}
|
||||
{:noreply, socket |> push_navigate(to: socket.assigns.return_to)}
|
||||
end
|
||||
|
||||
@impl true
|
||||
@@ -47,7 +47,7 @@ defmodule ClaperWeb.EmbedLive.FormComponent do
|
||||
{:ok, _embed} ->
|
||||
{:noreply,
|
||||
socket
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, :changeset, changeset)}
|
||||
@@ -65,7 +65,7 @@ defmodule ClaperWeb.EmbedLive.FormComponent do
|
||||
{:noreply,
|
||||
socket
|
||||
|> maybe_change_current_embed(embed)
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, changeset: changeset)}
|
||||
|
||||
@@ -74,8 +74,7 @@ defmodule ClaperWeb.EventLive.EventCardComponent do
|
||||
<% end %>
|
||||
|
||||
<%= if !Event.finished?(@event) do %>
|
||||
<%= if @event.presentation_file.status != "progress" do %>
|
||||
<div class="mt-2 flex flex-col space-y-2 sm:space-y-0 justify-between sm:flex-row items-center">
|
||||
<div :if={@event.presentation_file.status == "done"} class="mt-2 flex flex-col space-y-2 sm:space-y-0 justify-between sm:flex-row items-center">
|
||||
<div
|
||||
id={"event-infos-#{@event.uuid}"}
|
||||
class="text-sm w-full sm:w-auto font-medium text-gray-700 flex justify-center space-x-1 sm:space-y-0 items-center relative"
|
||||
@@ -192,7 +191,6 @@ defmodule ClaperWeb.EventLive.EventCardComponent do
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div
|
||||
:if={@event.presentation_file.status == "fail" && is_nil(@event.presentation_file.hash)}
|
||||
|
||||
@@ -165,7 +165,10 @@ defmodule ClaperWeb.EventLive.EventFormComponent do
|
||||
:new,
|
||||
event_params
|
||||
) do
|
||||
create_event(socket, event_params)
|
||||
case uploaded_entries(socket, :presentation_file) do
|
||||
{[_ | _], []} -> save_file(socket, event_params, &create_event/4)
|
||||
_ -> create_event(socket, event_params)
|
||||
end
|
||||
end
|
||||
|
||||
defp create_event(socket, event_params) do
|
||||
@@ -192,7 +195,7 @@ defmodule ClaperWeb.EventLive.EventFormComponent do
|
||||
{:noreply,
|
||||
socket
|
||||
|> put_flash(:info, gettext("Created successfully"))
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, changeset: changeset)}
|
||||
@@ -228,7 +231,7 @@ defmodule ClaperWeb.EventLive.EventFormComponent do
|
||||
{:noreply,
|
||||
socket
|
||||
|> put_flash(:info, gettext("Created successfully"))
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, changeset: changeset)}
|
||||
@@ -248,7 +251,7 @@ defmodule ClaperWeb.EventLive.EventFormComponent do
|
||||
{:noreply,
|
||||
socket
|
||||
|> put_flash(:info, gettext("Updated successfully"))
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, :changeset, changeset)}
|
||||
|
||||
@@ -71,7 +71,7 @@ defmodule ClaperWeb.EventLive.Index do
|
||||
{:noreply,
|
||||
socket
|
||||
|> put_flash(:info, gettext("Quick event created successfully"))
|
||||
|> push_redirect(to: ~p"/events")}
|
||||
|> push_navigate(to: ~p"/events")}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, quick_event_changeset: changeset)}
|
||||
|
||||
@@ -28,7 +28,7 @@ defmodule ClaperWeb.EventLive.Join do
|
||||
|
||||
@impl true
|
||||
def handle_event("join", %{"event" => %{"code" => code}}, socket) do
|
||||
{:noreply, socket |> push_redirect(to: ~p"/e/#{String.downcase(code)}")}
|
||||
{:noreply, socket |> push_navigate(to: ~p"/e/#{String.downcase(code)}")}
|
||||
end
|
||||
|
||||
defp apply_action(socket, :join, _params) do
|
||||
|
||||
@@ -642,7 +642,7 @@ defmodule ClaperWeb.EventLive.Manage do
|
||||
if socket.assigns.create != nil do
|
||||
{:noreply,
|
||||
socket
|
||||
|> push_redirect(to: ~p"/e/#{socket.assigns.event.code}/manage")}
|
||||
|> push_navigate(to: ~p"/e/#{socket.assigns.event.code}/manage")}
|
||||
else
|
||||
{:noreply, socket}
|
||||
end
|
||||
|
||||
@@ -191,7 +191,7 @@ defmodule ClaperWeb.EventLive.Show do
|
||||
{:noreply,
|
||||
socket
|
||||
|> put_flash(:error, gettext("This event has been terminated"))
|
||||
|> push_redirect(to: ~p"/")}
|
||||
|> push_navigate(to: ~p"/")}
|
||||
end
|
||||
|
||||
@impl true
|
||||
@@ -204,7 +204,7 @@ defmodule ClaperWeb.EventLive.Show do
|
||||
{:noreply,
|
||||
socket
|
||||
|> put_flash(:error, gettext("You have been banned from this event"))
|
||||
|> push_redirect(to: ~p"/")}
|
||||
|> push_navigate(to: ~p"/")}
|
||||
else
|
||||
{:noreply, socket}
|
||||
end
|
||||
@@ -219,7 +219,7 @@ defmodule ClaperWeb.EventLive.Show do
|
||||
{:noreply,
|
||||
socket
|
||||
|> put_flash(:error, gettext("You have been banned from this event"))
|
||||
|> push_redirect(to: ~p"/")}
|
||||
|> push_navigate(to: ~p"/")}
|
||||
else
|
||||
{:noreply, socket}
|
||||
end
|
||||
|
||||
@@ -20,7 +20,7 @@ defmodule ClaperWeb.FormLive.FormComponent do
|
||||
form = Forms.get_form!(id)
|
||||
{:ok, _} = Forms.delete_form(socket.assigns.event_uuid, form)
|
||||
|
||||
{:noreply, socket |> push_redirect(to: socket.assigns.return_to)}
|
||||
{:noreply, socket |> push_navigate(to: socket.assigns.return_to)}
|
||||
end
|
||||
|
||||
@impl true
|
||||
@@ -65,7 +65,7 @@ defmodule ClaperWeb.FormLive.FormComponent do
|
||||
{:ok, _form} ->
|
||||
{:noreply,
|
||||
socket
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, :changeset, changeset)}
|
||||
@@ -83,7 +83,7 @@ defmodule ClaperWeb.FormLive.FormComponent do
|
||||
{:noreply,
|
||||
socket
|
||||
|> maybe_change_current_form(form)
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, changeset: changeset)}
|
||||
|
||||
@@ -20,7 +20,7 @@ defmodule ClaperWeb.PollLive.FormComponent do
|
||||
poll = Polls.get_poll!(id)
|
||||
{:ok, _} = Polls.delete_poll(socket.assigns.event_uuid, poll)
|
||||
|
||||
{:noreply, socket |> push_redirect(to: socket.assigns.return_to)}
|
||||
{:noreply, socket |> push_navigate(to: socket.assigns.return_to)}
|
||||
end
|
||||
|
||||
@impl true
|
||||
@@ -65,7 +65,7 @@ defmodule ClaperWeb.PollLive.FormComponent do
|
||||
{:ok, _poll} ->
|
||||
{:noreply,
|
||||
socket
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, :changeset, changeset)}
|
||||
@@ -83,7 +83,7 @@ defmodule ClaperWeb.PollLive.FormComponent do
|
||||
{:noreply,
|
||||
socket
|
||||
|> maybe_change_current_poll(poll)
|
||||
|> push_redirect(to: socket.assigns.return_to)}
|
||||
|> push_navigate(to: socket.assigns.return_to)}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
{:noreply, assign(socket, changeset: changeset)}
|
||||
|
||||
@@ -68,7 +68,7 @@ defmodule ClaperWeb.UserSettingsLive.Show do
|
||||
:info,
|
||||
gettext("A link to confirm your email change has been sent to the new address.")
|
||||
)
|
||||
|> push_redirect(to: ~p"/users/settings")}
|
||||
|> push_navigate(to: ~p"/users/settings")}
|
||||
|
||||
{:error, changeset} ->
|
||||
{:noreply, assign(socket, :email_changeset, changeset)}
|
||||
@@ -90,7 +90,7 @@ defmodule ClaperWeb.UserSettingsLive.Show do
|
||||
:info,
|
||||
gettext("Your password has been updated.")
|
||||
)
|
||||
|> push_redirect(to: ~p"/users/settings")}
|
||||
|> push_navigate(to: ~p"/users/settings")}
|
||||
|
||||
{:error, changeset} ->
|
||||
{:noreply, assign(socket, :password_changeset, changeset)}
|
||||
|
||||
Reference in New Issue
Block a user