From 9233444c11034356a7fa9b4fb0643fdc9aa87c34 Mon Sep 17 00:00:00 2001 From: ArtChaos189 Date: Tue, 16 Jan 2024 13:10:38 +0300 Subject: [PATCH 01/12] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BB=D0=B0=D0=B9=D0=B4=D0=B5=D1=80=20,=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=BE=D0=B2=D0=BE=D0=B9=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++ src/assets/icons/arrow_left.svg | 13 +++++ src/assets/icons/arrow_right.svg | 13 +++++ src/pages/startPage/stepOne.tsx | 84 +++++++++++++++++++++++++++++++- src/pages/startPage/steptwo.tsx | 67 +++++++++++++++++++++++-- yarn.lock | 50 +++++++++++++++++++ 6 files changed, 225 insertions(+), 5 deletions(-) create mode 100644 src/assets/icons/arrow_left.svg create mode 100644 src/assets/icons/arrow_right.svg diff --git a/package.json b/package.json index decf6cd8..b35fa6f2 100755 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@types/react": "^18.0.0", "@types/react-dnd": "^3.0.2", "@types/react-dom": "^18.0.0", + "@types/react-slick": "^0.23.13", "axios": "^1.5.1", "cypress-file-upload": "^5.0.8", "cytoscape": "^3.26.0", @@ -47,6 +48,8 @@ "react-rnd": "^10.4.1", "react-router-dom": "^6.6.2", "react-scripts": "5.0.1", + "react-slick": "^0.29.0", + "slick-carousel": "^1.8.1", "swr": "^2.2.4", "typescript": "^5.2.2", "use-debounce": "^9.0.4", diff --git a/src/assets/icons/arrow_left.svg b/src/assets/icons/arrow_left.svg new file mode 100644 index 00000000..ab458806 --- /dev/null +++ b/src/assets/icons/arrow_left.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/assets/icons/arrow_right.svg b/src/assets/icons/arrow_right.svg new file mode 100644 index 00000000..ba5ffa5d --- /dev/null +++ b/src/assets/icons/arrow_right.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/pages/startPage/stepOne.tsx b/src/pages/startPage/stepOne.tsx index e3d7511a..600609f8 100755 --- a/src/pages/startPage/stepOne.tsx +++ b/src/pages/startPage/stepOne.tsx @@ -1,13 +1,45 @@ -import { Box, Button } from "@mui/material"; +import { Box, Button, useMediaQuery, useTheme } from "@mui/material"; import CreationCard from "@ui_kit/CreationCard"; import quizCreationImage1 from "../../assets/quiz-creation-1.png"; import quizCreationImage2 from "../../assets/quiz-creation-2.png"; import { setQuizType } from "@root/quizes/actions"; import { useCurrentQuiz } from "@root/quizes/hooks"; +import { useEffect, useRef, useState } from "react"; + +import arrowLeftIcon from "../../assets/icons/arrow_left.svg"; +import arrowRightIcon from "../../assets/icons/arrow_right.svg"; + +import "slick-carousel/slick/slick-theme.css"; +import "slick-carousel/slick/slick.css"; export default function StepOne() { const quiz = useCurrentQuiz(); const config = quiz?.config; + const theme = useTheme(); + const isSlider = useMediaQuery(theme.breakpoints.down(950)); + + const containerRef = useRef(null); + const buttonRefs = useRef<(HTMLButtonElement | null)[]>([]); + const [currentIndex, setCurrentIndex] = useState(0); + + useEffect(() => { + if (containerRef.current && buttonRefs.current.length > 0) { + const buttonWidth = buttonRefs.current[0]!.offsetWidth; + + containerRef.current.scrollTo({ + left: currentIndex * buttonWidth, + behavior: "smooth", + }); + } + }, [currentIndex]); + + const handlePrevClick = () => { + setCurrentIndex((prevIndex) => Math.max(prevIndex - 1, 0)); + }; + + const handleNextClick = () => { + setCurrentIndex((prevIndex) => Math.min(prevIndex + 1, 2)); + }; if (!config) return null; @@ -20,14 +52,18 @@ export default function StepOne() { }} > + + + {isSlider && ( + <> + + + + )} ); } diff --git a/src/pages/startPage/steptwo.tsx b/src/pages/startPage/steptwo.tsx index 9fce2ebe..e4eb42af 100755 --- a/src/pages/startPage/steptwo.tsx +++ b/src/pages/startPage/steptwo.tsx @@ -11,13 +11,40 @@ import cardImage1 from "../../assets/card-1.png"; import cardImage2 from "../../assets/card-2.png"; import cardImage3 from "../../assets/card-3.png"; import CardWithImage from "./CardWithImage"; +import { useRef, useState, useEffect } from "react"; + +import arrowLeftIcon from "../../assets/icons/arrow_left.svg"; +import arrowRightIcon from "../../assets/icons/arrow_right.svg"; export default function Steptwo() { + const quiz = useCurrentQuiz(); + const config = quiz?.config; const theme = useTheme(); const isSmallMonitor = useMediaQuery(theme.breakpoints.down(1300)); - const quiz = useCurrentQuiz(); + const isSlider = useMediaQuery(theme.breakpoints.down(1250)); - const config = quiz?.config; + const containerRef = useRef(null); + const buttonRefs = useRef<(HTMLButtonElement | null)[]>([]); + const [currentIndex, setCurrentIndex] = useState(0); + + useEffect(() => { + if (containerRef.current && buttonRefs.current.length > 0) { + const buttonWidth = buttonRefs.current[0]!.offsetWidth; + + containerRef.current.scrollTo({ + left: currentIndex * buttonWidth, + behavior: "smooth", + }); + } + }, [currentIndex]); + + const handlePrevClick = () => { + setCurrentIndex((prevIndex) => Math.max(prevIndex - 1, 0)); + }; + + const handleNextClick = () => { + setCurrentIndex((prevIndex) => Math.min(prevIndex + 1, 2)); + }; if (!config) return null; @@ -32,15 +59,19 @@ export default function Steptwo() { }} > + {isSlider && ( + <> + + + + )} ); diff --git a/yarn.lock b/yarn.lock index f5472212..6f23d7b9 100755 --- a/yarn.lock +++ b/yarn.lock @@ -2436,6 +2436,13 @@ hoist-non-react-statics "^3.3.0" redux "^4.0.0" +"@types/react-slick@^0.23.13": + version "0.23.13" + resolved "https://registry.yarnpkg.com/@types/react-slick/-/react-slick-0.23.13.tgz#037434e73a58063047b121e08565f7185d811f36" + integrity sha512-bNZfDhe/L8t5OQzIyhrRhBr/61pfBcWaYJoq6UDqFtv5LMwfg4NsVDD2J8N01JqdAdxLjOt66OZEp6PX+dGs/A== + dependencies: + "@types/react" "*" + "@types/react-transition-group@^4.4.7", "@types/react-transition-group@^4.4.8": version "4.4.9" resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.9.tgz" @@ -3617,6 +3624,11 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== +classnames@^2.2.5: + version "2.5.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b" + integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== + clean-css@^5.2.2: version "5.3.1" resolved "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz" @@ -4633,6 +4645,11 @@ enhanced-resolve@^5.10.0: graceful-fs "^4.2.4" tapable "^2.2.0" +enquire.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/enquire.js/-/enquire.js-2.1.6.tgz#3e8780c9b8b835084c3f60e166dbc3c2a3c89814" + integrity sha512-/KujNpO+PT63F7Hlpu4h3pE3TokKRHN26JYmQpPyjkRD/N57R7bPDNojMXdi7uveAKjYB7yQnartCxZnFWr0Xw== + enquirer@^2.3.6: version "2.4.1" resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz" @@ -6965,6 +6982,13 @@ json-stringify-safe@~5.0.1: resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== +json2mq@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a" + integrity sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA== + dependencies: + string-convert "^0.2.0" + json5@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz" @@ -8919,6 +8943,17 @@ react-scripts@5.0.1: optionalDependencies: fsevents "^2.3.2" +react-slick@^0.29.0: + version "0.29.0" + resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.29.0.tgz#0bed5ea42bf75a23d40c0259b828ed27627b51bb" + integrity sha512-TGdOKE+ZkJHHeC4aaoH85m8RnFyWqdqRfAGkhd6dirmATXMZWAxOpTLmw2Ll/jPTQ3eEG7ercFr/sbzdeYCJXA== + dependencies: + classnames "^2.2.5" + enquire.js "^2.1.6" + json2mq "^0.2.0" + lodash.debounce "^4.0.8" + resize-observer-polyfill "^1.5.0" + react-transition-group@^4.4.5: version "4.4.5" resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz" @@ -9122,6 +9157,11 @@ requires-port@^1.0.0: resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== +resize-observer-polyfill@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== + resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz" @@ -9529,6 +9569,11 @@ slice-ansi@^7.0.0: ansi-styles "^6.2.1" is-fullwidth-code-point "^5.0.0" +slick-carousel@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/slick-carousel/-/slick-carousel-1.8.1.tgz#a4bfb29014887bb66ce528b90bd0cda262cc8f8d" + integrity sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA== + sockjs@^0.3.24: version "0.3.24" resolved "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz" @@ -9667,6 +9712,11 @@ string-argv@0.3.2: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== +string-convert@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" + integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A== + string-length@^4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz" From 40f8698e90fb13778e5bb124349c61be06e0fbad Mon Sep 17 00:00:00 2001 From: ArtChaos189 Date: Tue, 16 Jan 2024 13:12:59 +0300 Subject: [PATCH 02/12] style --- src/pages/startPage/steptwo.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/startPage/steptwo.tsx b/src/pages/startPage/steptwo.tsx index e4eb42af..0756c055 100755 --- a/src/pages/startPage/steptwo.tsx +++ b/src/pages/startPage/steptwo.tsx @@ -132,7 +132,7 @@ export default function Steptwo() { style={{ position: "absolute", left: "0", - top: "50%", + top: "55%", width: "40px", height: "40px", }} @@ -143,7 +143,7 @@ export default function Steptwo() { style={{ position: "absolute", right: "0", - top: "50%", + top: "55%", width: "40px", height: "40px", }} From 3454e63334d1a51c80300d0dfb3b9facf9318546 Mon Sep 17 00:00:00 2001 From: ArtChaos189 Date: Tue, 16 Jan 2024 13:20:11 +0300 Subject: [PATCH 03/12] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B2?= =?UTF-8?q?=D0=B8=D0=B4=D0=B8=D0=BE=D1=81=D1=82=D1=8C=20=D1=81=D0=BA=D1=80?= =?UTF-8?q?=D0=BE=D0=BB=D0=BB=D0=B0=20=D0=B2=20=D1=81=D0=BB=D0=B0=D0=B9?= =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/startPage/stepOne.tsx | 4 ++++ src/pages/startPage/steptwo.tsx | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pages/startPage/stepOne.tsx b/src/pages/startPage/stepOne.tsx index 600609f8..bf2deeac 100755 --- a/src/pages/startPage/stepOne.tsx +++ b/src/pages/startPage/stepOne.tsx @@ -59,6 +59,10 @@ export default function StepOne() { gap: "20px", mt: "60px", position: "relative", + scrollbarWidth: "none", + "&::-webkit-scrollbar": { + width: 0, + }, }} > - {isSlider && ( From 56202996f6dd9213a686d922da81b9786c8bdb2e Mon Sep 17 00:00:00 2001 From: Nastya Date: Tue, 16 Jan 2024 18:20:59 +0300 Subject: [PATCH 06/12] =?UTF-8?q?=D1=80=D0=B5=D0=BB=D0=B5=D0=B9=D1=82?= =?UTF-8?q?=D0=B8=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5?= =?UTF-8?q?=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/startPage/stepOne.tsx | 2 -- src/pages/startPage/steptwo.tsx | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pages/startPage/stepOne.tsx b/src/pages/startPage/stepOne.tsx index 95d09aa3..3bdcfd70 100755 --- a/src/pages/startPage/stepOne.tsx +++ b/src/pages/startPage/stepOne.tsx @@ -9,8 +9,6 @@ import { useEffect, useRef, useState } from "react"; import arrowLeftIcon from "../../assets/icons/arrow_left.svg"; import arrowRightIcon from "../../assets/icons/arrow_right.svg"; -import "slick-carousel/slick/slick-theme.css"; -import "slick-carousel/slick/slick.css"; export default function StepOne() { const quiz = useCurrentQuiz(); diff --git a/src/pages/startPage/steptwo.tsx b/src/pages/startPage/steptwo.tsx index cb49fb4f..2e44b5cf 100755 --- a/src/pages/startPage/steptwo.tsx +++ b/src/pages/startPage/steptwo.tsx @@ -55,6 +55,7 @@ export default function Steptwo() { sx={{ paddingBottom: "15px", "&::-webkit-scrollbar": { width: 0 }, + position: "relative" }} > @@ -148,7 +149,7 @@ export default function Steptwo() { right: "0", top: "55%", width: "40px", - height: "40px", + top: "calc(50% - 40px)" }} src={arrowRightIcon} /> From 028a40b86ee53957732154dbe4b60a90df6e5ece Mon Sep 17 00:00:00 2001 From: skeris Date: Tue, 16 Jan 2024 16:25:04 +0300 Subject: [PATCH 07/12] fix: magic of account domain --- src/pages/auth/Signup.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/auth/Signup.tsx b/src/pages/auth/Signup.tsx index cfdc943b..83665b5e 100644 --- a/src/pages/auth/Signup.tsx +++ b/src/pages/auth/Signup.tsx @@ -54,10 +54,10 @@ export default function SignupDialog() { const location = useLocation(); useUserAccountFetcher({ - url: "https://hub.pena.digital/customer/account", + url: "https://squiz.pena.digital/customer/account", userId, onNewUserAccount: setUserAccount, - onError: enqueueSnackbar, + onError: () => {}, }); const navigate = useNavigate(); From 772c64a33a99f50a69f63b1bf9e6370fb21d1732 Mon Sep 17 00:00:00 2001 From: Tamara Date: Tue, 16 Jan 2024 21:58:39 +0300 Subject: [PATCH 08/12] =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=82=D0=B0=D1=80=D0=B8=D1=84=D0=BE=D0=B2,=20?= =?UTF-8?q?=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D0=BE?= =?UTF-8?q?=D1=84=D0=B5=D1=80=D1=82=D1=83=20=D0=B8=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D1=81=D0=BE=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D0=BA=D0=B0=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Landing/FooterLanding.tsx | 2 +- src/pages/Landing/Hero.tsx | 16 +-- src/pages/Tariffs/CustomTab.tsx | 33 +++--- src/pages/Tariffs/Tabs.tsx | 43 ++++---- src/pages/Tariffs/Tariffs.tsx | 20 ++-- .../Tariffs/tariffsUtils/FreeTariffCard.tsx | 102 ++++++++++++++---- src/pages/Tariffs/tariffsUtils/TariffCard.tsx | 15 ++- .../tariffsUtils/createTariffElements.tsx | 18 +++- src/pages/ViewPublicationPage/ContactForm.tsx | 10 +- src/pages/startPage/EditPage.tsx | 2 +- src/pages/startPage/stepOne.tsx | 1 - src/pages/startPage/steptwo.tsx | 6 +- src/ui_kit/Toolbars/ButtonTestPublication.tsx | 2 +- 13 files changed, 187 insertions(+), 83 deletions(-) diff --git a/src/pages/Landing/FooterLanding.tsx b/src/pages/Landing/FooterLanding.tsx index a66a783f..722a6c9b 100644 --- a/src/pages/Landing/FooterLanding.tsx +++ b/src/pages/Landing/FooterLanding.tsx @@ -122,7 +122,7 @@ export default function Component() { diff --git a/src/pages/Landing/Hero.tsx b/src/pages/Landing/Hero.tsx index 8e1742be..715d0c22 100644 --- a/src/pages/Landing/Hero.tsx +++ b/src/pages/Landing/Hero.tsx @@ -66,15 +66,15 @@ export default function Component() { шаблоны квизов с легкой установкой на любой сайт и социальные сети - + + component={Link} + to={"/signin"} + state={{ backgroundLocation: location }} + variant="contained" + > + Попробуйте бесплатно + ({ - ...theme.typography.body2, - color: theme.palette.primary.main, - padding: "15px", - minWidth: 0, - "&.Mui-selected": { - color: "#7e2aea", - textUnderlinePosition: "under", - textDecoration: "underline", - textUnderlineOffset: "3px", - }, - "&:first-of-type": { - paddingLeft: 0, - } -})) \ No newline at end of file + ...theme.typography.body2, + color: theme.palette.primary.main, + padding: "15px", + minWidth: 0, + "&.Mui-selected": { + color: "#7e2aea", + textUnderlinePosition: "under", + textDecoration: "underline", + textUnderlineOffset: "3px", + }, + "&:first-of-type": { + paddingLeft: 0, + }, +})); diff --git a/src/pages/Tariffs/Tabs.tsx b/src/pages/Tariffs/Tabs.tsx index 1b85428d..88d7696f 100644 --- a/src/pages/Tariffs/Tabs.tsx +++ b/src/pages/Tariffs/Tabs.tsx @@ -1,5 +1,5 @@ -import { Tabs as MuiTabs } from "@mui/material" -import { CustomTab } from "./CustomTab" +import { Tabs as MuiTabs } from "@mui/material"; +import { CustomTab } from "./CustomTab"; type TabsProps = { names: string[]; @@ -8,20 +8,25 @@ type TabsProps = { setSelectedItem: (num: "count" | "day") => void; }; -export const Tabs = ({ items, names, selectedItem, setSelectedItem }: TabsProps) => ( - { - console.log(newValue) - setSelectedItem(newValue) -}} - variant="scrollable" - scrollButtons={false} - > - {items.map((item, index) => ( - - ))} - -) \ No newline at end of file +export const Tabs = ({ + items, + names, + selectedItem, + setSelectedItem, +}: TabsProps) => ( + { + console.log(newValue); + setSelectedItem(newValue); + }} + variant="scrollable" + scrollButtons={false} + > + {items.map((item, index) => ( + + ))} + +); diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx index 20de4a72..0dd3e571 100644 --- a/src/pages/Tariffs/Tariffs.tsx +++ b/src/pages/Tariffs/Tariffs.tsx @@ -67,12 +67,12 @@ function TariffPage() { method: "GET", url: `https://squiz.pena.digital/strator/tariff?page=${page}&limit=100`, }); - console.log(page) + console.log(page); tariffsList.push(...tariffsResult.tariffs); } - console.log("это то что мы отдаём перед концом",tariffsList) + console.log("это то что мы отдаём перед концом", tariffsList); return tariffsList; }; @@ -88,7 +88,7 @@ function TariffPage() { url: "https://squiz.pena.digital/price/discounts", }); setUser(user); - console.log("это то что мы получили в самом конце",tariffsList) + console.log("это то что мы получили в самом конце", tariffsList); setTariffs(tariffsList); setDiscounts(discounts.Discounts); let c = currencyFormatter.format(Number(user.wallet.cash) / 100); @@ -140,7 +140,7 @@ function TariffPage() { const purchasesAmount = user?.wallet.purchasesAmount ?? 0; const isUserNko = user?.status === "nko"; - console.log(tariffs) + console.log(tariffs); const filteredTariffs = tariffs.filter((tariff) => { return ( tariff.privileges[0].serviceKey === "squiz" && @@ -149,7 +149,7 @@ function TariffPage() { tariff.privileges[0]?.type === selectedItem ); }); - console.log(filteredTariffs) + console.log(filteredTariffs); async function handleLogoutClick() { const [, logoutError] = await logout(); @@ -209,9 +209,13 @@ function TariffPage() { /> - - - + + } - discount={""} - headerText="бесплатно" - text="Первые 14 дней после регистрации, вы можете пользоваться полным функционалом сервиса совершенно бесплатно" - price={ - - 0 руб. - - } + // } + // discount={""} + // headerText="бесплатно" + // text="Каждому пользователю все наши продукты в первые 14 дней доступны совершенно бесплатно (кроме доп.услуг)" + // price={ + // + // 0 руб. + // + // } + // sx={{ + // backgroundColor: "#7e2aea", + // color: "white", + // }} + // /> + + > + + + + + {" "} + 0 руб{" "} + + + + + Бесплатно 14 дней + + + + Каждому пользователю все наши продукты в первые 14 дней доступны + совершенно бесплатно (кроме доп.услуг) + + + ); } diff --git a/src/pages/Tariffs/tariffsUtils/TariffCard.tsx b/src/pages/Tariffs/tariffsUtils/TariffCard.tsx index ae5a21cc..d00be039 100644 --- a/src/pages/Tariffs/tariffsUtils/TariffCard.tsx +++ b/src/pages/Tariffs/tariffsUtils/TariffCard.tsx @@ -131,9 +131,22 @@ export default function TariffCard({ {buttonProps && ( + ); }; From 7382d8eaa9b8824da34a5d9fb0cf253ac3d6f728 Mon Sep 17 00:00:00 2001 From: Tamara Date: Tue, 16 Jan 2024 23:48:03 +0300 Subject: [PATCH 10/12] =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=81=D0=B8=D0=B2?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D1=87=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=87=D0=B5=D1=80=D0=BD=D0=BE=D0=B9=20=D1=88?= =?UTF-8?q?=D0=B0=D0=BF=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ui_kit/Header/Header.tsx | 4 ++-- src/ui_kit/Header/HeaderFull.tsx | 2 +- src/ui_kit/Toolbars/ToTariffsButton.tsx | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/ui_kit/Header/Header.tsx b/src/ui_kit/Header/Header.tsx index 531cac30..c46b6345 100644 --- a/src/ui_kit/Header/Header.tsx +++ b/src/ui_kit/Header/Header.tsx @@ -128,7 +128,7 @@ export const Header = ({ setMobileSidebar }: HeaderProps) => { > {isMobile ? ( <> - + setMobileSidebar((visible: boolean) => !visible)} style={{ fontSize: "30px", color: "white", cursor: "pointer" }} @@ -136,7 +136,7 @@ export const Header = ({ setMobileSidebar }: HeaderProps) => { ) : ( <> - + )} diff --git a/src/ui_kit/Header/HeaderFull.tsx b/src/ui_kit/Header/HeaderFull.tsx index b7db12ee..8da43757 100644 --- a/src/ui_kit/Header/HeaderFull.tsx +++ b/src/ui_kit/Header/HeaderFull.tsx @@ -58,7 +58,7 @@ export default function HeaderFull() { - + ; } -export const ToTariffsButton = ({ variant, color, sx }: Props) => { +export const ToTariffsButton = () => { return ( - From 989baca61af3d4f60226728d6b2d2a5641b515b8 Mon Sep 17 00:00:00 2001 From: Nastya Date: Wed, 17 Jan 2024 00:18:21 +0300 Subject: [PATCH 11/12] =?UTF-8?q?=D0=B0=D0=BA=D0=BA=D0=B0=D1=83=D0=BD?= =?UTF-8?q?=D1=82=D1=8B=20=D0=B7=D0=B0=D0=BF=D1=80=D0=B0=D1=88=D0=B8=D0=B2?= =?UTF-8?q?=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D1=83=20=D1=81=D0=BA=D0=B2?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 2 +- src/pages/main.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 0702b85f..27f82443 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -123,7 +123,7 @@ export default function App() { const navigate = useNavigate(); useUserFetcher({ - url: `https://hub.pena.digital/user/${userId}`, + url: `https://squiz.pena.digital/user/${userId}`, userId, onNewUser: setUser, onError: (error) => { diff --git a/src/pages/main.tsx b/src/pages/main.tsx index 298f07fb..81a70af3 100755 --- a/src/pages/main.tsx +++ b/src/pages/main.tsx @@ -79,10 +79,9 @@ export default function Main({ sidebar, header, footer, Page }: Props) { setOpenBranchingPage((old) => !old); }; - if (!quizConfig) return <>; const isConditionMet = - [1].includes(currentStep) && quizConfig.type !== "form"; + [1].includes(currentStep) && quizConfig?.type !== "form"; const changePage = (index: number) => { if (currentStep === 2) { @@ -106,10 +105,11 @@ export default function Main({ sidebar, header, footer, Page }: Props) { ); useEffect(() => { - observer.current.observe(mainBlock.current); + if (mainBlock.current) observer.current.observe(mainBlock.current); }, [mainBlock, observer]); console.log(widthMain); + if (!quizConfig) return <>; return ( <>
From 7439ff5a620d5d4b79f9069c68e55c68d6ded1b8 Mon Sep 17 00:00:00 2001 From: Tamara Date: Wed, 17 Jan 2024 00:28:34 +0300 Subject: [PATCH 12/12] =?UTF-8?q?=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D1=8E=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=BC=20=D0=BE=D0=BA?= =?UTF-8?q?=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Landing/FooterLanding.tsx | 1 + src/pages/ViewPublicationPage/ContactForm.tsx | 7 +++++-- src/pages/main.tsx | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/Landing/FooterLanding.tsx b/src/pages/Landing/FooterLanding.tsx index 722a6c9b..52ad84f7 100644 --- a/src/pages/Landing/FooterLanding.tsx +++ b/src/pages/Landing/FooterLanding.tsx @@ -123,6 +123,7 @@ export default function Component() { variant="text" sx={{ fontSize: "16px", fontWeight: 500, color: "white" }} href={"https://shub.pena.digital/docs/oferta"} + target="_blank" > Пользовательское соглашение diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx index 156e4759..c82333f4 100644 --- a/src/pages/ViewPublicationPage/ContactForm.tsx +++ b/src/pages/ViewPublicationPage/ContactForm.tsx @@ -222,12 +222,15 @@ export const ContactForm = ({ /> С  - + {" "} Положением об обработке персональных данных{" "}  и  - + {" "} Политикой конфиденциальности{" "} diff --git a/src/pages/main.tsx b/src/pages/main.tsx index 81a70af3..eabb2375 100755 --- a/src/pages/main.tsx +++ b/src/pages/main.tsx @@ -79,7 +79,6 @@ export default function Main({ sidebar, header, footer, Page }: Props) { setOpenBranchingPage((old) => !old); }; - const isConditionMet = [1].includes(currentStep) && quizConfig?.type !== "form";