bender/e1be0852-5b06-401b-a3b9-f78822db4053
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main

Browse Source 
Merge version_4 into main
This commit was merged in pull request #5.
This commit is contained in:
bender
2026-02-22 12:23:11 +00:00
parent a90397c965 7b7a769bd6
commit 95e5e73666
4 changed files with 59 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import { useBlogPosts } from "@/hooks/useBlogPosts";
// New imports based on requirements
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -30,15 +30,13 @@ export default function BlogPage() {
<NavbarStyleApple
brandName="MyCo"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Products", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
{name: "Home", id: "/"},
{name: "About", id: "/#about"},
{name: "Features", id: "/#features"},
{name: "Products", id: "/#products"},
{name: "Testimonials", id: "/#testimonials"},
{name: "FAQ", id: "/#faq"},
{name: "Contact", id: "/#contact"}
]}
/>
</div>
@@ -49,7 +47,7 @@ export default function BlogPage() {
</div>
) : (
<div id="blog" data-section="blog">
<BlogCardTwo
<BlogCardThree
blogs={posts}
title="Latest Insights & Updates"
description="Stay informed with our articles and news."

31
src/app/page.tsx
View File

@@ -32,14 +32,12 @@ export default function LandingPage() {
brandName="MyCo"
navItems={[
{name: "Home", id: "/"},
{name: "About", id: "#about"},
{name: "Features", id: "#features"},
{name: "Products", id: "#products"},
{name: "Testimonials", id: "#testimonials"},
{name: "FAQ", id: "#faq"},
{name: "Contact", id: "#contact"},
{name: "Blog", id: "/blog"},
{name: "Shop", id: "/shop"}
{name: "About", id: "about"},
{name: "Features", id: "features"},
{name: "Products", id: "products"},
{name: "Testimonials", id: "testimonials"},
{name: "FAQ", id: "faq"},
{name: "Contact", id: "contact"}
]}
/>
</div>
@@ -49,8 +47,8 @@ export default function LandingPage() {
logoText="MyCo"
description="Innovative solutions for a brighter future."
buttons={[
{ text: "Get Started", href: "/#contact" },
{ text: "Learn More", href: "/#about" }
{ text: "Get Started", href: "#contact" },
{ text: "Learn More", href: "#about" }
]}
imageSrc="https://via.placeholder.com/1920x1080.png?text=Modern+Business"
imageAlt="Modern business cityscape"
@@ -141,6 +139,7 @@ export default function LandingPage() {
faqsAnimation="slide-up"
useInvertedBackground={false}
animationType="smooth"
textboxLayout="default"
/>
</div>
@@ -148,7 +147,7 @@ export default function LandingPage() {
<ContactFaq
ctaTitle="Ready to Start?"
ctaDescription="Get in touch with our team today to discuss your project and discover how we can help."
ctaButton={{ text: "Contact Us Now", href: "/#contact" }}
ctaButton={{ text: "Contact Us Now", href: "#contact" }}
ctaIcon={Phone}
faqs={[
{ id: "1", title: "What are your office hours?", content: "Our support team is available Monday to Friday, 9 AM to 5 PM EST." },
@@ -165,14 +164,14 @@ export default function LandingPage() {
logoText="MyCo"
columns={[
{title: "Solutions", items: [
{label: "Products", href: "/#products"},
{label: "Features", href: "/#features"}
{label: "Products", href: "#products"},
{label: "Features", href: "#features"}
]},
{title: "Company", items: [
{label: "About Us", href: "/#about"},
{label: "About Us", href: "#about"},
{label: "Blog", href: "/blog"},
{label: "FAQ", href: "/#faq"},
{label: "Contact", href: "/#contact"}
{label: "FAQ", href: "#faq"},
{label: "Contact", href: "#contact"}
]}
]}
copyrightText="© 2024 MyCo. All rights reserved."

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

@@ -93,15 +93,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="MyCo"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Products", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
{name: "Home", id: "/"},
{name: "About", id: "/#about"},
{name: "Features", id: "/#features"},
{name: "Products", id: "/#products"},
{name: "Testimonials", id: "/#testimonials"},
{name: "FAQ", id: "/#faq"},
{name: "Contact", id: "/#contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -157,15 +155,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="MyCo"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Products", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
{name: "Home", id: "/"},
{name: "About", id: "/#about"},
{name: "Features", id: "/#features"},
{name: "Products", id: "/#products"},
{name: "Testimonials", id: "/#testimonials"},
{name: "FAQ", id: "/#faq"},
{name: "Contact", id: "/#contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -226,15 +222,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="MyCo"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Products", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
{name: "Home", id: "/"},
{name: "About", id: "/#about"},
{name: "Features", id: "/#features"},
{name: "Products", id: "/#products"},
{name: "Testimonials", id: "/#testimonials"},
{name: "FAQ", id: "/#faq"},
{name: "Contact", id: "/#contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

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

@@ -60,15 +60,13 @@ function ShopPageContent() {
<NavbarStyleApple
brandName="MyCo"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Products", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
{name: "Home", id: "/"},
{name: "About", id: "/#about"},
{name: "Features", id: "/#features"},
{name: "Products", id: "/#products"},
{name: "Testimonials", id: "/#testimonials"},
{name: "FAQ", id: "/#faq"},
{name: "Contact", id: "/#contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -121,15 +119,13 @@ function ShopPageContent() {
<NavbarStyleApple
brandName="MyCo"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Products", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
{name: "Home", id: "/"},
{name: "About", id: "/#about"},
{name: "Features", id: "/#features"},
{name: "Products", id: "/#products"},
{name: "Testimonials", id: "/#testimonials"},
{name: "FAQ", id: "/#faq"},
{name: "Contact", id: "/#contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>