bender/afbbf5fc-8056-42fc-a535-ddd29ffb435b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
bender
2026-02-25 11:33:42 +00:00
parent b7a270823d 897517c5f9
commit c7605a1fbc
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,15 +27,10 @@ export default function BlogPage() {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Hero", id: "hero-section" },
{ name: "About", id: "about-section" },
{ name: "Feature", id: "features-section" },
{ name: "Product", id: "products-section" },
{ name: "Testimonial", id: "testimonials-section" },
{ name: "Pricing", id: "pricing-section" },
{ name: "Contact", id: "contact-section" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
]}
button={{ text: "Shop Now", href: "#products-section" }}
button={{ text: "Shop Now", href: "/shop" }}
brandName="Dring Together"
/>
</div>

33
src/app/page.tsx
View File

@@ -71,28 +71,29 @@ export default function SitePage() {
buttonAnimation="slide-up"
dashboard={{
title: "Featured Collection", stats: [
{ title: "Sustainable Materials", values: [100], valueSuffix: "%" },
{ title: "Customer Satisfaction", values: [98], valueSuffix: "%" },
{ title: "Global Shipping", values: [200], valueSuffix: "+ Countries" },
{ title: "Sustainable Materials", values: [100], valueSuffix: "%", description: "Sustainably sourced materials." },
{ title: "Customer Satisfaction", values: [98], valueSuffix: "%", description: "Based on 500+ reviews." },
{ title: "Global Shipping", values: [200], valueSuffix: "+ Countries", description: "Available worldwide." },
],
logoIcon: Coffee,
sidebarItems: [
{ icon: Heart },
{ icon: ShoppingCart },
{ icon: User },
{ icon: Heart, label: "Favorites" },
{ icon: ShoppingCart, label: "Cart" },
{ icon: User, label: "Account" },
],
buttons: [{ text: "View Details", href: "#products-section" }],
listItems: [
{ title: "Ceramic Collection" },
{ title: "Glass Series" },
{ title: "Travel Mugs" },
{ title: "Ceramic Collection", description: "Handcrafted ceramic cups with unique glazes." },
{ title: "Glass Series", description: "Clear, durable glass designs for everyday use." },
{ title: "Travel Mugs", description: "Insulated mugs perfect for on-the-go." },
],
imageSrc: "http://img.b2bpic.net/free-photo/close-up-view-cup-tea-with-flowers-white-surface_141793-13652.jpg", searchPlaceholder: "Search products...", chartTitle: "Customer Ratings", chartData: [
{ name: "5 Stars", value: 85 },
{ name: "4 Stars", value: 10 },
{ name: "3 Stars", value: 5 },
],
listTitle: "Popular Categories", imageAlt: "Featured Dring Together cups collection"}}
listTitle: "Popular Categories", imageAlt: "Featured Dring Together cups collection"
}}
ariaLabel="Hero section showcasing premium drinking cups"
className="bg-white"
containerClassName="relative overflow-hidden"
@@ -126,13 +127,13 @@ export default function SitePage() {
features={[
{
id: "feature-1", title: "Premium Glass Construction", author: "Dring Together", description: "Crafted from high-grade borosilicate glass, our cups offer superior durability and heat resistance. Each piece is carefully designed to maintain your beverage's perfect temperature while providing an elegant drinking experience.", tags: ["Durable", "Heat Resistant", "Elegant"],
imageSrc: "http://img.b2bpic.net/free-photo/still-life-glass-cups_23-2149646448.jpg?_wi=1", imageAlt: "Premium glass cup showcasing its clarity and craftsmanship"},
imageSrc: "http://img.b2bpic.net/free-photo/still-life-glass-cups_23-2149646448.jpg", imageAlt: "Premium glass cup showcasing its clarity and craftsmanship"},
{
id: "feature-2", title: "Ergonomic Design", author: "Dring Together", description: "Our innovative ergonomic grip ensures comfort in every hand. The contoured handle provides a secure hold, making it effortless to carry your favorite hot or cold beverages anywhere.", tags: ["Comfortable", "Secure Grip", "Portable"],
imageSrc: "http://img.b2bpic.net/free-photo/cup-tea-marble-table-with-cinnamon-books-high-quality-photo_114579-67985.jpg?_wi=1", imageAlt: "Hand holding a Dring Together cup with ergonomic grip"},
imageSrc: "http://img.b2bpic.net/free-photo/cup-tea-marble-table-with-cinnamon-books-high-quality-photo_114579-67985.jpg", imageAlt: "Hand holding a Dring Together cup with ergonomic grip"},
{
id: "feature-3", title: "Temperature Control Technology", author: "Dring Together", description: "Advanced double-wall insulation keeps your drinks at the ideal temperature for hours. Whether you're enjoying a steaming latte or refreshing iced tea, every sip remains perfectly balanced.", tags: ["Insulated", "Temperature Control", "Long-lasting"],
imageSrc: "http://img.b2bpic.net/free-photo/still-life-glass-cups_23-2149646448.jpg?_wi=2", imageAlt: "Cup demonstrating temperature control with steam rising from the top"},
imageSrc: "http://img.b2bpic.net/free-photo/still-life-glass-cups_23-2149646448.jpg", imageAlt: "Cup demonstrating temperature control with steam rising from the top"},
]}
animationType="slide-up"
title="Why Choose Dring Together Cups?"
@@ -153,7 +154,7 @@ export default function SitePage() {
{
id: "dring-together-premium-glass", name: "Premium Glass Collection", price: "$49.99", variant: "Clear & Frosted", imageSrc: "http://img.b2bpic.net/free-photo/glasses-arrangement-with-ice-cube_23-2148644612.jpg", imageAlt: "Premium Glass Collection cup set"},
{
id: "dring-together-eco-friendly", name: "Eco-Friendly Bamboo", price: "$39.99", variant: "Natural & Sustainable", imageSrc: "http://img.b2bpic.net/free-photo/cup-tea-marble-table-with-cinnamon-books-high-quality-photo_114579-67985.jpg?_wi=2", imageAlt: "Eco-Friendly Bamboo cup"},
id: "dring-together-eco-friendly", name: "Eco-Friendly Bamboo", price: "$39.99", variant: "Natural & Sustainable", imageSrc: "http://img.b2bpic.net/free-photo/cup-tea-marble-table-with-cinnamon-books-high-quality-photo_114579-67985.jpg", imageAlt: "Eco-Friendly Bamboo cup"},
{
id: "dring-together-thermal-series", name: "Thermal Insulated", price: "$59.99", variant: "Double-Walled Design", imageSrc: "http://img.b2bpic.net/free-photo/silver-aesthetic-wallpaper-with-cup-top-view_23-2149871691.jpg", imageAlt: "Thermal Insulated cup"},
{
@@ -194,13 +195,13 @@ export default function SitePage() {
testimonials={[
{
id: "testimonial-1", name: "Alex Morgan", handle: "@alexmorgan_coffee", testimonial: "The perfect blend of style and functionality. My morning routine has never felt more luxurious.", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-lady-taking-coffee-from-waiter-gesture-thumb-up_114579-92486.jpg?_wi=1", imageAlt: "Alex Morgan holding a Dring Together cup"},
imageSrc: "http://img.b2bpic.net/free-photo/smiling-lady-taking-coffee-from-waiter-gesture-thumb-up_114579-92486.jpg", imageAlt: "Alex Morgan holding a Dring Together cup"},
{
id: "testimonial-2", name: "Jamie Lee", handle: "@jamieleecollects", testimonial: "I've tried many premium cups, but none match the craftsmanship and aesthetic of Dring Together.", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/close-up-couple-spending-time-home_23-2149284102.jpg", imageAlt: "Jamie Lee with her collection of Dring Together cups"},
{
id: "testimonial-3", name: "Taylor Kim", handle: "@taylorkim_tea", testimonial: "The thermal insulation keeps my drinks at the perfect temperature all day long. Highly recommend!", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-lady-taking-coffee-from-waiter-gesture-thumb-up_114579-92486.jpg?_wi=2", imageAlt: "Taylor Kim enjoying a hot beverage from a Dring Together cup"},
imageSrc: "http://img.b2bpic.net/free-photo/smiling-lady-taking-coffee-from-waiter-gesture-thumb-up_114579-92486.jpg", imageAlt: "Taylor Kim enjoying a hot beverage from a Dring Together cup"},
]}
/>
</div>

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";