bender/a6281265-1cd9-43cc-9e25-ff6bb8db2065
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 6 commits from version_2 into main 2026-02-20 13:17:58 +00:00
Conversation 0 Commits 6 Files Changed 6 +38 -24
6 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ export default function BlogPage() {
brandName="Persik"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "#products" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "#about" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
@@ -61,9 +61,9 @@ export default function BlogPage() {
columns={[
{
title: "Shop", items: [
{ label: "Bouquets", href: "#products" },
{ label: "Arrangements", href: "#products" },
{ label: "Gifts", href: "#products" },
{ label: "Bouquets", href: "/shop" },
{ label: "Arrangements", href: "/shop" },
{ label: "Gifts", href: "/shop" },
],
},
{

2
src/app/layout.tsx
View File

@@ -13,7 +13,7 @@ export const metadata: Metadata = {
openGraph: {
title: "Persik Flowers - Fresh Flowers for Every Occasion", description: "Discover exquisite bouquets and arrangements from Persik. Your local flower shop for all occasions, offering fresh flowers and expert floral design.", url: "https://www.persikflowers.com", siteName: "Persik", images: [
{
url: "https://img.b2bpic.net/free-photo/flowers-bouquet-dining-table_1339-1210.jpg", alt: "Beautiful bouquet of fresh flowers"},
url: "https://img.b2bpic.net/free-photo/flowers-bouquet-dining-table_1339-1210.jpg", alt: "Beautiful bouquet of fresh flowers"}
],
type: "website"},
twitter: {

6
src/app/page.tsx
View File

@@ -29,8 +29,8 @@ export default function LandingPage() {
<NavbarStyleApple
brandName="Persik"
navItems={[
{ name: "Home", id: "#hero" },
{ name: "Shop", id: "#products" },
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "#about" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
@@ -138,7 +138,7 @@ export default function LandingPage() {
logoText="Persik Flowers"
copyrightText="© 2024 Persik | All rights reserved"
columns={[
{ title: "Shop", items: [{ label: "Bouquets", href: "#products" }, { label: "Arrangements", href: "#products" }, { label: "Gifts", href: "#products" }] },
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Gifts", href: "/shop" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Testimonials", href: "#testimonials" }, { label: "FAQ", href: "#faq" }] },
{ title: "Support", items: [{ label: "Contact", href: "#contact" }, { label: "Delivery Info", href: "https://example.com/delivery" }, { label: "Privacy Policy", href: "https://example.com/privacy" }] },
]}

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

@@ -67,7 +67,14 @@ export default function ProductPage({ params }: ProductPageProps) {
}, [cartItems, checkout, getCheckoutItems]);
const navbarProps = {
brandName: "Persik", navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }],
brandName: "Persik", navItems: [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "#about" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
{ name: "Contact", id: "#contact" }
],
button: { text: "Cart", onClick: () => setCartOpen(true) },
mobileNavContent: (
<div className="flex flex-col gap-2 mt-4">
@@ -83,7 +90,7 @@ export default function ProductPage({ params }: ProductPageProps) {
const footerProps = {
imageSrc: "https://img.b2bpic.net/free-photo/woman-holds-festive-flower-arrangement-with-bright-chrysanthemum-flowers_169016-51483.jpg?_wi=4", imageAlt: "Soft focus background image of various flowers", logoText: "Persik Flowers", copyrightText: "© 2024 Persik | All rights reserved", columns: [
{ title: "Shop", items: [{ label: "Bouquets", href: "#products" }, { label: "Arrangements", href: "#products" }, { label: "Gifts", href: "#products" }] },
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Gifts", href: "/shop" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Testimonials", href: "#testimonials" }, { label: "FAQ", href: "#faq" }] },
{ title: "Support", items: [{ label: "Contact", href: "#contact" }, { label: "Delivery Info", href: "https://example.com/delivery" }, { label: "Privacy Policy", href: "https://example.com/privacy" }] }
]

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

@@ -42,7 +42,14 @@ export default function ShopPage() {
}, [cartItems, checkout, getCheckoutItems]);
const navbarProps = {
brandName: "Persik", navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }],
brandName: "Persik", navItems: [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "#about" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
{ name: "Contact", id: "#contact" }
],
button: { text: "Cart", onClick: () => setCartOpen(true) },
mobileNavContent: (
<div className="flex flex-col gap-2 mt-4">
@@ -58,7 +65,7 @@ export default function ShopPage() {
const footerProps = {
imageSrc: "https://img.b2bpic.net/free-photo/woman-holds-festive-flower-arrangement-with-bright-chrysanthemum-flowers_169016-51483.jpg?_wi=3", imageAlt: "Soft focus background image of various flowers", logoText: "Persik Flowers", copyrightText: "© 2024 Persik | All rights reserved", columns: [
{ title: "Shop", items: [{ label: "Bouquets", href: "#products" }, { label: "Arrangements", href: "#products" }, { label: "Gifts", href: "#products" }] },
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Gifts", href: "/shop" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Testimonials", href: "#testimonials" }, { label: "FAQ", href: "#faq" }] },
{ title: "Support", items: [{ label: "Contact", href: "#contact" }, { label: "Delivery Info", href: "https://example.com/delivery" }, { label: "Privacy Policy", href: "https://example.com/privacy" }] }
]

24
src/app/styles/variables.css
View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #fffafa;;
--card: #fff7f7;;
--foreground: #1a0000;;
--primary-cta: #e63946;;
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #159c49;;
--secondary-cta: #ffffff;;
--accent: #f5c4c7;;
--background-accent: #f09199;; */
--accent: #6139e6;;
--background-accent: #a8e8ba;; */
--background: #fffafa;;
--card: #fff7f7;;
--foreground: #1a0000;;
--primary-cta: #e63946;;
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #159c49;;
--secondary-cta: #ffffff;;
--accent: #f5c4c7;;
--background-accent: #f09199;;
--accent: #6139e6;;
--background-accent: #a8e8ba;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);