fixed teaching

This commit is contained in:
2024-08-27 15:11:28 +05:00
parent 53222de466
commit 9f1a2636ad
14 changed files with 151 additions and 163 deletions

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1022 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 276 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 239 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 26 KiB

+1 -1
View File
@@ -8,7 +8,7 @@ export function Layout() {
return (
<>
<Header />
<main className="relative overflow-clip lg:px-10 sm:px-6 px-4">
<main className="relative overflow-hidden lg:px-10 sm:px-6 px-4">
<Outlet />
<Feedback />
</main>
+5 -5
View File
@@ -6,12 +6,12 @@ import { useEffect, useRef } from 'react';
export function Effeciency() {
return (
<div className="lg:py-[70px] py-14">
<div className="pt-5 gap-x-4 gap-y-8 sm:grid lg:grid-cols-12 sm:grid-cols-8 grid-rows-[repeat(fit,3)]">
<div className="pt-5 gap-x-4 gap-y-8 sm:grid lg:grid-cols-12 sm:grid-cols-8 sm:grid-rows-[repeat(fit,3)] max-sm:space-y-6">
<MiniTitle
text={'экономическая эффективность'}
className="col-span-3"
/>
<div className="grid lg:grid-cols-3 sm:grid-cols-2 sm:max-lg:grid-rows-[repeat(320px,2)] lg:-mx-10 sm:-mx-6 -mx-4 row-start-2 col-span-full">
<div className="grid lg:grid-cols-3 sm:grid-cols-2 sm:max-lg:grid-rows-[320px_320px] lg:-mx-10 sm:-mx-6 -mx-4 row-start-2 col-span-full">
<Figure
percents={50}
type="charts"
@@ -29,7 +29,7 @@ export function Effeciency() {
/>
</div>
<AppearanceText
className="row-start-3 col-span-6"
className="row-start-3 lg:col-span-6 col-span-full"
splits={[
'В тренажере человек ',
'принимает решения ',
@@ -84,13 +84,13 @@ function Figure({
<motion.div
ref={root}
initial={{
background: `bottom right / 50% url(src/assets/efficiency/${type}.png) no-repeat, bottom right / 0% 0% url(src/assets/efficiency/efficiency_backlight.svg) no-repeat`,
background: `bottom right / 50% url(src/assets/efficiency/${type}.png) no-repeat, bottom right / 0% url(src/assets/efficiency/efficiency_backlight.svg) no-repeat`,
}}
whileHover={{
backgroundSize: '50%,100% 100%',
transition: { duration: 0.075 },
}}
className="flex px-10 w-full pt-6 bg-no-repeat lg:aspect-[532.67/360] relative border-y border-r last:border-r-0 border-[#3D425C] sm:max-lg:last:col-span-2 sm:max-lg:last:row-start-2"
className="flex px-10 w-full pt-6 bg-no-repeat max-sm:aspect-[3/2] max-sm:border-t max-sm:last:border-b lg:aspect-[532.67/360] relative lg:border-y sm:max-lg:border-t sm:max-lg:last:border-b lg:border-r sm:first:border-r last:border-r-0 border-[#3D425C] sm:max-lg:last:col-span-2 sm:max-lg:row-start-1 sm:max-lg:last:row-start-2"
>
<div className="flex flex-col justify-between pb-6 max-sm:max-w-[50vw]">
<h3 className="lg:font-medium l-text 2xl:max-w-[70%]">{title}</h3>
+143 -153
View File
@@ -22,115 +22,9 @@ export function Teaching() {
function TeachingFeaturesForDesktop() {
return (
<div className="hidden flex-col gap-y-4 flex-wrap lg:flex col-span-7">
<div className="p-10 border border-[#3D425C] bg-[url(src/assets/teaching/highlight.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all overflow-hidden items-end flex justify-between">
<div className="max-w-[380px] flex flex-col justify-between self-stretch">
<div>
<TeachingFeatureTitle>Управление процессом</TeachingFeatureTitle>
<TeachingFeatureDescription className="max-w-[361px]">
Назначение сценария обучения
<br />
Выбор режима: обучение, тренировка, тестирование
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/master_card.jpg"
className="rounded-lg z-30 w-[max(198px,12.4vw)] relative left-[17.5vw]"
alt="Управление процессом"
/>
</div>
<img
src="src/assets/teaching/schedule.jpg"
className="rounded-tl-2xl w-[25vw] aspect-[406/357] -mr-10 -mb-10"
alt="Управление процессом"
/>
</div>
<div className="p-10 border border-[#3D425C] bg-[url(src/assets/teaching/highlight.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all flex min-h-[400px] justify-between gap-x-3 overflow-hidden">
<div className="w-fit">
<TeachingFeatureTitle className="w-fit">
Управление пользователями
</TeachingFeatureTitle>
<TeachingFeatureDescription className="w-fit">
Добавление, удаление
<br />и назначение ролей
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/modal.jpg"
className="rounded-lg w-[29.5vw] aspect-[468/306] self-end"
alt="Управление пользователями"
/>
</div>
<div className="p-10 border border-[#3D425C] bg-[url(src/assets/teaching/highlight.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all flex justify-between min-h-[400px] items-stretch overflow-hidden">
<div className="max-w-1/2 flex flex-col justify-between">
<div>
<TeachingFeatureTitle>Видеозапись обучения</TeachingFeatureTitle>
<TeachingFeatureDescription className="max-w-[25.6vw]">
Фиксация и хранение сессий обучения, тренировки и тестирования.
Ретроспектива по пройденной сессии вместе с инструктором
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/manage_video.jpg"
className="rounded-lg w-[max(174.75px,10.9vw)] z-30 relative left-[22.1vw]"
alt="Видеозапись обучения"
/>
</div>
<img
src="src/assets/teaching/pinned_windows.jpg"
className="rounded-tl-lg w-[24vw] relative left-10 self-end top-10"
alt="Видеозапись обучения"
/>
</div>
<div className="p-10 border border-[#3D425C] bg-[url(src/assets/teaching/highlight.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all min-h-[400px] flex justify-between">
<div>
<TeachingFeatureTitle>Статистика обучения</TeachingFeatureTitle>
<TeachingFeatureDescription className="max-w-[17.5vw]">
Фиксация правильных и неправильных действий.
<br />
Отчет об ошибках
</TeachingFeatureDescription>
</div>
<div className="flex self-end">
<img
src="src/assets/teaching/current_schedule.jpg"
className="rounded-lg self-end relative w-[13.875vw]"
alt="Расписание"
/>
<img
src="src/assets/teaching/stats.jpg"
className="rounded-lg mb-[27px] relative z-10 right-9 w-[13.875vw]"
alt="Статистика"
/>
</div>
</div>
</div>
);
}
function TeachingFeaturesForOtherScreens() {
return (
<div className="flex flex-col gap-y-2 md:grid grid-rows-[272px_105px_249px] sm:gap-3 grid-cols-2 lg:hidden">
<div className="border border-[#3D425C] bg-[url(src/assets/teaching/highlight.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all sm:pt-6 sm:px-6 pt-5 px-5 overflow-hidden row-start-1 col-start-1">
<TeachingFeatureTitle>
Управление
<br /> пользователями
</TeachingFeatureTitle>
<TeachingFeatureDescription>
Добавление, удаление и назначение ролей
</TeachingFeatureDescription>
<img
src="src/assets/teaching/modal.jpg"
className="relative max-sm:w-[351px] sm:max-md:w-[55vw] md:top-7 top-5 max-sm:left-[92px] self-end sm:max-md:m-auto sm:rounded-lg rounded-md"
alt="Управление пользователями"
/>
</div>
<div className="border border-[#3D425C] bg-[url(src/assets/teaching/highlight.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all sm:pt-6 sm:px-6 pt-5 px-5 row-start-1 row-span-2 col-start-2 flex flex-col gap-y-4 h-full overflow-hidden">
<div>
<div className="max-lg:hidden space-y-4 col-span-7">
<div className="p-10 relative aspect-[752/400] border border-[#3D425C] bg-[url(src/assets/teaching/highlight_desktop.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all overflow-hidden flex justify-between">
<div className="space-y-2 max-w-[calc(380/1600*100vw)]">
<TeachingFeatureTitle>Управление процессом</TeachingFeatureTitle>
<TeachingFeatureDescription>
Назначение сценария обучения
@@ -138,60 +32,156 @@ function TeachingFeaturesForOtherScreens() {
Выбор режима: обучение, тренировка, тестирование
</TeachingFeatureDescription>
</div>
<div className="flex flex-col justify-center">
<img
src="src/assets/teaching/schedule_mini.jpg"
className="rounded-tl-xl relative self-end md:left-[69px] max-md:-mr-5 w-[min(55vw)]"
alt="Расписание"
/>
<img
src="src/assets/teaching/master_card.jpg"
className="rounded-lg max-md:w-[max(148px,41.1vw)] md:w-[19.2vw] absolute mb-10"
alt="Управление процессом"
/>
</div>
<img
src="src/assets/teaching/master_card.jpg"
className="rounded-lg absolute max-w-[calc(198/1600*100vw)] left-[calc(321/1600*100vw)] bottom-10 z-10"
alt="Управление процессом"
/>
<img
src="src/assets/teaching/schedule_mini.jpg"
className="rounded-tl-2xl max-w-[calc(406/1600*100vw)] absolute top-[calc(69/400*100%)] left-[calc(475/1600*100vw)]"
alt="Управление процессом"
/>
</div>
<div className="border border-[#3D425C] bg-[url(src/assets/teaching/highlight.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all sm:pt-6 sm:px-6 pt-5 px-5 row-start-2 row-span-2 col-start-1 overflow-hidden flex flex-col gap-y-4">
<div>
<TeachingFeatureTitle>Видеозапись обучения</TeachingFeatureTitle>
<div className="p-10 relative aspect-[752/400] border border-[#3D425C] bg-[url(src/assets/teaching/highlight_desktop.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all flex justify-between gap-x-3 overflow-hidden">
<div className="space-y-2 max-w-[calc(380/752*100%)]">
<TeachingFeatureTitle>Управление пользователями</TeachingFeatureTitle>
<TeachingFeatureDescription>
Добавление, удаление
<br />и назначение ролей
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/modal.png"
className="rounded-lg -mr-10"
alt="Управление пользователями"
/>
</div>
<div className="p-10 relative border border-[#3D425C] aspect-[752/400] bg-[url(src/assets/teaching/highlight_desktop.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all flex justify-between overflow-hidden">
<div className="space-y-2 max-w-[calc(410/752*100%)]">
<TeachingFeatureTitle>Видеозапись обучения</TeachingFeatureTitle>
<TeachingFeatureDescription className="">
Фиксация и хранение сессий обучения, тренировки и тестирования.
Ретроспектива по пройденной сессии вместе с инструктором
</TeachingFeatureDescription>
</div>
<div className="flex flex-col justify-center">
<img
src="src/assets/teaching/pinned_windows_mini.jpg"
className="rounded-tl-md w-full relative sm:left-6 left-5"
alt="Видеозапись обучения"
/>
<img
src="src/assets/teaching/manage_video.jpg"
className="rounded-lg w-[max(130px,36.11vw)] md:w-[16.9vw] absolute"
alt="Видеозапись обучения"
/>
</div>
<img
src="src/assets/teaching/manage_video.jpg"
className="rounded-lg absolute z-30 max-w-[calc(174.75/1600*100vw)] right-[calc(183/752*100%)] top-[calc(256/400*100%)]"
alt="Видеозапись обучения"
/>
<img
src="src/assets/teaching/pinned_windows.jpg"
className="rounded-tl-lg absolute max-w-[calc(281/752*100%)] right-0 bottom-0 z-10"
alt="Видеозапись обучения"
/>
</div>
<div className="border border-[#3D425C] bg-[url(src/assets/teaching/highlight.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all sm:py-6 sm:px-6 py-5 px-5 overflow-hidden row-start-3 col-start-2">
<TeachingFeatureTitle>Статистика обучения</TeachingFeatureTitle>
<TeachingFeatureDescription className="max-md:mb-5">
Фиксация правильных и неправильных действий. <br />
Отчет об ошибках
</TeachingFeatureDescription>
<div className="flex items-end max-md:justify-center md:overflow-hidden mt-0.5 max-md:pl-11 mx-auto">
<img
src="src/assets/teaching/current_schedule.jpg"
className="rounded-lg w-[45vw] md:w-[166px] sm:relative z-10"
alt="Расписание"
/>
<img
src="src/assets/teaching/stats.jpg"
className="rounded-lg relative md:right-[27px] sm:right-[31px] w-[45vw] md:w-[166px] sm:max-md:bottom-[27px] max-sm:bottom-[14px] right-11"
alt="Статистика обучения"
/>
<div className="p-10 relative aspect-[752/400] border border-[#3D425C] bg-[url(src/assets/teaching/highlight_desktop.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all flex justify-between overflow-hidden">
<div className="space-y-2 max-w-[calc(350/752*100%)]">
<TeachingFeatureTitle>Статистика обучения</TeachingFeatureTitle>
<TeachingFeatureDescription>
Фиксация правильных и неправильных действий.
<br />
Отчет об ошибках
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/current_schedule.jpg"
className="rounded-lg absolute max-w-[calc(222/1600*100vw)] right-[calc(225/1600*100vw)] top-[calc(198/400*100%)]"
alt="Расписание"
/>
<img
src="src/assets/teaching/stats.jpg"
className="rounded-lg absolute max-w-[calc(222/1600*100vw)] right-[calc(34/1600*100vw)] top-[calc(88/400*100%)]"
alt="Статистика"
/>
</div>
</div>
);
}
function TeachingFeaturesForOtherScreens() {
return (
<div className="lg:hidden sm:-mx-6 -mx-4 flex flex-col">
<div className="sm:flex justify-between max-sm:relative sm:aspect-[768/240] aspect-[6/5] order-1 border-t border-[#3D425C] sm:bg-[url(src/assets/teaching/highlight_tablet.png)] bg-[url(src/assets/teaching/highlight_mobile.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-bottom transition-all sm:pt-6 sm:px-6 pt-5 px-5 overflow-hidden">
<div className="space-y-1">
<TeachingFeatureTitle>
Управление
<br /> пользователями
</TeachingFeatureTitle>
<TeachingFeatureDescription>
Добавление, удаление и назначение ролей
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/modal.png"
className="rounded-md max-sm:absolute sm:-bottom-1 max-sm:left-[calc(101/360*100vw)] top-[calc(97/300*100%)]"
alt="Управление пользователями"
/>
</div>
<div className="overflow-hidden relative flex sm:aspect-[768/240] aspect-[36/34] sm:order-2 order-3 border-t border-[#3D425C] sm:bg-[url(src/assets/teaching/highlight_tablet.png)] bg-[url(src/assets/teaching/highlight_mobile.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all sm:pt-6 sm:px-6 pt-5 px-5">
<div className="space-y-1">
<TeachingFeatureTitle>Видеозапись обучения</TeachingFeatureTitle>
<TeachingFeatureDescription className="sm:max-w-[calc(305/768*100vw)]">
Фиксация и хранение сессий обучения, тренировки и тестирования.
Ретроспектива по пройденной сессии вместе с инструктором
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/pinned_windows_mini.jpg"
className="rounded-md absolute sm:max-w-[50vw] sm:left-[calc(417/768*100vw)] left-[calc(83/360*100vw)] max-sm:top-[calc(119/300*100%)] sm:mt-3"
alt="Видеозапись обучения"
/>
<img
src="src/assets/teaching/manage_video.jpg"
className="rounded-lg absolute sm:max-w-[calc(130/768*100vw)] max-w-[calc(130/360*100vw)] bottom-5 sm:bottom-[calc(1/12*100%)] sm:left-[calc(350/768*100vw)]"
alt="Видеозапись обучения"
/>
</div>
<div className="flex relative sm:aspect-[768/240] aspect-[6/5] border-t border-[#3D425C] order-2 sm:order-3 sm:bg-[url(src/assets/teaching/highlight_tablet.png)] bg-[url(src/assets/teaching/highlight_mobile.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all sm:pt-6 sm:px-6 pt-5 px-5 overflow-hidden">
<div className="space-y-1">
<TeachingFeatureTitle>Управление процессом</TeachingFeatureTitle>
<TeachingFeatureDescription>
Назначение сценария обучения
<br />
Выбор режима: обучение, тренировка, тестирование
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/schedule.jpg"
className="rounded-tl-xl absolute sm:max-w-[calc(351/768*100vw)] max-w-[calc(304.5/360*100vw)] max-sm:left-[calc(132/360*100vw)] sm:right-0 max-sm:top-[calc(119/300*100%)]"
alt="Расписание"
/>
<img
src="src/assets/teaching/master_card.jpg"
className="rounded-md absolute sm:max-w-[calc(148/768*100vw)] max-w-[calc(148/360*100vw)] sm:bottom-[calc(17/240*100%)] sm:left-[calc(306/768*100vw)] max-sm:bottom-5"
alt="Управление процессом"
/>
</div>
<div className="flex justify-between items-start relative sm:aspect-[768/240] aspect-[36/32] border-y order-4 border-[#3D425C] sm:bg-[url(src/assets/teaching/highlight_tablet.png)] bg-[url(src/assets/teaching/highlight_mobile.png)] bg-[length:0%] hover:bg-[length:100%] bg-no-repeat bg-right-top transition-all sm:py-6 sm:px-6 py-5 px-5 overflow-hidden">
<div className="space-y-1">
<TeachingFeatureTitle>Статистика обучения</TeachingFeatureTitle>
<TeachingFeatureDescription>
Фиксация правильных и неправильных действий. <br />
Отчет об ошибках
</TeachingFeatureDescription>
</div>
<img
src="src/assets/teaching/stats.jpg"
className="rounded-lg absolute sm:right-6 sm:max-w-[calc(166/768*100vw)] max-w-[calc(166/360*100vw)] max-sm:left-[calc(142/360*100vw)] max-sm:top-[calc(112/320*100%)]"
alt="Статистика обучения"
/>
<img
src="src/assets/teaching/current_schedule.jpg"
className="rounded-lg absolute sm:bottom-6 sm:right-[calc(162.5/768*100vw)] sm:max-w-[calc(166.5/768*100vw)] max-w-[calc(166/360*100vw)] bottom-5"
alt="Расписание"
/>
</div>
</div>
);
+2 -4
View File
@@ -5,12 +5,11 @@ import { Products } from '../components/Main/Products/Products';
import { Teaching } from '../components/Main/Teaching';
import { Distance } from '../components/Main/Distance';
import { Availables } from '../components/Main/Availables';
// import { Projects } from '../components/Main/Projects';
import { Trainings } from '../components/Main/Trainings';
import { Ellipse } from '../components/Main/Ellipse';
import { Motivation } from '../components/Main/Motivation';
import { useWindowWidth } from '../hooks/useWindowWidth';
import { RecentProjects } from '../components/Main/RecentProjects';
// import { RecentProjects } from '../components/Main/RecentProjects';
import { ProjectsSlider } from '../components/Main/ProjectsSlider';
export function MainPage() {
@@ -23,10 +22,9 @@ export function MainPage() {
<Video />
<Decreasing />
<Effeciency />
{/* <Projects /> */}
<ProjectsSlider />
<Products />
<RecentProjects />
{/* <RecentProjects /> */}
<Teaching />
<Distance />
<Availables />