mikhail_lanskikh/graff.training
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upd

Browse Source
This commit is contained in:
Lanskikh
2024-09-19 14:08:11 +05:00
parent fd7a16da68
commit d4efeb5bf4
6 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Layouts/Footer.tsx
+1 -1
View File
@@ -4,7 +4,7 @@ import { LogoWithTextIcon } from '../icons/LogoWithTextIcon';
export function Footer() { export function Footer() {
return ( return (
<footer className="sm:grid xl:grid-cols-[2fr_1fr_1fr] sm:grid-cols-2 sm:max-xl:grid-rows-2"> <footer className="sm:grid xl:grid-cols-[2fr_1fr_1fr] sm:grid-cols-2 sm:max-xl:grid-rows-2">
<div className="flex sm:items-center max-sm:flex-col lg:px-10 sm:px-6 px-4 sm:py-9 py-4 border-t border-[#3D425C] gap-6 sm:max-xl:row-start-1 sm:max-xl:col-span-2"> <div className="flex sm:items-center max-sm:flex-col lg:px-10 sm:px-6 px-4 sm:py-[30px] py-4 border-t border-[#3D425C] gap-6 sm:max-xl:row-start-1 sm:max-xl:col-span-2">
<Link to={'/'} className="outline-none"> <Link to={'/'} className="outline-none">
<LogoWithTextIcon className="h-[50px] w-[104px]" /> <LogoWithTextIcon className="h-[50px] w-[104px]" />
</Link> </Link>
src/components/Main/Products/Tabs/ForTeachingTab.tsx
+3 -6
View File
@@ -10,18 +10,15 @@ export const ForTeachingTab = forwardRef<HTMLDivElement>((_, ref) => (
ref={ref} ref={ref}
className="overflow-hidden lg:ml-[129px] lg:h-[70vh] sm:h-[80vh] lg:min-w-[calc(100vw-129px)] h-[100vh] min-w-[100vw] sm:sticky -z-10 lg:top-[30vh] sm:top-[20vh] top-0 lg:px-10 lg:pt-10 sm:px-6 sm:pt-6 px-4 pt-4 lg:border-l bg-[#14161F] border-t border-[#3D425C]" className="overflow-hidden lg:ml-[129px] lg:h-[70vh] sm:h-[80vh] lg:min-w-[calc(100vw-129px)] h-[100vh] min-w-[100vw] sm:sticky -z-10 lg:top-[30vh] sm:top-[20vh] top-0 lg:px-10 lg:pt-10 sm:px-6 sm:pt-6 px-4 pt-4 lg:border-l bg-[#14161F] border-t border-[#3D425C]"
> >
<div className="flex justify-between "> <div className="flex justify-between">
<h2 className="font-medium h2"> <h2 className="font-medium h2">
Интерактивные тренажеры для учебных заведений Интерактивные тренажеры для учебных заведений
</h2> </h2>
<p className="h3 font-medium text-[#3D425C]">03</p> <p className="h3 font-medium text-[#3D425C]">03</p>
</div> </div>
<div className="flex justify-between max-sm:flex-col"> <div className="flex justify-between max-sm:flex-col">
<div className="lg:space-y-14 sm:space-y-10 space-y-6 sm:max-w-[calc(413/768*100vw)] lg:mt-14 sm:mt-10 mt-6"> <div className="sm:max-w-[calc(500/768*100vw)] mt-6">
<div <div itemProp="creating" className="space-y-4 lg:max-w-[40vw] flex-1">
itemProp="creating"
className="lg:space-y-7 space-y-4 lg:max-w-[40vw] flex-1"
>
<ForTeachingOption <ForTeachingOption
title="cоздание обучающих VR систем" title="cоздание обучающих VR систем"
description="Проведение виртуальных практических работ, создание учебных мастерских и стендов" description="Проведение виртуальных практических работ, создание учебных мастерских и стендов"
src/components/Main/Products/Tabs/IndustrialTab.tsx
+4 -4
View File
@@ -48,7 +48,7 @@ export const IndustrialTab = forwardRef<HTMLDivElement, { sticked: boolean }>(
<div <div
className={ className={
'flex justify-between items-center' + 'flex justify-between items-center' +
(sticked ? ' text-[#3D425C] transition-colors' : '') (sticked ? ' sm:text-[#3D425C] transition-colors' : '')
} }
> >
<h2 className="w-full font-medium h2">Промышленные тренажеры</h2> <h2 className="w-full font-medium h2">Промышленные тренажеры</h2>
@@ -60,7 +60,7 @@ export const IndustrialTab = forwardRef<HTMLDivElement, { sticked: boolean }>(
itemType="https://schema.org/IndustrialTrainingsEducation" itemType="https://schema.org/IndustrialTrainingsEducation"
className={ className={
'sm:space-y-7 space-y-4 xl:max-w-[max(450px,calc(507/1600*100vw))] lg:max-w-[440px] sm:max-w-[calc(379/768*100vw)]' + 'sm:space-y-7 space-y-4 xl:max-w-[max(450px,calc(507/1600*100vw))] lg:max-w-[440px] sm:max-w-[calc(379/768*100vw)]' +
(sticked ? ' transition-opacity opacity-0' : ' opacity-100') (sticked ? ' transition-opacity sm:opacity-0' : ' opacity-100')
} }
> >
<TeachingItem <TeachingItem
@@ -84,7 +84,7 @@ export const IndustrialTab = forwardRef<HTMLDivElement, { sticked: boolean }>(
src="/images/products/trainings/trainings_desktop.png" src="/images/products/trainings/trainings_desktop.png"
className={ className={
'absolute right-0 top-[121px] object-cover lg:w-[calc(1000/1600*100vw)] xl:w-[calc(1152/1600*100vw)] max-lg:hidden ' + 'absolute right-0 top-[121px] object-cover lg:w-[calc(1000/1600*100vw)] xl:w-[calc(1152/1600*100vw)] max-lg:hidden ' +
(sticked ? 'transition-opacity opacity-0' : 'opacity-100') (sticked ? 'transition-opacity sm:opacity-0' : 'opacity-100')
} }
alt="тренажеры" alt="тренажеры"
/> />
@@ -92,7 +92,7 @@ export const IndustrialTab = forwardRef<HTMLDivElement, { sticked: boolean }>(
src="/images/products/trainings/trainings_tablet.png" src="/images/products/trainings/trainings_tablet.png"
className={ className={
'absolute right-0 top-[120px] object-cover w-[calc(438/768*100vw)] hidden sm:max-lg:block ' + 'absolute right-0 top-[120px] object-cover w-[calc(438/768*100vw)] hidden sm:max-lg:block ' +
(sticked ? 'transition-opacity opacity-0' : 'opacity-100') (sticked ? 'transition-opacity sm:opacity-0' : 'opacity-100')
} }
alt="тренажеры" alt="тренажеры"
/> />
src/components/Main/Products/Tabs/SimulatorsTab.tsx
+6 -6
View File
@@ -15,7 +15,7 @@ export const SimulatorsTab = forwardRef<HTMLDivElement, { sticked: boolean }>(
itemProp="simulators" itemProp="simulators"
itemType="http://schema.org/Simulators" itemType="http://schema.org/Simulators"
ref={ref} ref={ref}
className="lg:ml-[65px] lg:h-[85dvh] lg:min-w-[calc(100vw-65px)] sm:h-[90vh] min-w-[100vw] sm:sticky -z-20 lg:top-[15vh] sm:top-[10vh] top-0 bg-[#14161F] lg:px-10 lg:pt-10 sm:px-6 sm:pt-6 px-4 pt-4 lg:space-y-12 sm:space-y-10 space-y-6 lg:border-l border-t border-[#3D425C]" className="lg:ml-[65px] lg:h-[85dvh] lg:min-w-[calc(100vw-65px)] sm:h-[90vh] min-w-[100vw] sm:sticky -z-20 lg:top-[15vh] sm:top-[10vh] top-0 bg-[#14161F] lg:px-10 lg:pt-10 sm:px-6 sm:pt-6 px-4 pt-4 sm:space-y-10 space-y-6 lg:border-l border-t border-[#3D425C]"
> >
<div <div
className={ className={
@@ -32,7 +32,7 @@ export const SimulatorsTab = forwardRef<HTMLDivElement, { sticked: boolean }>(
itemType="http://schema.org/SimulatorsTypes" itemType="http://schema.org/SimulatorsTypes"
className={ className={
'flex flex-wrap gap-2 lg:max-w-[1000px]' + 'flex flex-wrap gap-2 lg:max-w-[1000px]' +
(sticked ? ' transition-opacity opacity-0' : ' opacity-100') (sticked ? ' transition-opacity sm:opacity-0' : ' opacity-100')
} }
> >
<SimulatorsItem text="авиационные симуляторы" /> <SimulatorsItem text="авиационные симуляторы" />
@@ -47,11 +47,11 @@ export const SimulatorsTab = forwardRef<HTMLDivElement, { sticked: boolean }>(
itemScope itemScope
itemType="http://schema.org/SimulatorsModel" itemType="http://schema.org/SimulatorsModel"
className={ className={
'sm:flex max-sm:space-y-6 gap-x-2 lg:max-w-[calc(1417/1600*100vw)]' + 'sm:flex max-sm:space-y-6 gap-x-2' +
(sticked ? ' transition-opacity opacity-0' : ' opacity-100') (sticked ? ' transition-opacity sm:opacity-0' : ' opacity-100')
} }
> >
<div className="space-y-[10px] lg:w-[calc(498.5/1600*100vw)] sm:w-[calc(331/768*100vw)]"> <div className="space-y-[10px] lg:w-[calc(400/1600*100vw)] sm:w-[calc(331/768*100vw)]">
<img <img
src="/images/products/simulators/rzhd2.jpg" src="/images/products/simulators/rzhd2.jpg"
className="object-cover sm:max-lg:aspect-[331/292] max-sm:aspect-[328/172]" className="object-cover sm:max-lg:aspect-[331/292] max-sm:aspect-[328/172]"
@@ -62,7 +62,7 @@ export const SimulatorsTab = forwardRef<HTMLDivElement, { sticked: boolean }>(
соответствующая работе настоящего оборудования соответствующая работе настоящего оборудования
</p> </p>
</div> </div>
<div className="space-y-[10px] lg:w-[calc(498.5/1600*100vw)] sm:w-[calc(331/768*100vw)]"> <div className="space-y-[10px] lg:w-[calc(400/1600*100vw)] sm:w-[calc(331/768*100vw)]">
<img <img
src="/images/products/simulators/rzhd.jpg" src="/images/products/simulators/rzhd.jpg"
className="object-cover sm:max-lg:aspect-[331/292] max-sm:aspect-[328/172] object-[bottom_-1px_left_-1px]" className="object-cover sm:max-lg:aspect-[331/292] max-sm:aspect-[328/172] object-[bottom_-1px_left_-1px]"
src/components/Main/Products/Products.tsx → src/components/Main/Products/index.tsx
View File
src/pages/MainPage.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { Showreel } from '../components/Main/Showreel'; import { Showreel } from '../components/Main/Showreel';
import { Decreasing } from '../components/Main/Decreasing'; import { Decreasing } from '../components/Main/Decreasing';
import { Effeciency } from '../components/Main/Efficiency'; import { Effeciency } from '../components/Main/Efficiency';
import { Products } from '../components/Main/Products/Products'; import { Products } from '../components/Main/Products';
import { Teaching } from '../components/Main/Teaching'; import { Teaching } from '../components/Main/Teaching';
import { Distance } from '../components/Main/Distance'; import { Distance } from '../components/Main/Distance';
import { MultiUser } from '../components/Main/MultiUser'; import { MultiUser } from '../components/Main/MultiUser';