Merge version_1 into main #1

Merged
bender merged 2 commits from version_1 into main 2026-03-11 07:11:43 +00:00
2 changed files with 47 additions and 40 deletions

View File

@@ -1,6 +1,6 @@
"use client";
import { Building2, CheckCircle, Leaf, Shield, Sparkles, Wind, Zap } from "lucide-react";
import { Building2, CheckCircle, Home, Leaf, Shield, Sparkles, Wind, Zap } from "lucide-react";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroLogoBillboardSplit from '@/components/sections/hero/HeroLogoBillboardSplit';
import TextAbout from '@/components/sections/about/TextAbout';
@@ -15,7 +15,7 @@ export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="reveal-blur"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="compact"
sizing="mediumLargeSizeMediumTitles"
@@ -60,7 +60,7 @@ export default function LandingPage() {
tag="Trusted by Almaty"
title="⭐ 4.6 Rating · 140+ Reviews · Serving All Districts · 24/7 Available"
useInvertedBackground={false}
tagAnimation="reveal-blur"
tagAnimation="slide-up"
/>
</div>
@@ -78,7 +78,7 @@ export default function LandingPage() {
title: "Deep Cleaning", description: "Intensive cleaning including all corners and hard-to-reach areas"
},
{
icon: Building2,
icon: Home,
title: "Move-Out Cleaning", description: "Complete turnover cleaning for rental apartments and properties"
},
{

View File

@@ -1,51 +1,58 @@
"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;
className?: string;
textClassName?: string;
fillColor?: string;
strokeColor?: string;
strokeWidth?: number;
fontSize?: number;
fontWeight?: number | string;
fontFamily?: string;
letterSpacing?: number;
textAnchor?: 'start' | 'middle' | 'end';
dominantBaseline?: 'auto' | 'text-bottom' | 'alphabetic' | 'ideographic' | 'middle' | 'central' | 'mathematical' | 'hanging';
}
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,
className = '',
textClassName = '',
fillColor = 'currentColor',
strokeColor = 'none',
strokeWidth = 0,
fontSize = 48,
fontWeight = 700,
fontFamily = 'sans-serif',
letterSpacing = 0,
textAnchor = 'middle',
dominantBaseline = 'middle',
}) => {
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}`}
className={className}
preserveAspectRatio="xMidYMid meet"
>
<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="50%"
y="50%"
textAnchor={textAnchor}
dominantBaseline={dominantBaseline}
fill={fillColor}
stroke={strokeColor}
strokeWidth={strokeWidth}
fontSize={fontSize}
fontWeight={fontWeight}
fontFamily={fontFamily}
letterSpacing={letterSpacing}
className={textClassName}
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;