Merge version_2 into main

Merge version_2 into main

src/app/admin/analytics/page.tsx

@@ -41,9 +41,8 @@ export default function AdminAnalyticsPage() {
           <TextAnimation
             type="entrance-slide"
             className="text-center text-4xl font-bold md:text-6xl"
-          >
+            text="Analytics Dashboards"
-            Analytics Dashboards
+          />
-          </TextAnimation>
         </div>
       </ReactLenis>
     </ThemeProvider>

src/app/admin/calendar/page.tsx

@@ -41,9 +41,8 @@ export default function AdminCalendarPage() {
           <TextAnimation
             type="entrance-slide"
             className="text-center text-4xl font-bold md:text-6xl"
-          >
+            text="Calendar Management"
-            Calendar Management
+          />
-          </TextAnimation>
         </div>
       </ReactLenis>
     </ThemeProvider>

src/app/admin/settings/page.tsx

@@ -41,9 +41,8 @@ export default function AdminSettingsPage() {
           <TextAnimation
             type="entrance-slide"
             className="text-center text-4xl font-bold md:text-6xl"
-          >
+            text="Settings Management"
-            Settings Management
+          />
-          </TextAnimation>
         </div>
       </ReactLenis>
     </ThemeProvider>

src/app/cart/page.tsx

@@ -33,7 +33,7 @@ export default function CartPage() {
               { name: "Orders", id: "/order-tracking" },
               { name: "Pricing", id: "#pricing" },
               { name: "Testimonials", id: "#testimonials" },
-              { name: "Contact", id: "#contact" },
+              { name: "Contact", id: "#contact" }
             ]}
             brandName="ReservaFlow"
             button={{ text: "Start Free Trial", href: "#contact" }}
@@ -44,9 +44,8 @@ export default function CartPage() {
           <TextAnimation
             type="entrance-slide"
             className="text-4xl font-bold mb-4"
-          >
+            text="Your Shopping Cart"
-            Your Shopping Cart
+          />
-          </TextAnimation>
           <p className="text-lg text-foreground/80">
             Looks like your cart is empty. <a href="/menu" className="text-primary-cta hover:underline">Browse our menu</a> to add some delicious items!
           </p>

src/app/order-tracking/page.tsx

@@ -33,7 +33,7 @@ export default function OrderTrackingPage() {
               { name: "Orders", id: "/order-tracking" },
               { name: "Pricing", id: "#pricing" },
               { name: "Testimonials", id: "#testimonials" },
-              { name: "Contact", id: "#contact" },
+              { name: "Contact", id: "#contact" }
             ]}
             brandName="ReservaFlow"
             button={{ text: "Start Free Trial", href: "#contact" }}
@@ -44,9 +44,8 @@ export default function OrderTrackingPage() {
           <TextAnimation
             type="entrance-slide"
             className="text-4xl font-bold mb-4"
-          >
+            text="Track Your Order"
-            Track Your Order
+          />
-          </TextAnimation>
           <p className="text-lg text-foreground/80 mb-8">
             Enter your order number to check its status.
           </p>