bender/fa0028c5-573c-475e-8506-84bbbaa9d9d6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #7

Merged
bender merged 3 commits from version_4 into main 2026-03-04 01:55:23 +00:00
Conversation 0 Commits 3 Files Changed 3 +45 -52
3 changed files with 45 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/layout.tsx
View File

@@ -1,31 +1,23 @@
import type { Metadata } from "next";
import { Poppins } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Velora Living - Premium Furniture & Home Décor", description: "Discover thoughtfully designed furniture and home décor that transforms everyday spaces. Shop our curated collection of modern, minimalist pieces.", keywords: "furniture, home décor, modern furniture, interior design, contemporary seating, dining furniture", metadataBase: new URL("https://veloraliving.com"),
alternates: {
canonical: "https://veloraliving.com"
},
openGraph: {
title: "Velora Living - Premium Furniture & Home Décor", description: "Transform your space with our curated collection of premium furniture and home décor.", type: "website", siteName: "Velora Living", url: "https://veloraliving.com"
title: "Velora Living - Premium Furniture & Home Décor", description: "Transform your space with our curated collection of premium furniture and home décor.", type: "website", siteName: "Velora Living"
},
twitter: {
card: "summary_large_image", title: "Velora Living - Premium Furniture", description: "Discover thoughtfully designed furniture that transforms your living space."
@@ -45,7 +37,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${dmSans.variable} ${halant.variable} ${inter.variable} antialiased`}
className={`${poppins.variable} ${dmSans.variable} antialiased`}
>
<Tag />
{children}

45
src/app/page.tsx
View File

@@ -1,28 +1,29 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
import HeroLogoBillboard from "@/components/sections/hero/HeroLogoBillboard";
import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSplitTextAbout";
import ProductCardFour from "@/components/sections/product/ProductCardFour";
import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
import TestimonialCardThirteen from "@/components/sections/testimonial/TestimonialCardThirteen";
import ContactText from "@/components/sections/contact/ContactText";
import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
import ProductCardFour from '@/components/sections/product/ProductCardFour';
import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
import TestimonialCardThirteen from '@/components/sections/testimonial/TestimonialCardThirteen';
import ContactText from '@/components/sections/contact/ContactText';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { Award, CheckCircle, Heart } from 'lucide-react';
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="reveal-blur"
borderRadius="pill"
contentWidth="compact"
sizing="largeSizeMediumTitles"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="radial-glow"
headingFontWeight="light"
borderRadius="rounded"
contentWidth="medium"
sizing="mediumLargeSizeMediumTitles"
background="none"
cardStyle="soft-shadow"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="semibold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
@@ -46,7 +47,7 @@ export default function LandingPage() {
{ text: "Explore Collection", href: "#products" },
{ text: "Learn More", href: "#about" }
]}
background={{ variant: "sparkles-gradient" }}
background={{ variant: "plain" }}
imageSrc="http://img.b2bpic.net/free-photo/couch-with-cushions-glass-table_1203-764.jpg"
imageAlt="Modern living room with contemporary furniture"
frameStyle="card"
@@ -98,8 +99,8 @@ export default function LandingPage() {
<div id="social-proof" data-section="social-proof">
<SocialProofOne
title="Featured In"
description="Trusted by leading design publications and interior enthusiasts worldwide"
title="Trusted by Design Enthusiasts Worldwide"
description="Featured in leading design publications and loved by thousands of homeowners"
names={[
"Design Magazine", "Home Weekly", "Living Today", "Modern Living", "Interiors Hub", "Style Collective", "Design Co.", "Home Studio"
]}
@@ -152,9 +153,9 @@ export default function LandingPage() {
animationType="reveal-blur"
buttons={[
{ text: "Get in Touch", href: "#" },
{ text: "Visit Us", href: "#" }
{ text: "Schedule Showroom Visit", href: "#" }
]}
background={{ variant: "sparkles-gradient" }}
background={{ variant: "plain" }}
useInvertedBackground={false}
/>
</div>

28
src/app/styles/variables.css
View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #341f51;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
/* --background: #ffffff;;
--card: #f9f9f9;;
--foreground: #2b2b2b;;
--primary-cta: #1a1a1a;;
--secondary-cta: #d4af37;;
--accent: #4a4a4a;;
--background-accent: #e8e8e8;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #341f51;;
--background: #ffffff;;
--card: #f9f9f9;;
--foreground: #2b2b2b;;
--primary-cta: #1a1a1a;;
--primary-cta-text: #f5f5f5;;
--secondary-cta: #ffffff;;
--secondary-cta: #d4af37;;
--secondary-cta-text: #1c1c1c;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--accent: #4a4a4a;;
--background-accent: #e8e8e8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);