(FEAT): Implemented the ingredients, but not validation!
Need to update the validation to be in the parent. Review the AI output.
This commit is contained in:
Hayden Hargreaves
parent
d170429752
commit
c9aa4e62fa
@ -1,17 +1,108 @@
|
||||
import type { RecipeIngredient } from "../../types/recipe";
|
||||
import { Reorder, useDragControls } from "motion/react";
|
||||
import { INGREDIENT_UNITS, type RecipeIngredient } from "../../types/recipe";
|
||||
import DeleteIconSmall from "../icons/DeleteIconSmall";
|
||||
import DragIconSmall from "../icons/DragIconSmall";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
interface IngredientItemProps {
|
||||
classes: string;
|
||||
ingredient: RecipeIngredient;
|
||||
onChange: (id: string, name: string) => void;
|
||||
onChange: (id: string, name: "Amount" | "Unit" | "Name", value: string) => void;
|
||||
removeIngredientHandler: (id: string) => void;
|
||||
allowDelete: boolean;
|
||||
}
|
||||
|
||||
export default function IngredientItem({ ingredient, onChange }: IngredientItemProps) {
|
||||
export default function IngredientItem({ classes, ingredient, onChange, removeIngredientHandler, allowDelete }: IngredientItemProps) {
|
||||
const [dirty, setDirty] = useState<boolean>(false);
|
||||
const [valid, setValid] = useState<boolean>(false);
|
||||
|
||||
const controls = useDragControls();
|
||||
|
||||
|
||||
// HANDLERS
|
||||
const changeHandler = (name: "Amount" | "Unit" | "Name", value: string) => {
|
||||
if (!dirty) setDirty(true);
|
||||
onChange(ingredient.Id, name, value);
|
||||
}
|
||||
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
let _valid = true;
|
||||
if (ingredient.Name.trim() === "") _valid = false;
|
||||
if (ingredient.Unit === "") _valid = false;
|
||||
if (ingredient.Amount <= 0) _valid = false;
|
||||
setValid(_valid);
|
||||
}, [ingredient]);
|
||||
|
||||
useEffect(() => {
|
||||
console.log("@dirty", dirty);
|
||||
}, [dirty]);
|
||||
|
||||
return (
|
||||
<Reorder.Item
|
||||
key={ingredient.Id}
|
||||
value={ingredient}
|
||||
dragListener={false}
|
||||
dragControls={controls}
|
||||
className="select-none p-2 flex gap-2 flex-col"
|
||||
>
|
||||
<div className="flex gap-2">
|
||||
<div className="flex-col md:flex-row flex-grow flex gap-2">
|
||||
<div className="flex gap-2">
|
||||
<input
|
||||
type="number"
|
||||
step="0.25"
|
||||
min="0"
|
||||
placeholder="amount"
|
||||
required
|
||||
value={ingredient.Amount}
|
||||
onChange={(e) => changeHandler("Amount", e.target.value)}
|
||||
className={`w-1/2 md:w-28 ${classes} ${dirty && ingredient.Amount <= 0 ? "border-red-500" : ""}`}
|
||||
/>
|
||||
|
||||
<select
|
||||
onChange={(e) => changeHandler("Unit", e.target.value)}
|
||||
className={`w-1/2 md:w-fit ${classes} ${dirty && ingredient.Unit === "" ? "border-red-500" : ""}`}
|
||||
>
|
||||
{INGREDIENT_UNITS.map(unit => (
|
||||
<option key={unit} value={unit}>{unit ? unit : "Select"}</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<input
|
||||
type="text"
|
||||
value={ingredient.Name}
|
||||
onChange={(e) => onChange(ingredient.Id, e.target.value)}
|
||||
placeholder="Ingredient name"
|
||||
required
|
||||
value={ingredient.Name}
|
||||
onChange={(e) => changeHandler("Name", e.target.value)}
|
||||
className={`flex-grow ${classes} ${dirty && ingredient.Name.trim() === "" ? "border-red-500" : ""}`}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="flex-col md:flex-row flex gap-x-2 items-center justify-evenly md:justify-center">
|
||||
<button
|
||||
tabIndex={-1}
|
||||
disabled={!allowDelete}
|
||||
onClick={() => removeIngredientHandler(ingredient.Id)}
|
||||
className="p-1 md:p-2 md:pr-0 cursor-pointer text-gray-500 hover:text-red-500 disabled:text-gray-200 disabled:cursor-not-allowed duration-300"
|
||||
>
|
||||
<DeleteIconSmall />
|
||||
</button>
|
||||
<div
|
||||
tabIndex={-1}
|
||||
onPointerDown={(e) => controls.start(e)}
|
||||
className="p-1 md:p-0 cursor-pointer"
|
||||
>
|
||||
<DragIconSmall />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{(dirty && !valid) && (
|
||||
<p className="text-sm text-red-500"> Please fill out all fields. </p>
|
||||
)}
|
||||
</Reorder.Item>
|
||||
);
|
||||
}
|
||||
|
||||
@ -1,59 +1,40 @@
|
||||
import type { Dispatch, SetStateAction } from "react";
|
||||
import { type IngredientId, type IngredientsById, type RecipeIngredient, type RecipeIngredientSection, type SectionsById } from "../../types/recipe";
|
||||
import IngredientSectionElement from "./IngredientSectionElement";
|
||||
import { Reorder } from "motion/react";
|
||||
|
||||
import type { RecipeIngredient, RecipeIngredientSection } from "../../types/recipe";
|
||||
import IngredientItem from "./IngredientItem";
|
||||
|
||||
interface IngredientListProps {
|
||||
classes: string;
|
||||
section: RecipeIngredientSection;
|
||||
ingredients: RecipeIngredient[];
|
||||
setSectionIngredients: (sectionId: string, ingredients: RecipeIngredient[]) => void;
|
||||
ingredientChangeHandler: (id: string, name: "Amount" | "Unit" | "Name", value: string) => void;
|
||||
removeIngredientHandler: (id: string) => void;
|
||||
}
|
||||
|
||||
export default function IngredientList({ sectionOrder, setSectionOrder, sectionsById, ingredientsById, setIngredientsById }: IngredientListProps) {
|
||||
const handleIngredientChange = (
|
||||
ingredientId: IngredientId,
|
||||
field: "Name" | "Amount" | "Unit",
|
||||
value: string
|
||||
) => {
|
||||
setIngredientsById(prev => {
|
||||
const ing = prev[ingredientId];
|
||||
if (!ing) return prev;
|
||||
export default function IngredientList({ classes, section, ingredients, setSectionIngredients, ingredientChangeHandler, removeIngredientHandler }: IngredientListProps) {
|
||||
const sectionIngredients = ingredients.filter(x => x.SectionId === section.Id);
|
||||
|
||||
const updated: RecipeIngredient = {
|
||||
...ing,
|
||||
[field]:
|
||||
field === "Amount"
|
||||
? (value === "" ? 0 : Number(value))
|
||||
: value,
|
||||
};
|
||||
|
||||
// If nothing changed, keep same reference
|
||||
if (updated === ing) return prev;
|
||||
|
||||
return { ...prev, [ingredientId]: updated };
|
||||
});
|
||||
};
|
||||
const reorderHandler = (ingredients: RecipeIngredient[]) => {
|
||||
setSectionIngredients(section.Id, ingredients);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Reorder.Group
|
||||
axis="y"
|
||||
values={sectionOrder}
|
||||
onReorder={setSectionOrder}
|
||||
values={ingredients}
|
||||
onReorder={reorderHandler}
|
||||
className="flex flex-col"
|
||||
>
|
||||
{sectionOrder.map(sectionId => {
|
||||
const section = sectionsById[sectionId];
|
||||
console.log("@section", section);
|
||||
return (
|
||||
<Reorder.Item key={sectionId} value={sectionId}>
|
||||
<IngredientSectionElement
|
||||
section={section}
|
||||
ingredientsById={ingredientsById}
|
||||
onChange={handleIngredientChange}
|
||||
{sectionIngredients.map(ing =>
|
||||
<IngredientItem
|
||||
key={ing.Id}
|
||||
classes={classes}
|
||||
ingredient={ing}
|
||||
onChange={ingredientChangeHandler}
|
||||
removeIngredientHandler={removeIngredientHandler}
|
||||
allowDelete={sectionIngredients.length > 1}
|
||||
/>
|
||||
|
||||
</Reorder.Item>
|
||||
)
|
||||
})}
|
||||
)}
|
||||
</Reorder.Group>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@ -1,19 +1,30 @@
|
||||
import type { DragControls } from "motion/react";
|
||||
import { Reorder, useDragControls } from "motion/react";
|
||||
import type { RecipeIngredientSection } from "../../types/recipe";
|
||||
import DeleteIconSmall from "../icons/DeleteIconSmall";
|
||||
import DragIconSmall from "../icons/DragIconSmall";
|
||||
import type { ReactNode } from "react";
|
||||
|
||||
interface IngredientSectionProps {
|
||||
section: RecipeIngredientSection;
|
||||
onChange: (id: string, name: string) => void;
|
||||
index: number;
|
||||
controls: DragControls;
|
||||
removeIngredientSectionHandler: (id: string) => void;
|
||||
allowDelete: boolean;
|
||||
children?: ReactNode;
|
||||
};
|
||||
|
||||
export default function IngredientSection({ section, onChange, index, controls }: IngredientSectionProps) {
|
||||
export default function IngredientSection({ section, onChange, removeIngredientSectionHandler, allowDelete, children }: IngredientSectionProps) {
|
||||
const controls = useDragControls();
|
||||
|
||||
return (
|
||||
<div className="w-full bg-gray-100 p-3 flex items-center">
|
||||
<p className="font-semibold">Group:</p>
|
||||
<Reorder.Item
|
||||
key={section.Id}
|
||||
value={section}
|
||||
dragListener={false}
|
||||
dragControls={controls}
|
||||
className="select-none"
|
||||
>
|
||||
<div className="w-full bg-gray-100 p-3 flex items-center my-2">
|
||||
<p className="text-xs md:text-sm font-semibold">Group:</p>
|
||||
<input
|
||||
type="text"
|
||||
value={section.Name}
|
||||
@ -22,15 +33,21 @@ export default function IngredientSection({ section, onChange, index, controls }
|
||||
className="mx-2 px-2 py-1 border border-gray-300 flex-grow rounded-sm"
|
||||
/>
|
||||
|
||||
<div className="w-1/10 flex justify-between">
|
||||
<button className="cursor-pointer">
|
||||
<div className="flex gap-x-2 items-center">
|
||||
<button
|
||||
disabled={!allowDelete}
|
||||
className="p-2 pr-0 cursor-pointer text-gray-500 hover:text-red-500 disabled:text-gray-200 disabled:cursor-not-allowed duration-300"
|
||||
onClick={() => removeIngredientSectionHandler(section.Id)}
|
||||
>
|
||||
<DeleteIconSmall />
|
||||
</button>
|
||||
<div className="cursor-pointer" onPointerDown={(e) => controls.start(e)}>
|
||||
<div className="p-0 cursor-pointer" onPointerDown={(e) => controls.start(e)}>
|
||||
<DragIconSmall />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{children}
|
||||
</Reorder.Item>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
import { Fragment, useEffect, useState, type ChangeEvent, type FormEvent } from "react";
|
||||
import { useEffect, useState, type ChangeEvent, type FormEvent } from "react";
|
||||
import Banner from "../components/Banner";
|
||||
import { isRecipeMeal, RecipeIngredient, type IngredientsById, type RecipeIngredientSection, type RecipeInstruction, type SectionId, type SectionsById } from "../types/recipe";
|
||||
import { isRecipeMeal, type RecipeIngredient, type RecipeIngredientSection, type RecipeIngredientUnit, type RecipeInstruction } from "../types/recipe";
|
||||
import InstructionList from "../components/forms/InstructionList";
|
||||
import ValidationErrorList from "../components/forms/ValidationErrorList";
|
||||
import IngredientSection from "../components/forms/IngredientSection";
|
||||
import { section } from "motion/react-client";
|
||||
import IngredientItem from "../components/forms/IngredientItem";
|
||||
import { Reorder, useDragControls } from "motion/react";
|
||||
import { Reorder } from "motion/react";
|
||||
import IngredientList from "../components/forms/IngredientList";
|
||||
|
||||
// TODO: Move this
|
||||
interface CreateRecipeForm {
|
||||
@ -59,41 +58,18 @@ export default function Create() {
|
||||
image: null,
|
||||
});
|
||||
// Store complex values elsewhere
|
||||
const [instructions, setInstructions] = useState<RecipeInstruction[]>([{ Id: crypto.randomUUID(), Content: "" }, { Id: crypto.randomUUID(), Content: "" }]);
|
||||
const [instructions, setInstructions] = useState<RecipeInstruction[]>([
|
||||
{ Id: crypto.randomUUID(), Content: "" }
|
||||
]);
|
||||
|
||||
// Ingredients
|
||||
const [sections, setSections] = useState<RecipeIngredientSection[]>([
|
||||
{ Id: "a", Name: "Section 1" },
|
||||
{ Id: "b", Name: "Section 2" },
|
||||
{ Id: "c", Name: "Section 3" }
|
||||
{ Id: "initial-section", Name: "Unnamed group" },
|
||||
]);
|
||||
|
||||
const [ingredients, setIngredients] = useState<RecipeIngredient[]>([
|
||||
{ Id: crypto.randomUUID(), SectionId: "a", Name: "Ingredient 1", Amount: 1, Unit: "lb" },
|
||||
{ Id: crypto.randomUUID(), SectionId: "a", Name: "Ingredient 2", Amount: 1, Unit: "lb" },
|
||||
{ Id: crypto.randomUUID(), SectionId: "b", Name: "Ingredient 3", Amount: 1, Unit: "lb" },
|
||||
{ Id: crypto.randomUUID(), SectionId: "c", Name: "Ingredient 4", Amount: 1, Unit: "lb" },
|
||||
{ Id: crypto.randomUUID(), SectionId: "c", Name: "Ingredient 5", Amount: 1, Unit: "lb" },
|
||||
{ Id: crypto.randomUUID(), SectionId: "c", Name: "Ingredient 6", Amount: 1, Unit: "lb" },
|
||||
{ Id: crypto.randomUUID(), SectionId: "initial-section", Name: "", Amount: 0, Unit: "" },
|
||||
]);
|
||||
|
||||
const sectionChangeHandler = (id: string, name: string) => {
|
||||
setSections(prev =>
|
||||
prev.map(section =>
|
||||
section.Id === id ? { ...section, Name: name } : section
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
const ingredientChangeHandler = (id: string, name: string) => {
|
||||
setIngredients(prev =>
|
||||
prev.map(ing =>
|
||||
ing.Id === id ? { ...ing, Name: name } : ing
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
// VALIDATION STATE
|
||||
const [validation, setValidation] = useState<CreateRecipeFormToggles>({
|
||||
title: true,
|
||||
@ -136,7 +112,6 @@ export default function Create() {
|
||||
setValidation(state);
|
||||
}
|
||||
|
||||
|
||||
// HANDLERS
|
||||
const changeHandler = (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>) => {
|
||||
const { name, value } = e.target;
|
||||
@ -186,22 +161,76 @@ export default function Create() {
|
||||
setInstructions([...instructions, { Id: crypto.randomUUID(), Content: "" }]);
|
||||
}
|
||||
|
||||
const sectionChangeHandler = (id: string, name: string) => {
|
||||
setSections(prev =>
|
||||
prev.map(section =>
|
||||
section.Id === id ? { ...section, Name: name } : section
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
const ingredientChangeHandler = (id: string, name: "Amount" | "Unit" | "Name", value: string) => {
|
||||
setIngredients(prev =>
|
||||
prev.map(ing =>
|
||||
ing.Id === id ? { ...ing, [name]: name === "Amount" ? Number(value) : value } : ing
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
const setSectionIngredients = (sectionId: string, new_ingredients: RecipeIngredient[]) => {
|
||||
const sorted = [
|
||||
...new_ingredients.filter(x => x.SectionId === sectionId),
|
||||
...ingredients.filter(x => x.SectionId !== sectionId)
|
||||
].sort((a, b) => a.SectionId.localeCompare(b.SectionId));
|
||||
|
||||
setIngredients(sorted);
|
||||
}
|
||||
|
||||
const addIngredientHandler = (sectionId: string) => {
|
||||
const new_ingredients = [...ingredients, {
|
||||
Id: crypto.randomUUID(),
|
||||
SectionId: sectionId,
|
||||
Amount: 0,
|
||||
Name: "",
|
||||
Unit: "" as RecipeIngredientUnit
|
||||
}];
|
||||
|
||||
// TODO: Should I be using spread?
|
||||
setIngredients([...new_ingredients.sort((a, b) => a.SectionId.localeCompare(b.SectionId))]);
|
||||
}
|
||||
|
||||
const removeIngredientHandler = (id: string) => {
|
||||
setIngredients(prev => prev.filter(ing => ing.Id !== id));
|
||||
}
|
||||
|
||||
const addIngredientSectionHandler = (i: number) => {
|
||||
const id = crypto.randomUUID();
|
||||
|
||||
setSections(prev => [
|
||||
...prev.slice(0, i + 1),
|
||||
{ Id: id, Name: "Unnamed group" },
|
||||
...prev.slice(i + 1),
|
||||
]);
|
||||
|
||||
setIngredients([...ingredients, {
|
||||
Id: crypto.randomUUID(),
|
||||
SectionId: id,
|
||||
Amount: 0,
|
||||
Name: "",
|
||||
Unit: "" as RecipeIngredientUnit,
|
||||
}]);
|
||||
}
|
||||
|
||||
const removeIngredientSectionHandler = (id: string) => {
|
||||
setSections(prev => prev.filter(sec => sec.Id !== id));
|
||||
setIngredients(prev => prev.filter(ing => ing.SectionId !== id));
|
||||
}
|
||||
|
||||
// EFFECTS
|
||||
useEffect(() => {
|
||||
// Execute validation every time inputs change
|
||||
validate();
|
||||
console.log("@inputs", inputs);
|
||||
}, [inputs, instructions]);
|
||||
|
||||
// useEffect(() => {
|
||||
// console.log("@validation", validation);
|
||||
// }, [validation]);
|
||||
|
||||
useEffect(() => {
|
||||
console.log("@instructions", instructions);
|
||||
}, [instructions]);
|
||||
|
||||
}, [inputs, instructions, ingredients]);
|
||||
|
||||
useEffect(() => {
|
||||
// The form is only valid when every item has been touched, and every item is valid!
|
||||
@ -448,32 +477,49 @@ export default function Create() {
|
||||
Ingredients
|
||||
<span className="text-red-500">*</span>
|
||||
</label>
|
||||
<p className="text-xs py-1 text-gray-700">Please provide a list of ingredients and their quantities.</p>
|
||||
<p className="text-xs py-1 text-gray-700">
|
||||
Please provide a list of ingredients and their quantities. Ingredients can be added into
|
||||
groups. If only a single group exists, the group will be ignored when the recipe is created
|
||||
and the ingredients will appear as a single list.
|
||||
</p>
|
||||
|
||||
<Reorder.Group
|
||||
axis="y"
|
||||
values={sections}
|
||||
onReorder={setSections}
|
||||
className=""
|
||||
className="animate-none"
|
||||
>
|
||||
{sections.map((section, i) => {
|
||||
const controls = useDragControls();
|
||||
|
||||
return (
|
||||
<Reorder.Item
|
||||
{sections.map((section, i) => (
|
||||
<IngredientSection
|
||||
key={section.Id}
|
||||
value={section}
|
||||
dragListener={false}
|
||||
dragControls={controls}
|
||||
className="select-none"
|
||||
section={section}
|
||||
onChange={sectionChangeHandler}
|
||||
removeIngredientSectionHandler={removeIngredientSectionHandler}
|
||||
allowDelete={sections.length > 1}
|
||||
>
|
||||
<IngredientSection key={section.Id} section={section} onChange={sectionChangeHandler} index={i} controls={controls} />
|
||||
{ingredients.filter(x => x.SectionId === section.Id).map(ing =>
|
||||
<IngredientItem key={ing.Id} ingredient={ing} onChange={ingredientChangeHandler} />
|
||||
)}
|
||||
</Reorder.Item>
|
||||
)
|
||||
})}
|
||||
|
||||
<IngredientList
|
||||
classes={INPUT_CLASSES}
|
||||
section={section}
|
||||
ingredients={ingredients}
|
||||
setSectionIngredients={setSectionIngredients}
|
||||
ingredientChangeHandler={ingredientChangeHandler}
|
||||
removeIngredientHandler={removeIngredientHandler}
|
||||
/>
|
||||
<button
|
||||
onClick={() => addIngredientHandler(section.Id)}
|
||||
className="w-fit px-3 py-1.5 text-blue-800 font-semibold text-xs md:text-sm rounded-lg hover:bg-gray-100 duration-300 cursor-pointer"
|
||||
>
|
||||
Add ingredient
|
||||
</button>
|
||||
<button
|
||||
onClick={() => addIngredientSectionHandler(i)}
|
||||
className="w-fit px-3 py-1.5 text-blue-800 font-semibold text-xs md:text-sm rounded-lg hover:bg-gray-100 duration-300 cursor-pointer"
|
||||
>
|
||||
Add group header
|
||||
</button>
|
||||
</IngredientSection>
|
||||
))}
|
||||
</Reorder.Group>
|
||||
|
||||
</div>
|
||||
@ -492,7 +538,7 @@ export default function Create() {
|
||||
|
||||
<button
|
||||
onClick={addInstructionHandler}
|
||||
className="text-sm md:text-base text-white bg-blue-500 w-full md:w-fit px-8 py-2.5 rounded-lg cursor-pointer"
|
||||
className="w-fit px-3 py-1.5 text-blue-800 font-semibold text-xs md:text-sm rounded-lg hover:bg-gray-100 duration-300 cursor-pointer"
|
||||
>
|
||||
Add Instruction Step
|
||||
</button>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user