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 #5

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

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

@@ -8,14 +8,14 @@ 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 }> = {
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 getAssetUrl = (id: string) =&gt; assetMap[id]?.url || "";
const getAssetAlt = (id: string) =&gt; assetMap[id]?.alt || "";
const getAssetUrl = (id: string) => assetMap[id]?.url || "";
const getAssetAlt = (id: string) => assetMap[id]?.alt || "";
export default function AccountPage() {
const navItems = [
@@ -33,13 +33,13 @@ export default function AccountPage() {
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms &amp; Conditions", href: "#" }
{ label: "Terms & Conditions", href: "#" }
]
}
];
return (
&lt;ThemeProvider
<ThemeProvider
defaultButtonVariant={"shift-hover"}
defaultTextAnimation={"background-highlight"}
borderRadius={"pill"}
@@ -50,28 +50,28 @@ export default function AccountPage() {
primaryButtonStyle={"radial-glow"}
secondaryButtonStyle={"layered"}
headingFontWeight={"semibold"}
&gt;
&lt;div id="nav" data-section="nav"&gt;
&lt;NavbarStyleFullscreen
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
brandName="OLIVA"
navItems={navItems.map(item =&gt; ({ name: item.name, id: item.id }))}
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
/&gt;
&lt;/div&gt;
/>
</div>
&lt;div id="account-intro" data-section="account-intro"&gt;
&lt;InlineImageSplitTextAbout
<div id="account-intro" data-section="account-intro">
<InlineImageSplitTextAbout
heading={[{ type: "text", content: "Welcome to Your OLIVA Account" }]}
useInvertedBackground={true}
buttons={[
{ text: "View Orders", href: "#orders" },
{ text: "Update Profile", href: "#profile" }
]}
/&gt;
&lt;/div&gt;
/>
</div>
&lt;div id="account-features" data-section="account-features"&gt;
&lt;FeatureCardTwentySeven
<div id="account-features" data-section="account-features">
<FeatureCardTwentySeven
title="Manage Your Preferences"
description="Easily access and update your account details, order history, and saved information."
animationType="slide-up"
@@ -82,12 +82,12 @@ export default function AccountPage() {
{ 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") }
]}
/&gt;
&lt;/div&gt;
/>
</div>
&lt;div id="account-faqs" data-section="account-faqs"&gt;
&lt;FaqBase
title="Account Help &amp; FAQs"
<div id="account-faqs" data-section="account-faqs">
<FaqBase
title="Account Help & FAQs"
description="Have questions about managing your OLIVA account? Find answers here."
animationType="smooth"
textboxLayout="default"
@@ -98,18 +98,18 @@ export default function AccountPage() {
{ id: "faq2", title: "Can I delete my account?", content: "Please contact customer support to request account deletion." },
{ id: "faq3", title: "How can I update my shipping address?", content: "Go to 'Saved Addresses' in your account dashboard and edit or add a new address." }
]}
/&gt;
&lt;/div&gt;
/>
</div>
&lt;div id="footer" data-section="footer"&gt;
&lt;FooterMedia
<div id="footer" data-section="footer">
<FooterMedia
logoText="OLIVA"
imageSrc="http://img.b2bpic.net/free-photo/surrealist-portrait-fashionable-woman_23-2149224680.jpg"
imageAlt="OLIVA fashion brand elegant video"
columns={footerColumns}
copyrightText="© 2024 OLIVA | All Rights Reserved."
/&gt;
&lt;/div&gt;
&lt;/ThemeProvider&gt;
/>
</div>
</ThemeProvider>
);
}

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

@@ -8,12 +8,12 @@ import ContactSplit from '@/components/sections/contact/ContactSplit';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from 'next/link';
const assetMap: Record&lt;string, { url: string; alt: string }&gt; = {
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 getAssetUrl = (id: string) =&gt; assetMap[id]?.url || "";
const getAssetAlt = (id: string) =&gt; assetMap[id]?.alt || "";
const getAssetUrl = (id: string) => assetMap[id]?.url || "";
const getAssetAlt = (id: string) => assetMap[id]?.alt || "";
export default function CheckoutPage() {
const navItems = [
@@ -31,13 +31,13 @@ export default function CheckoutPage() {
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms &amp; Conditions", href: "#" }
{ label: "Terms & Conditions", href: "#" }
]
}
];
return (
&lt;ThemeProvider
<ThemeProvider
defaultButtonVariant={"shift-hover"}
defaultTextAnimation={"background-highlight"}
borderRadius={"pill"}
@@ -48,28 +48,28 @@ export default function CheckoutPage() {
primaryButtonStyle={"radial-glow"}
secondaryButtonStyle={"layered"}
headingFontWeight={"semibold"}
&gt;
&lt;div id="nav" data-section="nav"&gt;
&lt;NavbarStyleFullscreen
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
brandName="OLIVA"
navItems={navItems.map(item =&gt; ({ name: item.name, id: item.id }))}
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
/&gt;
&lt;/div&gt;
/>
</div>
&lt;div id="checkout-intro" data-section="checkout-intro"&gt;
&lt;InlineImageSplitTextAbout
heading={[{ type: "text", content: "Secure &amp; Seamless Checkout" }]}
<div id="checkout-intro" data-section="checkout-intro">
<InlineImageSplitTextAbout
heading={[{ type: "text", content: "Secure & Seamless Checkout" }]}
useInvertedBackground={true}
buttons={[
{ text: "Continue Shopping", href: "/shop" },
{ text: "Need Help?", href: "/contact" }
]}
/&gt;
&lt;/div&gt;
/>
</div>
&lt;div id="checkout-faqs" data-section="checkout-faqs"&gt;
&lt;FaqBase
<div id="checkout-faqs" data-section="checkout-faqs">
<FaqBase
title="Common Checkout Questions"
description="Find quick answers regarding payment, shipping, and order finalization."
animationType="smooth"
@@ -81,11 +81,11 @@ export default function CheckoutPage() {
{ id: "faq2", title: "Can I change my order after placing it?", content: "Orders cannot be changed after placement. Please review carefully before confirming." },
{ id: "faq3", title: "When will my order be shipped?", content: "Orders are typically processed and shipped within 1-2 business days." }
]}
/&gt;
&lt;/div&gt;
/>
</div>
&lt;div id="checkout-contact" data-section="checkout-contact"&gt;
&lt;ContactSplit
<div id="checkout-contact" data-section="checkout-contact">
<ContactSplit
tag="Got Questions?"
title="We're Here for You"
description="If you have any specific inquiries about your order or the checkout process, don't hesitate to reach out."
@@ -97,18 +97,18 @@ export default function CheckoutPage() {
imageAlt={getAssetAlt("contact-image__2")}
inputPlaceholder="Your Email"
buttonText="Send Message"
/&gt;
&lt;/div&gt;
/>
</div>
&lt;div id="footer" data-section="footer"&gt;
&lt;FooterMedia
<div id="footer" data-section="footer">
<FooterMedia
logoText="OLIVA"
imageSrc="http://img.b2bpic.net/free-photo/surrealist-portrait-fashionable-woman_23-2149224680.jpg"
imageAlt="OLIVA fashion brand elegant video"
columns={footerColumns}
copyrightText="© 2024 OLIVA | All Rights Reserved."
/&gt;
&lt;/div&gt;
&lt;/ThemeProvider&gt;
/>
</div>
</ThemeProvider>
);
}