Merge version_12 into main

Merge version_12 into main

src/app/about/page.tsx

@@ -10,11 +10,11 @@ import { Sparkles, MapPin } from "lucide-react";
 import Link from "next/link";
 
 const navItems = [
-  { name: "Home", id: "home" },
-  { name: "Menu", id: "menu" },
-  { name: "Order Online", id: "order-online" },
-  { name: "About", id: "about" },
-  { name: "Contact", id: "contact" },
+  { name: "Home", id: "/" },
+  { name: "Menu", id: "/menu" },
+  { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+  { name: "About", id: "/about" },
+  { name: "Contact", id: "/contact" },
 ];
 
 const footerColumns = [
@@ -96,16 +96,20 @@ export default function AboutPage() {
           features={[
             {
               id: "quality",              title: "Premium Quality",              tags: ["Excellence", "Standards"],
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-arrangement-organic-vegetables_23-2148538677.jpg?_wi=2",              imageAlt: "Premium quality ingredients"},
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-arrangement-organic-vegetables_23-2148538677.jpg?_wi=2",              imageAlt: "Premium quality ingredients"
+            },
             {
               id: "health",              title: "Health Consciousness",              tags: ["Wellness", "Nutrition"],
-              imageSrc: "http://img.b2bpic.net/free-photo/two-sporty-girls-kitchen-preparing-food_1303-24786.jpg?_wi=2",              imageAlt: "Health and wellness focus"},
+              imageSrc: "http://img.b2bpic.net/free-photo/two-sporty-girls-kitchen-preparing-food_1303-24786.jpg?_wi=2",              imageAlt: "Health and wellness focus"
+            },
             {
               id: "community",              title: "Community Focused",              tags: ["Connection", "Support"],
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-waitress-standing-with-disposable-coffee-cup_107420-12314.jpg?_wi=2",              imageAlt: "Community and connection"},
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-waitress-standing-with-disposable-coffee-cup_107420-12314.jpg?_wi=2",              imageAlt: "Community and connection"
+            },
             {
               id: "innovation",              title: "Innovation in Flavors",              tags: ["Creativity", "Fresh Ideas"],
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-slices-bread-sandwiches-with-salad_23-2148640157.jpg?_wi=2",              imageAlt: "Innovative flavor combinations"},
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-slices-bread-sandwiches-with-salad_23-2148640157.jpg?_wi=2",              imageAlt: "Innovative flavor combinations"
+            },
           ]}
           carouselMode="buttons"
         />
@@ -119,11 +123,14 @@ export default function AboutPage() {
           useInvertedBackground={false}
           testimonials={[
             {
-              id: "1",              title: "Life Changing Healthy Habits",              quote: "Get Fruity helped me stick to my healthy eating goals. The smoothies are delicious and I feel energized every time I visit.",              name: "Sarah M.",              role: "Wellness Journey",              imageSrc: "http://img.b2bpic.net/free-photo/smiling-woman-with-olives-beer_23-2147680964.jpg?_wi=2",              imageAlt: "Sarah, wellness advocate"},
+              id: "1",              title: "Life Changing Healthy Habits",              quote: "Get Fruity helped me stick to my healthy eating goals. The smoothies are delicious and I feel energized every time I visit.",              name: "Sarah M.",              role: "Wellness Journey",              imageSrc: "http://img.b2bpic.net/free-photo/smiling-woman-with-olives-beer_23-2147680964.jpg?_wi=2",              imageAlt: "Sarah, wellness advocate"
+            },
             {
-              id: "2",              title: "Supportive Local Business",              quote: "It's refreshing to support a local business that genuinely cares about quality and customer satisfaction. Highly recommend!",              name: "Marcus L.",              role: "Local Advocate",              imageSrc: "http://img.b2bpic.net/free-photo/latin-man-his-30s-smiling-making-eye-contact-while-drinking-coffee-sandwich-his-lunch-break-food-court_662251-228.jpg?_wi=2",              imageAlt: "Marcus, local business supporter"},
+              id: "2",              title: "Supportive Local Business",              quote: "It's refreshing to support a local business that genuinely cares about quality and customer satisfaction. Highly recommend!",              name: "Marcus L.",              role: "Local Advocate",              imageSrc: "http://img.b2bpic.net/free-photo/latin-man-his-30s-smiling-making-eye-contact-while-drinking-coffee-sandwich-his-lunch-break-food-court_662251-228.jpg?_wi=2",              imageAlt: "Marcus, local business supporter"
+            },
             {
-              id: "3",              title: "Perfect Family Destination",              quote: "Our whole family loves Get Fruity. The staff is friendly, the food is fresh, and everyone finds something they enjoy.",              name: "Patricia T.",              role: "Family Values",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-woman-restoring-wooden-furniture_23-2150062511.jpg?_wi=2",              imageAlt: "Patricia, family-focused customer"},
+              id: "3",              title: "Perfect Family Destination",              quote: "Our whole family loves Get Fruity. The staff is friendly, the food is fresh, and everyone finds something they enjoy.",              name: "Patricia T.",              role: "Family Values",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-woman-restoring-wooden-furniture_23-2150062511.jpg?_wi=2",              imageAlt: "Patricia, family-focused customer"
+            },
           ]}
         />
       </div>

src/app/contact/page.tsx

@@ -10,11 +10,11 @@ import { MapPin, Zap } from "lucide-react";
 
 export default function ContactPage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Menu", id: "menu" },
-    { name: "Order Online", id: "order-online" },
-    { name: "About", id: "about" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "Menu", id: "/menu" },
+    { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+    { name: "About", id: "/about" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const footerColumns = [
@@ -77,9 +77,11 @@ export default function ContactPage() {
           imageAlt="Get Fruity Cafe storefront in Conyers"
           buttons={[
             {
-              text: "Call Us: +1 (943) 269-8508",              href: "tel:+19432698508"},
+              text: "Call Us: +1 (943) 269-8508",              href: "tel:+19432698508"
+            },
             {
-              text: "Order Online",              href: "https://get-fruity-cafe-conyers.food-menu.net/menu/"},
+              text: "Order Online",              href: "https://get-fruity-cafe-conyers.food-menu.net/menu/"
+            },
           ]}
           buttonAnimation="slide-up"
         />
@@ -93,7 +95,8 @@ export default function ContactPage() {
           tagIcon={Zap}
           tagAnimation="slide-up"
           background={{
-            variant: "sparkles-gradient"}}
+            variant: "sparkles-gradient"
+          }}
           useInvertedBackground={true}
           imageSrc="http://img.b2bpic.net/free-photo/colorful-healthy-breakfast-sweet-deserts-few-different-chia-puddings-glass-jars-wooden-table-kitchen-home_343596-1244.jpg?_wi=3"
           imageAlt="Fresh smoothie bowl ready to enjoy"

src/app/layout.tsx

@@ -6,22 +6,10 @@ import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
+import { Open_Sans } from "next/font/google";
 
-const halant = Halant({
-  variable: "--font-halant",
-  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});
 
-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
-});
 
-const manrope = Manrope({
-  variable: "--font-manrope",
-  subsets: ["latin"],
-});
 
 export const metadata: Metadata = {
   title: "Get Fruity Cafe - Fresh Smoothies & Healthy Eats in Conyers, GA",
@@ -56,6 +44,15 @@ export const metadata: Metadata = {
   },
 };
 
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
+const openSans = Open_Sans({
+  variable: "--font-open-sans",
+  subsets: ["latin"],
+});
+
 export default function RootLayout({
   children,
 }: Readonly<{
@@ -64,9 +61,7 @@ export default function RootLayout({
   return (
     <html lang="en" suppressHydrationWarning>
       <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} ${manrope.variable} antialiased`}
-        >
+        <body className={`${inter.variable} ${openSans.variable} antialiased`}>
           <Tag />
           {children}
           <script

src/app/menu/page.tsx

@@ -11,11 +11,11 @@ import Link from "next/link";
 
 export default function MenuPage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Menu", id: "menu" },
-    { name: "Order Online", id: "order-online" },
-    { name: "About", id: "about" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "Menu", id: "/menu" },
+    { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+    { name: "About", id: "/about" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const footerColumns = [

src/app/order-online/page.tsx

@@ -10,11 +10,11 @@ import { ShoppingCart, Zap } from "lucide-react";
 import Link from "next/link";
 
 const navItems = [
-  { name: "Home", id: "home" },
-  { name: "Menu", id: "menu" },
-  { name: "Order Online", id: "order-online" },
-  { name: "About", id: "about" },
-  { name: "Contact", id: "contact" },
+  { name: "Home", id: "/" },
+  { name: "Menu", id: "/menu" },
+  { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+  { name: "About", id: "/about" },
+  { name: "Contact", id: "/contact" },
 ];
 
 const footerColumns = [
@@ -81,11 +81,14 @@ export default function OrderOnlinePage() {
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/colorful-healthy-breakfast-sweet-deserts-few-different-chia-puddings-glass-jars-wooden-table-kitchen-home_343596-1244.jpg?_wi=3",              imageAlt: "Fresh smoothie bowl ready to order"},
+              imageSrc: "http://img.b2bpic.net/free-photo/colorful-healthy-breakfast-sweet-deserts-few-different-chia-puddings-glass-jars-wooden-table-kitchen-home_343596-1244.jpg?_wi=3",              imageAlt: "Fresh smoothie bowl ready to order"
+            },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-delicious-vegetable-rolls-whole-sliced-bright-blue-food-meal-roll-vegetable-snack_140725-34216.jpg?_wi=2",              imageAlt: "Fresh wraps available for order"},
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-delicious-vegetable-rolls-whole-sliced-bright-blue-food-meal-roll-vegetable-snack_140725-34216.jpg?_wi=2",              imageAlt: "Fresh wraps available for order"
+            },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/fresh-green-vegetables-carrots-black-board-high-quality-photo_114579-26974.jpg?_wi=3",              imageAlt: "Fresh ingredients in every order"},
+              imageSrc: "http://img.b2bpic.net/free-photo/fresh-green-vegetables-carrots-black-board-high-quality-photo_114579-26974.jpg?_wi=3",              imageAlt: "Fresh ingredients in every order"
+            },
           ]}
           mediaAnimation="blur-reveal"
           ariaLabel="Get Fruity Cafe Order Online Hero Section"
@@ -105,15 +108,20 @@ export default function OrderOnlinePage() {
           buttonAnimation="slide-up"
           products={[
             {
-              id: "smoothies",              name: "Smoothies",              price: "$7.95 - $9.95",              imageSrc: "http://img.b2bpic.net/free-photo/smoothie-selection-colorful-beverages-bright_23-2148227533.jpg",              imageAlt: "Colorful smoothie selection"},
+              id: "smoothies",              name: "Smoothies",              price: "$7.95 - $9.95",              imageSrc: "http://img.b2bpic.net/free-photo/smoothie-selection-colorful-beverages-bright_23-2148227533.jpg",              imageAlt: "Colorful smoothie selection"
+            },
             {
-              id: "wraps",              name: "Wraps",              price: "$12.95 - $14.95",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-sliced-sandwich-with-vegetables-white-background-bread-meal-sandwich-burger-food_140725-80419.jpg?_wi=2",              imageAlt: "Fresh wraps with premium fillings"},
+              id: "wraps",              name: "Wraps",              price: "$12.95 - $14.95",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-sliced-sandwich-with-vegetables-white-background-bread-meal-sandwich-burger-food_140725-80419.jpg?_wi=2",              imageAlt: "Fresh wraps with premium fillings"
+            },
             {
-              id: "acai-bowls",              name: "Acai Bowls",              price: "$10.95 - $12.95",              imageSrc: "http://img.b2bpic.net/free-photo/breakfast-dessert-bowl-with-banana-slices-blueberries_23-2148417436.jpg?_wi=2",              imageAlt: "Colorful acai bowls with fresh toppings"},
+              id: "acai-bowls",              name: "Acai Bowls",              price: "$10.95 - $12.95",              imageSrc: "http://img.b2bpic.net/free-photo/breakfast-dessert-bowl-with-banana-slices-blueberries_23-2148417436.jpg?_wi=2",              imageAlt: "Colorful acai bowls with fresh toppings"
+            },
             {
-              id: "salads",              name: "Salads",              price: "$11.95 - $13.95",              imageSrc: "http://img.b2bpic.net/free-photo/overhead-view-fresh-peeled-cut-potatoes-with-red-pepper-radishes-green-tomatoes-brown-plate-meters-spices-green-black-mix-colors-surface_179666-24597.jpg?_wi=2",              imageAlt: "Fresh salads with healthy ingredients"},
+              id: "salads",              name: "Salads",              price: "$11.95 - $13.95",              imageSrc: "http://img.b2bpic.net/free-photo/overhead-view-fresh-peeled-cut-potatoes-with-red-pepper-radishes-green-tomatoes-brown-plate-meters-spices-green-black-mix-colors-surface_179666-24597.jpg?_wi=2",              imageAlt: "Fresh salads with healthy ingredients"
+            },
             {
-              id: "breakfast",              name: "Breakfast Items",              price: "$8.95 - $11.95",              imageSrc: "http://img.b2bpic.net/free-photo/toasts-cupcakes-juice_23-2147678718.jpg?_wi=2",              imageAlt: "Breakfast menu items"},
+              id: "breakfast",              name: "Breakfast Items",              price: "$8.95 - $11.95",              imageSrc: "http://img.b2bpic.net/free-photo/toasts-cupcakes-juice_23-2147678718.jpg?_wi=2",              imageAlt: "Breakfast menu items"
+            },
           ]}
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"

src/app/page.tsx

@@ -14,11 +14,11 @@ import { Leaf, Star, Sparkles, MapPin, Zap } from "lucide-react";
 
 export default function HomePage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Menu", id: "menu" },
-    { name: "Order Online", id: "order-online" },
-    { name: "About", id: "about" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "Menu", id: "/menu" },
+    { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+    { name: "About", id: "/about" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const footerColumns = [
@@ -101,13 +101,6 @@ export default function HomePage() {
           ]}
           mediaAnimation="blur-reveal"
           ariaLabel="Get Fruity Cafe Hero Section"
-          containerClassName="px-4 sm:px-6 md:px-8 py-8 sm:py-12 md:py-16"
-          textBoxClassName="max-w-2xl"
-          titleClassName="text-3xl sm:text-4xl md:text-5xl lg:text-6xl leading-tight"
-          descriptionClassName="text-base sm:text-lg md:text-xl leading-relaxed mt-4 sm:mt-6"
-          buttonContainerClassName="flex flex-col sm:flex-row gap-3 sm:gap-4 mt-6 sm:mt-8"
-          mediaWrapperClassName="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 sm:gap-6 mt-8 sm:mt-12"
-          imageClassName="w-full h-64 sm:h-72 md:h-80 lg:h-96 object-cover rounded-lg"
         />
       </div>
 
@@ -146,15 +139,6 @@ export default function HomePage() {
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
           carouselMode="buttons"
-          containerClassName="px-4 sm:px-6 md:px-8 py-8 sm:py-12 md:py-16"
-          textBoxClassName="mb-8 sm:mb-12"
-          textBoxTitleClassName="text-3xl sm:text-4xl md:text-5xl"
-          textBoxDescriptionClassName="text-base sm:text-lg mt-3 sm:mt-4"
-          gridClassName="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 sm:gap-6 md:gap-8"
-          cardClassName="rounded-lg overflow-hidden"
-          imageClassName="w-full h-48 sm:h-56 md:h-64 object-cover"
-          cardNameClassName="text-base sm:text-lg font-semibold mt-3 sm:mt-4"
-          cardPriceClassName="text-sm sm:text-base font-semibold mt-2"
         />
       </div>
 
@@ -187,16 +171,6 @@ export default function HomePage() {
             },
           ]}
           carouselMode="buttons"
-          containerClassName="px-4 sm:px-6 md:px-8 py-8 sm:py-12 md:py-16"
-          textBoxClassName="mb-8 sm:mb-12"
-          textBoxTitleClassName="text-3xl sm:text-4xl md:text-5xl"
-          textBoxDescriptionClassName="text-base sm:text-lg mt-3 sm:mt-4"
-          gridClassName="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 sm:gap-6 md:gap-8"
-          cardClassName="rounded-lg overflow-hidden"
-          mediaClassName="w-full h-48 sm:h-56 md:h-64 object-cover"
-          cardTitleClassName="text-lg sm:text-xl font-semibold mt-3 sm:mt-4"
-          tagsContainerClassName="flex flex-wrap gap-2 mt-2 sm:mt-3"
-          tagClassName="text-xs sm:text-sm px-2 sm:px-3 py-1 rounded"
         />
       </div>
 
@@ -220,18 +194,6 @@ export default function HomePage() {
               id: "4",              title: "Amazing Healthy Meals",              quote: "Perfect for post-workout nutrition. The wraps are filling, the smoothies are refreshing, and everything tastes premium.",              name: "David K.",              role: "Active Lifestyle",              imageSrc: "http://img.b2bpic.net/free-photo/middle-age-businessman-smiling-happy-standing-city_839833-25759.jpg",              imageAlt: "David, active lifestyle customer"
             },
           ]}
-          containerClassName="px-4 sm:px-6 md:px-8 py-8 sm:py-12 md:py-16"
-          textBoxClassName="mb-8 sm:mb-12"
-          textBoxTitleClassName="text-3xl sm:text-4xl md:text-5xl"
-          textBoxDescriptionClassName="text-base sm:text-lg mt-3 sm:mt-4"
-          contentClassName="space-y-4 sm:space-y-6"
-          quoteCardClassName="rounded-lg p-4 sm:p-6 md:p-8"
-          testimonialTitleClassName="text-lg sm:text-xl font-semibold"
-          quoteClassName="text-base sm:text-lg italic mt-3 sm:mt-4"
-          nameClassName="text-sm sm:text-base font-semibold mt-4 sm:mt-6"
-          roleClassName="text-xs sm:text-sm mt-1"
-          mediaCardClassName="rounded-lg overflow-hidden mb-3 sm:mb-4"
-          mediaClassName="w-12 h-12 sm:w-14 sm:h-14 md:w-16 md:h-16 object-cover"
         />
       </div>
 
@@ -254,13 +216,6 @@ export default function HomePage() {
             },
           ]}
           buttonAnimation="slide-up"
-          className=""
-          textBoxClassName="max-w-2xl mb-8 sm:mb-12"
-          titleClassName="text-3xl sm:text-4xl md:text-5xl"
-          descriptionClassName="text-base sm:text-lg mt-3 sm:mt-4"
-          buttonContainerClassName="flex flex-col sm:flex-row gap-3 sm:gap-4 mt-6 sm:mt-8"
-          mediaWrapperClassName="mt-8 sm:mt-12"
-          mediaClassName="w-full h-64 sm:h-80 md:h-96 object-cover rounded-lg"
         />
       </div>
 
@@ -282,14 +237,6 @@ export default function HomePage() {
           inputPlaceholder="Enter your email for updates"
           buttonText="Start Ordering"
           termsText="By ordering, you agree to our Terms and Conditions."
-          containerClassName="px-4 sm:px-6 md:px-8 py-8 sm:py-12 md:py-16"
-          contentClassName="grid grid-cols-1 md:grid-cols-2 gap-8 sm:gap-12 items-center"
-          contactFormClassName="space-y-6 sm:space-y-8"
-          titleClassName="text-3xl sm:text-4xl md:text-5xl"
-          descriptionClassName="text-base sm:text-lg mt-3 sm:mt-4"
-          formWrapperClassName="mt-6 sm:mt-8"
-          mediaWrapperClassName="mt-8 sm:mt-12 md:mt-0"
-          mediaClassName="w-full h-64 sm:h-80 md:h-96 object-cover rounded-lg"
         />
       </div>
 
@@ -298,10 +245,6 @@ export default function HomePage() {
           columns={footerColumns}
           bottomLeftText="© 2024 Get Fruity Cafe. All rights reserved."
           bottomRightText="Privacy Policy | Terms of Service"
-          containerClassName="px-4 sm:px-6 md:px-8 py-8 sm:py-12 md:py-16"
-          columnsClassName="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 sm:gap-8 md:gap-12"
-          columnTitleClassName="text-base sm:text-lg font-semibold"
-          columnItemClassName="text-sm sm:text-base mt-2 sm:mt-3"
         />
       </div>
     </ThemeProvider>

src/app/styles/base.css

@@ -11,7 +11,7 @@ html {
 body {
   background-color: var(--background);
   color: var(--foreground);
-  font-family: var(--font-manrope), sans-serif;
+  font-family: var(--font-open-sans), sans-serif;
   position: relative;
   min-height: 100vh;
   overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-manrope), sans-serif;
+  font-family: var(--font-inter), sans-serif;
 }

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #0A0A0A;
-  --card: #1A1A1A;
-  --foreground: #FFFFFF;
-  --primary-cta: #2ECC71;
+  --background: #ffffff;
+  --card: #f9f9f9;
+  --foreground: #000f06e6;
+  --primary-cta: #0a7039;
   --primary-cta-text: #ffffff;
-  --secondary-cta: #8E44AD;
-  --secondary-cta-text: #1c1c1c;
-  --accent: #F4D03F;
-  --background-accent: #F7DC6F;
+  --secondary-cta: #f9f9f9;
+  --secondary-cta-text: #000f06e6;
+  --accent: #e2e2e2;
+  --background-accent: #c4c4c4;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);