bender/c9610781-8598-4902-93a3-edf5e14bd17b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
bender
2026-02-20 12:49:51 +00:00
parent 5ef7657dda d3907e9fb1
commit b4ff0c8aeb
4 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/app/blog/page.tsx
View File

@@ -30,62 +30,65 @@ export default function BlogPage() {
headingFontWeight="bold"
>
<ReactLenis root>
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Characters", id: "characters" },
{ name: "Lore", id: "lore" },
{ name: "News", id: "news" },
]}
button={{ text: "Join Now", href: "contact" }}
brandName="Star Wars Hub"
className="bg-background/80 backdrop-blur-sm"
/>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
]}
button={{ text: "Join Now", href: "/#contact" }}
brandName="Star Wars Hub"
className="bg-background/80 backdrop-blur-sm"
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardTwo
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
<div id="blog" data-section="blog">
<BlogCardTwo
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
</div>
)}
<FooterSimple
columns={[
{
title: "Universe", items: [
{ label: "Characters", href: "#characters" },
{ label: "Lore", href: "#lore" },
{ label: "Timeline", href: "#" },
],
},
{
title: "Community", items: [
{ label: "News", href: "#news" },
{ label: "Forum", href: "#" },
{ label: "Fan Art", href: "#" },
],
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms of Use", href: "#" },
],
},
]}
bottomLeftText="© 2024 Star Wars Fan Hub. All rights reserved."
bottomRightText="A fan-made tribute to the galaxy far, far away."
className="py-12 bg-card text-foreground"
/>
<div id="footer" data-section="footer">
<FooterSimple
columns={[
{
title: "Universe", items: [
{ label: "Characters", href: "/#characters" },
{ label: "Lore", href: "/#lore" },
{ label: "Timeline", href: "#" },
],
},
{
title: "Community", items: [
{ label: "News", href: "/#news" },
{ label: "Forum", href: "#" },
{ label: "Fan Art", href: "#" },
],
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms of Use", href: "#" },
],
},
]}
bottomLeftText="© 2024 Star Wars Fan Hub. All rights reserved."
bottomRightText="A fan-made tribute to the galaxy far, far away."
className="py-12 bg-card text-foreground"
/>
</div>
</ReactLenis>
</ThemeProvider>
);

24
src/app/page.tsx
View File

@@ -29,8 +29,8 @@ export default function LandingPage() {
<main>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{name:"Home",id:"home"},{name:"About",id:"about"},{name:"Characters",id:"characters"},{name:"Lore",id:"lore"},{name:"News",id:"news"}]}
button={{text:"Join Now",href:"contact"}}
navItems={[{name:"Home",id:"hero"},{name:"About",id:"about"},{name:"Characters",id:"characters"},{name:"Lore",id:"lore"},{name:"News",id:"news"}]}
button={{text:"Join Now",href:"#contact"}}
brandName="Star Wars Hub"
className="bg-background/80 backdrop-blur-sm"
/>
@@ -60,7 +60,7 @@ export default function LandingPage() {
title="A Long Time Ago, In a Galaxy Far, Far Away..."
buttons={[{text:"Read the Saga",href:"#news"},{text:"Meet the Heroes",href:"#characters"}]}
useInvertedBackground={false}
tagAnimation="reveal-blur"
tagAnimation="blur-reveal"
titleClassName="text-5xl md:text-7xl lg:text-8xl font-bold max-w-5xl mx-auto"
className="py-20 md:py-32 lg:py-48"
/>
@@ -70,8 +70,8 @@ export default function LandingPage() {
<FeatureCardThree
features={[
{id:"01",title:"Luke Skywalker",description:"The farm boy from Tatooine who became a Jedi Master and a symbol of hope for the Rebel Alliance.",imageSrc:"https://img.b2bpic.net/free-photo/portrait-attractive-curly-man-with-guitar-dark-photo-studio_613910-14460.jpg",imageAlt:"Luke Skywalker"},
{id:"02",title:"Darth Vader",description:"Once the heroic Jedi Knight Anakin Skywalker, seduced by the dark side of the Force to become the Emperor's most feared enforcer.",imageSrc:"https://img.b2bpic.net/free-photo/three-men-wolf-masks-dance-with-light-bulbs-club_140725-8856.jpg?_wi=1",imageAlt:"Darth Vader"},
{id:"03",title:"Ahsoka Tano",description:"A Togruta Padawan trained by Anakin Skywalker, who forged her own path outside the Jedi Order.",imageSrc:"https://img.b2bpic.net/free-photo/three-men-wolf-masks-dance-with-light-bulbs-club_140725-8856.jpg?_wi=2",imageAlt:"Ahsoka Tano"},
{id:"02",title:"Darth Vader",description:"Once the heroic Jedi Knight Anakin Skywalker, seduced by the dark side of the Force to become the Emperor's most feared enforcer.",imageSrc:"https://img.b2bpic.net/free-photo/three-men-wolf-masks-dance-with-light-bulbs-club_140725-8856.jpg",imageAlt:"Darth Vader"},
{id:"03",title:"Ahsoka Tano",description:"A Togruta Padawan trained by Anakin Skywalker, who forged her own path outside the Jedi Order.",imageSrc:"https://img.b2bpic.net/free-photo/three-men-wolf-masks-dance-with-light-bulbs-club_140725-8856.jpg",imageAlt:"Ahsoka Tano"},
{id:"04",title:"The Mandalorian",description:"Din Djarin, a solitary bounty hunter who travels the outer reaches of the galaxy, protecting Grogu.",imageSrc:"https://img.b2bpic.net/free-photo/view-half-rhino-with-futuristic-robotic-parts_23-2151742005.jpg",imageAlt:"The Mandalorian"}
]}
gridVariant="four-items-2x2-equal-grid"
@@ -106,10 +106,10 @@ export default function LandingPage() {
<div id="testimonials" data-section="testimonials">
<TestimonialCardThirteen
testimonials={[
{id:"1",name:"Rey Skywalker",handle:"@ScavengerRey",testimonial:"This site truly captures the spirit of the Force. I feel more connected to the galaxy than ever before!",rating:5,imageSrc:"/placeholders/placeholder1.webp?_wi=1"},
{id:"2",name:"Finn",handle:"@FN2187",testimonial:"Finally, a place where I can dive deep into the Resistance history. Solid content!",rating:5,imageSrc:"/placeholders/placeholder1.webp?_wi=2"},
{id:"3",name:"Poe Dameron",handle:"@BlackLeader",testimonial:"As a pilot, I appreciate the detailed ship analyses. Keep up the great work!",rating:5,imageSrc:"/placeholders/placeholder1.webp?_wi=3"},
{id:"4",name:"Cassian Andor",handle:"@RebelIntel",testimonial:"Essential reading for any intelligence officer. The insights here are unparalleled.",rating:5,imageSrc:"/placeholders/placeholder1.webp?_wi=4"}
{id:"1",name:"Rey Skywalker",handle:"@ScavengerRey",testimonial:"This site truly captures the spirit of the Force. I feel more connected to the galaxy than ever before!",rating:5,imageSrc:"/placeholders/placeholder1.webp"},
{id:"2",name:"Finn",handle:"@FN2187",testimonial:"Finally, a place where I can dive deep into the Resistance history. Solid content!",rating:5,imageSrc:"/placeholders/placeholder1.webp"},
{id:"3",name:"Poe Dameron",handle:"@BlackLeader",testimonial:"As a pilot, I appreciate the detailed ship analyses. Keep up the great work!",rating:5,imageSrc:"/placeholders/placeholder1.webp"},
{id:"4",name:"Cassian Andor",handle:"@RebelIntel",testimonial:"Essential reading for any intelligence officer. The insights here are unparalleled.",rating:5,imageSrc:"/placeholders/placeholder1.webp"}
]}
showRating={true}
carouselMode="buttons"
@@ -140,9 +140,9 @@ export default function LandingPage() {
<div id="news" data-section="news">
<BlogCardOne
blogs={[
{id:"1",category:"Canon",title:"The Rise of the First Order: A Deep Dive",excerpt:"Explore the origins and devastating impact of the First Order on the galaxy.",imageSrc:"/placeholders/placeholder1.webp?_wi=5",imageAlt:"First Order fleet",authorName:"Galactic Historian",authorAvatar:"/placeholders/placeholder1.webp",date:"October 26, 2023"},
{id:"2",category:"Legends",title:"Unveiling the Secrets of the Old Republic",excerpt:"Journey back thousands of years to the era of the Old Republic and its epic conflicts.",imageSrc:"/placeholders/placeholder1.webp?_wi=6",imageAlt:"Old Republic temple",authorName:"Jedi Loremaster",authorAvatar:"/placeholders/placeholder1.webp",date:"September 12, 2023"},
{id:"3",category:"Fandom",title:"Top 10 Fan Theories About The Acolyte",excerpt:"Dive into the most compelling and wildest fan theories surrounding the upcoming series.",imageSrc:"/placeholders/placeholder1.webp?_wi=7",imageAlt:"The Acolyte fan theory",authorName:"Holonet Reporter",authorAvatar:"/placeholders/placeholder1.webp",date:"August 5, 2023"}
{id:"1",category:"Canon",title:"The Rise of the First Order: A Deep Dive",excerpt:"Explore the origins and devastating impact of the First Order on the galaxy.",imageSrc:"/placeholders/placeholder1.webp",imageAlt:"First Order fleet",authorName:"Galactic Historian",authorAvatar:"/placeholders/placeholder1.webp",date:"October 26, 2023"},
{id:"2",category:"Legends",title:"Unveiling the Secrets of the Old Republic",excerpt:"Journey back thousands of years to the era of the Old Republic and its epic conflicts.",imageSrc:"/placeholders/placeholder1.webp",imageAlt:"Old Republic temple",authorName:"Jedi Loremaster",authorAvatar:"/placeholders/placeholder1.webp",date:"September 12, 2023"},
{id:"3",category:"Fandom",title:"Top 10 Fan Theories About The Acolyte",excerpt:"Dive into the most compelling and wildest fan theories surrounding the upcoming series.",imageSrc:"/placeholders/placeholder1.webp",imageAlt:"The Acolyte fan theory",authorName:"Holonet Reporter",authorAvatar:"/placeholders/placeholder1.webp",date:"August 5, 2023"}
]}
carouselMode="buttons"
animationType="slide-up"

10
src/app/shop/[id]/page.tsx
View File

@@ -86,7 +86,7 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={navItems}
brandName="Star Wars Hub"
@@ -117,7 +117,7 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={navItems}
brandName="Star Wars Hub"
@@ -155,7 +155,7 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={navItems}
brandName="Star Wars Hub"
@@ -202,8 +202,8 @@ export default function ProductPage({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterSimple
columns={[
{ title: "Universe", items: [{ label: "Characters", href: "#characters" }, { label: "Lore", href: "#lore" }, { label: "Timeline", href: "#" }] },
{ title: "Community", items: [{ label: "News", href: "#news" }, { label: "Forum", href: "#" }, { label: "Fan Art", href: "#" }] },
{ title: "Universe", items: [{ label: "Characters", href: "/#characters" }, { label: "Lore", href: "/#lore" }, { label: "Timeline", href: "#" }] },
{ title: "Community", items: [{ label: "News", href: "/#news" }, { label: "Forum", href: "#" }, { label: "Fan Art", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Use", href: "#" }] }
]}
bottomLeftText="© 2024 Star Wars Fan Hub. All rights reserved."

8
src/app/shop/page.tsx
View File

@@ -36,7 +36,7 @@ export default function ShopPage() {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={navItems}
brandName="Star Wars Hub"
@@ -66,7 +66,7 @@ export default function ShopPage() {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={navItems}
brandName="Star Wars Hub"
@@ -88,8 +88,8 @@ export default function ShopPage() {
<div id="footer" data-section="footer">
<FooterSimple
columns={[
{ title: "Universe", items: [{ label: "Characters", href: "#characters" }, { label: "Lore", href: "#lore" }, { label: "Timeline", href: "#" }] },
{ title: "Community", items: [{ label: "News", href: "#news" }, { label: "Forum", href: "#" }, { label: "Fan Art", href: "#" }] },
{ title: "Universe", items: [{ label: "Characters", href: "/#characters" }, { label: "Lore", href: "/#lore" }, { label: "Timeline", href: "#" }] },
{ title: "Community", items: [{ label: "News", href: "/#news" }, { label: "Forum", href: "#" }, { label: "Fan Art", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Use", href: "#" }] }
]}
bottomLeftText="© 2024 Star Wars Fan Hub. All rights reserved."