From da1240ad0f009fe50665cddf65f147235d714bf4 Mon Sep 17 00:00:00 2001 From: Lanskikh Date: Mon, 16 Sep 2024 15:35:31 +0500 Subject: [PATCH] images fixed --- index.html | 2 +- {src/assets => public}/Ellipse.png | Bin .../availables/highlight.png | Bin {src/assets => public}/availables/image.png | Bin .../clients/RussianRailways.png | Bin .../clients/aircraft_industries.png | Bin {src/assets => public}/clients/croc.png | Bin .../clients/dubai_police.png | Bin .../clients/electro_him_pribor.png | Bin {src/assets => public}/clients/elem.png | Bin {src/assets => public}/clients/mintrans.png | Bin .../clients/moscow_government.png | Bin {src/assets => public}/clients/npoa.png | Bin {src/assets => public}/clients/rosatom.png | Bin {src/assets => public}/clients/ugmk.png | Bin .../assets => public}/clients/uralhimmash.png | Bin .../clients/uralvagonzavod.png | Bin {src/assets => public}/clients/urfu.png | Bin {src/assets => public}/clients/uztm.png | Bin .../decreasing/decreasing.mp4 | Bin {src/assets => public}/decreasing/effect.jpg | Bin .../distance/datamining_1.jpg | Bin .../distance/datamining_2.jpg | Bin {src/assets => public}/efficiency/charts.png | Bin {src/assets => public}/efficiency/diagram.png | Bin .../efficiency/efficiency_backlight.svg | 0 .../efficiency/left_variance_figure.svg | 0 {src/assets => public}/efficiency/pizza.png | Bin .../efficiency/right_variance_figure.svg | 0 {src/assets => public}/events/ivolga.jpg | Bin {src/assets => public}/events/ivolga_mini.jpg | Bin .../products/simulators/rzhd.jpg | Bin .../products/simulators/rzhd2.jpg | Bin .../products/teaching/teaching.png | Bin .../products/teaching/teaching_mobile.png | Bin .../products/trainings/trainings_desktop.png | Bin .../products/trainings/trainings_mobile.png | Bin .../products/trainings/trainings_tablet.png | Bin {src/assets => public}/projects/hangar.png | Bin .../assets => public}/projects/helicopter.jpg | Bin .../assets => public}/projects/laboratory.png | Bin {src/assets => public}/projects/loader.png | Bin {src/assets => public}/projects/operator.mp4 | Bin {src/assets => public}/projects/operator.png | Bin {src/assets => public}/projects/plane.png | Bin {src/assets => public}/projects/tank.jpg | Bin {src/assets => public}/projects/train_big.jpg | Bin {src/assets => public}/projects/trains.png | Bin .../recent_projects/laba.png | Bin .../recent_projects/plane.png | Bin .../teaching/current_schedule.jpg | Bin .../teaching/highlight_desktop.png | Bin .../teaching/highlight_mobile.png | Bin .../teaching/highlight_tablet.png | Bin .../teaching/manage_video.jpg | Bin .../teaching/master_card.jpg | Bin {src/assets => public}/teaching/modal.png | Bin .../teaching/pinned_windows.jpg | Bin .../teaching/pinned_windows_mini.jpg | Bin {src/assets => public}/teaching/schedule.jpg | Bin .../teaching/schedule_mini.jpg | Bin {src/assets => public}/teaching/stats.jpg | Bin .../assets => public}/trainings/classroom.png | Bin {src/assets => public}/trainings/stand.png | Bin {src/assets => public}/trainings/vr.png | Bin {src/assets => public}/video/showreel.mp4 | Bin src/components/Layouts/Header.tsx | 80 +++++++++--------- src/components/Main/Decreasing.tsx | 2 +- src/components/Main/Distance.tsx | 4 +- src/components/Main/Efficiency.tsx | 2 +- src/components/Main/Ellipse.tsx | 2 +- src/components/Main/MultiUser.tsx | 6 +- .../Main/Products/Tabs/ForTeachingTab.tsx | 4 +- .../Main/Products/Tabs/IndustrialTab.tsx | 6 +- .../Main/Products/Tabs/SimulatorsTab.tsx | 4 +- src/components/Main/Showreel.tsx | 4 +- src/components/Main/Teaching.tsx | 44 +++++----- src/components/Main/Trainings.tsx | 6 +- src/consts/clients.ts | 30 +++---- src/consts/projects.ts | 17 ++-- 80 files changed, 104 insertions(+), 109 deletions(-) rename {src/assets => public}/Ellipse.png (100%) rename {src/assets => public}/availables/highlight.png (100%) rename {src/assets => public}/availables/image.png (100%) rename {src/assets => public}/clients/RussianRailways.png (100%) rename {src/assets => public}/clients/aircraft_industries.png (100%) rename {src/assets => public}/clients/croc.png (100%) rename {src/assets => public}/clients/dubai_police.png (100%) rename {src/assets => public}/clients/electro_him_pribor.png (100%) rename {src/assets => public}/clients/elem.png (100%) rename {src/assets => public}/clients/mintrans.png (100%) rename {src/assets => public}/clients/moscow_government.png (100%) rename {src/assets => public}/clients/npoa.png (100%) rename {src/assets => public}/clients/rosatom.png (100%) rename {src/assets => public}/clients/ugmk.png (100%) rename {src/assets => public}/clients/uralhimmash.png (100%) rename {src/assets => public}/clients/uralvagonzavod.png (100%) rename {src/assets => public}/clients/urfu.png (100%) rename {src/assets => public}/clients/uztm.png (100%) rename {src/assets => public}/decreasing/decreasing.mp4 (100%) rename {src/assets => public}/decreasing/effect.jpg (100%) rename {src/assets => public}/distance/datamining_1.jpg (100%) rename {src/assets => public}/distance/datamining_2.jpg (100%) rename {src/assets => public}/efficiency/charts.png (100%) rename {src/assets => public}/efficiency/diagram.png (100%) rename {src/assets => public}/efficiency/efficiency_backlight.svg (100%) rename {src/assets => public}/efficiency/left_variance_figure.svg (100%) rename {src/assets => public}/efficiency/pizza.png (100%) rename {src/assets => public}/efficiency/right_variance_figure.svg (100%) rename {src/assets => public}/events/ivolga.jpg (100%) rename {src/assets => public}/events/ivolga_mini.jpg (100%) rename {src/assets => public}/products/simulators/rzhd.jpg (100%) rename {src/assets => public}/products/simulators/rzhd2.jpg (100%) rename {src/assets => public}/products/teaching/teaching.png (100%) rename {src/assets => public}/products/teaching/teaching_mobile.png (100%) rename {src/assets => public}/products/trainings/trainings_desktop.png (100%) rename {src/assets => public}/products/trainings/trainings_mobile.png (100%) rename {src/assets => public}/products/trainings/trainings_tablet.png (100%) rename {src/assets => public}/projects/hangar.png (100%) rename {src/assets => public}/projects/helicopter.jpg (100%) rename {src/assets => public}/projects/laboratory.png (100%) rename {src/assets => public}/projects/loader.png (100%) rename {src/assets => public}/projects/operator.mp4 (100%) rename {src/assets => public}/projects/operator.png (100%) rename {src/assets => public}/projects/plane.png (100%) rename {src/assets => public}/projects/tank.jpg (100%) rename {src/assets => public}/projects/train_big.jpg (100%) rename {src/assets => public}/projects/trains.png (100%) rename {src/assets => public}/recent_projects/laba.png (100%) rename {src/assets => public}/recent_projects/plane.png (100%) rename {src/assets => public}/teaching/current_schedule.jpg (100%) rename {src/assets => public}/teaching/highlight_desktop.png (100%) rename {src/assets => public}/teaching/highlight_mobile.png (100%) rename {src/assets => public}/teaching/highlight_tablet.png (100%) rename {src/assets => public}/teaching/manage_video.jpg (100%) rename {src/assets => public}/teaching/master_card.jpg (100%) rename {src/assets => public}/teaching/modal.png (100%) rename {src/assets => public}/teaching/pinned_windows.jpg (100%) rename {src/assets => public}/teaching/pinned_windows_mini.jpg (100%) rename {src/assets => public}/teaching/schedule.jpg (100%) rename {src/assets => public}/teaching/schedule_mini.jpg (100%) rename {src/assets => public}/teaching/stats.jpg (100%) rename {src/assets => public}/trainings/classroom.png (100%) rename {src/assets => public}/trainings/stand.png (100%) rename {src/assets => public}/trainings/vr.png (100%) rename {src/assets => public}/video/showreel.mp4 (100%) diff --git a/index.html b/index.html index a8c3f56..bbe049c 100644 --- a/index.html +++ b/index.html @@ -27,7 +27,7 @@ diff --git a/src/assets/Ellipse.png b/public/Ellipse.png similarity index 100% rename from src/assets/Ellipse.png rename to public/Ellipse.png diff --git a/src/assets/availables/highlight.png b/public/availables/highlight.png similarity index 100% rename from src/assets/availables/highlight.png rename to public/availables/highlight.png diff --git a/src/assets/availables/image.png b/public/availables/image.png similarity index 100% rename from src/assets/availables/image.png rename to public/availables/image.png diff --git a/src/assets/clients/RussianRailways.png b/public/clients/RussianRailways.png similarity index 100% rename from src/assets/clients/RussianRailways.png rename to public/clients/RussianRailways.png diff --git a/src/assets/clients/aircraft_industries.png b/public/clients/aircraft_industries.png similarity index 100% rename from src/assets/clients/aircraft_industries.png rename to public/clients/aircraft_industries.png diff --git a/src/assets/clients/croc.png b/public/clients/croc.png similarity index 100% rename from src/assets/clients/croc.png rename to public/clients/croc.png diff --git a/src/assets/clients/dubai_police.png b/public/clients/dubai_police.png similarity index 100% rename from src/assets/clients/dubai_police.png rename to public/clients/dubai_police.png diff --git a/src/assets/clients/electro_him_pribor.png b/public/clients/electro_him_pribor.png similarity index 100% rename from src/assets/clients/electro_him_pribor.png rename to public/clients/electro_him_pribor.png diff --git a/src/assets/clients/elem.png b/public/clients/elem.png similarity index 100% rename from src/assets/clients/elem.png rename to public/clients/elem.png diff --git a/src/assets/clients/mintrans.png b/public/clients/mintrans.png similarity index 100% rename from src/assets/clients/mintrans.png rename to public/clients/mintrans.png diff --git a/src/assets/clients/moscow_government.png b/public/clients/moscow_government.png similarity index 100% rename from src/assets/clients/moscow_government.png rename to public/clients/moscow_government.png diff --git a/src/assets/clients/npoa.png b/public/clients/npoa.png similarity index 100% rename from src/assets/clients/npoa.png rename to public/clients/npoa.png diff --git a/src/assets/clients/rosatom.png b/public/clients/rosatom.png similarity index 100% rename from src/assets/clients/rosatom.png rename to public/clients/rosatom.png diff --git a/src/assets/clients/ugmk.png b/public/clients/ugmk.png similarity index 100% rename from src/assets/clients/ugmk.png rename to public/clients/ugmk.png diff --git a/src/assets/clients/uralhimmash.png b/public/clients/uralhimmash.png similarity index 100% rename from src/assets/clients/uralhimmash.png rename to public/clients/uralhimmash.png diff --git a/src/assets/clients/uralvagonzavod.png b/public/clients/uralvagonzavod.png similarity index 100% rename from src/assets/clients/uralvagonzavod.png rename to public/clients/uralvagonzavod.png diff --git a/src/assets/clients/urfu.png b/public/clients/urfu.png similarity index 100% rename from src/assets/clients/urfu.png rename to public/clients/urfu.png diff --git a/src/assets/clients/uztm.png b/public/clients/uztm.png similarity index 100% rename from src/assets/clients/uztm.png rename to public/clients/uztm.png diff --git a/src/assets/decreasing/decreasing.mp4 b/public/decreasing/decreasing.mp4 similarity index 100% rename from src/assets/decreasing/decreasing.mp4 rename to public/decreasing/decreasing.mp4 diff --git a/src/assets/decreasing/effect.jpg b/public/decreasing/effect.jpg similarity index 100% rename from src/assets/decreasing/effect.jpg rename to public/decreasing/effect.jpg diff --git a/src/assets/distance/datamining_1.jpg b/public/distance/datamining_1.jpg similarity index 100% rename from src/assets/distance/datamining_1.jpg rename to public/distance/datamining_1.jpg diff --git a/src/assets/distance/datamining_2.jpg b/public/distance/datamining_2.jpg similarity index 100% rename from src/assets/distance/datamining_2.jpg rename to public/distance/datamining_2.jpg diff --git a/src/assets/efficiency/charts.png b/public/efficiency/charts.png similarity index 100% rename from src/assets/efficiency/charts.png rename to public/efficiency/charts.png diff --git a/src/assets/efficiency/diagram.png b/public/efficiency/diagram.png similarity index 100% rename from src/assets/efficiency/diagram.png rename to public/efficiency/diagram.png diff --git a/src/assets/efficiency/efficiency_backlight.svg b/public/efficiency/efficiency_backlight.svg similarity index 100% rename from src/assets/efficiency/efficiency_backlight.svg rename to public/efficiency/efficiency_backlight.svg diff --git a/src/assets/efficiency/left_variance_figure.svg b/public/efficiency/left_variance_figure.svg similarity index 100% rename from src/assets/efficiency/left_variance_figure.svg rename to public/efficiency/left_variance_figure.svg diff --git a/src/assets/efficiency/pizza.png b/public/efficiency/pizza.png similarity index 100% rename from src/assets/efficiency/pizza.png rename to public/efficiency/pizza.png diff --git a/src/assets/efficiency/right_variance_figure.svg b/public/efficiency/right_variance_figure.svg similarity index 100% rename from src/assets/efficiency/right_variance_figure.svg rename to public/efficiency/right_variance_figure.svg diff --git a/src/assets/events/ivolga.jpg b/public/events/ivolga.jpg similarity index 100% rename from src/assets/events/ivolga.jpg rename to public/events/ivolga.jpg diff --git a/src/assets/events/ivolga_mini.jpg b/public/events/ivolga_mini.jpg similarity index 100% rename from src/assets/events/ivolga_mini.jpg rename to public/events/ivolga_mini.jpg diff --git a/src/assets/products/simulators/rzhd.jpg b/public/products/simulators/rzhd.jpg similarity index 100% rename from src/assets/products/simulators/rzhd.jpg rename to public/products/simulators/rzhd.jpg diff --git a/src/assets/products/simulators/rzhd2.jpg b/public/products/simulators/rzhd2.jpg similarity index 100% rename from src/assets/products/simulators/rzhd2.jpg rename to public/products/simulators/rzhd2.jpg diff --git a/src/assets/products/teaching/teaching.png b/public/products/teaching/teaching.png similarity index 100% rename from src/assets/products/teaching/teaching.png rename to public/products/teaching/teaching.png diff --git a/src/assets/products/teaching/teaching_mobile.png b/public/products/teaching/teaching_mobile.png similarity index 100% rename from src/assets/products/teaching/teaching_mobile.png rename to public/products/teaching/teaching_mobile.png diff --git a/src/assets/products/trainings/trainings_desktop.png b/public/products/trainings/trainings_desktop.png similarity index 100% rename from src/assets/products/trainings/trainings_desktop.png rename to public/products/trainings/trainings_desktop.png diff --git a/src/assets/products/trainings/trainings_mobile.png b/public/products/trainings/trainings_mobile.png similarity index 100% rename from src/assets/products/trainings/trainings_mobile.png rename to public/products/trainings/trainings_mobile.png diff --git a/src/assets/products/trainings/trainings_tablet.png b/public/products/trainings/trainings_tablet.png similarity index 100% rename from src/assets/products/trainings/trainings_tablet.png rename to public/products/trainings/trainings_tablet.png diff --git a/src/assets/projects/hangar.png b/public/projects/hangar.png similarity index 100% rename from src/assets/projects/hangar.png rename to public/projects/hangar.png diff --git a/src/assets/projects/helicopter.jpg b/public/projects/helicopter.jpg similarity index 100% rename from src/assets/projects/helicopter.jpg rename to public/projects/helicopter.jpg diff --git a/src/assets/projects/laboratory.png b/public/projects/laboratory.png similarity index 100% rename from src/assets/projects/laboratory.png rename to public/projects/laboratory.png diff --git a/src/assets/projects/loader.png b/public/projects/loader.png similarity index 100% rename from src/assets/projects/loader.png rename to public/projects/loader.png diff --git a/src/assets/projects/operator.mp4 b/public/projects/operator.mp4 similarity index 100% rename from src/assets/projects/operator.mp4 rename to public/projects/operator.mp4 diff --git a/src/assets/projects/operator.png b/public/projects/operator.png similarity index 100% rename from src/assets/projects/operator.png rename to public/projects/operator.png diff --git a/src/assets/projects/plane.png b/public/projects/plane.png similarity index 100% rename from src/assets/projects/plane.png rename to public/projects/plane.png diff --git a/src/assets/projects/tank.jpg b/public/projects/tank.jpg similarity index 100% rename from src/assets/projects/tank.jpg rename to public/projects/tank.jpg diff --git a/src/assets/projects/train_big.jpg b/public/projects/train_big.jpg similarity index 100% rename from src/assets/projects/train_big.jpg rename to public/projects/train_big.jpg diff --git a/src/assets/projects/trains.png b/public/projects/trains.png similarity index 100% rename from src/assets/projects/trains.png rename to public/projects/trains.png diff --git a/src/assets/recent_projects/laba.png b/public/recent_projects/laba.png similarity index 100% rename from src/assets/recent_projects/laba.png rename to public/recent_projects/laba.png diff --git a/src/assets/recent_projects/plane.png b/public/recent_projects/plane.png similarity index 100% rename from src/assets/recent_projects/plane.png rename to public/recent_projects/plane.png diff --git a/src/assets/teaching/current_schedule.jpg b/public/teaching/current_schedule.jpg similarity index 100% rename from src/assets/teaching/current_schedule.jpg rename to public/teaching/current_schedule.jpg diff --git a/src/assets/teaching/highlight_desktop.png b/public/teaching/highlight_desktop.png similarity index 100% rename from src/assets/teaching/highlight_desktop.png rename to public/teaching/highlight_desktop.png diff --git a/src/assets/teaching/highlight_mobile.png b/public/teaching/highlight_mobile.png similarity index 100% rename from src/assets/teaching/highlight_mobile.png rename to public/teaching/highlight_mobile.png diff --git a/src/assets/teaching/highlight_tablet.png b/public/teaching/highlight_tablet.png similarity index 100% rename from src/assets/teaching/highlight_tablet.png rename to public/teaching/highlight_tablet.png diff --git a/src/assets/teaching/manage_video.jpg b/public/teaching/manage_video.jpg similarity index 100% rename from src/assets/teaching/manage_video.jpg rename to public/teaching/manage_video.jpg diff --git a/src/assets/teaching/master_card.jpg b/public/teaching/master_card.jpg similarity index 100% rename from src/assets/teaching/master_card.jpg rename to public/teaching/master_card.jpg diff --git a/src/assets/teaching/modal.png b/public/teaching/modal.png similarity index 100% rename from src/assets/teaching/modal.png rename to public/teaching/modal.png diff --git a/src/assets/teaching/pinned_windows.jpg b/public/teaching/pinned_windows.jpg similarity index 100% rename from src/assets/teaching/pinned_windows.jpg rename to public/teaching/pinned_windows.jpg diff --git a/src/assets/teaching/pinned_windows_mini.jpg b/public/teaching/pinned_windows_mini.jpg similarity index 100% rename from src/assets/teaching/pinned_windows_mini.jpg rename to public/teaching/pinned_windows_mini.jpg diff --git a/src/assets/teaching/schedule.jpg b/public/teaching/schedule.jpg similarity index 100% rename from src/assets/teaching/schedule.jpg rename to public/teaching/schedule.jpg diff --git a/src/assets/teaching/schedule_mini.jpg b/public/teaching/schedule_mini.jpg similarity index 100% rename from src/assets/teaching/schedule_mini.jpg rename to public/teaching/schedule_mini.jpg diff --git a/src/assets/teaching/stats.jpg b/public/teaching/stats.jpg similarity index 100% rename from src/assets/teaching/stats.jpg rename to public/teaching/stats.jpg diff --git a/src/assets/trainings/classroom.png b/public/trainings/classroom.png similarity index 100% rename from src/assets/trainings/classroom.png rename to public/trainings/classroom.png diff --git a/src/assets/trainings/stand.png b/public/trainings/stand.png similarity index 100% rename from src/assets/trainings/stand.png rename to public/trainings/stand.png diff --git a/src/assets/trainings/vr.png b/public/trainings/vr.png similarity index 100% rename from src/assets/trainings/vr.png rename to public/trainings/vr.png diff --git a/src/assets/video/showreel.mp4 b/public/video/showreel.mp4 similarity index 100% rename from src/assets/video/showreel.mp4 rename to public/video/showreel.mp4 diff --git a/src/components/Layouts/Header.tsx b/src/components/Layouts/Header.tsx index 7ff2101..329534c 100644 --- a/src/components/Layouts/Header.tsx +++ b/src/components/Layouts/Header.tsx @@ -1,9 +1,9 @@ -import { AnimatePresence, motion } from 'framer-motion'; +import { motion } from 'framer-motion'; import { PropsWithChildren, useRef, useState } from 'react'; import { AnchorLink } from '../../ui/AnchorLink'; import { Link } from 'react-router-dom'; -import { Lang, useLanguageStore } from '../../store/languageStore'; -import { useHover, useOnClickOutside } from 'usehooks-ts'; +import { useLanguageStore } from '../../store/languageStore'; +import { useOnClickOutside } from 'usehooks-ts'; import { useModalStore } from '../../store/modalStore'; import { ModalWithForm } from '../Main/ModalWithForm'; import { Button } from '../../ui/Button'; @@ -13,11 +13,9 @@ import { BurgerIcon } from '../icons/BurgerIcon'; import { CloseIcon } from '../icons/CloseIcon'; import { CubeIcon } from '../icons/CubeIcon'; import { useWindowWidth } from '../../hooks/useWindowWidth'; -import { ChevronDownIcon } from '../icons/ChevronDownIcon'; export function Header() { const [menuOpen, setMenuOpen] = useState(false); - // const { lang } = useLanguageStore(); const setModal = useModalStore(state => state.setModal); const menuRef = useRef(null); @@ -127,40 +125,40 @@ function ChooseLang({ currentLang }: { currentLang: 'RU' | 'EN' }) { ); } -function LangToggler({ lang }: { lang: Lang }) { - const [open, setOpen] = useState(false); - const langTogglerRef = useRef(null); - useOnClickOutside(langTogglerRef, () => setOpen(false)); - const hovered = useHover(langTogglerRef); +// function LangToggler({ lang }: { lang: Lang }) { +// const [open, setOpen] = useState(false); +// const langTogglerRef = useRef(null); +// useOnClickOutside(langTogglerRef, () => setOpen(false)); +// const hovered = useHover(langTogglerRef); - return ( -
- - - setOpen(false)} - initial={{ visibility: 'hidden', opacity: 0 }} - animate={{ - visibility: open ? 'visible' : 'hidden', - opacity: +open, - }} - exit={{ visibility: 'hidden', opacity: 0 }} - > - - - - -
- ); -} +// return ( +//
+// +// +// setOpen(false)} +// initial={{ visibility: 'hidden', opacity: 0 }} +// animate={{ +// visibility: open ? 'visible' : 'hidden', +// opacity: +open, +// }} +// exit={{ visibility: 'hidden', opacity: 0 }} +// > +// +// +// +// +//
+// ); +// } diff --git a/src/components/Main/Decreasing.tsx b/src/components/Main/Decreasing.tsx index 8e82245..f0f76f8 100644 --- a/src/components/Main/Decreasing.tsx +++ b/src/components/Main/Decreasing.tsx @@ -47,7 +47,7 @@ export function Decreasing() {