From 784f57966afb4ab2da3d32cea9cdc17244c032c7 Mon Sep 17 00:00:00 2001 From: inmake Date: Tue, 18 Apr 2023 19:31:30 +0500 Subject: [PATCH] upd --- .gitignore => client/.gitignore | 0 .../ecosystem.config.cjs | 0 index.html => client/index.html | 0 package.json => client/package.json | 0 postcss.config.js => client/postcss.config.js | 0 {public => client/public}/VRAnim_46.glb | Bin .../public}/fonts/Gilroy/Gilroy-Black.woff | Bin .../public}/fonts/Gilroy/Gilroy-Black.woff2 | Bin .../public}/fonts/Gilroy/Gilroy-Bold.woff | Bin .../public}/fonts/Gilroy/Gilroy-Bold.woff2 | Bin .../fonts/Gilroy/Gilroy-ExtraBold.woff | Bin .../fonts/Gilroy/Gilroy-ExtraBold.woff2 | Bin .../public}/fonts/Gilroy/Gilroy-Heavy.woff | Bin .../public}/fonts/Gilroy/Gilroy-Heavy.woff2 | Bin .../public}/fonts/Gilroy/Gilroy-Light.woff | Bin .../public}/fonts/Gilroy/Gilroy-Light.woff2 | Bin .../public}/fonts/Gilroy/Gilroy-Medium.woff | Bin .../public}/fonts/Gilroy/Gilroy-Medium.woff2 | Bin .../public}/fonts/Gilroy/Gilroy-Regular.woff | Bin .../public}/fonts/Gilroy/Gilroy-Regular.woff2 | Bin .../public}/fonts/Gilroy/Gilroy-SemiBold.woff | Bin .../fonts/Gilroy/Gilroy-SemiBold.woff2 | Bin .../public}/fonts/Gilroy/Gilroy-Thin.woff | Bin .../public}/fonts/Gilroy/Gilroy-Thin.woff2 | Bin .../fonts/Gilroy/Gilroy-UltraLight.woff | Bin .../fonts/Gilroy/Gilroy-UltraLight.woff2 | Bin .../public}/fonts/Gilroy/stylesheet.css | 0 .../public}/images/cards/card_1.jpg | Bin .../public}/images/cards/card_10.jpg | Bin .../public}/images/cards/card_11.jpg | Bin .../public}/images/cards/card_12.jpg | Bin .../public}/images/cards/card_13.jpg | Bin .../public}/images/cards/card_2.jpg | Bin .../public}/images/cards/card_3.jpg | Bin .../public}/images/cards/card_4.jpg | Bin .../public}/images/cards/card_5.jpg | Bin .../public}/images/cards/card_6.jpg | Bin .../public}/images/cards/card_7.jpg | Bin .../public}/images/cards/card_8.jpg | Bin .../public}/images/cards/card_9.jpg | Bin {public => client/public}/images/content.jpg | Bin .../public}/images/icons/Chevron_Down.svg | 0 .../public}/images/icons/Chevron_Right.svg | 0 {public => client/public}/images/logo.png | Bin {public => client/public}/images/map.png | Bin .../public}/images/slider/slide1.png | Bin .../public}/images/slider/slide2.jpg | Bin .../public}/images/slider/slide3.png | Bin .../public}/images/slider/slide4.jpg | Bin .../public}/images/slider/slide5.png | Bin .../public}/images/slider/slide6.png | Bin .../public}/images/slider/slide7.jpg | Bin .../public}/images/slider/slide8.png | Bin {public => client/public}/vite.svg | 0 {src => client/src}/App.css | 0 {src => client/src}/App.tsx | 65 ++++++-- {src => client/src}/components/Calc.tsx | 0 {src => client/src}/components/Map.tsx | 0 .../src}/components/PieChart/PieChart.css | 0 .../src}/components/PieChart/PieChart.tsx | 0 .../src}/components/RangeSlider.tsx | 0 .../src}/components/SearchableSelect.tsx | 0 .../src}/components/Slider/Slide1.tsx | 0 .../src}/components/Slider/Slide2.tsx | 0 .../src}/components/Slider/Slide3.tsx | 0 .../src}/components/Slider/Slide4.tsx | 0 .../src}/components/Slider/Slide5.tsx | 0 .../src}/components/Slider/Slide6.tsx | 0 .../src}/components/Slider/Slide7.tsx | 0 .../src}/components/Slider/Slide8.tsx | 0 .../src}/components/Slider/SlideContainer.tsx | 0 .../src}/components/Slider/Slider.tsx | 0 {src => client/src}/components/VRHemlet.tsx | 9 +- {src => client/src}/index.css | 0 {src => client/src}/main.tsx | 0 client/src/utils/api.ts | 7 + {src => client/src}/vite-env.d.ts | 0 .../tailwind.config.js | 0 tsconfig.json => client/tsconfig.json | 0 .../tsconfig.node.json | 0 vite.config.ts => client/vite.config.ts | 0 yarn.lock => client/yarn.lock | 0 server/app.js | 25 +-- server/models/Mail.js | 29 ++++ server/package.json | 3 +- server/yarn.lock | 151 ++++++++++++++++++ src/AppTest.tsx | 19 --- 87 files changed, 264 insertions(+), 44 deletions(-) rename .gitignore => client/.gitignore (100%) rename ecosystem.config.cjs => client/ecosystem.config.cjs (100%) rename index.html => client/index.html (100%) rename package.json => client/package.json (100%) rename postcss.config.js => client/postcss.config.js (100%) rename {public => client/public}/VRAnim_46.glb (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Black.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Black.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Bold.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Bold.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-ExtraBold.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-ExtraBold.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Heavy.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Heavy.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Light.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Light.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Medium.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Medium.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Regular.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Regular.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-SemiBold.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-SemiBold.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Thin.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-Thin.woff2 (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-UltraLight.woff (100%) rename {public => client/public}/fonts/Gilroy/Gilroy-UltraLight.woff2 (100%) rename {public => client/public}/fonts/Gilroy/stylesheet.css (100%) rename {public => client/public}/images/cards/card_1.jpg (100%) rename {public => client/public}/images/cards/card_10.jpg (100%) rename {public => client/public}/images/cards/card_11.jpg (100%) rename {public => client/public}/images/cards/card_12.jpg (100%) rename {public => client/public}/images/cards/card_13.jpg (100%) rename {public => client/public}/images/cards/card_2.jpg (100%) rename {public => client/public}/images/cards/card_3.jpg (100%) rename {public => client/public}/images/cards/card_4.jpg (100%) rename {public => client/public}/images/cards/card_5.jpg (100%) rename {public => client/public}/images/cards/card_6.jpg (100%) rename {public => client/public}/images/cards/card_7.jpg (100%) rename {public => client/public}/images/cards/card_8.jpg (100%) rename {public => client/public}/images/cards/card_9.jpg (100%) rename {public => client/public}/images/content.jpg (100%) rename {public => client/public}/images/icons/Chevron_Down.svg (100%) rename {public => client/public}/images/icons/Chevron_Right.svg (100%) rename {public => client/public}/images/logo.png (100%) rename {public => client/public}/images/map.png (100%) rename {public => client/public}/images/slider/slide1.png (100%) rename {public => client/public}/images/slider/slide2.jpg (100%) rename {public => client/public}/images/slider/slide3.png (100%) rename {public => client/public}/images/slider/slide4.jpg (100%) rename {public => client/public}/images/slider/slide5.png (100%) rename {public => client/public}/images/slider/slide6.png (100%) rename {public => client/public}/images/slider/slide7.jpg (100%) rename {public => client/public}/images/slider/slide8.png (100%) rename {public => client/public}/vite.svg (100%) rename {src => client/src}/App.css (100%) rename {src => client/src}/App.tsx (94%) rename {src => client/src}/components/Calc.tsx (100%) rename {src => client/src}/components/Map.tsx (100%) rename {src => client/src}/components/PieChart/PieChart.css (100%) rename {src => client/src}/components/PieChart/PieChart.tsx (100%) rename {src => client/src}/components/RangeSlider.tsx (100%) rename {src => client/src}/components/SearchableSelect.tsx (100%) rename {src => client/src}/components/Slider/Slide1.tsx (100%) rename {src => client/src}/components/Slider/Slide2.tsx (100%) rename {src => client/src}/components/Slider/Slide3.tsx (100%) rename {src => client/src}/components/Slider/Slide4.tsx (100%) rename {src => client/src}/components/Slider/Slide5.tsx (100%) rename {src => client/src}/components/Slider/Slide6.tsx (100%) rename {src => client/src}/components/Slider/Slide7.tsx (100%) rename {src => client/src}/components/Slider/Slide8.tsx (100%) rename {src => client/src}/components/Slider/SlideContainer.tsx (100%) rename {src => client/src}/components/Slider/Slider.tsx (100%) rename {src => client/src}/components/VRHemlet.tsx (79%) rename {src => client/src}/index.css (100%) rename {src => client/src}/main.tsx (100%) create mode 100644 client/src/utils/api.ts rename {src => client/src}/vite-env.d.ts (100%) rename tailwind.config.js => client/tailwind.config.js (100%) rename tsconfig.json => client/tsconfig.json (100%) rename tsconfig.node.json => client/tsconfig.node.json (100%) rename vite.config.ts => client/vite.config.ts (100%) rename yarn.lock => client/yarn.lock (100%) create mode 100644 server/models/Mail.js delete mode 100644 src/AppTest.tsx diff --git a/.gitignore b/client/.gitignore similarity index 100% rename from .gitignore rename to client/.gitignore diff --git a/ecosystem.config.cjs b/client/ecosystem.config.cjs similarity index 100% rename from ecosystem.config.cjs rename to client/ecosystem.config.cjs diff --git a/index.html b/client/index.html similarity index 100% rename from index.html rename to client/index.html diff --git a/package.json b/client/package.json similarity index 100% rename from package.json rename to client/package.json diff --git a/postcss.config.js b/client/postcss.config.js similarity index 100% rename from postcss.config.js rename to client/postcss.config.js diff --git a/public/VRAnim_46.glb b/client/public/VRAnim_46.glb similarity index 100% rename from public/VRAnim_46.glb rename to client/public/VRAnim_46.glb diff --git a/public/fonts/Gilroy/Gilroy-Black.woff b/client/public/fonts/Gilroy/Gilroy-Black.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-Black.woff rename to client/public/fonts/Gilroy/Gilroy-Black.woff diff --git a/public/fonts/Gilroy/Gilroy-Black.woff2 b/client/public/fonts/Gilroy/Gilroy-Black.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-Black.woff2 rename to client/public/fonts/Gilroy/Gilroy-Black.woff2 diff --git a/public/fonts/Gilroy/Gilroy-Bold.woff b/client/public/fonts/Gilroy/Gilroy-Bold.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-Bold.woff rename to client/public/fonts/Gilroy/Gilroy-Bold.woff diff --git a/public/fonts/Gilroy/Gilroy-Bold.woff2 b/client/public/fonts/Gilroy/Gilroy-Bold.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-Bold.woff2 rename to client/public/fonts/Gilroy/Gilroy-Bold.woff2 diff --git a/public/fonts/Gilroy/Gilroy-ExtraBold.woff b/client/public/fonts/Gilroy/Gilroy-ExtraBold.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-ExtraBold.woff rename to client/public/fonts/Gilroy/Gilroy-ExtraBold.woff diff --git a/public/fonts/Gilroy/Gilroy-ExtraBold.woff2 b/client/public/fonts/Gilroy/Gilroy-ExtraBold.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-ExtraBold.woff2 rename to client/public/fonts/Gilroy/Gilroy-ExtraBold.woff2 diff --git a/public/fonts/Gilroy/Gilroy-Heavy.woff b/client/public/fonts/Gilroy/Gilroy-Heavy.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-Heavy.woff rename to client/public/fonts/Gilroy/Gilroy-Heavy.woff diff --git a/public/fonts/Gilroy/Gilroy-Heavy.woff2 b/client/public/fonts/Gilroy/Gilroy-Heavy.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-Heavy.woff2 rename to client/public/fonts/Gilroy/Gilroy-Heavy.woff2 diff --git a/public/fonts/Gilroy/Gilroy-Light.woff b/client/public/fonts/Gilroy/Gilroy-Light.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-Light.woff rename to client/public/fonts/Gilroy/Gilroy-Light.woff diff --git a/public/fonts/Gilroy/Gilroy-Light.woff2 b/client/public/fonts/Gilroy/Gilroy-Light.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-Light.woff2 rename to client/public/fonts/Gilroy/Gilroy-Light.woff2 diff --git a/public/fonts/Gilroy/Gilroy-Medium.woff b/client/public/fonts/Gilroy/Gilroy-Medium.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-Medium.woff rename to client/public/fonts/Gilroy/Gilroy-Medium.woff diff --git a/public/fonts/Gilroy/Gilroy-Medium.woff2 b/client/public/fonts/Gilroy/Gilroy-Medium.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-Medium.woff2 rename to client/public/fonts/Gilroy/Gilroy-Medium.woff2 diff --git a/public/fonts/Gilroy/Gilroy-Regular.woff b/client/public/fonts/Gilroy/Gilroy-Regular.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-Regular.woff rename to client/public/fonts/Gilroy/Gilroy-Regular.woff diff --git a/public/fonts/Gilroy/Gilroy-Regular.woff2 b/client/public/fonts/Gilroy/Gilroy-Regular.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-Regular.woff2 rename to client/public/fonts/Gilroy/Gilroy-Regular.woff2 diff --git a/public/fonts/Gilroy/Gilroy-SemiBold.woff b/client/public/fonts/Gilroy/Gilroy-SemiBold.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-SemiBold.woff rename to client/public/fonts/Gilroy/Gilroy-SemiBold.woff diff --git a/public/fonts/Gilroy/Gilroy-SemiBold.woff2 b/client/public/fonts/Gilroy/Gilroy-SemiBold.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-SemiBold.woff2 rename to client/public/fonts/Gilroy/Gilroy-SemiBold.woff2 diff --git a/public/fonts/Gilroy/Gilroy-Thin.woff b/client/public/fonts/Gilroy/Gilroy-Thin.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-Thin.woff rename to client/public/fonts/Gilroy/Gilroy-Thin.woff diff --git a/public/fonts/Gilroy/Gilroy-Thin.woff2 b/client/public/fonts/Gilroy/Gilroy-Thin.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-Thin.woff2 rename to client/public/fonts/Gilroy/Gilroy-Thin.woff2 diff --git a/public/fonts/Gilroy/Gilroy-UltraLight.woff b/client/public/fonts/Gilroy/Gilroy-UltraLight.woff similarity index 100% rename from public/fonts/Gilroy/Gilroy-UltraLight.woff rename to client/public/fonts/Gilroy/Gilroy-UltraLight.woff diff --git a/public/fonts/Gilroy/Gilroy-UltraLight.woff2 b/client/public/fonts/Gilroy/Gilroy-UltraLight.woff2 similarity index 100% rename from public/fonts/Gilroy/Gilroy-UltraLight.woff2 rename to client/public/fonts/Gilroy/Gilroy-UltraLight.woff2 diff --git a/public/fonts/Gilroy/stylesheet.css b/client/public/fonts/Gilroy/stylesheet.css similarity index 100% rename from public/fonts/Gilroy/stylesheet.css rename to client/public/fonts/Gilroy/stylesheet.css diff --git a/public/images/cards/card_1.jpg b/client/public/images/cards/card_1.jpg similarity index 100% rename from public/images/cards/card_1.jpg rename to client/public/images/cards/card_1.jpg diff --git a/public/images/cards/card_10.jpg b/client/public/images/cards/card_10.jpg similarity index 100% rename from public/images/cards/card_10.jpg rename to client/public/images/cards/card_10.jpg diff --git a/public/images/cards/card_11.jpg b/client/public/images/cards/card_11.jpg similarity index 100% rename from public/images/cards/card_11.jpg rename to client/public/images/cards/card_11.jpg diff --git a/public/images/cards/card_12.jpg b/client/public/images/cards/card_12.jpg similarity index 100% rename from public/images/cards/card_12.jpg rename to client/public/images/cards/card_12.jpg diff --git a/public/images/cards/card_13.jpg b/client/public/images/cards/card_13.jpg similarity index 100% rename from public/images/cards/card_13.jpg rename to client/public/images/cards/card_13.jpg diff --git a/public/images/cards/card_2.jpg b/client/public/images/cards/card_2.jpg similarity index 100% rename from public/images/cards/card_2.jpg rename to client/public/images/cards/card_2.jpg diff --git a/public/images/cards/card_3.jpg b/client/public/images/cards/card_3.jpg similarity index 100% rename from public/images/cards/card_3.jpg rename to client/public/images/cards/card_3.jpg diff --git a/public/images/cards/card_4.jpg b/client/public/images/cards/card_4.jpg similarity index 100% rename from public/images/cards/card_4.jpg rename to client/public/images/cards/card_4.jpg diff --git a/public/images/cards/card_5.jpg b/client/public/images/cards/card_5.jpg similarity index 100% rename from public/images/cards/card_5.jpg rename to client/public/images/cards/card_5.jpg diff --git a/public/images/cards/card_6.jpg b/client/public/images/cards/card_6.jpg similarity index 100% rename from public/images/cards/card_6.jpg rename to client/public/images/cards/card_6.jpg diff --git a/public/images/cards/card_7.jpg b/client/public/images/cards/card_7.jpg similarity index 100% rename from public/images/cards/card_7.jpg rename to client/public/images/cards/card_7.jpg diff --git a/public/images/cards/card_8.jpg b/client/public/images/cards/card_8.jpg similarity index 100% rename from public/images/cards/card_8.jpg rename to client/public/images/cards/card_8.jpg diff --git a/public/images/cards/card_9.jpg b/client/public/images/cards/card_9.jpg similarity index 100% rename from public/images/cards/card_9.jpg rename to client/public/images/cards/card_9.jpg diff --git a/public/images/content.jpg b/client/public/images/content.jpg similarity index 100% rename from public/images/content.jpg rename to client/public/images/content.jpg diff --git a/public/images/icons/Chevron_Down.svg b/client/public/images/icons/Chevron_Down.svg similarity index 100% rename from public/images/icons/Chevron_Down.svg rename to client/public/images/icons/Chevron_Down.svg diff --git a/public/images/icons/Chevron_Right.svg b/client/public/images/icons/Chevron_Right.svg similarity index 100% rename from public/images/icons/Chevron_Right.svg rename to client/public/images/icons/Chevron_Right.svg diff --git a/public/images/logo.png b/client/public/images/logo.png similarity index 100% rename from public/images/logo.png rename to client/public/images/logo.png diff --git a/public/images/map.png b/client/public/images/map.png similarity index 100% rename from public/images/map.png rename to client/public/images/map.png diff --git a/public/images/slider/slide1.png b/client/public/images/slider/slide1.png similarity index 100% rename from public/images/slider/slide1.png rename to client/public/images/slider/slide1.png diff --git a/public/images/slider/slide2.jpg b/client/public/images/slider/slide2.jpg similarity index 100% rename from public/images/slider/slide2.jpg rename to client/public/images/slider/slide2.jpg diff --git a/public/images/slider/slide3.png b/client/public/images/slider/slide3.png similarity index 100% rename from public/images/slider/slide3.png rename to client/public/images/slider/slide3.png diff --git a/public/images/slider/slide4.jpg b/client/public/images/slider/slide4.jpg similarity index 100% rename from public/images/slider/slide4.jpg rename to client/public/images/slider/slide4.jpg diff --git a/public/images/slider/slide5.png b/client/public/images/slider/slide5.png similarity index 100% rename from public/images/slider/slide5.png rename to client/public/images/slider/slide5.png diff --git a/public/images/slider/slide6.png b/client/public/images/slider/slide6.png similarity index 100% rename from public/images/slider/slide6.png rename to client/public/images/slider/slide6.png diff --git a/public/images/slider/slide7.jpg b/client/public/images/slider/slide7.jpg similarity index 100% rename from public/images/slider/slide7.jpg rename to client/public/images/slider/slide7.jpg diff --git a/public/images/slider/slide8.png b/client/public/images/slider/slide8.png similarity index 100% rename from public/images/slider/slide8.png rename to client/public/images/slider/slide8.png diff --git a/public/vite.svg b/client/public/vite.svg similarity index 100% rename from public/vite.svg rename to client/public/vite.svg diff --git a/src/App.css b/client/src/App.css similarity index 100% rename from src/App.css rename to client/src/App.css diff --git a/src/App.tsx b/client/src/App.tsx similarity index 94% rename from src/App.tsx rename to client/src/App.tsx index 89aabcf..4add304 100644 --- a/src/App.tsx +++ b/client/src/App.tsx @@ -1,17 +1,24 @@ import "./App.css"; import { Canvas } from "@react-three/fiber"; -import { Suspense, useEffect, useRef } from "react"; +import { FormEvent, Suspense, useEffect, useRef, useState } from "react"; import PieChart from "./components/PieChart/PieChart"; -import { Model } from "./components/VRHemlet"; +import { Model } from "./components/govno"; import Calc from "./components/Calc"; import Slider from "./components/Slider/Slider"; import Map from "./components/Map"; import { motion } from "framer-motion"; -// import { OrbitControls, PerspectiveCamera } from "@react-three/drei"; +import InputMask from "react-input-mask"; +import api from "./utils/api"; +import { OrbitControls, PerspectiveCamera, Wireframe } from "@react-three/drei"; function App() { const parallaxRef = useRef(null); + const [fullname, setFullname] = useState(""); + const [email, setEmail] = useState(""); + const [company, setCompany] = useState(""); + const [phone, setPhone] = useState(""); + function handleScroll() { if (parallaxRef.current) { parallaxRef.current.style.transform = `translateY(${ @@ -26,6 +33,19 @@ function App() { } } + async function handleSubmitSendMail(e: FormEvent) { + e.preventDefault(); + + await api.post("mail", { + json: { + fullname, + email, + company, + phone, + }, + }); + } + useEffect(() => { window.addEventListener("scroll", handleScroll); @@ -159,11 +179,11 @@ function App() { - {/* */} + @@ -562,7 +582,10 @@ function App() { Давайте обсудим детали!

-
+
@@ -586,6 +612,8 @@ function App() { setCompany(e.target.value)} />
@@ -598,8 +626,11 @@ function App() { Email* setEmail(e.target.value)} />
@@ -609,15 +640,20 @@ function App() { > Номер телефона - setPhone(e.target.value)} />
-
- +
diff --git a/src/components/Calc.tsx b/client/src/components/Calc.tsx similarity index 100% rename from src/components/Calc.tsx rename to client/src/components/Calc.tsx diff --git a/src/components/Map.tsx b/client/src/components/Map.tsx similarity index 100% rename from src/components/Map.tsx rename to client/src/components/Map.tsx diff --git a/src/components/PieChart/PieChart.css b/client/src/components/PieChart/PieChart.css similarity index 100% rename from src/components/PieChart/PieChart.css rename to client/src/components/PieChart/PieChart.css diff --git a/src/components/PieChart/PieChart.tsx b/client/src/components/PieChart/PieChart.tsx similarity index 100% rename from src/components/PieChart/PieChart.tsx rename to client/src/components/PieChart/PieChart.tsx diff --git a/src/components/RangeSlider.tsx b/client/src/components/RangeSlider.tsx similarity index 100% rename from src/components/RangeSlider.tsx rename to client/src/components/RangeSlider.tsx diff --git a/src/components/SearchableSelect.tsx b/client/src/components/SearchableSelect.tsx similarity index 100% rename from src/components/SearchableSelect.tsx rename to client/src/components/SearchableSelect.tsx diff --git a/src/components/Slider/Slide1.tsx b/client/src/components/Slider/Slide1.tsx similarity index 100% rename from src/components/Slider/Slide1.tsx rename to client/src/components/Slider/Slide1.tsx diff --git a/src/components/Slider/Slide2.tsx b/client/src/components/Slider/Slide2.tsx similarity index 100% rename from src/components/Slider/Slide2.tsx rename to client/src/components/Slider/Slide2.tsx diff --git a/src/components/Slider/Slide3.tsx b/client/src/components/Slider/Slide3.tsx similarity index 100% rename from src/components/Slider/Slide3.tsx rename to client/src/components/Slider/Slide3.tsx diff --git a/src/components/Slider/Slide4.tsx b/client/src/components/Slider/Slide4.tsx similarity index 100% rename from src/components/Slider/Slide4.tsx rename to client/src/components/Slider/Slide4.tsx diff --git a/src/components/Slider/Slide5.tsx b/client/src/components/Slider/Slide5.tsx similarity index 100% rename from src/components/Slider/Slide5.tsx rename to client/src/components/Slider/Slide5.tsx diff --git a/src/components/Slider/Slide6.tsx b/client/src/components/Slider/Slide6.tsx similarity index 100% rename from src/components/Slider/Slide6.tsx rename to client/src/components/Slider/Slide6.tsx diff --git a/src/components/Slider/Slide7.tsx b/client/src/components/Slider/Slide7.tsx similarity index 100% rename from src/components/Slider/Slide7.tsx rename to client/src/components/Slider/Slide7.tsx diff --git a/src/components/Slider/Slide8.tsx b/client/src/components/Slider/Slide8.tsx similarity index 100% rename from src/components/Slider/Slide8.tsx rename to client/src/components/Slider/Slide8.tsx diff --git a/src/components/Slider/SlideContainer.tsx b/client/src/components/Slider/SlideContainer.tsx similarity index 100% rename from src/components/Slider/SlideContainer.tsx rename to client/src/components/Slider/SlideContainer.tsx diff --git a/src/components/Slider/Slider.tsx b/client/src/components/Slider/Slider.tsx similarity index 100% rename from src/components/Slider/Slider.tsx rename to client/src/components/Slider/Slider.tsx diff --git a/src/components/VRHemlet.tsx b/client/src/components/VRHemlet.tsx similarity index 79% rename from src/components/VRHemlet.tsx rename to client/src/components/VRHemlet.tsx index 1e2fe9c..a7cf099 100644 --- a/src/components/VRHemlet.tsx +++ b/client/src/components/VRHemlet.tsx @@ -4,7 +4,8 @@ Command: npx gltfjsx@6.1.4 .\\public\\VRAnim_46.glb */ import React, { useRef, useEffect } from "react"; -import { useGLTF, useAnimations } from "@react-three/drei"; +import { useGLTF, useAnimations, Wireframe } from "@react-three/drei"; +import THREE from "three"; export function Model(props: any) { const group = useRef(); @@ -28,7 +29,11 @@ export function Model(props: any) { name="SM_VRHelmet" geometry={nodes.SM_VRHelmet.geometry} material={materials.M_Plastic_White} - /> + + > + {/* */} + + ); diff --git a/src/index.css b/client/src/index.css similarity index 100% rename from src/index.css rename to client/src/index.css diff --git a/src/main.tsx b/client/src/main.tsx similarity index 100% rename from src/main.tsx rename to client/src/main.tsx diff --git a/client/src/utils/api.ts b/client/src/utils/api.ts new file mode 100644 index 0000000..3544985 --- /dev/null +++ b/client/src/utils/api.ts @@ -0,0 +1,7 @@ +import ky from "ky"; + +const api = ky.create({ + prefixUrl: "http://localhost:3000", +}); + +export default api; diff --git a/src/vite-env.d.ts b/client/src/vite-env.d.ts similarity index 100% rename from src/vite-env.d.ts rename to client/src/vite-env.d.ts diff --git a/tailwind.config.js b/client/tailwind.config.js similarity index 100% rename from tailwind.config.js rename to client/tailwind.config.js diff --git a/tsconfig.json b/client/tsconfig.json similarity index 100% rename from tsconfig.json rename to client/tsconfig.json diff --git a/tsconfig.node.json b/client/tsconfig.node.json similarity index 100% rename from tsconfig.node.json rename to client/tsconfig.node.json diff --git a/vite.config.ts b/client/vite.config.ts similarity index 100% rename from vite.config.ts rename to client/vite.config.ts diff --git a/yarn.lock b/client/yarn.lock similarity index 100% rename from yarn.lock rename to client/yarn.lock diff --git a/server/app.js b/server/app.js index 2bb7223..6211eb4 100644 --- a/server/app.js +++ b/server/app.js @@ -1,9 +1,11 @@ import express from "express"; import cors from "cors"; import ky from "ky"; +import mongoose from "mongoose"; +import Mail from "./models/Mail.js"; const app = express(); -const PORT = 3000; +const port = 3000; app.use(cors()); app.use(express.json()); @@ -63,14 +65,19 @@ app.get("/region/:id", async (req, res) => { } }); -app.get("/test/:id", async (req, res) => { - try { - res.json({ data }); - } catch (error) { - res.send({ error: 1 }); - } +app.post("/mail", async (req, res) => { + console.log(req.body); + await Mail.create(req.body); + + res.send({ ok: 1 }); }); -app.listen(PORT, () => { - console.log(`Server is started on port ${PORT}...`); +app.listen(port, async () => { + await mongoose.connect( + "mongodb://192.168.1.159:27017/", + { dbName: "test" }, + console.log("DB connection...") + ); + + console.log(`Server is started on port ${port}...`); }); diff --git a/server/models/Mail.js b/server/models/Mail.js new file mode 100644 index 0000000..fcc43cb --- /dev/null +++ b/server/models/Mail.js @@ -0,0 +1,29 @@ +import { Schema, model } from "mongoose"; + +const mailSchema = new Schema( + { + fullname: { + type: String, + required: true, + }, // String is shorthand for {type: String} + email: { + type: String, + required: true, + }, + company: { + type: String, + }, + phone: { + type: String, + }, + }, + { + timestamps: true, + toJSON: { virtuals: true }, + toObject: { virtuals: true }, + } +); + +const Mail = model("Mail", mailSchema); + +export default Mail; diff --git a/server/package.json b/server/package.json index e3360ea..ed525c5 100644 --- a/server/package.json +++ b/server/package.json @@ -10,7 +10,8 @@ "dependencies": { "cors": "^2.8.5", "express": "^4.18.2", - "ky": "^0.33.3" + "ky": "^0.33.3", + "mongoose": "^7.0.4" }, "devDependencies": { "nodemon": "^2.0.22" diff --git a/server/yarn.lock b/server/yarn.lock index 9a659d6..512c8f1 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -2,6 +2,24 @@ # yarn lockfile v1 +"@types/node@*": + version "18.15.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" + integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== + +"@types/webidl-conversions@*": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz#2b8e60e33906459219aa587e9d1a612ae994cfe7" + integrity sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog== + +"@types/whatwg-url@^8.2.1": + version "8.2.2" + resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63" + integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA== + dependencies: + "@types/node" "*" + "@types/webidl-conversions" "*" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -71,6 +89,11 @@ braces@~3.0.2: dependencies: fill-range "^7.0.1" +bson@^5.0.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/bson/-/bson-5.2.0.tgz#c81d35dd30e2798203e5422a639780ea98dd25ba" + integrity sha512-HevkSpDbpUfsrHWmWiAsNavANKYIErV2ePXllp1bwq5CDreAaFVj6RVlZpJnxK4WWDCJ/5jMUpaY6G526q3Hjg== + bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" @@ -141,6 +164,13 @@ debug@2.6.9: dependencies: ms "2.0.0" +debug@4.x: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -316,6 +346,11 @@ inherits@2.0.4: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -345,6 +380,11 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +kareem@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.5.1.tgz#7b8203e11819a8e77a34b3517d3ead206764d15d" + integrity sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA== + ky@^0.33.3: version "0.33.3" resolved "https://registry.yarnpkg.com/ky/-/ky-0.33.3.tgz#bf1ad322a3f2c3428c13cfa4b3af95e6c4a2f543" @@ -355,6 +395,11 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== +memory-pager@^1.0.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5" + integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg== + merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" @@ -389,11 +434,60 @@ minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" +mongodb-connection-string-url@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf" + integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ== + dependencies: + "@types/whatwg-url" "^8.2.1" + whatwg-url "^11.0.0" + +mongodb@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-5.1.0.tgz#e551f9e496777bde9173e51d16c163ab2c805b9d" + integrity sha512-qgKb7y+EI90y4weY3z5+lIgm8wmexbonz0GalHkSElQXVKtRuwqXuhXKccyvIjXCJVy9qPV82zsinY0W1FBnJw== + dependencies: + bson "^5.0.1" + mongodb-connection-string-url "^2.6.0" + socks "^2.7.1" + optionalDependencies: + saslprep "^1.0.3" + +mongoose@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-7.0.4.tgz#7f6c31e12d86eed516ab5d1f5e6f8196d3682ed2" + integrity sha512-MEmQOOqQUvW1PJcji64NtA2EFGHrEvk9o4g//isVYSJW2+8Y8u49C2qFBKzn1t6/l9onQn012o/PcFqR6ixQpQ== + dependencies: + bson "^5.0.1" + kareem "2.5.1" + mongodb "5.1.0" + mpath "0.9.0" + mquery "5.0.0" + ms "2.1.3" + sift "16.0.1" + +mpath@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.9.0.tgz#0c122fe107846e31fc58c75b09c35514b3871904" + integrity sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew== + +mquery@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/mquery/-/mquery-5.0.0.tgz#a95be5dfc610b23862df34a47d3e5d60e110695d" + integrity sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg== + dependencies: + debug "4.x" + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + ms@2.1.3, ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" @@ -477,6 +571,11 @@ pstree.remy@^1.1.8: resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a" integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w== +punycode@^2.1.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== + qs@6.11.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" @@ -516,6 +615,13 @@ safe-buffer@5.2.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +saslprep@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226" + integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag== + dependencies: + sparse-bitfield "^3.0.3" + semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -569,6 +675,11 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +sift@16.0.1: + version "16.0.1" + resolved "https://registry.yarnpkg.com/sift/-/sift-16.0.1.tgz#e9c2ccc72191585008cf3e36fc447b2d2633a053" + integrity sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ== + simple-update-notifier@^1.0.7: version "1.1.0" resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" @@ -576,6 +687,26 @@ simple-update-notifier@^1.0.7: dependencies: semver "~7.0.0" +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +socks@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + +sparse-bitfield@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11" + integrity sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ== + dependencies: + memory-pager "^1.0.2" + statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -607,6 +738,13 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" +tr46@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" + integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== + dependencies: + punycode "^2.1.1" + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -634,3 +772,16 @@ vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== + +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +whatwg-url@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" + integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== + dependencies: + tr46 "^3.0.0" + webidl-conversions "^7.0.0" diff --git a/src/AppTest.tsx b/src/AppTest.tsx deleted file mode 100644 index 8cfac09..0000000 --- a/src/AppTest.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from "react"; -import { Parallax, ParallaxProvider } from "react-scroll-parallax"; - -function AppTest() { - return ( - -
- -
test
- -
- - ); -} - -export default AppTest;