Merge version_2 into main #5

Merged
bender merged 7 commits from version_2 into main 2026-04-02 12:06:03 +00:00
7 changed files with 17 additions and 13 deletions

View File

@@ -6,7 +6,7 @@ import React from "react";
export default function CartPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -23,7 +23,7 @@ export default function CartPage() {
<h1 className="text-4xl font-bold mb-8">Your Shopping Cart</h1>
<p>Your cart is empty. Start shopping for your favorite Trackly devices.</p>
</main>
<FooterSimple columns={[]} />
<FooterSimple columns={[]} bottomLeftText="© 2024 TracklyHub" bottomRightText="Secure your world." />
</ThemeProvider>
);
}

View File

@@ -6,7 +6,7 @@ import React from "react";
export default function CheckoutPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -23,7 +23,7 @@ export default function CheckoutPage() {
<h1 className="text-4xl font-bold mb-8">Checkout</h1>
<p>Please enter your shipping and payment details to complete your order.</p>
</main>
<FooterSimple columns={[]} />
<FooterSimple columns={[]} bottomLeftText="© 2024 TracklyHub" bottomRightText="Secure your world." />
</ThemeProvider>
);
}

View File

@@ -6,7 +6,7 @@ import React from "react";
export default function UserDashboardPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -23,7 +23,7 @@ export default function UserDashboardPage() {
<h1 className="text-4xl font-bold mb-8">Dashboard</h1>
<p>Welcome back! Here you can manage your account, track orders, and view your devices.</p>
</main>
<FooterSimple columns={[]} />
<FooterSimple columns={[]} bottomLeftText="© 2024 TracklyHub" bottomRightText="Secure your world." />
</ThemeProvider>
);
}

View File

@@ -6,7 +6,7 @@ import React from "react";
export default function OrderConfirmationPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -23,7 +23,7 @@ export default function OrderConfirmationPage() {
<h1 className="text-4xl font-bold mb-8">Thank You!</h1>
<p>Your order has been placed successfully.</p>
</main>
<FooterSimple columns={[]} />
<FooterSimple columns={[]} bottomLeftText="© 2024 TracklyHub" bottomRightText="Secure your world." />
</ThemeProvider>
);
}

View File

@@ -10,7 +10,7 @@ import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/Nav
import PricingCardFive from '@/components/sections/pricing/PricingCardFive';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import FaqSplitText from '@/components/sections/faq/FaqSplitText';
import { Activity, MapPin, Star } from "lucide-react";
import { Activity, MapPin } from "lucide-react";
export default function LandingPage() {
return (
@@ -116,6 +116,7 @@ export default function LandingPage() {
sideTitle="Frequently Asked Questions"
sideDescription="Everything you need to know about our trackers."
faqsAnimation="slide-up"
useInvertedBackground={false}
faqs={[
{ id: "f1", title: "How do I sync my tracker?", content: "Simple, just tap the add button in our app." },
{ id: "f2", title: "Is it waterproof?", content: "Yes, all models are IP67 rated." },

View File

@@ -5,7 +5,7 @@ import ReactLenis from "lenis/react";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function ProductDetailPage({ params }: { params: { id: string } }) {
export default function ProductPage({ params }: { params: { id: string } }) {
return (
<ThemeProvider
defaultButtonVariant="icon-arrow"
@@ -31,8 +31,8 @@ export default function ProductDetailPage({ params }: { params: { id: string } }
brandName="Trackly"
/>
<div className="pt-32 pb-20 container mx-auto px-4">
<h1 className="text-4xl font-bold mb-4">Product Details: {params.id}</h1>
<p className="text-xl">This is the detail view for product {params.id}. Discover features and technical specifications.</p>
<h1 className="text-4xl font-bold mb-4">Product Details</h1>
<p>Displaying information for product: {params.id}</p>
</div>
<FooterSimple
columns={[
@@ -40,6 +40,7 @@ export default function ProductDetailPage({ params }: { params: { id: string } }
{ title: "Company", items: [{ label: "About", href: "/about" }] }
]}
bottomLeftText="© 2024 TracklyHub"
bottomRightText="Secure your world."
/>
</ReactLenis>
</ThemeProvider>

View File

@@ -9,7 +9,8 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function ShopPage() {
const products = [
{ id: "1", name: "Trackly Pro", price: "$49", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/top-view-tampon-pattern_23-2148163081.jpg?_wi=1" },
{ id: "2", name: "Trackly Mini", price: "$29", rating: 4, imageSrc: "http://img.b2bpic.net/free-photo/top-view-tampon-pattern_23-2148163081.jpg?_wi=2" }
{ id: "2", name: "Trackly Mini", price: "$29", rating: 4, imageSrc: "http://img.b2bpic.net/free-photo/top-view-tampon-pattern_23-2148163081.jpg?_wi=2" },
{ id: "3", name: "Trackly Basic", price: "$19", rating: 4, imageSrc: "http://img.b2bpic.net/free-photo/top-view-tampon-pattern_23-2148163081.jpg?_wi=3" }
];
return (
@@ -50,6 +51,7 @@ export default function ShopPage() {
{ title: "Company", items: [{ label: "About", href: "/about" }] }
]}
bottomLeftText="© 2024 TracklyHub"
bottomRightText="Secure your world."
/>
</ReactLenis>
</ThemeProvider>