From b8be47299e0cd69c7786c0ba45ec45d3b8adcf11 Mon Sep 17 00:00:00 2001 From: Lanskikh Date: Tue, 3 Sep 2024 14:35:39 +0500 Subject: [PATCH] form, modal, ellipse, devices, etc --- package.json | 3 +- src/Layout/index.tsx | 19 -- src/assets/Ellipse.png | Bin 0 -> 2424648 bytes src/assets/devices/holographic.png | Bin 0 -> 538484 bytes src/assets/devices/interactive.png | Bin 0 -> 721980 bytes src/assets/devices/led.png | Bin 0 -> 728345 bytes src/assets/devices/mobile.png | Bin 0 -> 948888 bytes src/assets/devices/projection.png | Bin 0 -> 875947 bytes src/assets/devices/transparent.png | Bin 0 -> 1035029 bytes src/assets/form/1_1.png | Bin 0 -> 66204 bytes src/assets/form/1_2.png | Bin 0 -> 99043 bytes src/assets/form/2_1.png | Bin 0 -> 91266 bytes src/assets/form/2_2.png | Bin 0 -> 115493 bytes src/assets/form/3_1.png | Bin 0 -> 74046 bytes src/assets/form/3_2.png | Bin 0 -> 89146 bytes src/assets/form/4_1.png | Bin 0 -> 104772 bytes src/assets/form/4_2.png | Bin 0 -> 92152 bytes src/components/Devices.tsx | 89 ++++++ src/components/Feedback.tsx | 5 +- src/components/Form.tsx | 268 ++++++++++-------- src/components/Layout/Ellipse.tsx | 44 +++ src/{ => components}/Layout/Footer.tsx | 4 +- src/{ => components}/Layout/Header.tsx | 17 +- src/components/Layout/ModalContainer.tsx | 15 + src/{ => components}/Layout/ModalWithForm.tsx | 18 +- src/components/Layout/ScrollToHashElement.tsx | 18 ++ src/components/Layout/index.tsx | 25 ++ src/components/Projects.tsx | 14 +- src/components/Promotion.tsx | 11 +- src/components/Stands.tsx | 2 +- src/components/Statistics.tsx | 6 +- src/components/icons/CloseIcon.tsx | 19 ++ src/consts/devices.ts | 52 ++++ src/index.css | 8 +- src/main.tsx | 2 +- src/pages/MainPage.tsx | 6 +- src/stores/modalStore.ts | 12 + src/types/IDevice.ts | 5 + yarn.lock | 12 + 39 files changed, 509 insertions(+), 165 deletions(-) delete mode 100644 src/Layout/index.tsx create mode 100644 src/assets/Ellipse.png create mode 100644 src/assets/devices/holographic.png create mode 100644 src/assets/devices/interactive.png create mode 100644 src/assets/devices/led.png create mode 100644 src/assets/devices/mobile.png create mode 100644 src/assets/devices/projection.png create mode 100644 src/assets/devices/transparent.png create mode 100644 src/assets/form/1_1.png create mode 100644 src/assets/form/1_2.png create mode 100644 src/assets/form/2_1.png create mode 100644 src/assets/form/2_2.png create mode 100644 src/assets/form/3_1.png create mode 100644 src/assets/form/3_2.png create mode 100644 src/assets/form/4_1.png create mode 100644 src/assets/form/4_2.png create mode 100644 src/components/Devices.tsx create mode 100644 src/components/Layout/Ellipse.tsx rename src/{ => components}/Layout/Footer.tsx (96%) rename src/{ => components}/Layout/Header.tsx (69%) create mode 100644 src/components/Layout/ModalContainer.tsx rename src/{ => components}/Layout/ModalWithForm.tsx (95%) create mode 100644 src/components/Layout/ScrollToHashElement.tsx create mode 100644 src/components/Layout/index.tsx create mode 100644 src/components/icons/CloseIcon.tsx create mode 100644 src/consts/devices.ts create mode 100644 src/stores/modalStore.ts create mode 100644 src/types/IDevice.ts diff --git a/package.json b/package.json index 343fe01..b2303b5 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "react-input-mask": "^2.0.4", "react-router-dom": "^6.26.1", "react-swipeable": "^7.0.1", - "usehooks-ts": "^3.1.0" + "usehooks-ts": "^3.1.0", + "zustand": "^4.5.5" }, "devDependencies": { "@eslint/js": "^9.9.0", diff --git a/src/Layout/index.tsx b/src/Layout/index.tsx deleted file mode 100644 index ad23b09..0000000 --- a/src/Layout/index.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { Outlet } from 'react-router-dom'; -import { Footer } from './Footer'; -import { Header } from './Header'; -import { Feedback } from '../components/Feedback'; -import { Clients } from '../components/Clients'; - -export function Layout() { - return ( - <> -
-
- -
- - -