Merge version_16 into main #24

Merged
mulika-local merged 2 commits from version_16 into main 2025-12-25 11:04:36 +00:00
2 changed files with 25 additions and 50 deletions

View File

@@ -1,59 +1,35 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Inter } from "next/font/google"; import localFont from "next/font/local";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const inter = Inter({ const geistSans = localFont({
variable: "--font-inter", src: "./fonts/GeistVF.woff2",
subsets: ["latin"], variable: "--font-geist-sans",
weight: "100 900",
});
const geistMono = localFont({
src: "./fonts/GeistMonoVF.woff2",
variable: "--font-geist-mono",
weight: "100 900",
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
title: "Star Wars Fans Community - Explore the Galaxy", title: "Star Wars - Join the Galactic Saga",
description: "Join millions of Star Wars fans worldwide. Discover exclusive content, connect with the community, and celebrate the epic saga.", description: "Explore the galaxy far, far away with millions of fans. Discover movies, characters, collectibles and more from the Star Wars universe.",
keywords: "Star Wars, fans, community, movies, series, Jedi, galaxy", keywords: ["star wars", "movies", "collectibles", "lightsaber", "millennium falcon", "yoda", "force"]
metadataBase: new URL("https://starwarsfans.com"),
alternates: {
canonical: "https://starwarsfans.com"
},
openGraph: {
title: "Star Wars Fans Community",
description: "Join the Force. Connect with Star Wars fans, explore content, and celebrate the greatest saga.",
siteName: "STAR WARS",
type: "website",
images: [
{
url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg",
alt: "Star Wars galaxy"
}
]
},
twitter: {
card: "summary_large_image",
title: "Star Wars Fans Community",
description: "Join millions of fans exploring the galaxy's greatest saga",
images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg"]
},
robots: {
index: true,
follow: true
}
}; };
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: {
children: React.ReactNode; children: React.ReactNode;
}>) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en">
<ServiceWrapper> <body
<body className={`${geistSans.variable} ${geistMono.variable} antialiased`}
className={inter.variable} >
> {children}
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
@@ -1273,7 +1249,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

View File

@@ -7,7 +7,7 @@ import ParallaxAbout from "@/components/sections/about/ParallaxAbout";
import ContactSplitForm from "@/components/sections/contact/ContactSplitForm"; import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
import ProductCardTwo from "@/components/sections/product/ProductCardTwo"; import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
import FooterSocial from "@/components/sections/footer/FooterSocial"; import FooterSocial from "@/components/sections/footer/FooterSocial";
import { Youtube, Twitter, Linkedin } from "lucide-react"; import { Youtube, Twitter, Linkedin, Film, Users, Calendar } from "lucide-react";
export default function StarWarsPage() { export default function StarWarsPage() {
return ( return (
@@ -43,9 +43,9 @@ export default function StarWarsPage() {
title="Our Galactic Impact" title="Our Galactic Impact"
description="Experience the epic saga spanning decades of storytelling" description="Experience the epic saga spanning decades of storytelling"
metrics={[ metrics={[
{ id: "1", icon: Youtube, title: "Years", value: "40+" }, { id: "1", icon: Calendar, title: "Years", value: "40+" },
{ id: "2", icon: Twitter, title: "Films", value: "11" }, { id: "2", icon: Film, title: "Films", value: "11" },
{ id: "3", icon: Linkedin, title: "Fans", value: "100M+" } { id: "3", icon: Users, title: "Fans", value: "100M+" }
]} ]}
gridVariant="uniform-all-items-equal" gridVariant="uniform-all-items-equal"
textboxLayout="default" textboxLayout="default"