55c6fc5ab7
Extends the existing feature-flags system (previously 3 keys, all default-enabled) with 6 more: recipe_import_url, recipe_import_photo, nutrition_estimation, markdown_export, weekly_nutrition, grocery_delivery. Each FEATURE_DEFINITIONS entry now carries its own defaultEnabled -- the new 6 default to false, the original 3 stay true -- so no migration/seed was needed for the "off by default" requirement, just a per-key fallback instead of a blanket true. Gated server-side (requireFeatureEnabledResponse, a new shared helper avoiding six copies of the same try/catch) on: import-url, import-photo, nutrition POST estimate, bulk markdown export, weekly meal-plan nutrition GET, Instacart export. Gated client-side by hiding the trigger entirely (not just disabling) on every page that renders one: recipe detail (meal/drink pairing buttons, nutrition panel's estimate button, markdown export), recipes list (import-URL button, including the OS Share Target auto-import path), new-recipe page (photo import), meal-plan page (markdown export, weekly nutrition bar), shopping-list/collection/pantry pages (markdown export), shopping-list page (Instacart button, now gated by both the existing env-var check AND the tier flag). Also: BYOK section on Settings -> AI now hidden entirely for non-BYOK users (previously showed a locked-and-teased notice, same inconsistency the Model Prefs fix closed yesterday). Language switcher shows a flag icon (FlagGB/FlagFR, moved from components/marketing to components/shared so both the logged-in settings switcher and the logged-out marketing one can use it) instead of plain "English"/"Français" text-only options. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
88 lines
3.6 KiB
TypeScript
88 lines
3.6 KiB
TypeScript
import type { Metadata } from "next";
|
|
import { headers } from "next/headers";
|
|
import { auth } from "@/lib/auth/server";
|
|
import { db, pantryItems, recipes, cookingHistory, eq, and, or, inArray, isNotNull } from "@epicure/db";
|
|
import { asc } from "@epicure/db";
|
|
import { PantryManager } from "@/components/meal-plan/pantry-manager";
|
|
import { PantryPageHeader } from "@/components/pantry/pantry-page-header";
|
|
import { ExpiringSoonSuggestions } from "@/components/pantry/expiring-soon-suggestions";
|
|
import { ExpiringLeftovers } from "@/components/pantry/expiring-leftovers";
|
|
import { scoreRecipesAgainstPantry } from "@/lib/pantry-match";
|
|
import { dishExpiresAt, daysUntil, isLeftoverExpiringSoon } from "@/lib/leftover-match";
|
|
import { getPublicUrl } from "@/lib/storage";
|
|
import { getFeatureFlagMatrix, type Tier } from "@/lib/feature-flags";
|
|
|
|
export const metadata: Metadata = {};
|
|
|
|
export default async function PantryPage() {
|
|
const session = await auth.api.getSession({ headers: await headers() });
|
|
if (!session) return null;
|
|
const viewerTier = (session.user as { tier?: string }).tier as Tier | undefined ?? "free";
|
|
const canExportMarkdown = (await getFeatureFlagMatrix()).markdown_export[viewerTier];
|
|
|
|
const [items, candidateRecipes, cookedDishes] = await Promise.all([
|
|
db.query.pantryItems.findMany({
|
|
where: eq(pantryItems.userId, session.user.id),
|
|
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 },
|
|
}),
|
|
db.query.cookingHistory.findMany({
|
|
where: and(eq(cookingHistory.userId, session.user.id), isNotNull(cookingHistory.batchDishId)),
|
|
with: {
|
|
batchDish: { columns: { id: true, name: true, fridgeDays: true } },
|
|
recipe: { columns: { id: true, title: true } },
|
|
},
|
|
}),
|
|
]);
|
|
|
|
const mappedItems = items.map((i) => ({
|
|
id: i.id,
|
|
rawName: i.rawName,
|
|
quantity: i.quantity,
|
|
unit: i.unit,
|
|
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,
|
|
};
|
|
});
|
|
|
|
const latestByDish = new Map<string, (typeof cookedDishes)[number]>();
|
|
for (const log of cookedDishes) {
|
|
if (!log.batchDish) continue;
|
|
const existing = latestByDish.get(log.batchDish.id);
|
|
if (!existing || log.cookedAt > existing.cookedAt) latestByDish.set(log.batchDish.id, log);
|
|
}
|
|
const leftovers = [...latestByDish.values()]
|
|
.filter((log) => log.batchDish && isLeftoverExpiringSoon(log.cookedAt, log.batchDish.fridgeDays))
|
|
.map((log) => ({
|
|
recipeId: log.recipe.id,
|
|
dishName: log.batchDish!.name,
|
|
recipeTitle: log.recipe.title,
|
|
expiresAt: dishExpiresAt(log.cookedAt, log.batchDish!.fridgeDays).toISOString(),
|
|
daysLeft: daysUntil(dishExpiresAt(log.cookedAt, log.batchDish!.fridgeDays)),
|
|
}))
|
|
.sort((a, b) => a.daysLeft - b.daysLeft);
|
|
|
|
return (
|
|
<div className="space-y-6">
|
|
<PantryPageHeader items={mappedItems} canExportMarkdown={canExportMarkdown} />
|
|
<ExpiringLeftovers leftovers={leftovers} />
|
|
<ExpiringSoonSuggestions suggestions={suggestions} />
|
|
<PantryManager key={mappedItems.map((i) => i.id).join(",")} initialItems={mappedItems} />
|
|
</div>
|
|
);
|
|
}
|