#{gettext("This code will be used by your attendees to access the event. You have the option to create a custom code.")}"}
+ data-tg-group="create-event"
+ data-tg-order="2"
+ >
+
#{gettext("If you require assistance in managing your event, you can grant access to others. Simply enter their email addresses; once they register an account with these emails, they will be able to manage the event.")}
#{gettext("Note: Facilitators do not have the ability to delete your event.")}
"}
+ data-tg-group="create-event"
+ data-tg-order="4"
+ >
<%= gettext("Facilitators can present and manage interactions") %>
@@ -278,7 +307,7 @@
type="button"
phx-click="add-leader"
phx-target={@myself}
- class="rounded-md bg-primary-500 hover:bg-primary-600 transition flex items-center mt-3 md:w-max text-white py-7 px-3 text-sm max-h-0"
+ class="rounded-md bg-primary-500 hover:bg-primary-600 transition flex items-center mt-3 md:w-max text-white py-5 px-3 text-sm max-h-0"
>
-
<%= gettext("Add facilitator") %>
+
<%= gettext("Add facilitator") %>
diff --git a/lib/claper_web/live/event_live/index.ex b/lib/claper_web/live/event_live/index.ex
index 4685058..18f1961 100644
--- a/lib/claper_web/live/event_live/index.ex
+++ b/lib/claper_web/live/event_live/index.ex
@@ -12,16 +12,24 @@ defmodule ClaperWeb.EventLive.Index do
Gettext.put_locale(ClaperWeb.Gettext, locale)
end
+ changeset =
+ Events.change_event(%Event{}, %{
+ started_at: NaiveDateTime.utc_now(),
+ code: Enum.random(1000..9999),
+ leaders: []
+ })
+
if connected?(socket) do
Phoenix.PubSub.subscribe(Claper.PubSub, "events:#{socket.assigns.current_user.id}")
end
socket =
socket
- |> assign(:events, list_events(socket))
+ |> stream(:events, list_events(socket))
|> assign(:managed_events, list_managed_events(socket))
+ |> assign(:quick_event_changeset, changeset)
- {:ok, socket, temporary_assigns: [events: []]}
+ {:ok, socket}
end
@impl true
@@ -33,37 +41,104 @@ defmodule ClaperWeb.EventLive.Index do
def handle_info({:presentation_file_process_done, presentation}, socket) do
event = Claper.Events.get_event!(presentation.event.uuid, [:presentation_file])
- {:noreply,
- socket |> update(:events, fn events -> [event | events] end) |> put_flash(:info, nil)}
+ {:noreply, socket |> stream_insert(:events, event) |> put_flash(:info, nil)}
end
@impl true
- def handle_event("delete", %{"id" => id}, socket) do
- event = Events.get_event!(id, [:presentation_file])
+ def handle_event("validate", %{"event" => event_params}, socket) do
+ changeset =
+ %Event{}
+ |> Claper.Events.change_event(event_params)
+ |> Map.put(:action, :validate)
+
+ {:noreply, socket |> assign(:quick_event_changeset, changeset)}
+ end
+
+ @impl true
+ def handle_event("save", %{"event" => event_params}, socket) do
+ case Claper.Events.create_event(
+ event_params
+ |> Map.put("user_id", socket.assigns.current_user.id)
+ |> Map.put("presentation_file", %{
+ "status" => "done",
+ "length" => 0,
+ "presentation_state" => %{}
+ })
+ |> Map.put("started_at", NaiveDateTime.utc_now())
+ |> Map.put("code", "#{Enum.random(1000..9999)}")
+ ) do
+ {:ok, _event} ->
+ {:noreply,
+ socket
+ |> put_flash(:info, gettext("Quick event created successfully"))
+ |> push_redirect(to: ~p"/events")}
+
+ {:error, %Ecto.Changeset{} = changeset} ->
+ {:noreply, assign(socket, quick_event_changeset: changeset)}
+ end
+ end
+
+ @impl true
+ def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
+ event = Events.get_user_event!(current_user.id, id, [:presentation_file])
{:ok, _} = Events.delete_event(event)
Task.Supervisor.async_nolink(Claper.TaskSupervisor, fn ->
Claper.Tasks.Converter.clear(event.presentation_file.hash)
end)
- {:noreply, redirect(socket, to: Routes.event_index_path(socket, :index))}
+ {:noreply, redirect(socket, to: ~p"/events")}
+ end
+
+ @impl true
+ def handle_event(
+ "checked",
+ %{"key" => "no_file", "value" => value},
+ %{assigns: %{event: event}} = socket
+ ) do
+ {:noreply, socket |> assign(:event, %{event | no_file: value})}
+ end
+
+ @impl true
+ def handle_event("terminate", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
+ event = Events.get_user_event!(current_user.id, id)
+ {:ok, _} = Events.terminate_event(event)
+ {:noreply, redirect(socket, to: ~p"/events")}
+ end
+
+ @impl true
+ def handle_event(
+ "toggle-quick-create",
+ _params,
+ %{assigns: %{:live_action => :quick_create}} = socket
+ ) do
+ {:noreply, assign(socket, :live_action, :index)}
+ end
+
+ @impl true
+ def handle_event("toggle-quick-create", _params, %{assigns: %{:live_action => :index}} = socket) do
+ {:noreply, assign(socket, :live_action, :quick_create)}
end
defp apply_action(socket, :edit, %{"id" => id}) do
event =
Events.get_user_event!(socket.assigns.current_user.id, id, [:presentation_file, :leaders])
- if event.presentation_file.status == "fail" && event.presentation_file.hash do
- Claper.Presentations.update_presentation_file(event.presentation_file, %{
- "status" => "done"
- })
+ if event.expired_at && NaiveDateTime.compare(NaiveDateTime.utc_now(), event.expired_at) == :gt do
+ redirect(socket, to: ~p"/events")
+ else
+ if event.presentation_file.status == "fail" && event.presentation_file.hash do
+ Claper.Presentations.update_presentation_file(event.presentation_file, %{
+ "status" => "done"
+ })
+ end
+
+ {:ok, socket |> assign(:event, event)}
+
+ socket
+ |> assign(:page_title, gettext("Edit"))
+ |> assign(:event, event)
end
-
- {:ok, socket |> assign(:event, event)}
-
- socket
- |> assign(:page_title, gettext("Edit"))
- |> assign(:event, event)
end
defp apply_action(socket, :new, _params) do
@@ -71,7 +146,6 @@ defmodule ClaperWeb.EventLive.Index do
|> assign(:page_title, gettext("Create"))
|> assign(:event, %Event{
started_at: NaiveDateTime.utc_now(),
- expired_at: NaiveDateTime.utc_now() |> NaiveDateTime.add(3600 * 2, :second),
code: Enum.random(1000..9999),
leaders: []
})
diff --git a/lib/claper_web/live/event_live/index.html.heex b/lib/claper_web/live/event_live/index.html.heex
index 9a643ea..1f7d1d7 100644
--- a/lib/claper_web/live/event_live/index.html.heex
+++ b/lib/claper_web/live/event_live/index.html.heex
@@ -1,4 +1,4 @@
-
+
<%= if @live_action in [:new, :edit] do %>
<.live_component
module={ClaperWeb.EventLive.EventFormComponent}
@@ -6,21 +6,117 @@
event={@event}
page_title={@page_title}
action={@live_action}
- return_to={Routes.event_index_path(@socket, :index)}
+ return_to={~p"/events"}
current_user={@current_user}
/>
<% else %>
-
+
+
-
@@ -64,24 +69,7 @@
- <%= if @last_event do %>
- <%= live_patch to: Routes.event_show_path(@socket, :show, @last_event.code) do %>
-
-
-
- <%= gettext("Return to your last presentation") %> (#<%= @last_event.code %> )
-
-
-
- →
-
-
-
-
- <% end %>
- <% end %>
-
- <%= form_for :event, Routes.event_join_path(@socket, :join), ["phx-submit": "join", "phx-hook": "JoinEvent", id: "form"], fn f -> %>
+ <%= form_for :event, ~p"/join", ["phx-submit": "join", "phx-hook": "JoinEvent", id: "form"], fn f -> %>
<%= text_input(f, :code,
required: true,
@@ -107,6 +95,23 @@
+
+ <%= if @last_event do %>
+ <.link href={~p"/e/#{@last_event.code}"}>
+
+
+
+ <%= gettext("Return to your last event") %> (<%= @last_event.name %>)
+
+
+
+ →
+
+
+
+
+
+ <% end %>
<% end %>
diff --git a/lib/claper_web/live/event_live/manage.ex b/lib/claper_web/live/event_live/manage.ex
index 9442c6d..5c55b5b 100644
--- a/lib/claper_web/live/event_live/manage.ex
+++ b/lib/claper_web/live/event_live/manage.ex
@@ -26,7 +26,6 @@ defmodule ClaperWeb.EventLive.Manage do
else
if connected?(socket) do
Claper.Events.Event.subscribe(event.uuid)
- # Claper.Presentations.subscribe(event.presentation_file.id)
Presence.track(
self(),
@@ -41,9 +40,14 @@ defmodule ClaperWeb.EventLive.Manage do
|> assign(:attendees_nb, 1)
|> assign(:event, event)
|> assign(:state, event.presentation_file.presentation_state)
- |> assign(:pinned_posts, list_pinned_posts(socket, event.uuid))
- |> assign(:all_posts, list_all_posts(socket, event.uuid))
+ |> stream(:pinned_posts, list_pinned_posts(socket, event.uuid))
+ |> stream(:posts, list_all_posts(socket, event.uuid))
|> assign(:pinned_post_count, length(list_pinned_posts(socket, event.uuid)))
+ |> assign(:post_count, length(list_all_posts(socket, event.uuid)))
+ |> assign(
+ :form_submit_count,
+ length(list_form_submits(socket, event.presentation_file.id))
+ )
|> assign(:polls, list_polls(socket, event.presentation_file.id))
|> assign(:forms, list_forms(socket, event.presentation_file.id))
|> assign(:embeds, list_embeds(socket, event.presentation_file.id))
@@ -58,7 +62,7 @@ defmodule ClaperWeb.EventLive.Manage do
|> form_at_position(false)
|> embed_at_position(false)
- {:ok, socket, temporary_assigns: [all_posts: [], pinned_posts: [], form_submits: []]}
+ {:ok, socket}
end
end
@@ -78,7 +82,8 @@ defmodule ClaperWeb.EventLive.Manage do
def handle_info({:post_created, post}, socket) do
{:noreply,
socket
- |> assign(:all_posts, [post | socket.assigns.all_posts])
+ |> stream_insert(:posts, post)
+ |> update(:post_count, fn post_count -> post_count + 1 end)
|> push_event("scroll", %{})}
end
@@ -86,27 +91,28 @@ defmodule ClaperWeb.EventLive.Manage do
def handle_info({:post_updated, updated_post}, socket) do
{:noreply,
socket
- |> update(:all_posts, fn posts -> [updated_post | posts] end)
- |> update(:pinned_posts, fn posts -> [updated_post | posts] end)}
+ |> stream_insert(:posts, updated_post)
+ |> stream_insert(:pinned_posts, updated_post)}
end
@impl true
def handle_info({:post_deleted, deleted_post}, socket) do
{:noreply,
socket
- |> update(:all_posts, fn posts -> [deleted_post | posts] end)
- |> update(:pinned_posts, fn posts -> [deleted_post | posts] end)
+ |> stream_delete(:posts, deleted_post)
+ |> stream_delete(:pinned_posts, deleted_post)
|> update(:pinned_post_count, fn pinned_post_count ->
pinned_post_count - if deleted_post.pinned, do: 1, else: 0
- end)}
+ end)
+ |> update(:post_count, fn post_count -> post_count - 1 end)}
end
@impl true
def handle_info({:post_pinned, post}, socket) do
updated_socket =
socket
- |> update(:all_posts, fn all_posts -> [post | all_posts] end)
- |> update(:pinned_posts, fn pinned_posts -> [post | pinned_posts] end)
+ |> stream_insert(:posts, post)
+ |> stream_insert(:pinned_posts, post)
|> assign(:pinned_post_count, socket.assigns.pinned_post_count + 1)
{:noreply, updated_socket}
@@ -116,8 +122,8 @@ defmodule ClaperWeb.EventLive.Manage do
def handle_info({:post_unpinned, post}, socket) do
updated_socket =
socket
- |> update(:all_posts, fn all_posts -> [post | all_posts] end)
- |> update(:pinned_posts, fn pinned_posts -> [post | pinned_posts] end)
+ |> stream_insert(:posts, post)
+ |> stream_delete(:pinned_posts, post)
|> assign(:pinned_post_count, socket.assigns.pinned_post_count - 1)
{:noreply, updated_socket}
@@ -127,18 +133,22 @@ defmodule ClaperWeb.EventLive.Manage do
def handle_info({:form_submit_created, fs}, socket) do
{:noreply,
socket
- |> update(:form_submits, fn form_submits -> [fs | form_submits] end)
+ |> stream_insert(:form_submits, fs)
+ |> update(:form_submit_count, fn form_submit_count -> form_submit_count + 1 end)
|> push_event("scroll", %{})}
end
@impl true
def handle_info({:form_submit_updated, fs}, socket) do
- {:noreply, socket |> update(:form_submits, fn form_submits -> [fs | form_submits] end)}
+ {:noreply, socket |> stream_insert(:form_submits, fs)}
end
@impl true
def handle_info({:form_submit_deleted, fs}, socket) do
- {:noreply, socket |> update(:form_submits, fn form_submits -> [fs | form_submits] end)}
+ {:noreply,
+ socket
+ |> stream_delete(:form_submits, fs)
+ |> update(:form_submit_count, fn form_submit_count -> form_submit_count - 1 end)}
end
@impl true
@@ -218,14 +228,14 @@ defmodule ClaperWeb.EventLive.Manage do
{:noreply,
socket
|> put_flash(:info, gettext("Interactions imported successfully"))
- |> redirect(to: Routes.event_manage_path(socket, :show, current_event.code))}
+ |> redirect(to: ~p"/e/#{current_event.code}/manage")}
end
rescue
Ecto.NoResultsError ->
{:noreply,
socket
|> put_flash(:error, gettext("Interactions import failed"))
- |> redirect(to: Routes.event_manage_path(socket, :show, current_event.code))}
+ |> redirect(to: ~p"/e/#{current_event.code}/manage")}
end
end
@@ -496,6 +506,40 @@ defmodule ClaperWeb.EventLive.Manage do
{:noreply, socket |> assign(:state, new_state)}
end
+ @impl true
+ def handle_event(
+ "checked",
+ %{"key" => "message_reaction_enabled", "value" => value},
+ %{assigns: %{state: state}} = socket
+ ) do
+ {:ok, new_state} =
+ Claper.Presentations.update_presentation_state(
+ state,
+ %{
+ :message_reaction_enabled => value
+ }
+ )
+
+ {:noreply, socket |> assign(:state, new_state)}
+ end
+
+ @impl true
+ def handle_event(
+ "checked",
+ %{"key" => "show_poll_results_enabled", "value" => value},
+ %{assigns: %{state: state}} = socket
+ ) do
+ {:ok, new_state} =
+ Claper.Presentations.update_presentation_state(
+ state,
+ %{
+ :show_poll_results_enabled => value
+ }
+ )
+
+ {:noreply, socket |> assign(:state, new_state)}
+ end
+
@impl true
def handle_event(
"checked",
@@ -537,10 +581,13 @@ defmodule ClaperWeb.EventLive.Manage do
updated_socket =
if post.pinned do
- assign(socket, :pinned_posts, list_pinned_posts(socket, socket.assigns.event.uuid))
- assign(socket, :all_posts, list_all_posts(socket, socket.assigns.event.uuid))
+ stream(socket, :pinned_posts, list_pinned_posts(socket, socket.assigns.event.uuid),
+ reset: true
+ )
+
+ stream(socket, :posts, list_all_posts(socket, socket.assigns.event.uuid), reset: true)
else
- assign(socket, :all_posts, list_all_posts(socket, socket.assigns.event.uuid))
+ stream(socket, :posts, list_all_posts(socket, socket.assigns.event.uuid), reset: true)
end
{:noreply, updated_socket}
@@ -567,19 +614,24 @@ defmodule ClaperWeb.EventLive.Manage do
case tab do
"posts" ->
socket
- |> assign(:pinned_posts, list_pinned_posts(socket, socket.assigns.event.uuid))
- |> assign(:all_posts, list_all_posts(socket, socket.assigns.event.uuid))
+ |> stream(:pinned_posts, list_pinned_posts(socket, socket.assigns.event.uuid),
+ reset: true
+ )
+ |> stream(:posts, list_all_posts(socket, socket.assigns.event.uuid), reset: true)
"forms" ->
- assign(
+ stream(
socket,
:form_submits,
- list_form_submits(socket, socket.assigns.event.presentation_file.id)
+ list_form_submits(socket, socket.assigns.event.presentation_file.id),
+ reset: true
)
"pinned_posts" ->
socket
- |> assign(:pinned_posts, list_pinned_posts(socket, socket.assigns.event.uuid))
+ |> stream(:pinned_posts, list_pinned_posts(socket, socket.assigns.event.uuid),
+ reset: true
+ )
end
{:noreply, socket}
@@ -590,7 +642,7 @@ defmodule ClaperWeb.EventLive.Manage do
if socket.assigns.create != nil do
{:noreply,
socket
- |> push_redirect(to: Routes.event_manage_path(socket, :show, socket.assigns.event.code))}
+ |> push_redirect(to: ~p"/e/#{socket.assigns.event.code}/manage")}
else
{:noreply, socket}
end
@@ -788,6 +840,6 @@ defmodule ClaperWeb.EventLive.Manage do
end
defp list_form_submits(_socket, presentation_file_id) do
- Claper.Forms.list_form_submits(presentation_file_id)
+ Claper.Forms.list_form_submits(presentation_file_id, [:form])
end
end
diff --git a/lib/claper_web/live/event_live/manage.html.heex b/lib/claper_web/live/event_live/manage.html.heex
index ebd4612..310d41f 100644
--- a/lib/claper_web/live/event_live/manage.html.heex
+++ b/lib/claper_web/live/event_live/manage.html.heex
@@ -1,121 +1,11 @@
-
-
-
-
-
-
-
-
- <%= @event.name %>
-
-
-
-
-
-
- <%= @event.code %>
-
-
-
-
- <%= @attendees_nb %>
-
-
-
-
- <%= gettext("Finish on") %>
-
-
-
-
-
-
- <%= raw(
- gettext("Press F in the presentation window to enable fullscreen")
- ) %>
-
-
-
-
- <%= gettext("Start") %>
-
-
-
-
-
@@ -225,7 +115,7 @@
@@ -254,12 +144,12 @@
- <%= if (length @polls)==0 && (length @forms)==0 do %>
+ <%= if (length @polls)==0 && (length @forms)==0 && @event.presentation_file.length > 0 do %>
<% end %>
@@ -322,7 +212,7 @@
form={@form}
live_action={@create_action}
position={@state.position}
- return_to={Routes.event_manage_path(@socket, :show, @event.code)}
+ return_to={~p"/e/#{@event.code}/manage"}
/>
-
-
-
- <%= for index <- 0..@event.presentation_file.length-1 do %>
- <%= if @state.position==index && @state.position> 0 do %>
-
-
-
-
- <% end %>
-
-
-
- <%= if Application.get_env(:claper, :presentations) |> Keyword.get(:storage) == "local" do %>
-
-
-
- <%= for poll <- Enum.filter(@polls, fn poll -> poll.position == index end) do %>
-
-
-
-
-
- <%= gettext "Poll" %>
- : <%= poll.title %>
-
- <%= if @state.position==index do %>
- <%= if poll.enabled do %>
-
-
-
- <%= gettext("Active") %>
-
- <% else %>
-
- <%= gettext("Set active") %>
-
- <% end %>
-
-
-
-
- <% end %>
-
-
-
- <% end %>
- <%= for form <- Enum.filter(@forms, fn form -> form.position == index end) do %>
-
-
-
-
-
- <%= gettext "Form" %>
- : <%= form.title %>
-
- <%= if @state.position==index do %>
- <%= if form.enabled do %>
-
-
-
- <%= gettext("Active") %>
-
- <% else %>
-
- <%= gettext("Set active") %>
-
- <% end %>
-
-
-
-
- <% end %>
-
-
-
- <% end %>
- <%= for embed<- Enum.filter(@embeds, fn embed -> embed.position == index end) do %>
-
-
-
-
- <%= gettext "Web content" %> : <%= embed.title %>
-
- <%= if @state.position == index do %>
- <%= if embed.enabled do %>
-
-
-
- <%= gettext("Active") %>
-
- <% else %>
-
- <%= gettext("Set active") %>
-
- <% end %>
-
-
-
-
- <% end %>
-
-
-
- <% end %>
-
-
- <%= if @state.position==index do %>
-
- <%= gettext("Add interaction") %>
-
- <% end %>
-
-
- <%= if @state.position==index && @state.position < @event.presentation_file.length - 1 do %>
-
-
-
-
- <% end %>
- <% end %>
-
-
-
-
- <%= if NaiveDateTime.compare(@current_time, @event.started_at) == :gt and NaiveDateTime.compare(@current_time, @event.expired_at) == :lt do %>
- 
- 
- 
- 
- 
![]({"/uploads/#{@event.presentation_file.hash}/#{index}.jpg"})
- <% else %>
- 
diff --git a/lib/claper_web/live/live_helpers.ex b/lib/claper_web/live/live_helpers.ex
index 7124ae5..9057a38 100644
--- a/lib/claper_web/live/live_helpers.ex
+++ b/lib/claper_web/live/live_helpers.ex
@@ -1,23 +1,2 @@
defmodule ClaperWeb.LiveHelpers do
- import Phoenix.LiveView.Helpers
-
- @doc """
- Renders a component inside the `ClaperWeb.ModalComponent` component.
-
- The rendered modal receives a `:return_to` option to properly update
- the URL when the modal is closed.
-
- ## Examples
-
- <%= live_modal ClaperWeb.PostLive.FormComponent,
- id: @post.id || :new,
- action: @live_action,
- post: @post,
- return_to: Routes.post_index_path(@socket, :index) %>
- """
- def live_modal(component, opts) do
- path = Keyword.fetch!(opts, :return_to)
- modal_opts = [id: :modal, return_to: path, component: component, opts: opts]
- live_component(ClaperWeb.ModalComponent, modal_opts)
- end
end
diff --git a/lib/claper_web/live/stat_live/index.html.heex b/lib/claper_web/live/stat_live/index.html.heex
index f801025..77eafb8 100644
--- a/lib/claper_web/live/stat_live/index.html.heex
+++ b/lib/claper_web/live/stat_live/index.html.heex
@@ -1,4 +1,4 @@
-![]({"/uploads/#{@event.presentation_file.hash}/#{position+1}.jpg"})
- <% else %>
- ![]({"https://avatars.dicebear.com/api/identicon/#{fs.attendee_identifier}.svg"})
<% else %>
![]({"https://avatars.dicebear.com/api/identicon/#{fs.user_id}.svg"})
<% end %>
@@ -279,12 +281,12 @@
<%= if post.attendee_identifier do %>
![]({"https://avatars.dicebear.com/api/identicon/#{post.attendee_identifier}.svg"})
<% else %>
![]({"https://avatars.dicebear.com/api/identicon/#{post.user_id}.svg"})
<% end %>
diff --git a/lib/claper_web/live/user_live_auth.ex b/lib/claper_web/live/user_live_auth.ex
index 319ebaf..ccbe3bc 100644
--- a/lib/claper_web/live/user_live_auth.ex
+++ b/lib/claper_web/live/user_live_auth.ex
@@ -1,7 +1,10 @@
defmodule ClaperWeb.UserLiveAuth do
import Phoenix.LiveView
import Phoenix.Component
- alias ClaperWeb.Router.Helpers, as: Routes
+
+ use Phoenix.VerifiedRoutes,
+ endpoint: ClaperWeb.Endpoint,
+ router: ClaperWeb.Router
def on_mount(:default, _params, %{"current_user" => current_user} = _session, socket) do
socket =
@@ -19,11 +22,11 @@ defmodule ClaperWeb.UserLiveAuth do
# else
# {:halt,
# redirect(socket,
- # to: Routes.user_registration_path(socket, :confirm, %{email: current_user.email})
+ # to: ~p"/users/register/confirm?#{[%{email: current_user.email}]}"
# )}
# end
end
def on_mount(:default, _params, _session, socket),
- do: {:halt, redirect(socket, to: Routes.user_registration_path(socket, :confirm))}
+ do: {:halt, redirect(socket, to: ~p"/users/register/confirm")}
end
diff --git a/lib/claper_web/live/user_settings_live/show.ex b/lib/claper_web/live/user_settings_live/show.ex
index ea8799d..30ce9ed 100644
--- a/lib/claper_web/live/user_settings_live/show.ex
+++ b/lib/claper_web/live/user_settings_live/show.ex
@@ -59,7 +59,7 @@ defmodule ClaperWeb.UserSettingsLive.Show do
Accounts.deliver_update_email_instructions(
applied_user,
user.email,
- &Routes.user_settings_url(socket, :confirm_email, &1)
+ &url(~p"/users/settings/confirm_email/#{&1}")
)
{:noreply,
@@ -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: Routes.user_settings_show_path(socket, :show))}
+ |> push_redirect(to: ~p"/users/settings")}
{:error, changeset} ->
{:noreply, assign(socket, :email_changeset, changeset)}
@@ -90,13 +90,23 @@ defmodule ClaperWeb.UserSettingsLive.Show do
:info,
gettext("Your password has been updated.")
)
- |> push_redirect(to: Routes.user_settings_show_path(socket, :show))}
+ |> push_redirect(to: ~p"/users/settings")}
{:error, changeset} ->
{:noreply, assign(socket, :password_changeset, changeset)}
end
end
+ @impl true
+ def handle_event("delete_account", _params, %{assigns: %{current_user: user}} = socket) do
+ Accounts.delete(user)
+
+ {:noreply,
+ socket
+ |> put_flash(:info, gettext("Your account has been deleted."))
+ |> redirect(to: ~p"/users/log_in")}
+ end
+
@impl true
def handle_event("validate", _params, socket) do
{:noreply, socket}
diff --git a/lib/claper_web/live/user_settings_live/show.html.heex b/lib/claper_web/live/user_settings_live/show.html.heex
index 1453f02..8c8321d 100644
--- a/lib/claper_web/live/user_settings_live/show.html.heex
+++ b/lib/claper_web/live/user_settings_live/show.html.heex
@@ -1,4 +1,4 @@
-