bender/1672736b-8f51-414f-8606-b882d9127a6f
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #3.
This commit is contained in:
bender
2026-02-20 13:12:19 +00:00
parent f1c7620e31 154ae114ca
commit bd1d195b16
4 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import BlogCardThree from "@/components/sections/blog/BlogCardThree";
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -28,13 +29,13 @@ export default function BlogPage() {
brandName="Star Wars Fan Club"
navItems={[
{ name: 'Home', id: '/' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Showcase', id: '#product' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Showcase', id: '/#product' },
{ name: 'News', id: '/blog' },
{ name: 'Shop', id: '/shop' },
{ name: 'Team', id: '#team' },
{ name: 'Contact', id: '#contact' }
{ name: 'Team', id: '/#team' },
{ name: 'Contact', id: '/#contact' }
]}
/>
</div>

10
src/app/page.tsx
View File

@@ -31,13 +31,13 @@ export default function LandingPage() {
brandName="Star Wars Fan Club"
navItems={[
{ name: 'Home', id: '/' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Showcase', id: '#product' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Showcase', id: '/#product' },
{ name: 'News', id: '/blog' },
{ name: 'Shop', id: '/shop' },
{ name: 'Team', id: '#team' },
{ name: 'Contact', id: '#contact' }
{ name: 'Team', id: '/#team' },
{ name: 'Contact', id: '/#contact' }
]}
/>
</div>

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

@@ -86,13 +86,13 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Star Wars Fan Club"
navItems={[
{ name: 'Home', id: '/' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Showcase', id: '#product' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Showcase', id: '/#product' },
{ name: 'News', id: '/blog' },
{ name: 'Shop', id: '/shop' },
{ name: 'Team', id: '#team' },
{ name: 'Contact', id: '#contact' }
{ name: 'Team', id: '/#team' },
{ name: 'Contact', id: '/#contact' }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -125,13 +125,13 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Star Wars Fan Club"
navItems={[
{ name: 'Home', id: '/' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Showcase', id: '#product' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Showcase', id: '/#product' },
{ name: 'News', id: '/blog' },
{ name: 'Shop', id: '/shop' },
{ name: 'Team', id: '#team' },
{ name: 'Contact', id: '#contact' }
{ name: 'Team', id: '/#team' },
{ name: 'Contact', id: '/#contact' }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -171,13 +171,13 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Star Wars Fan Club"
navItems={[
{ name: 'Home', id: '/' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Showcase', id: '#product' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Showcase', id: '/#product' },
{ name: 'News', id: '/blog' },
{ name: 'Shop', id: '/shop' },
{ name: 'Team', id: '#team' },
{ name: 'Contact', id: '#contact' }
{ name: 'Team', id: '/#team' },
{ name: 'Contact', id: '/#contact' }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

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

@@ -61,13 +61,13 @@ export default function ShopPage() {
brandName="Star Wars Fan Club"
navItems={[
{ name: 'Home', id: '/' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Showcase', id: '#product' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Showcase', id: '/#product' },
{ name: 'News', id: '/blog' },
{ name: 'Shop', id: '/shop' },
{ name: 'Team', id: '#team' },
{ name: 'Contact', id: '#contact' }
{ name: 'Team', id: '/#team' },
{ name: 'Contact', id: '/#contact' }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -99,13 +99,13 @@ export default function ShopPage() {
brandName="Star Wars Fan Club"
navItems={[
{ name: 'Home', id: '/' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Showcase', id: '#product' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Showcase', id: '/#product' },
{ name: 'News', id: '/blog' },
{ name: 'Shop', id: '/shop' },
{ name: 'Team', id: '#team' },
{ name: 'Contact', id: '#contact' }
{ name: 'Team', id: '/#team' },
{ name: 'Contact', id: '/#contact' }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>