Merge version_2 into main

Merge version_2 into main

src/app/blog/page.tsx

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

src/app/layout.tsx

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

src/app/page.tsx

@@ -1,4 +1,4 @@
-"use client"
+"use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -312,4 +312,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

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

@@ -86,10 +86,10 @@ export default function ProductPage({ params }: ProductPageProps) {
                         brandName="Future"
                         navItems={[
                             { name: "Home", id: "/" },
+                            { name: "Portfolio", id: "projects" },
                             { name: "About", id: "about" },
                             { name: "Services", id: "services" },
-                            { name: "Team", id: "team" },
-                            { name: "Shop", id: "/shop" }
+                            { name: "Team", id: "team" }
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
@@ -154,10 +154,10 @@ export default function ProductPage({ params }: ProductPageProps) {
                             brandName="Future"
                             navItems={[
                                 { name: "Home", id: "/" },
+                                { name: "Portfolio", id: "projects" },
                                 { name: "About", id: "about" },
                                 { name: "Services", id: "services" },
-                                { name: "Team", id: "team" },
-                                { name: "Shop", id: "/shop" }
+                                { name: "Team", id: "team" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -229,10 +229,10 @@ export default function ProductPage({ params }: ProductPageProps) {
                     brandName="Future"
                     navItems={[
                         { name: "Home", id: "/" },
+                        { name: "Portfolio", id: "projects" },
                         { name: "About", id: "about" },
                         { name: "Services", id: "services" },
-                        { name: "Team", id: "team" },
-                        { name: "Shop", id: "/shop" }
+                        { name: "Team", id: "team" }
                     ]}
                     button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                 />
@@ -308,4 +308,4 @@ export default function ProductPage({ params }: ProductPageProps) {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/shop/page.tsx

@@ -36,10 +36,10 @@ export default function ShopPage() {
                         brandName="Future"
                         navItems={[
                             { name: "Home", id: "/" },
+                            { name: "Portfolio", id: "projects" },
                             { name: "About", id: "about" },
                             { name: "Services", id: "services" },
-                            { name: "Team", id: "team" },
-                            { name: "Shop", id: "/shop" }
+                            { name: "Team", id: "team" }
                         ]}
                         button={{ text: "Cart", onClick: () => console.log("cart") }}
                     />
@@ -103,10 +103,10 @@ export default function ShopPage() {
                     brandName="Future"
                     navItems={[
                         { name: "Home", id: "/" },
+                        { name: "Portfolio", id: "projects" },
                         { name: "About", id: "about" },
                         { name: "Services", id: "services" },
-                        { name: "Team", id: "team" },
-                        { name: "Shop", id: "/shop" }
+                        { name: "Team", id: "team" }
                     ]}
                     button={{ text: "Cart", onClick: () => console.log("cart") }}
                 />
@@ -157,4 +157,4 @@ export default function ShopPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/styles/variables.css

@@ -2,21 +2,21 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #fffafa;;
-  --card: #fff7f7;;
-  --foreground: #1a0000;;
-  --primary-cta: #e63946;;
+  /* --background: #f7f6f7;;
+  --card: #ffffff;;
+  --foreground: #251a0c;;
+  --primary-cta: #f4c408;;
   --secondary-cta: #ffffff;;
-  --accent: #f5c4c7;;
-  --background-accent: #f09199;; */
+  --accent: #f4ca26;;
+  --background-accent: #e8daa8;; */
 
-  --background: #fffafa;;
-  --card: #fff7f7;;
-  --foreground: #1a0000;;
-  --primary-cta: #e63946;;
+  --background: #f7f6f7;;
+  --card: #ffffff;;
+  --foreground: #251a0c;;
+  --primary-cta: #f4c408;;
   --secondary-cta: #ffffff;;
-  --accent: #f5c4c7;;
-  --background-accent: #f09199;;
+  --accent: #f4ca26;;
+  --background-accent: #e8daa8;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);