bender/b323098e-f482-41b8-8b29-bde1a36da291
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 4 commits from version_2 into main 2026-02-21 18:22:30 +00:00
Conversation 0 Commits 4 Files Changed 4 +42 -46
4 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
// Import the specified Navbar component
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
// Import the specified Blog Section component
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
@@ -30,19 +30,21 @@ export default function BlogPage() {
headingFontWeight="semibold"
>
<ReactLenis root>
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Features", id: "features" },
{ name: "About", id: "about" },
{ name: "Pricing", id: "pricing" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
]}
brandName="AI Voyage"
bottomLeftText="Explore Smarter"
bottomRightText="hello@aivoyage.com"
/>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Features", id: "#features" },
{ name: "About", id: "#about" },
{ name: "Pricing", id: "#pricing" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
brandName="AI Voyage"
button={{ text: "Get Started", href: "#contact" }}
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">

9
src/app/page.tsx
View File

@@ -1,7 +1,7 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import HeroBillboardDashboard from '@/components/sections/hero/HeroBillboardDashboard';
import FeatureBento from '@/components/sections/feature/FeatureBento';
import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
@@ -52,11 +52,10 @@ export default function LandingPage() {
headingFontWeight="semibold"
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[{name:"Features",id:"features"},{name:"About",id:"about"},{name:"Pricing",id:"pricing"},{name:"Testimonials",id:"testimonials"},{name:"Contact",id:"contact"}]}
<NavbarLayoutFloatingInline
navItems={[{name:"Home", id:"/"}, {name:"Features",id:"#features"},{name:"About",id:"#about"},{name:"Pricing",id:"#pricing"},{name:"Testimonials",id:"#testimonials"}, {name:"Blog", id:"/blog"}, {name:"Shop", id:"/shop"}]}
brandName="AI Voyage"
bottomLeftText="Explore Smarter"
bottomRightText="hello@aivoyage.com"
button={{ text: "Get Started", href: "#contact" }}
/>
</div>
<div id="hero" data-section="hero">

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

@@ -4,7 +4,7 @@ import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
import ProductCart from "@/components/ecommerce/cart/ProductCart";
@@ -89,12 +89,11 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Features", id: "#features" }, { name: "About", id: "#about" }, { name: "Pricing", id: "#pricing" }, { name: "Testimonials", id: "#testimonials" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="AI Voyage"
bottomLeftText="Explore Smarter"
bottomRightText="hello@aivoyage.com"
button={{ text: "Get Started", href: "#contact" }}
/>
</div>
<div id="loading-state" data-section="loading-state">
@@ -122,12 +121,11 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Features", id: "#features" }, { name: "About", id: "#about" }, { name: "Pricing", id: "#pricing" }, { name: "Testimonials", id: "#testimonials" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="AI Voyage"
bottomLeftText="Explore Smarter"
bottomRightText="hello@aivoyage.com"
button={{ text: "Get Started", href: "#contact" }}
/>
</div>
<div id="not-found-state" data-section="not-found-state">
@@ -162,12 +160,11 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Features", id: "#features" }, { name: "About", id: "#about" }, { name: "Pricing", id: "#pricing" }, { name: "Testimonials", id: "#testimonials" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="AI Voyage"
bottomLeftText="Explore Smarter"
bottomRightText="hello@aivoyage.com"
button={{ text: "Get Started", href: "#contact" }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">

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

@@ -3,7 +3,7 @@
import { Suspense } from "react";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
import { useProductCatalog } from "@/hooks/useProductCatalog";
@@ -32,12 +32,11 @@ function ShopPageContent() {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Features", id: "#features" }, { name: "About", id: "#about" }, { name: "Pricing", id: "#pricing" }, { name: "Testimonials", id: "#testimonials" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="AI Voyage"
bottomLeftText="Explore Smarter"
bottomRightText="hello@aivoyage.com"
button={{ text: "Get Started", href: "#contact" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -74,12 +73,11 @@ function ShopPageContent() {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Features", id: "#features" }, { name: "About", id: "#about" }, { name: "Pricing", id: "#pricing" }, { name: "Testimonials", id: "#testimonials" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="AI Voyage"
bottomLeftText="Explore Smarter"
bottomRightText="hello@aivoyage.com"
button={{ text: "Get Started", href: "#contact" }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">