bender/3a40be81-8f4c-4725-b166-9f1188706cd2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 7 commits from version_1 into main 2026-02-21 23:57:26 +00:00
Conversation 0 Commits 7 Files Changed 7 +17 -32
7 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/about/page.tsx
View File

@@ -10,7 +10,7 @@ import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis'
import { Coffee, Sun, Users, Leaf, Armchair } from "lucide-react";
export default function AboutPage() {
const navItems = [{"name":"Home","id":"/"},{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"},{"name":"Order Ahead","id":"/order"}];
const navItems = [{"name":"Home","id":"/"},{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"},{"name":"Order Ahead","id":"/order"},{"name":"Shop","id":"/shop"}];
const footerColumns = [{"items":[{"label":"Home","href":"/"},{"label":"Menu","href":"/menu"},{"label":"About","href":"/about"},{"label":"Order Ahead","href":"/order"}]},{"items":[{"label":"Hours","href":"/about"},{"label":"Instagram","href":"https://instagram.com/midnightcafe"}]}];
return (

25
src/app/layout.tsx
View File

@@ -4,39 +4,26 @@ import { Inter } from "next/font/google";
import "./globals.css";
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
variable: "--font-dm-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Midnight Cafe | Iowa City's Elevated Coffee Experience",
description: "Midnight Cafe is Iowa City's premier destination for luxury craft coffee, natural light, and a vibrant local community. Experience perfected pours and a welcoming ambiance.",
robots: {
title: "Midnight Cafe | Iowa City's Elevated Coffee Experience", description: "Midnight Cafe is Iowa City's premier destination for luxury craft coffee, natural light, and a vibrant local community. Experience perfected pours and a welcoming ambiance.", robots: {
index: true,
follow: true,
},
openGraph: {
title: "Midnight Cafe | Iowa City's Elevated Coffee Experience",
description: "Midnight Cafe is Iowa City's premier destination for luxury craft coffee, natural light, and a vibrant local community. Experience perfected pours and a welcoming ambiance.",
url: "https://midnightcafe.com",
siteName: "Midnight Cafe",
images: [
title: "Midnight Cafe | Iowa City's Elevated Coffee Experience", description: "Midnight Cafe is Iowa City's premier destination for luxury craft coffee, natural light, and a vibrant local community. Experience perfected pours and a welcoming ambiance.", url: "https://midnightcafe.com", siteName: "Midnight Cafe", images: [
{
url: "https://img.b2bpic.net/free-photo/talanted-barista-is-pouring-milk-jug-latte-cappuchino-his-cafe_613910-3236.jpg",
alt: "Slow motion espresso pour in a cafe",
},
url: "https://img.b2bpic.net/free-photo/talanted-barista-is-pouring-milk-jug-latte-cappuchino-his-cafe_613910-3236.jpg", alt: "Slow motion espresso pour in a cafe"},
],
},
twitter: {
card: "summary_large_image",
title: "Midnight Cafe | Iowa City's Elevated Coffee Experience",
description: "Midnight Cafe is Iowa City's premier destination for luxury craft coffee, natural light, and a vibrant local community. Experience perfected pours and a welcoming ambiance.",
images: ["https://img.b2bpic.net/free-photo/talanted-barista-is-pouring-milk-jug-latte-cappuchino-his-cafe_613910-3236.jpg"],
card: "summary_large_image", title: "Midnight Cafe | Iowa City's Elevated Coffee Experience", description: "Midnight Cafe is Iowa City's premier destination for luxury craft coffee, natural light, and a vibrant local community. Experience perfected pours and a welcoming ambiance.", images: ["https://img.b2bpic.net/free-photo/talanted-barista-is-pouring-milk-jug-latte-cappuchino-his-cafe_613910-3236.jpg"],
},
};

4
src/app/menu/page.tsx
View File

@@ -7,7 +7,7 @@ import ProductCardOne from '@/components/sections/product/ProductCardOne';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function MenuPage() {
const navItems = [{"name":"Home","id":"/"},{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"},{"name":"Order Ahead","id":"/order"}];
const navItems = [{"name":"Home","id":"/"},{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"},{"name":"Order Ahead","id":"/order"},{"name":"Shop","id":"/shop"}];
const footerColumns = [{"items":[{"label":"Home","href":"/"},{"label":"Menu","href":"/menu"},{"label":"About","href":"/about"},{"label":"Order Ahead","href":"/order"}]},{"items":[{"label":"Hours","href":"/about"},{"label":"Instagram","href":"https://instagram.com/midnightcafe"}]}];
return (
@@ -37,7 +37,7 @@ export default function MenuPage() {
products={[
{ id: "e1", name: "Classic Latte", price: "$4.50", imageSrc: "https://img.b2bpic.net/free-photo/hot-cup-hot-chocolate_140725-7519.jpg", imageAlt: "A classic latte with art" },
{ id: "e2", name: "Rich Americano", price: "$3.75", imageSrc: "https://img.b2bpic.net/free-photo/top-view-tasty-espresso-served-cup-with-coffee_24972-2324.jpg", imageAlt: "A rich Americano coffee" },
{ id: "e3", name: "Velvet Cappuccino", price: "$4.50", imageSrc: "https://img.b2bpic.net/free-photo/talanted-barista-is-pouring-milk-jug-latte-cappuchino-his-cafe_613910-3236.jpg?_wi=2", imageAlt: "A velvety cappuccino" }
{ id: "e3", name: "Velvet Cappuccino", price: "$4.50", imageSrc: "https://img.b2bpic.net/free-photo/talanted-barista-is-pouring-milk-jug-latte-cappuchino-his-cafe_613910-3236.jpg", imageAlt: "A velvety cappuccino" }
]}
gridVariant="three-columns-all-equal-width"
animationType="slide-up"

2
src/app/order/page.tsx
View File

@@ -10,7 +10,7 @@ import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis'
import { Clock, Star, Gift, BookOpen, ShoppingCart, Coffee } from "lucide-react";
export default function OrderPage() {
const navItems = [{"name":"Home","id":"/"},{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"},{"name":"Order Ahead","id":"/order"}];
const navItems = [{"name":"Home","id":"/"},{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"},{"name":"Order Ahead","id":"/order"},{"name":"Shop","id":"/shop"}];
const footerColumns = [{"items":[{"label":"Home","href":"/"},{"label":"Menu","href":"/menu"},{"label":"About","href":"/about"},{"label":"Order Ahead","href":"/order"}]},{"items":[{"label":"Hours","href":"/about"},{"label":"Instagram","href":"https://instagram.com/midnightcafe"}]}];
return (

4
src/app/page.tsx
View File

@@ -12,7 +12,7 @@ import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis'
import { Coffee, Sun, Users, Vegan } from "lucide-react";
export default function HomePage() {
const navItems = [{"name":"Home","id":"/"},{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"},{"name":"Order Ahead","id":"/order"}];
const navItems = [{"name":"Home","id":"/"},{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"},{"name":"Order Ahead","id":"/order"},{"name":"Shop","id":"/shop"}];
const footerColumns = [{"items":[{"label":"Home","href":"/"},{"label":"Menu","href":"/menu"},{"label":"About","href":"/about"},{"label":"Order Ahead","href":"/order"}]},{"items":[{"label":"Hours","href":"/about"},{"label":"Instagram","href":"https://instagram.com/midnightcafe"}]}];
return (
@@ -40,7 +40,7 @@ export default function HomePage() {
title="Midnight Cafe"
description="Where coffee isn’t just made. It’s mastered."
background={{ "variant": "plain" }}
imageSrc="https://img.b2bpic.net/free-photo/talanted-barista-is-pouring-milk-jug-latte-cappuchino-his-cafe_613910-3236.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/talanted-barista-is-pouring-milk-jug-latte-cappuchino-his-cafe_613910-3236.jpg"
imageAlt="Slow motion espresso pour with natural light"
imagePosition="right"
buttons={[{ "text": "Order Ahead", "href": "/order" }, { "text": "View Menu", "href": "/menu" }]}

7
src/app/shop/[id]/page.tsx
View File

@@ -89,7 +89,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }, { name: "Order Ahead", id: "/order" }, { name: "Shop", id: "/shop" }]}
brandName="Midnight Cafe"
@@ -119,7 +119,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }, { name: "Order Ahead", id: "/order" }, { name: "Shop", id: "/shop" }]}
brandName="Midnight Cafe"
@@ -156,7 +156,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }, { name: "Order Ahead", id: "/order" }, { name: "Shop", id: "/shop" }]}
brandName="Midnight Cafe"
@@ -206,7 +206,6 @@ function ProductPageContent({ params }: ProductPageProps) {
{ items: [{ label: "Hours", href: "/contact#hours" }, { label: "Contact", href: "/contact" }, { label: "Instagram", href: "https://instagram.com/midnightcafe" }] }
]}
logoText="Midnight Cafe"
useInvertedBackground={false}
/>
</div>
</ReactLenis>

5
src/app/shop/page.tsx
View File

@@ -56,7 +56,7 @@ function ShopPageContent() {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }, { name: "Order Ahead", id: "/order" }, { name: "Shop", id: "/shop" }]}
brandName="Midnight Cafe"
@@ -85,7 +85,7 @@ function ShopPageContent() {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }, { name: "Order Ahead", id: "/order" }, { name: "Shop", id: "/shop" }]}
brandName="Midnight Cafe"
@@ -125,7 +125,6 @@ function ShopPageContent() {
{ items: [{ label: "Hours", href: "/contact#hours" }, { label: "Contact", href: "/contact" }, { label: "Instagram", href: "https://instagram.com/midnightcafe" }] }
]}
logoText="Midnight Cafe"
useInvertedBackground={false}
/>
</div>
</ReactLenis>