diff --git a/lib/bones73k_web/live/user/registration.html.leex b/lib/bones73k_web/live/user/registration.html.leex index 22416c1..e70560b 100644 --- a/lib/bones73k_web/live/user/registration.html.leex +++ b/lib/bones73k_web/live/user/registration.html.leex @@ -1,5 +1,5 @@
-
+

<%= icon_div @socket, "bi-person-plus", [class: "icon baseline"] %> diff --git a/lib/bones73k_web/live/user/reset_password.html.leex b/lib/bones73k_web/live/user/reset_password.html.leex index 049d15a..2a9f963 100644 --- a/lib/bones73k_web/live/user/reset_password.html.leex +++ b/lib/bones73k_web/live/user/reset_password.html.leex @@ -1,5 +1,5 @@
-
+

<%= icon_div @socket, "bi-shield-lock", [class: "icon baseline"] %> diff --git a/lib/bones73k_web/live/user/settings.html.leex b/lib/bones73k_web/live/user/settings.html.leex index 31b344d..2450570 100644 --- a/lib/bones73k_web/live/user/settings.html.leex +++ b/lib/bones73k_web/live/user/settings.html.leex @@ -1,9 +1,15 @@ -

- <%= icon_div @socket, "bi-sliders", [class: "icon baseline"] %> - User Settings -

+
+
-
- <%= live_component @socket, Bones73kWeb.UserLive.Settings.Email, id: "email-#{@current_user.id}", current_user: @current_user %> - <%= live_component @socket, Bones73kWeb.UserLive.Settings.Password, id: "password-#{@current_user.id}", current_user: @current_user %> +

+ <%= icon_div @socket, "bi-sliders", [class: "icon baseline"] %> + User Settings +

+ +
+ <%= live_component @socket, Bones73kWeb.UserLive.Settings.Email, id: "email-#{@current_user.id}", current_user: @current_user %> + <%= live_component @socket, Bones73kWeb.UserLive.Settings.Password, id: "password-#{@current_user.id}", current_user: @current_user %> +
+ +
diff --git a/lib/bones73k_web/live/user/settings/email.html.leex b/lib/bones73k_web/live/user/settings/email.html.leex index a3e773a..477059c 100644 --- a/lib/bones73k_web/live/user/settings/email.html.leex +++ b/lib/bones73k_web/live/user/settings/email.html.leex @@ -1,4 +1,4 @@ -
+

Change email

diff --git a/lib/bones73k_web/live/user/settings/password.html.leex b/lib/bones73k_web/live/user/settings/password.html.leex index 9815074..cb9217b 100644 --- a/lib/bones73k_web/live/user/settings/password.html.leex +++ b/lib/bones73k_web/live/user/settings/password.html.leex @@ -1,4 +1,4 @@ -
+

Change password

diff --git a/lib/bones73k_web/live/user_management/index.html.leex b/lib/bones73k_web/live/user_management/index.html.leex index 31f390f..cb38f2d 100644 --- a/lib/bones73k_web/live/user_management/index.html.leex +++ b/lib/bones73k_web/live/user_management/index.html.leex @@ -22,20 +22,20 @@

<%# filtering and new item creation %> -
+
-
+
<%= live_patch to: Routes.user_management_index_path(@socket, :new, Enum.into(@query, [])), - class: "btn btn-primary mb-3 mb-sm-0" do %> + class: "btn btn-primary mb-3 mb-md-0" do %> <%= icon_div @socket, "bi-person-plus", [class: "icon baseline me-1"] %> New User <% end %>
-
+
<%= form_for :sort, "#", [phx_change: "sort-by-change"], fn srt -> %> <%= label srt, :sort_by, class: "visually-hidden" %> -
+
<%= icon_div @socket, "bi-arrow-down-up", [class: "icon is-left text-muted fs-5", style: "z-index:1001;"], [style: "padding: 1px;"] %> <%= Phoenix.HTML.Form.select srt, :sort_by, ["Email": "email", "Role": "role", "Created at": "inserted_at"], value: @query.sort_by, class: "form-select" %>
-
+
<%= form_for :filter, "#", [phx_change: "filter-change"], fn flt -> %> <%= label flt, :filter, class: "visually-hidden" %>
@@ -66,9 +66,9 @@
<%# mobile data cards %> -
- +
+
<%= if !@page do %>
@@ -77,24 +77,27 @@
<% else %> <%= for user <- @page.entries do %> +
-
Email
+
Email
<%= user.email %>
-
Role
+
Role
<%= user.role |> Atom.to_string() |> String.capitalize() %>
-
Created at
+
Created at
<%= dt_out(user.inserted_at) %>
-
- Confirmed? - <%= user.confirmed_at && "Yes" || "No" %> - > +
+ Confirmed?
+
+ <%= user.confirmed_at && "Yes" || "No" %> + > +
<%= if Roles.can?(@current_user, user, :edit) do %> - <%= live_patch to: Routes.user_management_index_path(@socket, :edit, user.id, Enum.into(@query, [])), class: "btn btn-outline-primary btn-sm text-nowrap" do %> + <%= live_patch to: Routes.user_management_index_path(@socket, :edit, user.id, Enum.into(@query, [])), class: "btn btn-primary btn-sm text-nowrap" do %> <%= icon_div @socket, "bi-pencil", [class: "icon baseline", style: "margin-right:0.125rem;"] %> Edit <% end %> @@ -109,13 +112,15 @@
+
<% end %> <% end %> +
<%# non-mobile main data table %> -
+
diff --git a/lib/bones73k_web/templates/layout/app.html.eex b/lib/bones73k_web/templates/layout/app.html.eex index 032b065..7bb9fee 100644 --- a/lib/bones73k_web/templates/layout/app.html.eex +++ b/lib/bones73k_web/templates/layout/app.html.eex @@ -2,7 +2,7 @@ <%# phoenix flash alerts: %>
-
+
<%= for {kind, class} <- alert_kinds() do %> <%= if flash_content = get_flash(@conn, kind) do %>