dimitar/fitaiProto
1
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

rb fine tune

Browse Source
This commit is contained in:
dimitar committed 2026-03-18 13:14:47 +01:00
1 parent 7043487fc2
commit d112dbb122
9 files changed
+335 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/admin/src/components/users/UserManagement.tsx
+79 -21
View File
@@ -34,6 +34,8 @@ export function UserManagement({ gymId }: UserManagementProps) {
role: string;
phone: string;
gymId: string;
membershipType?: string;
membershipStatus?: string;
} | null>(null);
const {
@@ -62,6 +64,8 @@ export function UserManagement({ gymId }: UserManagementProps) {
role: user.role,
phone: user.phone || "",
gymId: user.gymId || "",
membershipType: user.client?.membershipType || "basic",
membershipStatus: user.client?.membershipStatus || "active",
});
setIsEditing(true);
};
@@ -133,7 +137,7 @@ export function UserManagement({ gymId }: UserManagementProps) {
try {
if (selectedUser) {
const payload = {
const payload: any = {
id: selectedUser.id,
email: editForm.email,
firstName: editForm.firstName,
@@ -143,6 +147,12 @@ export function UserManagement({ gymId }: UserManagementProps) {
gymId: editForm.gymId === "" ? null : editForm.gymId,
};
// Include membership fields if user is a client
if (editForm.role === "client") {
payload.membershipType = editForm.membershipType;
payload.membershipStatus = editForm.membershipStatus;
}
await updateUser.mutateAsync(payload);
setIsEditing(false);
setEditForm(null);
@@ -351,26 +361,74 @@ export function UserManagement({ gymId }: UserManagementProps) {
className="w-full border border-gray-300 rounded px-3 py-2"
/>
</div>
<div className="mb-4">
<label className="block text-sm font-medium mb-1">Gym</label>
<select
value={editForm.gymId}
onChange={(e) =>
setEditForm({ ...editForm, gymId: e.target.value })
}
className="w-full border border-gray-300 rounded px-3 py-2"
>
<option value="">Proceed without gym</option>
{gyms.map((g) => (
<option key={g.id} value={g.id}>
{g.name}
</option>
))}
</select>
<p className="text-xs text-gray-500 mt-1">
Select an active gym or proceed without a gym.
</p>
</div>
{/* Only superAdmins and admins can reassign gyms */}
{user?.publicMetadata?.role !== "trainer" && (
<div className="mb-4">
<label className="block text-sm font-medium mb-1">Gym</label>
<select
value={editForm.gymId}
onChange={(e) =>
setEditForm({ ...editForm, gymId: e.target.value })
}
className="w-full border border-gray-300 rounded px-3 py-2"
>
<option value="">Proceed without gym</option>
{gyms.map((g) => (
<option key={g.id} value={g.id}>
{g.name}
</option>
))}
</select>
<p className="text-xs text-gray-500 mt-1">
Select an active gym or proceed without a gym.
</p>
</div>
)}
{/* Client-specific fields - only show when role is client */}
{editForm.role === "client" && (
<>
<div className="mb-4">
<label className="block text-sm font-medium mb-1">
Membership Type
</label>
<select
value={editForm.membershipType || "basic"}
onChange={(e) =>
setEditForm({
...editForm,
membershipType: e.target.value,
})
}
className="w-full border border-gray-300 rounded px-3 py-2"
>
<option value="basic">Basic</option>
<option value="premium">Premium</option>
<option value="vip">VIP</option>
</select>
</div>
<div className="mb-4">
<label className="block text-sm font-medium mb-1">
Membership Status
</label>
<select
value={editForm.membershipStatus || "active"}
onChange={(e) =>
setEditForm({
...editForm,
membershipStatus: e.target.value,
})
}
className="w-full border border-gray-300 rounded px-3 py-2"
>
<option value="active">Active</option>
<option value="inactive">Inactive</option>
<option value="suspended">Suspended</option>
</select>
</div>
</>
)}
<div className="flex justify-end gap-2">
<button
type="button"