diff --git a/src/assets/LandingPict/calendarIcon.tsx b/src/assets/LandingPict/calendarIcon.tsx index 19653871..8e94dc97 100644 --- a/src/assets/LandingPict/calendarIcon.tsx +++ b/src/assets/LandingPict/calendarIcon.tsx @@ -1,35 +1,81 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function CalendarIcon({color}:Props) { - - return ( - - - - - - - - - - - - - - - - ); -} \ No newline at end of file +export default function CalendarIcon({ color }: Props) { + return ( + + + + + + + + + + + + + + + + ); +} diff --git a/src/assets/LandingPict/notebook.tsx b/src/assets/LandingPict/notebook.tsx index 10083733..1e925a61 100644 --- a/src/assets/LandingPict/notebook.tsx +++ b/src/assets/LandingPict/notebook.tsx @@ -1,192 +1,535 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function Notebook({color}:Props) { - - return ( - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ); -} \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} diff --git a/src/assets/LandingPict/youtobeIcon.tsx b/src/assets/LandingPict/youtobeIcon.tsx index 4419cb3d..3ed6def5 100644 --- a/src/assets/LandingPict/youtobeIcon.tsx +++ b/src/assets/LandingPict/youtobeIcon.tsx @@ -1,57 +1,109 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; - width?: string; + color?: string; + width?: string; } -export default function YoutobeIcon({color, width}:Props) { - - return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ); -} \ No newline at end of file +export default function YoutobeIcon({ color, width }: Props) { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} diff --git a/src/assets/icons/ContactFormIcon/NameIcon.tsx b/src/assets/icons/ContactFormIcon/NameIcon.tsx index d209df2a..8fafed27 100644 --- a/src/assets/icons/ContactFormIcon/NameIcon.tsx +++ b/src/assets/icons/ContactFormIcon/NameIcon.tsx @@ -25,7 +25,7 @@ export default function NameIcon({ color }: Props) { diff --git a/src/assets/icons/PenaLogoIcon.tsx b/src/assets/icons/PenaLogoIcon.tsx index 0641f00f..a52a052a 100644 --- a/src/assets/icons/PenaLogoIcon.tsx +++ b/src/assets/icons/PenaLogoIcon.tsx @@ -1,16 +1,34 @@ import { FC, SVGProps } from "react"; export const PenaLogoIcon: FC> = (props) => ( - - + + - - + + diff --git a/src/assets/icons/questionsPage/addEmoji.tsx b/src/assets/icons/questionsPage/addEmoji.tsx index cc8bc4d4..4d88f669 100644 --- a/src/assets/icons/questionsPage/addEmoji.tsx +++ b/src/assets/icons/questionsPage/addEmoji.tsx @@ -37,9 +37,9 @@ export default function AddEmoji() { diff --git a/src/assets/icons/questionsPage/answerGroup.tsx b/src/assets/icons/questionsPage/answerGroup.tsx index 4b17fcb9..d23247b2 100644 --- a/src/assets/icons/questionsPage/answerGroup.tsx +++ b/src/assets/icons/questionsPage/answerGroup.tsx @@ -20,22 +20,22 @@ export default function AnswerGroup({ color, sx }: Props) { diff --git a/src/assets/icons/questionsPage/image.tsx b/src/assets/icons/questionsPage/image.tsx index cccdcfd7..536b9437 100644 --- a/src/assets/icons/questionsPage/image.tsx +++ b/src/assets/icons/questionsPage/image.tsx @@ -30,16 +30,16 @@ const Image: FC = ({ onClick, sx }) => { diff --git a/src/pages/Landing/FooterLanding.tsx b/src/pages/Landing/FooterLanding.tsx index 2ee291aa..9d478029 100644 --- a/src/pages/Landing/FooterLanding.tsx +++ b/src/pages/Landing/FooterLanding.tsx @@ -1,83 +1,134 @@ -import React from 'react'; +import React from "react"; import Box from "@mui/material/Box"; -import Typography from '@mui/material/Typography'; +import Typography from "@mui/material/Typography"; import Button from "@mui/material/Button"; import PenaLogo from "../../ui_kit/PenaLogo"; -import SectionStyled from './SectionStyled'; -import {styled} from "@mui/material/styles"; -import {useMediaQuery, useTheme} from "@mui/material"; - +import SectionStyled from "./SectionStyled"; +import { styled } from "@mui/material/styles"; +import { useMediaQuery, useTheme } from "@mui/material"; export default function Component() { - const theme = useTheme(); - const isMobile = useMediaQuery(theme.breakpoints.down(600)); - const isTablet = useMediaQuery(theme.breakpoints.down(1000)) - return( - - - - - - - - - - - - - - - - ООО Пена © 2023 - + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down(600)); + const isTablet = useMediaQuery(theme.breakpoints.down(1000)); + return ( + + + + + + + + + + + + + + + + + ООО Пена © 2023 + + - - - - - - - - ) -} \ No newline at end of file + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/DoneIcon.tsx b/src/pages/Landing/images/icons/DoneIcon.tsx index 6e94c039..ea8c05d7 100644 --- a/src/pages/Landing/images/icons/DoneIcon.tsx +++ b/src/pages/Landing/images/icons/DoneIcon.tsx @@ -1,34 +1,47 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - - ) -}; \ No newline at end of file +export default function ({ color }: Props) { + return ( + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group133.tsx b/src/pages/Landing/images/icons/Group133.tsx index b84ed037..5f8830d0 100644 --- a/src/pages/Landing/images/icons/Group133.tsx +++ b/src/pages/Landing/images/icons/Group133.tsx @@ -1,32 +1,53 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group134.tsx b/src/pages/Landing/images/icons/Group134.tsx index 1961fd6f..38675b54 100644 --- a/src/pages/Landing/images/icons/Group134.tsx +++ b/src/pages/Landing/images/icons/Group134.tsx @@ -1,30 +1,45 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group135.tsx b/src/pages/Landing/images/icons/Group135.tsx index 7435c774..ddfbafcb 100644 --- a/src/pages/Landing/images/icons/Group135.tsx +++ b/src/pages/Landing/images/icons/Group135.tsx @@ -1,34 +1,61 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group136.tsx b/src/pages/Landing/images/icons/Group136.tsx index d38d2c5a..98a89dcf 100644 --- a/src/pages/Landing/images/icons/Group136.tsx +++ b/src/pages/Landing/images/icons/Group136.tsx @@ -1,30 +1,51 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group137.tsx b/src/pages/Landing/images/icons/Group137.tsx index 941cc17e..9e8c079a 100644 --- a/src/pages/Landing/images/icons/Group137.tsx +++ b/src/pages/Landing/images/icons/Group137.tsx @@ -1,29 +1,50 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group138.tsx b/src/pages/Landing/images/icons/Group138.tsx index f83660ac..04027c8b 100644 --- a/src/pages/Landing/images/icons/Group138.tsx +++ b/src/pages/Landing/images/icons/Group138.tsx @@ -1,33 +1,78 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group139.tsx b/src/pages/Landing/images/icons/Group139.tsx index fd779af7..405666f9 100644 --- a/src/pages/Landing/images/icons/Group139.tsx +++ b/src/pages/Landing/images/icons/Group139.tsx @@ -1,39 +1,120 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group140.tsx b/src/pages/Landing/images/icons/Group140.tsx index e7b81255..154f9786 100644 --- a/src/pages/Landing/images/icons/Group140.tsx +++ b/src/pages/Landing/images/icons/Group140.tsx @@ -1,30 +1,54 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group141.tsx b/src/pages/Landing/images/icons/Group141.tsx index 0c71ac1a..1b6f215c 100644 --- a/src/pages/Landing/images/icons/Group141.tsx +++ b/src/pages/Landing/images/icons/Group141.tsx @@ -1,28 +1,45 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group142.tsx b/src/pages/Landing/images/icons/Group142.tsx index 0306cdba..244bd14b 100644 --- a/src/pages/Landing/images/icons/Group142.tsx +++ b/src/pages/Landing/images/icons/Group142.tsx @@ -1,32 +1,72 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group147.tsx b/src/pages/Landing/images/icons/Group147.tsx index 88c16038..b87ea422 100644 --- a/src/pages/Landing/images/icons/Group147.tsx +++ b/src/pages/Landing/images/icons/Group147.tsx @@ -1,30 +1,64 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group148.tsx b/src/pages/Landing/images/icons/Group148.tsx index 97d67678..192c8244 100644 --- a/src/pages/Landing/images/icons/Group148.tsx +++ b/src/pages/Landing/images/icons/Group148.tsx @@ -1,31 +1,71 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group151.tsx b/src/pages/Landing/images/icons/Group151.tsx index 893241fe..6f142aba 100644 --- a/src/pages/Landing/images/icons/Group151.tsx +++ b/src/pages/Landing/images/icons/Group151.tsx @@ -1,27 +1,42 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group152.tsx b/src/pages/Landing/images/icons/Group152.tsx index 924a0fd6..99029159 100644 --- a/src/pages/Landing/images/icons/Group152.tsx +++ b/src/pages/Landing/images/icons/Group152.tsx @@ -1,28 +1,50 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group153.tsx b/src/pages/Landing/images/icons/Group153.tsx index a4fe8ee6..c4d8fd5c 100644 --- a/src/pages/Landing/images/icons/Group153.tsx +++ b/src/pages/Landing/images/icons/Group153.tsx @@ -1,27 +1,41 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Group154.tsx b/src/pages/Landing/images/icons/Group154.tsx index a279b745..6024dbbd 100644 --- a/src/pages/Landing/images/icons/Group154.tsx +++ b/src/pages/Landing/images/icons/Group154.tsx @@ -1,28 +1,52 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Handshake.tsx b/src/pages/Landing/images/icons/Handshake.tsx index 803acd42..46f90cf2 100644 --- a/src/pages/Landing/images/icons/Handshake.tsx +++ b/src/pages/Landing/images/icons/Handshake.tsx @@ -1,35 +1,80 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - - - ) -}; \ No newline at end of file +export default function ({ color }: Props) { + return ( + + + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/IconNumber2.tsx b/src/pages/Landing/images/icons/IconNumber2.tsx index d3f8c645..6a9fa878 100644 --- a/src/pages/Landing/images/icons/IconNumber2.tsx +++ b/src/pages/Landing/images/icons/IconNumber2.tsx @@ -1,27 +1,42 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function OneIconBorder({color}:Props) { - - return ( - - - - - - - - ); -} \ No newline at end of file +export default function OneIconBorder({ color }: Props) { + return ( + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/IconNumber3.tsx b/src/pages/Landing/images/icons/IconNumber3.tsx index 94c1e531..afc7a355 100644 --- a/src/pages/Landing/images/icons/IconNumber3.tsx +++ b/src/pages/Landing/images/icons/IconNumber3.tsx @@ -1,28 +1,42 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function OneIconBorder({color}:Props) { - - return ( - - - - - - - - - ); -} \ No newline at end of file +export default function OneIconBorder({ color }: Props) { + return ( + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/IconNumber4.tsx b/src/pages/Landing/images/icons/IconNumber4.tsx index 4c4ba2f2..d8cef30e 100644 --- a/src/pages/Landing/images/icons/IconNumber4.tsx +++ b/src/pages/Landing/images/icons/IconNumber4.tsx @@ -1,29 +1,49 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function OneIconBorder({color}:Props) { - - return ( - - - - - - - - - - ); -} \ No newline at end of file +export default function OneIconBorder({ color }: Props) { + return ( + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/Network.tsx b/src/pages/Landing/images/icons/Network.tsx index 120aeff7..843cde16 100644 --- a/src/pages/Landing/images/icons/Network.tsx +++ b/src/pages/Landing/images/icons/Network.tsx @@ -1,28 +1,55 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - ) -}; \ No newline at end of file +export default function ({ color }: Props) { + return ( + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/PenaLogoOnly.tsx b/src/pages/Landing/images/icons/PenaLogoOnly.tsx index fdc4066d..c99dd5a9 100644 --- a/src/pages/Landing/images/icons/PenaLogoOnly.tsx +++ b/src/pages/Landing/images/icons/PenaLogoOnly.tsx @@ -1,23 +1,57 @@ import { useTheme } from "@mui/material"; - interface Props { - width: number; + width: number; } export default function PenaLogoOnly({ width }: Props) { - const theme = useTheme(); + const theme = useTheme(); - return ( - - - - - - - - + return ( + + + + + + + + - -); -} \ No newline at end of file + ); +} diff --git a/src/pages/Landing/images/icons/QuizLogo.tsx b/src/pages/Landing/images/icons/QuizLogo.tsx index 459a5e89..0c12503d 100644 --- a/src/pages/Landing/images/icons/QuizLogo.tsx +++ b/src/pages/Landing/images/icons/QuizLogo.tsx @@ -1,30 +1,55 @@ import { useTheme } from "@mui/material"; - interface Props { - width: number; + width: number; } export default function QuizLogo({ width }: Props) { - const theme = useTheme(); + const theme = useTheme(); - return ( - - - - - - - - - - - - - - - - - - ); -} \ No newline at end of file + return ( + + + + + + + + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/UserCircle.tsx b/src/pages/Landing/images/icons/UserCircle.tsx index 3a9fc31e..b0da91b4 100644 --- a/src/pages/Landing/images/icons/UserCircle.tsx +++ b/src/pages/Landing/images/icons/UserCircle.tsx @@ -1,34 +1,60 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - - - - - - ) -}; \ No newline at end of file +export default function ({ color }: Props) { + return ( + + + + + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/clipIcon.tsx b/src/pages/Landing/images/icons/clipIcon.tsx index d82c0d41..792ea995 100644 --- a/src/pages/Landing/images/icons/clipIcon.tsx +++ b/src/pages/Landing/images/icons/clipIcon.tsx @@ -1,27 +1,36 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - ) -}; \ No newline at end of file +export default function ({ color }: Props) { + return ( + + + + + + + ); +} diff --git a/src/pages/Landing/images/icons/tiktokIcon.tsx b/src/pages/Landing/images/icons/tiktokIcon.tsx index 2d84455a..7ae28bfa 100644 --- a/src/pages/Landing/images/icons/tiktokIcon.tsx +++ b/src/pages/Landing/images/icons/tiktokIcon.tsx @@ -1,27 +1,36 @@ import { Box } from "@mui/material"; - interface Props { - color?: string; + color?: string; } -export default function ({color}:Props) { - - return ( - - - - - - - - ) -}; +export default function ({ color }: Props) { + return ( + + + + + + + ); +} diff --git a/src/pages/Questions/Form/FormQuestionsPage.tsx b/src/pages/Questions/Form/FormQuestionsPage.tsx index 4481dceb..98973346 100644 --- a/src/pages/Questions/Form/FormQuestionsPage.tsx +++ b/src/pages/Questions/Form/FormQuestionsPage.tsx @@ -128,8 +128,8 @@ export default function FormQuestionsPage() { > Следующий шаг - {createPortal(, document.body)} + {createPortal(, document.body)} ); } diff --git a/src/pages/createQuize/MyQuizzesFull.tsx b/src/pages/createQuize/MyQuizzesFull.tsx index 37752ae9..892c8b2a 100644 --- a/src/pages/createQuize/MyQuizzesFull.tsx +++ b/src/pages/createQuize/MyQuizzesFull.tsx @@ -67,16 +67,17 @@ export default function MyQuizzesFull({ mb: "60px", }} > - {Object.values(listQuizes).map((e, i) => ( + {Object.values(listQuizes).map(({ id, name }) => ( { - removeQuiz(e.id); + removeQuiz(id); }} - onClickEdit={() => navigate(`/setting/${e.id}`)} + onClickEdit={() => navigate(`/setting/${id}`)} /> ))} diff --git a/src/pages/startPage/ModalSizeImage.tsx b/src/pages/startPage/ModalSizeImage.tsx index 84a391ab..3b95af67 100644 --- a/src/pages/startPage/ModalSizeImage.tsx +++ b/src/pages/startPage/ModalSizeImage.tsx @@ -109,8 +109,9 @@ export default function ModalSizeImage() { - {rows.map((row) => ( + {rows.map(({ name, size }, index) => ( - {row.name} + {name} - {row.size} + {size} ))} @@ -146,8 +147,9 @@ export default function ModalSizeImage() { Размеры изображений в квизе - {rows2.map((row) => ( + {rows2.map(({ name, size }, index) => ( - {row.name} + {name} - {row.size} + {size} ))} diff --git a/src/pages/startPage/Sidebar/icons/ReturnTime.tsx b/src/pages/startPage/Sidebar/icons/ReturnTime.tsx index 3724be6e..55a96754 100644 --- a/src/pages/startPage/Sidebar/icons/ReturnTime.tsx +++ b/src/pages/startPage/Sidebar/icons/ReturnTime.tsx @@ -1,13 +1,19 @@ import { FC, SVGProps } from "react"; export const ReturnTime: FC> = (props) => ( - + );