diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx index 5660339..f5c9240 100644 --- a/src/app/blog/page.tsx +++ b/src/app/blog/page.tsx @@ -1,9 +1,9 @@ "use client"; import BlogCardThree from '@/components/sections/blog/BlogCardThree'; -import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal'; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay"; +import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal'; // Updated import const posts = [ { @@ -42,14 +42,14 @@ export default function BlogPage() { return ( @@ -81,15 +81,25 @@ export default function BlogPage() { ); -} \ No newline at end of file +} diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 26db042..235f850 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,11 +1,11 @@ import type { Metadata } from "next"; -import { Plus_Jakarta_Sans } from "next/font/google"; +import { Inter } from "next/font/google"; import "./globals.css"; import { ServiceWrapper } from "@/components/ServiceWrapper"; import Tag from "@/tag/Tag"; -const plusJakartaSans = Plus_Jakarta_Sans({ - variable: "--font-plus-jakarta-sans", subsets: ["latin"], +const inter = Inter({ + variable: "--font-inter", subsets: ["latin"], }); export const metadata: Metadata = { @@ -31,7 +31,7 @@ export default function RootLayout({ {children} @@ -1406,4 +1406,4 @@ export default function RootLayout({ ); -} \ No newline at end of file +} diff --git a/src/app/page.tsx b/src/app/page.tsx index 6e8f97a..4dbbd67 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -2,26 +2,28 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; -import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery'; -import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard'; -import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow'; import ProductCardTwo from '@/components/sections/product/ProductCardTwo'; -import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen'; -import ContactSplitForm from '@/components/sections/contact/ContactSplitForm'; -import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal'; -import { CalendarCheck, Mail, MessageSquare, Sparkles, Timer, Tv } from "lucide-react"; +import { CalendarCheck, Mail, MessageSquare, Sparkles, Timer, Tv, Quote } from "lucide-react"; + +// New imports for replaced components +import HeroBillboard from '@/components/sections/hero/HeroBillboard'; +import TextAbout from '@/components/sections/about/TextAbout'; +import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive'; +import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo'; +import ContactCenter from '@/components/sections/contact/ContactCenter'; +import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal'; export default function LandingPage() { return ( @@ -42,16 +44,12 @@ export default function LandingPage() {
-
-
- @@ -135,37 +122,35 @@ export default function LandingPage() {
-
-
- console.log(`Subscribed with: ${email}`)} useInvertedBackground={false} className="bg-[--background-accent] text-[--foreground]" - formCardClassName="!bg-[--card] rounded-[--radius] shadow-lg p-8 md:p-12" + contentClassName="!bg-[--card] rounded-[--radius] shadow-lg p-8 md:p-12 max-w-2xl mx-auto" + tagClassName="text-[--primary-cta] font-semibold" titleClassName="text-4xl md:text-5xl lg:text-6xl font-thin tracking-wide" descriptionClassName="text-md md:text-lg font-light mt-4 mb-8 leading-relaxed" buttonClassName="min-w-[12rem] px-8 py-3 rounded-full shadow-lg !bg-[--primary-cta] !text-[--primary-cta-text] hover:!bg-[--primary-cta] hover:scale-105 transition-transform duration-300" buttonTextClassName="font-semibold" - mediaWrapperClassName="rounded-[--radius] overflow-hidden" - mediaClassName="object-cover h-full w-full" - contentClassName="grid-cols-1 md:grid-cols-2 gap-8 md:gap-12" + inputClassName="px-4 py-2 rounded-md border border-[--accent] focus:outline-none focus:ring-2 focus:ring-[--primary-cta] !bg-[--background]" + termsClassName="text-sm mt-4 opacity-75" />
); -} \ No newline at end of file +} diff --git a/src/app/privacy/page.tsx b/src/app/privacy/page.tsx index a9aeff3..73d628e 100644 --- a/src/app/privacy/page.tsx +++ b/src/app/privacy/page.tsx @@ -3,19 +3,19 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; import LegalSection from '@/components/legal/LegalSection'; -import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal'; +import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal'; // Updated import export default function PrivacyPage() { return ( @@ -72,15 +72,25 @@ export default function PrivacyPage() {
); -} \ No newline at end of file +} diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx index dcc8d8b..d8e9aed 100644 --- a/src/app/shop/[id]/page.tsx +++ b/src/app/shop/[id]/page.tsx @@ -4,12 +4,12 @@ import { Suspense, use, useCallback } from "react"; import { useRouter } from "next/navigation"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; -import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal'; import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard"; import ProductCart from "@/components/ecommerce/cart/ProductCart"; import { useProductDetail } from "@/hooks/useProductDetail"; import { useCart } from "@/hooks/useCart"; import { useCheckout } from "@/hooks/useCheckout"; +import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal'; // Updated import interface ProductPageProps { params: Promise<{ id: string }>; @@ -76,14 +76,14 @@ function ProductPageContent({ params }: ProductPageProps) { if (isLoading) { return ( @@ -108,13 +108,23 @@ function ProductPageContent({ params }: ProductPageProps) {
@@ -124,14 +134,14 @@ function ProductPageContent({ params }: ProductPageProps) { if (!product) { return ( @@ -164,13 +174,23 @@ function ProductPageContent({ params }: ProductPageProps) { @@ -179,14 +199,14 @@ function ProductPageContent({ params }: ProductPageProps) { return ( @@ -242,15 +262,25 @@ function ProductPageContent({ params }: ProductPageProps) { /> ); -} \ No newline at end of file +} diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx index 4c894d5..6612c4b 100644 --- a/src/app/shop/page.tsx +++ b/src/app/shop/page.tsx @@ -3,12 +3,12 @@ import { Suspense, useCallback } from "react"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; -import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal'; import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog"; import ProductCart from "@/components/ecommerce/cart/ProductCart"; import { useProductCatalog } from "@/hooks/useProductCatalog"; import { useCart } from "@/hooks/useCart"; import { useCheckout } from "@/hooks/useCheckout"; +import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal'; // Updated import function ShopPageContent() { const { @@ -46,14 +46,14 @@ function ShopPageContent() { if (isLoading) { return ( @@ -78,13 +78,23 @@ function ShopPageContent() { @@ -93,14 +103,14 @@ function ShopPageContent() { return ( @@ -146,13 +156,23 @@ function ShopPageContent() { /> @@ -165,4 +185,4 @@ export default function ShopPage() { ); -} \ No newline at end of file +} diff --git a/src/app/styles/base.css b/src/app/styles/base.css index 0a33a6e..34aea07 100644 --- a/src/app/styles/base.css +++ b/src/app/styles/base.css @@ -11,7 +11,7 @@ html { body { background-color: var(--background); color: var(--foreground); - font-family: var(--font-plus-jakarta-sans), sans-serif; + font-family: var(--font-inter), sans-serif; position: relative; min-height: 100vh; overscroll-behavior: none; @@ -24,5 +24,5 @@ h3, h4, h5, h6 { - font-family: var(--font-plus-jakarta-sans), sans-serif; + font-family: var(--font-inter), sans-serif; } diff --git a/src/app/styles/variables.css b/src/app/styles/variables.css index 56cdadc..0f450a7 100644 --- a/src/app/styles/variables.css +++ b/src/app/styles/variables.css @@ -2,23 +2,23 @@ /* Base units */ /* --vw is set by ThemeProvider */ - /* --background: #fbfaff;; - --card: #f7f5ff;; - --foreground: #0f0022;; - --primary-cta: #8b5cf6;; + /* --background: #f5faff;; + --card: #f1f8ff;; + --foreground: #001122;; + --primary-cta: #15479c;; --secondary-cta: #ffffff;; - --accent: #d8cef5;; - --background-accent: #c4a8f9;; */ + --accent: #a8cce8;; + --background-accent: #7ba3cf;; */ - --background: #fbfaff;; - --card: #f7f5ff;; - --foreground: #0f0022;; - --primary-cta: #8b5cf6;; - --primary-cta-text: #fbfaff;; + --background: #f5faff;; + --card: #f1f8ff;; + --foreground: #001122;; + --primary-cta: #15479c;; + --primary-cta-text: #f5faff;; --secondary-cta: #ffffff;; - --secondary-cta-text: #0f0022;; - --accent: #d8cef5;; - --background-accent: #c4a8f9;; + --secondary-cta-text: #001122;; + --accent: #a8cce8;; + --background-accent: #7ba3cf;; /* text sizing - set by ThemeProvider */ /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);