bender/dfb94a7a-94f1-4866-beb9-bafa3ad8719e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #4

Merged
bender merged 3 commits from version_3 into main 2026-03-24 12:50:14 +00:00
Conversation 0 Commits 3 Files Changed 3 +45 -37
3 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/admissions/page.tsx
View File

@@ -10,43 +10,49 @@ import { Users, Info, Phone, GraduationCap, School, Award, Users as UsersIcon }
export default function AdmissionsPage() {
const navItems = [
{ name: "Bosh sahifa", id: "home", href: "/" },
{ name: "Qabul", id: "admissions", href: "/admissions" },
{ name: "Yangiliklar", id: "news", href: "/news" }
{ name: "Yangiliklar", id: "news", href: "/news" },
{ name: "O'qituvchilar", id: "team", href: "/team" },
{ name: "Bog'lanish", id: "contact", href: "/contact" }
];
const navbarButton = { text: "Bog'lanish" };
const navbarButton = { text: "Bog'lanish", href: "/contact" };
const footerColumns = [
{
title: "Litsey haqida", items: [
{ label: "Qabul", href: "/admissions" }
{ label: "Qabul", href: "/admissions" },
{ label: "Jamoa", href: "/team" }
]
},
{
title: "Resurslar", items: [
{ label: "Yangiliklar", href: "/news" },
{ label: "FAQ", href: "/admissions" }
{ label: "FAQ", href: "/admissions#admissions-faq" }
]
},
{
title: "Bog'lanish", items: [
{ label: "Email", href: "mailto:iiv_buxoro_al@mail.ru" }
{ label: "Manzil", href: "/contact" },
{ label: "Email", href: "mailto:iiv_buxoro_al@mail.ru" },
{ label: "Telefon", href: "/contact" }
]
}
];
return (
<ThemeProvider
defaultButtonVariant={"bounce-effect"}
defaultTextAnimation={"entrance-slide"}
defaultButtonVariant={"shift-hover"}
defaultTextAnimation={"reveal-blur"}
borderRadius={"rounded"}
contentWidth={"medium"}
sizing={"largeSmallSizeMediumTitles"}
background={"aurora"}
cardStyle={"soft-shadow"}
cardStyle={"gradient-bordered"}
primaryButtonStyle={"diagonal-gradient"}
secondaryButtonStyle={"radial-glow"}
headingFontWeight={"normal"}
headingFontWeight={"semibold"}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -67,7 +73,7 @@ export default function AdmissionsPage() {
{ id: "3", title: "Qanday hujjatlar talab etiladi?", content: "Arizalar, shaxsni tasdiqlovchi hujjat nusxasi, o'rta ta'lim shahodatnomasi, tibbiy ma'lumotnoma va boshqa zaruriy hujjatlar talab etiladi. To'liq ro'yxat uchun biz bilan bog'laning." },
{ id: "4", title: "Test sinovlari qaysi fanlardan o'tkaziladi?", content: "Test sinovlari odatda O'zbek tili va adabiyoti, Tarix, Matematika va Chet tili fanlaridan o'tkaziladi. Ba'zi yo'nalishlar uchun qo'shimcha fanlar ham bo'lishi mumkin." }
]}
faqsAnimation={"slide-up"}
faqsAnimation={"blur-reveal"}
textboxLayout={"default"}
useInvertedBackground={false}
/>
@@ -83,7 +89,7 @@ export default function AdmissionsPage() {
{ id: "3", value: "300+", title: "Faoliyat davomidagi bitiruvchilar", description: "Huquqni muhofaza qilish sohasida faoliyat yuritayotgan bitiruvchilarimiz.", imageSrc: "http://img.b2bpic.net/free-vector/kind-awards-set_23-2147540388.jpg", imageAlt: "Award trophy icon" },
{ id: "4", value: "200+", title: "Hozirgi talabalar", description: "Bugungi kunda ta'lim olayotgan yoshlar soni.", imageSrc: "http://img.b2bpic.net/free-vector/mass-education-flat-isometric-concept_126523-1780.jpg", imageAlt: "Student group icon" }
]}
animationType={"slide-up"}
animationType={"blur-reveal"}
textboxLayout={"default"}
useInvertedBackground={false}
/>

28
src/app/contact/page.tsx
View File

@@ -8,50 +8,46 @@ import FooterBase from '@/components/sections/footer/FooterBase';
export default function ContactPage() {
const navItems = [
{ name: "Bosh sahifa", id: "home", href: "/" },
{ name: "Biz haqimizda", id: "about", href: "/about" },
{ name: "Qabul", id: "admissions", href: "/admissions" },
{ name: "Yangiliklar", id: "news", href: "/news" },
{ name: "O'qituvchilar", id: "team", href: "/team" },
{ name: "Galereya", id: "gallery", href: "/gallery" },
{ name: "Bog'lanish", id: "contact", href: "/contact" },
{ name: "Bog'lanish", id: "contact", href: "/contact" }
];
const footerColumns = [
{
title: "Litsey haqida", items: [
{ label: "Biz haqimizda", href: "/about" },
{ label: "Qabul", href: "/admissions" },
{ label: "Jamoa", href: "/team" },
],
{ label: "Jamoa", href: "/team" }
]
},
{
title: "Resurslar", items: [
{ label: "Yangiliklar", href: "/news" },
{ label: "Galereya", href: "/gallery" },
{ label: "FAQ", href: "/admissions" },
],
{ label: "FAQ", href: "/admissions#admissions-faq" }
]
},
{
title: "Bog'lanish", items: [
{ label: "Manzil", href: "/contact" },
{ label: "Email", href: "mailto:iiv_buxoro_al@mail.ru" },
{ label: "Telefon", href: "/contact" },
],
},
{ label: "Telefon", href: "/contact" }
]
}
];
return (
<ThemeProvider
defaultButtonVariant={"bounce-effect"}
defaultTextAnimation={"entrance-slide"}
defaultButtonVariant={"shift-hover"}
defaultTextAnimation={"reveal-blur"}
borderRadius={"rounded"}
contentWidth={"medium"}
sizing={"largeSmallSizeMediumTitles"}
background={"aurora"}
cardStyle={"soft-shadow"}
cardStyle={"gradient-bordered"}
primaryButtonStyle={"diagonal-gradient"}
secondaryButtonStyle={"radial-glow"}
headingFontWeight={"normal"}
headingFontWeight={"semibold"}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline

26
src/app/news/page.tsx
View File

@@ -10,43 +10,49 @@ import { Users, Info, Phone, GraduationCap, School, Award, Users as UsersIcon }
export default function NewsPage() {
const navItems = [
{ name: "Bosh sahifa", id: "home", href: "/" },
{ name: "Qabul", id: "admissions", href: "/admissions" },
{ name: "Yangiliklar", id: "news", href: "/news" }
{ name: "Yangiliklar", id: "news", href: "/news" },
{ name: "O'qituvchilar", id: "team", href: "/team" },
{ name: "Bog'lanish", id: "contact", href: "/contact" }
];
const navbarButton = { text: "Bog'lanish" };
const navbarButton = { text: "Bog'lanish", href: "/contact" };
const footerColumns = [
{
title: "Litsey haqida", items: [
{ label: "Qabul", href: "/admissions" }
{ label: "Qabul", href: "/admissions" },
{ label: "Jamoa", href: "/team" }
]
},
{
title: "Resurslar", items: [
{ label: "Yangiliklar", href: "/news" },
{ label: "FAQ", href: "/admissions" }
{ label: "FAQ", href: "/admissions#admissions-faq" }
]
},
{
title: "Bog'lanish", items: [
{ label: "Email", href: "mailto:iiv_buxoro_al@mail.ru" }
{ label: "Manzil", href: "/contact" },
{ label: "Email", href: "mailto:iiv_buxoro_al@mail.ru" },
{ label: "Telefon", href: "/contact" }
]
}
];
return (
<ThemeProvider
defaultButtonVariant={"bounce-effect"}
defaultTextAnimation={"entrance-slide"}
defaultButtonVariant={"shift-hover"}
defaultTextAnimation={"reveal-blur"}
borderRadius={"rounded"}
contentWidth={"medium"}
sizing={"largeSmallSizeMediumTitles"}
background={"aurora"}
cardStyle={"soft-shadow"}
cardStyle={"gradient-bordered"}
primaryButtonStyle={"diagonal-gradient"}
secondaryButtonStyle={"radial-glow"}
headingFontWeight={"normal"}
headingFontWeight={"semibold"}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -67,7 +73,7 @@ export default function NewsPage() {
{ id: "3", category: "E'lonlar", title: "Yangi o'quv yiliga qabul boshlandi", excerpt: "2024-2025 o'quv yili uchun litseyga hujjatlarni qabul qilish jarayoni boshlanganini e'lon qilamiz.", imageSrc: "http://img.b2bpic.net/free-photo/busy-pensive-multiethnic-students-preparing-exam_1262-14815.jpg", imageAlt: "Yangi o'quv yiliga qabul", authorName: "IIV Litseyi Qabul komissiyasi", authorAvatar: "http://img.b2bpic.net/free-photo/medium-shot-smiley-senior-woman_23-2149178449.jpg", date: "2024-07-01" },
{ id: "4", category: "Musobaqalar", title: "Sport musobaqalarida yuqori natijalar", excerpt: "Talabalarimiz viloyat miqyosidagi sport musobaqalarida faxrli o'rinlarni egallashdi.", imageSrc: "http://img.b2bpic.net/free-photo/kids-having-fun-jungle-party_23-2149498977.jpg", imageAlt: "Sport musobaqasi", authorName: "Litsey Sport klubi", authorAvatar: "http://img.b2bpic.net/free-photo/headshot-happy-excited-young-woman-wearing-rectangular-sunglasses-looking-raising-her-brows-astonishment_273609-1459.jpg", date: "2024-05-15" }
]}
animationType={"slide-up"}
animationType={"blur-reveal"}
textboxLayout={"default"}
useInvertedBackground={false}
/>