Compare commits
2 Commits
23b8c3ad8a
...
deac5ec94d
Author | SHA1 | Date | |
---|---|---|---|
|
deac5ec94d | ||
|
07574e98a6 |
@ -25,7 +25,7 @@ export const AuthHeader = () => {
|
|||||||
</NavLink>
|
</NavLink>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<NavLink to={"/auth"}>Кабинет разработчика</NavLink>
|
<NavLink to={"/profile"}>Кабинет разработчика</NavLink>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<NavLink to={"/tracker-intro"}>Трекер</NavLink>
|
<NavLink to={"/tracker-intro"}>Трекер</NavLink>
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
|
|
||||||
.auth-nav {
|
.auth-nav {
|
||||||
|
height: 35px;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
@ -48,11 +49,13 @@
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
a:focus, a.active {
|
a:focus,
|
||||||
|
a.active {
|
||||||
color: #000000;
|
color: #000000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.candidate {
|
.candidate {
|
||||||
|
background: transparent;
|
||||||
color: #1458dd;
|
color: #1458dd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -137,7 +137,7 @@ export const ModalRegistration = ({ active, setActive }) => {
|
|||||||
|
|
||||||
<div className="button-box">
|
<div className="button-box">
|
||||||
{loader ? (
|
{loader ? (
|
||||||
<Loader style={"green"} />
|
<Loader />
|
||||||
) : (
|
) : (
|
||||||
<BaseButton
|
<BaseButton
|
||||||
onClick={async (e) => {
|
onClick={async (e) => {
|
||||||
|
@ -50,7 +50,7 @@ export const SideBar = () => {
|
|||||||
<Link to={"/auth"}>Вход для партнеров</Link>
|
<Link to={"/auth"}>Вход для партнеров</Link>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<Link to={"/auth"}>Кабинет разработчика</Link>
|
<Link to={"/profile"}>Кабинет разработчика</Link>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<Link to={"/tracker-intro"}>Трекер</Link>
|
<Link to={"/tracker-intro"}>Трекер</Link>
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
|
|
||||||
|
import { Loader } from "@components/common/Loader/Loader";
|
||||||
|
|
||||||
import { selectUserInfo } from "@redux/quizSlice";
|
import { selectUserInfo } from "@redux/quizSlice";
|
||||||
|
|
||||||
import { urlForLocal } from "@utils/helper";
|
import { urlForLocal } from "@utils/helper";
|
||||||
@ -21,7 +23,7 @@ export const HeaderQuiz = ({ header }) => {
|
|||||||
<div className="header-quiz">
|
<div className="header-quiz">
|
||||||
<div className="header-quiz__container">
|
<div className="header-quiz__container">
|
||||||
{!userInfo ? (
|
{!userInfo ? (
|
||||||
<h2>Loading...</h2>
|
<Loader />
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
{header && (
|
{header && (
|
||||||
|
@ -9,6 +9,7 @@ import { apiRequest } from "@api/request";
|
|||||||
import comment from "assets/icons/comment.jpg";
|
import comment from "assets/icons/comment.jpg";
|
||||||
|
|
||||||
import "./quiz.scss";
|
import "./quiz.scss";
|
||||||
|
import { Loader } from "@components/common/Loader/Loader";
|
||||||
|
|
||||||
export const Instruction = () => {
|
export const Instruction = () => {
|
||||||
const [countQuestions, setCountQuestions] = useState(null);
|
const [countQuestions, setCountQuestions] = useState(null);
|
||||||
@ -24,7 +25,7 @@ export const Instruction = () => {
|
|||||||
<div className="instruction">
|
<div className="instruction">
|
||||||
<div className="instruction__container">
|
<div className="instruction__container">
|
||||||
{!countQuestions ? (
|
{!countQuestions ? (
|
||||||
<h2>Loading...</h2>
|
<Loader />
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<h3 className="instruction__title quiz-title_h3">
|
<h3 className="instruction__title quiz-title_h3">
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
|
|
||||||
|
import { Loader } from "@components/common/Loader/Loader";
|
||||||
|
|
||||||
import { fetchResultTest, selectResult, selectedTest } from "@redux/quizSlice";
|
import { fetchResultTest, selectResult, selectedTest } from "@redux/quizSlice";
|
||||||
|
|
||||||
import { apiRequest } from "@api/request";
|
import { apiRequest } from "@api/request";
|
||||||
@ -21,7 +23,7 @@ export const Results = () => {
|
|||||||
return (
|
return (
|
||||||
<div className={"result _container"}>
|
<div className={"result _container"}>
|
||||||
{!result ? (
|
{!result ? (
|
||||||
<h1 style={{ display: "block" }}>Ожидайте результата...</h1>
|
<Loader />
|
||||||
) : (
|
) : (
|
||||||
<div className="result__body">
|
<div className="result__body">
|
||||||
<div className="result__text">Благодарим за прохождение теста</div>
|
<div className="result__text">Благодарим за прохождение теста</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user