Merge version_1 into main #2

Merged
bender merged 3 commits from version_1 into main 2026-03-11 18:09:59 +00:00
3 changed files with 50 additions and 106 deletions

View File

@@ -5,7 +5,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import HeroBillboard from "@/components/sections/hero/HeroBillboard";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import { MapPin, Phone, MessageCircle } from "lucide-react";
import { MapPin, Phone, MessageCircle, Sparkles } from "lucide-react";
export default function LocationsPage() {
const navItems = [
@@ -17,37 +17,13 @@ export default function LocationsPage() {
const locations = [
{
id: "islamabad-blue-area",
city: "Islamabad",
name: "Blue Area",
address: "108-W Jinnah Ave, Block I G 7/2 Blue Area, Islamabad",
phone: "(051) 2804240",
whatsapp: "+92 300 1916252",
},
id: "islamabad-blue-area", city: "Islamabad", name: "Blue Area", address: "108-W Jinnah Ave, Block I G 7/2 Blue Area, Islamabad", phone: "(051) 2804240", whatsapp: "+92 300 1916252"},
{
id: "islamabad-aura",
city: "Islamabad",
name: "Aura Square F-11",
address: "Aura Square Mall, Major Road, F-11, Islamabad",
phone: "(051) 8318888",
whatsapp: "+92 300 8548359",
},
id: "islamabad-aura", city: "Islamabad", name: "Aura Square F-11", address: "Aura Square Mall, Major Road, F-11, Islamabad", phone: "(051) 8318888", whatsapp: "+92 300 8548359"},
{
id: "islamabad-diplomatic",
city: "Islamabad",
name: "Diplomatic Enclave",
address: "Ramna 5, Diplomatic Enclave, Islamabad",
phone: "(051) 8356643",
whatsapp: "+92 300 1916252",
},
id: "islamabad-diplomatic", city: "Islamabad", name: "Diplomatic Enclave", address: "Ramna 5, Diplomatic Enclave, Islamabad", phone: "(051) 8356643", whatsapp: "+92 300 1916252"},
{
id: "lahore-dha",
city: "Lahore",
name: "DHA Phase 4",
address: "Gold Crest Mall, Sector DD, Phase 4 DHA, Lahore",
phone: "(042) 3567-8900",
whatsapp: "+92 300 1234567",
},
id: "lahore-dha", city: "Lahore", name: "DHA Phase 4", address: "Gold Crest Mall, Sector DD, Phase 4 DHA, Lahore", phone: "(042) 3567-8900", whatsapp: "+92 300 1234567"},
];
return (
@@ -78,7 +54,7 @@ export default function LocationsPage() {
description="Find Loafology near you. We have multiple premium locations in Islamabad and Lahore serving fresh artisanal breads, pastries, and cafe favorites."
background={{ variant: "sparkles-gradient" }}
tag="Find Us"
tagIcon="MapPin"
tagIcon={MapPin}
tagAnimation="slide-up"
buttons={[
{ text: "Order Online", href: "/store" },

View File

@@ -7,7 +7,7 @@ import HeroBillboard from "@/components/sections/hero/HeroBillboard";
import ProductCardOne from "@/components/sections/product/ProductCardOne";
import ContactText from "@/components/sections/contact/ContactText";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import { ShoppingCart, Truck, Clock } from "lucide-react";
import { ShoppingCart, Truck, Clock, TrendingUp } from "lucide-react";
export default function StorePage() {
const navItems = [
@@ -19,47 +19,17 @@ export default function StorePage() {
const allProducts = [
{
id: "1",
name: "Sourdough Loaf",
price: "Rs 350",
imageSrc: "http://img.b2bpic.net/free-photo/oatmeal-cookies-with-black-cumin-with-glass-coffee_114579-16082.jpg?_wi=4",
imageAlt: "Fresh sourdough loaf",
},
id: "1", name: "Sourdough Loaf", price: "Rs 350", imageSrc: "http://img.b2bpic.net/free-photo/oatmeal-cookies-with-black-cumin-with-glass-coffee_114579-16082.jpg", imageAlt: "Fresh sourdough loaf"},
{
id: "2",
name: "Butter Croissant",
price: "Rs 200",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-roissants-near-drink-book_23-2147886002.jpg?_wi=4",
imageAlt: "Buttery croissant",
},
id: "2", name: "Butter Croissant", price: "Rs 200", imageSrc: "http://img.b2bpic.net/free-photo/close-up-roissants-near-drink-book_23-2147886002.jpg", imageAlt: "Buttery croissant"},
{
id: "3",
name: "NY Cheesecake",
price: "Rs 450",
imageSrc: "http://img.b2bpic.net/free-photo/variety-pastries-buns-wooden-board_114579-12903.jpg?_wi=4",
imageAlt: "Fresh cheesecake slice",
},
id: "3", name: "NY Cheesecake", price: "Rs 450", imageSrc: "http://img.b2bpic.net/free-photo/variety-pastries-buns-wooden-board_114579-12903.jpg", imageAlt: "Fresh cheesecake slice"},
{
id: "4",
name: "Whole Wheat Bread",
price: "Rs 300",
imageSrc: "http://img.b2bpic.net/free-photo/oatmeal-cookies-with-black-cumin-with-glass-coffee_114579-16082.jpg?_wi=5",
imageAlt: "Whole wheat bread loaf",
},
id: "4", name: "Whole Wheat Bread", price: "Rs 300", imageSrc: "http://img.b2bpic.net/free-photo/oatmeal-cookies-with-black-cumin-with-glass-coffee_114579-16082.jpg", imageAlt: "Whole wheat bread loaf"},
{
id: "5",
name: "Almond Croissant",
price: "Rs 250",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-roissants-near-drink-book_23-2147886002.jpg?_wi=5",
imageAlt: "Almond-filled croissant",
},
id: "5", name: "Almond Croissant", price: "Rs 250", imageSrc: "http://img.b2bpic.net/free-photo/close-up-roissants-near-drink-book_23-2147886002.jpg", imageAlt: "Almond-filled croissant"},
{
id: "6",
name: "Chocolate Cake",
price: "Rs 500",
imageSrc: "http://img.b2bpic.net/free-photo/variety-pastries-buns-wooden-board_114579-12903.jpg?_wi=5",
imageAlt: "Chocolate cake slice",
},
id: "6", name: "Chocolate Cake", price: "Rs 500", imageSrc: "http://img.b2bpic.net/free-photo/variety-pastries-buns-wooden-board_114579-12903.jpg", imageAlt: "Chocolate cake slice"},
];
return (
@@ -90,14 +60,14 @@ export default function StorePage() {
description="Delivery and pickup available from all our premium locations. Same-day delivery for orders placed before 12 PM. Enjoy the taste of freshly baked goodness at your doorstep."
background={{ variant: "sparkles-gradient" }}
tag="Fast Delivery"
tagIcon="Truck"
tagIcon={Truck}
tagAnimation="slide-up"
buttons={[
{ text: "Browse Catalog", href: "#products" },
{ text: "View Locations", href: "/locations" },
]}
buttonAnimation="slide-up"
imageSrc="http://img.b2bpic.net/free-photo/hot-freshly-buns-heart-shaped-basket-close-up-photo-freshly-baked-bread-products_613910-6794.jpg?_wi=3"
imageSrc="http://img.b2bpic.net/free-photo/hot-freshly-buns-heart-shaped-basket-close-up-photo-freshly-baked-bread-products_613910-6794.jpg"
imageAlt="Fresh artisanal breads ready for delivery"
mediaAnimation="slide-up"
/>
@@ -143,7 +113,7 @@ export default function StorePage() {
title="Our Collection"
description="Browse our full selection of fresh breads, pastries, cakes, and cafe favorites. All items are handcrafted with premium organic ingredients."
tag="Best Sellers"
tagIcon="TrendingUp"
tagIcon={TrendingUp}
tagAnimation="slide-up"
products={allProducts}
gridVariant="three-columns-all-equal-width"

View File

@@ -1,51 +1,49 @@
"use client";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
import React from 'react';
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
text: string;
fontSize?: number;
fontWeight?: number;
fontFamily?: string;
fill?: string;
className?: string;
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
fontSize = 48,
fontWeight = 700,
fontFamily = 'system-ui, -apple-system, sans-serif',
fill = '#000000',
className = '',
}) => {
const padding = 20;
const textWidth = text.length * (fontSize * 0.6);
const width = textWidth + padding * 2;
const height = fontSize + padding * 2;
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
width={width}
height={height}
viewBox={`0 0 ${width} ${height}`}
className={className}
xmlns="http://www.w3.org/2000/svg"
>
<text
ref={textRef}
x="0"
y={verticalAlign === "center" ? "50%" : "0"}
className="font-bold fill-current"
style={{
fontSize: "20px",
letterSpacing: "-0.02em",
dominantBaseline: verticalAlign === "center" ? "middle" : "text-before-edge"
}}
x={width / 2}
y={height / 2}
textAnchor="middle"
dominantBaseline="middle"
fontSize={fontSize}
fontWeight={fontWeight}
fontFamily={fontFamily}
fill={fill}
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;