Merge version_4 into main #5

Merged
bender merged 3 commits from version_4 into main 2026-04-29 01:13:32 +00:00
3 changed files with 136 additions and 0 deletions

View File

@@ -0,0 +1,48 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { NavbarStyleApple } from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import { FooterBase } from "@/components/sections/footer/FooterBase";
import { useState } from "react";
export default function NotificationsPage() {
const [notifications] = useState([
{ id: "n1", title: "Order Status Update", message: "Your artisan rug is now in production.", time: "2 hours ago" },
{ id: "n2", title: "Shipping Alert", message: "Your ceramic tagine has been dispatched.", time: "1 day ago" }
]);
return (
<ThemeProvider>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Products", id: "/#products" },
{ name: "About", id: "/#about" },
{ name: "Contact", id: "/#contact" },
{ name: "Admin", id: "/admin/dashboard" },
{ name: "Notifications", id: "/notifications" },
]}
brandName="RoseSouk"
/>
<main className="container mx-auto py-20 min-h-screen">
<h1 className="text-4xl font-bold mb-8">Status Change Alerts</h1>
<div className="space-y-4">
{notifications.map((n) => (
<div key={n.id} className="p-6 rounded-xl border border-border/40 shadow-sm">
<h2 className="font-semibold text-lg">{n.title}</h2>
<p className="text-muted-foreground">{n.message}</p>
<span className="text-xs text-muted-foreground/60">{n.time}</span>
</div>
))}
</div>
</main>
<FooterBase
columns={[
{ title: "Navigation", items: [{ label: "Home", href: "/" }] },
{ title: "Support", items: [{ label: "Notifications", href: "/notifications" }] }
]}
logoText="RoseSouk"
/>
</ThemeProvider>
);
}

View File

@@ -34,6 +34,7 @@ export default function LandingPage() {
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Admin", id: "/admin/dashboard" },
{ name: "Notifications", id: "/notifications" },
]}
brandName="RoseSouk"
/>

View File

@@ -0,0 +1,87 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import FooterBase from '@/components/sections/footer/FooterBase';
export default function TrackOrderPage() {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="mediumLarge"
sizing="mediumLargeSizeLargeTitles"
background="floatingGradient"
cardStyle="layered-gradient"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Products", id: "/#products" },
{ name: "Order Tracking", id: "/track-order" },
{ name: "About", id: "/#about" },
{ name: "Contact", id: "/#contact" },
{ name: "Admin", id: "/admin/dashboard" },
]}
brandName="RoseSouk"
/>
<main className="min-h-screen pt-32 pb-20 px-6">
<div className="max-w-3xl mx-auto space-y-8">
<h1 className="text-4xl font-bold">Track Your Order</h1>
<div className="bg-white/50 p-8 rounded-xl shadow-sm border border-black/10">
<p className="mb-6">Enter your order number to see the current status of your shipment.</p>
<div className="flex gap-4">
<input
type="text"
placeholder="Order Number (e.g. RS-12345)"
className="flex-grow p-3 rounded border border-gray-300"
/>
<button className="px-6 py-3 bg-black text-white rounded font-medium hover:bg-black/80">
Track
</button>
</div>
</div>
<div className="mt-12">
<h2 className="text-2xl font-semibold mb-6">Timeline</h2>
<div className="space-y-4">
{['Order Placed', 'Processing', 'In Transit', 'Out for Delivery', 'Delivered'].map((step, idx) => (
<div key={step} className="flex items-center gap-4 p-4 border-b">
<div className="w-8 h-8 rounded-full bg-black/10 flex items-center justify-center font-bold text-sm">
{idx + 1}
</div>
<span className="font-medium">{step}</span>
</div>
))}
</div>
</div>
</div>
</main>
<FooterBase
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Products", href: "/#products" },
{ label: "Order Tracking", href: "/track-order" },
{ label: "About", href: "/#about" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/#faq" },
{ label: "WhatsApp", href: "https://wa.me/1234567890" },
],
},
]}
logoText="RoseSouk"
/>
</ThemeProvider>
);
}