From d54b841148289e094d075a34659763f8ed00f248 Mon Sep 17 00:00:00 2001
From: june <self@breadone.net>
Date: Wed, 13 Aug 2025 13:49:15 +1200
Subject: [PATCH] Add ingredient table to recipe view

---
 src/components/Detail/ImageCarousel.astro     |  8 ++--
 .../Detail/IngredientTableView.astro          | 42 +++++++++++++++++++
 src/pages/recipe/[recipeid].astro             | 42 ++++++++++---------
 src/styles/global.css                         |  4 +-
 4 files changed, 72 insertions(+), 24 deletions(-)
 create mode 100644 src/components/Detail/IngredientTableView.astro

diff --git a/src/components/Detail/ImageCarousel.astro b/src/components/Detail/ImageCarousel.astro
index 4f23d3c..8800a17 100644
--- a/src/components/Detail/ImageCarousel.astro
+++ b/src/components/Detail/ImageCarousel.astro
@@ -1,6 +1,6 @@
 ---
 import client from "@/data/pocketbase";
-const { recipe } = Astro.props
+const { class: className, recipe } = Astro.props
 
 async function getLink(img: string) {
     const record = await client.collection("images").getOne(img)
@@ -26,8 +26,8 @@ const links = await Promise.all(
         const b0 = document.getElementById('dec-button')
         const b1 = document.getElementById('inc-button')
 
-        b0.hidden = true
-        b1.hidden = true
+        b0!.hidden = true
+        b1!.hidden = true
     }
     
     function inc() { 
@@ -45,7 +45,7 @@ const links = await Promise.all(
     (window as any).dec = dec;
 </script>
 
-<div>
+<div class={className}>
     <!-- Hidden element to pass server data to client -->
     <div class="hidden" id="carousel-data">{JSON.stringify(links)}</div>
     
diff --git a/src/components/Detail/IngredientTableView.astro b/src/components/Detail/IngredientTableView.astro
new file mode 100644
index 0000000..8d6951c
--- /dev/null
+++ b/src/components/Detail/IngredientTableView.astro
@@ -0,0 +1,42 @@
+---
+// const { ingredients } = Astro.props
+
+const { class: className, ingredients } = Astro.props
+---
+
+<!-- <div class=`bg-[#2a2b2c] rounded-lg grid grid-cols-3 text-center ${className}`>
+    <span class="font-bold">Quantity</span>
+    <span class="font-bold">Unit</span>
+    <span class="font-bold">Food</span>
+    {
+        ingredients.map(ing => (
+            <span>{ing.quantity}</span>
+            <span>{ing.unit}</span>
+            <span>{ing.name}</span>
+        ))
+    }
+
+</div> -->
+
+<table class={`table-auto bg-[#2a2b2c] rounded-lg ${className} w-full`}>
+    <thead>
+        <tr>
+            <th class="text-center px-4 py-2">Quantity</th>
+            <th class="text-center px-4 py-2">Unit</th>
+            <th class="text-center px-4 py-2">Food</th>
+        </tr>
+    </thead>
+    <tbody>
+        {
+        ingredients.map(ing => (
+            <>
+                <tr class="border-t border-gray-600">
+                    <td class="text-left px-4 py-2">{ing.quantity}</td>
+                    <td class="text-left px-4 py-2">{ing.unit}</td>
+                    <td class="text-left px-4 py-2">{ing.name}</td>
+                </tr>
+            </>
+        ))
+        }
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/src/pages/recipe/[recipeid].astro b/src/pages/recipe/[recipeid].astro
index 0158bd1..0cae90b 100644
--- a/src/pages/recipe/[recipeid].astro
+++ b/src/pages/recipe/[recipeid].astro
@@ -2,6 +2,7 @@
 import client from "@/data/pocketbase";
 import SiteLayout from "@/layouts/base";
 import ImageCarousel from "@/components/Detail/ImageCarousel";
+import IngredientTableView from "@/components/Detail/IngredientTableView";
 
 const { recipeid } = Astro.params;
 
@@ -9,12 +10,14 @@ const re = await client.collection("recipes").getOne(recipeid ?? "0");
 
 const stepIds = re.steps
 
-const steps = await Promise.all(
+let steps = await Promise.all(
     stepIds.map(async s =>
         await client.collection("steps").getOne(s)
     )
 )
 
+steps = steps.sort((a, b) => a.index - b.index);
+
 const ingredients = await Promise.all(
     re.ingredients.map(async s =>
         await client.collection("ingredients").getOne(s)
@@ -23,27 +26,28 @@ const ingredients = await Promise.all(
 ---
 
 <SiteLayout>
-    <div class="flex flex-col">
-        <div class="flex flex-col md:flex-row">
-            <ImageCarousel recipe={re} />
-            <!-- Title -->
-            <p class=" text-[28pt] font-bold md:pl-5">{re.name}</p>
+    <div class="flex flex-col md:flex-row">
+        <div class="flex flex-col ">
+            <ImageCarousel class="w-full" recipe={re} />
+            <p class=" md:hidden text-[28pt] font-bold leading-none mt-2">{re.name}</p>
+            <p class="text-[22pt] font-bold 'md:mt-4'">Ingredients</p>
+            <IngredientTableView class:list={['md:w-80', 'px-4']} ingredients={ingredients}  />
         </div>
+        
+        <div class="flex flex-col">
+            <p class="hidden md:block text-[28pt] font-bold pl-5">{re.name}</p>
 
-        <!-- Ingredients -->
-        <div class="bg-[#2a2b2c] rounded-lg md:w-80 md:mt-4 grid grid-cols-3 px-4 text-center">
-            <span class="font-bold">Quantity</span>
-            <span class="font-bold">Unit</span>
-            <span class="font-bold">Food</span>
-
-            {
-                ingredients.map(ing => (
-                    <span>{ing.quantity}</span>
-                    <span>{ing.unit}</span>
-                    <span>{ing.name}</span>
-                ))
-            }
+            <div class="md:ml-5 mt-2 md:mt-0">
+                <p class="text-[22pt] font-bold">Steps</p>
+                { steps.map(s => (
+                    <div class="bg-[#2a2b2c] rounded-lg mb-2 p-3 md:">
+                        <p>Step {s.index + 1}</p>
+                        <p>{s.instruction}</p>
+                    </div>
+                )) }
+            </div>
 
+            
         </div>
 
     </div>
diff --git a/src/styles/global.css b/src/styles/global.css
index 281ef03..12ec143 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -4,5 +4,7 @@ html {
     @apply bg-[#1d1f21];
     /* @apply bg-[#fafafa]; */
     @apply text-white;
-    @apply font-stretch-condensed;
+    /* @apply font-; */
+    @apply font-sans;
+    /* font-family: 'SF Pro Display', 'Segoe UI', 'Helvetica Neue', Arial, 'Noto Sans', sans-serif; */
 }
\ No newline at end of file