bender/550a4828-10b0-4533-8a9f-50073e0f8735
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 5 commits from version_1 into main 2026-02-22 22:27:00 +00:00
Conversation 0 Commits 5 Files Changed 4 +32 -32
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,13 +28,13 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Смачна Випічка"
button={{ text: "Order Now", href: "#products" }}
button={{ text: "Order Now", href: "/#products" }}
className="py-4 px-6"
buttonClassName="px-5 py-2"
buttonTextClassName="font-medium"
@@ -61,27 +61,27 @@ export default function BlogPage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg"
imageAlt="Rustic fabric or dough texture as footer background."
logoText="Смачна Випічка"
columns={[
{
title: "Menu", items: [
{ label: "Breads", href: "#products" },
{ label: "Pastries", href: "#products" },
{ label: "Custom Cakes", href: "#contact" },
{ label: "Breads", href: "/#products" },
{ label: "Pastries", href: "/#products" },
{ label: "Custom Cakes", href: "/#contact" },
],
},
{
title: "About Us", items: [
{ label: "Our Story", href: "#about" },
{ label: "Reviews", href: "#testimonials" },
{ label: "Our Story", href: "/#about" },
{ label: "Reviews", href: "/#testimonials" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact", href: "#contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
],
},
]}

4
src/app/page.tsx
View File

@@ -27,7 +27,7 @@ export default function SitePage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "home" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Testimonials", id: "testimonials" },
@@ -185,7 +185,7 @@ export default function SitePage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg"
imageAlt="Rustic fabric or dough texture as footer background."
logoText="Смачна Випічка"
columns={[

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

@@ -1,6 +1,6 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { Suspense, useCallback } from "react";
import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -13,7 +13,7 @@ import { useCheckout } from "@/hooks/useCheckout";
import FooterMedia from '@/components/sections/footer/FooterMedia';
interface ProductPageProps {
params: Promise<{ id: string }>;
params: { id: string };
}
export default function ProductPage({ params }: ProductPageProps) {
@@ -25,7 +25,7 @@ export default function ProductPage({ params }: ProductPageProps) {
}
function ProductPageContent({ params }: ProductPageProps) {
const { id } = use(params);
const { id } = params;
const router = useRouter();
const {
@@ -93,13 +93,13 @@ function ProductPageContent({ params }: ProductPageProps) {
const footerComponent = (
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg?_wi=5"
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg"
imageAlt="Rustic fabric or dough texture as footer background."
logoText="Смачна Випічка"
columns={[
{ title: "Menu", items: [{ label: "Breads", href: "#products" }, { label: "Pastries", href: "#products" }, { label: "Custom Cakes", href: "#contact" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }] },
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }] }
{ title: "Menu", items: [{ label: "Breads", href: "/#products" }, { label: "Pastries", href: "/#products" }, { label: "Custom Cakes", href: "/#contact" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Reviews", href: "/#testimonials" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] }
]}
copyrightText="© 2024 Смачна Випічка. All rights reserved."
mediaClassName="opacity-60"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense } from "react";
import ReactLenis from "lenis/react";
@@ -50,13 +50,13 @@ function ShopPageContent() {
</main>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg?_wi=3"
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg"
imageAlt="Rustic fabric or dough texture as footer background."
logoText="Смачна Випічка"
columns={[
{ title: "Menu", items: [{ label: "Breads", href: "#products" }, { label: "Pastries", href: "#products" }, { label: "Custom Cakes", href: "#contact" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }] },
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }] }
{ title: "Menu", items: [{ label: "Breads", href: "/#products" }, { label: "Pastries", href: "/#products" }, { label: "Custom Cakes", href: "/#contact" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Reviews", href: "/#testimonials" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] }
]}
copyrightText="© 2024 Смачна Випічка. All rights reserved."
mediaClassName="opacity-60"
@@ -113,13 +113,13 @@ function ShopPageContent() {
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg?_wi=4"
imageSrc="https://img.b2bpic.net/free-photo/ripe-big-pumpkin-burlap_114579-29487.jpg"
imageAlt="Rustic fabric or dough texture as footer background."
logoText="Смачна Випічка"
columns={[
{ title: "Menu", items: [{ label: "Breads", href: "#products" }, { label: "Pastries", href: "#products" }, { label: "Custom Cakes", href: "#contact" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }] },
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }] }
{ title: "Menu", items: [{ label: "Breads", href: "/#products" }, { label: "Pastries", href: "/#products" }, { label: "Custom Cakes", href: "/#contact" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Reviews", href: "/#testimonials" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] }
]}
copyrightText="© 2024 Смачна Випічка. All rights reserved."
mediaClassName="opacity-60"