apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'trackerTask' (#13) from trackerTask into main

Browse Source 
Reviewed-on: #13
This commit was merged in pull request #13.
This commit is contained in:
Николай Полтщук
2024-02-01 23:32:46 +03:00
parent 06f5cda1e8 40937472b7
commit d4f7b287d3
11 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/App.js
View File

@@ -10,7 +10,7 @@ import { getNotification } from "@redux/outstaffingSlice";
import Auth from "./pages/Auth/Auth"; import Auth from "./pages/Auth/Auth";
import CatalogSpecialists from "@pages/CatalogSpecialists/CatalogSpecialists"; import CatalogSpecialists from "@pages/CatalogSpecialists/CatalogSpecialists";
import { TrackerIntro } from "./pages/TrackerIntro/TrackerIntro" import { TrackerIntro } from "@pages/TrackerIntro/TrackerIntro"
import { CompanyInfo } from "@pages/CompanyInfo/CompanyInfo"; import { CompanyInfo } from "@pages/CompanyInfo/CompanyInfo";
import { TrackerAuth } from "@pages/TrackerAuth/TrackerAuth"; import { TrackerAuth } from "@pages/TrackerAuth/TrackerAuth";
import { TrackerRegistration } from "@pages/TrackerRegistration/TrackerRegistration"; import { TrackerRegistration } from "@pages/TrackerRegistration/TrackerRegistration";
@@ -19,35 +19,35 @@ import Candidate from "./components/Candidate/Candidate";
import Calendar from "./components/Calendar/Calendar"; import Calendar from "./components/Calendar/Calendar";
import ReportForm from "./components/ReportForm/ReportForm"; import ReportForm from "./components/ReportForm/ReportForm";
import FreeDevelopers from "./components/FreeDevelopers/FreeDevelopers"; import FreeDevelopers from "./components/FreeDevelopers/FreeDevelopers";
import { TicketFullScreen } from "./components/Modal/Tracker/TicketFullScreen/TicketFullScreen"; import { TicketFullScreen } from "@components/Modal/Tracker/TicketFullScreen/TicketFullScreen";
import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar"; import { ProfileCalendar } from "@components/ProfileCalendar/ProfileCalendar";
import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting"; import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting";
import Article from "./pages/Article/Article"; import Article from "./pages/Article/Article";
import FormPage from "./pages/FormPage/FormPage"; import FormPage from "./pages/FormPage/FormPage";
import SingleReportPage from "./pages/SingleReportPage/SingleReportPage"; import SingleReportPage from "./pages/SingleReportPage/SingleReportPage";
import { QuizPage } from "./pages/Quiz/QuizPage"; import { QuizPage } from "@pages/Quiz/QuizPage";
import { QuizReportPage } from "./pages/Quiz/QuizReportPage"; import { QuizReportPage } from "@pages/Quiz/QuizReportPage";
import { Profile } from "./pages/Profile/Profile.js"; import { Profile } from "@pages/Profile/Profile";
import { Summary } from "./pages/Summary/Summary"; import { Summary } from "@pages/Summary/Summary";
import { ViewReport } from "./pages/ViewReport/ViewReport"; import { ViewReport } from "@pages/ViewReport/ViewReport";
import { Tracker } from "./pages/Tracker/Tracker"; import { Tracker } from "@pages/Tracker/Tracker";
import { Payouts } from "./pages/Payouts/Payouts"; import { Payouts } from "@pages/Payouts/Payouts";
import { PartnerSettings } from "./pages/PartnerSettings/PartnerSettings"; import { PartnerSettings } from "@pages/PartnerSettings/PartnerSettings";
import { PartnerRequests } from "./pages/PartnerRequests/PartnerRequests"; import { PartnerRequests } from "@pages/PartnerRequests/PartnerRequests";
import { PartnerAddRequest } from "./pages/PartnerAddRequest/PartnerAddRequest"; import { PartnerAddRequest } from "@pages/PartnerAddRequest/PartnerAddRequest";
import { PartnerBid } from "./pages/PartnerBid/PartnerBid"; import { PartnerBid } from "@pages/PartnerBid/PartnerBid";
import { PartnerCategories } from "./pages/PartnerСategories/PartnerСategories"; import { PartnerCategories } from "@pages/PartnerСategories/PartnerСategories";
import { PartnerTreaties } from "./pages/PartnerTreaties/PartnerTreaties"; import { PartnerTreaties } from "@pages/PartnerTreaties/PartnerTreaties";
import { PartnerEmployees } from "./pages/PartnerEmployees/PartnerEmployees"; import { PartnerEmployees } from "@pages/PartnerEmployees/PartnerEmployees";
import { AuthForCandidate } from "./pages/AuthForCandidate/AuthForCandidate"; import { AuthForCandidate } from "@pages/AuthForCandidate/AuthForCandidate";
import { RegistrationForCandidate } from "./pages/RegistrationForCandidate/RegistrationForCandidate"; import { RegistrationForCandidate } from "@pages/RegistrationForCandidate/RegistrationForCandidate";
import { ProfileCandidate } from "./pages/ProfileCandidate/ProfileCandidate"; import { ProfileCandidate } from "@pages/ProfileCandidate/ProfileCandidate";
import { PassingTests } from "./pages/Quiz/PassingTests"; import { PassingTests } from "@pages/Quiz/PassingTests";
import Blog from "./pages/Blog/Blog"; import Blog from "./pages/Blog/Blog";
import Statistics from "@pages/Statistics/Statistics"; import Statistics from "@pages/Statistics/Statistics";
import { ProjectTracker } from "./pages/ProjectTracker/ProjectTracker"; import { ProjectTracker } from "@pages/ProjectTracker/ProjectTracker";
import { FrequentlyAskedQuestions } from "./pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions"; import { FrequentlyAskedQuestions } from "@pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions";
import { FrequentlyAskedQuestion } from "./pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion"; import { FrequentlyAskedQuestion } from "@pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion";
import Notification from "@components/Notification/Notification"; import Notification from "@components/Notification/Notification";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";

4
src/components/Navigation/Navigation.jsx
View File

@@ -35,7 +35,7 @@ export const Navigation = () => {
name: "Выплаты" name: "Выплаты"
}, },
{ {
path: "/quiz", path: "/Quiz",
name: "Тесты" name: "Тесты"
}, },
{ {
@@ -96,7 +96,7 @@ export const Navigation = () => {
<NavLink <NavLink
key={index} key={index}
end end
to={link.path === "/quiz" ? link.path : `/profile${link.path}`} to={link.path === "/Quiz" ? link.path : `/profile${link.path}`}
> >
{link.name} {link.name}
</NavLink> </NavLink>

2
src/components/ProfileCalendar/ProfileCalendar.jsx
View File

@@ -51,7 +51,7 @@ export const ProfileCalendar = () => {
return; return;
} }
apiRequest( apiRequest(
`/reports/index?${requestDates}&user_id =${localStorage.getItem("id")}` `/reports/index?${requestDates}&user_id=${localStorage.getItem("id")}`
).then((reports) => { ).then((reports) => {
let spendTime = 0; let spendTime = 0;

2
src/components/SideBar/SideBar.jsx
View File

@@ -56,7 +56,7 @@ export const SideBar = () => {
<Link to={"/tracker-intro"}>Трекер</Link> <Link to={"/tracker-intro"}>Трекер</Link>
</li> </li>
<li> <li>
<Link to={"/quiz"}>Тесты</Link> <Link to={"/Quiz"}>Тесты</Link>
</li> </li>
<li> <li>
<a href="#">Школа</a> <a href="#">Школа</a>

2
src/components/features/quiz/HeaderPageTests.jsx
View File

@@ -32,7 +32,7 @@ export const HeaderPageTestsQuiz = ({ isVisibilityButton }) => {
</div> </div>
{isVisibilityButton && ( {isVisibilityButton && (
<Link <Link
to={"/quiz/instruction"} to={"/Quiz/instruction"}
className="quiz-btn quiz-btn_restriction" className="quiz-btn quiz-btn_restriction"
> >
Пройти Пройти

2
src/components/features/quiz/MyTestsQuiz.jsx
View File

@@ -44,7 +44,7 @@ export const MyTestsQuiz = ({ listTests }) => {
</h3> </h3>
<div className="item-test__body test-data"> <div className="item-test__body test-data">
<Link <Link
to={"/quiz/interjacent"} to={"/Quiz/interjacent"}
className="quiz-btn" className="quiz-btn"
onClick={() => recordSelectedTest(item)} onClick={() => recordSelectedTest(item)}
> >

2
src/components/features/quiz/Task.js
View File

@@ -58,7 +58,7 @@ export const TaskQuiz = ({ timer }) => {
text: "Тест успешно пройден", text: "Тест успешно пройден",
type: "success" type: "success"
}); });
navigate("/quiz"); navigate("/Quiz");
// if (String(res?.status)[0] !== "2") { // if (String(res?.status)[0] !== "2") {
// showNotification({ // showNotification({
// show: true, // show: true,

6
src/pages/quiz/PassingTests.js → src/pages/Quiz/PassingTests.js
View File

@@ -26,7 +26,7 @@ export const PassingTests = () => {
expiryTimestamp: moment(), expiryTimestamp: moment(),
autoStart: false, autoStart: false,
onExpire: () => { onExpire: () => {
navigate("/quiz"); navigate("/Quiz");
} }
}); });
@@ -85,8 +85,8 @@ export const PassingTests = () => {
<ProfileBreadcrumbs <ProfileBreadcrumbs
links={[ links={[
{ name: "Главная", link: "/profile-candidate" }, { name: "Главная", link: "/profile-candidate" },
{ name: "Тестирование", link: "/quiz" }, { name: "Тестирование", link: "/Quiz" },
{ name: "Прохождение тестов", link: "/quiz/test" } { name: "Прохождение тестов", link: "/Quiz/test" }
]} ]}
/> />
<div className="passing-tests-page__title main-title"> <div className="passing-tests-page__title main-title">

8
src/pages/quiz/QuizPage.js → src/pages/Quiz/QuizPage.js
View File

@@ -116,7 +116,7 @@ export const QuizPage = () => {
<ProfileBreadcrumbs <ProfileBreadcrumbs
links={[ links={[
{ name: "Главная", link: "/profile-candidate" }, { name: "Главная", link: "/profile-candidate" },
{ name: "Тестирование", link: "/quiz" } { name: "Тестирование", link: "/Quiz" }
]} ]}
/> />
<div className="quiz-page__title main-title"> <div className="quiz-page__title main-title">
@@ -124,9 +124,9 @@ export const QuizPage = () => {
</div> </div>
{!selectedCategory && ( {!selectedCategory && (
<> <>
<div className="quiz-page__specialization"> {/*<div className="quiz-page__specialization">*/}
<SelectedCategory setSelectedCategory={setSetSelectedCategory} /> {/* <SelectedCategory setSelectedCategory={setSetSelectedCategory} />*/}
</div> {/*</div>*/}
<div className="quiz-page__block">Доступные тесты</div> <div className="quiz-page__block">Доступные тесты</div>
<div className="quiz-page__cards-test"> <div className="quiz-page__cards-test">
{questionnaires.length ? ( {questionnaires.length ? (

6
src/pages/quiz/QuizReportPage.js → src/pages/Quiz/QuizReportPage.js
View File

@@ -20,7 +20,7 @@ export const QuizReportPage = () => {
let navigate = useNavigate(); let navigate = useNavigate();
if (!test) { if (!test) {
navigate("/quiz"); navigate("/Quiz");
} }
useEffect(() => { useEffect(() => {
@@ -42,8 +42,8 @@ export const QuizReportPage = () => {
<ProfileBreadcrumbs <ProfileBreadcrumbs
links={[ links={[
{ name: "Главная", link: "/profile-candidate" }, { name: "Главная", link: "/profile-candidate" },
{ name: "Тестирование", link: "/quiz" }, { name: "Тестирование", link: "/Quiz" },
{ name: "Отчет по тестированию", link: "/quiz/report" } { name: "Отчет по тестированию", link: "/Quiz/report" }
]} ]}
/> />
<div className="quiz-report-page__title main-title"> <div className="quiz-report-page__title main-title">

0
src/pages/quiz/quiz-page.scss → src/pages/Quiz/quiz-page.scss
View File