bender/f324cd59-f310-4c36-bbd1-aa05d4981181
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
bender
2026-06-10 04:54:45 +00:00
parent 25635b30c0 44f728e57f
commit 573506d981
3 changed files with 54 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/layout.tsx
View File

@@ -6,23 +6,22 @@ import "@/lib/gsap-setup";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { DM_Sans } from "next/font/google";
const halant = Halant({
variable: "--font-halant",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: 'Aether Studio | Minimalist Architecture & Design', title: 'GRN GROUP | Архитектурная студия',
description: 'Discover Aether Studio, where minimalist architecture meets innovative design. We craft elegant, functional spaces that embody modern simplicity and timeless beauty.', description: 'GRN GROUP: 20 лет опыта в строительстве и ремонтных работах. Минималистичная архитектура, ремонт под ключ. Создаем элегантные и функциональные пространства, сочетающие современную простоту и вечную красоту.',
}; };
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -31,9 +30,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
className={`${halant.variable} ${inter.variable} antialiased`}
>
<Tag /> <Tag />
{children} {children}
<script <script

101
src/app/page.tsx
View File

@@ -27,15 +27,14 @@ export default function ArchitectureStudioPage() {
<ReactLenis root> <ReactLenis root>
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarLayoutFloatingInline <NavbarLayoutFloatingInline
brandName="Studio" brandName="GRN GROUP"
navItems={[ navItems={[
{ name: "Work", id: "projects" }, { name: "Работы", id: "projects" },
{ name: "Philosophy", id: "philosophy" }, { name: "О нас", id: "philosophy" },
{ name: "Contact", id: "contact" } { name: "Контакты", id: "contact" }
]} ]}
button={{ button={{
text: "Inquire", text: "Запрос", href: "contact"
href: "contact"
}} }}
className="text-xs tracking-widest uppercase" className="text-xs tracking-widest uppercase"
navItemClassName="text-sm font-light tracking-wide" navItemClassName="text-sm font-light tracking-wide"
@@ -46,13 +45,13 @@ export default function ArchitectureStudioPage() {
<div id="hero" data-section="hero"> <div id="hero" data-section="hero">
<HeroSplit <HeroSplit
background={{ variant: "plain" }} background={{ variant: "plain" }}
title="Timeless Architecture" title="Архитектурная студия GRN GROUP"
description="We craft spaces that transcend trend, marrying restraint with precision. Each project is a dialogue between site, material, and intention." description="20 лет опыта в строительстве и ремонтных работах. Создаем пространства, которые выдерживают испытание временем, сочетая сдержанность и точность. Каждый проект — это диалог между местом, материалом и намерением."
imagePosition="right" imagePosition="right"
imageSrc="https://img.b2bpic.net/free-photo/minimalist-architectural-building-details_23-2151870844.jpg" imageSrc="https://img.b2bpic.net/free-photo/minimalist-architectural-building-details_23-2151870844.jpg"
imageAlt="modern building architecture minimalist interior concrete" imageAlt="modern building architecture minimalist interior concrete"
buttons={[ buttons={[
{ text: "View Work", href: "projects" } { text: "Смотреть работы", href: "projects" }
]} ]}
mediaAnimation="slide-up" mediaAnimation="slide-up"
className="py-24 md:py-32" className="py-24 md:py-32"
@@ -65,7 +64,7 @@ export default function ArchitectureStudioPage() {
<div id="philosophy" data-section="philosophy"> <div id="philosophy" data-section="philosophy">
<TextAbout <TextAbout
title="We believe architecture should speak quietly. Good design requires no explanation—it exists with purpose and restraint, allowing inhabitants to inhabit space without distraction. Our practice centers on understanding context, respecting material honesty, and creating timeless environments." title="Мы верим, что архитектура должна говорить тихо. Хороший дизайн не требует объяснений — он существует с целью и сдержанностью, позволяя жильцам пользоваться пространством без отвлечения. Наша практика сосредоточена на понимании контекста, уважении к честности материалов и создании вневременных сред. Мы также предлагаем комплексный ремонт под ключ."
useInvertedBackground={false} useInvertedBackground={false}
className="py-32 md:py-48" className="py-32 md:py-48"
containerClassName="max-w-4xl" containerClassName="max-w-4xl"
@@ -75,30 +74,22 @@ export default function ArchitectureStudioPage() {
<div id="projects" data-section="projects"> <div id="projects" data-section="projects">
<FeatureCardSix <FeatureCardSix
title="Selected Projects" title="Избранные проекты"
description="Recent work exploring materiality, form, and spatial integrity" description="Недавние работы, исследующие материальность, форму и пространственную целостность"
textboxLayout="default" textboxLayout="default"
useInvertedBackground={true} useInvertedBackground={true}
features={[ features={[
{ {
title: "Riverside Residence", title: "Резиденция у реки", description: "Частный дом, органично вписанный в ландшафт. Бетон, стекло и дерево создают диалог между структурой и природой. Индивидуальный дизайн, учитывающий прибрежный контекст.", imageSrc: "https://img.b2bpic.net/free-photo/city-building-sky_23-2148107055.jpg"
description: "A private home responding to its landscape. Concrete, glass, and timber create a dialogue between structure and nature. Site-specific design honoring the waterfront context.",
imageSrc: "https://img.b2bpic.net/free-photo/city-building-sky_23-2148107055.jpg"
}, },
{ {
title: "Corporate Headquarters", title: "Корпоративная штаб-квартира", description: "Минималистичный офисный комплекс с акцентом на естественное освещение и подлинность материалов. Стальная конструкция с каменной облицовкой создает спокойную и сосредоточенную рабочую среду.", imageSrc: "https://img.b2bpic.net/free-photo/imposing-building-near-smaller-black-building_23-2148252731.jpg"
description: "Minimal office complex emphasizing natural light and material authenticity. Steel structure with stone cladding defines a calm, focused work environment.",
imageSrc: "https://img.b2bpic.net/free-photo/imposing-building-near-smaller-black-building_23-2148252731.jpg"
}, },
{ {
title: "Urban Studio", title: "Городская студия", description: "Адаптивное повторное использование промышленного склада под творческое рабочее пространство. Тщательное сохранение существующей структуры с сдержанными новыми вмешательствами.", imageSrc: "https://img.b2bpic.net/free-photo/concrete-structure-blue-sky_181624-5763.jpg"
description: "Adaptive reuse of an industrial warehouse into creative workspace. Careful preservation of existing structure with restrained new interventions.",
imageSrc: "https://img.b2bpic.net/free-photo/concrete-structure-blue-sky_181624-5763.jpg"
}, },
{ {
title: "Botanical Pavilion", title: "Ботанический павильон", description: "Общественная садовая структура, исследующая устойчивые материалы и прозрачный дизайн. Стальной каркас с живыми стенами создает проницаемое пространство для общественных собраний.", imageSrc: "https://img.b2bpic.net/free-photo/white-facade-modern-building_181624-6180.jpg"
description: "Public garden structure exploring sustainable materials and transparent design. Steel framework with living walls creates a permeable space for community gathering.",
imageSrc: "https://img.b2bpic.net/free-photo/white-facade-modern-building_181624-6180.jpg"
} }
]} ]}
className="py-32 md:py-48" className="py-32 md:py-48"
@@ -112,32 +103,24 @@ export default function ArchitectureStudioPage() {
<div id="metrics" data-section="metrics"> <div id="metrics" data-section="metrics">
<MetricCardTwo <MetricCardTwo
title="Our Practice" title="Наша практика"
description="Metrics that matter to us" description="Показатели, которые важны для нас. 20 лет успешной работы."
textboxLayout="default" textboxLayout="default"
useInvertedBackground={false} useInvertedBackground={false}
gridVariant="uniform-all-items-equal" gridVariant="uniform-all-items-equal"
animationType="slide-up" animationType="slide-up"
metrics={[ metrics={[
{ {
id: "1", id: "1", value: "20+", description: "Лет на рынке"
value: "18+",
description: "Years of Practice"
}, },
{ {
id: "2", id: "2", value: "120+", description: "Завершенных проектов"
value: "120+",
description: "Completed Projects"
}, },
{ {
id: "3", id: "3", value: "4", description: "Главных архитекторов"
value: "4",
description: "Principal Architects"
}, },
{ {
id: "4", id: "4", value: "42", description: "Членов команды"
value: "42",
description: "Studio Team Members"
} }
]} ]}
className="py-24 md:py-32" className="py-24 md:py-32"
@@ -151,17 +134,17 @@ export default function ArchitectureStudioPage() {
<div id="contact" data-section="contact"> <div id="contact" data-section="contact">
<ContactSplit <ContactSplit
background={{ variant: "plain" }} background={{ variant: "plain" }}
tag="Get in Touch" tag="Свяжитесь с нами"
title="Let's Discuss Your Project" title="Обсудим ваш проект"
description="We explore commissions where thoughtful design and client vision align. Tell us about your space, your aspirations, your constraints." description="Мы ищем заказы, где вдумчивый дизайн и видение клиента совпадают. Расскажите нам о вашем пространстве, ваших стремлениях, ваших ограничениях."
useInvertedBackground={true} useInvertedBackground={true}
imageSrc="https://img.b2bpic.net/free-photo/grey-concrete-building-blue-sky_181624-6496.jpg" imageSrc="https://img.b2bpic.net/free-photo/grey-concrete-building-blue-sky_181624-6496.jpg"
imageAlt="studio workspace architects design drafting collaboration" imageAlt="studio workspace architects design drafting collaboration"
mediaPosition="right" mediaPosition="right"
mediaAnimation="slide-up" mediaAnimation="slide-up"
inputPlaceholder="your@email.com" inputPlaceholder="ваш@email.com"
buttonText="Send" buttonText="Отправить"
termsText="We respect your inquiry. Connect with us within 48 hours." termsText="Мы ценим ваше обращение. Мы свяжемся с вами в течение 48 часов."
className="py-32 md:py-48" className="py-32 md:py-48"
tagClassName="text-sm uppercase tracking-widest" tagClassName="text-sm uppercase tracking-widest"
titleClassName="text-4xl md:text-5xl font-light tracking-tight leading-tight mt-4" titleClassName="text-4xl md:text-5xl font-light tracking-tight leading-tight mt-4"
@@ -173,32 +156,30 @@ export default function ArchitectureStudioPage() {
<div id="footer" data-section="footer"> <div id="footer" data-section="footer">
<FooterBaseReveal <FooterBaseReveal
logoText="Studio X" logoText="GRN GROUP"
columns={[ columns={[
{ {
title: "Studio", title: "Студия", items: [
items: [ { label: "О нас", href: "philosophy" },
{ label: "About", href: "philosophy" }, { label: "Работы", href: "projects" }
{ label: "Work", href: "projects" }
] ]
}, },
{ {
title: "Connect", title: "Связь", items: [
items: [ { label: "hello@grngroup.com", href: "mailto:hello@grngroup.com" },
{ label: "hello@studiox.com", href: "#" }, { label: "Контакты", href: "contact" }
{ label: "Contact", href: "contact" }
] ]
}, },
{ {
title: "Practice", title: "Услуги", items: [
items: [ { label: "Жилые объекты", href: "#" },
{ label: "Residential", href: "#" }, { label: "Коммерческие объекты", href: "#" },
{ label: "Commercial", href: "#" }, { label: "Реконструкция", href: "#" },
{ label: "Adaptive Reuse", href: "#" } { label: "Ремонт под ключ", href: "#" }
] ]
} }
]} ]}
copyrightText="© 2025 Studio. Timeless architecture." copyrightText="© 2025 GRN GROUP. Вневременная архитектура."
className="mt-0" className="mt-0"
columnTitleClassName="text-base uppercase tracking-widest font-light mb-0" columnTitleClassName="text-base uppercase tracking-widest font-light mb-0"
columnItemClassName="text-base font-light" columnItemClassName="text-base font-light"
@@ -208,4 +189,4 @@ export default function ArchitectureStudioPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

4
src/app/styles/base.css
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-tight), sans-serif; font-family: var(--font-inter), 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-inter-tight), sans-serif; font-family: var(--font-dm-sans), sans-serif;
} }