Merge version_3 into main

Merge version_3 into main

src/app/page.tsx

@@ -5,7 +5,7 @@ import ReactLenis from "lenis/react";
 import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
-import FooterCard from '@/components/sections/footer/FooterCard';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import HeroBillboard from '@/components/sections/hero/HeroBillboard';
 import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
 import MetricCardTwo from '@/components/sections/metrics/MetricCardTwo';
@@ -131,9 +131,13 @@ export default function LandingPage() {
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterCard
+      <FooterBaseCard
       logoText="CJ Private Resort"
-      copyrightText="© 2025 CJ Private Resort. All rights reserved."
+      columns={[
+          { title: "Resort", items: [{ label: "About Us", href: "#about" }, { label: "Amenities", href: "#services" }] },
+          { title: "Contact", items: [{ label: "Inquiries", href: "#contact" }, { label: "Events", href: "#faq" }] }
+      ]}
+      copyrightText="© 2025 CJ Private Resort. Tropical Oasis Edition."
     />
   </div>
       </ReactLenis>

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #f5faff;
-  --card: #f1f8ff;
-  --foreground: #001122;
-  --primary-cta: #15479c;
+  --background: #fcf6ec;
+  --card: #f3ede2;
+  --foreground: #2e2521;
+  --primary-cta: #c68a62;
   --primary-cta-text: #f5faff;
-  --secondary-cta: #ffffff;
+  --secondary-cta: #e3deea;
   --secondary-cta-text: #001122;
-  --accent: #a8cce8;
-  --background-accent: #7ba3cf;
+  --accent: #b2a28b;
+  --background-accent: #c68a62;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);