bender/c4c806f4-fff1-4392-bea2-02bcc9b5f9ff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #4

Merged
bender merged 2 commits from version_4 into main 2026-04-17 18:56:00 +00:00
Conversation 0 Commits 2 Files Changed 2 +30 -115
2 changed files with 30 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/app/page.tsx
View File

@@ -28,14 +28,10 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{
name: "Home", id: "/"},
{
name: "Products", id: "/products"},
{
name: "About Us", id: "/about"},
{
name: "Contact", id: "/contact"},
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About Us", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Goodfellas Bud"
/>
@@ -46,10 +42,8 @@ export default function LandingPage() {
logoText="Goodfellas Bud"
description="Experience the epitome of luxury cannabis on Florida Road. Curated strains, refined quality, and unmatched service in the heart of Durban."
buttons={[
{
text: "Explore Strains", href: "/products"},
{
text: "Visit Us", href: "/contact"},
{ text: "Explore Strains", href: "/products" },
{ text: "Visit Us", href: "/contact" },
]}
imageSrc="https://img.freepik.com/free-photo/cannabis-buds-with-cbd-oil-bottles-dark-background_23-2148784795.jpg"
imageAlt="Goodfellas Bud Luxury Dispensary Interior"
@@ -60,12 +54,9 @@ export default function LandingPage() {
<InlineImageSplitTextAbout
useInvertedBackground={false}
heading={[
{
type: "text", content: "Our Commitment to "},
{
type: "text", content: "Excellence"},
{
type: "image", src: "https://img.freepik.com/free-photo/close-up-marijuana-leaf-nature_23-2148810915.jpg", alt: "Durban Heritage"}
{ type: "text", content: "Our Commitment to " },
{ type: "text", content: "Excellence" },
{ type: "image", src: "https://img.freepik.com/free-photo/close-up-marijuana-leaf-nature_23-2148810915.jpg", alt: "Durban Heritage" }
]}
/>
</div>
@@ -76,12 +67,8 @@ export default function LandingPage() {
textboxLayout="split"
useInvertedBackground={true}
testimonials={[
{
id: "1", name: "Sarah J.", handle: "@sarahj", testimonial: "The best selection in Durban. Truly premium quality.", rating: 5,
imageSrc: "https://img.freepik.com/free-photo/happy-young-woman-with-curly-hair-enjoying-sunny-day_23-2148821935.jpg"},
{
id: "2", name: "Mark D.", handle: "@markd", testimonial: "Sleek, professional, and very knowledgeable.", rating: 5,
imageSrc: "https://img.freepik.com/free-photo/portrait-confident-man-smiling-camera_23-2148822003.jpg"},
{ id: "1", name: "Sarah J.", handle: "@sarahj", testimonial: "The best selection in Durban. Truly premium quality.", rating: 5, imageSrc: "https://img.freepik.com/free-photo/happy-young-woman-with-curly-hair-enjoying-sunny-day_23-2148821935.jpg" },
{ id: "2", name: "Mark D.", handle: "@markd", testimonial: "Sleek, professional, and very knowledgeable.", rating: 5, imageSrc: "https://img.freepik.com/free-photo/portrait-confident-man-smiling-camera_23-2148822003.jpg" },
]}
showRating={true}
title="Client Experiences"
@@ -96,7 +83,8 @@ export default function LandingPage() {
title="Trusted Partners"
description="Collaborating with local growers and premium suppliers."
names={[
"Durban Organic", "Florida Road Collective", "Pure Sativa Durban", "The Green Leaf", "HighGrade South Africa"]}
"Durban Organic", "Florida Road Collective", "Pure Sativa Durban", "The Green Leaf", "HighGrade South Africa"
]}
/>
</div>
@@ -109,10 +97,8 @@ export default function LandingPage() {
title="Featured Highlights"
description="Our most popular selections this month."
products={[
{
id: "fp1", name: "Durban Gold", price: "R 480", variant: "Premium", imageSrc: "https://img.freepik.com/free-photo/cbd-oil-cannabis-buds-dark-surface_23-2148784805.jpg?_wi=1"},
{
id: "fp2", name: "Sativa Elite", price: "R 490", variant: "Exotic", imageSrc: "https://img.freepik.com/free-photo/growing-green-cannabis-plants_23-2148784800.jpg?_wi=1"},
{ id: "fp1", name: "Durban Gold", price: "R 480", variant: "Premium", imageSrc: "https://img.freepik.com/free-photo/cbd-oil-cannabis-buds-dark-surface_23-2148784805.jpg?_wi=1" },
{ id: "fp2", name: "Sativa Elite", price: "R 490", variant: "Exotic", imageSrc: "https://img.freepik.com/free-photo/growing-green-cannabis-plants_23-2148784800.jpg?_wi=1" },
]}
/>
</div>
@@ -120,26 +106,8 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBase
columns={[
{
title: "Links", items: [
{
label: "Home", href: "/"},
{
label: "Products", href: "/products"},
{
label: "About Us", href: "/about"},
{
label: "Contact", href: "/contact"},
],
},
{
title: "Legal", items: [
{
label: "Privacy Policy", href: "#"},
{
label: "Terms of Use", href: "#"},
],
},
{ title: "Links", items: [{ label: "Home", href: "/" }, { label: "Products", href: "/products" }, { label: "About Us", href: "/about" }, { label: "Contact", href: "/contact" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Use", href: "#" }] },
]}
logoText="Goodfellas Bud"
/>
@@ -147,4 +115,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

77
src/app/products/page.tsx
View File

@@ -4,10 +4,9 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import FooterBase from '@/components/sections/footer/FooterBase';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import ProductCardFour from '@/components/sections/product/ProductCardFour';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
export default function LandingPage() {
export default function ProductsPage() {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
@@ -25,14 +24,10 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{
name: "Home", id: "/"},
{
name: "Products", id: "/products"},
{
name: "About Us", id: "/about"},
{
name: "Contact", id: "/contact"},
{ name: "Home", id: "/" },
{ name: "Products", id: "/products" },
{ name: "About Us", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Goodfellas Bud"
/>
@@ -45,70 +40,22 @@ export default function LandingPage() {
gridVariant="four-items-2x2-equal-grid"
useInvertedBackground={false}
products={[
{
id: "p1", brand: "Goodfellas", name: "Golden Kush", price: "R 450", rating: 5,
reviewCount: "12", imageSrc: "http://img.b2bpic.net/free-photo/dreamy-aesthetic-cosmetic-product-with-fresh-background_23-2151382793.jpg"},
{
id: "p2", brand: "Goodfellas", name: "Florida Haze", price: "R 520", rating: 5,
reviewCount: "8", imageSrc: "http://img.b2bpic.net/free-photo/organic-dried-flower-petals-pink-bowl_114579-70372.jpg"},
{
id: "p3", brand: "Goodfellas", name: "Durban Gold", price: "R 480", rating: 4,
reviewCount: "15", imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-item-with-marijuana-leaves_23-2151336308.jpg?_wi=2"},
{
id: "p4", brand: "Goodfellas", name: "Royal Indica", price: "R 550", rating: 5,
reviewCount: "20", imageSrc: "http://img.b2bpic.net/free-photo/young-woman-holding-plant-gray-wall-high-quality-photo_114579-35168.jpg"},
{
id: "p5", brand: "Goodfellas", name: "Sativa Elite", price: "R 490", rating: 5,
reviewCount: "10", imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-growing-green-plants-black-background_181624-49918.jpg?_wi=2"},
{
id: "p6", brand: "Goodfellas", name: "Blue Velvet", price: "R 510", rating: 4,
reviewCount: "7", imageSrc: "http://img.b2bpic.net/free-photo/dried-chamomile-cinnamon-sticks-dark-board_114579-84716.jpg"},
{ id: "p1", brand: "Goodfellas", name: "Durban Poison", price: "R 450", rating: 5, reviewCount: "12", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CUsM7cNm8gvFAGuh23EiUB7nBY/uploaded-1776452143024-mdj7zo2u.jpg" },
{ id: "p2", brand: "Goodfellas", name: "Florida Haze", price: "R 520", rating: 5, reviewCount: "8", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CUsM7cNm8gvFAGuh23EiUB7nBY/uploaded-1776452143024-iwzs3e6z.jpg" },
{ id: "p3", brand: "Goodfellas", name: "Heritage Gold", price: "R 480", rating: 4, reviewCount: "15", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CUsM7cNm8gvFAGuh23EiUB7nBY/uploaded-1776452143024-ht2qk5e2.jpg" },
{ id: "p4", brand: "Goodfellas", name: "Royal Indica", price: "R 550", rating: 5, reviewCount: "20", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CUsM7cNm8gvFAGuh23EiUB7nBY/uploaded-1776452143025-4e5kcy1z.jpg" },
{ id: "p5", brand: "Goodfellas", name: "Coastal Sativa", price: "R 490", rating: 5, reviewCount: "10", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CUsM7cNm8gvFAGuh23EiUB7nBY/uploaded-1776452143025-06xumc27.jpg" }
]}
title="Our Premium Collection"
description="Hand-picked high quality strains for the discerning enthusiast."
/>
</div>
<div id="product" data-section="product">
<ProductCardFour
animationType="slide-up"
textboxLayout="default"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
title="Limited Editions"
description="Exclusive small-batch offerings."
products={[
{
id: "le1", name: "Limited Kush", price: "R 800", variant: "Rare", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-still-life-with-herbal-medicine_23-2149292049.jpg"},
{
id: "le2", name: "Rare Sativa", price: "R 850", variant: "Exotic", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-still-life-with-herbal-medicine_23-2149292038.jpg"},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBase
columns={[
{
title: "Links", items: [
{
label: "Home", href: "/"},
{
label: "Products", href: "/products"},
{
label: "About Us", href: "/about"},
{
label: "Contact", href: "/contact"},
],
},
{
title: "Legal", items: [
{
label: "Privacy Policy", href: "#"},
{
label: "Terms of Use", href: "#"},
],
},
{ title: "Links", items: [{ label: "Home", href: "/" }, { label: "Products", href: "/products" }, { label: "About Us", href: "/about" }, { label: "Contact", href: "/contact" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Use", href: "#" }] },
]}
logoText="Goodfellas Bud"
/>