From 8cf8f50ff9ad25733f9bdafbdaff7898c85f15ca Mon Sep 17 00:00:00 2001 From: june Date: Wed, 13 Aug 2025 21:37:42 +1200 Subject: [PATCH 01/26] Add underline feedback for top bar --- src/components/Header.astro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Header.astro b/src/components/Header.astro index 5ffff2c..28dd602 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -7,8 +7,8 @@
- new - tags - search + new + tags + search
\ No newline at end of file -- 2.47.2 From d191c04bbf787bab18db2b295cb23b18c09c5672 Mon Sep 17 00:00:00 2001 From: june Date: Wed, 13 Aug 2025 22:20:26 +1200 Subject: [PATCH 02/26] i keep getting distracted bruh --- src/pages/recipe/[recipeid].astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/recipe/[recipeid].astro b/src/pages/recipe/[recipeid].astro index 052862f..a760c77 100644 --- a/src/pages/recipe/[recipeid].astro +++ b/src/pages/recipe/[recipeid].astro @@ -28,7 +28,7 @@ const ingredients = await Promise.all( --- -
+

{re.name}

-- 2.47.2 From e48763760022271a55473bf564d2d9819c095f97 Mon Sep 17 00:00:00 2001 From: june Date: Wed, 13 Aug 2025 23:34:45 +1200 Subject: [PATCH 03/26] Added basic new recipe page --- src/pages/recipe/new.astro | 63 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/pages/recipe/new.astro diff --git a/src/pages/recipe/new.astro b/src/pages/recipe/new.astro new file mode 100644 index 0000000..02cf587 --- /dev/null +++ b/src/pages/recipe/new.astro @@ -0,0 +1,63 @@ +--- +import client from "@/data/pocketbase"; +import SiteLayout from "@/layouts/base"; +import ImageCarousel from "@/components/Detail/ImageCarousel"; +import IngredientTableView from "@/components/Detail/IngredientTableView"; +import StepView from "@/components/Detail/StepView"; +import InfoView from "@/components/Detail/InfoView"; + +const { recipeid } = Astro.params; + +--- + + + + +
+
+
+ Image Upload +
+ + + + + + +

Ingredients

+ + + + + + + + + + + + + + + +
QuantityUnitIngredient
˚ + + + + + + +
+
+ +
+ + + + +
+ +
+ \ No newline at end of file -- 2.47.2 From 672191cc5b552edd7d50070bef01e74b6b596652 Mon Sep 17 00:00:00 2001 From: june Date: Wed, 13 Aug 2025 23:59:48 +1200 Subject: [PATCH 04/26] fix edge-case layout bug --- src/pages/recipe/[recipeid].astro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/recipe/[recipeid].astro b/src/pages/recipe/[recipeid].astro index a760c77..6554145 100644 --- a/src/pages/recipe/[recipeid].astro +++ b/src/pages/recipe/[recipeid].astro @@ -29,7 +29,7 @@ const ingredients = await Promise.all(
-
+

{re.name}

@@ -40,7 +40,7 @@ const ingredients = await Promise.all(
-
+
-- 2.47.2 From c92c754f5f138440f93fc999938d2c60993b7c7d Mon Sep 17 00:00:00 2001 From: june Date: Thu, 14 Aug 2025 08:27:49 +1200 Subject: [PATCH 05/26] Changed formatting to have title on left column at all times --- src/components/Detail/StepView.astro | 4 ++-- src/pages/recipe/[recipeid].astro | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/Detail/StepView.astro b/src/components/Detail/StepView.astro index a7652b6..7b8df3a 100644 --- a/src/components/Detail/StepView.astro +++ b/src/components/Detail/StepView.astro @@ -3,10 +3,10 @@ import { record } from "astro:schema" import client from "@/data/pocketbase" import StepIngredientSideView from "./StepIngredientSideView.astro" -const { steps } = Astro.props +const { steps, class: className } = Astro.props --- -
+

Steps

{ steps.map(s => (
diff --git a/src/pages/recipe/[recipeid].astro b/src/pages/recipe/[recipeid].astro index 6554145..c91320e 100644 --- a/src/pages/recipe/[recipeid].astro +++ b/src/pages/recipe/[recipeid].astro @@ -31,7 +31,7 @@ const ingredients = await Promise.all(
-

{re.name}

+

{re.name}

@@ -40,11 +40,9 @@ const ingredients = await Promise.all(
-
- - +
- +
-- 2.47.2 From 88f6628ee0854f399a6ba2beab44a6849b604ae0 Mon Sep 17 00:00:00 2001 From: june Date: Thu, 14 Aug 2025 09:22:46 +1200 Subject: [PATCH 06/26] Change ratio and text size of step ingredient list --- src/components/Detail/StepIngredientSideView.astro | 2 +- src/components/Detail/StepView.astro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Detail/StepIngredientSideView.astro b/src/components/Detail/StepIngredientSideView.astro index 5b6c7dd..b4cdc49 100644 --- a/src/components/Detail/StepIngredientSideView.astro +++ b/src/components/Detail/StepIngredientSideView.astro @@ -10,7 +10,7 @@ const ings = await Promise.all(
{ings.map(i => ( -
+

• {i.quantity} {i.unit || " "} {i.name}

))} diff --git a/src/components/Detail/StepView.astro b/src/components/Detail/StepView.astro index 7b8df3a..1860721 100644 --- a/src/components/Detail/StepView.astro +++ b/src/components/Detail/StepView.astro @@ -15,7 +15,7 @@ const { steps, class: className } = Astro.props

{s.instruction}

{s.ingredients && s.ingredients.length > 0 && ( -
+
)} -- 2.47.2 From 5a171f0f0f9425f4bf868acc1b37a268044049ad Mon Sep 17 00:00:00 2001 From: june Date: Thu, 14 Aug 2025 11:07:58 +1200 Subject: [PATCH 07/26] Fix styling for new ingredient table --- src/pages/recipe/new.astro | 48 ++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/src/pages/recipe/new.astro b/src/pages/recipe/new.astro index 02cf587..0cf1319 100644 --- a/src/pages/recipe/new.astro +++ b/src/pages/recipe/new.astro @@ -11,49 +11,61 @@ const { recipeid } = Astro.params; --- -
-
-
+
+
+
Image Upload
- + + +