feat: surface pantry-expiry recipe suggestions
Pantry page now shows a "Use it up soon" widget with recipes that use soon-to-expire pantry items, across the user's own recipes plus public/ unlisted ones (the existing /recipes/can-cook page only looked at the user's own). Extracted the matching/scoring logic shared by both into lib/pantry-match.ts. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,9 +1,13 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import { headers } from "next/headers";
|
import { headers } from "next/headers";
|
||||||
import { auth } from "@/lib/auth/server";
|
import { auth } from "@/lib/auth/server";
|
||||||
import { db, pantryItems, eq, asc } from "@epicure/db";
|
import { db, pantryItems, recipes, eq, or, inArray } from "@epicure/db";
|
||||||
|
import { asc } from "@epicure/db";
|
||||||
import { PantryManager } from "@/components/meal-plan/pantry-manager";
|
import { PantryManager } from "@/components/meal-plan/pantry-manager";
|
||||||
import { PantryPageHeader } from "@/components/pantry/pantry-page-header";
|
import { PantryPageHeader } from "@/components/pantry/pantry-page-header";
|
||||||
|
import { ExpiringSoonSuggestions } from "@/components/pantry/expiring-soon-suggestions";
|
||||||
|
import { scoreRecipesAgainstPantry } from "@/lib/pantry-match";
|
||||||
|
import { getPublicUrl } from "@/lib/storage";
|
||||||
|
|
||||||
export const metadata: Metadata = {};
|
export const metadata: Metadata = {};
|
||||||
|
|
||||||
@@ -11,10 +15,16 @@ export default async function PantryPage() {
|
|||||||
const session = await auth.api.getSession({ headers: await headers() });
|
const session = await auth.api.getSession({ headers: await headers() });
|
||||||
if (!session) return null;
|
if (!session) return null;
|
||||||
|
|
||||||
const items = await db.query.pantryItems.findMany({
|
const [items, candidateRecipes] = await Promise.all([
|
||||||
|
db.query.pantryItems.findMany({
|
||||||
where: eq(pantryItems.userId, session.user.id),
|
where: eq(pantryItems.userId, session.user.id),
|
||||||
orderBy: asc(pantryItems.rawName),
|
orderBy: asc(pantryItems.rawName),
|
||||||
});
|
}),
|
||||||
|
db.query.recipes.findMany({
|
||||||
|
where: or(eq(recipes.authorId, session.user.id), inArray(recipes.visibility, ["public", "unlisted"])),
|
||||||
|
with: { ingredients: true, photos: true },
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
|
||||||
const mappedItems = items.map((i) => ({
|
const mappedItems = items.map((i) => ({
|
||||||
id: i.id,
|
id: i.id,
|
||||||
@@ -24,9 +34,23 @@ export default async function PantryPage() {
|
|||||||
expiresAt: i.expiresAt?.toISOString() ?? null,
|
expiresAt: i.expiresAt?.toISOString() ?? null,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const suggestions = scoreRecipesAgainstPantry(candidateRecipes, items)
|
||||||
|
.filter((s) => s.usesExpiring.length > 0)
|
||||||
|
.slice(0, 3)
|
||||||
|
.map((s) => {
|
||||||
|
const cover = s.recipe.photos?.find((p) => p.isCover) ?? s.recipe.photos?.[0];
|
||||||
|
return {
|
||||||
|
id: s.recipe.id,
|
||||||
|
title: s.recipe.title,
|
||||||
|
photoUrl: cover ? getPublicUrl(cover.storageKey) : null,
|
||||||
|
usesExpiring: s.usesExpiring,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
<PantryPageHeader items={mappedItems} />
|
<PantryPageHeader items={mappedItems} />
|
||||||
|
<ExpiringSoonSuggestions suggestions={suggestions} />
|
||||||
<PantryManager initialItems={mappedItems} />
|
<PantryManager initialItems={mappedItems} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -5,17 +5,10 @@ import { db, recipes, pantryItems } from "@epicure/db";
|
|||||||
import { eq } from "@epicure/db";
|
import { eq } from "@epicure/db";
|
||||||
import { getPublicUrl } from "@/lib/storage";
|
import { getPublicUrl } from "@/lib/storage";
|
||||||
import { CanCookContent } from "@/components/recipe/can-cook-content";
|
import { CanCookContent } from "@/components/recipe/can-cook-content";
|
||||||
|
import { scoreRecipesAgainstPantry } from "@/lib/pantry-match";
|
||||||
|
|
||||||
export const metadata: Metadata = {};
|
export const metadata: Metadata = {};
|
||||||
|
|
||||||
const EXPIRING_WITHIN_DAYS = 3;
|
|
||||||
|
|
||||||
function isExpiringSoon(expiresAt: Date | null): boolean {
|
|
||||||
if (!expiresAt) return false;
|
|
||||||
const days = Math.ceil((expiresAt.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
|
|
||||||
return days >= 0 && days <= EXPIRING_WITHIN_DAYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default async function CanCookPage() {
|
export default async function CanCookPage() {
|
||||||
const session = await auth.api.getSession({ headers: await headers() });
|
const session = await auth.api.getSession({ headers: await headers() });
|
||||||
if (!session) return null;
|
if (!session) return null;
|
||||||
@@ -33,48 +26,17 @@ export default async function CanCookPage() {
|
|||||||
}),
|
}),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const pantryKeys = new Set(pantry.map((p) => p.rawName.toLowerCase()));
|
const scored = scoreRecipesAgainstPantry(userRecipes, pantry).map((s) => {
|
||||||
|
const cover = s.recipe.photos?.find((p) => p.isCover) ?? s.recipe.photos?.[0];
|
||||||
const expiringSoonKeys = new Set(
|
|
||||||
pantry
|
|
||||||
.filter((p) => isExpiringSoon(p.expiresAt))
|
|
||||||
.map((p) => p.rawName.toLowerCase())
|
|
||||||
);
|
|
||||||
|
|
||||||
const scored = userRecipes
|
|
||||||
.filter((r) => r.ingredients.length > 0)
|
|
||||||
.map((recipe) => {
|
|
||||||
const matched = recipe.ingredients.filter((ing) =>
|
|
||||||
pantryKeys.has(ing.rawName.toLowerCase())
|
|
||||||
).length;
|
|
||||||
const missing = recipe.ingredients
|
|
||||||
.filter((ing) => !pantryKeys.has(ing.rawName.toLowerCase()))
|
|
||||||
.map((ing) => ing.rawName)
|
|
||||||
.slice(0, 5);
|
|
||||||
const usesExpiring = recipe.ingredients
|
|
||||||
.filter((ing) => expiringSoonKeys.has(ing.rawName.toLowerCase()))
|
|
||||||
.map((ing) => ing.rawName);
|
|
||||||
const total = recipe.ingredients.length;
|
|
||||||
const cover = recipe.photos?.find((p) => p.isCover) ?? recipe.photos?.[0];
|
|
||||||
return {
|
return {
|
||||||
|
...s,
|
||||||
recipe: {
|
recipe: {
|
||||||
id: recipe.id,
|
id: s.recipe.id,
|
||||||
title: recipe.title,
|
title: s.recipe.title,
|
||||||
description: recipe.description,
|
description: s.recipe.description,
|
||||||
photos: cover ? [{ url: getPublicUrl(cover.storageKey) }] : [],
|
photos: cover ? [{ url: getPublicUrl(cover.storageKey) }] : [],
|
||||||
},
|
},
|
||||||
matched,
|
|
||||||
total,
|
|
||||||
pct: Math.round((matched / total) * 100),
|
|
||||||
missing,
|
|
||||||
usesExpiring,
|
|
||||||
};
|
};
|
||||||
})
|
|
||||||
.sort((a, b) => {
|
|
||||||
if (a.usesExpiring.length > 0 !== b.usesExpiring.length > 0) {
|
|
||||||
return a.usesExpiring.length > 0 ? -1 : 1;
|
|
||||||
}
|
|
||||||
return b.pct - a.pct;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return <CanCookContent pantryCount={pantry.length} scored={scored} />;
|
return <CanCookContent pantryCount={pantry.length} scored={scored} />;
|
||||||
|
|||||||
@@ -0,0 +1,55 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import Link from "next/link";
|
||||||
|
import { useTranslations } from "next-intl";
|
||||||
|
import { Clock } from "lucide-react";
|
||||||
|
import { Badge } from "@/components/ui/badge";
|
||||||
|
|
||||||
|
type Suggestion = {
|
||||||
|
id: string;
|
||||||
|
title: string;
|
||||||
|
photoUrl: string | null;
|
||||||
|
usesExpiring: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export function ExpiringSoonSuggestions({ suggestions }: { suggestions: Suggestion[] }) {
|
||||||
|
const t = useTranslations("pantry");
|
||||||
|
|
||||||
|
if (suggestions.length === 0) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border p-4 space-y-3">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<h2 className="font-semibold flex items-center gap-2">
|
||||||
|
<Clock className="h-4 w-4 text-orange-500" />
|
||||||
|
{t("expiringSoonSuggestionsTitle")}
|
||||||
|
</h2>
|
||||||
|
<Link href="/recipes/can-cook" className="text-sm text-primary hover:underline">
|
||||||
|
{t("seeAll")}
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-3 gap-3">
|
||||||
|
{suggestions.map((s) => (
|
||||||
|
<Link
|
||||||
|
key={s.id}
|
||||||
|
href={`/recipes/${s.id}`}
|
||||||
|
className="rounded-lg border overflow-hidden hover:bg-accent transition-colors"
|
||||||
|
>
|
||||||
|
{s.photoUrl ? (
|
||||||
|
<img src={s.photoUrl} alt="" className="h-24 w-full object-cover" />
|
||||||
|
) : (
|
||||||
|
<div className="h-24 w-full bg-muted" />
|
||||||
|
)}
|
||||||
|
<div className="p-2 space-y-1">
|
||||||
|
<p className="text-sm font-medium truncate">{s.title}</p>
|
||||||
|
<Badge variant="outline" className="text-orange-500 border-orange-500 gap-1 text-[11px]">
|
||||||
|
<Clock className="h-3 w-3" />
|
||||||
|
{s.usesExpiring.slice(0, 2).join(", ")}
|
||||||
|
</Badge>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
export const EXPIRING_WITHIN_DAYS = 3;
|
||||||
|
|
||||||
|
export function isExpiringSoon(expiresAt: Date | null): boolean {
|
||||||
|
if (!expiresAt) return false;
|
||||||
|
const days = Math.ceil((expiresAt.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
|
||||||
|
return days >= 0 && days <= EXPIRING_WITHIN_DAYS;
|
||||||
|
}
|
||||||
|
|
||||||
|
type ScorableRecipe<T> = T & { ingredients: { rawName: string }[] };
|
||||||
|
|
||||||
|
export function scoreRecipesAgainstPantry<T>(
|
||||||
|
recipesList: ScorableRecipe<T>[],
|
||||||
|
pantry: { rawName: string; expiresAt: Date | null }[]
|
||||||
|
) {
|
||||||
|
const pantryKeys = new Set(pantry.map((p) => p.rawName.toLowerCase()));
|
||||||
|
const expiringSoonKeys = new Set(
|
||||||
|
pantry.filter((p) => isExpiringSoon(p.expiresAt)).map((p) => p.rawName.toLowerCase())
|
||||||
|
);
|
||||||
|
|
||||||
|
return recipesList
|
||||||
|
.filter((r) => r.ingredients.length > 0)
|
||||||
|
.map((recipe) => {
|
||||||
|
const matched = recipe.ingredients.filter((ing) => pantryKeys.has(ing.rawName.toLowerCase())).length;
|
||||||
|
const missing = recipe.ingredients
|
||||||
|
.filter((ing) => !pantryKeys.has(ing.rawName.toLowerCase()))
|
||||||
|
.map((ing) => ing.rawName)
|
||||||
|
.slice(0, 5);
|
||||||
|
const usesExpiring = recipe.ingredients
|
||||||
|
.filter((ing) => expiringSoonKeys.has(ing.rawName.toLowerCase()))
|
||||||
|
.map((ing) => ing.rawName);
|
||||||
|
const total = recipe.ingredients.length;
|
||||||
|
return { recipe, matched, total, pct: Math.round((matched / total) * 100), missing, usesExpiring };
|
||||||
|
})
|
||||||
|
.sort((a, b) => {
|
||||||
|
if (a.usesExpiring.length > 0 !== b.usesExpiring.length > 0) {
|
||||||
|
return a.usesExpiring.length > 0 ? -1 : 1;
|
||||||
|
}
|
||||||
|
return b.pct - a.pct;
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -622,6 +622,8 @@
|
|||||||
"title": "Pantry",
|
"title": "Pantry",
|
||||||
"subtitle": "Track what you have on hand",
|
"subtitle": "Track what you have on hand",
|
||||||
"canCook": "What can I cook?",
|
"canCook": "What can I cook?",
|
||||||
|
"expiringSoonSuggestionsTitle": "Use it up soon",
|
||||||
|
"seeAll": "See all",
|
||||||
"itemNamePlaceholder": "Item name",
|
"itemNamePlaceholder": "Item name",
|
||||||
"qtyPlaceholder": "Qty",
|
"qtyPlaceholder": "Qty",
|
||||||
"unitPlaceholder": "Unit",
|
"unitPlaceholder": "Unit",
|
||||||
|
|||||||
@@ -610,6 +610,8 @@
|
|||||||
"title": "Garde-manger",
|
"title": "Garde-manger",
|
||||||
"subtitle": "Suivez ce que vous avez en stock",
|
"subtitle": "Suivez ce que vous avez en stock",
|
||||||
"canCook": "Que puis-je cuisiner ?",
|
"canCook": "Que puis-je cuisiner ?",
|
||||||
|
"expiringSoonSuggestionsTitle": "À utiliser bientôt",
|
||||||
|
"seeAll": "Tout voir",
|
||||||
"itemNamePlaceholder": "Nom de l'article",
|
"itemNamePlaceholder": "Nom de l'article",
|
||||||
"qtyPlaceholder": "Qté",
|
"qtyPlaceholder": "Qté",
|
||||||
"unitPlaceholder": "Unité",
|
"unitPlaceholder": "Unité",
|
||||||
|
|||||||
Reference in New Issue
Block a user