Merge version_3 into main

Merge version_3 into main

src/app/blog/page.tsx

@@ -63,4 +63,4 @@ export default function BlogPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/layout.tsx

@@ -1401,4 +1401,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -259,4 +259,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/shop/[id]/page.tsx

@@ -92,13 +92,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                         <NavbarStyleFullscreen
                             navItems={[
                                 {"name":"Home","id":"/"},
-                                {"name":"Hero","id":"hero-section"},
-                                {"name":"About","id":"about-section"},
-                                {"name":"Feature","id":"features-section"},
-                                {"name":"Product","id":"product-section"},
-                                {"name":"Testimonial","id":"testimonials-section"},
-                                {"name":"Faq","id":"faq-section"},
-                                {"name":"Contact","id":"contact-section"}
+                                {"name":"Shop","id":"/shop"}
                             ]}
                             brandName="Artisan Bakery"
                             bottomLeftText="Global Community"
@@ -133,13 +127,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                         <NavbarStyleFullscreen
                             navItems={[
                                 {"name":"Home","id":"/"},
-                                {"name":"Hero","id":"hero-section"},
-                                {"name":"About","id":"about-section"},
-                                {"name":"Feature","id":"features-section"},
-                                {"name":"Product","id":"product-section"},
-                                {"name":"Testimonial","id":"testimonials-section"},
-                                {"name":"Faq","id":"faq-section"},
-                                {"name":"Contact","id":"contact-section"}
+                                {"name":"Shop","id":"/shop"}
                             ]}
                             brandName="Artisan Bakery"
                             bottomLeftText="Global Community"
@@ -181,13 +169,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                     <NavbarStyleFullscreen
                         navItems={[
                             {"name":"Home","id":"/"},
-                            {"name":"Hero","id":"hero-section"},
-                            {"name":"About","id":"about-section"},
-                            {"name":"Feature","id":"features-section"},
-                            {"name":"Product","id":"product-section"},
-                            {"name":"Testimonial","id":"testimonials-section"},
-                            {"name":"Faq","id":"faq-section"},
-                            {"name":"Contact","id":"contact-section"}
+                            {"name":"Shop","id":"/shop"}
                         ]}
                         brandName="Artisan Bakery"
                         bottomLeftText="Global Community"
@@ -234,4 +216,4 @@ function ProductPageContent({ params }: ProductPageProps) {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/shop/page.tsx

@@ -35,13 +35,7 @@ function ShopPageContent() {
                         <NavbarStyleFullscreen
                             navItems={[
                                 {"name":"Home","id":"/"},
-                                {"name":"Hero","id":"hero-section"},
-                                {"name":"About","id":"about-section"},
-                                {"name":"Feature","id":"features-section"},
-                                {"name":"Product","id":"product-section"},
-                                {"name":"Testimonial","id":"testimonials-section"},
-                                {"name":"Faq","id":"faq-section"},
-                                {"name":"Contact","id":"contact-section"}
+                                {"name":"Shop","id":"/shop"}
                             ]}
                             brandName="Artisan Bakery"
                             bottomLeftText="Global Community"
@@ -75,13 +69,7 @@ function ShopPageContent() {
                     <NavbarStyleFullscreen
                         navItems={[
                             {"name":"Home","id":"/"},
-                            {"name":"Hero","id":"hero-section"},
-                            {"name":"About","id":"about-section"},
-                            {"name":"Feature","id":"features-section"},
-                            {"name":"Product","id":"product-section"},
-                            {"name":"Testimonial","id":"testimonials-section"},
-                            {"name":"Faq","id":"faq-section"},
-                            {"name":"Contact","id":"contact-section"}
+                            {"name":"Shop","id":"/shop"}
                         ]}
                         brandName="Artisan Bakery"
                         bottomLeftText="Global Community"
@@ -111,4 +99,4 @@ export default function ShopPage() {
             <ShopPageContent />
         </Suspense>
     );
-}
+}

src/app/styles/variables.css

@@ -5,20 +5,20 @@
   /* --background: #f5f5f5;;
   --card: #ffffff;;
   --foreground: #1c1c1c;;
-  --primary-cta: #341f51;;
+  --primary-cta: #d63946;;
   --secondary-cta: #ffffff;;
-  --accent: #6139e6;;
-  --background-accent: #b3a8e8;; */
+  --accent: #d63946;;
+  --background-accent: #f4a8b3;; */
 
   --background: #f5f5f5;;
   --card: #ffffff;;
   --foreground: #1c1c1c;;
-  --primary-cta: #341f51;;
+  --primary-cta: #d63946;;
   --primary-cta-text: #f5f5f5;;
   --secondary-cta: #ffffff;;
   --secondary-cta-text: #1c1c1c;;
-  --accent: #6139e6;;
-  --background-accent: #b3a8e8;;
+  --accent: #d63946;;
+  --background-accent: #f4a8b3;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);