bender/377eed22-4cd1-40e5-b6a8-4e4511482e66
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #7

Merged
bender merged 6 commits from version_2 into main 2026-02-20 09:53:29 +00:00
Conversation 0 Commits 6 Files Changed 6 +30 -35
6 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ export default function BlogPage() {
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
@@ -68,4 +68,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/layout.tsx
View File

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

2
src/app/page.tsx
View File

@@ -208,4 +208,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -84,12 +84,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Gallery", id: "testimonials" },
{ name: "Shop", id: "/shop" }
{ name: "Gallery", id: "testimonials" }
]}
brandName="Pandas"
bottomLeftText="Artisan Floral Design"
@@ -130,12 +129,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Gallery", id: "testimonials" },
{ name: "Shop", id: "/shop" }
{ name: "Gallery", id: "testimonials" }
]}
brandName="Pandas"
bottomLeftText="Artisan Floral Design"
@@ -183,12 +181,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Gallery", id: "testimonials" },
{ name: "Shop", id: "/shop" }
{ name: "Gallery", id: "testimonials" }
]}
brandName="Pandas"
bottomLeftText="Artisan Floral Design"
@@ -242,4 +239,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -37,12 +37,11 @@ export default function ShopPage() {
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Gallery", id: "testimonials" },
{ name: "Shop", id: "/shop" }
{ name: "Gallery", id: "testimonials" }
]}
brandName="Pandas"
bottomLeftText="Artisan Floral Design"
@@ -82,12 +81,11 @@ export default function ShopPage() {
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Gallery", id: "testimonials" },
{ name: "Shop", id: "/shop" }
{ name: "Gallery", id: "testimonials" }
]}
brandName="Pandas"
bottomLeftText="Artisan Floral Design"
@@ -116,4 +114,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #6139e6;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
/* --background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #6139e6;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);