profile page

Author: DragonDark13

src/App.tsx

@@ -261,6 +261,7 @@ function App() {
                                                         avatar={avatarImg}
                                                         lessonsVisited={currentUser ? currentUser?.current_level : 0}
                                                         username={currentUser ? currentUser.user_name : "Петро Сагайдачний"}
+                                                        currentUserDate={historyListFromData[selectedArticle].date}
                                                     />
                                                 ) : (
                                                     <Preloader/>

src/components/ProfilePage/ProfilePage.tsx

@@ -5,7 +5,7 @@ import Paper from '@mui/material/Paper';
 import Typography from '@mui/material/Typography';
 import SettingsIcon from '@mui/icons-material/Settings';
 import EmojiEvents from '@mui/icons-material/EmojiEvents';
-import {Container, Grid, LinearProgress, useMediaQuery} from "@mui/material";
+import {CardActions, Container, Grid, IconButton, LinearProgress, useMediaQuery} from "@mui/material";
 import './profile_page.scss'
 import UserProfileSettings from "./UserProfileSettings";
 import {Helmet} from "react-helmet-async";
@@ -23,6 +23,7 @@ import StarIcon from '@mui/icons-material/Star';
 import Preloader from "../Preloader/Preloader";
 import ChangePasswordForm from "./ChangePasswordForm";
 import ResetAchievementsButton from "./ResetAchievementsButton";
+import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos';
 
 
 const useStyles = makeStyles()((theme) => ({
@@ -44,7 +45,8 @@ const ProfilePage: React.FC<ProfilePageProps> = ({
                                                      achievements,
                                                      historyList,
                                                      achievedList,
-                                                     isLoading
+                                                     isLoading,
+                                                     currentUserDate
                                                  }) => {
 
 
@@ -142,10 +144,16 @@ const ProfilePage: React.FC<ProfilePageProps> = ({
                                         <Grid item xs={"auto"} lg={"auto"}>
                                             <Typography className={"time"} variant={"h6"} color="text.secondary"
                                                         sx={{marginTop: '5px'}}>
-                                                {lessonsVisited}
+                                                {currentUserDate}
                                             </Typography>
                                         </Grid>
+                                        <Grid item xs={"auto"} lg={"auto"}>
+                                            <IconButton>
+                                                <ArrowForwardIosIcon/>
+                                            </IconButton>
+                                        </Grid>
                                     </Grid>
+
                                 </Paper>
 
                             </Grid>

src/components/QuizBlock/QuizBlock.tsx

@@ -1,38 +1,23 @@
 import React, {useEffect, useState} from "react";
 import {
     Button,
-    Card, CardActions,
-    CardContent, CardHeader,
     Container,
-    FormControlLabel,
     Grid,
-    LinearProgress,
-    Radio,
-    RadioGroup,
-    Typography, useMediaQuery,
+    useMediaQuery,
     useTheme
 } from "@mui/material";
 import ArrowBackIosIcon from "@mui/icons-material/ArrowBackIos";
 
 import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward';
-import ReplayIcon from '@mui/icons-material/Replay';
-import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos';
-import CheckCircleIcon from '@mui/icons-material/CheckCircle';
-import DoNotDisturbOnIcon from '@mui/icons-material/DoNotDisturbOn';
-import StarIcon from '@mui/icons-material/Star';
 
 import "./quiz_style.scss"
 import {Link as RouterLink, useNavigate, useParams} from "react-router-dom";
 import {Helmet} from "react-helmet-async";
 import QuizSuccessModal from "../../QuizSuccessModal/QuizSuccessModal";
 import {HistoricalEvent, IDataForQuiz, IQuizBlockProps, SubtopicsProps} from "../../types/types";
 import {makeStyles} from "tss-react/mui";
-import AnswerReactionBlock from "./components/AnswerReactionBlock/АnswerReactionBlock";
-import TimeUpMessageBlock from "./components/TimeUpMessageBlock/TimeUpMessageBlock";
-import TimerProgress from "./components/TimerProgress/TimerProgress";
 import axiosClient from "../../axios";
 import QuizResults from "./components/QuizResults/QuizResults";
-import QuizActions from "./components/QuizActions/QuizActions";
 import QuestionContainer from "./components/QuestionContainer/QuestionContainer";
 
 
@@ -78,7 +63,7 @@ const useStyles = makeStyles()((theme) => ({
 
 
 const QuizHeader: React.FC<{ selectedArticleNumber: number }> = ({selectedArticleNumber}) => (
-    <Grid sx={{display: "none"}} className={"back_button_container"} container justifyContent={"space-between"}>
+    <Grid  className={"back_button_container"} container justifyContent={"space-between"}>
         <Grid item>
             <Button component={RouterLink} to={`/article/${selectedArticleNumber}`} startIcon={<ArrowBackIosIcon/>}>
                 До бібліотеки

src/components/QuizBlock/components/QuestionContainer/QuestionContainer.tsx

@@ -58,7 +58,7 @@ const QuestionContainer: React.FC<{ props: QuestionContainerProps }> = ({props})
                             defaultValue={0}
                             value={percentCompleted ? percentCompleted : 0}
                             variant={"determinate"}/>
-            <Typography variant={"h5"}>Тема: {currentArticleTitle && currentArticleTitle}</Typography>
+            <Typography className={"quiz_title"} variant={"h5"}>Тема: {currentArticleTitle && currentArticleTitle}</Typography>
             <Grid container rowSpacing={{xs: 2, sm: 0}} columnSpacing={{xs: 1, sm: 2, md: 3}} alignItems={"center"}
                   justifyContent={"center"}>
                 <Grid item xs={12} sm={6}>

src/components/QuizBlock/quiz_style.scss

@@ -40,6 +40,11 @@
 .question_container {
   text-align: left;
 
+  .quiz_title{
+    margin-top: 1rem;
+    margin-bottom: 2rem;
+  }
+
   @media (min-width: 992px) {
     text-align: center;
   }

src/types/types.ts

@@ -91,6 +91,7 @@ export interface ProfilePageProps extends IHistoryListArray {
     achievements: string[];
     readonly achievedList: IAchievedListItem[];
     isLoading: boolean;
+    currentUserDate: string;
 
 }