bender/40ac155c-8fc0-43ee-9873-51925e2cba83
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
bender
2026-02-16 15:06:02 +00:00
parent 594964f888 39876f7306
commit d62ec91ff3
4 changed files with 109 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/blog/page.tsx
View File

@@ -29,13 +29,14 @@ export default function BlogPage() {
brandName="Coca-Cola"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Order Now", href: "#products" }}
button={{ text: "Order Now", href: "/shop" }}
/>
</div>
@@ -64,26 +65,26 @@ export default function BlogPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "#products" },
{ label: "Classic Coke", href: "#" },
{ label: "Diet Coke", href: "#" },
{ label: "Coke Zero", href: "#" }
{ label: "All Products", href: "/shop" },
{ label: "Classic Coke", href: "/shop" },
{ label: "Diet Coke", href: "/shop" },
{ label: "Coke Zero", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Heritage", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Sustainability", href: "#" }
{ label: "About Us", href: "about" },
{ label: "Our Heritage", href: "about" },
{ label: "Careers", href: "about" },
{ label: "Sustainability", href: "about" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" }
{ label: "Contact Us", href: "contact" },
{ label: "FAQ", href: "/blog" },
{ label: "Shipping Info", href: "/shop" },
{ label: "Returns", href: "/shop" }
]
},
{

48
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import HeroLogoBillboardSplit from '@/components/sections/hero/HeroLogoBillboardSplit';
@@ -31,14 +31,15 @@ export default function LandingPage() {
<NavbarLayoutFloatingOverlay
brandName="Coca-Cola"
navItems={[
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" }
]}
button={{
text: "Order Now", href: "#products"
text: "Order Now", href: "/shop"
}}
/>
</div>
@@ -49,8 +50,8 @@ export default function LandingPage() {
description="Taste the refreshment that has delighted generations. Premium quality beverages crafted for every moment. From classic cola to innovative flavors, discover your perfect drink."
background={{ variant: "sparkles-gradient" }}
buttons={[
{ text: "Shop Now", href: "#products" },
{ text: "Learn More", href: "#about" }
{ text: "Shop Now", href: "/shop" },
{ text: "Learn More", href: "about" }
]}
layoutOrder="default"
imageSrc="https://img.b2bpic.net/free-photo/pouring-soda-drink-from-bottle-glass-close-up_169016-19026.jpg"
@@ -142,21 +143,21 @@ export default function LandingPage() {
plans={[
{
id: "single", badge: "Single Bottle", badgeIcon: Droplet,
price: "$2.99", subtitle: "Perfect for a quick refresh", buttons: [{ text: "Add to Cart", href: "#" }],
price: "$2.99", subtitle: "Perfect for a quick refresh", buttons: [{ text: "Add to Cart", href: "/shop" }],
features: [
"Single 20oz bottle", "Fresh and cold delivery", "Free local shipping over $10"
]
},
{
id: "case", badge: "Most Popular", badgeIcon: Sparkles,
price: "$35.99", subtitle: "Best value for regular consumers", buttons: [{ text: "Select Case", href: "#" }],
price: "$35.99", subtitle: "Best value for regular consumers", buttons: [{ text: "Select Case", href: "/shop" }],
features: [
"12 pack of 12oz bottles", "Premium refrigerated delivery", "Free shipping included", "Exclusive member benefits"
]
},
{
id: "subscription", badge: "Premium Subscription", badgeIcon: Award,
price: "$99.99/mo", subtitle: "Unlimited refreshment monthly", buttons: [{ text: "Subscribe Now", href: "#" }],
price: "$99.99/mo", subtitle: "Unlimited refreshment monthly", buttons: [{ text: "Subscribe Now", href: "/shop" }],
features: [
"Unlimited monthly cases", "Priority fast delivery", "Exclusive seasonal flavors", "24/7 dedicated support", "Member-only pricing"
]
@@ -176,8 +177,7 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={false}
names={[
"Coca-Cola", "Sprite",
"Fanta", "Dasani", "Smartwater", "Minute Maid", "Powerade", "Vitaminwater"
"Coca-Cola", "Sprite", "Fanta", "Dasani", "Smartwater", "Minute Maid", "Powerade", "Vitaminwater"
]}
showCard={true}
speed={40}
@@ -210,8 +210,8 @@ export default function LandingPage() {
text="Ready to refresh yourself with the world's favorite beverage? Join millions of satisfied customers and discover why Coca-Cola is the choice of a new generation."
animationType="background-highlight"
buttons={[
{ text: "Order Your First Bottle", href: "#products" },
{ text: "Subscribe for Savings", href: "#pricing" }
{ text: "Order Your First Bottle", href: "/shop" },
{ text: "Subscribe for Savings", href: "pricing" }
]}
background={{ variant: "radial-gradient" }}
useInvertedBackground={false}
@@ -224,26 +224,26 @@ export default function LandingPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "#products" },
{ label: "Classic Coke", href: "#" },
{ label: "Diet Coke", href: "#" },
{ label: "Coke Zero", href: "#" }
{ label: "All Products", href: "/shop" },
{ label: "Classic Coke", href: "/shop" },
{ label: "Diet Coke", href: "/shop" },
{ label: "Coke Zero", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Heritage", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Sustainability", href: "#" }
{ label: "About Us", href: "about" },
{ label: "Our Heritage", href: "about" },
{ label: "Careers", href: "about" },
{ label: "Sustainability", href: "about" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" }
{ label: "Contact Us", href: "contact" },
{ label: "FAQ", href: "/blog" },
{ label: "Shipping Info", href: "/shop" },
{ label: "Returns", href: "/shop" }
]
},
{

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

@@ -86,7 +86,8 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Coca-Cola"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Testimonials", id: "testimonials" },
@@ -104,26 +105,26 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "#products" },
{ label: "Classic Coke", href: "#" },
{ label: "Diet Coke", href: "#" },
{ label: "Coke Zero", href: "#" }
{ label: "All Products", href: "/shop" },
{ label: "Classic Coke", href: "/shop" },
{ label: "Diet Coke", href: "/shop" },
{ label: "Coke Zero", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Heritage", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Sustainability", href: "#" }
{ label: "About Us", href: "about" },
{ label: "Our Heritage", href: "about" },
{ label: "Careers", href: "about" },
{ label: "Sustainability", href: "about" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" }
{ label: "Contact Us", href: "contact" },
{ label: "FAQ", href: "/blog" },
{ label: "Shipping Info", href: "/shop" },
{ label: "Returns", href: "/shop" }
]
},
{
@@ -162,7 +163,8 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Coca-Cola"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Testimonials", id: "testimonials" },
@@ -188,26 +190,26 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "#products" },
{ label: "Classic Coke", href: "#" },
{ label: "Diet Coke", href: "#" },
{ label: "Coke Zero", href: "#" }
{ label: "All Products", href: "/shop" },
{ label: "Classic Coke", href: "/shop" },
{ label: "Diet Coke", href: "/shop" },
{ label: "Coke Zero", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Heritage", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Sustainability", href: "#" }
{ label: "About Us", href: "about" },
{ label: "Our Heritage", href: "about" },
{ label: "Careers", href: "about" },
{ label: "Sustainability", href: "about" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" }
{ label: "Contact Us", href: "contact" },
{ label: "FAQ", href: "/blog" },
{ label: "Shipping Info", href: "/shop" },
{ label: "Returns", href: "/shop" }
]
},
{
@@ -245,7 +247,8 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Coca-Cola"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Testimonials", id: "testimonials" },
@@ -296,26 +299,26 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "#products" },
{ label: "Classic Coke", href: "#" },
{ label: "Diet Coke", href: "#" },
{ label: "Coke Zero", href: "#" }
{ label: "All Products", href: "/shop" },
{ label: "Classic Coke", href: "/shop" },
{ label: "Diet Coke", href: "/shop" },
{ label: "Coke Zero", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Heritage", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Sustainability", href: "#" }
{ label: "About Us", href: "about" },
{ label: "Our Heritage", href: "about" },
{ label: "Careers", href: "about" },
{ label: "Sustainability", href: "about" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" }
{ label: "Contact Us", href: "contact" },
{ label: "FAQ", href: "/blog" },
{ label: "Shipping Info", href: "/shop" },
{ label: "Returns", href: "/shop" }
]
},
{

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

@@ -38,7 +38,8 @@ export default function ShopPage() {
brandName="Coca-Cola"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Testimonials", id: "testimonials" },
@@ -56,26 +57,26 @@ export default function ShopPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "#products" },
{ label: "Classic Coke", href: "#" },
{ label: "Diet Coke", href: "#" },
{ label: "Coke Zero", href: "#" }
{ label: "All Products", href: "/shop" },
{ label: "Classic Coke", href: "/shop" },
{ label: "Diet Coke", href: "/shop" },
{ label: "Coke Zero", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Heritage", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Sustainability", href: "#" }
{ label: "About Us", href: "about" },
{ label: "Our Heritage", href: "about" },
{ label: "Careers", href: "about" },
{ label: "Sustainability", href: "about" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" }
{ label: "Contact Us", href: "contact" },
{ label: "FAQ", href: "/blog" },
{ label: "Shipping Info", href: "/shop" },
{ label: "Returns", href: "/shop" }
]
},
{
@@ -113,7 +114,8 @@ export default function ShopPage() {
brandName="Coca-Cola"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Testimonials", id: "testimonials" },
@@ -139,26 +141,26 @@ export default function ShopPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "#products" },
{ label: "Classic Coke", href: "#" },
{ label: "Diet Coke", href: "#" },
{ label: "Coke Zero", href: "#" }
{ label: "All Products", href: "/shop" },
{ label: "Classic Coke", href: "/shop" },
{ label: "Diet Coke", href: "/shop" },
{ label: "Coke Zero", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Heritage", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Sustainability", href: "#" }
{ label: "About Us", href: "about" },
{ label: "Our Heritage", href: "about" },
{ label: "Careers", href: "about" },
{ label: "Sustainability", href: "about" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" }
{ label: "Contact Us", href: "contact" },
{ label: "FAQ", href: "/blog" },
{ label: "Shipping Info", href: "/shop" },
{ label: "Returns", href: "/shop" }
]
},
{