bender/b4a563f7-6ec1-4307-b08d-a0dd5ff037cc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #7

Merged
bender merged 5 commits from version_2 into main 2026-03-03 19:32:14 +00:00
Conversation 0 Commits 5 Files Changed 5 +52 -1434
5 changed files with 52 additions and 1434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloating
import MediaAbout from "@/components/sections/about/MediaAbout";
import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
import Link from "next/link";
import { Heart } from "lucide-react";
export default function AboutPage() {
@@ -89,7 +90,8 @@ export default function AboutPage() {
textboxLayout="default"
useInvertedBackground={false}
names={[
"Urban Fashion Week", "Street Culture Magazine", "Fashion Forward Collective", "Independent Style Collective", "Art & Fashion Union", "Creative Movement", "Urban Collective", "Style Rebels"]}
"Urban Fashion Week", "Street Culture Magazine", "Fashion Forward Collective", "Independent Style Collective", "Art & Fashion Union", "Creative Movement", "Urban Collective", "Style Rebels"
]}
speed={50}
showCard={true}
/>

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

@@ -5,6 +5,7 @@ import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloating
import ContactFaq from "@/components/sections/contact/ContactFaq";
import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
import Link from "next/link";
import { MessageCircle } from "lucide-react";
export default function ContactPage() {
@@ -72,17 +73,17 @@ export default function ContactPage() {
<ContactFaq
faqs={[
{
id: "1", title: "What sizes do you offer?", content:
"We offer sizes XS through XXL with detailed size guides available for each product. Check the product page for specific measurements and fit recommendations."},
id: "1", title: "What sizes do you offer?", content: "We offer sizes XS through XXL with detailed size guides available for each product. Check the product page for specific measurements and fit recommendations."
},
{
id: "2", title: "How long does shipping take?", content:
"Standard shipping within South Africa takes 3-5 business days. Express delivery is available for urgent orders. International shipping available to select countries."},
id: "2", title: "How long does shipping take?", content: "Standard shipping within South Africa takes 3-5 business days. Express delivery is available for urgent orders. International shipping available to select countries."
},
{
id: "3", title: "What payment methods do you accept?", content:
"We accept all major credit cards, PayPal, and EFT transfers. Secure checkout with 256-bit encryption for all transactions."},
id: "3", title: "What payment methods do you accept?", content: "We accept all major credit cards, PayPal, and EFT transfers. Secure checkout with 256-bit encryption for all transactions."
},
{
id: "4", title: "Do you offer returns?", content:
"30-day returns on all unworn items with original tags. Free return shipping on defective products. Easy return process through your account dashboard."},
id: "4", title: "Do you offer returns?", content: "30-day returns on all unworn items with original tags. Free return shipping on defective products. Easy return process through your account dashboard."
},
]}
ctaTitle="Get In Touch"
ctaDescription="Have questions about our collection? Reach out to our team."
@@ -103,7 +104,8 @@ export default function ContactPage() {
textboxLayout="default"
useInvertedBackground={false}
names={[
"Urban Fashion Week", "Street Culture Magazine", "Fashion Forward Collective", "Independent Style Collective", "Art & Fashion Union", "Creative Movement", "Urban Collective", "Style Rebels"]}
"Urban Fashion Week", "Street Culture Magazine", "Fashion Forward Collective", "Independent Style Collective", "Art & Fashion Union", "Creative Movement", "Urban Collective", "Style Rebels"
]}
speed={50}
showCard={true}
/>

1409
src/app/layout.tsx
View File

File diff suppressed because it is too large Load Diff

28
src/app/page.tsx
View File

@@ -102,13 +102,16 @@ export default function HomePage() {
products={[
{
id: "1", brand: "UNREST", name: "Baggy Jeans", price: "R599", rating: 5,
reviewCount: "142", imageSrc: "http://img.b2bpic.net/free-photo/vertical-photo-young-lady-leaning-wall-tunnel_114579-92564.jpg?_wi=1", imageAlt: "Oversized baggy jeans with artistic prints"},
reviewCount: "142", imageSrc: "http://img.b2bpic.net/free-photo/vertical-photo-young-lady-leaning-wall-tunnel_114579-92564.jpg?_wi=1", imageAlt: "Oversized baggy jeans with artistic prints"
},
{
id: "2", brand: "UNREST", name: "Long Sleeve Shirt", price: "R399", rating: 5,
reviewCount: "98", imageSrc: "http://img.b2bpic.net/free-vector/simple-symmetrical-design-black-background_1040-1214.jpg", imageAlt: "Premium long sleeve shirt with detailed graphics"},
reviewCount: "98", imageSrc: "http://img.b2bpic.net/free-vector/simple-symmetrical-design-black-background_1040-1214.jpg", imageAlt: "Premium long sleeve shirt with detailed graphics"
},
{
id: "3", brand: "UNREST", name: "T-Shirt Premium", price: "R299", rating: 5,
reviewCount: "176", imageSrc: "http://img.b2bpic.net/free-vector/pride-day-lettering_23-2148514310.jpg?_wi=1", imageAlt: "Artistic print t-shirt classic cut"},
reviewCount: "176", imageSrc: "http://img.b2bpic.net/free-vector/pride-day-lettering_23-2148514310.jpg?_wi=1", imageAlt: "Artistic print t-shirt classic cut"
},
]}
/>
</div>
@@ -121,7 +124,8 @@ export default function HomePage() {
textboxLayout="default"
useInvertedBackground={false}
names={[
"Urban Fashion Week", "Street Culture Magazine", "Fashion Forward Collective", "Independent Style Collective", "Art & Fashion Union", "Creative Movement", "Urban Collective", "Style Rebels"]}
"Urban Fashion Week", "Street Culture Magazine", "Fashion Forward Collective", "Independent Style Collective", "Art & Fashion Union", "Creative Movement", "Urban Collective", "Style Rebels"
]}
speed={50}
showCard={true}
/>
@@ -144,17 +148,17 @@ export default function HomePage() {
<ContactFaq
faqs={[
{
id: "1", title: "What sizes do you offer?", content:
"We offer sizes XS through XXL with detailed size guides available for each product. Check the product page for specific measurements and fit recommendations."},
id: "1", title: "What sizes do you offer?", content: "We offer sizes XS through XXL with detailed size guides available for each product. Check the product page for specific measurements and fit recommendations."
},
{
id: "2", title: "How long does shipping take?", content:
"Standard shipping within South Africa takes 3-5 business days. Express delivery is available for urgent orders. International shipping available to select countries."},
id: "2", title: "How long does shipping take?", content: "Standard shipping within South Africa takes 3-5 business days. Express delivery is available for urgent orders. International shipping available to select countries."
},
{
id: "3", title: "What payment methods do you accept?", content:
"We accept all major credit cards, PayPal, and EFT transfers. Secure checkout with 256-bit encryption for all transactions."},
id: "3", title: "What payment methods do you accept?", content: "We accept all major credit cards, PayPal, and EFT transfers. Secure checkout with 256-bit encryption for all transactions."
},
{
id: "4", title: "Do you offer returns?", content:
"30-day returns on all unworn items with original tags. Free return shipping on defective products. Easy return process through your account dashboard."},
id: "4", title: "Do you offer returns?", content: "30-day returns on all unworn items with original tags. Free return shipping on defective products. Easy return process through your account dashboard."
},
]}
ctaTitle="Get In Touch"
ctaDescription="Have questions about our collection? Reach out to our team."

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

@@ -5,6 +5,7 @@ import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloating
import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
import ContactFaq from "@/components/sections/contact/ContactFaq";
import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
import Link from "next/link";
import { MessageCircle } from "lucide-react";
export default function ShopPage() {
@@ -80,16 +81,20 @@ export default function ShopPage() {
products={[
{
id: "baggy-jeans", brand: "UNREST", name: "Oversized Baggy Jeans", price: "R599", rating: 5,
reviewCount: "142", imageSrc: "http://img.b2bpic.net/free-photo/vertical-photo-young-lady-leaning-wall-tunnel_114579-92564.jpg?_wi=3", imageAlt: "Baggy jeans with fingerprint graphic print"},
reviewCount: "142", imageSrc: "http://img.b2bpic.net/free-photo/vertical-photo-young-lady-leaning-wall-tunnel_114579-92564.jpg?_wi=3", imageAlt: "Baggy jeans with fingerprint graphic print"
},
{
id: "long-sleeve", brand: "UNREST", name: "Knife Graphic Long Sleeve", price: "R399", rating: 5,
reviewCount: "98", imageSrc: "http://img.b2bpic.net/free-vector/poster-design-with-mechanic-girl_1284-52594.jpg", imageAlt: "White long sleeve with artistic knife illustration"},
reviewCount: "98", imageSrc: "http://img.b2bpic.net/free-vector/poster-design-with-mechanic-girl_1284-52594.jpg", imageAlt: "White long sleeve with artistic knife illustration"
},
{
id: "tshirt-one", brand: "UNREST", name: "Graphic T-Shirt V1", price: "R299", rating: 5,
reviewCount: "156", imageSrc: "http://img.b2bpic.net/free-vector/pride-day-lettering_23-2148514310.jpg?_wi=2", imageAlt: "Oversized graphic t-shirt with artistic print"},
reviewCount: "156", imageSrc: "http://img.b2bpic.net/free-vector/pride-day-lettering_23-2148514310.jpg?_wi=2", imageAlt: "Oversized graphic t-shirt with artistic print"
},
{
id: "tshirt-two", brand: "UNREST", name: "Statement T-Shirt V2", price: "R299", rating: 5,
reviewCount: "120", imageSrc: "http://img.b2bpic.net/free-vector/pride-day-lettering_23-2148514310.jpg?_wi=3", imageAlt: "Black t-shirt with bold artistic graphic"},
reviewCount: "120", imageSrc: "http://img.b2bpic.net/free-vector/pride-day-lettering_23-2148514310.jpg?_wi=3", imageAlt: "Black t-shirt with bold artistic graphic"
},
]}
/>
</div>
@@ -98,14 +103,14 @@ export default function ShopPage() {
<ContactFaq
faqs={[
{
id: "1", title: "What sizes do you offer?", content:
"We offer sizes XS through XXL with detailed size guides available for each product. Check the product page for specific measurements and fit recommendations."},
id: "1", title: "What sizes do you offer?", content: "We offer sizes XS through XXL with detailed size guides available for each product. Check the product page for specific measurements and fit recommendations."
},
{
id: "2", title: "How long does shipping take?", content:
"Standard shipping within South Africa takes 3-5 business days. Express delivery is available for urgent orders. International shipping available to select countries."},
id: "2", title: "How long does shipping take?", content: "Standard shipping within South Africa takes 3-5 business days. Express delivery is available for urgent orders. International shipping available to select countries."
},
{
id: "3", title: "What payment methods do you accept?", content:
"We accept all major credit cards, PayPal, and EFT transfers. Secure checkout with 256-bit encryption for all transactions."},
id: "3", title: "What payment methods do you accept?", content: "We accept all major credit cards, PayPal, and EFT transfers. Secure checkout with 256-bit encryption for all transactions."
},
]}
ctaTitle="Questions About Our Products?"
ctaDescription="Our team is here to help with sizing, shipping, and more."