bender/8968c606-7ebc-44fb-ae40-4fde8ae19e19
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #6

Merged
bender merged 4 commits from version_1 into main 2026-06-08 13:57:06 +00:00
Conversation 0 Commits 4 Files Changed 4 +140 -129
4 changed files with 140 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,36 +8,39 @@ import FaqBase from '@/components/sections/faq/FaqBase';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from 'next/link';
const assetMap: Record<string, { url: string; alt: string }> = {
"gen-stock-rsv-113": { "url": "http://img.b2bpic.net/free-photo/beautiful-woman-with-curly-hair-posing_23-2148973992.jpg", "alt": "Beautiful woman with curly hair posing" },
"gen-stock-rsv-118": { "url": "http://img.b2bpic.net/free-photo/fashion-portrait-young-businessman-handsome-model-man-dressed-elegant-blue-suit-gray_158538-11101.jpg", "alt": "Fashion portrait of young businessman handsome model man dressed in elegant blue suit on gray" },
"gen-stock-rsv-258": { "url": "http://img.b2bpic.net/free-photo/smiling-young-blonde-call-centre-girl-wearing-headset-sitting-desk-with-work-tools-looking-camera-showing-thumb-up-isolated-green-wall_141793-113773.jpg", "alt": "Smiling young blonde call centre girl wearing headset sitting at desk with work tools looking at camera showing thumb up isolated on green wall" }
};
const allNavItems = [
{ name: "Home", id: "/" },
{ name: "Account", id: "/account" },
{ name: "Admin", id: "/admin" },
{ name: "Cart", id: "/cart" },
{ name: "Checkout", id: "/checkout" },
{ name: "Product", id: "/product" },
{ name: "Return Policy", id: "/return-policy" },
{ name: "Shipping Policy", id: "/shipping-policy" },
{ name: "Terms & Conditions", id: "/terms-conditions" }
];
const getAssetUrl = (id: string) => assetMap[id]?.url || "";
const getAssetAlt = (id: string) => assetMap[id]?.alt || "";
const allFooterColumns = [
{
title: "Site Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Account", href: "/account" },
{ label: "Admin", href: "/admin" },
{ label: "Cart", href: "/cart" },
{ label: "Checkout", href: "/checkout" },
{ label: "Product", href: "/product" }
]
},
{
title: "Policies", items: [
{ label: "Return Policy", href: "/return-policy" },
{ label: "Shipping Policy", href: "/shipping-policy" },
{ label: "Terms & Conditions", href: "/terms-conditions" }
]
}
];
export default function AccountPage() {
const navItems = [
{ name: "Checkout", id: "/checkout" },
{ name: "My Account", id: "/account" }
];
const footerColumns = [
{
title: "Pages", items: [
{ label: "Checkout", href: "/checkout" },
{ label: "My Account", href: "/account" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms & Conditions", href: "#" }
]
}
];
return (
<ThemeProvider
defaultButtonVariant={"shift-hover"}
@@ -54,8 +57,8 @@ export default function AccountPage() {
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
brandName="OLIVA"
navItems={navItems.map(item => ({ name: item.name, id: item.id }))}
button={{ text: "Cart", href: "/cart" }} // Keeping cart button as it's common for e-commerce
navItems={allNavItems}
button={{ text: "Cart", href: "/cart" }}
/>
</div>
@@ -78,9 +81,9 @@ export default function AccountPage() {
textboxLayout="default"
useInvertedBackground={false}
features={[
{ id: "feat1", title: "Order History", descriptions: ["Review past purchases and track current orders."], imageSrc: getAssetUrl("gen-stock-rsv-113"), imageAlt: getAssetAlt("gen-stock-rsv-113") },
{ id: "feat2", title: "Personal Details", descriptions: ["Edit your name, email, password, and communication preferences."], imageSrc: getAssetUrl("gen-stock-rsv-118"), imageAlt: getAssetAlt("gen-stock-rsv-118")},
{ id: "feat3", title: "Saved Addresses", descriptions: ["Manage multiple shipping and billing addresses for faster checkout."], imageSrc: getAssetUrl("gen-stock-rsv-258"), imageAlt: getAssetAlt("gen-stock-rsv-258") }
{ id: "feat1", title: "Order History", descriptions: ["Review past purchases and track current orders."], imageSrc: "http://img.b2bpic.net/free-photo/beautiful-woman-with-curly-hair-posing_23-2148973992.jpg", imageAlt: "Beautiful woman with curly hair posing" },
{ id: "feat2", title: "Personal Details", descriptions: ["Edit your name, email, password, and communication preferences."], imageSrc: "http://img.b2bpic.net/free-photo/fashion-portrait-young-businessman-handsome-model-man-dressed-elegant-blue-suit-gray_158538-11101.jpg", imageAlt: "Fashion portrait of young businessman handsome model man dressed in elegant blue suit on gray"},
{ id: "feat3", title: "Saved Addresses", descriptions: ["Manage multiple shipping and billing addresses for faster checkout."], imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-blonde-call-centre-girl-wearing-headset-sitting-desk-with-work-tools-looking-camera-showing-thumb-up-isolated-green-wall_141793-113773.jpg", imageAlt: "Smiling young blonde call centre girl wearing headset sitting at desk with work tools looking at camera showing thumb up isolated on green wall" }
]}
/>
</div>
@@ -106,7 +109,7 @@ export default function AccountPage() {
logoText="OLIVA"
imageSrc="http://img.b2bpic.net/free-photo/surrealist-portrait-fashionable-woman_23-2149224680.jpg"
imageAlt="OLIVA fashion brand elegant video"
columns={footerColumns}
columns={allFooterColumns}
copyrightText="© 2024 OLIVA | All Rights Reserved."
/>
</div>

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

@@ -6,25 +6,39 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
import FaqBase from '@/components/sections/faq/FaqBase';
const allNavItems = [
{ name: "Home", id: "/" },
{ name: "Account", id: "/account" },
{ name: "Admin", id: "/admin" },
{ name: "Cart", id: "/cart" },
{ name: "Checkout", id: "/checkout" },
{ name: "Product", id: "/product" },
{ name: "Return Policy", id: "/return-policy" },
{ name: "Shipping Policy", id: "/shipping-policy" },
{ name: "Terms & Conditions", id: "/terms-conditions" }
];
const allFooterColumns = [
{
title: "Site Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Account", href: "/account" },
{ label: "Admin", href: "/admin" },
{ label: "Cart", href: "/cart" },
{ label: "Checkout", href: "/checkout" },
{ label: "Product", href: "/product" }
]
},
{
title: "Policies", items: [
{ label: "Return Policy", href: "/return-policy" },
{ label: "Shipping Policy", href: "/shipping-policy" },
{ label: "Terms & Conditions", href: "/terms-conditions" }
]
}
];
export default function AdminPage() {
const navItems = [
{ name: "Return Policy", id: "/return-policy" },
{ name: "Admin", id: "/admin" }
];
const footerColumns = [
{
title: "Support", items: [
{ label: "Return Policy", href: "/return-policy" }
]
},
{
title: "Legal", items: [
{ label: "Return Policy", href: "/return-policy" }
]
}
];
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
@@ -41,7 +55,7 @@ export default function AdminPage() {
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
brandName="OLIVA"
navItems={navItems}
navItems={allNavItems}
/>
</div>
@@ -90,7 +104,7 @@ export default function AdminPage() {
logoText="OLIVA"
imageSrc="http://img.b2bpic.net/free-photo/surrealist-portrait-fashionable-woman_23-2149224680.jpg?_wi=9"
imageAlt="OLIVA fashion brand elegant minimal"
columns={footerColumns}
columns={allFooterColumns}
copyrightText="© 2024 OLIVA | All Rights Reserved."
/>
</div>

78
src/app/cart/page.tsx
View File

@@ -4,49 +4,39 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from "next/link";
const allNavItems = [
{ name: "Home", id: "/" },
{ name: "Account", id: "/account" },
{ name: "Admin", id: "/admin" },
{ name: "Cart", id: "/cart" },
{ name: "Checkout", id: "/checkout" },
{ name: "Product", id: "/product" },
{ name: "Return Policy", id: "/return-policy" },
{ name: "Shipping Policy", id: "/shipping-policy" },
{ name: "Terms & Conditions", id: "/terms-conditions" }
];
const allFooterColumns = [
{
title: "Site Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Account", href: "/account" },
{ label: "Admin", href: "/admin" },
{ label: "Cart", href: "/cart" },
{ label: "Checkout", href: "/checkout" },
{ label: "Product", href: "/product" }
]
},
{
title: "Policies", items: [
{ label: "Return Policy", href: "/return-policy" },
{ label: "Shipping Policy", href: "/shipping-policy" },
{ label: "Terms & Conditions", href: "/terms-conditions" }
]
}
];
export default function CartPage() {
const navItems = [
{
name: "Product", id: "/product"
},
{
name: "Cart", id: "/cart"
}
];
const footerNavColumns = [
{
title: "Shop", items: [
{ label: "New Arrivals", href: "#" },
{ label: "Best Sellers", href: "#" },
{ label: "Sale", href: "#" },
{ label: "Collections", href: "#" }
]
},
{
title: "About", items: [
{ label: "Our Story", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Blog", href: "#" },
{ label: "Press", href: "#" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#" },
{ label: "FAQ", href: "#" },
{ label: "Shipping Policy", href: "#" },
{ label: "Return Policy", href: "#" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms & Conditions", href: "#" }
]
}
];
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
@@ -63,7 +53,7 @@ export default function CartPage() {
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
brandName="OLIVA"
navItems={navItems}
navItems={allNavItems}
/>
</div>
@@ -75,7 +65,7 @@ export default function CartPage() {
logoText="OLIVA"
imageSrc="http://img.b2bpic.net/free-photo/surrealist-portrait-fashionable-woman_23-2149224680.jpg?_wi=3"
imageAlt="OLIVA fashion brand elegant video"
columns={footerNavColumns}
columns={allFooterColumns}
copyrightText="© 2024 OLIVA | All Rights Reserved."
/>
</div>

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

@@ -8,34 +8,38 @@ import ContactSplit from '@/components/sections/contact/ContactSplit';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from 'next/link';
const assetMap: Record<string, { url: string; alt: string }> = {
"contact-image__2": { "url": "http://img.b2bpic.net/free-photo/businesswoman-using-sign-language-work_23-2148740359.jpg", "alt": "fashion store contact us desk" }
};
const allNavItems = [
{ name: "Home", id: "/" },
{ name: "Account", id: "/account" }, { name: "Admin", id: "/admin" },
{ name: "Cart", id: "/cart" },
{ name: "Checkout", id: "/checkout" },
{ name: "Product", id: "/product" },
{ name: "Return Policy", id: "/return-policy" },
{ name: "Shipping Policy", id: "/shipping-policy" },
{ name: "Terms & Conditions", id: "/terms-conditions" }
];
const getAssetUrl = (id: string) => assetMap[id]?.url || "";
const getAssetAlt = (id: string) => assetMap[id]?.alt || "";
const allFooterColumns = [
{
title: "Site Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Account", href: "/account" },
{ label: "Admin", href: "/admin" },
{ label: "Cart", href: "/cart" },
{ label: "Checkout", href: "/checkout" },
{ label: "Product", href: "/product" }
]
},
{
title: "Policies", items: [
{ label: "Return Policy", href: "/return-policy" },
{ label: "Shipping Policy", href: "/shipping-policy" },
{ label: "Terms & Conditions", href: "/terms-conditions" }
]
}
];
export default function CheckoutPage() {
const navItems = [
{ name: "Checkout", id: "/checkout" },
{ name: "My Account", id: "/account" }
];
const footerColumns = [
{
title: "Pages", items: [
{ label: "Checkout", href: "/checkout" },
{ label: "My Account", href: "/account" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms & Conditions", href: "#" }
]
}
];
return (
<ThemeProvider
defaultButtonVariant={"shift-hover"}
@@ -52,8 +56,8 @@ export default function CheckoutPage() {
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
brandName="OLIVA"
navItems={navItems.map(item => ({ name: item.name, id: item.id }))}
button={{ text: "Cart", href: "/cart" }} // Keeping cart button as it's common for e-commerce
navItems={allNavItems}
button={{ text: "Cart", href: "/cart" }}
/>
</div>
@@ -62,8 +66,8 @@ export default function CheckoutPage() {
heading={[{ type: "text", content: "Secure & Seamless Checkout" }]}
useInvertedBackground={true}
buttons={[
{ text: "Continue Shopping", href: "/shop" },
{ text: "Need Help?", href: "/contact" }
{ text: "Continue Shopping", href: "/product" },
{ text: "Need Help?", href: "/product" }
]}
/>
</div>
@@ -93,8 +97,8 @@ export default function CheckoutPage() {
useInvertedBackground={false}
mediaAnimation="opacity"
mediaPosition="left"
imageSrc={getAssetUrl("contact-image__2")}
imageAlt={getAssetAlt("contact-image__2")}
imageSrc="http://img.b2bpic.net/free-photo/businesswoman-using-sign-language-work_23-2148740359.jpg"
imageAlt="fashion store contact us desk"
inputPlaceholder="Your Email"
buttonText="Send Message"
/>
@@ -105,7 +109,7 @@ export default function CheckoutPage() {
logoText="OLIVA"
imageSrc="http://img.b2bpic.net/free-photo/surrealist-portrait-fashionable-woman_23-2149224680.jpg"
imageAlt="OLIVA fashion brand elegant video"
columns={footerColumns}
columns={allFooterColumns}
copyrightText="© 2024 OLIVA | All Rights Reserved."
/>
</div>