Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-12 23:36:46 +00:00
2 changed files with 38 additions and 48 deletions

View File

@@ -22,7 +22,7 @@ export default function LandingPage() {
borderRadius="soft"
contentWidth="mediumLarge"
sizing="largeSizeMediumTitles"
background="noise"
background="circleGradient"
cardStyle="subtle-shadow"
primaryButtonStyle="flat"
secondaryButtonStyle="radial-glow"
@@ -46,7 +46,7 @@ export default function LandingPage() {
<HeroBillboard
title="Premium Cannabis Bundles, Delivered Bigtime"
description="Top-shelf flower, edibles, vapes, and more—curated and delivered across NYC in minutes, day or night. Stack more value with our signature bundles: trusted quality, fast delivery, zero hassle."
background={{ variant: "noise" }}
background={{ variant: "sparkles-gradient" }}
tag="Fast Delivery"
tagIcon={Zap}
tagAnimation="slide-up"
@@ -54,7 +54,7 @@ export default function LandingPage() {
{ text: "Shop Bundles Now", href: "#products" },
{ text: "Learn More", href: "#about" }
]}
imageSrc="http://img.b2bpic.net/free-photo/craftswoman-working-workshop_107420-65255.jpg?_wi=1"
imageSrc="http://img.b2bpic.net/free-photo/craftswoman-working-workshop_107420-65255.jpg"
imageAlt="Premium cannabis bundles luxury packaging"
mediaAnimation="slide-up"
/>
@@ -73,15 +73,15 @@ export default function LandingPage() {
products={[
{
id: "bundle-1", brand: "Bigtime Bundles", name: "The Flower Stack", price: "$89.00", rating: 5,
reviewCount: "847", imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-natural-medicinal-spices-herbs_23-2148776504.jpg?_wi=1", imageAlt: "Premium flower bundle"
reviewCount: "847", imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-natural-medicinal-spices-herbs_23-2148776504.jpg", imageAlt: "Premium flower bundle"
},
{
id: "bundle-2", brand: "Bigtime Bundles", name: "The Vibe Mix", price: "$99.00", rating: 5,
reviewCount: "623", imageSrc: "http://img.b2bpic.net/free-photo/spoon-form-black-white-chocolates-side-view_141793-13070.jpg?_wi=1", imageAlt: "Mixed cannabis bundle"
reviewCount: "623", imageSrc: "http://img.b2bpic.net/free-photo/spoon-form-black-white-chocolates-side-view_141793-13070.jpg", imageAlt: "Mixed cannabis bundle"
},
{
id: "bundle-3", brand: "Bigtime Bundles", name: "The Edibles Explorer", price: "$79.00", rating: 5,
reviewCount: "512", imageSrc: "http://img.b2bpic.net/free-photo/delicious-terere-drink-still-life_23-2150219499.jpg?_wi=1", imageAlt: "Premium edibles bundle"
reviewCount: "512", imageSrc: "http://img.b2bpic.net/free-photo/delicious-terere-drink-still-life_23-2150219499.jpg", imageAlt: "Premium edibles bundle"
},
{
id: "product-1", brand: "Premium Cultivars", name: "Midnight Kush - Quarter Oz", price: "$45.00", rating: 5,
@@ -121,16 +121,16 @@ export default function LandingPage() {
animationType="slide-up"
features={[
{
id: "feature-1", tag: "Speed", title: "30-60 Minute Delivery", description: "Fast, reliable delivery across all five boroughs. Order day or night—we're here.", imageSrc: "http://img.b2bpic.net/free-photo/craftswoman-working-workshop_107420-65255.jpg?_wi=2", imageAlt: "Fast delivery service"
id: "feature-1", tag: "Speed", title: "30-60 Minute Delivery", description: "Fast, reliable delivery across all five boroughs. Order day or night—we're here.", imageSrc: "http://img.b2bpic.net/free-photo/craftswoman-working-workshop_107420-65255.jpg", imageAlt: "Fast delivery service"
},
{
id: "feature-2", tag: "Curation", title: "Expert-Curated Selection", description: "Top-shelf flower, premium edibles, quality vapes, and more. No compromise on quality.", imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-natural-medicinal-spices-herbs_23-2148776504.jpg?_wi=2", imageAlt: "Premium curated products"
id: "feature-2", tag: "Curation", title: "Expert-Curated Selection", description: "Top-shelf flower, premium edibles, quality vapes, and more. No compromise on quality.", imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-natural-medicinal-spices-herbs_23-2148776504.jpg", imageAlt: "Premium curated products"
},
{
id: "feature-3", tag: "Trust", title: "Discreet & Legal", description: "Fully compliant NYC dispensary. Professional, confidential service every time.", imageSrc: "http://img.b2bpic.net/free-photo/spoon-form-black-white-chocolates-side-view_141793-13070.jpg?_wi=2", imageAlt: "Trusted service"
id: "feature-3", tag: "Trust", title: "Discreet & Legal", description: "Fully compliant NYC dispensary. Professional, confidential service every time.", imageSrc: "http://img.b2bpic.net/free-photo/spoon-form-black-white-chocolates-side-view_141793-13070.jpg", imageAlt: "Trusted service"
},
{
id: "feature-4", tag: "Value", title: "Bundle Savings", description: "Stack more value with our signature bundles. Premium products, better pricing.", imageSrc: "http://img.b2bpic.net/free-photo/delicious-terere-drink-still-life_23-2150219499.jpg?_wi=2", imageAlt: "Value bundles"
id: "feature-4", tag: "Value", title: "Bundle Savings", description: "Stack more value with our signature bundles. Premium products, better pricing.", imageSrc: "http://img.b2bpic.net/free-photo/delicious-terere-drink-still-life_23-2150219499.jpg", imageAlt: "Value bundles"
}
]}
/>
@@ -247,9 +247,9 @@ export default function LandingPage() {
tag="Newsletter"
title="Stay Updated on New Drops"
description="Be the first to know about new products, exclusive bundles, and limited-time offers."
background={{ variant: "noise" }}
background={{ variant: "sparkles-gradient" }}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/craftswoman-working-workshop_107420-65255.jpg?_wi=3"
imageSrc="http://img.b2bpic.net/free-photo/craftswoman-working-workshop_107420-65255.jpg"
imageAlt="New cannabis products"
mediaAnimation="slide-up"
mediaPosition="right"

View File

@@ -1,51 +1,41 @@
"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?: string | 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 = 32,
fontWeight = 'bold',
fontFamily = 'Arial, sans-serif',
fill = '#000000',
className = '',
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
viewBox={`0 0 ${text.length * fontSize * 0.6} ${fontSize * 1.5}`}
xmlns="http://www.w3.org/2000/svg"
className={className}
>
<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"
}}
y={fontSize}
fontSize={fontSize}
fontWeight={fontWeight}
fontFamily={fontFamily}
fill={fill}
dominantBaseline="middle"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;