bender/39d3f701-7e64-4539-ba34-e61849658e82
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_11 into main #13

Merged
bender merged 5 commits from version_11 into main 2026-06-07 13:38:58 +00:00
Conversation 0 Commits 5 Files Changed 5 +160 -168
5 changed files with 160 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/app/approach/page.tsx
View File

@@ -8,6 +8,36 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
const consistentNavItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Approach", id: "/approach" },
{ name: "Company", id: "/company" },
{ name: "Cases", id: "/cases" },
{ name: "Insights", id: "/insights" },
{ name: "Careers", id: "/careers" },
{ name: "Contact", id: "/contact" },
];
const consistentFooterColumns = [
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
];
export default function LandingPage() {
return (
<ThemeProvider
@@ -25,24 +55,7 @@ export default function LandingPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{
name: "Home", id: "/"},
{
name: "Services", id: "/services"},
{
name: "Approach", id: "/approach"},
{
name: "Company", id: "/company"},
{
name: "Cases", id: "/cases"},
{
name: "Insights", id: "/insights"},
{
name: "Careers", id: "/careers"},
{
name: "Contact", id: "/contact"},
]}
navItems={consistentNavItems}
brandName="K&K Solution Inc."
/>
</div>
@@ -96,24 +109,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="K&K Solution Inc."
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
]}
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"

64
src/app/careers/page.tsx
View File

@@ -8,6 +8,36 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
const consistentNavItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Approach", id: "/approach" },
{ name: "Company", id: "/company" },
{ name: "Cases", id: "/cases" },
{ name: "Insights", id: "/insights" },
{ name: "Careers", id: "/careers" },
{ name: "Contact", id: "/contact" },
];
const consistentFooterColumns = [
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
];
export default function LandingPage() {
return (
<ThemeProvider
@@ -25,20 +55,7 @@ export default function LandingPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{
name: "Home", id: "/"},
{
name: "Services", id: "/services"},
{
name: "Company", id: "/company"},
{
name: "Insights", id: "/insights"},
{
name: "Careers", id: "/careers"},
{
name: "Contact", id: "/contact"},
]}
navItems={consistentNavItems}
brandName="K&K Solution Inc."
/>
</div>
@@ -89,24 +106,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="K&K Solution Inc."
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
]}
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"

68
src/app/cases/page.tsx
View File

@@ -7,6 +7,36 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
const consistentNavItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Approach", id: "/approach" },
{ name: "Company", id: "/company" },
{ name: "Cases", id: "/cases" },
{ name: "Insights", id: "/insights" },
{ name: "Careers", id: "/careers" },
{ name: "Contact", id: "/contact" },
];
const consistentFooterColumns = [
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
];
export default function LandingPage() {
return (
<ThemeProvider
@@ -24,24 +54,7 @@ export default function LandingPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{
name: "Home", id: "/"},
{
name: "Services", id: "/services"},
{
name: "Approach", id: "/approach"},
{
name: "Company", id: "/company"},
{
name: "Cases", id: "/cases"},
{
name: "Insights", id: "/insights"},
{
name: "Careers", id: "/careers"},
{
name: "Contact", id: "/contact"}
]}
navItems={consistentNavItems}
brandName="K&K Solution Inc."
/>
</div>
@@ -93,24 +106,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="K&K Solution Inc."
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
]}
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"

64
src/app/company/page.tsx
View File

@@ -8,6 +8,36 @@ import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleAp
import TeamCardEleven from '@/components/sections/team/TeamCardEleven';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
const consistentNavItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Approach", id: "/approach" },
{ name: "Company", id: "/company" },
{ name: "Cases", id: "/cases" },
{ name: "Insights", id: "/insights" },
{ name: "Careers", id: "/careers" },
{ name: "Contact", id: "/contact" },
];
const consistentFooterColumns = [
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
];
export default function LandingPage() {
return (
<ThemeProvider
@@ -25,20 +55,7 @@ export default function LandingPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{
name: "Home", id: "/"},
{
name: "Services", id: "/services"},
{
name: "Company", id: "/company"},
{
name: "Insights", id: "/insights"},
{
name: "Careers", id: "/careers"},
{
name: "Contact", id: "/contact"},
]}
navItems={consistentNavItems}
brandName="K&K Solution Inc."
/>
</div>
@@ -99,24 +116,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="K&K Solution Inc."
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
]}
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"

64
src/app/contact/page.tsx
View File

@@ -7,6 +7,36 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
const consistentNavItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Approach", id: "/approach" },
{ name: "Company", id: "/company" },
{ name: "Cases", id: "/cases" },
{ name: "Insights", id: "/insights" },
{ name: "Careers", id: "/careers" },
{ name: "Contact", id: "/contact" },
];
const consistentFooterColumns = [
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
];
export default function LandingPage() {
return (
<ThemeProvider
@@ -24,20 +54,7 @@ export default function LandingPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{
name: "Home", id: "/"},
{
name: "Services", id: "/services"},
{
name: "Company", id: "/company"},
{
name: "Insights", id: "/insights"},
{
name: "Careers", id: "/careers"},
{
name: "Contact", id: "/contact"},
]}
navItems={consistentNavItems}
brandName="K&K Solution Inc."
/>
</div>
@@ -68,24 +85,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="K&K Solution Inc."
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Company", href: "/company" },
{ label: "Insights", href: "/insights" },
{ label: "Careers", href: "/careers" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Legal", items: [
{ label: "Privacy Policy", href: "#privacy" },
{ label: "Terms of Service", href: "#terms" }
]
}
]}
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"