bender/c7b69c2a-4f2f-4dc1-99c8-cc08234733f8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 4 commits from version_2 into main 2026-02-27 10:43:50 +00:00
Conversation 0 Commits 4 Files Changed 4 +33 -5
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ export default function BlogPage() {
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Projects", id: "projects" },
{ name: "Team", id: "team" },
{ name: "Skills", id: "skills" },
{ name: "Contact", id: "contact" }
]}
@@ -65,6 +66,7 @@ export default function BlogPage() {
title: "Navigation", items: [
{ label: "About", href: "#about" },
{ label: "Projects", href: "#projects" },
{ label: "Team", href: "#team" },
{ label: "Skills", href: "#skills" },
{ label: "Contact", href: "#contact" }
]

21
src/app/page.tsx
View File

@@ -7,6 +7,7 @@ import FeatureBento from '@/components/sections/feature/FeatureBento';
import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import PricingCardEight from '@/components/sections/pricing/PricingCardEight';
import TeamCardTen from '@/components/sections/team/TeamCardTen';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { Award, Brain, CheckCircle, Code, Database, Globe, Lightbulb, Mail, Palette, Shield, Sparkles, Users, Zap } from "lucide-react";
@@ -31,6 +32,7 @@ export default function LandingPage() {
{ name: "About", id: "about" },
{ name: "Projects", id: "projects" },
{ name: "Skills", id: "skills" },
{ name: "Team", id: "team" },
{ name: "Contact", id: "contact" }
]}
brandName="Alex Chen"
@@ -161,6 +163,24 @@ export default function LandingPage() {
/>
</div>
<div id="team" data-section="team">
<TeamCardTen
title="Meet The Team"
tag="Team"
members={[
{
id: "1", name: "Bob", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg", imageAlt: "Bob team member portrait"
},
{
id: "2", name: "Lorenzo", imageSrc: "http://img.b2bpic.net/free-photo/happy-joyful-male-man-with-smartphone-posing-indoors_74855-2897.jpg", imageAlt: "Lorenzo team member portrait"
}
]}
memberVariant="default"
membersAnimation="slide-up"
useInvertedBackground={false}
/>
</div>
<div id="skills" data-section="skills">
<PricingCardEight
title="My Service Offerings"
@@ -216,6 +236,7 @@ export default function LandingPage() {
title: "Navigation", items: [
{ label: "About", href: "#about" },
{ label: "Projects", href: "#projects" },
{ label: "Team", href: "#team" },
{ label: "Skills", href: "#skills" },
{ label: "Contact", href: "#contact" }
]

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

@@ -95,6 +95,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Projects","id":"projects"},
{"name":"Team","id":"team"},
{"name":"Skills","id":"skills"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
@@ -109,7 +110,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Team","href":"#team"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Social","items":[{"label":"LinkedIn","href":"https://linkedin.com"},{"label":"GitHub","href":"https://github.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Portfolio","href":"https://portfolio.com"}]},
{"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"},{"label":"Cookie Policy","href":"#"}]}
]}
@@ -142,6 +143,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Projects","id":"projects"},
{"name":"Team","id":"team"},
{"name":"Skills","id":"skills"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
@@ -164,7 +166,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Team","href":"#team"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Social","items":[{"label":"LinkedIn","href":"https://linkedin.com"},{"label":"GitHub","href":"https://github.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Portfolio","href":"https://portfolio.com"}]},
{"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"},{"label":"Cookie Policy","href":"#"}]}
]}
@@ -196,6 +198,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Projects","id":"projects"},
{"name":"Team","id":"team"},
{"name":"Skills","id":"skills"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
@@ -243,7 +246,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Team","href":"#team"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Social","items":[{"label":"LinkedIn","href":"https://linkedin.com"},{"label":"GitHub","href":"https://github.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Portfolio","href":"https://portfolio.com"}]},
{"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"},{"label":"Cookie Policy","href":"#"}]}
]}

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

@@ -38,6 +38,7 @@ function ShopPageContent() {
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Projects","id":"projects"},
{"name":"Team","id":"team"},
{"name":"Skills","id":"skills"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
@@ -52,7 +53,7 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Team","href":"#team"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Social","items":[{"label":"LinkedIn","href":"https://linkedin.com"},{"label":"GitHub","href":"https://github.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Portfolio","href":"https://portfolio.com"}]},
{"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"},{"label":"Cookie Policy","href":"#"}]}
]}
@@ -84,6 +85,7 @@ function ShopPageContent() {
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Projects","id":"projects"},
{"name":"Team","id":"team"},
{"name":"Skills","id":"skills"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
@@ -106,7 +108,7 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Navigation","items":[{"label":"About","href":"#about"},{"label":"Projects","href":"#projects"},{"label":"Team","href":"#team"},{"label":"Skills","href":"#skills"},{"label":"Contact","href":"#contact"}]},
{"title":"Social","items":[{"label":"LinkedIn","href":"https://linkedin.com"},{"label":"GitHub","href":"https://github.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Portfolio","href":"https://portfolio.com"}]},
{"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"},{"label":"Cookie Policy","href":"#"}]}
]}