bender/1672736b-8f51-414f-8606-b882d9127a6f
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 #1.
This commit is contained in:
bender
2026-02-20 12:59:02 +00:00
parent 1ef7b0b851 623b66ff72
commit c0d2ebfe4e
4 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import BlogCardOne from '@/components/sections/blog/BlogCardOne';
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function BlogPage() {
@@ -24,25 +24,21 @@ export default function BlogPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<NavbarStyleApple
brandName="Star Wars Fan Club"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Showcase", id: "showcase" },
{ name: "News", id: "news" },
{ name: "Team", id: "team" },
{ name: "Contact", id: "contact" },
]}
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Star Wars Fan Club"
navItems={[
{ name: "Home", id: "/" }
]}
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardOne
<BlogCardThree
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
@@ -52,16 +48,16 @@ export default function BlogPage() {
carouselMode="buttons"
/>
)}
<FooterLogoEmphasis
columns={[
{ items: [{ label: "About Us", href: "#about" }, { label: "Features", href: "#features" }, { label: "News", href: "#blog" }] },
{ items: [{ label: "Community", href: "#product" }, { label: "Team", href: "#team" }, { label: "FAQ", href: "#faq" }] },
{ items: [{ label: "Contact", href: "#contact" }, { label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Star Wars Fan Club"
containerClassName="bg-background-accent text-foreground"
/>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Shop", href: "/shop" }, { label: "Blog", href: "/blog" }] },
{ items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Star Wars Fan Club"
containerClassName="bg-background-accent text-foreground"
/>
</div>
</ReactLenis>
</ThemeProvider>
);

20
src/app/page.tsx
View File

@@ -30,12 +30,12 @@ export default function LandingPage() {
<NavbarStyleApple
brandName="Star Wars Fan Club"
navItems={[
{ name: 'About', id: 'about' },
{ name: 'Features', id: 'features' },
{ name: 'Showcase', id: 'product' },
{ name: 'News', id: 'blog' },
{ name: 'Team', id: 'team' },
{ name: 'Contact', id: 'contact' }
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Showcase', id: '#product' },
{ name: 'News', id: '#blog' },
{ name: 'Team', id: '#team' },
{ name: 'Contact', id: '#contact' }
]}
/>
</div>
@@ -117,9 +117,9 @@ export default function LandingPage() {
<div id="blog" data-section="blog">
<BlogCardThree
blogs={[
{ id: '1', category: 'Lore & Analysis', title: 'The Unseen Depths of the Dark Side', excerpt: 'A philosophical dive into the origins and temptations of the Sith.', imageSrc: 'https://img.b2bpic.net/free-vector/futuristic-infographics-concept_23-2148444702.jpg', imageAlt: 'Lightsaber schematic hologram', authorName: 'Kylo Ren', date: 'DEC 17, 2023' },
{ id: '2', category: 'Fandom News', title: 'Upcoming Star Wars Games and Series Revealed!', excerpt: 'Get the latest updates on what\'s coming to the galaxy.', imageSrc: 'https://img.b2bpic.net/free-photo/technological-exploration-settlement_23-2151768616.jpg', imageAlt: 'Star Wars planets collage', authorName: 'Ahsoka Tano', date: 'MAY 4, 2024' },
{ id: '3', category: 'Technology & Sci-Fi', title: 'The Droids You\'re Looking For: A Deep Dive', excerpt: 'Exploring the history and evolution of droids in Star Wars.', imageSrc: 'https://img.b2bpic.net/free-photo/futuristic-christmas-celebration-concept_23-2150979882.jpg', imageAlt: 'Droid interacting with human hand', authorName: 'C-3PO', date: 'NOV 22, 2023' }
{ id: '1', category: 'Lore & Analysis', title: 'The Unseen Depths of the Dark Side', excerpt: 'A philosophical dive into the origins and temptations of the Sith.', imageSrc: 'https://img.b2bpic.net/free-vector/futuristic-infographics-concept_23-2148444702.jpg', imageAlt: 'Lightsaber schematic hologram', authorName: 'Kylo Ren', date: 'DEC 17, 2023', authorAvatar: '/placeholders/avatar.png' },
{ id: '2', category: 'Fandom News', title: 'Upcoming Star Wars Games and Series Revealed!', excerpt: "Get the latest updates on what's coming to the galaxy.", imageSrc: 'https://img.b2bpic.net/free-photo/technological-exploration-settlement_23-2151768616.jpg', imageAlt: 'Star Wars planets collage', authorName: 'Ahsoka Tano', date: 'MAY 4, 2024', authorAvatar: '/placeholders/avatar.png' },
{ id: '3', category: 'Technology & Sci-Fi', title: "The Droids You're Looking For: A Deep Dive", excerpt: 'Exploring the history and evolution of droids in Star Wars.', imageSrc: 'https://img.b2bpic.net/free-photo/futuristic-christmas-celebration-concept_23-2150979882.jpg', imageAlt: 'Droid interacting with human hand', authorName: 'C-3PO', date: 'NOV 22, 2023', authorAvatar: '/placeholders/avatar.png' }
]}
carouselMode="auto"
animationType="slide-up"
@@ -151,7 +151,7 @@ export default function LandingPage() {
<div id="faq" data-section="faq">
<FaqSplitText
faqs={[
{ id: '1', title: 'How do I join the Star Wars Fan Club?', content: 'You can join by clicking the \'Join the Club\' button in the hero section or navigating to our contact section.' },
{ id: '1', title: 'How do I join the Star Wars Fan Club?', content: "You can join by clicking the 'Join the Club' button in the hero section or navigating to our contact section." },
{ id: '2', title: 'Is there a membership fee?', content: 'Membership is free! We believe the Force should be accessible to all. Premium features or merchandise may have associated costs.' },
{ id: '3', title: 'How can I contribute to the community?', content: 'Members can submit fan art, theories, and articles. Participate in forums and events to share your passion.' },
{ id: '4', title: 'What kind of events does the club host?', content: 'We host virtual meetups, watch parties, cosplay contests, and discussions about new Star Wars content.' }

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

@@ -81,12 +81,11 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Star Wars Fan Club"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
{ name: "Home", id: "/" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -114,12 +113,11 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Star Wars Fan Club"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
{ name: "Home", id: "/" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -154,12 +152,11 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Star Wars Fan Club"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
{ name: "Home", id: "/" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -203,12 +200,10 @@ export default function ProductPage({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{ items: [{ label: "About Us", href: "#about" }, { label: "Features", href: "#features" }, { label: "News", href: "#blog" }] },
{ items: [{ label: "Community", href: "#product" }, { label: "Team", href: "#team" }, { label: "FAQ", href: "#faq" }] },
{ items: [{ label: "Contact", href: "#contact" }, { label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
{ items: [{ label: "Home", href: "/" }, { label: "Shop", href: "/shop" }, { label: "Blog", href: "/blog" }] },
{ items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Star Wars Fan Club"
useInvertedBackground={false}
containerClassName="bg-background-accent text-foreground"
/>
</div>

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

@@ -56,12 +56,11 @@ export default function ShopPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Star Wars Fan Club"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
{ name: "Home", id: "/" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -88,12 +87,11 @@ export default function ShopPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Star Wars Fan Club"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
{ name: "Home", id: "/" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -127,12 +125,10 @@ export default function ShopPage() {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{ items: [{ label: "About Us", href: "#about" }, { label: "Features", href: "#features" }, { label: "News", href: "#blog" }] },
{ items: [{ label: "Community", href: "#product" }, { label: "Team", href: "#team" }, { label: "FAQ", href: "#faq" }] },
{ items: [{ label: "Contact", href: "#contact" }, { label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
{ items: [{ label: "Home", href: "/" }, { label: "Shop", href: "/shop" }, { label: "Blog", href: "/blog" }] },
{ items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Star Wars Fan Club"
useInvertedBackground={false}
containerClassName="bg-background-accent text-foreground"
/>
</div>