bender/13ee642a-ed9b-4519-97e2-308036da92a6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #3

Merged
bender merged 5 commits from version_3 into main 2026-03-04 02:25:55 +00:00
Conversation 0 Commits 5 Files Changed 5 +69 -47
5 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,14 +6,13 @@ import HeroSplit from "@/components/sections/hero/HeroSplit";
import FeatureCardSeven from "@/components/sections/feature/FeatureCardSeven";
import ContactSplit from "@/components/sections/contact/ContactSplit";
import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
import Link from "next/link";
import { Rocket, CheckCircle } from "lucide-react";
export default function AboutPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "How It Works", id: "/#process" },
{ name: "Why Choose Us", id: "/#why-choose-us" },
{ name: "Portfolio", id: "/#portfolio" },
{ name: "Contact", id: "/contact" },
];
@@ -35,9 +34,9 @@ export default function AboutPage() {
},
{
title: "Support", items: [
{ label: "FAQ", href: "/" },
{ label: "How It Works", href: "/#process" },
{ label: "Bulk Orders", href: "/" },
{ label: "FAQ", href: "/contact" },
{ label: "How It Works", href: "/services" },
{ label: "Bulk Orders", href: "/contact" },
],
},
{
@@ -162,7 +161,7 @@ export default function AboutPage() {
<FooterBaseCard
logoText="Custom Apparel Co"
columns={footerColumns}
copyrightText="© 2025 Custom Apparel Co. All rights reserved. | Olympia, WA"
copyrightText="© 2025 Custom Apparel Co. All rights reserved. | Olympia, WA 98502 | 360-550-6540"
/>
</div>
</ThemeProvider>

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

@@ -5,14 +5,13 @@ import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloating
import HeroSplit from "@/components/sections/hero/HeroSplit";
import ContactSplit from "@/components/sections/contact/ContactSplit";
import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
import Link from "next/link";
import { Phone } from "lucide-react";
export default function ContactPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "How It Works", id: "/#process" },
{ name: "Why Choose Us", id: "/#why-choose-us" },
{ name: "Portfolio", id: "/#portfolio" },
{ name: "Contact", id: "/contact" },
];
@@ -34,9 +33,9 @@ export default function ContactPage() {
},
{
title: "Support", items: [
{ label: "FAQ", href: "/" },
{ label: "How It Works", href: "/#process" },
{ label: "Bulk Orders", href: "/" },
{ label: "FAQ", href: "/contact" },
{ label: "How It Works", href: "/services" },
{ label: "Bulk Orders", href: "/contact" },
],
},
{
@@ -81,7 +80,7 @@ export default function ContactPage() {
tagAnimation="slide-up"
background={{ variant: "glowing-orb" }}
buttons={[
{ text: "Call Us: (360) 555-0123", href: "tel:+13605550123" },
{ text: "Call Us: 360-550-6540", href: "tel:+13605506540" },
{ text: "View Services", href: "/services" },
]}
buttonAnimation="slide-up"
@@ -117,11 +116,13 @@ export default function ContactPage() {
<div className="grid grid-cols-1 md:grid-cols-2 gap-12">
<div>
<h3 className="text-2xl font-light mb-4">Olympia Location</h3>
<p className="text-foreground/70 mb-2">123 Print Street</p>
<p className="text-foreground/70 mb-2">Olympia, WA 98501</p>
<p className="text-foreground/70 mb-4">United States</p>
<p className="text-foreground/70 mb-2">625 Black Lake Blvd SW</p>
<p className="text-foreground/70 mb-2">Suite 221</p>
<p className="text-foreground/70 mb-4">Olympia, WA 98502</p>
<p className="font-medium text-primary-cta mb-1">Phone</p>
<p className="text-foreground/70 mb-6">(360) 555-0123</p>
<p className="text-foreground/70 mb-6">
<a href="tel:+13605506540" className="hover:underline">360-550-6540</a>
</p>
<p className="font-medium text-primary-cta mb-1">Email</p>
<p className="text-foreground/70">info@customapparelco.com</p>
</div>
@@ -144,7 +145,7 @@ export default function ContactPage() {
<FooterBaseCard
logoText="Custom Apparel Co"
columns={footerColumns}
copyrightText="© 2025 Custom Apparel Co. All rights reserved. | Olympia, WA"
copyrightText="© 2025 Custom Apparel Co. All rights reserved. | Olympia, WA 98502 | 360-550-6540"
/>
</div>
</ThemeProvider>

8
src/app/layout.tsx
View File

@@ -1,13 +1,7 @@
import type { Metadata } from "next";
import { Libre_Baskerville } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville", subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
@@ -38,7 +32,7 @@ export default function RootLayout({
}>) {
return (
<html lang="en">
<body className={`${libreBaskerville.variable} ${inter.variable}`}>
<body className={`${inter.variable}`}>
{children}
<script

63
src/app/page.tsx
View File

@@ -8,15 +8,14 @@ import ProductCardFour from "@/components/sections/product/ProductCardFour";
import TestimonialCardOne from "@/components/sections/testimonial/TestimonialCardOne";
import ContactSplit from "@/components/sections/contact/ContactSplit";
import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
import Link from "next/link";
import { CheckCircle, Zap, Image, Star, Rocket } from "lucide-react";
import { CheckCircle, Zap, Image, Star, Rocket, Zap as FastTurnaround, CheckCircle as PixelPerfect, Award } from "lucide-react";
export default function HomePage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "How It Works", id: "process" },
{ name: "Portfolio", id: "portfolio" },
{ name: "Why Choose Us", id: "#why-choose-us" },
{ name: "Portfolio", id: "#portfolio" },
{ name: "Contact", id: "/contact" },
];
@@ -31,15 +30,15 @@ export default function HomePage() {
{
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Work", href: "portfolio" },
{ label: "Our Work", href: "#portfolio" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/" },
{ label: "How It Works", href: "process" },
{ label: "Bulk Orders", href: "/" },
{ label: "FAQ", href: "/contact" },
{ label: "How It Works", href: "/services" },
{ label: "Bulk Orders", href: "/contact" },
],
},
{
@@ -85,7 +84,7 @@ export default function HomePage() {
background={{ variant: "glowing-orb" }}
buttons={[
{ text: "Get a Quote Today", href: "/contact" },
{ text: "View Our Work", href: "portfolio" },
{ text: "View Our Work", href: "#portfolio" },
]}
buttonAnimation="slide-up"
imageSrc="http://img.b2bpic.net/free-photo/young-man-screen-printing_1163-2777.jpg?_wi=1"
@@ -96,6 +95,30 @@ export default function HomePage() {
/>
</div>
{/* Brand Promise Section */}
<div id="brand-promise" data-section="brand-promise">
<FeatureCardSeven
title="Our Brand Promise"
description="We stand by our commitment to deliver exceptional quality every single time."
tag="Quality Assurance"
tagIcon={CheckCircle}
tagAnimation="slide-up"
features={[
{
id: 1,
title: "Fast Turnaround", description: "Standard orders completed in 5-7 business days. Rush orders available for 2-3 day turnaround. We respect your timeline and deliver on schedule.", imageSrc: "http://img.b2bpic.net/free-photo/businesspeople-planning-tasks-with-sticky-notes_53876-15190.jpg?_wi=1", imageAlt: "Fast turnaround process", buttons: [{ text: "Learn More", href: "/services" }],
},
{
id: 2,
title: "Pixel Perfect Printing", description: "Every detail matters. Our advanced printing technology ensures crisp, vibrant colors and precise details. Quality inspection on every garment.", imageSrc: "http://img.b2bpic.net/free-photo/person-holding-brown-wooden-board_250224-22.jpg?_wi=1", imageAlt: "Quality printing process", buttons: [{ text: "Learn More", href: "/services" }],
},
]}
textboxLayout="default"
animationType="slide-up"
useInvertedBackground={false}
/>
</div>
{/* Services Section */}
<div id="services" data-section="services">
<FeatureCardSeven
@@ -124,21 +147,27 @@ export default function HomePage() {
/>
</div>
{/* How It Works Section */}
<div id="process" data-section="process">
{/* Why Choose Us Section */}
<div id="why-choose-us" data-section="why-choose-us">
<FeatureCardSeven
title="How It Works"
description="Our streamlined 3-step process gets your custom apparel ready quickly and professionally."
title="Why Choose Custom Apparel Co"
description="We go beyond printing. We're your partner in creating amazing branded apparel."
tag="Our Competitive Edge"
tagIcon={Award}
tagAnimation="slide-up"
features={[
{
id: 1,
title: "Upload Your Design", description: "Submit your artwork in any format. Our design team will review and provide feedback if needed. We accept PSD, AI, PNG, JPG, PDF, and more.", imageSrc: "http://img.b2bpic.net/free-vector/online-image-upload-landing-page_23-2148282428.jpg?_wi=1", imageAlt: "Upload design step"},
title: "Expert Design Consultation", description: "Our design team reviews every submission. We provide feedback, suggest improvements, and ensure your design looks perfect before printing begins.", imageSrc: "http://img.b2bpic.net/free-photo/businesspeople-planning-tasks-with-sticky-notes_53876-15190.jpg?_wi=1", imageAlt: "Design consultation"},
{
id: 2,
title: "Choose Your Print Method", description: "Select the best printing technique for your project based on design complexity, quantity, and budget. We'll recommend options.", imageSrc: "http://img.b2bpic.net/free-photo/businesspeople-planning-tasks-with-sticky-notes_53876-15190.jpg?_wi=1", imageAlt: "Choose printing method"},
title: "Competitive Pricing Guaranteed", description: "No hidden fees. No surprise costs. Transparent quotes upfront with detailed breakdowns. Bulk discounts available for larger orders.", imageSrc: "http://img.b2bpic.net/free-photo/order-summary-payslip-purchase-order-form-concept_53876-123701.jpg?_wi=1", imageAlt: "Pricing transparency"},
{
id: 3,
title: "Receive Your Quote", description: "Get an instant, detailed quote with production timeline and shipping options. No hidden fees. Rush orders available.", imageSrc: "http://img.b2bpic.net/free-photo/order-summary-payslip-purchase-order-form-concept_53876-123701.jpg?_wi=1", imageAlt: "Quote confirmation"},
title: "Local Olympia Expertise", description: "We're proud members of the Olympia community. Located at 625 Black Lake Blvd SW Suite 221, we serve local businesses and beyond.", imageSrc: "http://img.b2bpic.net/free-vector/online-image-upload-landing-page_23-2148282428.jpg?_wi=1", imageAlt: "Local service"},
{
id: 4,
title: "Dedicated Customer Support", description: "Call us at 360-550-6540 or visit our location. We respond to inquiries within 24 hours and are committed to your success.", imageSrc: "http://img.b2bpic.net/free-photo/smiling-businessman-sitting-meeting-talking-phone_1262-18075.jpg?_wi=1", imageAlt: "Customer support"},
]}
textboxLayout="default"
animationType="blur-reveal"
@@ -230,7 +259,7 @@ export default function HomePage() {
<FooterBaseCard
logoText="Custom Apparel Co"
columns={footerColumns}
copyrightText="© 2025 Custom Apparel Co. All rights reserved. | Olympia, WA"
copyrightText="© 2025 Custom Apparel Co. All rights reserved. | Olympia, WA 98502 | 360-550-6540"
/>
</div>
</ThemeProvider>

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

@@ -5,14 +5,13 @@ import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloating
import FeatureCardSeven from "@/components/sections/feature/FeatureCardSeven";
import ContactSplit from "@/components/sections/contact/ContactSplit";
import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
import Link from "next/link";
import { Zap, Rocket } from "lucide-react";
export default function ServicesPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "How It Works", id: "/#process" },
{ name: "Why Choose Us", id: "/#why-choose-us" },
{ name: "Portfolio", id: "/#portfolio" },
{ name: "Contact", id: "/contact" },
];
@@ -34,9 +33,9 @@ export default function ServicesPage() {
},
{
title: "Support", items: [
{ label: "FAQ", href: "/" },
{ label: "How It Works", href: "/#process" },
{ label: "Bulk Orders", href: "/" },
{ label: "FAQ", href: "/contact" },
{ label: "How It Works", href: "/services" },
{ label: "Bulk Orders", href: "/contact" },
],
},
{
@@ -142,7 +141,7 @@ export default function ServicesPage() {
<FooterBaseCard
logoText="Custom Apparel Co"
columns={footerColumns}
copyrightText="© 2025 Custom Apparel Co. All rights reserved. | Olympia, WA"
copyrightText="© 2025 Custom Apparel Co. All rights reserved. | Olympia, WA 98502 | 360-550-6540"
/>
</div>
</ThemeProvider>