diff --git a/client/.env b/client/.env index 9c07060..5b9388e 100644 --- a/client/.env +++ b/client/.env @@ -1 +1,2 @@ -VITE_API_URL=http://192.168.1.170:3000 \ No newline at end of file +VITE_API_URL=http://192.168.1.171:3000 +# VITE_API_URL=http://localhost:3000 \ No newline at end of file diff --git a/client/public/images/Logo.svg b/client/public/images/Logo.svg new file mode 100644 index 0000000..f47a105 --- /dev/null +++ b/client/public/images/Logo.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/LogoMobile.svg b/client/public/images/LogoMobile.svg new file mode 100644 index 0000000..36fc3da --- /dev/null +++ b/client/public/images/LogoMobile.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/images/Map.png b/client/public/images/Map.png new file mode 100644 index 0000000..fa4ca9e Binary files /dev/null and b/client/public/images/Map.png differ diff --git a/client/public/images/Stream.jpg b/client/public/images/Stream.jpg index 4388edd..36e7193 100644 Binary files a/client/public/images/Stream.jpg and b/client/public/images/Stream.jpg differ diff --git a/client/src/App.tsx b/client/src/App.tsx index fd45491..869af1e 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -1,6 +1,5 @@ /* eslint-disable no-irregular-whitespace */ import "./App.css"; -import LogoIcon from "./components/icons/LogoIcon"; import BlendingHeader from "./components/blendings/BlendingHeader"; import FeatureItem from "./components/FeatureItem"; // import BlendVR from "./components/blendings/BlendVR"; @@ -23,6 +22,7 @@ import VideoSliderMobile from "./components/VideoSliderMobile"; // import { isMobile } from "react-device-detect"; import IProject from "./types/IProject"; import api from "./utils/api"; +import ArrowRightIcon from "./components/icons/ArrowRightIcon"; function App() { const [selectedVideo, setSelectedVideo] = useState( @@ -53,7 +53,16 @@ function App() {
- + +
+
+ +
+ + + +
+ +
+ +
+
+ + {/*
Экскурсия @@ -314,7 +411,7 @@ function App() {
-
+
*/}
@@ -342,61 +439,6 @@ function App() {
-
-
- - Graff.estate stream — -
- - удаленная демонстрация -
- жилого комплекса - - - -
-
-

- Высокий уровень графики и полное погружение покупателя в процесс - выбора квартиры -

- -
-
-

- Местоположение и устройство значения не имеют. Нужен только - интернет -

-
-
- -
-
- -
- - - -
-
diff --git a/client/src/assets/fonts/Gilroy/Gilroy-Medium.eot b/client/src/assets/fonts/Gilroy/Gilroy-Medium.eot new file mode 100644 index 0000000..fb2cfc7 Binary files /dev/null and b/client/src/assets/fonts/Gilroy/Gilroy-Medium.eot differ diff --git a/client/src/assets/fonts/Gilroy/Gilroy-Medium.ttf b/client/src/assets/fonts/Gilroy/Gilroy-Medium.ttf new file mode 100644 index 0000000..eac83a8 Binary files /dev/null and b/client/src/assets/fonts/Gilroy/Gilroy-Medium.ttf differ diff --git a/client/src/assets/fonts/Gilroy/Gilroy-Medium.woff b/client/src/assets/fonts/Gilroy/Gilroy-Medium.woff new file mode 100644 index 0000000..5317e7c Binary files /dev/null and b/client/src/assets/fonts/Gilroy/Gilroy-Medium.woff differ diff --git a/client/src/assets/fonts/Gilroy/Gilroy-Medium.woff2 b/client/src/assets/fonts/Gilroy/Gilroy-Medium.woff2 new file mode 100644 index 0000000..bfcb803 Binary files /dev/null and b/client/src/assets/fonts/Gilroy/Gilroy-Medium.woff2 differ diff --git a/client/src/assets/fonts/Gilroy/Gilroy-Semibold.eot b/client/src/assets/fonts/Gilroy/Gilroy-Semibold.eot new file mode 100644 index 0000000..f19ef8c Binary files /dev/null and b/client/src/assets/fonts/Gilroy/Gilroy-Semibold.eot differ diff --git a/client/src/assets/fonts/Gilroy/Gilroy-Semibold.ttf b/client/src/assets/fonts/Gilroy/Gilroy-Semibold.ttf new file mode 100644 index 0000000..e587a2f Binary files /dev/null and b/client/src/assets/fonts/Gilroy/Gilroy-Semibold.ttf differ diff --git a/client/src/assets/fonts/Gilroy/Gilroy-Semibold.woff b/client/src/assets/fonts/Gilroy/Gilroy-Semibold.woff new file mode 100644 index 0000000..4103d81 Binary files /dev/null and b/client/src/assets/fonts/Gilroy/Gilroy-Semibold.woff differ diff --git a/client/src/assets/fonts/Gilroy/Gilroy-Semibold.woff2 b/client/src/assets/fonts/Gilroy/Gilroy-Semibold.woff2 new file mode 100644 index 0000000..dab2939 Binary files /dev/null and b/client/src/assets/fonts/Gilroy/Gilroy-Semibold.woff2 differ diff --git a/client/src/assets/fonts/Gilroy/Gilroy.css b/client/src/assets/fonts/Gilroy/Gilroy.css new file mode 100644 index 0000000..34d41a2 --- /dev/null +++ b/client/src/assets/fonts/Gilroy/Gilroy.css @@ -0,0 +1,24 @@ +@font-face { + font-family: 'Gilroy'; + src: url('Gilroy-Medium.eot'); + src: url('Gilroy-Medium.eot?#iefix') format('embedded-opentype'), + url('Gilroy-Medium.woff2') format('woff2'), + url('Gilroy-Medium.woff') format('woff'), + url('Gilroy-Medium.ttf') format('truetype'); + font-weight: 500; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Gilroy'; + src: url('Gilroy-Semibold.eot'); + src: url('Gilroy-Semibold.eot?#iefix') format('embedded-opentype'), + url('Gilroy-Semibold.woff2') format('woff2'), + url('Gilroy-Semibold.woff') format('woff'), + url('Gilroy-Semibold.ttf') format('truetype'); + font-weight: 600; + font-style: normal; + font-display: swap; +} + diff --git a/client/src/components/Button.tsx b/client/src/components/Button.tsx index 6b54603..435feeb 100644 --- a/client/src/components/Button.tsx +++ b/client/src/components/Button.tsx @@ -19,13 +19,15 @@ function Button({ ); } diff --git a/client/src/components/Calc.tsx b/client/src/components/Calc.tsx index e15b953..885cbb3 100644 --- a/client/src/components/Calc.tsx +++ b/client/src/components/Calc.tsx @@ -260,7 +260,7 @@ function Calc() {

@@ -296,7 +296,7 @@ function Calc() {

@@ -304,7 +304,7 @@ function Calc() { млн руб. @@ -327,56 +327,6 @@ function Calc() {

Статистика продаж

- {/*
-

100%

-
-
-

{consultations}

-
-
-

- Консультаций в офисе -

-
- -
-

- {isToolEnabled ? 48 : 30}% -

-
-
-

- {isToolEnabled ? reservation : oldReservation} -

-
-
-

- Бронь квартиры -

-
- -
-

- {isToolEnabled ? 42 : 30}% -

-
-
-

- {isToolEnabled ? sales : oldSales} -

-
-
-

Продажа

-
*/} -

100%

@@ -389,14 +339,20 @@ function Calc() {
-
+

{consultations}

@@ -406,8 +362,10 @@ function Calc() {

diff --git a/client/src/components/ProjectCard.tsx b/client/src/components/ProjectCard.tsx index 25d555c..1e346d2 100644 --- a/client/src/components/ProjectCard.tsx +++ b/client/src/components/ProjectCard.tsx @@ -48,7 +48,7 @@ function ProjectCard({

) : ( -
+

{releaseYear}

diff --git a/client/src/components/blendings/BlendStream.tsx b/client/src/components/blendings/BlendStream.tsx index 12657b0..b6306c8 100644 --- a/client/src/components/blendings/BlendStream.tsx +++ b/client/src/components/blendings/BlendStream.tsx @@ -1,842 +1,790 @@ function BlendStream() { return ( - + diff --git a/client/src/components/blendings/BlendingCalc.tsx b/client/src/components/blendings/BlendingCalc.tsx index 2197abd..93e1e66 100644 --- a/client/src/components/blendings/BlendingCalc.tsx +++ b/client/src/components/blendings/BlendingCalc.tsx @@ -1,5 +1,3 @@ -import React from "react"; - function BlendingCalc() { return ( void; - removeModal: () => void; } const useModalStore = create((set) => ({ modal: null, setModal: (modal) => set({ modal }), - removeModal: set({ modal: null }), })); export default useModalStore; diff --git a/server/src/routes/upload.ts b/server/src/routes/upload.ts index 66924f5..6757ca1 100644 --- a/server/src/routes/upload.ts +++ b/server/src/routes/upload.ts @@ -41,15 +41,15 @@ router.post("/", upload.single("file"), async (req, res) => { await sharp(req.file.buffer) .resize({ - width: 512, - height: 512, + width: 728, + height: 728, fit: "inside", withoutEnlargement: true, }) .jpeg({ quality: 90 }) .toFile(`uploads/${filename}`); - return res.json({ file: `http://192.168.1.170:3000/upload/${filename}` }); + return res.json({ file: `http://192.168.1.171:3000/upload/${filename}` }); } catch (error) { if (error instanceof Error) { return res.json({ error: error.message }); diff --git a/server/uploads/8c9b0949-8b30-457c-a6d5-aeef71866a42.jpg b/server/uploads/8c9b0949-8b30-457c-a6d5-aeef71866a42.jpg deleted file mode 100644 index ca5604e..0000000 Binary files a/server/uploads/8c9b0949-8b30-457c-a6d5-aeef71866a42.jpg and /dev/null differ diff --git a/server/uploads/925c5501-5e6e-4b23-bad2-ea7e7d5e96e2.jpg b/server/uploads/925c5501-5e6e-4b23-bad2-ea7e7d5e96e2.jpg deleted file mode 100644 index 4d9fc67..0000000 Binary files a/server/uploads/925c5501-5e6e-4b23-bad2-ea7e7d5e96e2.jpg and /dev/null differ diff --git a/server/uploads/9d6db744-3af3-41a7-b24e-ef0f056c3d6e.jpg b/server/uploads/9d6db744-3af3-41a7-b24e-ef0f056c3d6e.jpg deleted file mode 100644 index a8f7c00..0000000 Binary files a/server/uploads/9d6db744-3af3-41a7-b24e-ef0f056c3d6e.jpg and /dev/null differ diff --git a/server/uploads/a5fe12a2-75f3-4de7-a765-18316cd58d3f.jpg b/server/uploads/a5fe12a2-75f3-4de7-a765-18316cd58d3f.jpg new file mode 100644 index 0000000..f627bb6 Binary files /dev/null and b/server/uploads/a5fe12a2-75f3-4de7-a765-18316cd58d3f.jpg differ diff --git a/server/uploads/d5829c95-f38b-43e9-883a-c23a2080e496.jpg b/server/uploads/d5829c95-f38b-43e9-883a-c23a2080e496.jpg deleted file mode 100644 index 5639ac4..0000000 Binary files a/server/uploads/d5829c95-f38b-43e9-883a-c23a2080e496.jpg and /dev/null differ