Merge version_1 into main #1

Merged
bender merged 2 commits from version_1 into main 2026-03-10 22:24:46 +00:00
2 changed files with 30 additions and 45 deletions

View File

@@ -4,7 +4,6 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import HeroSplit from "@/components/sections/hero/HeroSplit";
import TextAbout from "@/components/sections/about/TextAbout";
import ProjectShowcase from "@/components/sections/product/ProjectShowcase";
import FeatureCardSix from "@/components/sections/feature/FeatureCardSix";
import MetricCardTwo from "@/components/sections/metrics/MetricCardTwo";
import ContactSplit from "@/components/sections/contact/ContactSplit";
@@ -75,7 +74,7 @@ export default function LandingPage() {
</div>
<div id="projects" data-section="projects">
<ProjectShowcase
<FeatureCardSix
title="Recent Works"
description="A selection of projects that define our design philosophy through minimal form and maximum impact."
tag="Portfolio"
@@ -83,16 +82,14 @@ export default function LandingPage() {
tagAnimation="slide-up"
textboxLayout="default"
useInvertedBackground={false}
items={[
features={[
{
id: "project-1", title: "Riverside Residence", description: "Minimalist family home featuring clean lines, natural materials, and seamless indoor-outdoor integration. Completed 2024.", imageSrc: "http://img.b2bpic.net/free-photo/bottom-view-modern-apartment-building_116348-101.jpg", imageAlt: "Riverside Residence architectural photography", buttons: [
{ text: "View Project", href: "#" }
]
id: 1,
title: "Riverside Residence", description: "Minimalist family home featuring clean lines, natural materials, and seamless indoor-outdoor integration. Completed 2024.", imageSrc: "http://img.b2bpic.net/free-photo/bottom-view-modern-apartment-building_116348-101.jpg", imageAlt: "Riverside Residence architectural photography"
},
{
id: "project-2", title: "Urban Studio Conversion", description: "Adaptive reuse of historic warehouse into contemporary artist studios. Preserves character while introducing modern minimalist interventions. Completed 2023.", imageSrc: "http://img.b2bpic.net/free-photo/pretty-pregnant-woman-sits-sofa-looks-window_8353-10692.jpg", imageAlt: "Urban Studio Conversion interior view", buttons: [
{ text: "View Project", href: "#" }
]
id: 2,
title: "Urban Studio Conversion", description: "Adaptive reuse of historic warehouse into contemporary artist studios. Preserves character while introducing modern minimalist interventions. Completed 2023.", imageSrc: "http://img.b2bpic.net/free-photo/pretty-pregnant-woman-sits-sofa-looks-window_8353-10692.jpg", imageAlt: "Urban Studio Conversion interior view"
}
]}
/>

View File

@@ -1,51 +1,39 @@
"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;
fontSize?: number;
fontWeight?: number | string;
dominantBaseline?: 'auto' | 'text-top' | 'text-bottom' | 'middle' | 'central' | 'hanging' | 'mathematical' | 'inherit';
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
export const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
className,
fontSize = 24,
fontWeight = 'bold',
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 200 50"
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="50%"
y="50%"
fontSize={fontSize}
fontWeight={fontWeight}
textAnchor="middle"
dominantBaseline={dominantBaseline}
fill="currentColor"
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;