bender/a3146715-8831-4b16-997d-df8a9058940c
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_7 into main #19

Merged
bender merged 3 commits from version_7 into main 2026-03-09 21:54:19 +00:00
Conversation 0 Commits 3 Files Changed 3 +24 -37
3 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
"use client";
import { ThemeProvider } from "@/components/theme/ThemeProvider";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import { useState } from "react";
@@ -42,13 +42,15 @@ export default function ContactPage() {
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Contact", id: "/contact" },
]}
brandName="Vortex"
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Contact", id: "/contact" },
]}
brandName="Vortex"
/>
</div>
<div id="contact" data-section="contact" className="min-h-screen bg-background py-20 px-4">
<div className="max-w-7xl mx-auto">

25
src/app/layout.tsx
View File

@@ -1,12 +1,8 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.css";
const inter = Inter({ subsets: ["latin"] });
import "./styles/globals.css";
export const metadata: Metadata = {
title: "Vortex Web - Design & Marketing Studio", description: "Innovative design and marketing solutions for modern brands"
};
title: "Vortex", description: "Innovative design and marketing solutions for modern brands"};
export default function RootLayout({
children,
@@ -14,21 +10,8 @@ export default function RootLayout({
children: React.ReactNode;
}) {
return (
<html lang="en" suppressHydrationWarning>
<body className={inter.className}>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
if (localStorage.getItem('theme') === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
document.documentElement.classList.add('dark')
} else {
document.documentElement.classList.remove('dark')
}
`,
}}
/>
<html lang="en">
<body>{children}
<script
dangerouslySetInnerHTML={{
__html: `

18
src/app/page.tsx
View File

@@ -1,6 +1,6 @@
"use client";
import { ThemeProvider } from "@/components/theme/ThemeProvider";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import HeroLogo from "@/components/sections/hero/HeroLogo";
@@ -18,13 +18,15 @@ export default function Home() {
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Contact", id: "/contact" },
]}
brandName="Vortex"
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Contact", id: "/contact" },
]}
brandName="Vortex"
/>
</div>
<div id="hero" data-section="hero">
<HeroLogo
logoText="Vortex"