development/6919f299-80f9-42e6-9c61-f5350e5fba60
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
development merged 5 commits from version_1 into main 2026-01-15 11:37:48 +00:00
Conversation 0 Commits 5 Files Changed 5 +51 -107
5 changed files with 51 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,13 +14,13 @@ export default function AboutPage() {
defaultButtonVariant="hover-bubble"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="compact"
sizing="largeSmallSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="solid"
primaryButtonStyle="double-inset"
secondaryButtonStyle="solid"
headingFontWeight="medium"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -45,24 +45,16 @@ export default function AboutPage() {
tag="Our Story"
bulletPoints={[
{
title: "Ethically Sourced",
description: "Direct partnerships with farmers ensuring fair trade and sustainable practices",
icon: Leaf
title: "Ethically Sourced", description: "Direct partnerships with farmers ensuring fair trade and sustainable practices", icon: Leaf
},
{
title: "Expert Selection",
description: "Handpicked beans and leaves curated by our experienced tasting team",
icon: Award
title: "Expert Selection", description: "Handpicked beans and leaves curated by our experienced tasting team", icon: Award
},
{
title: "Small Batch Roasting",
description: "Fresh roasts prepared in small quantities for maximum flavor and quality",
icon: Flame
title: "Small Batch Roasting", description: "Fresh roasts prepared in small quantities for maximum flavor and quality", icon: Flame
},
{
title: "Community Focused",
description: "Building a community of coffee and tea lovers who appreciate quality",
icon: Users
title: "Community Focused", description: "Building a community of coffee and tea lovers who appreciate quality", icon: Users
}
]}
imageSrc="https://img.b2bpic.net/free-photo/green-tea-leaves-field_53876-95115.jpg"
@@ -82,49 +74,38 @@ export default function AboutPage() {
tag="Our Difference"
negativeCard={{
items: [
"Mass-produced blends",
"Unknown origins",
"Stale inventory",
"Inconsistent quality"
"Mass-produced blends", "Unknown origins", "Stale inventory", "Inconsistent quality"
]
}}
positiveCard={{
items: [
"Small-batch roasted to order",
"Traceable sourcing",
"Fresh roasts delivered monthly",
"Rigorous quality testing"
"Small-batch roasted to order", "Traceable sourcing", "Fresh roasts delivered monthly", "Rigorous quality testing"
]
}}
animationType="slide-up"
textboxLayout="default"
useInvertedBackground="invertDefault"
titleClassName="text-4xl font-bold mb-4"
descriptionClassName="text-base mb-8"
/>
</div>
<FooterBaseReveal
columns={[
{
title: "Shop",
items: [
title: "Shop", items: [
{ label: "Coffee", href: "/products" },
{ label: "Tea", href: "/products" },
{ label: "Brewing Guides", href: "#about" }
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Sustainability", href: "#about" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Newsletter", href: "/contact" }

21
src/app/contact/page.tsx
View File

@@ -13,13 +13,13 @@ export default function ContactPage() {
defaultButtonVariant="hover-bubble"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="compact"
sizing="largeSmallSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="solid"
primaryButtonStyle="double-inset"
secondaryButtonStyle="solid"
headingFontWeight="medium"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -56,24 +56,21 @@ export default function ContactPage() {
<FooterBaseReveal
columns={[
{
title: "Shop",
items: [
title: "Shop", items: [
{ label: "Coffee", href: "/products" },
{ label: "Tea", href: "/products" },
{ label: "Brewing Guides", href: "/about" }
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Sustainability", href: "/about" },
{ label: "Contact", href: "#contact" }
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Newsletter", href: "#contact" }

22
src/app/layout.tsx
View File

@@ -3,36 +3,24 @@ import { Cormorant_Garamond } from "next/font/google";
import "./globals.css";
const cormorantGaramond = Cormorant_Garamond({
variable: "--font-cormorant-garamond",
subsets: ["latin"],
variable: "--font-cormorant-garamond", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
title: "Morning | Premium Tea & Coffee Store",
description: "Discover ethically sourced premium teas and specialty coffees from around the world. Every cup tells a story.",
keywords: "premium coffee, specialty tea, ethically sourced, artisan roaster, organic tea",
metadataBase: new URL("https://morning-store.com"),
title: "Morning | Premium Tea & Coffee Store", description: "Discover ethically sourced premium teas and specialty coffees from around the world. Every cup tells a story.", keywords: "premium coffee, specialty tea, ethically sourced, artisan roaster, organic tea", metadataBase: new URL("https://morning-store.com"),
alternates: {
canonical: "https://morning-store.com"
},
openGraph: {
title: "Morning | Premium Tea & Coffee Store",
description: "Discover ethically sourced premium teas and specialty coffees. Handpicked beans and leaves roasted fresh for exceptional flavor.",
siteName: "Morning",
type: "website",
images: [
title: "Morning | Premium Tea & Coffee Store", description: "Discover ethically sourced premium teas and specialty coffees. Handpicked beans and leaves roasted fresh for exceptional flavor.", siteName: "Morning", type: "website", images: [
{
url: "https://img.b2bpic.net/free-photo/hand-holding-glass-cup-front-sunset_266188-9.jpg",
alt: "Morning premium coffee and tea"
url: "https://img.b2bpic.net/free-photo/hand-holding-glass-cup-front-sunset_266188-9.jpg", alt: "Morning premium coffee and tea"
}
]
},
twitter: {
card: "summary_large_image",
title: "Morning | Premium Tea & Coffee",
description: "Ethically sourced, handpicked beverages roasted fresh to order.",
images: ["https://img.b2bpic.net/free-photo/hand-holding-glass-cup-front-sunset_266188-9.jpg"]
card: "summary_large_image", title: "Morning | Premium Tea & Coffee", description: "Ethically sourced, handpicked beverages roasted fresh to order.", images: ["https://img.b2bpic.net/free-photo/hand-holding-glass-cup-front-sunset_266188-9.jpg"]
},
robots: {
index: true,

21
src/app/page.tsx
View File

@@ -13,13 +13,13 @@ export default function HomePage() {
defaultButtonVariant="hover-bubble"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="compact"
sizing="largeSmallSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="solid"
primaryButtonStyle="double-inset"
secondaryButtonStyle="solid"
headingFontWeight="medium"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -78,24 +78,21 @@ export default function HomePage() {
<FooterBaseReveal
columns={[
{
title: "Shop",
items: [
title: "Shop", items: [
{ label: "Coffee", href: "/products" },
{ label: "Tea", href: "/products" },
{ label: "Brewing Guides", href: "/about" }
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Sustainability", href: "/about" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Newsletter", href: "/contact" }

45
src/app/products/page.tsx
View File

@@ -12,13 +12,13 @@ export default function ProductsPage() {
defaultButtonVariant="hover-bubble"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="compact"
sizing="largeSmallSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="solid"
primaryButtonStyle="double-inset"
secondaryButtonStyle="solid"
headingFontWeight="medium"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -43,32 +43,16 @@ export default function ProductsPage() {
tag="Featured Products"
products={[
{
id: "1",
name: "Single Origin Espresso",
price: "$18.99",
imageSrc: "https://img.b2bpic.net/free-photo/little-beverage-shot-wooden-board_140725-2421.jpg",
imageAlt: "Premium espresso blend"
id: "1", name: "Single Origin Espresso", price: "$18.99", imageSrc: "https://img.b2bpic.net/free-photo/little-beverage-shot-wooden-board_140725-2421.jpg", imageAlt: "Premium espresso blend"
},
{
id: "2",
name: "Chamomile Flower Tea",
price: "$14.99",
imageSrc: "https://img.b2bpic.net/free-photo/fresh-green-yellow-leaves-garden_23-2148058684.jpg",
imageAlt: "Organic chamomile tea"
id: "2", name: "Chamomile Flower Tea", price: "$14.99", imageSrc: "https://img.b2bpic.net/free-photo/fresh-green-yellow-leaves-garden_23-2148058684.jpg", imageAlt: "Organic chamomile tea"
},
{
id: "3",
name: "Silky Latte Blend",
price: "$16.99",
imageSrc: "https://img.b2bpic.net/free-photo/top-view-pancake-inside-round-metal-pan-around-powdered-chocolate-dark-surface_140725-14559.jpg",
imageAlt: "Smooth latte blend coffee"
id: "3", name: "Silky Latte Blend", price: "$16.99", imageSrc: "https://img.b2bpic.net/free-photo/top-view-pancake-inside-round-metal-pan-around-powdered-chocolate-dark-surface_140725-14559.jpg", imageAlt: "Smooth latte blend coffee"
},
{
id: "4",
name: "Premium Green Tea",
price: "$12.99",
imageSrc: "https://img.b2bpic.net/free-photo/healthy-tea-leaves_53876-90195.jpg",
imageAlt: "Traditional green tea leaves"
id: "4", name: "Premium Green Tea", price: "$12.99", imageSrc: "https://img.b2bpic.net/free-photo/healthy-tea-leaves_53876-90195.jpg", imageAlt: "Traditional green tea leaves"
}
]}
gridVariant="uniform-all-items-equal"
@@ -83,24 +67,21 @@ export default function ProductsPage() {
<FooterBaseReveal
columns={[
{
title: "Shop",
items: [
title: "Shop", items: [
{ label: "Coffee", href: "#products" },
{ label: "Tea", href: "#products" },
{ label: "Brewing Guides", href: "/about" }
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Sustainability", href: "/about" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Newsletter", href: "/contact" }