quiz #3

Merged
nik.polishuk merged 9 commits from quiz into main 2023-12-12 15:19:52 +03:00
3 changed files with 12 additions and 6 deletions
Showing only changes of commit cf827cc185 - Show all commits

View File

@ -36,10 +36,14 @@ export const Navigation = () => {
path: "/payouts",
name: "Выплаты",
},
{
path: "/quiz",
name: "Тесты"
},
{
path: "/settings",
name: "Настройки",
},
}
],
partner: [
{
@ -91,7 +95,7 @@ export const Navigation = () => {
<nav className="profileHeader__nav">
{navInfo[user].map((link, index) => {
return (
<NavLink key={index} end to={`/profile${link.path}`}>
<NavLink key={index} end to={link.path === '/quiz' ? link.path : `/profile${link.path}`}>
{link.name}
</NavLink>
);

View File

@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import { Link } from "react-router-dom";
import { questionnairesSelector, setQuestionnaires } from "@redux/quizSlice";
// import { questionnairesSelector, setQuestionnaires } from "@redux/quizSlice";
import { apiRequest } from "@api/request";
@ -10,7 +10,8 @@ import CategoriesItem from "@components/CategoriesItem/CategoriesItem";
import { Footer } from "@components/Common/Footer/Footer";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import { Navigation } from "@components/Navigation/Navigation";
// import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import { CardAvailableTest } from "@components/features/quiz/CardAviableTest";
import { SelectedCategory } from "@components/features/quiz/SelectedCategory";
@ -110,7 +111,8 @@ export const QuizPage = () => {
return (
<div className="quiz-page">
<ProfileHeader />
<HeadBottom />
<Navigation />
{/*<HeadBottom />*/}
<div className="quiz-page__container">
<ProfileBreadcrumbs
links={[

View File

@ -7,7 +7,7 @@
flex-direction: column;
&__container {
max-width: 1160px;
margin: 0 auto 42px auto;
margin: 23px auto 42px auto;
flex: 1 1 auto;
width: 100%;
padding: 0 15px;