bender/e48b6145-3a15-480d-8744-c5a17f10d7bb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-13 15:29:31 +00:00
Conversation 0 Commits 4 Files Changed 4 +35 -12
4 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,8 @@ export default function BlogPage() {
{ name: "Home", id: "/" },
{ name: "What We Do", id: "about" },
{ name: "Work", id: "case-studies" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Let's Talk", href: "contact" }}
className="fixed top-4 left-4 right-4 z-50"
@@ -64,9 +65,11 @@ export default function BlogPage() {
columns={[
{
title: "Company", items: [
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Work", href: "case-studies" },
{ label: "Contact", href: "contact" }
{ label: "Contact", href: "contact" },
{ label: "Shop", href: "/shop" }
]
},
{

8
src/app/page.tsx
View File

@@ -29,7 +29,9 @@ export default function HomePage() {
navItems={[
{ name: "What We Do", id: "about" },
{ name: "Work", id: "case-studies" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Let's Talk", href: "contact" }}
className="fixed top-4 left-4 right-4 z-50"
@@ -118,7 +120,9 @@ export default function HomePage() {
title: "Company", items: [
{ label: "About", href: "about" },
{ label: "Work", href: "case-studies" },
{ label: "Contact", href: "contact" }
{ label: "Contact", href: "contact" },
{ label: "Blog", href: "/blog" },
{ label: "Shop", href: "/shop" }
]
},
{

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

@@ -90,6 +90,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "What We Do", id: "about" },
{ name: "Work", id: "case-studies" },
{ name: "Contact", id: "contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -106,9 +107,12 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Company", items: [
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Work", href: "case-studies" },
{ label: "Contact", href: "contact" }
{ label: "Contact", href: "contact" },
{ label: "Blog", href: "/blog" },
{ label: "Shop", href: "/shop" }
]
},
{
@@ -156,6 +160,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "What We Do", id: "about" },
{ name: "Work", id: "case-studies" },
{ name: "Contact", id: "contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -180,9 +185,12 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Company", items: [
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Work", href: "case-studies" },
{ label: "Contact", href: "contact" }
{ label: "Contact", href: "contact" },
{ label: "Blog", href: "/blog" },
{ label: "Shop", href: "/shop" }
]
},
{
@@ -229,6 +237,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "What We Do", id: "about" },
{ name: "Work", id: "case-studies" },
{ name: "Contact", id: "contact" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -263,16 +272,19 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Company", items: [
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Work", href: "case-studies" },
{ label: "Contact", href: "contact" }
{ label: "Contact", href: "contact" },
{ label: "Blog", href: "/blog" },
{ label: "Shop", href: "/shop" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "https://example.com/privacy" },
{ label: "Terms of Service", href: "https://example.com/terms" }
}
]
},
{
title: "Connect", items: [

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

@@ -42,7 +42,7 @@ export default function ShopPage() {
{ name: "What We Do", id: "about" },
{ name: "Work", id: "case-studies" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Blog", id: "/blog" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="fixed top-4 left-4 right-4 z-50"
@@ -58,9 +58,11 @@ export default function ShopPage() {
columns={[
{
title: "Company", items: [
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Work", href: "case-studies" },
{ label: "Contact", href: "contact" }
{ label: "Contact", href: "contact" },
{ label: "Blog", href: "/blog" }
]
},
{
@@ -107,7 +109,7 @@ export default function ShopPage() {
{ name: "What We Do", id: "about" },
{ name: "Work", id: "case-studies" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Blog", id: "/blog" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="fixed top-4 left-4 right-4 z-50"
@@ -131,9 +133,11 @@ export default function ShopPage() {
columns={[
{
title: "Company", items: [
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Work", href: "case-studies" },
{ label: "Contact", href: "contact" }
{ label: "Contact", href: "contact" },
{ label: "Blog", href: "/blog" }
]
},
{