Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-23 09:49:51 +00:00
4 changed files with 176 additions and 243 deletions

View File

@@ -24,16 +24,18 @@ export default function BlogPage() {
headingFontWeight="bold"
>
<ReactLenis root>
<NavbarStyleApple
brandName="Gladiatogo"
navItems={[
{ name: "Home", id: "/" },
{ name: "Fleet", id: "#fleet" },
{ name: "About", id: "#about" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "Contact", id: "#contact" },
]}
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Gladiatogo"
navItems={[
{ name: "Home", id: "/" },
{ name: "Fleet", id: "/#product" },
{ name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonial" },
{ name: "Contact", id: "/#contact" },
]}
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
@@ -50,35 +52,36 @@ export default function BlogPage() {
carouselMode="buttons"
/>
)}
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/car-with-lights-driving-down-road_23-2151850179.jpg?_wi=2"
imageAlt="Road with cars at sunset"
logoText="Gladiatogo"
columns={[
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Fleet", href: "#fleet" },
{ label: "Careers", href: "#" },
],
},
{
title: "Support", items: [
{ label: "FAQs", href: "#faq" },
{ label: "Contact", href: "#contact" },
{ label: "Help Center", href: "#" },
],
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms of Service", href: "#" },
],
},
]}
copyrightText="© 2024 Gladiatogo. All rights reserved."
/>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/car-with-lights-driving-down-road_23-2151850179.jpg"
imageAlt="Road with cars at sunset"
logoText="Gladiatogo"
columns={[
{
title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "Our Fleet", href: "/#product" },
{ label: "Careers", href: "#" },
],
},
{
title: "Support", items: [
{ label: "FAQs", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
{ label: "Help Center", href: "#" },
],
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms of Service", href: "#" },
],
},
]}
copyrightText="© 2024 Gladiatogo. All rights reserved."
/>
</div>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -28,10 +28,10 @@ export default function LandingPage() {
<NavbarStyleApple
brandName="Gladiatogo"
navItems={[
{ name: "Home", id: "#home" },
{ name: "Fleet", id: "#fleet" },
{ name: "Home", id: "/" },
{ name: "Fleet", id: "#product" },
{ name: "About", id: "#about" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "Testimonials", id: "#testimonial" },
{ name: "Contact", id: "#contact" },
]}
/>
@@ -40,9 +40,9 @@ export default function LandingPage() {
<HeroSplit
title="Drive Your Adventure. Rent with Gladiatogo."
description="Seamlessly book your dream car for any journey. Explore our premium fleet and hit the road with confidence."
background={{ variant: "grid" }}
background={{ variant: "animated-grid" }}
buttons={[
{ text: "Book Now", href: "#fleet" },
{ text: "Book Now", href: "#product" },
{ text: "Learn More", href: "#about" },
]}
imageSrc="https://img.b2bpic.net/free-photo/it-has-few-special-functions-female-customer-modern-stylish-bearded-businessman-automobile-saloon_146671-16061.jpg"
@@ -65,7 +65,7 @@ export default function LandingPage() {
mediaAnimation="slide-up"
textboxLayout="default"
useInvertedBackground={false}
imageSrc="https://img.b2bpic.net/free-photo/transportation-ownership-concept-customer-salesman-with-car-key_1423-183.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/transportation-ownership-concept-customer-salesman-with-car-key_1423-183.jpg"
imageAlt="Car keys on a modern counter, representing rental process"
/>
</div>
@@ -78,12 +78,12 @@ export default function LandingPage() {
animationType="slide-up"
gridVariant="three-columns-all-equal-width"
products={[
{ id: "1", brand: "Gladiatogo", name: "Standard Sedan", price: "From $49/day", rating: 4, reviewCount: "1.2K", imageSrc: "https://img.b2bpic.net/free-photo/grey-coupe-rainy-highway-motion-focus_169016-69693.jpg?_wi=1", imageAlt: "Modern sedan car for rental" },
{ id: "2", brand: "Gladiatogo", name: "Luxury SUV", price: "From $89/day", rating: 5, reviewCount: "850", imageSrc: "https://img.b2bpic.net/free-photo/good-friends-playing-guitar-while-traveling-by-car_23-2148771860.jpg?_wi=1", imageAlt: "Spacious luxury SUV for rent" },
{ id: "1", brand: "Gladiatogo", name: "Standard Sedan", price: "From $49/day", rating: 4, reviewCount: "1.2K", imageSrc: "https://img.b2bpic.net/free-photo/grey-coupe-rainy-highway-motion-focus_169016-69693.jpg", imageAlt: "Modern sedan car for rental" },
{ id: "2", brand: "Gladiatogo", name: "Luxury SUV", price: "From $89/day", rating: 5, reviewCount: "850", imageSrc: "https://img.b2bpic.net/free-photo/good-friends-playing-guitar-while-traveling-by-car_23-2148771860.jpg", imageAlt: "Spacious luxury SUV for rent" },
{ id: "3", brand: "Gladiatogo", name: "Sports Coupe", price: "From $129/day", rating: 5, reviewCount: "630", imageSrc: "https://img.b2bpic.net/free-photo/high-speed-silver-sport-car-driving-highway-sunny-weather_114579-4031.jpg", imageAlt: "Sleek red sports coupe available for rent" },
{ id: "4", brand: "Gladiatogo", name: "Compact Hatchback", price: "From $35/day", rating: 4, reviewCount: "1.5K", imageSrc: "https://img.b2bpic.net/free-photo/grey-coupe-rainy-highway-motion-focus_169016-69693.jpg?_wi=2", imageAlt: "Compact hatchback for city driving" },
{ id: "5", brand: "Gladiatogo", name: "Premium Electric", price: "From $99/day", rating: 5, reviewCount: "480", imageSrc: "https://img.b2bpic.net/free-photo/good-friends-playing-guitar-while-traveling-by-car_23-2148771860.jpg?_wi=2", imageAlt: "Electric SUV charging station" },
{ id: "6", brand: "Gladiatogo", name: "Minivan", price: "From $75/day", rating: 4, reviewCount: "900", imageSrc: "https://img.b2bpic.net/free-photo/grey-coupe-rainy-highway-motion-focus_169016-69693.jpg?_wi=3", imageAlt: "Family minivan for rent" },
{ id: "4", brand: "Gladiatogo", name: "Compact Hatchback", price: "From $35/day", rating: 4, reviewCount: "1.5K", imageSrc: "https://img.b2bpic.net/free-photo/grey-coupe-rainy-highway-motion-focus_169016-69693.jpg", imageAlt: "Compact hatchback for city driving" },
{ id: "5", brand: "Gladiatogo", name: "Premium Electric", price: "From $99/day", rating: 5, reviewCount: "480", imageSrc: "https://img.b2bpic.net/free-photo/good-friends-playing-guitar-while-traveling-by-car_23-2148771860.jpg", imageAlt: "Electric SUV charging station" },
{ id: "6", brand: "Gladiatogo", name: "Minivan", price: "From $75/day", rating: 4, reviewCount: "900", imageSrc: "https://img.b2bpic.net/free-photo/grey-coupe-rainy-highway-motion-focus_169016-69693.jpg", imageAlt: "Family minivan for rent" },
]}
/>
</div>
@@ -111,7 +111,7 @@ export default function LandingPage() {
faqsAnimation="slide-up"
animationType="smooth"
mediaPosition="left"
imageSrc="https://img.b2bpic.net/free-photo/transportation-ownership-concept-customer-salesman-with-car-key_1423-183.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/transportation-ownership-concept-customer-salesman-with-car-key_1423-183.jpg"
imageAlt="Customer service representative helping a client"
faqs={[
{ id: "1", title: "What documents do I need to rent a car?", content: "You will need a valid driver's license, a credit card in your name, and proof of identity." },
@@ -139,11 +139,11 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/car-with-lights-driving-down-road_23-2151850179.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/car-with-lights-driving-down-road_23-2151850179.jpg"
imageAlt="Road with cars at sunset"
logoText="Gladiatogo"
columns={[
{ title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Our Fleet", href: "#fleet" }, { label: "Careers", href: "#" }] },
{ title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Our Fleet", href: "#product" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "FAQs", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Help Center", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] },
]}

View File

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -74,74 +74,6 @@ function ProductPageContent({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
if (isLoading) {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="small"
sizing="largeSmall"
background="grid"
cardStyle="glass-elevated"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleApple
brandName="Gladiatogo"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
</main>
</ReactLenis>
</ThemeProvider>
);
}
if (!product) {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="small"
sizing="largeSmall"
background="grid"
cardStyle="glass-elevated"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleApple
brandName="Gladiatogo"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<div className="text-center">
<p className="text-foreground mb-4">Product not found</p>
<button
onClick={() => router.push("/shop")}
className="primary-button px-6 py-2 rounded-theme text-primary-cta-text"
>
Back to Shop
</button>
</div>
</main>
</ReactLenis>
</ThemeProvider>
);
}
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
@@ -156,62 +88,82 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Gladiatogo"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
<ProductDetailCard
layout="page"
name={product.name}
price={product.price}
salePrice={meta.salePrice}
rating={product.rating || 0}
description={product.description}
images={images}
variants={variants.length > 0 ? variants : undefined}
quantity={quantityVariant}
ribbon={meta.ribbon}
inventoryStatus={meta.inventoryStatus}
inventoryQuantity={meta.inventoryQuantity}
sku={meta.sku}
buttons={[
{ text: "Add To Cart", onClick: handleAddToCart },
{ text: "Buy Now", onClick: handleBuyNow },
]}
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/car-with-lights-driving-down-road_23-2151850179.jpg?_wi=4"
imageAlt="Road with cars at sunset"
logoText="Gladiatogo"
columns={[
{ title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Our Fleet", href: "#fleet" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "FAQs", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Help Center", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
copyrightText="© 2024 Gladiatogo. All rights reserved."
/>
</div>
{isLoading ? (
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
</main>
) : !product ? (
<main className="min-h-screen flex items-center justify-center pt-20">
<div className="text-center">
<p className="text-foreground mb-4">Product not found</p>
<button
onClick={() => router.push("/shop")}
className="primary-button px-6 py-2 rounded-theme text-primary-cta-text"
>
Back to Shop
</button>
</div>
</main>
) : (
<>
<div id="product-detail-card" data-section="product-detail-card">
<ProductDetailCard
layout="page"
name={product.name}
price={product.price}
salePrice={meta.salePrice}
rating={product.rating || 0}
description={product.description}
images={images}
variants={variants.length > 0 ? variants : undefined}
quantity={quantityVariant}
ribbon={meta.ribbon}
inventoryStatus={meta.inventoryStatus}
inventoryQuantity={meta.inventoryQuantity}
sku={meta.sku}
buttons={[
{ text: "Add To Cart", onClick: handleAddToCart },
{ text: "Buy Now", onClick: handleBuyNow },
]}
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/car-with-lights-driving-down-road_23-2151850179.jpg"
imageAlt="Road with cars at sunset"
logoText="Gladiatogo"
columns={[
{ title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Our Fleet", href: "/#product" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "FAQs", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Help Center", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
copyrightText="© 2024 Gladiatogo. All rights reserved."
/>
</div>
</>
)}
</ReactLenis>
</ThemeProvider>
);

View File

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
@@ -41,36 +41,6 @@ function ShopPageContent() {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
if (isLoading) {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="small"
sizing="largeSmall"
background="grid"
cardStyle="glass-elevated"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleApple
brandName="Gladiatogo"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading products...</p>
</main>
</ReactLenis>
</ThemeProvider>
);
}
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
@@ -85,52 +55,60 @@ function ShopPageContent() {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Gladiatogo"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
<ProductCatalog
layout="page"
products={products}
searchValue={search}
onSearchChange={setSearch}
searchPlaceholder="Search products..."
filters={filters}
emptyMessage="No products found"
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/car-with-lights-driving-down-road_23-2151850179.jpg?_wi=3"
imageAlt="Road with cars at sunset"
logoText="Gladiatogo"
columns={[
{ title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Our Fleet", href: "#fleet" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "FAQs", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Help Center", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
copyrightText="© 2024 Gladiatogo. All rights reserved."
/>
</div>
{isLoading ? (
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading products...</p>
</main>
) : (
<>
<div id="product-catalog" data-section="product-catalog">
<ProductCatalog
layout="page"
products={products}
searchValue={search}
onSearchChange={setSearch}
searchPlaceholder="Search products..."
filters={filters}
emptyMessage="No products found"
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/car-with-lights-driving-down-road_23-2151850179.jpg"
imageAlt="Road with cars at sunset"
logoText="Gladiatogo"
columns={[
{ title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Our Fleet", href: "/#product" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "FAQs", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Help Center", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
copyrightText="© 2024 Gladiatogo. All rights reserved."
/>
</div>
</>
)}
</ReactLenis>
</ThemeProvider>
);