From fff9e63d43a3157edc1011ae7f404f539e334394 Mon Sep 17 00:00:00 2001 From: Batyr Date: Fri, 21 Nov 2025 11:16:42 +0500 Subject: [PATCH 1/9] renamed --- app/(root)/(mainMenu)/company/aboutus/page.tsx | 2 +- app/(root)/(mainMenu)/news/[id]/page.tsx | 2 +- app/(root)/(mainMenu)/news/page.tsx | 2 +- app/(root)/(mainMenu)/services/additional/page.tsx | 2 +- app/(root)/(mainMenu)/services/advertising/page.tsx | 2 +- app/(root)/(mainMenu)/services/business-tours/page.tsx | 2 +- app/(root)/(mainMenu)/services/certification/page.tsx | 2 +- app/(root)/(mainMenu)/services/forwarding/page.tsx | 2 +- app/(root)/(mainMenu)/services/hybrid-organizations/page.tsx | 2 +- app/(root)/(mainMenu)/services/meetings/page.tsx | 2 +- app/(root)/(mainMenu)/services/missions/page.tsx | 2 +- app/(root)/(mainMenu)/services/organization/page.tsx | 2 +- app/(root)/(mainMenu)/services/outsourcing/page.tsx | 2 +- app/(root)/(mainMenu)/services/personnel-training/page.tsx | 2 +- app/(root)/(mainMenu)/visitors/page.tsx | 2 +- app/(root)/(mainMenu)/visitors/rules-for-visitors/page.tsx | 2 +- app/(root)/calendar/page.tsx | 2 +- .../page/{layout-with-sidebar.tsx => LayoutWithSidebar.tsx} | 2 +- components/shared/News.tsx | 2 +- components/shared/Partners.tsx | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) rename components/page/{layout-with-sidebar.tsx => LayoutWithSidebar.tsx} (96%) diff --git a/app/(root)/(mainMenu)/company/aboutus/page.tsx b/app/(root)/(mainMenu)/company/aboutus/page.tsx index 4364f9b..d8b3b64 100644 --- a/app/(root)/(mainMenu)/company/aboutus/page.tsx +++ b/app/(root)/(mainMenu)/company/aboutus/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getAbout } from "@/services/about"; import { cookies } from "next/headers"; diff --git a/app/(root)/(mainMenu)/news/[id]/page.tsx b/app/(root)/(mainMenu)/news/[id]/page.tsx index 33513cb..a32bb2e 100644 --- a/app/(root)/(mainMenu)/news/[id]/page.tsx +++ b/app/(root)/(mainMenu)/news/[id]/page.tsx @@ -11,7 +11,7 @@ import { baseAPI } from "@/lib/API"; import { NewsPageType } from "@/lib/types/NewsPage.type"; import Link from "next/link"; import { BreadCrumbs } from "@/components/ui/bread-crumbs"; -import { Title } from "@/components/ui/title"; +import { Title } from "@/components/ui/Title"; import Loader from "@/components/ui/Loader"; export default function SingleNewsPage({ params }: { params: { id: string } }) { diff --git a/app/(root)/(mainMenu)/news/page.tsx b/app/(root)/(mainMenu)/news/page.tsx index e2fa483..7e051b2 100644 --- a/app/(root)/(mainMenu)/news/page.tsx +++ b/app/(root)/(mainMenu)/news/page.tsx @@ -12,7 +12,7 @@ import clsx from "clsx"; import { Card } from "@/components/shared/Card"; import { BorderBtn } from "@/components/ui/Buttons"; import { Pagination } from "@/components/ui/Pagination"; -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; const News = () => { const { activeLang } = useAppSelector(selectHeader); diff --git a/app/(root)/(mainMenu)/services/additional/page.tsx b/app/(root)/(mainMenu)/services/additional/page.tsx index 133a775..a6c13b7 100644 --- a/app/(root)/(mainMenu)/services/additional/page.tsx +++ b/app/(root)/(mainMenu)/services/additional/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function AdvertisingPage() { diff --git a/app/(root)/(mainMenu)/services/advertising/page.tsx b/app/(root)/(mainMenu)/services/advertising/page.tsx index c773694..dfe87d6 100644 --- a/app/(root)/(mainMenu)/services/advertising/page.tsx +++ b/app/(root)/(mainMenu)/services/advertising/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function AdvertisingPage() { diff --git a/app/(root)/(mainMenu)/services/business-tours/page.tsx b/app/(root)/(mainMenu)/services/business-tours/page.tsx index 7d55298..972af0f 100644 --- a/app/(root)/(mainMenu)/services/business-tours/page.tsx +++ b/app/(root)/(mainMenu)/services/business-tours/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function BusinessTours() { diff --git a/app/(root)/(mainMenu)/services/certification/page.tsx b/app/(root)/(mainMenu)/services/certification/page.tsx index 0212ba5..98c2394 100644 --- a/app/(root)/(mainMenu)/services/certification/page.tsx +++ b/app/(root)/(mainMenu)/services/certification/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function CertificationPage() { diff --git a/app/(root)/(mainMenu)/services/forwarding/page.tsx b/app/(root)/(mainMenu)/services/forwarding/page.tsx index d7906ce..0c4c6f8 100644 --- a/app/(root)/(mainMenu)/services/forwarding/page.tsx +++ b/app/(root)/(mainMenu)/services/forwarding/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function ForwardingPage() { diff --git a/app/(root)/(mainMenu)/services/hybrid-organizations/page.tsx b/app/(root)/(mainMenu)/services/hybrid-organizations/page.tsx index 9fc91b6..9f52436 100644 --- a/app/(root)/(mainMenu)/services/hybrid-organizations/page.tsx +++ b/app/(root)/(mainMenu)/services/hybrid-organizations/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function HybridsPage() { diff --git a/app/(root)/(mainMenu)/services/meetings/page.tsx b/app/(root)/(mainMenu)/services/meetings/page.tsx index e7f90d1..1fa8f70 100644 --- a/app/(root)/(mainMenu)/services/meetings/page.tsx +++ b/app/(root)/(mainMenu)/services/meetings/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function MeetingsPage() { diff --git a/app/(root)/(mainMenu)/services/missions/page.tsx b/app/(root)/(mainMenu)/services/missions/page.tsx index c70f454..68b74f8 100644 --- a/app/(root)/(mainMenu)/services/missions/page.tsx +++ b/app/(root)/(mainMenu)/services/missions/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function MissionsPage() { diff --git a/app/(root)/(mainMenu)/services/organization/page.tsx b/app/(root)/(mainMenu)/services/organization/page.tsx index 30f4f35..89beb10 100644 --- a/app/(root)/(mainMenu)/services/organization/page.tsx +++ b/app/(root)/(mainMenu)/services/organization/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function OrganizationPage() { diff --git a/app/(root)/(mainMenu)/services/outsourcing/page.tsx b/app/(root)/(mainMenu)/services/outsourcing/page.tsx index 62ba53c..b524d0b 100644 --- a/app/(root)/(mainMenu)/services/outsourcing/page.tsx +++ b/app/(root)/(mainMenu)/services/outsourcing/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function OutsourcingPage() { diff --git a/app/(root)/(mainMenu)/services/personnel-training/page.tsx b/app/(root)/(mainMenu)/services/personnel-training/page.tsx index 89011ab..4616313 100644 --- a/app/(root)/(mainMenu)/services/personnel-training/page.tsx +++ b/app/(root)/(mainMenu)/services/personnel-training/page.tsx @@ -1,4 +1,4 @@ -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { getServices } from "@/services/services"; export default async function PersonalTrainingPage() { diff --git a/app/(root)/(mainMenu)/visitors/page.tsx b/app/(root)/(mainMenu)/visitors/page.tsx index ec941ff..3fa60d9 100644 --- a/app/(root)/(mainMenu)/visitors/page.tsx +++ b/app/(root)/(mainMenu)/visitors/page.tsx @@ -1,6 +1,6 @@ "use client"; -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { baseAPI } from "@/lib/API"; import { useAppSelector } from "@/redux/hooks"; import { selectHeader } from "@/redux/slices/headerSlice"; diff --git a/app/(root)/(mainMenu)/visitors/rules-for-visitors/page.tsx b/app/(root)/(mainMenu)/visitors/rules-for-visitors/page.tsx index 0a3fddf..dce7035 100644 --- a/app/(root)/(mainMenu)/visitors/rules-for-visitors/page.tsx +++ b/app/(root)/(mainMenu)/visitors/rules-for-visitors/page.tsx @@ -1,6 +1,6 @@ "use client"; -import { LayoutWithSidebar } from "@/components/page/layout-with-sidebar"; +import { LayoutWithSidebar } from "@/components/page/LayoutWithSidebar"; import { baseAPI } from "@/lib/API"; import { useAppSelector } from "@/redux/hooks"; import { selectHeader } from "@/redux/slices/headerSlice"; diff --git a/app/(root)/calendar/page.tsx b/app/(root)/calendar/page.tsx index 84e2a47..a75fd67 100644 --- a/app/(root)/calendar/page.tsx +++ b/app/(root)/calendar/page.tsx @@ -1,6 +1,6 @@ import { EventCard } from "@/components/shared/event-card"; import { BreadCrumbs } from "@/components/ui/bread-crumbs"; -import { Title } from "@/components/ui/title"; +import { Title } from "@/components/ui/Title"; import { getCalendar } from "@/services/calendar"; import { Metadata } from "next"; import { cookies } from "next/headers"; diff --git a/components/page/layout-with-sidebar.tsx b/components/page/LayoutWithSidebar.tsx similarity index 96% rename from components/page/layout-with-sidebar.tsx rename to components/page/LayoutWithSidebar.tsx index 7675aa5..a0d3979 100644 --- a/components/page/layout-with-sidebar.tsx +++ b/components/page/LayoutWithSidebar.tsx @@ -4,7 +4,7 @@ import React from "react"; import { BreadCrumbs } from "../ui/bread-crumbs"; import { usePathname } from "next/navigation"; import { useAppSelector } from "@/redux/hooks"; -import { Title } from "../ui/title"; +import { Title } from "../ui/Title"; interface Props { title: string; diff --git a/components/shared/News.tsx b/components/shared/News.tsx index 76214b4..0fe1059 100644 --- a/components/shared/News.tsx +++ b/components/shared/News.tsx @@ -20,7 +20,7 @@ import "swiper/css/scrollbar"; import Link from "next/link"; import { useLang } from "@/utils/useLang"; import { GreenBtn } from "../ui/Buttons"; -import { Title } from "../ui/title"; +import { Title } from "../ui/Title"; import Loader from "@/components/ui/Loader"; export const News = () => { diff --git a/components/shared/Partners.tsx b/components/shared/Partners.tsx index 454c56d..a449fd5 100644 --- a/components/shared/Partners.tsx +++ b/components/shared/Partners.tsx @@ -10,7 +10,7 @@ import { selectHeader } from "@/redux/slices/headerSlice"; import { PartnersType } from "@/lib/types/PartnersData.type"; import { baseAPI } from "@/lib/API"; import { useLang } from "@/utils/useLang"; -import { Title } from "../ui/title"; +import { Title } from "../ui/Title"; export const Partners = () => { const { activeLang } = useAppSelector(selectHeader); From b0f094000ababecd2a048547e303e70a95c01f49 Mon Sep 17 00:00:00 2001 From: Batyr Date: Fri, 21 Nov 2025 11:56:33 +0500 Subject: [PATCH 2/9] renamed --- app/(root)/(mainMenu)/news/[id]/page.tsx | 2 +- app/(root)/calendar/page.tsx | 2 +- components/page/LayoutWithSidebar.tsx | 2 +- components/shared/News.tsx | 2 +- components/shared/Partners.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/(root)/(mainMenu)/news/[id]/page.tsx b/app/(root)/(mainMenu)/news/[id]/page.tsx index a32bb2e..33513cb 100644 --- a/app/(root)/(mainMenu)/news/[id]/page.tsx +++ b/app/(root)/(mainMenu)/news/[id]/page.tsx @@ -11,7 +11,7 @@ import { baseAPI } from "@/lib/API"; import { NewsPageType } from "@/lib/types/NewsPage.type"; import Link from "next/link"; import { BreadCrumbs } from "@/components/ui/bread-crumbs"; -import { Title } from "@/components/ui/Title"; +import { Title } from "@/components/ui/title"; import Loader from "@/components/ui/Loader"; export default function SingleNewsPage({ params }: { params: { id: string } }) { diff --git a/app/(root)/calendar/page.tsx b/app/(root)/calendar/page.tsx index a75fd67..84e2a47 100644 --- a/app/(root)/calendar/page.tsx +++ b/app/(root)/calendar/page.tsx @@ -1,6 +1,6 @@ import { EventCard } from "@/components/shared/event-card"; import { BreadCrumbs } from "@/components/ui/bread-crumbs"; -import { Title } from "@/components/ui/Title"; +import { Title } from "@/components/ui/title"; import { getCalendar } from "@/services/calendar"; import { Metadata } from "next"; import { cookies } from "next/headers"; diff --git a/components/page/LayoutWithSidebar.tsx b/components/page/LayoutWithSidebar.tsx index a0d3979..7675aa5 100644 --- a/components/page/LayoutWithSidebar.tsx +++ b/components/page/LayoutWithSidebar.tsx @@ -4,7 +4,7 @@ import React from "react"; import { BreadCrumbs } from "../ui/bread-crumbs"; import { usePathname } from "next/navigation"; import { useAppSelector } from "@/redux/hooks"; -import { Title } from "../ui/Title"; +import { Title } from "../ui/title"; interface Props { title: string; diff --git a/components/shared/News.tsx b/components/shared/News.tsx index 0fe1059..76214b4 100644 --- a/components/shared/News.tsx +++ b/components/shared/News.tsx @@ -20,7 +20,7 @@ import "swiper/css/scrollbar"; import Link from "next/link"; import { useLang } from "@/utils/useLang"; import { GreenBtn } from "../ui/Buttons"; -import { Title } from "../ui/Title"; +import { Title } from "../ui/title"; import Loader from "@/components/ui/Loader"; export const News = () => { diff --git a/components/shared/Partners.tsx b/components/shared/Partners.tsx index a449fd5..454c56d 100644 --- a/components/shared/Partners.tsx +++ b/components/shared/Partners.tsx @@ -10,7 +10,7 @@ import { selectHeader } from "@/redux/slices/headerSlice"; import { PartnersType } from "@/lib/types/PartnersData.type"; import { baseAPI } from "@/lib/API"; import { useLang } from "@/utils/useLang"; -import { Title } from "../ui/Title"; +import { Title } from "../ui/title"; export const Partners = () => { const { activeLang } = useAppSelector(selectHeader); From e1dbfa0720037a73327dcd8118d36d342532b759 Mon Sep 17 00:00:00 2001 From: Batyr Date: Fri, 21 Nov 2025 12:06:13 +0500 Subject: [PATCH 3/9] renamed --- components/shared/Header.tsx | 2 +- components/ui/{lang-menu.tsx => LangMenu.tsx} | 0 components/ui/burger-menu.tsx | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename components/ui/{lang-menu.tsx => LangMenu.tsx} (100%) diff --git a/components/shared/Header.tsx b/components/shared/Header.tsx index 5917a6c..b4fed45 100644 --- a/components/shared/Header.tsx +++ b/components/shared/Header.tsx @@ -10,7 +10,7 @@ import logo from "@/public/assets/icons/logo.svg"; import search from "@/public/assets/icons/header/search.svg"; import searchMob from "@/public/assets/icons/header/mob-search.svg"; -import { LangMenu } from "../ui/lang-menu"; +import { LangMenu } from "../ui/LangMenu"; import { SearchInput } from "./search-input"; import { headerMenu2 } from "@/lib/database/pathnames"; import { BurgerMenu } from "../ui/burger-menu"; diff --git a/components/ui/lang-menu.tsx b/components/ui/LangMenu.tsx similarity index 100% rename from components/ui/lang-menu.tsx rename to components/ui/LangMenu.tsx diff --git a/components/ui/burger-menu.tsx b/components/ui/burger-menu.tsx index a2837c4..9b6d76e 100644 --- a/components/ui/burger-menu.tsx +++ b/components/ui/burger-menu.tsx @@ -11,7 +11,7 @@ import { activeLangType, setActiveLang } from "@/redux/slices/headerSlice"; import clsx from "clsx"; import { burgerMenu, burgerMenu2 } from "@/lib/database/header"; import { useRouter } from "next/navigation"; -import { lang } from "./lang-menu"; +import { lang } from "./LangMenu"; interface flagTypes { // title: 'Ру' | 'En' | 'Tm'; From 0f4cd2b3740e4d8a6b594643cd63f7ab85542ac6 Mon Sep 17 00:00:00 2001 From: Batyr Date: Fri, 21 Nov 2025 15:28:26 +0500 Subject: [PATCH 4/9] video added into hero banner --- components/shared/Header.tsx | 2 -- components/shared/Slider.tsx | 26 +++++++++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/components/shared/Header.tsx b/components/shared/Header.tsx index b4fed45..a124617 100644 --- a/components/shared/Header.tsx +++ b/components/shared/Header.tsx @@ -18,7 +18,6 @@ import { useAppDispatch, useAppSelector } from "@/redux/hooks"; import { selectHeader, setShowInput } from "@/redux/slices/headerSlice"; import { selectBurger, setBurgerOpen } from "@/redux/slices/burgerSlice"; import { useStorage } from "@/hooks/useStorage"; -import { usePathname, useRouter } from "next/navigation"; export const Header = () => { const dispatch = useAppDispatch(); @@ -26,7 +25,6 @@ export const Header = () => { const { burgerOpen } = useAppSelector(selectBurger); const { activeLang } = useAppSelector(selectHeader); const [activeLink, setActiveLink] = useState(""); - const pathname = usePathname(); const toggleMenu = () => { dispatch(setBurgerOpen(!burgerOpen)); diff --git a/components/shared/Slider.tsx b/components/shared/Slider.tsx index f3a573f..7e4add3 100644 --- a/components/shared/Slider.tsx +++ b/components/shared/Slider.tsx @@ -59,7 +59,7 @@ export const Slider = ({ lang }: { lang: string }) => { { target="_blank" className="size-full" > - {item?.title} + {item.image.includes(".mp4") ? ( +