diff --git a/src/App.tsx b/src/App.tsx index 5705effb..d15d932e 100755 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,11 +1,11 @@ import { CssBaseline } from "@mui/material"; import { styled } from "@mui/material/styles"; import CreateQuiz from "./components/CreateQuiz/CreateQuiz"; -import FirstQuiz from "./pages/startPage/FirstQuiz"; -import MyQuizzes from "./components/MyQuizzes"; -import Navbar from "./components/Navbar/Navbar"; -import NavbarCreateQuiz from "./components/Navbar/NavbarCreateQuiz"; -import QuizGallery from "./components/QuizGallery"; +import FirstQuiz from "./pages/createQuize/FirstQuiz"; +import MyQuizzes from "./pages/createQuize/MyQuizzes"; +import Navbar from "@ui_kit/Header/Navbar"; +import NavbarCreateQuiz from "@ui_kit/Header/NavbarCreateQuiz"; +import QuizGallery from "./pages/createQuize/QuizGallery"; import lightTheme from "./utils/themes/light"; import darkTheme from "./utils/themes/dark"; diff --git a/src/components/Button/BackButton.tsx b/src/components/Button/BackButton.tsx deleted file mode 100644 index 738c1717..00000000 --- a/src/components/Button/BackButton.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import { Button } from "@mui/material"; - -export default function BackButton() { - return ( - - ); -} diff --git a/src/index.tsx b/src/index.tsx index b08312f6..82665f71 100755 --- a/src/index.tsx +++ b/src/index.tsx @@ -6,22 +6,21 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'; import lightTheme from "./utils/themes/light"; import { ThemeProvider } from '@mui/material'; import CreateQuiz from './components/CreateQuiz/CreateQuiz'; -import NavbarCreateQuiz from './components/Navbar/NavbarCreateQuiz'; +import NavbarCreateQuiz from '@ui_kit/Header/NavbarCreateQuiz'; import darkTheme from "./utils/themes/dark"; import HorizontalLinearStepper from './ui_kit/Stepper'; -import Create from './pages/createQuize/Create'; -import Quizes from './pages/createQuize/Quizes'; -import Projects from './pages/createQuize/Projects'; -import Gallery from './pages/createQuize/Gallery'; + import StartPage from "./pages/startPage/StartPage"; import Main from "./pages/main" -import FirstQuiz from "./pages/startPage/FirstQuiz"; +import FirstQuiz from "./pages/createQuize/FirstQuiz"; import QuestionsPage from "./pages/Questions/QuestionsPage"; import ContactFormPage from "./pages/ContactFormPage/ContactFormPage"; import InstallQuiz from "./pages/InstallQuiz/InstallQuiz"; import {Result} from "./pages/Result/Result"; import { Setting } from "./pages/Result/Setting"; +import MyQuizzes from "./pages/createQuize/MyQuizzes"; +import MyQuizzesFull from "./pages/createQuize/MyQuizzesFull"; const root = ReactDOM.createRoot( document.getElementById('root') as HTMLElement @@ -31,15 +30,18 @@ root.render( - }> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - + }/> + } /> + } /> + } /> + } /> + + } /> + } /> + } /> + } /> + } /> + } /> diff --git a/src/pages/InstallQuiz/InstallQzOnSiteParent.tsx b/src/pages/InstallQuiz/InstallQzOnSiteParent.tsx index aaa59c51..b89c1cdc 100644 --- a/src/pages/InstallQuiz/InstallQzOnSiteParent.tsx +++ b/src/pages/InstallQuiz/InstallQzOnSiteParent.tsx @@ -7,7 +7,6 @@ import NumberThree from "@icons/NumberThree"; interface Props { outerContainerSx?: SxProps; children?: React.ReactNode; - sx?: SxProps; } export default function InstallQzOnSiteParent ({outerContainerSx: sx, children}: Props) { diff --git a/src/pages/createQuize/Create.tsx b/src/pages/createQuize/Create.tsx deleted file mode 100755 index bb1d6592..00000000 --- a/src/pages/createQuize/Create.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import FirstQuiz from "../startPage/FirstQuiz"; -import Navbar from "../../components/Navbar/Navbar"; - -export default function Create(){ - return ( - <> - - <> - - ) -} \ No newline at end of file diff --git a/src/pages/startPage/FirstQuiz.tsx b/src/pages/createQuize/FirstQuiz.tsx similarity index 93% rename from src/pages/startPage/FirstQuiz.tsx rename to src/pages/createQuize/FirstQuiz.tsx index 3e8b0878..c48cea64 100755 --- a/src/pages/startPage/FirstQuiz.tsx +++ b/src/pages/createQuize/FirstQuiz.tsx @@ -1,7 +1,7 @@ import { Typography, useTheme } from "@mui/material"; import ComplexNavText from "../../components/ComplexNavText"; import CustomButton from "../../components/CustomButton"; -import SectionWrapper from "../../components/SectionWrapper"; +import SectionWrapper from "@ui_kit/SectionWrapper"; export default function FirstQuiz() { const theme = useTheme(); diff --git a/src/pages/createQuize/Gallery.tsx b/src/pages/createQuize/Gallery.tsx deleted file mode 100755 index 7106aed5..00000000 --- a/src/pages/createQuize/Gallery.tsx +++ /dev/null @@ -1,9 +0,0 @@ - -import Navbar from "../../components/Navbar/Navbar"; -import QuizGallery from "../../components/QuizGallery"; - -export default function Gallery(){ - return ( -<> - ) -} \ No newline at end of file diff --git a/src/pages/createQuize/MyQuizzes.tsx b/src/pages/createQuize/MyQuizzes.tsx new file mode 100755 index 00000000..f3fb50b8 --- /dev/null +++ b/src/pages/createQuize/MyQuizzes.tsx @@ -0,0 +1,23 @@ +import {useTheme, Box,} from "@mui/material"; +import ExpandableQuizBlock from "../../components/ExpandableQuizBlock"; +import MyQuizzesFull from "./MyQuizzesFull"; + + +export default function MyQuizzes() { + const theme = useTheme(); + + return ( + + + + + + + ); +} \ No newline at end of file diff --git a/src/components/MyQuizzes.tsx b/src/pages/createQuize/MyQuizzesFull.tsx old mode 100755 new mode 100644 similarity index 57% rename from src/components/MyQuizzes.tsx rename to src/pages/createQuize/MyQuizzesFull.tsx index e0166728..90b84419 --- a/src/components/MyQuizzes.tsx +++ b/src/pages/createQuize/MyQuizzesFull.tsx @@ -1,11 +1,15 @@ -import {Typography, useTheme, Box, Button} from "@mui/material"; -import ComplexNavText from "./ComplexNavText"; -import ExpandableQuizBlock from "./ExpandableQuizBlock"; -import QuizCard from "./QuizCard"; -import SectionWrapper from "./SectionWrapper"; +import {Typography, useTheme, Box, Button, SxProps, Theme} from "@mui/material"; +import ComplexNavText from "../../components/ComplexNavText"; +import QuizCard from "../../components/QuizCard"; +import SectionWrapper from "@ui_kit/SectionWrapper"; +import React from "react"; +interface Props { + outerContainerSx?: SxProps; + children?: React.ReactNode; +} -export default function MyQuizzes() { +export default function MyQuizzesFull({outerContainerSx: sx, children}: Props) { const theme = useTheme(); return ( @@ -16,7 +20,7 @@ export default function MyQuizzes() { mb: "70px", }} > - + - - - - - - + + + {children} - ); + ) } \ No newline at end of file diff --git a/src/pages/createQuize/Projects.tsx b/src/pages/createQuize/Projects.tsx deleted file mode 100755 index 9679d2a8..00000000 --- a/src/pages/createQuize/Projects.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import MyQuizzes from "../../components/MyQuizzes"; -import Navbar from "../../components/Navbar/Navbar"; - -export default function Projects() { - return ( - <> - - - ); -} diff --git a/src/components/QuizGallery.tsx b/src/pages/createQuize/QuizGallery.tsx similarity index 91% rename from src/components/QuizGallery.tsx rename to src/pages/createQuize/QuizGallery.tsx index cb6cbd4e..6c096d94 100755 --- a/src/components/QuizGallery.tsx +++ b/src/pages/createQuize/QuizGallery.tsx @@ -1,19 +1,19 @@ import { Box, FormControl, InputAdornment, InputLabel, MenuItem, Select, Tabs, TextField, Typography, useTheme } from "@mui/material"; -import ComplexNavText from "./ComplexNavText"; -import CustomButton from "./CustomButton"; -import LayoutIconOld from "../assets/icons/LayoutIcon"; -import SearchIcon from "../assets/icons/SearchIcon"; -import SectionWrapper from "./SectionWrapper"; -import ArrowDown from "../assets/icons/ArrowDownIcon"; +import ComplexNavText from "../../components/ComplexNavText"; +import CustomButton from "../../components/CustomButton"; +import LayoutIconOld from "@icons/LayoutIcon"; +import SearchIcon from "@icons/SearchIcon"; +import SectionWrapper from "@ui_kit/SectionWrapper"; +import ArrowDown from "@icons/ArrowDownIcon"; import { useState } from "react"; -import { CustomTab } from "./CustomTab"; -import QuizTemplateCard from "./QuizTemplateCard"; -import quizTemplateImage1 from "../assets/quiz-template-1.png"; -import quizTemplateImage2 from "../assets/quiz-template-2.png"; -import quizTemplateImage3 from "../assets/quiz-template-3.png"; -import quizTemplateImage4 from "../assets/quiz-template-4.png"; -import quizTemplateImage5 from "../assets/quiz-template-5.png"; -import quizTemplateImage6 from "../assets/quiz-template-6.png"; +import { CustomTab } from "../../components/CustomTab"; +import QuizTemplateCard from "../../components/QuizTemplateCard"; +import quizTemplateImage1 from "../../assets/quiz-template-1.png"; +import quizTemplateImage2 from "../../assets/quiz-template-2.png"; +import quizTemplateImage3 from "../../assets/quiz-template-3.png"; +import quizTemplateImage4 from "../../assets/quiz-template-4.png"; +import quizTemplateImage5 from "../../assets/quiz-template-5.png"; +import quizTemplateImage6 from "../../assets/quiz-template-6.png"; const categories = ["Категория 1", "Категория 2", "Категория 3", "Категория 4"] as const; diff --git a/src/pages/createQuize/Quizes.tsx b/src/pages/createQuize/Quizes.tsx deleted file mode 100755 index d8cead72..00000000 --- a/src/pages/createQuize/Quizes.tsx +++ /dev/null @@ -1,8 +0,0 @@ - -import Navbar from "../../components/Navbar/Navbar"; - -export default function Quizes(){ - return ( -<> - ) -} \ No newline at end of file diff --git a/src/pages/main.tsx b/src/pages/main.tsx index 54ba8d92..d0500506 100755 --- a/src/pages/main.tsx +++ b/src/pages/main.tsx @@ -1,4 +1,4 @@ -import Header from '@ui_kit/Header'; +import Header from '@ui_kit/Header/Header'; import Sidebar from '@ui_kit/Sidebar'; import Box from '@mui/material/Box'; import {Outlet} from "react-router-dom"; diff --git a/src/components/Navbar/Avatar.tsx b/src/ui_kit/Header/Avatar.tsx similarity index 100% rename from src/components/Navbar/Avatar.tsx rename to src/ui_kit/Header/Avatar.tsx diff --git a/src/ui_kit/Header.tsx b/src/ui_kit/Header/Header.tsx similarity index 93% rename from src/ui_kit/Header.tsx rename to src/ui_kit/Header/Header.tsx index 120bb184..64bc46b3 100755 --- a/src/ui_kit/Header.tsx +++ b/src/ui_kit/Header/Header.tsx @@ -1,10 +1,10 @@ import { Box, Container, FormControl, IconButton, TextField, useTheme } from "@mui/material"; -import CustomButton from "../components/CustomButton"; -import BackArrowIcon from "../assets/icons/BackArrowIcon"; -import EyeIcon from "../assets/icons/EyeIcon"; -import CustomAvatar from "../components/Navbar/Avatar"; -import NavMenuItem from "../components/NavMenuItem"; -import PenaLogo from "./PenaLogo"; +import CustomButton from "../../components/CustomButton"; +import BackArrowIcon from "@icons/BackArrowIcon"; +import EyeIcon from "@icons/EyeIcon"; +import CustomAvatar from "./Avatar"; +import NavMenuItem from "./NavMenuItem"; +import PenaLogo from "../PenaLogo"; interface Props { isLoggedIn: boolean; diff --git a/src/ui_kit/Header/HeaderFull.tsx b/src/ui_kit/Header/HeaderFull.tsx new file mode 100644 index 00000000..101048f1 --- /dev/null +++ b/src/ui_kit/Header/HeaderFull.tsx @@ -0,0 +1,71 @@ +import { Box, Container, IconButton, Typography, useTheme } from "@mui/material"; +import LogoutIcon from "@icons/LogoutIcon"; +import NavMenuItem from "./NavMenuItem"; +import PenaLogo from "../PenaLogo"; +import WalletIcon from "@icons/WalletIcon"; +import CustomAvatar from "./Avatar"; + + +export default function HeaderFull() { + const theme = useTheme(); + + return ( + + + + + + + + + + + + + + + + + Мой баланс + 00.00 руб. + + + + + + + + ); +} \ No newline at end of file diff --git a/src/components/NavMenuItem.tsx b/src/ui_kit/Header/NavMenuItem.tsx similarity index 100% rename from src/components/NavMenuItem.tsx rename to src/ui_kit/Header/NavMenuItem.tsx diff --git a/src/components/Navbar/Navbar.tsx b/src/ui_kit/Header/Navbar.tsx similarity index 92% rename from src/components/Navbar/Navbar.tsx rename to src/ui_kit/Header/Navbar.tsx index d8b4e05d..25f61b15 100755 --- a/src/components/Navbar/Navbar.tsx +++ b/src/ui_kit/Header/Navbar.tsx @@ -1,6 +1,6 @@ import NavbarCollapsed from "./NavbarCollapsed"; import NavbarCreateQuiz from "./NavbarCreateQuiz"; -import Header from "@ui_kit/Header"; +import Header from "@ui_kit/Header/Header"; interface Props { diff --git a/src/components/Navbar/NavbarCollapsed.tsx b/src/ui_kit/Header/NavbarCollapsed.tsx similarity index 100% rename from src/components/Navbar/NavbarCollapsed.tsx rename to src/ui_kit/Header/NavbarCollapsed.tsx diff --git a/src/components/Navbar/NavbarCreateQuiz.tsx b/src/ui_kit/Header/NavbarCreateQuiz.tsx similarity index 95% rename from src/components/Navbar/NavbarCreateQuiz.tsx rename to src/ui_kit/Header/NavbarCreateQuiz.tsx index fcf7ff71..a2b99a81 100755 --- a/src/components/Navbar/NavbarCreateQuiz.tsx +++ b/src/ui_kit/Header/NavbarCreateQuiz.tsx @@ -1,8 +1,8 @@ import { Box, Container, FormControl, IconButton, TextField, useTheme } from "@mui/material"; -import CustomButton from "../CustomButton"; -import BackArrowIcon from "../../assets/icons/BackArrowIcon"; -import EyeIcon from "../../assets/icons/EyeIcon"; -import NavMenuItem from "../NavMenuItem"; +import CustomButton from "../../components/CustomButton"; +import BackArrowIcon from "@icons/BackArrowIcon"; +import EyeIcon from "@icons/EyeIcon"; +import NavMenuItem from "./NavMenuItem"; import PenaLogo from "@ui_kit/PenaLogo"; import CustomAvatar from "./Avatar"; diff --git a/src/components/SectionWrapper.tsx b/src/ui_kit/SectionWrapper.tsx similarity index 100% rename from src/components/SectionWrapper.tsx rename to src/ui_kit/SectionWrapper.tsx