13 Commits

Author SHA1 Message Date
ec6448b4d6 Merge version_14 into main
Merge version_14 into main
2026-06-10 20:05:00 +00:00
e2629ae1c6 Update theme fonts 2026-06-10 20:04:54 +00:00
eeda946015 Update theme fonts 2026-06-10 20:04:54 +00:00
363594589c Merge version_14 into main
Merge version_14 into main
2026-06-10 20:04:42 +00:00
5790095f2c Update theme fonts 2026-06-10 20:04:39 +00:00
a06a3ca757 Update theme fonts 2026-06-10 20:04:39 +00:00
4a623aef1f Merge version_14 into main
Merge version_14 into main
2026-06-10 20:04:30 +00:00
8fcc63222b Update theme fonts 2026-06-10 20:04:27 +00:00
a3b8a196e9 Update theme fonts 2026-06-10 20:04:26 +00:00
ad69fdb378 Merge version_14 into main
Merge version_14 into main
2026-06-10 19:40:06 +00:00
db4ad2d54b Update src/app/contact/page.tsx 2026-06-10 19:40:03 +00:00
4e20e5b519 Update src/app/about/page.tsx 2026-06-10 19:40:03 +00:00
73c5ba8be4 Merge version_13 into main
Merge version_13 into main
2026-06-10 19:31:43 +00:00
4 changed files with 87 additions and 77 deletions

View File

@@ -9,6 +9,41 @@ import FooterBase from "@/components/sections/footer/FooterBase";
import { Clock, Sparkles, Star } from "lucide-react"; import { Clock, Sparkles, Star } from "lucide-react";
export default function AboutPage() { export default function AboutPage() {
const commonNavItems = [
{ name: "Domov", id: "/" },
{ name: "Práca", id: "/#work" },
{ name: "Služby", id: "/services" },
{ name: "O nás", id: "/about" },
{ name: "Kontakt", id: "/contact" }
];
const commonFooterColumnsEnglish = [
{
title: "Company", items: [
{ label: "About", href: "/about" },
{ label: "Services", href: "/services" },
{ label: "Work", href: "/#work" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Services", items: [
{ label: "Web Development", href: "/services" },
{ label: "SEO", href: "/services" },
{ label: "Branding", href: "/services" },
{ label: "UI/UX Design", href: "/services" }
]
},
{
title: "Connect", items: [
{ label: "Twitter", href: "/#" },
{ label: "LinkedIn", href: "/#" },
{ label: "Instagram", href: "/#" },
{ label: "Dribbble", href: "/#" }
]
}
];
return ( return (
<ThemeProvider <ThemeProvider
defaultButtonVariant="text-stagger" defaultButtonVariant="text-stagger"
@@ -25,13 +60,7 @@ export default function AboutPage() {
<ReactLenis root> <ReactLenis root>
<NavbarLayoutFloatingOverlay <NavbarLayoutFloatingOverlay
brandName="Grow With Social" brandName="Grow With Social"
navItems={[ navItems={commonNavItems}
{ name: "Domov", id: "/" },
{ name: "Práca", id: "/#work" },
{ name: "Služby", id: "/services" },
{ name: "O nás", id: "/about" },
{ name: "Kontakt", id: "/contact" }
]}
/> />
<AboutMetric <AboutMetric
@@ -50,34 +79,9 @@ export default function AboutPage() {
<FooterBase <FooterBase
logoText="Grow With Social" logoText="Grow With Social"
copyrightText="© 2026 | Grow With Social" copyrightText="© 2026 | Grow With Social"
columns={[ columns={commonFooterColumnsEnglish}
{
title: "Company", items: [
{ label: "About", href: "/about" },
{ label: "Services", href: "/services" },
{ label: "Work", href: "/#work" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Services", items: [
{ label: "Web Development", href: "/services" },
{ label: "SEO", href: "/services" },
{ label: "Branding", href: "/services" },
{ label: "UI/UX Design", href: "/services" },
],
},
{
title: "Connect", items: [
{ label: "Twitter", href: "/#" },
{ label: "LinkedIn", href: "/#" },
{ label: "Instagram", href: "/#" },
{ label: "Dribbble", href: "/#" },
],
},
]}
/> />
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

View File

@@ -8,6 +8,41 @@ import FooterBase from "@/components/sections/footer/FooterBase";
import { Mail, Phone, Instagram } from "lucide-react"; // Import Lucide icons import { Mail, Phone, Instagram } from "lucide-react"; // Import Lucide icons
export default function ContactPage() { export default function ContactPage() {
const commonNavItems = [
{ name: "Domov", id: "/" },
{ name: "Práca", id: "/#work" },
{ name: "Služby", id: "/services" },
{ name: "O nás", id: "/about" },
{ name: "Kontakt", id: "/contact" }
];
const commonFooterColumnsEnglish = [
{
title: "Company", items: [
{ label: "About", href: "/about" },
{ label: "Services", href: "/services" },
{ label: "Work", href: "/#work" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Services", items: [
{ label: "Web Development", href: "/services" },
{ label: "SEO", href: "/services" },
{ label: "Branding", href: "/services" },
{ label: "UI/UX Design", href: "/services" }
]
},
{
title: "Connect", items: [
{ label: "Twitter", href: "/#" },
{ label: "LinkedIn", href: "/#" },
{ label: "Instagram", href: "/#" },
{ label: "Dribbble", href: "/#" }
]
}
];
return ( return (
<ThemeProvider <ThemeProvider
defaultButtonVariant="text-stagger" defaultButtonVariant="text-stagger"
@@ -24,13 +59,7 @@ export default function ContactPage() {
<ReactLenis root> <ReactLenis root>
<NavbarLayoutFloatingOverlay <NavbarLayoutFloatingOverlay
brandName="Grow With Social" brandName="Grow With Social"
navItems={[ navItems={commonNavItems}
{ name: "Domov", id: "/" },
{ name: "Práca", id: "/#work" },
{ name: "Služby", id: "/services" },
{ name: "O nás", id: "/about" },
{ name: "Kontakt", id: "/contact" }
]}
/> />
<ContactSplitForm <ContactSplitForm
@@ -77,34 +106,9 @@ export default function ContactPage() {
<FooterBase <FooterBase
logoText="Grow With Social" logoText="Grow With Social"
copyrightText="© 2026 | Grow With Social" copyrightText="© 2026 | Grow With Social"
columns={[ columns={commonFooterColumnsEnglish}
{
title: "Company", items: [
{ label: "About", href: "/about" },
{ label: "Services", href: "/services" },
{ label: "Work", href: "/#work" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Services", items: [
{ label: "Web Development", href: "/services" },
{ label: "SEO", href: "/services" },
{ label: "Branding", href: "/services" },
{ label: "UI/UX Design", href: "/services" },
],
},
{
title: "Connect", items: [
{ label: "Twitter", href: "/#" },
{ label: "LinkedIn", href: "/#" },
{ label: "Instagram", href: "/#" },
{ label: "Dribbble", href: "/#" },
],
},
]}
/> />
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

View File

@@ -8,6 +8,9 @@ import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Raleway } from "next/font/google"; import { Raleway } from "next/font/google";
import { Poppins } from "next/font/google"; import { Poppins } from "next/font/google";
import { Montserrat } from "next/font/google"; import { Montserrat } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
import { Manrope } from "next/font/google";
@@ -18,12 +21,11 @@ export const metadata: Metadata = {
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
}); const manrope = Manrope({
const inter = Inter({ variable: "--font-manrope",
variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -35,7 +37,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${montserrat.variable} ${inter.variable} antialiased`}> <body className={`${manrope.variable} antialiased`}>
{children} {children}
<script <script

View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-inter), sans-serif; font-family: var(--font-manrope), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-montserrat), sans-serif; font-family: var(--font-manrope), sans-serif;
} }