Merge/copilot push now into main #7
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -196,9 +196,9 @@ | |||||
| const [savedAddresses, setSavedAddresses] = useState<Array<{ id: string; name: string; address: string }>>([]); | ||||||
|
|
||||||
| // Favorites & filters | ||||||
| const [favoriteIds, setFavoriteIds] = useState<Set<number>>(new Set()); | ||||||
| const [dietaryFilter, setDietaryFilter] = useState<string>("All"); | ||||||
|
Check warning on line 200 in app/page.tsx
|
||||||
| const [showFavoritesOnly, setShowFavoritesOnly] = useState(false); | ||||||
|
Check warning on line 201 in app/page.tsx
|
||||||
|
|
||||||
| // Chat | ||||||
| const [chatMessages, setChatMessages] = useState<ChatMessage[]>([ | ||||||
|
|
@@ -211,7 +211,9 @@ | |||||
| const [chatInput, setChatInput] = useState(""); | ||||||
| const [chatLoading, setChatLoading] = useState(false); | ||||||
| const [statusMessage, setStatusMessage] = useState<string | null>(null); | ||||||
| const contentScrollRef = useRef<HTMLDivElement>(null); | ||||||
| const chatSectionRef = useRef<HTMLHeadingElement>(null); | ||||||
| const chatScrollRef = useRef<HTMLDivElement>(null); | ||||||
|
|
||||||
| // ─── Load from localStorage ─────────────────────────────────────────────── | ||||||
|
|
||||||
|
|
@@ -243,10 +245,12 @@ | |||||
| }); | ||||||
| }, [aiView, selectedRestaurantId, restaurants]); | ||||||
|
|
||||||
| // ─── Auto-scroll chat container only ───────────────────────────────────── | ||||||
|
|
||||||
| useEffect(() => { | ||||||
| const el = chatScrollRef.current; | ||||||
| if (!el) return; | ||||||
| el.scrollTo({ top: el.scrollHeight, behavior: "smooth" }); | ||||||
| }, [chatMessages]); | ||||||
|
|
||||||
| // ─── Fetch restaurants ──────────────────────────────────────────────────── | ||||||
|
|
@@ -329,6 +333,9 @@ | |||||
| ); | ||||||
| const deliveryFee = items.length > 0 ? (selectedRestaurant?.deliveryFee ?? 0) : 0; | ||||||
| const orderTotal = Math.max(0, totalPrice + deliveryFee + tip - promoDiscount); | ||||||
| const restaurantGridClass = isOpen | ||||||
| ? "grid gap-4 sm:grid-cols-2 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4" | ||||||
| : "grid gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5"; | ||||||
|
|
||||||
| // ─── Saved meals ────────────────────────────────────────────────────────── | ||||||
|
|
||||||
|
|
@@ -354,7 +361,7 @@ | |||||
|
|
||||||
| // ─── Favorites ──────────────────────────────────────────────────────────── | ||||||
|
|
||||||
| const toggleFavorite = (rId: number) => { | ||||||
| setFavoriteIds((prev) => { | ||||||
| const next = new Set(prev); | ||||||
| if (next.has(rId)) next.delete(rId); | ||||||
|
|
@@ -436,6 +443,17 @@ | |||||
| ]); | ||||||
| }; | ||||||
|
|
||||||
| const scrollToChatSection = () => { | ||||||
| const container = contentScrollRef.current; | ||||||
| const target = chatSectionRef.current; | ||||||
| if (!container || !target) return; | ||||||
|
|
||||||
| const containerRect = container.getBoundingClientRect(); | ||||||
| const targetRect = target.getBoundingClientRect(); | ||||||
| const top = targetRect.top - containerRect.top + container.scrollTop - 12; | ||||||
| container.scrollTo({ top: Math.max(top, 0), behavior: "smooth" }); | ||||||
| }; | ||||||
|
|
||||||
| const handleSendMessage = async (presetText?: string) => { | ||||||
| const text = (presetText ?? chatInput).trim(); | ||||||
| if (!text || chatLoading) return; | ||||||
|
|
@@ -444,8 +462,13 @@ | |||||
| setChatInput(""); | ||||||
| setChatLoading(true); | ||||||
| setStatusMessage(null); | ||||||
| // Keep current panel selections while sending a message | ||||||
|
There was a problem hiding this comment. The comment says this keeps current panel selections, but this code still forces
Suggested change
|
||||||
| setSidebarView("none"); | ||||||
| requestAnimationFrame(() => { | ||||||
| requestAnimationFrame(() => { | ||||||
| scrollToChatSection(); | ||||||
| }); | ||||||
| }); | ||||||
|
Comment on lines
+467
to
+471
There was a problem hiding this comment. The nested |
||||||
|
|
||||||
| try { | ||||||
| const res = await fetch("/api/chat", { | ||||||
|
|
@@ -599,13 +622,13 @@ | |||||
| // ─── Render ─────────────────────────────────────────────────────────────── | ||||||
|
|
||||||
| return ( | ||||||
| <div className="flex h-dvh flex-col overflow-hidden bg-gradient-to-br from-amber-50 via-orange-50/70 to-amber-100/80 text-foreground dark:from-slate-950 dark:via-slate-900 dark:to-slate-950"> | ||||||
| {/* Header */} | ||||||
| <header className="relative overflow-hidden border-b border-orange-200 dark:border-orange-900/20 bg-gradient-to-r from-amber-50 via-orange-50 to-amber-100 dark:from-slate-900 dark:via-slate-800 dark:to-slate-900 px-6 py-5 shadow-lg"> | ||||||
| <div className="absolute inset-0 opacity-30 bg-gradient-to-r from-orange-400/10 via-red-400/10 to-purple-400/10 dark:from-orange-500/5 dark:to-purple-500/5 pointer-events-none" /> | ||||||
| <div className="mx-auto flex w-full max-w-6xl items-center justify-between gap-4 relative z-10"> | ||||||
| <div> | ||||||
| <h1 className="text-3xl font-black bg-gradient-to-r from-orange-600 via-orange-500 to-red-600 bg-clip-text text-transparent">🍽️ QuickBite</h1> | ||||||
| <div className="flex items-center gap-3 mt-1"> | ||||||
| <p className="text-sm text-orange-600 dark:text-orange-400 font-medium">Welcome back, {user.name}</p> | ||||||
| {userLocation && ( | ||||||
|
|
@@ -647,7 +670,7 @@ | |||||
| </div> | ||||||
| </header> | ||||||
|
|
||||||
| <main className="flex min-h-0 flex-1 overflow-hidden"> | ||||||
| {/* ── Sidebar ── */} | ||||||
| <aside className="hidden w-56 shrink-0 flex-col border-r border-orange-200 dark:border-orange-900/20 bg-gradient-to-b from-white via-orange-50/50 to-white dark:from-slate-900 dark:via-slate-800 dark:to-slate-900 md:flex shadow-lg"> | ||||||
| <div className="p-6"> | ||||||
|
|
@@ -711,9 +734,9 @@ | |||||
| </aside> | ||||||
|
|
||||||
| {/* ── Main content ── */} | ||||||
| <div className="flex min-h-0 flex-1 flex-col overflow-hidden"> | ||||||
| <div ref={contentScrollRef} className="min-h-0 flex-1 overflow-y-auto p-6 pb-5"> | ||||||
| <div className="mx-auto w-full max-w-6xl space-y-6 xl:max-w-7xl"> | ||||||
|
|
||||||
| {/* Past Orders */} | ||||||
| {sidebarView === "past-orders" && ( | ||||||
|
|
@@ -957,12 +980,12 @@ | |||||
| {/* Default: chat + AI views */} | ||||||
| {sidebarView === "none" && ( | ||||||
| <> | ||||||
| <h2 ref={chatSectionRef} className="text-center text-4xl font-black bg-gradient-to-r from-orange-600 via-red-600 to-orange-500 bg-clip-text text-transparent"> | ||||||
| What are you craving today? | ||||||
| </h2> | ||||||
|
|
||||||
| {/* Chat messages */} | ||||||
| <div ref={chatScrollRef} className="max-h-[42vh] space-y-4 overflow-y-auto pr-1"> | ||||||
| {chatMessages.map((msg) => ( | ||||||
| <div | ||||||
| key={msg.id} | ||||||
|
|
@@ -1066,17 +1089,16 @@ | |||||
| ))} | ||||||
| </div> | ||||||
| )} | ||||||
| </div> | ||||||
|
|
||||||
| {/* AI restaurant grid - show by default so restaurant images stay visible */} | ||||||
| {(aiView === "restaurants" || aiView === "none") && ( | ||||||
| <div className="space-y-4"> | ||||||
| <div className="flex items-center justify-between"> | ||||||
| <h2 className="text-2xl font-bold text-orange-600">🏪 All Restaurants ({restaurants.length})</h2> | ||||||
| <span className="text-sm text-gray-500 dark:text-gray-400">Sorted by distance</span> | ||||||
| </div> | ||||||
| <div className={restaurantGridClass}> | ||||||
| {restaurants.map((r, idx) => ( | ||||||
| <div | ||||||
| key={r.id} | ||||||
|
|
@@ -1258,7 +1280,7 @@ | |||||
| )} | ||||||
|
|
||||||
| {/* Chat input bar */} | ||||||
| <div className="border-t border-orange-200 dark:border-orange-900/20 bg-gradient-to-r from-amber-50 via-orange-50 to-amber-100 dark:from-slate-900 dark:via-slate-800 dark:to-slate-900 p-4 shadow-lg"> | ||||||
| <div className="mx-auto flex max-w-3xl gap-3"> | ||||||
| <input | ||||||
| value={chatInput} | ||||||
|
|
@@ -1282,7 +1304,7 @@ | |||||
|
|
||||||
| {/* ── Cart panel ── */} | ||||||
| {isOpen && ( | ||||||
| <div className="flex min-h-0 w-96 shrink-0 flex-col border-l-2 border-orange-200 dark:border-orange-900/20 bg-gradient-to-b from-amber-50 via-orange-50 to-amber-100 dark:from-slate-900 dark:via-slate-800 dark:to-slate-900 shadow-2xl"> | ||||||
| <div className="flex items-center justify-between border-b-2 border-orange-200 dark:border-orange-900/20 bg-gradient-to-r from-orange-500 to-red-600 px-6 py-4 text-white shadow-lg"> | ||||||
| <h2 className="text-lg font-bold">🛒 Your Cart</h2> | ||||||
| <button | ||||||
|
|
@@ -1294,7 +1316,7 @@ | |||||
| </button> | ||||||
| </div> | ||||||
|
|
||||||
| <div className="min-h-0 flex-1 space-y-3 overflow-y-auto p-4"> | ||||||
| {items.length === 0 ? ( | ||||||
| <div className="mt-12 text-center space-y-3"> | ||||||
| <p className="text-4xl">🍕</p> | ||||||
|
|
@@ -1344,7 +1366,7 @@ | |||||
| </div> | ||||||
|
|
||||||
| {items.length > 0 && ( | ||||||
| <div className="shrink-0 space-y-4 border-t-2 border-orange-200 dark:border-orange-900/20 bg-gradient-to-r from-amber-100 via-orange-50 to-amber-100 dark:from-slate-800 dark:via-slate-800 dark:to-slate-900 p-4"> | ||||||
| <div className="space-y-2"> | ||||||
| <div className="flex justify-between text-sm font-medium"> | ||||||
| <span className="text-gray-700 dark:text-gray-300">Subtotal</span> | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
scrollToChatSectionuses a hard-coded- 12offset when computing the scroll target. Please replace this magic number with a named constant and/or derive it from layout (e.g., container padding / desired spacing) so future style changes don’t silently break scroll positioning.