Merge version_1 into main #2

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

View File

@@ -20,7 +20,7 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="smallMedium"
sizing="mediumLargeSizeMediumTitles"
background="fluid"
background="circleGradient"
cardStyle="gradient-bordered"
primaryButtonStyle="flat"
secondaryButtonStyle="layered"
@@ -46,7 +46,7 @@ export default function LandingPage() {
title="Websites That Move Your Business Forward"
description="Oasis designs beautiful, high-performing websites that convert visitors into customers. See our work and discover how thoughtful design drives real results."
tag="Web Design Agency"
background={{ variant: "fluid" }}
background={{ variant: "plain" }}
imageSrc="http://img.b2bpic.net/free-photo/neon-robot-vacuum-cleaner_23-2151349173.jpg"
imageAlt="Oasis web design showcase"
buttons={[
@@ -117,16 +117,16 @@ export default function LandingPage() {
tag="Process"
members={[
{
id: "1", name: "Strategy & Discovery", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=1", imageAlt: "professional business headshot portrait"
id: "1", name: "Strategy & Discovery", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg", imageAlt: "professional business headshot portrait"
},
{
id: "2", name: "Design & Prototyping", imageSrc: "http://img.b2bpic.net/free-photo/close-up-equity-analyst-working-proprietary-firm-reading-annual-company-reports-evaluate_482257-132953.jpg?_wi=1", imageAlt: "marketing director professional headshot"
id: "2", name: "Design & Prototyping", imageSrc: "http://img.b2bpic.net/free-photo/close-up-equity-analyst-working-proprietary-firm-reading-annual-company-reports-evaluate_482257-132953.jpg", imageAlt: "marketing director professional headshot"
},
{
id: "3", name: "Development & Testing", imageSrc: "http://img.b2bpic.net/free-photo/young-cheerful-man-classic-black-suit-white-shirt-with-wireless-earphones-happily-lookingin-camera-with-laptop-hands-while-spending-time-outdoor_574295-5776.jpg?_wi=1", imageAlt: "tech startup founder portrait"
id: "3", name: "Development & Testing", imageSrc: "http://img.b2bpic.net/free-photo/young-cheerful-man-classic-black-suit-white-shirt-with-wireless-earphones-happily-lookingin-camera-with-laptop-hands-while-spending-time-outdoor_574295-5776.jpg", imageAlt: "tech startup founder portrait"
},
{
id: "4", name: "Launch & Optimize", imageSrc: "http://img.b2bpic.net/free-photo/attractive-blond-business-woman-white-shirt-eyeglasses-crossed-arms-grey-background_613910-11786.jpg?_wi=1", imageAlt: "product manager professional headshot"
id: "4", name: "Launch & Optimize", imageSrc: "http://img.b2bpic.net/free-photo/attractive-blond-business-woman-white-shirt-eyeglasses-crossed-arms-grey-background_613910-11786.jpg", imageAlt: "product manager professional headshot"
}
]}
memberVariant="default"
@@ -143,19 +143,19 @@ export default function LandingPage() {
testimonials={[
{
id: "1", name: "Sarah Chen", role: "CEO", company: "Luxe Retail Co", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=2", imageAlt: "professional business headshot portrait"
imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg", imageAlt: "professional business headshot portrait"
},
{
id: "2", name: "Marcus Johnson", role: "Founder", company: "CloudSync Analytics", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/close-up-equity-analyst-working-proprietary-firm-reading-annual-company-reports-evaluate_482257-132953.jpg?_wi=2", imageAlt: "marketing director professional headshot"
imageSrc: "http://img.b2bpic.net/free-photo/close-up-equity-analyst-working-proprietary-firm-reading-annual-company-reports-evaluate_482257-132953.jpg", imageAlt: "marketing director professional headshot"
},
{
id: "3", name: "Emily Rodriguez", role: "Marketing Director", company: "GrowthStudio Agency", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/young-cheerful-man-classic-black-suit-white-shirt-with-wireless-earphones-happily-lookingin-camera-with-laptop-hands-while-spending-time-outdoor_574295-5776.jpg?_wi=2", imageAlt: "tech startup founder portrait"
imageSrc: "http://img.b2bpic.net/free-photo/young-cheerful-man-classic-black-suit-white-shirt-with-wireless-earphones-happily-lookingin-camera-with-laptop-hands-while-spending-time-outdoor_574295-5776.jpg", imageAlt: "tech startup founder portrait"
},
{
id: "4", name: "David Park", role: "Product Lead", company: "InnovateTech Ventures", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/attractive-blond-business-woman-white-shirt-eyeglasses-crossed-arms-grey-background_613910-11786.jpg?_wi=2", imageAlt: "product manager professional headshot"
imageSrc: "http://img.b2bpic.net/free-photo/attractive-blond-business-woman-white-shirt-eyeglasses-crossed-arms-grey-background_613910-11786.jpg", imageAlt: "product manager professional headshot"
}
]}
kpiItems={[

View File

@@ -1,51 +1,50 @@
"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;
width?: number | string;
height?: number | string;
fontSize?: number;
fontWeight?: number | string;
letterSpacing?: number;
dominantBaseline?: 'auto' | 'baseline' | 'before-edge' | 'text-before-edge' | 'middle' | 'central' | 'after-edge' | 'text-after-edge' | 'ideographic' | 'alphabetic' | 'hanging' | 'mathematical' | 'inherit';
}
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 = '',
width = '100%',
height = '100%',
fontSize = 24,
fontWeight = 700,
letterSpacing = 0,
dominantBaseline = 'middle',
}) => {
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 200 80"
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%"
textAnchor="middle"
dominantBaseline={dominantBaseline}
fontSize={fontSize}
fontWeight={fontWeight}
letterSpacing={letterSpacing}
className={textClassName}
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;