From a1363ee4b50c6c52be5c6859eb830f1e13f3c923 Mon Sep 17 00:00:00 2001
From: Atridad Lahiji <me@atri.dad>
Date: Fri, 7 Feb 2025 02:56:17 -0600
Subject: [PATCH] Fixed

---
 src/components/RegistryList.tsx    | 144 ++++++++++++++++++++---------
 src/components/RegistryManager.tsx |  55 ++++++++---
 src/lib/types.ts                   |   1 +
 src/pages/api/registry/[id].ts     |  41 +++++---
 src/pages/api/registry/index.ts    |   2 +-
 5 files changed, 169 insertions(+), 74 deletions(-)

diff --git a/src/components/RegistryList.tsx b/src/components/RegistryList.tsx
index 05a12bb..4da6204 100644
--- a/src/components/RegistryList.tsx
+++ b/src/components/RegistryList.tsx
@@ -6,29 +6,31 @@ const RegistryList = () => {
 	const [claimedItems, setClaimedItems] = useState<Set<string>>(new Set());
 	const [loading, setLoading] = useState(true);
 	const [error, setError] = useState<string | null>(null);
+	const [claimantName, setClaimantName] = useState("");
+	const [showClaimants, setShowClaimants] = useState<Set<string>>(new Set());
 
 	useEffect(() => {
-		const fetchRegistryItems = async () => {
-			setLoading(true);
-			setError(null);
-			try {
-				const response = await fetch("/api/registry");
-				if (!response.ok) {
-					throw new Error(`HTTP error! status: ${response.status}`);
-				}
-				const data = await response.json();
-				setRegistryItems(data);
-			} catch (e: any) {
-				setError(e.message);
-				console.error("Failed to fetch registry items:", e);
-			} finally {
-				setLoading(false);
-			}
-		};
-
 		fetchRegistryItems();
 	}, []);
 
+	const fetchRegistryItems = async () => {
+		setLoading(true);
+		setError(null);
+		try {
+			const response = await fetch("/api/registry");
+			if (!response.ok) {
+				throw new Error(`HTTP error! status: ${response.status}`);
+			}
+			const data = await response.json();
+			setRegistryItems(data);
+		} catch (e: any) {
+			setError(e.message);
+			console.error("Failed to fetch registry items:", e);
+		} finally {
+			setLoading(false);
+		}
+	};
+
 	const handleCheckboxChange = (itemId: string) => {
 		const newClaimedItems = new Set(claimedItems);
 		if (newClaimedItems.has(itemId)) {
@@ -39,31 +41,42 @@ const RegistryList = () => {
 		setClaimedItems(newClaimedItems);
 	};
 
-	const handleSubmit = async () => {
-		// Prepare updates for claimed items
-		const updates = registryItems.filter((item) =>
-			claimedItems.has(item.id)
-		);
+	const toggleClaimantVisibility = (itemId: string) => {
+		const newShowClaimants = new Set(showClaimants);
+		if (newShowClaimants.has(itemId)) {
+			newShowClaimants.delete(itemId);
+		} else {
+			newShowClaimants.add(itemId);
+		}
+		setShowClaimants(newShowClaimants);
+	};
+
+	const handleSubmit = async () => {
+		if (!claimantName.trim()) {
+			setError("Please enter your name before claiming items");
+			return;
+		}
+
+		const updates = registryItems.filter((item) => claimedItems.has(item.id));
 
-		// Optimistically update the UI
 		const updatedRegistryItems = registryItems.map((item) => {
 			if (claimedItems.has(item.id)) {
-				return { ...item, taken: true };
+				return { ...item, taken: true, claimedBy: claimantName };
 			}
 			return item;
 		});
 		setRegistryItems(updatedRegistryItems);
-		setClaimedItems(new Set()); // Clear claimed items after submission
+		setClaimedItems(new Set());
+		setClaimantName("");
 
 		try {
-			// Send updates to the server
 			for (const item of updates) {
 				const response = await fetch(`/api/registry/${item.id}`, {
 					method: "PUT",
 					headers: {
 						"Content-Type": "application/json",
 					},
-					body: JSON.stringify({ taken: true }),
+					body: JSON.stringify({ taken: true, claimedBy: claimantName }),
 				});
 
 				if (!response.ok) {
@@ -85,9 +98,7 @@ const RegistryList = () => {
 	}
 
 	if (error) {
-		return (
-			<div className="text-red-500 text-center">Error: {error}</div>
-		);
+		return <div className="text-red-500 text-center">Error: {error}</div>;
 	}
 
 	return (
@@ -99,17 +110,37 @@ const RegistryList = () => {
 						<tr>
 							<th>Item</th>
 							<th>Link</th>
+							<th>Status</th>
 							<th>Claim</th>
 						</tr>
 					</thead>
 					<tbody>
 						{registryItems.map((item) => (
-							<tr key={item.id} className={item.taken ? "opacity-50" : ""}>
+							<tr key={item.id}>
 								<td>
-									{item.name}
-									{item.taken && (
-										<span className="badge badge-success ml-2">Taken</span>
-									)}
+									<div className="flex flex-col gap-1">
+										<div className="flex items-center gap-2">
+											{item.name}
+											{item.taken && (
+												<div className="flex items-center gap-2">
+													<span className="badge badge-success">Taken</span>
+													<button
+														onClick={() => toggleClaimantVisibility(item.id)}
+														className="btn btn-xs btn-ghost"
+													>
+														{showClaimants.has(item.id) ? "Hide" : "Show"}
+													</button>
+												</div>
+											)}
+										</div>
+										{item.taken && 
+											item.claimedBy && 
+											showClaimants.has(item.id) && (
+												<div className="text-sm text-gray-500 italic">
+													Claimed by: {item.claimedBy}
+												</div>
+											)}
+									</div>
 								</td>
 								<td>
 									{item.link && (
@@ -123,28 +154,51 @@ const RegistryList = () => {
 										</a>
 									)}
 								</td>
+								<td>{item.taken ? "Claimed" : "Available"}</td>
 								<td>
-									{!item.taken && (
+									{!item.taken ? (
 										<input
 											type="checkbox"
 											className="checkbox"
 											checked={claimedItems.has(item.id)}
 											onChange={() => handleCheckboxChange(item.id)}
 										/>
-									)}
+									) : <input
+										type="checkbox"
+										className="checkbox"
+										disabled
+										checked={true}
+									/>}
 								</td>
 							</tr>
 						))}
 					</tbody>
 				</table>
 			</div>
-			<button
-				className="btn btn-primary mt-4"
-				onClick={handleSubmit}
-				disabled={claimedItems.size === 0}
-			>
-				Submit Claims
-			</button>
+			{claimedItems.size > 0 && (
+				<div className="mt-4 flex flex-col gap-4">
+					<div className="form-control">
+						<label className="label">
+							<span className="label-text">Your Name</span>
+						</label>
+						<input
+							type="text"
+							className="input input-bordered"
+							value={claimantName}
+							onChange={(e) => setClaimantName(e.target.value)}
+							placeholder="Enter your name"
+							required
+						/>
+					</div>
+					<button
+						className="btn btn-primary"
+						onClick={handleSubmit}
+						disabled={!claimantName.trim()}
+					>
+						Submit Claims
+					</button>
+				</div>
+			)}
 		</div>
 	);
 };
diff --git a/src/components/RegistryManager.tsx b/src/components/RegistryManager.tsx
index 7af6e8d..f7511e5 100644
--- a/src/components/RegistryManager.tsx
+++ b/src/components/RegistryManager.tsx
@@ -6,6 +6,7 @@ const RegistryManager = () => {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [newItem, setNewItem] = useState({ name: "", link: "" });
+  const [showClaimants, setShowClaimants] = useState<Set<string>>(new Set());
 
   useEffect(() => {
     fetchRegistryItems();
@@ -46,7 +47,6 @@ const RegistryManager = () => {
         throw new Error(`Failed to add item: ${response.statusText}`);
       }
 
-      // Clear form and refresh list
       setNewItem({ name: "", link: "" });
       await fetchRegistryItems();
     } catch (error: any) {
@@ -67,7 +67,6 @@ const RegistryManager = () => {
         throw new Error(`Failed to delete item: ${response.statusText}`);
       }
 
-      // Refresh the list after deletion
       await fetchRegistryItems();
     } catch (error: any) {
       setError(error.message);
@@ -75,6 +74,16 @@ const RegistryManager = () => {
     }
   };
 
+  const toggleClaimantVisibility = (itemId: string) => {
+    const newShowClaimants = new Set(showClaimants);
+    if (newShowClaimants.has(itemId)) {
+      newShowClaimants.delete(itemId);
+    } else {
+      newShowClaimants.add(itemId);
+    }
+    setShowClaimants(newShowClaimants);
+  };
+
   if (loading) {
     return <div className="text-center">Loading registry items...</div>;
   }
@@ -85,9 +94,6 @@ const RegistryManager = () => {
 
   return (
     <div className="container mx-auto p-4">
-      <h1 className="text-2xl font-bold mb-4">Registry Manager</h1>
-
-      {/* Add New Item Form */}
       <form onSubmit={handleAddItem} className="mb-8">
         <div className="card bg-base-100 shadow-xl">
           <div className="card-body">
@@ -130,7 +136,6 @@ const RegistryManager = () => {
         </div>
       </form>
 
-      {/* Registry Items List */}
       <div className="overflow-x-auto">
         <table className="table w-full">
           <thead>
@@ -144,7 +149,35 @@ const RegistryManager = () => {
           <tbody>
             {registryItems.map((item) => (
               <tr key={item.id}>
-                <td>{item.name}</td>
+                <td>
+                  <div className="flex items-center gap-2">
+                    {item.name}
+                    {item.taken && (
+                      <>
+                        <span className="badge badge-success">Taken</span>
+                        {item.claimedBy && (
+                          <button
+                            onClick={() => toggleClaimantVisibility(item.id)}
+                            className="btn btn-ghost btn-xs"
+                          >
+                            {showClaimants.has(item.id) ? (
+                              <i className="fas fa-eye-slash" />
+                            ) : (
+                              <i className="fas fa-eye" />
+                            )}
+                          </button>
+                        )}
+                      </>
+                    )}
+                  </div>
+                  {item.taken &&
+                    item.claimedBy &&
+                    showClaimants.has(item.id) && (
+                      <div className="text-sm text-gray-500">
+                        Claimed by: {item.claimedBy}
+                      </div>
+                    )}
+                </td>
                 <td>
                   {item.link && (
                     <a
@@ -157,13 +190,7 @@ const RegistryManager = () => {
                     </a>
                   )}
                 </td>
-                <td>
-                  {item.taken ? (
-                    <span className="badge badge-success">Taken</span>
-                  ) : (
-                    <span className="badge badge-info">Available</span>
-                  )}
-                </td>
+                <td>{item.taken ? "Claimed" : "Available"}</td>
                 <td>
                   <button
                     className="btn btn-error btn-sm"
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 9c20706..065611c 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -3,6 +3,7 @@ export interface RegistryItem {
   name: string;
   taken: boolean;
   link?: string;
+  claimedBy?: string;
 }
 
 export interface RSVPItem {
diff --git a/src/pages/api/registry/[id].ts b/src/pages/api/registry/[id].ts
index 3d9b4a2..6d5db75 100644
--- a/src/pages/api/registry/[id].ts
+++ b/src/pages/api/registry/[id].ts
@@ -2,7 +2,7 @@ import type { APIRoute } from "astro";
 import { getS3Data, putS3Data } from "../../../lib/s3";
 import type { RegistryItem } from "../../../lib/types";
 
-const REGISTRY_FILE_KEY = "baby-registry.json";
+const REGISTRY_FILE_KEY = "registry.json";
 
 // GET: Get a specific registry item by ID
 export const GET: APIRoute = async ({ params }) => {
@@ -50,7 +50,7 @@ export const PUT: APIRoute = async ({ request, params }) => {
 		}
 
 		const body = await request.json();
-		const { name, taken, link } = body;
+		const { taken, claimedBy } = body;
 
 		const registry = await getS3Data<RegistryItem[]>(REGISTRY_FILE_KEY) || [];
 		const itemIndex = registry.findIndex((item) => item.id === id);
@@ -62,12 +62,10 @@ export const PUT: APIRoute = async ({ request, params }) => {
 			);
 		}
 
-		// Update the item with the provided values
 		registry[itemIndex] = {
 			...registry[itemIndex],
-			name: name !== undefined ? name : registry[itemIndex].name,
 			taken: taken !== undefined ? taken : registry[itemIndex].taken,
-			link: link !== undefined ? link : registry[itemIndex].link,
+			claimedBy: claimedBy !== undefined ? claimedBy : registry[itemIndex].claimedBy,
 		};
 
 		await putS3Data(REGISTRY_FILE_KEY, registry);
@@ -85,39 +83,54 @@ export const PUT: APIRoute = async ({ request, params }) => {
 	}
 };
 
+
 // DELETE: Delete a registry item
 export const DELETE: APIRoute = async ({ params }) => {
+	const headers = {
+		"Content-Type": "application/json",
+	};
+
 	try {
 		const { id } = params;
 		if (!id) {
 			return new Response(
 				JSON.stringify({ success: false, error: "Item ID is required" }),
-				{ status: 400, headers: { "Content-Type": "application/json" } }
+				{ status: 400, headers }
 			);
 		}
 
+		// Get current registry data
 		const registry = await getS3Data<RegistryItem[]>(REGISTRY_FILE_KEY) || [];
+    
+		// Find the item index
 		const itemIndex = registry.findIndex((item) => item.id === id);
 
 		if (itemIndex === -1) {
 			return new Response(
 				JSON.stringify({ success: false, error: "Item not found" }),
-				{ status: 404, headers: { "Content-Type": "application/json" } }
+				{ status: 404, headers }
 			);
 		}
 
-		registry.splice(itemIndex, 1); // Remove the item from the array
+		// Remove the item
+		registry.splice(itemIndex, 1);
+
+		// Save the updated registry
 		await putS3Data(REGISTRY_FILE_KEY, registry);
 
 		return new Response(JSON.stringify({ success: true }), {
-			status: 204, // No Content
-			headers: { "Content-Type": "application/json" },
+			status: 200,
+			headers,
 		});
-	} catch (error: any) {
-		console.error("Error deleting registry item:", error.message);
+	} catch (error) {
+		console.error("Error deleting registry item:", error);
 		return new Response(
-			JSON.stringify({ success: false, error: "Failed to delete item" }),
-			{ status: 500, headers: { "Content-Type": "application/json" } }
+			JSON.stringify({
+				success: false,
+				error: "Failed to delete item",
+				details: error instanceof Error ? error.message : "Unknown error",
+			}),
+			{ status: 500, headers }
 		);
 	}
 };
diff --git a/src/pages/api/registry/index.ts b/src/pages/api/registry/index.ts
index 4dbcfcd..131b033 100644
--- a/src/pages/api/registry/index.ts
+++ b/src/pages/api/registry/index.ts
@@ -3,7 +3,7 @@ import { getS3Data, putS3Data } from "../../../lib/s3";
 import { v4 as uuidv4 } from "uuid";
 import type { RegistryItem } from "../../../lib/types";
 
-const REGISTRY_FILE_KEY = "baby-registry.json";
+const REGISTRY_FILE_KEY = "registry.json";
 
 // GET: List all registry items
 export const GET: APIRoute = async () => {