Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #4.
This commit is contained in:
2026-03-03 08:03:08 +00:00
3 changed files with 31 additions and 53 deletions

View File

@@ -1,22 +1,12 @@
import type { Metadata } from "next";
import { Nunito_Sans } from "next/font/google";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Poppins } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-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"],
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
@@ -43,9 +33,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${nunitoSans.variable} ${halant.variable} ${inter.variable} antialiased`}
>
<body className={`${poppins.variable} antialiased`}>
<Tag />
{children}

View File

@@ -1,13 +1,13 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import HeroSplit from '@/components/sections/hero/HeroSplit';
import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import FooterCard from '@/components/sections/footer/FooterCard';
import { Heart, Leaf, Flower, Gift, Home, Sparkles, MapPin, Phone } from 'lucide-react';
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
import HeroSplit from "@/components/sections/hero/HeroSplit";
import TestimonialAboutCard from "@/components/sections/about/TestimonialAboutCard";
import FeatureCardTwentyFive from "@/components/sections/feature/FeatureCardTwentyFive";
import ContactCenter from "@/components/sections/contact/ContactCenter";
import FooterCard from "@/components/sections/footer/FooterCard";
import { Heart, Leaf, Flower, Gift, Home, Sparkles, MapPin, Phone } from "lucide-react";
export default function LandingPage() {
return (
@@ -29,12 +29,10 @@ export default function LandingPage() {
navItems={[
{ name: "About", id: "about" },
{ name: "Products", id: "products" },
{ name: "Services", id: "services" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "contact" },
]}
button={{
text: "Call Now", href: "tel:087000-12721"
}}
text: "Call Now", href: "tel:087000-12721"}}
/>
</div>
@@ -51,7 +49,7 @@ export default function LandingPage() {
mediaAnimation="slide-up"
buttons={[
{ text: "Call Now", href: "tel:087000-12721" },
{ text: "Get Directions", href: "#contact" }
{ text: "Get Directions", href: "#contact" },
]}
buttonAnimation="slide-up"
/>
@@ -85,41 +83,35 @@ export default function LandingPage() {
title: "Flower Pots", description: "Stylish ceramic, plastic, and designer pots for your home & balcony.", icon: Flower,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/birds-nest-fern-plant-beige-pot_53876-142823.jpg?_wi=1", imageAlt: "Ceramic flower pots collection"
},
imageSrc: "http://img.b2bpic.net/free-photo/birds-nest-fern-plant-beige-pot_53876-142823.jpg?_wi=1", imageAlt: "Ceramic flower pots collection"},
{
imageSrc: "http://img.b2bpic.net/free-photo/modern-home-creative-interior-decoration-elements_628469-518.jpg?_wi=1", imageAlt: "Designer planters for indoor and outdoor"
}
]
imageSrc: "http://img.b2bpic.net/free-photo/modern-home-creative-interior-decoration-elements_628469-518.jpg?_wi=1", imageAlt: "Designer planters for indoor and outdoor"},
],
},
{
title: "Gift Items", description: "Perfect gifts for birthdays, anniversaries, festivals & special occasions.", icon: Gift,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/gifts-christmas-table_1098-22260.jpg", imageAlt: "Gift items and decorative pieces"
},
imageSrc: "http://img.b2bpic.net/free-photo/gifts-christmas-table_1098-22260.jpg", imageAlt: "Gift items and decorative pieces"},
{
imageSrc: "http://img.b2bpic.net/free-photo/modern-home-creative-interior-decoration-elements_628469-518.jpg?_wi=2", imageAlt: "Unique gift collections"
}
]
imageSrc: "http://img.b2bpic.net/free-photo/modern-home-creative-interior-decoration-elements_628469-518.jpg?_wi=2", imageAlt: "Unique gift collections"},
],
},
{
title: "Home Decor", description: "Unique decorative items to enhance your living and working spaces.", icon: Home,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/modern-home-creative-interior-decoration-elements_628469-518.jpg?_wi=3", imageAlt: "Home decoration items"
},
imageSrc: "http://img.b2bpic.net/free-photo/modern-home-creative-interior-decoration-elements_628469-518.jpg?_wi=3", imageAlt: "Home decoration items"},
{
imageSrc: "http://img.b2bpic.net/free-photo/birds-nest-fern-plant-beige-pot_53876-142823.jpg?_wi=2", imageAlt: "Decorative planters for spaces"
}
]
}
imageSrc: "http://img.b2bpic.net/free-photo/birds-nest-fern-plant-beige-pot_53876-142823.jpg?_wi=2", imageAlt: "Decorative planters for spaces"},
],
},
]}
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
buttons={[
{ text: "Browse All Products", href: "#products" }
{ text: "Browse All Products", href: "#products" },
]}
buttonAnimation="slide-up"
/>
@@ -147,12 +139,10 @@ export default function LandingPage() {
socialLinks={[
{
icon: Phone,
href: "tel:087000-12721", ariaLabel: "Call us"
},
href: "tel:087000-12721", ariaLabel: "Call us"},
{
icon: MapPin,
href: "#contact", ariaLabel: "Visit our store"
}
href: "#contact", ariaLabel: "Visit our store"},
]}
/>
</div>

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-nunito-sans), sans-serif;
font-family: var(--font-poppins), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-nunito-sans), sans-serif;
font-family: var(--font-poppins), sans-serif;
}