bender/2e0b8b4c-1c17-44dd-bd18-346a5aefc3f9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

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

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

@@ -17,7 +17,7 @@ export default function BlogPage() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -91,4 +91,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/layout.tsx
View File

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

4
src/app/page.tsx
View File

@@ -21,7 +21,7 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -309,4 +309,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -82,7 +82,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -97,8 +97,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -151,7 +150,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -166,8 +165,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -227,7 +225,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -242,8 +240,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -319,4 +316,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -25,7 +25,7 @@ function ShopPageContent() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -40,8 +40,7 @@ function ShopPageContent() {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -93,7 +92,7 @@ function ShopPageContent() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -108,8 +107,7 @@ function ShopPageContent() {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -168,4 +166,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}