Gitlab-Migration/rhein-sw-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'homepage-refactoring' into 'dev'

Browse Source 
Homepage Refactoring - Pt .3

See merge request rheinsw/website!28
This commit is contained in:
Thatsaphorn
2025-04-16 17:37:41 +00:00
parent 66cdadea16
commit 5c60594a4f
36 changed files with 896 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/(root)/layout.tsx
View File

@@ -6,6 +6,7 @@ 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: "Rhein Software",
@@ -19,11 +20,12 @@ export default async function RootLayout({
}>) {
const cookieStore = await cookies();
const theme = cookieStore.get("theme")?.value === "dark" ? "dark" : "light";
const bgColor = themeColors[theme].primaryBg;
return (
<html lang="de" data-theme={theme}>
<head/>
<body className="antialiased" style={{backgroundColor: "var(--primary-bg)"}}>
<body className="antialiased" style={{backgroundColor: bgColor}}>
<ThemeProvider>
<Nav/>
{children}

6
app/contact/layout.tsx
View File

@@ -6,9 +6,10 @@ 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: "Rhein Software",
title: "Kontakt | Rhein Software",
description: "Rhein Software Development",
};
@@ -19,11 +20,12 @@ export default async function RootLayout({
}>) {
const cookieStore = await cookies();
const theme = cookieStore.get("theme")?.value === "dark" ? "dark" : "light";
const bgColor = themeColors[theme].primaryBg;
return (
<html lang="de" data-theme={theme}>
<head/>
<body className="antialiased" style={{backgroundColor: "var(--primary-bg)"}}>
<body className="antialiased" style={{backgroundColor: bgColor}}>
<ThemeProvider>
<Nav/>
{children}

21
app/globals.css
View File

@@ -13,27 +13,6 @@
transition: background-color 0.7s ease, color 0.7s ease;
}
/* Light mode */
/* Light mode */
[data-theme="light"] {
--primary-bg: #FAFAFA; /* Soft off-white background */
--secondary-bg: #F5F5F7; /* Gentle off-white for subtle separation */
--primary-text: #2E2E2E; /* Dark grey text for clear readability */
--secondary-text: #595959; /* Medium grey for less prominent text */
--nav-bg: #F8F8F8; /* Light grey navigation background */
--footer-bg: #E0E0E0; /* Slightly darker grey for footer contrast */
}
/* Dark mode */
[data-theme="dark"] {
--primary-bg: #2C2C2C; /* Modern dark grey background */
--secondary-bg: #333333; /* A touch lighter grey for section differentiation */
--primary-text: #E0E0E0; /* Light grey text for optimal readability */
--secondary-text: #B0B0B0; /* Medium grey for secondary text elements */
--nav-bg: #272727; /* Subtle variation for the navigation area */
--footer-bg: #242424; /* Deep grey footer to add visual depth */
}
@keyframes float {
0%, 100% {
transform: translateY(0);

7
app/legal/layout.tsx
View File

@@ -6,9 +6,10 @@ 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: "Rhein Software",
title: "Rechtliches | Rhein Software",
description: "Rhein Software Development",
};
@@ -19,11 +20,12 @@ export default async function RootLayout({
}>) {
const cookieStore = await cookies();
const theme = cookieStore.get("theme")?.value === "dark" ? "dark" : "light";
const bgColor = themeColors[theme].primaryBg;
return (
<html lang="de" data-theme={theme}>
<head/>
<body className="antialiased" style={{backgroundColor: "var(--primary-bg)"}}>
<body className="antialiased" style={{backgroundColor: bgColor}}>
<ThemeProvider>
<Nav/>
{children}
@@ -33,3 +35,4 @@ export default async function RootLayout({
</html>
);
}

6
app/services/layout.tsx
View File

@@ -6,9 +6,10 @@ 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: "Rhein Software",
title: "Leistungen | Rhein Software",
description: "Rhein Software Development",
};
@@ -19,11 +20,12 @@ export default async function RootLayout({
}>) {
const cookieStore = await cookies();
const theme = cookieStore.get("theme")?.value === "dark" ? "dark" : "light";
const bgColor = themeColors[theme].primaryBg;
return (
<html lang="de" data-theme={theme}>
<head/>
<body className="antialiased" style={{backgroundColor: "var(--primary-bg)"}}>
<body className="antialiased" style={{backgroundColor: bgColor}}>
<ThemeProvider>
<Nav/>
{children}

4
app/services/page.tsx
View File

@@ -1,10 +1,10 @@
import React from 'react';
import Contact from "@/components/Contact/Contact";
import Services from "@/components/Services/Services";
const ContactPage = () => {
return (
<div>
<Contact/>
<Services/>
</div>
);
};