bender/cbc1d456-5b7f-42be-a042-e8508a2384c9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_7
Branches Tags
bender:main bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

25 Commits
version_7 ... main

Author SHA1 Message Date
bender
821004bf8f Merge version_11 into main 
Merge version_11 into main
 2026-04-17 06:36:34 +00:00
bender
54bc3d77ba Update src/app/page.tsx 2026-04-17 06:36:28 +00:00
bender
7192813602 Merge version_10 into main 
Merge version_10 into main
 2026-04-17 06:33:12 +00:00
bender
0b7cd09013 Update theme colors 2026-04-17 06:33:06 +00:00
bender
c9fd668d36 Merge version_9 into main 
Merge version_9 into main
 2026-04-17 06:33:02 +00:00
bender
8d101da3cb Update theme colors 2026-04-17 06:32:56 +00:00
bender
8167d78179 Merge version_8 into main 
Merge version_8 into main
 2026-04-16 17:00:49 +00:00
bender
5f6ff3212d Update theme fonts 2026-04-16 17:00:49 +00:00
bender
1ef58487d5 Update theme fonts 2026-04-16 17:00:48 +00:00
bender
2dbd27280e Update theme fonts 2026-04-16 17:00:46 +00:00
bender
8291606f7d Update theme fonts 2026-04-16 17:00:46 +00:00
bender
64e7391889 Merge version_8 into main 
Merge version_8 into main
 2026-04-16 17:00:41 +00:00
bender
72bbf12427 Update theme fonts 2026-04-16 17:00:38 +00:00
bender
de9dd977f5 Update theme fonts 2026-04-16 17:00:38 +00:00
bender
650fe9b314 Merge version_8 into main 
Merge version_8 into main
 2026-04-16 17:00:32 +00:00
bender
ee7b7232d4 Update theme fonts 2026-04-16 17:00:29 +00:00
bender
bb0dbf3be5 Update theme fonts 2026-04-16 17:00:29 +00:00
bender
c4ab94251d Merge version_8 into main 
Merge version_8 into main
 2026-04-16 16:59:31 +00:00
bender
9351a40527 Update theme colors 2026-04-16 16:59:28 +00:00
bender
a20f0d258e Merge version_7 into main 
Merge version_7 into main
 2026-04-16 16:59:27 +00:00
bender
94b54f90b1 Merge version_6 into main 
Merge version_6 into main
 2026-04-16 16:59:22 +00:00
bender
ed8d51f3ef Merge version_5 into main 
Merge version_5 into main
 2026-04-16 16:59:17 +00:00
bender
cea132e725 Merge version_4 into main 
Merge version_4 into main
 2026-04-16 16:59:11 +00:00
bender
61de95228f Merge version_3 into main 
Merge version_3 into main
 2026-04-16 16:59:02 +00:00
bender
6c860c0f10 Merge version_2 into main 
Merge version_2 into main
 2026-04-16 16:58:53 +00:00
4 changed files with 25 additions and 20 deletions
Expand all files Collapse all files

29
src/app/layout.tsx
View File

@@ -6,20 +6,27 @@ 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 { Nunito } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Manrope } 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 = { title: 'Beshqozon Osh Markazi | The Heart of Real Uzbek Plov', description: 'Experience the authentic taste of Tashkent at Beshqozon. Premium slow-cooked Uzbek plov, rich flavors, and fast service in a warm, traditional atmosphere.', openGraph: { title: 'Beshqozon Osh Markazi | The Heart of Real Uzbek Plov', description: 'Experience the authentic taste of Tashkent at Beshqozon. Premium slow-cooked Uzbek plov, rich flavors, and fast service in a warm, traditional atmosphere.', type: 'website' } }; export const metadata: Metadata = { title: 'Beshqozon Osh Markazi | The Heart of Real Uzbek Plov', description: 'Experience the authentic taste of Tashkent at Beshqozon. Premium slow-cooked Uzbek plov, rich flavors, and fast service in a warm, traditional atmosphere.', openGraph: { title: 'Beshqozon Osh Markazi | The Heart of Real Uzbek Plov', description: 'Experience the authentic taste of Tashkent at Beshqozon. Premium slow-cooked Uzbek plov, rich flavors, and fast service in a warm, traditional atmosphere.', type: 'website' } };
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -28,9 +35,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
className={`${halant.variable} ${inter.variable} antialiased`}
>
<Tag /> <Tag />
{children} {children}
<script <script

6
src/app/page.tsx
View File

@@ -3,7 +3,7 @@
import ReactLenis from "lenis/react"; import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline"; import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import HeroBillboard from "@/components/sections/hero/HeroBillboard"; import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
import TextAbout from "@/components/sections/about/TextAbout"; import TextAbout from "@/components/sections/about/TextAbout";
import ProductCardOne from "@/components/sections/product/ProductCardOne"; import ProductCardOne from "@/components/sections/product/ProductCardOne";
import MetricCardFourteen from "@/components/sections/metrics/MetricCardFourteen"; import MetricCardFourteen from "@/components/sections/metrics/MetricCardFourteen";
@@ -44,7 +44,7 @@ export default function BeshqozonPage() {
</div> </div>
<div id="hero" data-section="hero"> <div id="hero" data-section="hero">
<HeroBillboard <HeroBillboardScroll
title="Tashkent’s Most Loved Plov Experience" title="Tashkent’s Most Loved Plov Experience"
description="Rich flavor. Fast service. Authentic tradition. The heart of real Uzbek plov." description="Rich flavor. Fast service. Authentic tradition. The heart of real Uzbek plov."
background={{ variant: "sparkles-gradient" }} background={{ variant: "sparkles-gradient" }}
@@ -149,4 +149,4 @@ export default function BeshqozonPage() {
</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-dm-sans), 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-manrope), sans-serif;
} }

6
src/app/styles/variables.css
View File

@@ -12,11 +12,11 @@
--background: #ffffff; --background: #ffffff;
--card: #f9f9f9; --card: #f9f9f9;
--foreground: #000f06e6; --foreground: #000612e6;
--primary-cta: #0a7039; --primary-cta: #15479c;
--primary-cta-text: #ffffff; --primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9; --secondary-cta: #f9f9f9;
--secondary-cta-text: #000f06e6; --secondary-cta-text: #000612e6;
--accent: #e2e2e2; --accent: #e2e2e2;
--background-accent: #c4c4c4; --background-accent: #c4c4c4;