Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
2026-01-22 20:03:35 +00:00
4 changed files with 21 additions and 20 deletions

View File

@@ -79,7 +79,8 @@ export default function BlogPage() {
const url = `${apiUrl}/posts/${projectId}?status=published`;
const response = await fetch(url, {
method: "GET", headers: {
"Content-Type": "application/json"},
"Content-Type": "application/json"
},
});
if (response.ok) {
@@ -152,7 +153,7 @@ export default function BlogPage() {
)}
<FooterMedia
imageSrc="asset://bakery-storefront"
imageSrc="https://img.b2bpic.net/free-photo/delicious-donut-shop-ai-generated_23-2150694732.jpg"
imageAlt="Artisan Bakery storefront"
logoText="Artisan Bakery"
copyrightText="© 2025 Artisan Bakery. All rights reserved."
@@ -184,4 +185,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #fcf6ec;;
--card: #f3ede2;;
--foreground: #2e2521;;
--primary-cta: #2e2521;;
--secondary-cta: #ffffff;;
--accent: #b2a28b;;
--background-accent: #b2a28b;; */
/* --background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffe6cce6;;
--primary-cta: #d4a574;;
--secondary-cta: #1a1a1a;;
--accent: #b8860b;;
--background-accent: #5a4a2a;; */
--background: #fcf6ec;;
--card: #f3ede2;;
--foreground: #2e2521;;
--primary-cta: #2e2521;;
--secondary-cta: #ffffff;;
--accent: #b2a28b;;
--background-accent: #b2a28b;;
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffe6cce6;;
--primary-cta: #d4a574;;
--secondary-cta: #1a1a1a;;
--accent: #b8860b;;
--background-accent: #5a4a2a;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

View File

@@ -1264,4 +1264,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -211,4 +211,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}