Merge version_2 into main #4

Merged
bender merged 3 commits from version_2 into main 2026-03-03 20:10:23 +00:00
3 changed files with 16 additions and 21 deletions

View File

@@ -1,27 +1,22 @@
import type { Metadata } from "next";
import { Source_Sans_3 } from "next/font/google";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Poppins } from "next/font/google";
import { Playfair_Display } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3", subsets: ["latin"],
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const playfairDisplay = Playfair_Display({
variable: "--font-playfair-display", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Premium Hijabs | Elegant, Comfortable & Affordable", description: "Discover our curated collection of premium hijabs in various styles and fabrics. Quality, comfort, and elegance for the modern woman.", keywords: "hijab, modest fashion, premium hijabs, comfortable wraps, elegant styles", openGraph: {
title: "Premium Hijabs | Elegant, Comfortable & Affordable", description: "Discover our curated collection of premium hijabs in various styles and fabrics. Quality, comfort, and elegance for the modern woman.", siteName: "Hijab Store", type: "website", images: [
title: "Premium Hijabs | Elegant, Comfortable & Affordable", description: "Discover our curated collection of premium hijabs in various styles and fabrics. Quality, comfort, and elegance for the modern woman.", siteName: "Vanessa Hijab Store", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/close-up-hands-holding-plants_23-2149226602.jpg", alt: "hijab collection fashion elegant"
}
@@ -41,7 +36,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${sourceSans3.variable} ${halant.variable} ${inter.variable} antialiased`}
className={`${poppins.variable} ${playfairDisplay.variable} antialiased`}
>
<Tag />
{children}

View File

@@ -27,13 +27,13 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Hijab Store"
brandName="Vanessa Hijab Store"
navItems={[
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "footer" }
{ name: "Contact", id: "contact" }
]}
/>
</div>
@@ -202,8 +202,8 @@ export default function LandingPage() {
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/modern-muslim-woman-hijab-office-room_285396-10889.jpg"
imageAlt="Hijab lifestyle image"
logoText="Hijab Store"
copyrightText="© 2025 Hijab Store. All rights reserved."
logoText="Vanessa Hijab Store"
copyrightText="© 2025 Vanessa Hijab Store. All rights reserved."
columns={[
{
title: "Shop", items: [
@@ -215,7 +215,7 @@ export default function LandingPage() {
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#footer" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#faq" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" }

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-source-sans-3), 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-source-sans-3), sans-serif;
font-family: var(--font-poppins), sans-serif;
}