@kyro-cms/admin 0.9.0 → 0.9.2

package/src/components/users/UserDetail.tsx

@@ -1,11 +1,15 @@
-import React, { useState } from "react";
-import { useUIStore } from "../../lib/stores";
+import React, { useState, useEffect } from "react";
+import { apiGet } from "../../lib/api";
+import { useUIStore, toast } from "../../lib/stores";
+import { X } from "../ui/icons";
+import { UploadField } from "../fields/UploadField";
 
 interface User {
   id: string;
   name?: string;
   email: string;
   role: string;
+  avatar?: string;
   tenantId?: string;
   emailVerified?: boolean;
   locked?: boolean;
@@ -33,12 +37,41 @@ const roleOptions = [
 export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
   const [name, setName] = useState(user.name || "");
   const [role, setRole] = useState(user.role);
+  const [avatar, setAvatar] = useState<string | undefined>(user.avatar);
+  const [avatarUrl, setAvatarUrl] = useState<string | null>(null);
+  const [avatarMedia, setAvatarMedia] = useState<any>(user.avatar ? { id: user.avatar } : null);
   const [saving, setSaving] = useState(false);
   const { confirm, alert } = useUIStore();
   const [deleting, setDeleting] = useState(false);
   const [locking, setLocking] = useState(false);
   const [isLocked, setIsLocked] = useState(user.locked || false);
 
+  useEffect(() => {
+    if (typeof avatar === "string" && /^[0-9a-f-]+$/i.test(avatar)) {
+      apiGet<any>(`/api/media/${avatar}`)
+        .then((media) => {
+          setAvatarUrl(media?.thumbnailUrl || media?.url || null);
+          setAvatarMedia({ id: avatar, url: media.url, thumbnailUrl: media.thumbnailUrl, filename: media.filename, originalName: media.originalName, mimeType: media.mimeType });
+        })
+        .catch(() => { setAvatarUrl(null); setAvatarMedia(null); });
+    } else {
+      setAvatarUrl(null);
+      setAvatarMedia(null);
+    }
+  }, [avatar]);
+
+  const handleAvatarChange = (val: any) => {
+    if (val && typeof val === "object") {
+      setAvatar(val.id);
+      setAvatarUrl(val.url || val.thumbnailUrl || null);
+      setAvatarMedia(val);
+    } else {
+      setAvatar(undefined);
+      setAvatarUrl(null);
+      setAvatarMedia(null);
+    }
+  };
+
   const handleSave = async () => {
     setSaving(true);
     try {
@@ -50,6 +83,9 @@ export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
       if (name !== user.name) {
         body.name = name.trim() === "" ? null : name.trim();
       }
+      if (avatar !== user.avatar) {
+        body.avatar = avatar || null;
+      }
 
       if (Object.keys(body).length === 0) {
         window.location.href = adminPath + "/users";
@@ -66,12 +102,13 @@ export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
       const data = await res.json();
 
       if (res.ok) {
+        toast.success("User updated");
         window.location.href = adminPath + "/users";
       } else {
-        console.error("Save failed:", data.error);
+        toast.error(data.error || "Failed to save user");
       }
     } catch (e) {
-      console.error("Failed to save user:", e);
+      toast.error("Failed to save user");
     } finally {
       setSaving(false);
     }
@@ -96,9 +133,12 @@ export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
           });
           if (res.ok) {
             setIsLocked(!isLocked);
+            toast.success(isLocked ? "User unlocked" : "User locked");
+          } else {
+            toast.error("Failed to update lock status");
           }
         } catch (e) {
-          console.error("Failed to toggle lock:", e);
+          toast.error("Failed to toggle lock");
         } finally {
           setLocking(false);
         }
@@ -119,10 +159,13 @@ export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
             credentials: "include",
           });
           if (res.ok) {
+            toast.success("User deleted");
             window.location.href = adminPath + "/users";
+          } else {
+            toast.error("Failed to delete user");
           }
         } catch (e) {
-          console.error("Failed to delete user:", e);
+          toast.error("Failed to delete user");
         } finally {
           setDeleting(false);
         }
@@ -139,14 +182,18 @@ export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
     <div className="flex-1 overflow-y-auto  space-y-8">
       <div className="surface-tile p-6 flex items-center justify-between">
         <div className="flex items-center gap-4">
-          <div className="w-14 h-14 rounded-full bg-[var(--kyro-sidebar-active)] text-[var(--kyro-sidebar-text-active)] flex items-center justify-center font-bold text-xl">
-            {(name || user.email).charAt(0).toUpperCase()}
+          <div className="relative w-14 h-14 rounded-full bg-[var(--kyro-sidebar-active)] text-[var(--kyro-sidebar-text-active)] flex items-center justify-center font-bold text-xl overflow-hidden flex-shrink-0">
+            {avatarUrl ? (
+              <img src={avatarUrl} alt="" className="w-full h-full object-cover" />
+            ) : (
+              (name || user.email).charAt(0).toUpperCase()
+            )}
           </div>
           <div>
             <h1 className="text-xl font-bold tracking-tighter text-[var(--kyro-text-primary)]">
               {name || user.email}
             </h1>
-            <p className="text-sm text-[var(--kyro-text-secondary)] font-medium">
+            <p className="text-sm text-[var(--kyro-text-secondary)] font-medium mb-2">
               {name ? user.email : `User ID: ${user.id}`}
             </p>
           </div>
@@ -248,14 +295,20 @@ export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
                 : "Never"}
             </p>
           </div>
-          <div>
-            <label className="text-xs font-bold text-[var(--kyro-text-secondary)]  tracking-wider">
-              Failed Attempts
+          <div className="col-span-2">
+            <label className="text-xs font-bold text-[var(--kyro-text-secondary)] tracking-wider">
+              Photo
             </label>
-            <p className="mt-1 text-sm font-medium text-[var(--kyro-text-primary)]">
-              {user.failedLoginAttempts || 0}
-            </p>
+            <div className="mt-1 flex items-center gap-2">
+              <UploadField
+                field={{ label: "Photo", name: "avatar", maxCount: 1, allowedTypes: ["image/*"] }}
+                value={avatarMedia}
+                onChange={handleAvatarChange}
+                disabled={saving}
+              />
+            </div>
           </div>
+
           <div>
             <label className="text-xs font-bold text-[#64748b]  tracking-wider">
               Created
@@ -264,6 +317,16 @@ export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
               {formatDate(user.createdAt)}
             </p>
           </div>
+
+          <div>
+            <label className="text-xs font-bold text-[var(--kyro-text-secondary)]  tracking-wider">
+              Failed Attempts
+            </label>
+            <p className="mt-1 text-sm font-medium text-[var(--kyro-text-primary)]">
+              {user.failedLoginAttempts || 0}
+            </p>
+          </div>
+
           <div>
             <label className="text-xs font-bold text-[#64748b]  tracking-wider">
               Updated
@@ -278,7 +341,7 @@ export function UserDetail({ user, apiPath, adminPath }: UserDetailProps) {
           <button
             onClick={handleSave}
             disabled={saving}
-            className="px-6 py-2 bg-[#0b1222] text-white rounded-xl text-sm font-bold hover:bg-[#1a2332] transition-colors disabled:opacity-50"
+            className="kyro-btn kyro-btn-primary px-6 py-2 rounded-xl text-sm font-bold transition-colors disabled:opacity-50"
           >
             {saving ? "Saving…" : "Save Changes"}
           </button>

package/src/components/users/UsersList.tsx

@@ -1,3 +1,4 @@
+import { Plus, Lock, CheckCircle2, Edit2, Trash2, XCircle, X } from "../ui/icons";
 import React, { useState } from "react";
 import { useUIStore } from "../../lib/stores";
 
@@ -144,19 +145,7 @@ export function UsersList({
                 href={`${adminPath}/users/new`}
                 className="mt-2 inline-flex items-center gap-2 px-5 py-2.5 bg-[var(--kyro-sidebar-active)] text-[var(--kyro-sidebar-text-active)] rounded-lg font-bold text-sm shadow-md"
               >
-                <svg
-                  className="w-3.5 h-3.5"
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2.5"
-                    d="M12 5v14M5 12h14"
-                  />
-                </svg>
+                <Plus className="w-4 h-4" />
                 Add User
               </a>
             </div>
@@ -214,32 +203,12 @@ export function UsersList({
                   <td className="px-6 py-5">
                     {user.locked ? (
                       <span className="inline-flex items-center gap-1.5 px-3 py-1 rounded-lg text-xs font-bold bg-red-50 text-red-600">
-                        <svg
-                          className="w-3 h-3"
-                          fill="currentColor"
-                          viewBox="0 0 20 20"
-                        >
-                          <path
-                            fillRule="evenodd"
-                            d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                            clipRule="evenodd"
-                          />
-                        </svg>
+                        <Lock className="w-4 h-4" />
                         Locked
                       </span>
                     ) : (
                       <span className="inline-flex items-center gap-1.5 px-3 py-1 rounded-lg text-xs font-bold bg-green-50 text-green-600">
-                        <svg
-                          className="w-3 h-3"
-                          fill="currentColor"
-                          viewBox="0 0 20 20"
-                        >
-                          <path
-                            fillRule="evenodd"
-                            d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
-                            clipRule="evenodd"
-                          />
-                        </svg>
+                        <CheckCircle2 className="w-4 h-4" />
                         Active
                       </span>
                     )}
@@ -254,19 +223,7 @@ export function UsersList({
                         className="inline-flex items-center justify-center w-8 h-8 rounded-md text-[#64748b] hover:bg-gray-100 hover:text-[#0b1222] transition-colors"
                         onClick={(e) => e.stopPropagation()}
                       >
-                        <svg
-                          className="w-4 h-4"
-                          fill="none"
-                          stroke="currentColor"
-                          viewBox="0 0 24 24"
-                        >
-                          <path
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                            strokeWidth="2"
-                            d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"
-                          />
-                        </svg>
+                        <Edit2 className="w-4 h-4" />
                       </a>
                       <button
                         onClick={(e) => {
@@ -275,19 +232,7 @@ export function UsersList({
                         }}
                         className="inline-flex items-center justify-center w-8 h-8 rounded-md text-[#64748b] hover:bg-red-50 hover:text-red-600 transition-colors"
                       >
-                        <svg
-                          className="w-4 h-4"
-                          fill="none"
-                          stroke="currentColor"
-                          viewBox="0 0 24 24"
-                        >
-                          <path
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                            strokeWidth="2"
-                            d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
-                          />
-                        </svg>
+                        <Trash2 className="w-4 h-4" />
                       </button>
                     </div>
                   </td>
@@ -300,35 +245,13 @@ export function UsersList({
 
       {errorMsg && (
         <div className="surface-tile p-4 flex items-center gap-3 border border-red-200">
-          <svg
-            className="w-5 h-5 text-red-500 flex-shrink-0"
-            fill="currentColor"
-            viewBox="0 0 20 20"
-          >
-            <path
-              fillRule="evenodd"
-              d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
-              clipRule="evenodd"
-            />
-          </svg>
+          <XCircle className="w-4 h-4" />
           <p className="text-sm font-medium text-red-500">{errorMsg}</p>
           <button
             onClick={() => setErrorMsg(null)}
             className="ml-auto text-red-400 hover:text-red-600"
           >
-            <svg
-              className="w-4 h-4"
-              fill="none"
-              stroke="currentColor"
-              viewBox="0 0 24 24"
-            >
-              <path
-                strokeLinecap="round"
-                strokeLinejoin="round"
-                strokeWidth="2"
-                d="M6 18L18 6M6 6l12 12"
-              />
-            </svg>
+            <X className="w-4 h-4" />
           </button>
         </div>
       )}