Merge version_1 into main #2

Merged
bender merged 3 commits from version_1 into main 2026-03-11 16:44:16 +00:00
3 changed files with 87 additions and 211 deletions

View File

@@ -33,9 +33,7 @@ export default function AboutPage() {
{ name: "Kontakt", id: "/contact" },
]}
button={{
text: "Ro'yxatdan o'tish",
href: "/contact",
}}
text: "Ro'yxatdan o'tish", href: "/contact"}}
brandName="Blitz"
/>
</div>
@@ -48,18 +46,15 @@ export default function AboutPage() {
description="Blitz markazi 2015 yildan beri talabalarni dunyo standartida nemis tiliga o'rgatib kelmoqda. Biznig maqsad - har bir talabani TELC, Goethe va Cambridge imtihonlariga tayyorlash va ularni nemis sohalarida karyera qilishiga yordam berish."
metrics={[
{
value: "10+",
title: "Yillik Tajriba",
},
value: "10+", title: "Yillik Tajriba"},
{
value: "1000+",
title: "Bitiruvchilar",
},
value: "1000+", title: "Bitiruvchilar"},
]}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/people-social-distancing-work_23-2148961705.jpg?_wi=2"
imageSrc="http://img.b2bpic.net/free-photo/people-social-distancing-work_23-2148961705.jpg"
imageAlt="modern language learning center interior"
mediaAnimation="slide-up"
metricsAnimation="slide-up"
/>
</div>
@@ -71,40 +66,20 @@ export default function AboutPage() {
tagIcon={BookOpen}
features={[
{
title: "A1 - Boshlang'ich Darajasi",
description: "Nemis tiliga birinchi qadamlar. Asosiy so'z boyligi va ruhiy nutq ko'nikmalari.",
imageSrc: "http://img.b2bpic.net/free-photo/woman-enjoying-sudoku-game-by-herself_23-2149073684.jpg?_wi=2",
button: {
text: "Batafsil",
href: "#",
},
title: "A1 - Boshlang'ich Darajasi", description: "Nemis tiliga birinchi qadamlar. Asosiy so'z boyligi va ruhiy nutq ko'nikmalari.", imageSrc: "http://img.b2bpic.net/free-photo/woman-enjoying-sudoku-game-by-herself_23-2149073684.jpg", button: {
text: "Batafsil", href: "#"},
},
{
title: "A2 - Elementar Darajasi",
description: "Kundalik holatlarni hal qilish va sohta gaplarni boshqarish.",
imageSrc: "http://img.b2bpic.net/free-photo/man-correcting-grammar-mistakes-side-view_23-2150171344.jpg?_wi=2",
button: {
text: "Batafsil",
href: "#",
},
title: "A2 - Elementar Darajasi", description: "Kundalik holatlarni hal qilish va sohta gaplarni boshqarish.", imageSrc: "http://img.b2bpic.net/free-photo/man-correcting-grammar-mistakes-side-view_23-2150171344.jpg", button: {
text: "Batafsil", href: "#"},
},
{
title: "B1 - O'rta Darajasi",
description: "Murakkab mavzularda gapirish va yozish ko'nikmalari.",
imageSrc: "http://img.b2bpic.net/free-photo/students-completing-homework-table_23-2147844942.jpg?_wi=2",
button: {
text: "Batafsil",
href: "#",
},
title: "B1 - O'rta Darajasi", description: "Murakkab mavzularda gapirish va yozish ko'nikmalari.", imageSrc: "http://img.b2bpic.net/free-photo/students-completing-homework-table_23-2147844942.jpg", button: {
text: "Batafsil", href: "#"},
},
{
title: "B2 - Yuqori O'rta Darajasi",
description: "Professional va akademik tilda savodxonlik.",
imageSrc: "http://img.b2bpic.net/free-photo/people-studying-with-notebooks-close-up_23-2149204801.jpg?_wi=2",
button: {
text: "Batafsil",
href: "#",
},
title: "B2 - Yuqori O'rta Darajasi", description: "Professional va akademik tilda savodxonlik.", imageSrc: "http://img.b2bpic.net/free-photo/people-studying-with-notebooks-close-up_23-2149204801.jpg", button: {
text: "Batafsil", href: "#"},
},
]}
gridVariant="two-columns-alternating-heights"
@@ -121,29 +96,13 @@ export default function AboutPage() {
tag="O'qituvchilar"
members={[
{
id: "1",
name: "Dr. Klaus Weber",
imageSrc: "http://img.b2bpic.net/free-photo/pretty-cheerful-casual-blond-girl-happily-looking-away-with-book-coffee-table-courtyard-cafe_574295-4094.jpg?_wi=2",
imageAlt: "professional german teacher portrait",
},
id: "1", name: "Dr. Klaus Weber", imageSrc: "http://img.b2bpic.net/free-photo/pretty-cheerful-casual-blond-girl-happily-looking-away-with-book-coffee-table-courtyard-cafe_574295-4094.jpg", imageAlt: "professional german teacher portrait"},
{
id: "2",
name: "Ingrid Mueller",
imageSrc: "http://img.b2bpic.net/free-photo/charming-girl-with-book-posing-room_23-2147655829.jpg?_wi=2",
imageAlt: "german language teacher professional photo",
},
id: "2", name: "Ingrid Mueller", imageSrc: "http://img.b2bpic.net/free-photo/charming-girl-with-book-posing-room_23-2147655829.jpg", imageAlt: "german language teacher professional photo"},
{
id: "3",
name: "Hans Schmidt",
imageSrc: "http://img.b2bpic.net/free-photo/blond-businessman-sad-expression_1194-3905.jpg?_wi=2",
imageAlt: "male german language teacher portrait",
},
id: "3", name: "Hans Schmidt", imageSrc: "http://img.b2bpic.net/free-photo/blond-businessman-sad-expression_1194-3905.jpg", imageAlt: "male german language teacher portrait"},
{
id: "4",
name: "Maria Schneider",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-teacher-class-pointing_23-2148665948.jpg?_wi=2",
imageAlt: "german female language teacher professional",
},
id: "4", name: "Maria Schneider", imageSrc: "http://img.b2bpic.net/free-photo/portrait-teacher-class-pointing_23-2148665948.jpg", imageAlt: "german female language teacher professional"},
]}
memberVariant="card"
useInvertedBackground={true}
@@ -155,66 +114,39 @@ export default function AboutPage() {
<FooterBaseReveal
columns={[
{
title: "Sayt",
items: [
title: "Sayt", items: [
{
label: "Bosh sahifa",
href: "/",
},
label: "Bosh sahifa", href: "/"},
{
label: "Kurslar",
href: "/courses",
},
label: "Kurslar", href: "/courses"},
{
label: "Biz Haqimizda",
href: "/about",
},
label: "Biz Haqimizda", href: "/about"},
{
label: "Kontakt",
href: "/contact",
},
label: "Kontakt", href: "/contact"},
],
},
{
title: "Kurslar",
items: [
title: "Kurslar", items: [
{
label: "A1 - Boshlang'ich",
href: "#",
},
label: "A1 - Boshlang'ich", href: "#"},
{
label: "A2 - Elementar",
href: "#",
},
label: "A2 - Elementar", href: "#"},
{
label: "B1 - O'rta",
href: "#",
},
label: "B1 - O'rta", href: "#"},
{
label: "B2 - Yuqori O'rta",
href: "#",
},
label: "B2 - Yuqori O'rta", href: "#"},
],
},
{
title: "Bog'lanish",
items: [
title: "Bog'lanish", items: [
{
label: "Telefon",
href: "tel:+998901234567",
},
label: "Telefon", href: "tel:+998901234567"},
{
label: "Email",
href: "mailto:info@blitz.uz",
},
label: "Email", href: "mailto:info@blitz.uz"},
{
label: "Manzil",
href: "#",
},
label: "Manzil", href: "#"},
{
label: "Telegram",
href: "https://telegram.me/blitzuzb",
},
label: "Telegram", href: "https://telegram.me/blitzuzb"},
],
},
]}

View File

@@ -37,8 +37,7 @@ export default function HomePage() {
const heroButtons = [
{
text: "Birinchi Dars",
onClick: () => {
text: "Birinchi Dars", onClick: () => {
const element = document.getElementById("contact");
if (element) {
element.scrollIntoView({ behavior: "smooth" });
@@ -46,8 +45,7 @@ export default function HomePage() {
},
},
{
text: "Batafsil Ma'lumot",
onClick: () => {
text: "Batafsil Ma'lumot", onClick: () => {
window.location.href = "/courses";
},
},
@@ -55,8 +53,7 @@ export default function HomePage() {
const courseButtons = [
{
text: "Batafsil",
onClick: () => {
text: "Batafsil", onClick: () => {
window.location.href = "/courses";
},
},
@@ -115,9 +112,10 @@ export default function HomePage() {
{ value: "1000+", title: "Bitiruvchilar" },
]}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/people-social-distancing-work_23-2148961705.jpg?_wi=1"
imageSrc="http://img.b2bpic.net/free-photo/people-social-distancing-work_23-2148961705.jpg"
imageAlt="modern language learning center interior"
mediaAnimation="slide-up"
metricsAnimation="slide-up"
/>
</div>
@@ -146,29 +144,13 @@ export default function HomePage() {
tag="O'qituvchilar"
members={[
{
id: "1",
name: "Dr. Klaus Weber",
imageSrc: "http://img.b2bpic.net/free-photo/pretty-cheerful-casual-blond-girl-happily-looking-away-with-book-coffee-table-courtyard-cafe_574295-4094.jpg?_wi=1",
imageAlt: "professional german teacher portrait",
},
id: "1", name: "Dr. Klaus Weber", imageSrc: "http://img.b2bpic.net/free-photo/pretty-cheerful-casual-blond-girl-happily-looking-away-with-book-coffee-table-courtyard-cafe_574295-4094.jpg", imageAlt: "professional german teacher portrait"},
{
id: "2",
name: "Ingrid Mueller",
imageSrc: "http://img.b2bpic.net/free-photo/charming-girl-with-book-posing-room_23-2147655829.jpg?_wi=1",
imageAlt: "german language teacher professional photo",
},
id: "2", name: "Ingrid Mueller", imageSrc: "http://img.b2bpic.net/free-photo/charming-girl-with-book-posing-room_23-2147655829.jpg", imageAlt: "german language teacher professional photo"},
{
id: "3",
name: "Hans Schmidt",
imageSrc: "http://img.b2bpic.net/free-photo/blond-businessman-sad-expression_1194-3905.jpg?_wi=1",
imageAlt: "male german language teacher portrait",
},
id: "3", name: "Hans Schmidt", imageSrc: "http://img.b2bpic.net/free-photo/blond-businessman-sad-expression_1194-3905.jpg", imageAlt: "male german language teacher portrait"},
{
id: "4",
name: "Maria Schneider",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-teacher-class-pointing_23-2148665948.jpg?_wi=1",
imageAlt: "german female language teacher professional",
},
id: "4", name: "Maria Schneider", imageSrc: "http://img.b2bpic.net/free-photo/portrait-teacher-class-pointing_23-2148665948.jpg", imageAlt: "german female language teacher professional"},
]}
memberVariant="card"
useInvertedBackground={true}
@@ -183,21 +165,13 @@ export default function HomePage() {
author="Yulduz Karimova, TELC Bitiruvchi"
avatars={[
{
src: "http://img.b2bpic.net/free-photo/young-lady-academic-dress-pointing-aside-looking-happy_176474-82284.jpg",
alt: "Yulduz Karimova",
},
src: "http://img.b2bpic.net/free-photo/young-lady-academic-dress-pointing-aside-looking-happy_176474-82284.jpg", alt: "Yulduz Karimova"},
{
src: "http://img.b2bpic.net/free-photo/brunette-girl-pointing-finger-air_1187-5314.jpg",
alt: "Student 2",
},
src: "http://img.b2bpic.net/free-photo/brunette-girl-pointing-finger-air_1187-5314.jpg", alt: "Student 2"},
{
src: "http://img.b2bpic.net/free-photo/satisfied-beautiful-dark-skinned-female-student-with-positive-expression-wears-big-round-glasses-happy-recieve-good-mark-university-poses-indoor_273609-3465.jpg",
alt: "Student 3",
},
src: "http://img.b2bpic.net/free-photo/satisfied-beautiful-dark-skinned-female-student-with-positive-expression-wears-big-round-glasses-happy-recieve-good-mark-university-poses-indoor_273609-3465.jpg", alt: "Student 3"},
{
src: "http://img.b2bpic.net/free-vector/labels-collection-class-2023-graduation_23-2150304075.jpg",
alt: "Student 4",
},
src: "http://img.b2bpic.net/free-vector/labels-collection-class-2023-graduation_23-2150304075.jpg", alt: "Student 4"},
]}
ratingAnimation="slide-up"
avatarsAnimation="slide-up"
@@ -213,41 +187,23 @@ export default function HomePage() {
tagIcon={HelpCircle}
faqs={[
{
id: "1",
title: "Nemis tilini o'rganish qancha vaqt oladi?",
content:
"Bu sizning boshlang'ich darajangizga va maqsadingizga bog'liq. A1 darajasiga 3-4 oy, B1 darajasiga 9-12 oy, C1 darajasiga 18-24 oy ketadi. Har qanday darajani individual tezligi bilan o'rganishingiz mumkin.",
},
id: "1", title: "Nemis tilini o'rganish qancha vaqt oladi?", content:
"Bu sizning boshlang'ich darajangizga va maqsadingizga bog'liq. A1 darajasiga 3-4 oy, B1 darajasiga 9-12 oy, C1 darajasiga 18-24 oy ketadi. Har qanday darajani individual tezligi bilan o'rganishingiz mumkin."},
{
id: "2",
title: "Kurslar onlayn yoki oflayn?",
content:
"Biz ikkala shaklda ham ta'lim beramiz. Onlayn kurslar siz uyingizda ishlayotgan paytda, oflayn kurslar esa bizning markazda. Bundan tashqari, gibrid variantlar ham mavjud.",
},
id: "2", title: "Kurslar onlayn yoki oflayn?", content:
"Biz ikkala shaklda ham ta'lim beramiz. Onlayn kurslar siz uyingizda ishlayotgan paytda, oflayn kurslar esa bizning markazda. Bundan tashqari, gibrid variantlar ham mavjud."},
{
id: "3",
title: "TELC va Cambridge imtihonlariga tayyorlash qo'llab-quvvatlanib bormi?",
content:
"Ha, biz TELC, Cambridge va Goethe imtihonlariga maxsus tayyorlik kurslarini taqdim etamiz. Har bir imtihon uchun alohida protokol va mock imtihonlar mavjud.",
},
id: "3", title: "TELC va Cambridge imtihonlariga tayyorlash qo'llab-quvvatlanib bormi?", content:
"Ha, biz TELC, Cambridge va Goethe imtihonlariga maxsus tayyorlik kurslarini taqdim etamiz. Har bir imtihon uchun alohida protokol va mock imtihonlar mavjud."},
{
id: "4",
title: "Birinchi dars bepul bormi?",
content:
"Ha, birinchi konsultatsiya va test dars bepul. Bu dars siz va bizning o'qituvchimiz o'zaro tanishish uchun ko'plab vaqt beradi.",
},
id: "4", title: "Birinchi dars bepul bormi?", content:
"Ha, birinchi konsultatsiya va test dars bepul. Bu dars siz va bizning o'qituvchimiz o'zaro tanishish uchun ko'plab vaqt beradi."},
{
id: "5",
title: "Guruh kattaligi qancha?",
content:
"Bizning guruhlar 4-8 kishidan iborat bo'lib, har bir talaba yetarli e'tiborni oladi. Bundan tashqari individual darslar ham mavjud.",
},
id: "5", title: "Guruh kattaligi qancha?", content:
"Bizning guruhlar 4-8 kishidan iborat bo'lib, har bir talaba yetarli e'tiborni oladi. Bundan tashqari individual darslar ham mavjud."},
{
id: "6",
title: "Kurs davomiyligi va jadval nima?",
content:
"Kurslar 3-6 oylik davrni qamrab oladi, haftasi 2-3 darsligi bo'lib, har bir dars 90 minutlidir. Jadval sizning qulayligi bo'yicha tanlash mumkin.",
},
id: "6", title: "Kurs davomiyligi va jadval nima?", content:
"Kurslar 3-6 oylik davrni qamrab oladi, haftasi 2-3 darsligi bo'lib, har bir dars 90 minutlidir. Jadval sizning qulayligi bo'yicha tanlash mumkin."},
]}
textboxLayout="default"
useInvertedBackground={false}
@@ -259,8 +215,7 @@ export default function HomePage() {
<FooterBaseReveal
columns={[
{
title: "Sayt",
items: [
title: "Sayt", items: [
{ label: "Bosh sahifa", href: "/" },
{ label: "Kurslar", href: "/courses" },
{ label: "Biz Haqimizda", href: "/" },
@@ -268,8 +223,7 @@ export default function HomePage() {
],
},
{
title: "Kurslar",
items: [
title: "Kurslar", items: [
{ label: "A1 - Boshlang'ich", href: "courses" },
{ label: "A2 - Elementar", href: "courses" },
{ label: "B1 - O'rta", href: "courses" },
@@ -277,8 +231,7 @@ export default function HomePage() {
],
},
{
title: "Bog'lanish",
items: [
title: "Bog'lanish", items: [
{ label: "Telefon", href: "tel:+998901234567" },
{ label: "Email", href: "mailto:info@blitz.uz" },
{ label: "Telegram", href: "https://telegram.me/blitzuzb" },

View File

@@ -1,51 +1,42 @@
"use client";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
import React from "react";
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
text: string;
fontSize?: number;
fontWeight?: number | string;
fontFamily?: string;
fill?: string;
className?: string;
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
export const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
fontSize = 24,
fontWeight = "bold", fontFamily = "Arial, sans-serif", fill = "currentColor", className = ""}) => {
const textWidth = text.length * (fontSize as number) * 0.6;
const viewBoxWidth = textWidth + 20;
const viewBoxHeight = (fontSize as number) + 20;
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
viewBox={`0 0 ${viewBoxWidth} ${viewBoxHeight}`}
xmlns="http://www.w3.org/2000/svg"
className={className}
aria-label={text}
>
<text
ref={textRef}
x="0"
y={verticalAlign === "center" ? "50%" : "0"}
className="font-bold fill-current"
style={{
fontSize: "20px",
letterSpacing: "-0.02em",
dominantBaseline: verticalAlign === "center" ? "middle" : "text-before-edge"
}}
x="10"
y={Math.max((fontSize as number) + 5, 20)}
fontSize={fontSize}
fontWeight={fontWeight}
fontFamily={fontFamily}
fill={fill}
dominantBaseline="middle"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;