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

Merge version_12 into main #14

Merged
bender merged 6 commits from version_12 into main 2026-06-07 13:52:31 +00:00
Conversation 0 Commits 6 Files Changed 6 +24 -68
6 changed files with 24 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import ContactText from '@/components/sections/contact/ContactText';
import FeatureCardTwentyThree from '@/components/sections/feature/FeatureCardTwentyThree';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
@@ -107,17 +107,10 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
<FooterBaseReveal
logoText="K&K Solution Inc."
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"
columnTitleClassName="text-[#C9A961] font-semibold mb-4"
columnItemClassName="text-[#C9A961] hover:text-[#FAF4E6] text-base mb-2"
copyrightTextClassName="text-[#D8C896] text-sm mt-8"
containerClassName="max-w-screen-xl mx-auto px-4"
columnsClassName="grid grid-cols-2 md:grid-cols-2 gap-8 lg:gap-12"
/>
</div>
</ReactLenis>

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

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import ContactText from '@/components/sections/contact/ContactText';
import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
@@ -104,17 +104,10 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
<FooterBaseReveal
logoText="K&K Solution Inc."
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"
columnTitleClassName="text-[#C9A961] font-semibold mb-4"
columnItemClassName="text-[#C9A961] hover:text-[#FAF4E6] text-base mb-2"
copyrightTextClassName="text-[#D8C896] text-sm mt-8"
containerClassName="max-w-screen-xl mx-auto px-4"
columnsClassName="grid grid-cols-2 md:grid-cols-2 gap-8 lg:gap-12"
/>
</div>
</ReactLenis>

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

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import ContactText from '@/components/sections/contact/ContactText';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
@@ -104,17 +104,10 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
<FooterBaseReveal
logoText="K&K Solution Inc."
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"
columnTitleClassName="text-[#C9A961] font-semibold mb-4"
columnItemClassName="text-[#C9A961] hover:text-[#FAF4E6] text-base mb-2"
copyrightTextClassName="text-[#D8C896] text-sm mt-8"
containerClassName="max-w-screen-xl mx-auto px-4"
columnsClassName="grid grid-cols-2 md:grid-cols-2 gap-8 lg:gap-12"
/>
</div>
</ReactLenis>

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

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import ContactText from '@/components/sections/contact/ContactText';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import TeamCardEleven from '@/components/sections/team/TeamCardEleven';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
@@ -114,17 +114,10 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
<FooterBaseReveal
logoText="K&K Solution Inc."
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"
columnTitleClassName="text-[#C9A961] font-semibold mb-4"
columnItemClassName="text-[#C9A961] hover:text-[#FAF4E6] text-base mb-2"
copyrightTextClassName="text-[#D8C896] text-sm mt-8"
containerClassName="max-w-screen-xl mx-auto px-4"
columnsClassName="grid grid-cols-2 md:grid-cols-2 gap-8 lg:gap-12"
/>
</div>
</ReactLenis>

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

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import ContactText from '@/components/sections/contact/ContactText';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
@@ -83,17 +83,10 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
<FooterBaseReveal
logoText="K&K Solution Inc."
columns={consistentFooterColumns}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"
columnTitleClassName="text-[#C9A961] font-semibold mb-4"
columnItemClassName="text-[#C9A961] hover:text-[#FAF4E6] text-base mb-2"
copyrightTextClassName="text-[#D8C896] text-sm mt-8"
containerClassName="max-w-screen-xl mx-auto px-4"
columnsClassName="grid grid-cols-2 md:grid-cols-2 gap-8 lg:gap-12"
/>
</div>
</ReactLenis>

37
src/app/insights/page.tsx
View File

@@ -4,9 +4,20 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
import ContactText from '@/components/sections/contact/ContactText';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
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" },
];
export default function LandingPage() {
return (
<ThemeProvider
@@ -24,20 +35,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>
@@ -74,7 +72,7 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
<FooterBaseReveal
logoText="K&K Solution Inc."
columns={[
{
@@ -95,13 +93,6 @@ export default function LandingPage() {
}
]}
copyrightText="© 2026 K&K Solution Inc."
className="bg-[#6B0F1A] border-t border-[#C9A961] py-8"
logoTextClassName="text-[#FAF4E6] text-xl font-bold"
columnTitleClassName="text-[#C9A961] font-semibold mb-4"
columnItemClassName="text-[#C9A961] hover:text-[#FAF4E6] text-base mb-2"
copyrightTextClassName="text-[#D8C896] text-sm mt-8"
containerClassName="max-w-screen-xl mx-auto px-4"
columnsClassName="grid grid-cols-2 md:grid-cols-2 gap-8 lg:gap-12"
/>
</div>
</ReactLenis>