9c545a5bb3
- Private accounts: users.isPrivate hides a user from search and their recipes from search/trending/for-you discovery surfaces (follow-aware where the route already has session context, blanket exclusion where it doesn't); existing followers and direct links are unaffected, no follow-request approval flow was built (explicit scope limit) - Merged /people into the Explore tab (tab=people query param); the old standalone route now redirects there - "Get Ideas" vs "Surprise Me" were doing the same empty-prompt call; Surprise Me now injects a real random constraint (5-ingredient, one-pot, etc.), matching the existing pattern in the AI recipe-generate dialog - Meal-plan day cells now link to their recipe (was dead text) and gained a one-click "mark as cooked" action - Theme toggle is now a real three-way light/dark/system control instead of a binary flip - Nutrition goals form had zero i18n wiring; fully localized now New migration 0027 (users.is_private) generated, left unapplied like the others. Verified with typecheck, lint, and a clean --no-cache docker build. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
88 lines
2.2 KiB
TypeScript
88 lines
2.2 KiB
TypeScript
import type { Metadata } from "next";
|
|
import {
|
|
db,
|
|
recipes,
|
|
users,
|
|
favorites,
|
|
eq,
|
|
desc,
|
|
sql,
|
|
and,
|
|
gte,
|
|
count,
|
|
} from "@epicure/db";
|
|
import { ExplorePageContent } from "@/components/search/explore-page-content";
|
|
|
|
export const metadata: Metadata = {};
|
|
|
|
export type RecipeResult = {
|
|
id: string;
|
|
title: string;
|
|
authorName: string | null;
|
|
difficulty: string | null;
|
|
prepMins: number | null;
|
|
cookMins: number | null;
|
|
};
|
|
|
|
export default async function ExplorePage({
|
|
searchParams,
|
|
}: {
|
|
searchParams: Promise<{ q?: string; tab?: string }>;
|
|
}) {
|
|
const { q, tab } = await searchParams;
|
|
const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000);
|
|
|
|
// Trending: public recipes ordered by favorite count in last 7 days
|
|
const trendingRows = await db
|
|
.select({
|
|
id: recipes.id,
|
|
title: recipes.title,
|
|
authorName: users.name,
|
|
difficulty: recipes.difficulty,
|
|
prepMins: recipes.prepMins,
|
|
cookMins: recipes.cookMins,
|
|
favoriteCount: count(favorites.recipeId),
|
|
})
|
|
.from(recipes)
|
|
.innerJoin(users, eq(recipes.authorId, users.id))
|
|
.leftJoin(
|
|
favorites,
|
|
and(
|
|
eq(favorites.recipeId, recipes.id),
|
|
gte(favorites.createdAt, sevenDaysAgo)
|
|
)
|
|
)
|
|
.where(and(eq(recipes.visibility, "public"), eq(users.isPrivate, false)))
|
|
.groupBy(recipes.id, users.id)
|
|
.orderBy(desc(sql`count(${favorites.recipeId})`))
|
|
.limit(12);
|
|
|
|
// Recent: public recipes ordered by createdAt desc
|
|
const recentRows = await db
|
|
.select({
|
|
id: recipes.id,
|
|
title: recipes.title,
|
|
authorName: users.name,
|
|
difficulty: recipes.difficulty,
|
|
prepMins: recipes.prepMins,
|
|
cookMins: recipes.cookMins,
|
|
})
|
|
.from(recipes)
|
|
.innerJoin(users, eq(recipes.authorId, users.id))
|
|
.where(and(eq(recipes.visibility, "public"), eq(users.isPrivate, false)))
|
|
.orderBy(desc(recipes.createdAt))
|
|
.limit(12);
|
|
|
|
const trending: RecipeResult[] = trendingRows.map(({ favoriteCount: _fc, ...r }) => r);
|
|
const recent: RecipeResult[] = recentRows;
|
|
|
|
return (
|
|
<ExplorePageContent
|
|
trending={trending}
|
|
recent={recent}
|
|
initialQuery={q ?? ""}
|
|
initialTab={tab === "people" ? "people" : "recipes"}
|
|
/>
|
|
);
|
|
}
|