From 454c225be10c0e2b3fa16aee793a2d65871c1fef Mon Sep 17 00:00:00 2001 From: inmake Date: Mon, 17 Apr 2023 18:13:47 +0500 Subject: [PATCH] upd --- package.json | 1 - src/App.tsx | 35 +- src/components/Map.tsx | 13432 ++++++++++++++++++++++++++++++++++++++- yarn.lock | 54 - 4 files changed, 13330 insertions(+), 192 deletions(-) diff --git a/package.json b/package.json index 419aa8a..ffb09ee 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "preview": "vite preview" }, "dependencies": { - "@react-spring/parallax": "^9.7.2", "@react-three/drei": "^9.62.2", "@react-three/fiber": "^8.12.0", "framer-motion": "^10.11.6", diff --git a/src/App.tsx b/src/App.tsx index 8ec04dc..89aabcf 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -6,7 +6,6 @@ import { Model } from "./components/VRHemlet"; import Calc from "./components/Calc"; import Slider from "./components/Slider/Slider"; import Map from "./components/Map"; -import { Parallax, ParallaxLayer } from "@react-spring/parallax"; import { motion } from "framer-motion"; // import { OrbitControls, PerspectiveCamera } from "@react-three/drei"; @@ -79,13 +78,13 @@ function App() { -
+
-
+

Эффективность инстумента продаж в цифрах @@ -136,21 +135,22 @@ function App() {

-
-
- Функциональные возможности -
-
- Интерактивная презентация увлекает покупателей и предоставляет - актуальную информацию о жилом комплексе, отвечая на все - интересующие вопросы и показывая важные особенности и преимущества - объекта +
+
+
+ Функциональные возможности +
+
+ Интерактивная презентация увлекает покупателей и предоставляет + актуальную информацию о жилом комплексе, отвечая на все + интересующие вопросы и показывая важные особенности и + преимущества объекта +
+
+
-
- -
@@ -158,7 +158,6 @@ function App() { - {/* */} {/*
-
{/* */}
+
+ +
diff --git a/src/components/Map.tsx b/src/components/Map.tsx index 57bf81a..bb7d2a8 100644 --- a/src/components/Map.tsx +++ b/src/components/Map.tsx @@ -14,13 +14,13205 @@ function Map() { fill="none" xmlns="http://www.w3.org/2000/svg" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -165,7 +13357,7 @@ function Map() { transition={{ duration: 1, ease: "easeInOut", delay: 2 }} d="M890.12 203.223L890.12 132.183" stroke="#567ECE" - stroke-width="1.44" + strokeWidth="1.44" /> @@ -207,7 +13399,7 @@ function Map() { transition={{ duration: 1, ease: "easeInOut", delay: 2 }} d="M740.361 761.943L740.361 690.903" stroke="#567ECE" - stroke-width="1.44" + strokeWidth="1.44" /> @@ -249,7 +13441,7 @@ function Map() { transition={{ duration: 1, ease: "easeInOut", delay: 2 }} d="M1094.6 602.103L1094.6 531.063" stroke="#567ECE" - stroke-width="1.44" + strokeWidth="1.44" /> @@ -287,7 +13479,7 @@ function Map() { transition={{ duration: 1, ease: "easeInOut", delay: 2 }} d="M537.32 345.783L537.32 274.743" stroke="#567ECE" - stroke-width="1.44" + strokeWidth="1.44" /> @@ -325,7 +13517,7 @@ function Map() { transition={{ duration: 1, ease: "easeInOut" }} d="M573.32 492.663L573.32 421.623" stroke="#D375FF" - stroke-width="1.44" + strokeWidth="1.44" /> - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/yarn.lock b/yarn.lock index 9c2ef30..680621b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -187,14 +187,6 @@ "@react-spring/shared" "~9.6.1" "@react-spring/types" "~9.6.1" -"@react-spring/animated@~9.7.2": - version "9.7.2" - resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.2.tgz#0119db8075e91d693ec45c42575541e01b104a70" - integrity sha512-ipvleJ99ipqlnHkz5qhSsgf/ny5aW0ZG8Q+/2Oj9cI7LCc7COdnrSO6V/v8MAX3JOoQNzfz6dye2s5Pt5jGaIA== - dependencies: - "@react-spring/shared" "~9.7.2" - "@react-spring/types" "~9.7.2" - "@react-spring/core@~9.6.1": version "9.6.1" resolved "https://registry.npmjs.org/@react-spring/core/-/core-9.6.1.tgz" @@ -205,34 +197,11 @@ "@react-spring/shared" "~9.6.1" "@react-spring/types" "~9.6.1" -"@react-spring/core@~9.7.2": - version "9.7.2" - resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.2.tgz#804ebadee45a6adff00886454d6f1c5d97ee219d" - integrity sha512-fF512edZT/gKVCA90ZRxfw1DmELeVwiL4OC2J6bMUlNr707C0h4QRoec6DjzG27uLX2MvS1CEatf9KRjwZR9/w== - dependencies: - "@react-spring/animated" "~9.7.2" - "@react-spring/rafz" "~9.7.2" - "@react-spring/shared" "~9.7.2" - "@react-spring/types" "~9.7.2" - -"@react-spring/parallax@^9.7.2": - version "9.7.2" - resolved "https://registry.yarnpkg.com/@react-spring/parallax/-/parallax-9.7.2.tgz#3feb54b95654027319591eee932e8babe32275ef" - integrity sha512-RLEU9yVe7PqaXJgEe6HPWB/kM0KmVLSikh8laedFmjUURfQSHmk8/jFzyGwKqnnNXVQ7rFLli75FcDabrnhwfQ== - dependencies: - "@react-spring/shared" "~9.7.2" - "@react-spring/web" "~9.7.2" - "@react-spring/rafz@~9.6.1": version "9.6.1" resolved "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.6.1.tgz" integrity sha512-v6qbgNRpztJFFfSE3e2W1Uz+g8KnIBs6SmzCzcVVF61GdGfGOuBrbjIcp+nUz301awVmREKi4eMQb2Ab2gGgyQ== -"@react-spring/rafz@~9.7.2": - version "9.7.2" - resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.7.2.tgz#77e7088c215e05cf893851cd87ceb40d89f2a7d7" - integrity sha512-kDWMYDQto3+flkrX3vy6DU/l9pxQ4TVW91DglQEc11iDc7shF4+WVDRJvOVLX+xoMP7zyag1dMvlIgvQ+dvA/A== - "@react-spring/shared@~9.6.1": version "9.6.1" resolved "https://registry.npmjs.org/@react-spring/shared/-/shared-9.6.1.tgz" @@ -241,14 +210,6 @@ "@react-spring/rafz" "~9.6.1" "@react-spring/types" "~9.6.1" -"@react-spring/shared@~9.7.2": - version "9.7.2" - resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.2.tgz#b8485617bdcc9f6348b245922051fb534e07c566" - integrity sha512-6U9qkno+9DxlH5nSltnPs+kU6tYKf0bPLURX2te13aGel8YqgcpFYp5Av8DcN2x3sukinAsmzHUS/FRsdZMMBA== - dependencies: - "@react-spring/rafz" "~9.7.2" - "@react-spring/types" "~9.7.2" - "@react-spring/three@~9.6.1": version "9.6.1" resolved "https://registry.npmjs.org/@react-spring/three/-/three-9.6.1.tgz" @@ -264,21 +225,6 @@ resolved "https://registry.npmjs.org/@react-spring/types/-/types-9.6.1.tgz" integrity sha512-POu8Mk0hIU3lRXB3bGIGe4VHIwwDsQyoD1F394OK7STTiX9w4dG3cTLljjYswkQN+hDSHRrj4O36kuVa7KPU8Q== -"@react-spring/types@~9.7.2": - version "9.7.2" - resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.2.tgz#e04dd72755d88b0e3163ba143ecd8ba78b68a5b0" - integrity sha512-GEflx2Ex/TKVMHq5g5MxQDNNPNhqg+4Db9m7+vGTm8ttZiyga7YQUF24shgRNebKIjahqCuei16SZga8h1pe4g== - -"@react-spring/web@~9.7.2": - version "9.7.2" - resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.2.tgz#76e53dd24033764c3062f9927f88b0f3194688d4" - integrity sha512-7qNc7/5KShu2D05x7o2Ols2nUE7mCKfKLaY2Ix70xPMfTle1sZisoQMBFgV9w/fSLZlHZHV9P0uWJqEXQnbV4Q== - dependencies: - "@react-spring/animated" "~9.7.2" - "@react-spring/core" "~9.7.2" - "@react-spring/shared" "~9.7.2" - "@react-spring/types" "~9.7.2" - "@react-three/drei@^9.62.2": version "9.62.2" resolved "https://registry.npmjs.org/@react-three/drei/-/drei-9.62.2.tgz"