Merge version_3 into main #5

Merged
bender merged 4 commits from version_3 into main 2026-03-03 09:54:19 +00:00
4 changed files with 37 additions and 44 deletions

View File

@@ -1,27 +1,17 @@
import type { Metadata } from "next";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Raleway } from "next/font/google";
import { Lato } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
const raleway = Raleway({
variable: "--font-raleway", subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const lato = Lato({
variable: "--font-lato", subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"],
});
export const metadata: Metadata = {
@@ -54,7 +44,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${manrope.variable} ${dmSans.variable} ${halant.variable} ${inter.variable} antialiased`}
className={`${raleway.variable} ${lato.variable} antialiased`}
>
<Tag />
{children}

View File

@@ -15,16 +15,16 @@ import { Award, Sparkles, Flag, Zap, Trophy, Phone, Star, Crown, Briefcase } fro
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="text-shift"
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="smallMedium"
sizing="largeSizeMediumTitles"
background="circleGradient"
cardStyle="solid"
primaryButtonStyle="gradient"
secondaryButtonStyle="radial-glow"
headingFontWeight="bold"
contentWidth="medium"
sizing="mediumLargeSizeLargeTitles"
background="none"
cardStyle="gradient-mesh"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="glass"
headingFontWeight="semibold"
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
@@ -44,7 +44,7 @@ export default function LandingPage() {
<div id="hero" data-section="hero">
<HeroBillboardCarousel
title="Tashkent's Premier Lakeside Golf Experience"
description="18-Hole Championship Course | Corporate Events | Exclusive Membership | 4.4★ | 141 Reviews"
description="18-Hole Course | Corporate Events | Exclusive Membership | 4.4★ | 141 Reviews"
tag="Welcome to Excellence"
tagIcon={Sparkles}
tagAnimation="blur-reveal"
@@ -115,19 +115,22 @@ export default function LandingPage() {
plans={[
{
id: "standard", tag: "Standard Membership", tagIcon: Sparkles,
price: "Contact", period: "/inquiry", description: "Perfect for golf enthusiasts looking for regular access and special rates.", button: { text: "Request Information", href: "#contact" }, featuresTitle: "What's Included:", features: [
price: "Contact", period: "/inquiry", description: "Perfect for golf enthusiasts looking for regular access and special rates.", button: { text: "Request Information", href: "#contact" },
featuresTitle: "What's Included:", features: [
"Unlimited tee time bookings", "20% discount on green fees", "Access to member events", "Priority course reservations", "Member-only dining privileges"
]
},
{
id: "premium", tag: "Premium Membership", tagIcon: Crown,
price: "Contact", period: "/inquiry", description: "Exclusive benefits for dedicated golfers seeking premium privileges.", button: { text: "Request Information", href: "#contact" }, featuresTitle: "What's Included:", features: [
price: "Contact", period: "/inquiry", description: "Exclusive benefits for dedicated golfers seeking premium privileges.", button: { text: "Request Information", href: "#contact" },
featuresTitle: "What's Included:", features: [
"Unlimited priority tee times", "Complimentary green fees", "Private locker room access", "Exclusive member tournaments", "VIP event invitations", "Guest privileges for 4 per month"
]
},
{
id: "corporate", tag: "Corporate Membership", tagIcon: Briefcase,
price: "Contact", period: "/inquiry", description: "Perfect for companies hosting client events and team outings.", button: { text: "Request Information", href: "#contact" }, featuresTitle: "What's Included:", features: [
price: "Contact", period: "/inquiry", description: "Perfect for companies hosting client events and team outings.", button: { text: "Request Information", href: "#contact" },
featuresTitle: "What's Included:", features: [
"Multiple executive memberships", "Reserved tournament dates", "Private event spaces", "Customized corporate packages", "Employee access privileges", "Dedicated events coordinator"
]
}

View File

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

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #fafffb;;
--card: #f7fffa;;
--foreground: #001a0a;;
--primary-cta: #0a7039;;
/* --background: #ffffff;;
--card: #f9f9f9;;
--foreground: #0a3d2a;;
--primary-cta: #1a5c3f;;
--secondary-cta: #ffffff;;
--accent: #a8d9be;;
--background-accent: #6bbf8e;; */
--accent: #d4af37;;
--background-accent: #e8d9b8;; */
--background: #fafffb;;
--card: #f7fffa;;
--foreground: #001a0a;;
--primary-cta: #0a7039;;
--background: #ffffff;;
--card: #f9f9f9;;
--foreground: #0a3d2a;;
--primary-cta: #1a5c3f;;
--primary-cta-text: #fafffb;;
--secondary-cta: #ffffff;;
--secondary-cta-text: #001a0a;;
--accent: #a8d9be;;
--background-accent: #6bbf8e;;
--accent: #d4af37;;
--background-accent: #e8d9b8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);