From d6ac5bc5253daf9820c3bca4fcb58fb05ec21595 Mon Sep 17 00:00:00 2001 From: Alex Lion Date: Wed, 6 Aug 2025 22:12:20 +0200 Subject: [PATCH] WIP --- .../live/admin_live/dashboard_live.ex | 2 +- lib/claper_web/live/admin_live/event_live.ex | 4 +- .../live/admin_live/oidc_provider_live.ex | 2 +- .../admin_live/oidc_provider_live.html.heex | 121 +++++++++--------- lib/claper_web/live/admin_live/user_live.ex | 4 +- .../live/admin_live/user_live.html.heex | 109 ++++++++-------- 6 files changed, 124 insertions(+), 118 deletions(-) diff --git a/lib/claper_web/live/admin_live/dashboard_live.ex b/lib/claper_web/live/admin_live/dashboard_live.ex index 983f593..bada7f5 100644 --- a/lib/claper_web/live/admin_live/dashboard_live.ex +++ b/lib/claper_web/live/admin_live/dashboard_live.ex @@ -15,7 +15,7 @@ defmodule ClaperWeb.AdminLive.DashboardLive do socket = socket - |> assign(:page_title, "Admin Dashboard") + |> assign(:page_title, "Dashboard") |> assign(:selected_period, :day) |> assign(:days_back, 30) |> load_dashboard_data() diff --git a/lib/claper_web/live/admin_live/event_live.ex b/lib/claper_web/live/admin_live/event_live.ex index e20259f..e352708 100644 --- a/lib/claper_web/live/admin_live/event_live.ex +++ b/lib/claper_web/live/admin_live/event_live.ex @@ -9,7 +9,7 @@ defmodule ClaperWeb.AdminLive.EventLive do def mount(_params, _session, socket) do {:ok, socket - |> assign(:page_title, "Admin - Events") + |> assign(:page_title, "Events") |> assign(:events, list_events()) |> assign(:search, "") |> assign(:current_sort, %{field: :na, order: :asc})} @@ -22,7 +22,7 @@ defmodule ClaperWeb.AdminLive.EventLive do defp apply_action(socket, :index, _params) do socket - |> assign(:page_title, "Admin - Events") + |> assign(:page_title, "Events") |> assign(:event, nil) end diff --git a/lib/claper_web/live/admin_live/oidc_provider_live.ex b/lib/claper_web/live/admin_live/oidc_provider_live.ex index 8037069..aaacdb3 100644 --- a/lib/claper_web/live/admin_live/oidc_provider_live.ex +++ b/lib/claper_web/live/admin_live/oidc_provider_live.ex @@ -8,7 +8,7 @@ defmodule ClaperWeb.AdminLive.OidcProviderLive do def mount(_params, _session, socket) do {:ok, socket - |> assign(:page_title, "Admin - OIDC Providers") + |> assign(:page_title, "OIDC Providers") |> assign(:providers, list_providers()) |> assign(:search, "") |> assign(:current_sort, %{field: :na, order: :asc})} diff --git a/lib/claper_web/live/admin_live/oidc_provider_live.html.heex b/lib/claper_web/live/admin_live/oidc_provider_live.html.heex index b9341d0..0bba920 100644 --- a/lib/claper_web/live/admin_live/oidc_provider_live.html.heex +++ b/lib/claper_web/live/admin_live/oidc_provider_live.html.heex @@ -1,9 +1,9 @@ <%= case @live_action do %> <% :index -> %> -
+
-
-

OIDC Providers

+
+

OIDC Providers

<.link navigate={~p"/admin/oidc_providers/new"} class="btn btn-primary btn-sm">
<% :show -> %> -
+
-
-

OIDC Provider Details

+
+

OIDC Provider details

<.link navigate={~p"/admin/oidc_providers"} class="btn btn-outline btn-sm"> Back to Providers @@ -239,44 +239,43 @@
-
-
-

{@provider.name}

-

OIDC Provider

-
-
-
-
-
Name
-
{@provider.name}
+
+
+

{@provider.name}

+

OIDC Provider

+
+
+
+
Name
+
{@provider.name}
-
-
Issuer
-
+
+
Issuer
+
{@provider.issuer}
-
-
Client ID
-
+
+
Client ID
+
{@provider.client_id}
-
-
Response Type
-
+
+
Response Type
+
{@provider.response_type}
-
-
Scope
-
+
+
Scope
+
{@provider.scope}
-
-
Status
-
+
+
Status
+
<%= if @provider.active do %> Active @@ -288,15 +287,15 @@ <% end %>
-
-
Created At
-
+
+
Created At
+
{Calendar.strftime(@provider.inserted_at, "%Y-%m-%d %H:%M")}
-
-
Last Updated
-
+
+
Last Updated
+
{Calendar.strftime(@provider.updated_at, "%Y-%m-%d %H:%M")}
@@ -306,44 +305,48 @@
<% :new -> %> -
+
-

New OIDC Provider

+

New OIDC Provider

-
- <.live_component - module={ClaperWeb.AdminLive.OidcProviderLive.FormComponent} - id="provider-form" - title="New OIDC Provider" - action={:new} - provider={@provider} - navigate={~p"/admin/oidc_providers"} - /> +
+
+ <.live_component + module={ClaperWeb.AdminLive.OidcProviderLive.FormComponent} + id="provider-form" + title="New OIDC Provider" + action={:new} + provider={@provider} + navigate={~p"/admin/oidc_providers"} + /> +
<% :edit -> %> -
+
-

Edit OIDC Provider

+

Edit OIDC Provider

-
- <.live_component - module={ClaperWeb.AdminLive.OidcProviderLive.FormComponent} - id={"provider-form-#{@provider.id}"} - title="Edit OIDC Provider" - action={:edit} - provider={@provider} - navigate={~p"/admin/oidc_providers"} - /> +
+
+ <.live_component + module={ClaperWeb.AdminLive.OidcProviderLive.FormComponent} + id={"provider-form-#{@provider.id}"} + title="Edit OIDC Provider" + action={:edit} + provider={@provider} + navigate={~p"/admin/oidc_providers"} + /> +
diff --git a/lib/claper_web/live/admin_live/user_live.ex b/lib/claper_web/live/admin_live/user_live.ex index b3cb0cf..4a8d3a2 100644 --- a/lib/claper_web/live/admin_live/user_live.ex +++ b/lib/claper_web/live/admin_live/user_live.ex @@ -11,7 +11,7 @@ defmodule ClaperWeb.AdminLive.UserLive do def mount(_params, _session, socket) do {:ok, socket - |> assign(:page_title, "Admin - Users") + |> assign(:page_title, "Users") |> assign(:users, list_users()) |> assign(:search, "") |> assign(:current_sort, %{field: :na, order: :asc})} @@ -24,7 +24,7 @@ defmodule ClaperWeb.AdminLive.UserLive do defp apply_action(socket, :index, _params) do socket - |> assign(:page_title, "Admin - Users") + |> assign(:page_title, "Users") |> assign(:user, nil) end diff --git a/lib/claper_web/live/admin_live/user_live.html.heex b/lib/claper_web/live/admin_live/user_live.html.heex index f08a568..a52e9f4 100644 --- a/lib/claper_web/live/admin_live/user_live.html.heex +++ b/lib/claper_web/live/admin_live/user_live.html.heex @@ -1,9 +1,9 @@ <%= case @live_action do %> <% :index -> %> -
+
-
-

Users

+
+

Users

<.link navigate={~p"/admin/users/new"} class="btn btn-primary btn-sm">
<% :show -> %> -
+
-
-

User Details

+
+

User details

<.link navigate={~p"/admin/users"} class="btn btn-outline btn-sm"> Back to Users @@ -231,26 +231,25 @@
-
-
-

{@user.email}

-

User Account

-
-
-
-
-
Email
-
{@user.email}
+
+
+

{@user.email}

+

User Account

+
+
+
+
Email
+
{@user.email}
-
-
Role
-
+
+
Role
+
{if @user.role, do: @user.role.name, else: "No role"}
-
-
Status
-
+
+
Status
+
<%= if @user.confirmed_at do %> Confirmed @@ -262,22 +261,22 @@ <% end %>
-
-
Created At
-
+
+
Created At
+
{Calendar.strftime(@user.inserted_at, "%Y-%m-%d %H:%M")}
-
-
Last Updated
-
+
+
Last Updated
+
{Calendar.strftime(@user.updated_at, "%Y-%m-%d %H:%M")}
<%= if @user.confirmed_at do %> -
-
Confirmed At
-
+
+
Confirmed At
+
{Calendar.strftime(@user.confirmed_at, "%Y-%m-%d %H:%M")}
@@ -288,44 +287,48 @@
<% :new -> %> -
+
-

New User

+

New User

-
- <.live_component - module={ClaperWeb.AdminLive.UserLive.FormComponent} - id="user-form" - title="New User" - action={:new} - user={@user} - navigate={~p"/admin/users"} - /> +
+
+ <.live_component + module={ClaperWeb.AdminLive.UserLive.FormComponent} + id="user-form" + title="New User" + action={:new} + user={@user} + navigate={~p"/admin/users"} + /> +
<% :edit -> %> -
+
-

Edit User

+

Edit User

-
- <.live_component - module={ClaperWeb.AdminLive.UserLive.FormComponent} - id={"user-form-#{@user.id}"} - title="Edit User" - action={:edit} - user={@user} - navigate={~p"/admin/users"} - /> +
+
+ <.live_component + module={ClaperWeb.AdminLive.UserLive.FormComponent} + id={"user-form-#{@user.id}"} + title="Edit User" + action={:edit} + user={@user} + navigate={~p"/admin/users"} + /> +