bender/b90c8a55-3656-493d-92c6-91c5fe9c0a71
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #3

Merged
bender merged 3 commits from version_2 into main 2026-04-01 02:35:33 +00:00
Conversation 0 Commits 3 Files Changed 3 +49 -47
3 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/about/page.tsx
View File

@@ -3,35 +3,36 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import TeamCardTen from '@/components/sections/team/TeamCardTen';
import TeamCardFive from '@/components/sections/team/TeamCardFive';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function AboutPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="reveal-blur" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Portfolio", id: "/portfolio" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Amped Web Solutions"
navItems={[
{ name: "Home", id: "/" },
{ name: "Portfolio", id: "/portfolio" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Amped Web Solutions"
/>
<TeamCardTen
title="Our Experts"
tag="The Team"
memberVariant="card"
members={[
{ id: "1", name: "Alex R.", imageSrc: "http://img.b2bpic.net/free-photo/lifestyle-people-office_23-2149173741.jpg?_wi=1" },
{ id: "2", name: "Jordan P.", imageSrc: "http://img.b2bpic.net/free-photo/lifestyle-people-office_23-2149173741.jpg?_wi=2" }
]}
<TeamCardFive
animationType="slide-up"
title="Our Experts"
tag="The Team"
textboxLayout="default"
useInvertedBackground={false}
team={[
{ id: "1", name: "Alex R.", role: "Founder", imageSrc: "http://img.b2bpic.net/free-photo/lifestyle-people-office_23-2149173741.jpg?_wi=1" },
{ id: "2", name: "Jordan P.", role: "Developer", imageSrc: "http://img.b2bpic.net/free-photo/lifestyle-people-office_23-2149173741.jpg?_wi=2" }
]}
/>
<FooterLogoEmphasis
logoText="Amped Web Solutions"
columns={[{ items: [{ label: "Home", href: "/" }, { label: "Portfolio", href: "/portfolio" }, { label: "About", href: "/about" }] }]}
logoText="Amped Web Solutions"
columns={[{ items: [{ label: "Home", href: "/" }, { label: "Portfolio", href: "/portfolio" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }]}
/>
</ReactLenis>
</ThemeProvider>

22
src/app/contact/page.tsx
View File

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import ContactCTA from '@/components/sections/contact/ContactCTA';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function ContactPage() {
@@ -13,18 +13,17 @@ export default function ContactPage() {
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="medium"
sizing="mediumLargeSizeLargeTitles"
background="noiseDiagonalGradient"
cardStyle="soft-shadow"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="radial-glow"
headingFontWeight="bold"
sizing="medium"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="normal"
>
<ReactLenis root>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Portfolio", id: "/portfolio" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
@@ -33,18 +32,19 @@ export default function ContactPage() {
/>
<div className="pt-32 pb-20">
<ContactCenter
<ContactCTA
tag="Get in Touch"
title="Let's Build Something Great"
description="Ready to discuss your next project? Send us a message and we'll be in touch shortly."
background={{ variant: "plain" }}
useInvertedBackground={false}
buttons={[{ text: "Email Us", href: "mailto:hello@amped.com" }]}
/>
</div>
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Portfolio", href: "/portfolio" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] },
{ items: [{ label: "Tallahassee, FL", href: "#" }, { label: "© 2026", href: "#" }] },
{ items: [{ label: "Home", href: "/" }, { label: "Portfolio", href: "/portfolio" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] },
]}
logoText="Amped Web Solutions"
/>

33
src/app/portfolio/page.tsx
View File

@@ -3,37 +3,38 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import FeatureCardTwentyThree from '@/components/sections/feature/FeatureCardTwentyThree';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function PortfolioPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="reveal-blur" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Portfolio", id: "/portfolio" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Amped Web Solutions"
navItems={[
{ name: "Home", id: "/" },
{ name: "Portfolio", id: "/portfolio" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Amped Web Solutions"
/>
<FeatureCardTwentyThree
<ProductCardTwo
animationType="slide-up"
gridVariant="three-columns-all-equal-width"
textboxLayout="default"
title="Case Studies"
description="Real results for real businesses."
features={[
{ id: "1", title: "Local Cafe Redesign", tags: ["Web Design", "Marketing"], imageSrc: "http://img.b2bpic.net/free-vector/start-up-landing-page-with-laptop-rocket_23-2148261584.jpg?_wi=1" },
{ id: "2", title: "AI Assistant Integration", tags: ["AI", "Automation"], imageSrc: "http://img.b2bpic.net/free-vector/realistic-ui-ux-landing-page_23-2149070669.jpg?_wi=1" },
{ id: "3", title: "Regional Ad Campaign", tags: ["Growth", "Ads"], imageSrc: "http://img.b2bpic.net/free-vector/construction-web-landing-page_23-2148174677.jpg?_wi=1" }
useInvertedBackground={false}
products={[
{ id: "1", brand: "Cafe", name: "Local Cafe Redesign", price: "$5k", rating: 5, reviewCount: "10", imageSrc: "http://img.b2bpic.net/free-vector/start-up-landing-page-with-laptop-rocket_23-2148261584.jpg?_wi=1" },
{ id: "2", brand: "Tech", name: "AI Assistant Integration", price: "$15k", rating: 5, reviewCount: "20", imageSrc: "http://img.b2bpic.net/free-vector/realistic-ui-ux-landing-page_23-2149070669.jpg?_wi=1" },
{ id: "3", brand: "Ads", name: "Regional Ad Campaign", price: "$8k", rating: 4, reviewCount: "15", imageSrc: "http://img.b2bpic.net/free-vector/construction-web-landing-page_23-2148174677.jpg?_wi=1" }
]}
/>
<FooterLogoEmphasis
logoText="Amped Web Solutions"
columns={[{ items: [{ label: "Home", href: "/" }, { label: "Portfolio", href: "/portfolio" }, { label: "About", href: "/about" }] }]}
columns={[{ items: [{ label: "Home", href: "/" }, { label: "Portfolio", href: "/portfolio" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }]}
/>
</ReactLenis>
</ThemeProvider>