-
- <%= live_patch raw("×"), to: @return_to, class: "phx-modal-close" %>
- <%= live_component @socket, @component, @opts %>
+
+
+
+
+
+
+ <%= live_component @socket, @component, @opts %>
+
+
+
"""
@@ -23,4 +33,9 @@ defmodule Bones73kWeb.ModalComponent do
def handle_event("close", _, socket) do
{:noreply, push_patch(socket, to: socket.assigns.return_to)}
end
+
+ @impl true
+ def handle_event("hide", _, socket) do
+ {:noreply, push_event(socket, "modal-please-hide", %{})}
+ end
end
diff --git a/lib/bones73k_web/live/property_live/form_component.ex b/lib/bones73k_web/live/property_live/form_component.ex
index 00357b3c..ef5f9020 100644
--- a/lib/bones73k_web/live/property_live/form_component.ex
+++ b/lib/bones73k_web/live/property_live/form_component.ex
@@ -5,12 +5,10 @@ defmodule Bones73kWeb.PropertyLive.FormComponent do
@impl true
def update(%{property: property} = assigns, socket) do
- changeset = Properties.change_property(property)
-
- {:ok,
- socket
- |> assign(assigns)
- |> assign(:changeset, changeset)}
+ socket
+ |> assign(assigns)
+ |> assign(:changeset, Properties.change_property(property))
+ |> live_okreply()
end
@impl true
@@ -30,10 +28,10 @@ defmodule Bones73kWeb.PropertyLive.FormComponent do
defp save_property(socket, :edit, property_params) do
case Properties.update_property(socket.assigns.property, property_params) do
{:ok, _property} ->
- {:noreply,
- socket
- |> put_flash(:info, "Property updated successfully")
- |> push_redirect(to: socket.assigns.return_to)}
+ socket
+ |> put_flash(:info, "Property updated successfully")
+ |> push_event("modal-please-hide", %{})
+ |> live_noreply()
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, :changeset, changeset)}
@@ -46,10 +44,10 @@ defmodule Bones73kWeb.PropertyLive.FormComponent do
case Properties.create_property(property_params) do
{:ok, _property} ->
- {:noreply,
- socket
- |> put_flash(:info, "Property created successfully")
- |> push_redirect(to: socket.assigns.return_to)}
+ socket
+ |> put_flash(:info, "Property created successfully")
+ |> push_event("modal-please-hide", %{})
+ |> live_noreply()
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, changeset: changeset)}
diff --git a/lib/bones73k_web/live/property_live/form_component.html.leex b/lib/bones73k_web/live/property_live/form_component.html.leex
index 31841ec8..a25b1f82 100644
--- a/lib/bones73k_web/live/property_live/form_component.html.leex
+++ b/lib/bones73k_web/live/property_live/form_component.html.leex
@@ -1,22 +1,44 @@
-
<%= @title %>
+<%= form_for @changeset, "#", [
+ phx_target: @myself,
+ phx_change: "validate",
+ phx_submit: "save"
+ ], fn f -> %>
-<%= f = form_for @changeset, "#",
- id: "property-form",
- phx_target: @myself,
- phx_change: "validate",
- phx_submit: "save" %>
- <%= label f, :name %>
- <%= text_input f, :name %>
- <%= error_tag f, :name %>
+
+ <%= label f, :name, class: "form-label" %>
+
+ <%= text_input f, :name,
+ class: input_class(f, :name, "form-control"),
+ aria_describedby: error_id(f, :name)
+ %>
+ <%= error_tag f, :name %>
+
+
- <%= label f, :price %>
- <%= number_input f, :price, step: "any" %>
- <%= error_tag f, :price %>
+
+ <%= label f, :price, class: "form-label" %>
+
+ <%= number_input f, :price,
+ class: input_class(f, :price, "form-control"),
+ step: "any",
+ aria_describedby: error_id(f, :price)
+ %>
+ <%= error_tag f, :price %>
+
+
- <%= label f, :description %>
- <%= textarea f, :description %>
- <%= error_tag f, :description %>
+
+ <%= label f, :description, class: "form-label" %>
+
+ <%= textarea f, :description,
+ class: input_class(f, :description, "form-control"),
+ aria_describedby: error_id(f, :description)
+ %>
+ <%= error_tag f, :description %>
+
+
- <%= submit "Save", phx_disable_with: "Saving..." %>
-
+ <%= submit "Save", phx_disable_with: "Saving...", class: "btn btn-primary" %>
+
+<% end %>
diff --git a/lib/bones73k_web/live/user/registration.ex b/lib/bones73k_web/live/user/registration.ex
index 0ad56c70..977c47a0 100644
--- a/lib/bones73k_web/live/user/registration.ex
+++ b/lib/bones73k_web/live/user/registration.ex
@@ -30,7 +30,7 @@ defmodule Bones73kWeb.UserLive.Registration do
@impl true
def handle_event("validate", %{"user" => user_params}, socket) do
cs = Accounts.change_user_registration(%User{}, user_params)
- {:noreply, assign(socket, changeset: %{cs | action: :update})}
+ {:noreply, assign(socket, changeset: %{cs | action: :validate})}
end
@impl true
diff --git a/lib/bones73k_web/live/user/reset_password.ex b/lib/bones73k_web/live/user/reset_password.ex
index b7d751b4..05945461 100644
--- a/lib/bones73k_web/live/user/reset_password.ex
+++ b/lib/bones73k_web/live/user/reset_password.ex
@@ -19,7 +19,7 @@ defmodule Bones73kWeb.UserLive.ResetPassword do
@impl true
def handle_event("validate", %{"user" => user_params}, socket) do
cs = Accounts.change_user_password(socket.assigns.user, user_params)
- {:noreply, socket |> assign(changeset: %{cs | action: :update})}
+ {:noreply, socket |> assign(changeset: %{cs | action: :validate})}
end
def handle_event("save", %{"user" => user_params}, socket) do
@@ -34,7 +34,7 @@ defmodule Bones73kWeb.UserLive.ResetPassword do
{:noreply,
socket
|> put_flash(:error, "Please check the errors below.")
- |> assign(changeset: %{changeset | action: :update})}
+ |> assign(changeset: changeset)}
end
end
end
diff --git a/lib/bones73k_web/live/user/settings/email.ex b/lib/bones73k_web/live/user/settings/email.ex
index 341ed0ff..49915d6f 100644
--- a/lib/bones73k_web/live/user/settings/email.ex
+++ b/lib/bones73k_web/live/user/settings/email.ex
@@ -20,7 +20,7 @@ defmodule Bones73kWeb.UserLive.Settings.Email do
@impl true
def handle_event("validate", %{"user" => user_params}, socket) do
cs = get_changeset(socket.assigns.current_user, user_params)
- {:noreply, assign(socket, changeset: %{cs | action: :update})}
+ {:noreply, assign(socket, changeset: %{cs | action: :validate})}
end
# user_settings_path GET /users/settings/confirm_email/:token Bones73kWeb.UserSettingsController :confirm_email
diff --git a/lib/bones73k_web/live/user/settings/email.html.leex b/lib/bones73k_web/live/user/settings/email.html.leex
index ee5a5053..353b07d6 100644
--- a/lib/bones73k_web/live/user/settings/email.html.leex
+++ b/lib/bones73k_web/live/user/settings/email.html.leex
@@ -30,6 +30,7 @@
<%= icon_div @socket, "bi-lock", [class: "icon fs-5"] %>
<%= password_input f, :current_password,
+ value: input_value(f, :current_password),
class: "form-control",
required: true,
aria_describedby: error_id(f, :current_password)
diff --git a/lib/bones73k_web/live/user/settings/password.ex b/lib/bones73k_web/live/user/settings/password.ex
index 2225ff9f..4a670af5 100644
--- a/lib/bones73k_web/live/user/settings/password.ex
+++ b/lib/bones73k_web/live/user/settings/password.ex
@@ -30,7 +30,7 @@ defmodule Bones73kWeb.UserLive.Settings.Password do
@impl true
def handle_event("validate", %{"user" => user_params}, socket) do
cs = get_changeset(socket.assigns.current_user, user_params)
- {:noreply, assign(socket, changeset: %{cs | action: :update})}
+ {:noreply, assign(socket, changeset: %{cs | action: :validate})}
end
@impl true
diff --git a/lib/bones73k_web/live/user/settings/password.html.leex b/lib/bones73k_web/live/user/settings/password.html.leex
index 736b2615..7c7debc3 100644
--- a/lib/bones73k_web/live/user/settings/password.html.leex
+++ b/lib/bones73k_web/live/user/settings/password.html.leex
@@ -44,6 +44,7 @@
<%= icon_div @socket, "bi-lock", [class: "icon fs-5"] %>
<%= password_input f, :current_password,
+ value: input_value(f, :current_password),
class: "form-control",
required: true,
aria_describedby: error_id(f, :current_password)
diff --git a/lib/bones73k_web/templates/other/index.html.eex b/lib/bones73k_web/templates/other/index.html.eex
index b42a562d..531dfaf2 100644
--- a/lib/bones73k_web/templates/other/index.html.eex
+++ b/lib/bones73k_web/templates/other/index.html.eex
@@ -11,27 +11,31 @@
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptatibus dolore sunt quia aperiam sint id
- reprehenderit? Dolore incidunt alias inventore accusantium nulla optio, ducimus eius aliquam hic, pariatur
- voluptate distinctio.
+ Praesent velit justo, auctor ut nibh id, fermentum eleifend nunc. Cras sed purus dignissim, ornare elit et, ultrices elit. Sed quis neque consequat, laoreet ante a, hendrerit elit. Maecenas dapibus sed nulla vitae consectetur. Duis sollicitudin augue nisl, et rhoncus enim tempor at. Fusce scelerisque sollicitudin purus sit amet iaculis. Phasellus lacinia mi ut laoreet accumsan. Sed sagittis erat nec sem placerat, ut volutpat neque porttitor. Suspendisse tempor mauris vel mollis sagittis. In ut laoreet arcu. Duis sed felis in dui imperdiet luctus nec faucibus sem. Donec commodo urna ut enim fringilla, quis lacinia ligula malesuada. Quisque feugiat fermentum pretium. Integer sed porttitor lacus, sed bibendum diam. Aliquam dapibus neque et pharetra interdum.
-<%#