Merge branch 'main' of https://github.com/aw-batyr/turkmen-expo
This commit is contained in:
commit
22daef2c73
|
|
@ -11,7 +11,7 @@ export default async function HomePage() {
|
|||
const lang = cookies().get("lang")?.value ?? "ru";
|
||||
|
||||
return (
|
||||
<div className="bg-blueBg flex flex-col gap-[60px] md:gap-20 pb-20">
|
||||
<div className="bg-blueBg flex flex-col gap-[60px] md:gap-20 pb-20 mt-[70px]">
|
||||
<Slider lang={lang} />
|
||||
|
||||
<Suspense fallback={<Loader />}>
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
import { getEvents } from "@/services/home";
|
||||
import { EventsMobile } from "./events-mobile";
|
||||
|
||||
const events = [
|
||||
{
|
||||
link: "https://kids.turkmenexpo.com/",
|
||||
video:
|
||||
"https://editor.turkmenexpo.com/storage/app/media/video/KidsExpo%202024_%20Turkmenistan.mp4",
|
||||
logo: "https://kids.turkmenexpo.com/logo.svg",
|
||||
},
|
||||
{
|
||||
link: "https://turkmentextile.turkmenexpo.com/",
|
||||
video:
|
||||
"https://turkmentextile.turkmenexpo.com/app/storage/app/media/video/Textile2025.mp4",
|
||||
logo: "/assets/icons/turkmen-textile.png",
|
||||
},
|
||||
{
|
||||
link: "https://itse.turkmenexpo.com/",
|
||||
video:
|
||||
"https://itse.turkmenexpo.com/app/storage/app/media/video/itse2025.mp4",
|
||||
logo: "https://itse.turkmenexpo.com/logo.svg",
|
||||
|
|
@ -81,7 +83,7 @@ export const Events = async ({ lang }: { lang: string }) => {
|
|||
className="h-10 w-auto object-cover"
|
||||
/>
|
||||
<a
|
||||
href={events[0].logo.slice(0, -8)}
|
||||
href={events[i].link}
|
||||
target="_blank"
|
||||
className="text-PRIMARY underline"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -56,9 +56,11 @@ export const Header = () => {
|
|||
|
||||
{/* Mobile */}
|
||||
|
||||
{/* <div className="h-[74px] tab:hidden"> */}
|
||||
<div className="h-[70px]">
|
||||
<header
|
||||
className={clsx(
|
||||
"bg-[#EEF1F0] border-b border-[#DFE2E1] tab:hidden relative z-[50] flex items-center justify-between px-4 py-6",
|
||||
"bg-[#EEF1F0] border-b z-30 border-[#DFE2E1] tab:hidden fixed top-0 left-0 right-0 flex items-center justify-between px-4 py-6",
|
||||
{
|
||||
// 'fixed w-full top-0': burgerOpen,
|
||||
}
|
||||
|
|
@ -121,10 +123,12 @@ export const Header = () => {
|
|||
|
||||
<AnimatePresence>{burgerOpen && <BurgerMenu />}</AnimatePresence>
|
||||
</header>
|
||||
{/* </div> */}
|
||||
|
||||
{/* Desktop */}
|
||||
|
||||
<header className="hidden border-b border-[#DFE2E1] relative z-[3000] tab:flex flex-col">
|
||||
{/* <div className="hidden h-[74px] tab:block"> */}
|
||||
<header className="hidden border-b border-[#DFE2E1] fixed top-0 left-0 right-0 z-30 tab:flex flex-col">
|
||||
<div className="bg-[#EEF1F0] text-black">
|
||||
<div className="container py-[17px] flex items-center justify-between">
|
||||
<div className="flex items-center">
|
||||
|
|
@ -162,6 +166,8 @@ export const Header = () => {
|
|||
</div>
|
||||
</div>
|
||||
</header>
|
||||
</div>
|
||||
{/* </div> */}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ export const BurgerMenu = () => {
|
|||
x: "100%",
|
||||
opacity: 0,
|
||||
}}
|
||||
className="bg-green overflow-auto fixed w-full z-[900] top-[74px] bottom-0 left-0 min-h-[100vh] h-full px-4 py-10 flex flex-col overflow-y-auto"
|
||||
className="bg-green overflow-auto fixed w-full z-50 top-[66px] bottom-0 left-0 min-h-[100vh] h-full px-4 py-10 flex flex-col overflow-y-auto"
|
||||
>
|
||||
{activeMenu && (
|
||||
<div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue