From f2221815c8c9edefa675e31b4e861bb4a9d194f4 Mon Sep 17 00:00:00 2001 From: Thatsaphorn Atchariyaphap Date: Sun, 20 Apr 2025 09:42:40 +0000 Subject: [PATCH] Merge branch 'homepage-refactoring-pt4' into 'dev' Homepage refactoring pt4 See merge request rheinsw/website!31 --- app/about/layout.tsx | 37 ++++ app/about/page.tsx | 12 ++ components/About/AboutContent.tsx | 47 ++++++ components/About/Section/AboutHero.tsx | 19 +++ components/About/Section/AboutIntro.tsx | 68 ++++++++ components/About/Section/AboutProcess.tsx | 158 ++++++++++++++++++ components/About/Section/AboutTimeline.tsx | 94 +++++++++++ components/About/Section/TeamSection.tsx | 97 +++++++++++ components/Contact/Contact.tsx | 111 +++--------- .../Contact/Section/ContactFormSection.tsx | 101 +++++++++++ components/Contact/Section/ContactHero.tsx | 19 +++ components/Helper/SmallHero.tsx | 72 +++++--- components/Home/Home.tsx | 7 +- components/Home/Sections/ContactCTA.tsx | 27 +-- components/Navbar/DesktopNav.tsx | 23 +-- components/Services/Section/OverviewTabs.tsx | 45 +++-- components/Services/Section/ServiceHero.tsx | 29 +--- .../Services/Section/overview/BugFixing.tsx | 25 +-- .../Services/Section/overview/Consulting.tsx | 2 +- .../Services/Section/overview/Development.tsx | 2 +- .../Section/overview/ManagedServices.tsx | 2 +- components/Services/Services.tsx | 6 +- constant/Constant.ts | 5 + public/images/team/default-avatar.jpg | Bin 0 -> 14051 bytes 24 files changed, 797 insertions(+), 211 deletions(-) create mode 100644 app/about/layout.tsx create mode 100644 app/about/page.tsx create mode 100644 components/About/AboutContent.tsx create mode 100644 components/About/Section/AboutHero.tsx create mode 100644 components/About/Section/AboutIntro.tsx create mode 100644 components/About/Section/AboutProcess.tsx create mode 100644 components/About/Section/AboutTimeline.tsx create mode 100644 components/About/Section/TeamSection.tsx create mode 100644 components/Contact/Section/ContactFormSection.tsx create mode 100644 components/Contact/Section/ContactHero.tsx create mode 100644 public/images/team/default-avatar.jpg diff --git a/app/about/layout.tsx b/app/about/layout.tsx new file mode 100644 index 0000000..ffa5db9 --- /dev/null +++ b/app/about/layout.tsx @@ -0,0 +1,37 @@ +import type {Metadata} from "next"; +import "../globals.css"; + +import Nav from "@/components/Navbar/Nav"; +import Footer from "@/components/Footer/Footer"; +import {ThemeProvider} from "@/components/provider/ThemeProvider"; +import React from "react"; +import {cookies} from "next/headers"; +import {themeColors} from "@/components/Helper/ThemeColors"; + +export const metadata: Metadata = { + title: "Über Uns | Rhein Software", + description: "Rhein Software Development", +}; + +export default async function RootLayout({ + children, + }: Readonly<{ + children: React.ReactNode; +}>) { + const cookieStore = await cookies(); + const theme = cookieStore.get("theme")?.value === "dark" ? "dark" : "light"; + const bgColor = themeColors[theme].primaryBg; + + return ( + + + + +