bender/fdafeb37-67df-4e2e-a49a-c0b65d265209
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #4

Merged
bender merged 3 commits from version_4 into main 2026-06-09 09:55:56 +00:00
Conversation 0 Commits 3 Files Changed 3 +83 -89
3 changed files with 83 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/app/account/page.tsx
View File

@@ -6,6 +6,27 @@ import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloating
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
export default function AccountPage() {
const canonicalNavItems = [
{ name: "Home", id: "/" },
{ name: "Categories", id: "/categories" },
{ name: "Products", id: "#products" },
{ name: "Features", id: "#features" },
{ name: "Pricing", id: "#pricing" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
{ name: "Search", id: "/search" },
{ name: "Wishlist", id: "/wishlist" },
{ name: "Account", id: "/account" },
{ name: "Login", id: "/login" },
{ name: "Register", id: "/register" },
{ name: "Customer Dashboard", id: "/customer/dashboard" },
{ name: "Seller Dashboard", id: "/seller-dashboard" },
{ name: "Seller Portal", id: "/seller/dashboard" },
{ name: "Checkout", id: "/checkout" },
{ name: "Downloads", id: "/downloads" },
{ name: "Contact", id: "/contact" }
];
return (
<ThemeProvider
defaultButtonVariant="text-shift"
@@ -22,35 +43,10 @@ export default function AccountPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{
name: "Home", id: "/"},
{
name: "Categories", id: "/categories"},
{
name: "Products", id: "/products"},
{
name: "Features", id: "/features"},
{
name: "Search", id: "/search"},
{
name: "Wishlist", id: "/wishlist"},
{
name: "Testimonials", id: "/testimonials"},
{
name: "Pricing", id: "/pricing"},
{
name: "FAQ", id: "/faq"},
{
name: "Seller Dashboard", id: "/seller-dashboard"},
{
name: "Account", id: "/account"},
{
name: "Contact", id: "/contact"},
]}
navItems={canonicalNavItems}
brandName="DesignFlow"
button={{
text: "Get Started", href: "/products"}}
text: "Get Started", href: "#products"}}
animateOnLoad={true}
/>
</div>
@@ -68,23 +64,23 @@ export default function AccountPage() {
{
title: "Products", items: [
{
label: "Canva Templates", href: "/products"},
label: "Canva Templates", href: "#products"},
{
label: "Logos", href: "/products"},
label: "Logos", href: "#products"},
{
label: "Social Media Kits", href: "/products"},
label: "Social Media Kits", href: "#products"},
{
label: "Banners & Flyers", href: "/products"},
label: "Banners & Flyers", href: "#products"},
],
},
{
title: "Company", items: [
{
label: "About Us", href: "/about"},
label: "About Us", href: "#about"},
{
label: "Features", href: "/features"},
label: "Features", href: "#features"},
{
label: "Pricing", href: "/pricing"},
label: "Pricing", href: "#pricing"},
{
label: "Contact", href: "/contact"},
],

64
src/app/categories/page.tsx
View File

@@ -6,6 +6,27 @@ import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloating
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
export default function CategoriesPage() {
const canonicalNavItems = [
{ name: "Home", id: "/" },
{ name: "Categories", id: "/categories" },
{ name: "Products", id: "#products" },
{ name: "Features", id: "#features" },
{ name: "Pricing", id: "#pricing" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
{ name: "Search", id: "/search" },
{ name: "Wishlist", id: "/wishlist" },
{ name: "Account", id: "/account" },
{ name: "Login", id: "/login" },
{ name: "Register", id: "/register" },
{ name: "Customer Dashboard", id: "/customer/dashboard" },
{ name: "Seller Dashboard", id: "/seller-dashboard" },
{ name: "Seller Portal", id: "/seller/dashboard" },
{ name: "Checkout", id: "/checkout" },
{ name: "Downloads", id: "/downloads" },
{ name: "Contact", id: "/contact" }
];
return (
<ThemeProvider
defaultButtonVariant="text-shift"
@@ -22,35 +43,10 @@ export default function CategoriesPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{
name: "Home", id: "/"},
{
name: "Categories", id: "/categories"},
{
name: "Products", id: "/products"},
{
name: "Features", id: "/features"},
{
name: "Search", id: "/search"},
{
name: "Wishlist", id: "/wishlist"},
{
name: "Testimonials", id: "/testimonials"},
{
name: "Pricing", id: "/pricing"},
{
name: "FAQ", id: "/faq"},
{
name: "Seller Dashboard", id: "/seller-dashboard"},
{
name: "Account", id: "/account"},
{
name: "Contact", id: "/contact"},
]}
navItems={canonicalNavItems}
brandName="DesignFlow"
button={{
text: "Get Started", href: "/products"}}
text: "Get Started", href: "#products"}}
animateOnLoad={true}
/>
</div>
@@ -68,23 +64,23 @@ export default function CategoriesPage() {
{
title: "Products", items: [
{
label: "Canva Templates", href: "/products"},
label: "Canva Templates", href: "#products"},
{
label: "Logos", href: "/products"},
label: "Logos", href: "#products"},
{
label: "Social Media Kits", href: "/products"},
label: "Social Media Kits", href: "#products"},
{
label: "Banners & Flyers", href: "/products"},
label: "Banners & Flyers", href: "#products"},
],
},
{
title: "Company", items: [
{
label: "About Us", href: "/about"},
label: "About Us", href: "#about"},
{
label: "Features", href: "/features"},
label: "Features", href: "#features"},
{
label: "Pricing", href: "/pricing"},
label: "Pricing", href: "#pricing"},
{
label: "Contact", href: "/contact"},
],

44
src/app/checkout/page.tsx
View File

@@ -8,6 +8,27 @@ import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloating
import { Sparkles } from "lucide-react";
export default function CheckoutPage() {
const canonicalNavItems = [
{ name: "Home", id: "/" },
{ name: "Categories", id: "/categories" },
{ name: "Products", id: "#products" },
{ name: "Features", id: "#features" },
{ name: "Pricing", id: "#pricing" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
{ name: "Search", id: "/search" },
{ name: "Wishlist", id: "/wishlist" },
{ name: "Account", id: "/account" },
{ name: "Login", id: "/login" },
{ name: "Register", id: "/register" },
{ name: "Customer Dashboard", id: "/customer/dashboard" },
{ name: "Seller Dashboard", id: "/seller-dashboard" },
{ name: "Seller Portal", id: "/seller/dashboard" },
{ name: "Checkout", id: "/checkout" },
{ name: "Downloads", id: "/downloads" },
{ name: "Contact", id: "/contact" }
];
return (
<ThemeProvider
defaultButtonVariant="text-shift"
@@ -24,26 +45,7 @@ export default function CheckoutPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{
name: "Home", id: "#home"},
{
name: "Products", id: "#products"},
{
name: "Features", id: "#features"},
{
name: "Testimonials", id: "#testimonials"},
{
name: "Pricing", id: "#pricing"},
{
name: "FAQ", id: "#faq"},
{
name: "Checkout", id: "/checkout"},
{
name: "Downloads", id: "/downloads"},
{
name: "Contact", id: "#contact"},
]}
navItems={canonicalNavItems}
brandName="DesignFlow"
button={{
text: "Get Started", href: "#products"}}
@@ -102,7 +104,7 @@ export default function CheckoutPage() {
{
label: "Pricing", href: "#pricing"},
{
label: "Contact", href: "#contact"},
label: "Contact", href: "/contact"},
],
},
{