diff --git a/src/App.js b/src/App.js index 432bc36f..e3b8812d 100644 --- a/src/App.js +++ b/src/App.js @@ -16,7 +16,7 @@ import FreeDevelopers from "./components/UI/FreeDevelopers/FreeDevelopers"; import { TicketFullScreen } from "./components/UI/TicketFullScreen/TicketFullScreen"; import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar"; import Article from "./pages/Article/Article"; -import FormPage from "./pages/FormPage/FormPage.js"; +import FormPage from "./pages/FormPage/FormPage"; import SingleReportPage from "./pages/SingleReportPage/SingleReportPage"; import { QuizPage } from "./pages/quiz/QuizPage"; import { QuizReportPage } from "./pages/quiz/QuizReportPage"; diff --git a/src/pages/PartnerTreaties/Images/actTreaties.png b/src/assets/icons/actTreaties.png similarity index 100% rename from src/pages/PartnerTreaties/Images/actTreaties.png rename to src/assets/icons/actTreaties.png diff --git a/src/images/anyMoment.svg b/src/assets/icons/anyMoment.svg similarity index 100% rename from src/images/anyMoment.svg rename to src/assets/icons/anyMoment.svg diff --git a/src/images/archive.svg b/src/assets/icons/archive.svg similarity index 100% rename from src/images/archive.svg rename to src/assets/icons/archive.svg diff --git a/src/images/archiveTracker.svg b/src/assets/icons/archiveTracker.svg similarity index 100% rename from src/images/archiveTracker.svg rename to src/assets/icons/archiveTracker.svg diff --git a/src/images/ArrovLeftSlider.png b/src/assets/icons/arrows/ArrovLeftSlider.png similarity index 100% rename from src/images/ArrovLeftSlider.png rename to src/assets/icons/arrows/ArrovLeftSlider.png diff --git a/src/images/BreadcrumbsArrow.png b/src/assets/icons/arrows/BreadcrumbsArrow.png similarity index 100% rename from src/images/BreadcrumbsArrow.png rename to src/assets/icons/arrows/BreadcrumbsArrow.png diff --git a/src/images/arrowCalendar.png b/src/assets/icons/arrows/arrowCalendar.png similarity index 100% rename from src/images/arrowCalendar.png rename to src/assets/icons/arrows/arrowCalendar.png diff --git a/src/pages/PartnerTreaties/Images/arrowCheck.png b/src/assets/icons/arrows/arrowCheck.png similarity index 100% rename from src/pages/PartnerTreaties/Images/arrowCheck.png rename to src/assets/icons/arrows/arrowCheck.png diff --git a/src/pages/PartnerTreaties/Images/arrowDown.png b/src/assets/icons/arrows/arrowDown.png similarity index 100% rename from src/pages/PartnerTreaties/Images/arrowDown.png rename to src/assets/icons/arrows/arrowDown.png diff --git a/src/images/arrowRight.svg b/src/assets/icons/arrows/arrowRight.svg similarity index 100% rename from src/images/arrowRight.svg rename to src/assets/icons/arrows/arrowRight.svg diff --git a/src/images/arrowSelect.png b/src/assets/icons/arrows/arrowSelect.png similarity index 100% rename from src/images/arrowSelect.png rename to src/assets/icons/arrows/arrowSelect.png diff --git a/src/images/arrowStart.png b/src/assets/icons/arrows/arrowStart.png similarity index 100% rename from src/images/arrowStart.png rename to src/assets/icons/arrows/arrowStart.png diff --git a/src/images/arrowViewReport.png b/src/assets/icons/arrows/arrowViewReport.png similarity index 100% rename from src/images/arrowViewReport.png rename to src/assets/icons/arrows/arrowViewReport.png diff --git a/src/images/arrowViewReport.svg b/src/assets/icons/arrows/arrowViewReport.svg similarity index 100% rename from src/images/arrowViewReport.svg rename to src/assets/icons/arrows/arrowViewReport.svg diff --git a/src/images/arrow__login_page.png b/src/assets/icons/arrows/arrow__login_page.png similarity index 100% rename from src/images/arrow__login_page.png rename to src/assets/icons/arrows/arrow__login_page.png diff --git a/src/images/arrow_left.png b/src/assets/icons/arrows/arrow_left.png similarity index 100% rename from src/images/arrow_left.png rename to src/assets/icons/arrows/arrow_left.png diff --git a/src/images/arrow_right.png b/src/assets/icons/arrows/arrow_right.png similarity index 100% rename from src/images/arrow_right.png rename to src/assets/icons/arrows/arrow_right.png diff --git a/src/images/blogArrow.svg b/src/assets/icons/arrows/blogArrow.svg similarity index 100% rename from src/images/blogArrow.svg rename to src/assets/icons/arrows/blogArrow.svg diff --git a/src/images/dateArrow.svg b/src/assets/icons/arrows/dateArrow.svg similarity index 100% rename from src/images/dateArrow.svg rename to src/assets/icons/arrows/dateArrow.svg diff --git a/src/images/inFullScreen.svg b/src/assets/icons/arrows/inFullScreen.svg similarity index 100% rename from src/images/inFullScreen.svg rename to src/assets/icons/arrows/inFullScreen.svg diff --git a/src/images/left-arrow.png b/src/assets/icons/arrows/left-arrow.png similarity index 100% rename from src/images/left-arrow.png rename to src/assets/icons/arrows/left-arrow.png diff --git a/src/images/select.svg b/src/assets/icons/arrows/select.svg similarity index 100% rename from src/images/select.svg rename to src/assets/icons/arrows/select.svg diff --git a/src/images/selectArrow.png b/src/assets/icons/arrows/selectArrow.png similarity index 100% rename from src/images/selectArrow.png rename to src/assets/icons/arrows/selectArrow.png diff --git a/src/images/calendar.svg b/src/assets/icons/calendar.svg similarity index 100% rename from src/images/calendar.svg rename to src/assets/icons/calendar.svg diff --git a/src/images/cardCalendar.svg b/src/assets/icons/cardCalendar.svg similarity index 100% rename from src/images/cardCalendar.svg rename to src/assets/icons/cardCalendar.svg diff --git a/src/images/category.svg b/src/assets/icons/category.svg similarity index 100% rename from src/images/category.svg rename to src/assets/icons/category.svg diff --git a/src/pages/PartnerTreaties/Images/checkTreaties.png b/src/assets/icons/checkTreaties.png similarity index 100% rename from src/pages/PartnerTreaties/Images/checkTreaties.png rename to src/assets/icons/checkTreaties.png diff --git a/src/images/close.png b/src/assets/icons/close.png similarity index 100% rename from src/images/close.png rename to src/assets/icons/close.png diff --git a/src/images/closeProjectPersons.svg b/src/assets/icons/closeProjectPersons.svg similarity index 100% rename from src/images/closeProjectPersons.svg rename to src/assets/icons/closeProjectPersons.svg diff --git a/src/images/comment.jpg b/src/assets/icons/comment.jpg similarity index 100% rename from src/images/comment.jpg rename to src/assets/icons/comment.jpg diff --git a/src/images/commentsBoard.svg b/src/assets/icons/commentsBoard.svg similarity index 100% rename from src/images/commentsBoard.svg rename to src/assets/icons/commentsBoard.svg diff --git a/src/images/cursorImg.svg b/src/assets/icons/cursorImg.svg similarity index 100% rename from src/images/cursorImg.svg rename to src/assets/icons/cursorImg.svg diff --git a/src/images/delete.svg b/src/assets/icons/delete.svg similarity index 100% rename from src/images/delete.svg rename to src/assets/icons/delete.svg diff --git a/src/images/doc.svg b/src/assets/icons/doc.svg similarity index 100% rename from src/images/doc.svg rename to src/assets/icons/doc.svg diff --git a/src/images/edit.svg b/src/assets/icons/edit.svg similarity index 100% rename from src/images/edit.svg rename to src/assets/icons/edit.svg diff --git a/src/images/ellipse.png b/src/assets/icons/ellipse.png similarity index 100% rename from src/images/ellipse.png rename to src/assets/icons/ellipse.png diff --git a/src/images/emailLogo.svg b/src/assets/icons/emailLogo.svg similarity index 100% rename from src/images/emailLogo.svg rename to src/assets/icons/emailLogo.svg diff --git a/src/images/fileModal.svg b/src/assets/icons/fileModal.svg similarity index 100% rename from src/images/fileModal.svg rename to src/assets/icons/fileModal.svg diff --git a/src/images/filesBoard.svg b/src/assets/icons/filesBoard.svg similarity index 100% rename from src/images/filesBoard.svg rename to src/assets/icons/filesBoard.svg diff --git a/src/images/gitItemImg.svg b/src/assets/icons/gitItemImg.svg similarity index 100% rename from src/images/gitItemImg.svg rename to src/assets/icons/gitItemImg.svg diff --git a/src/images/link.svg b/src/assets/icons/link.svg similarity index 100% rename from src/images/link.svg rename to src/assets/icons/link.svg diff --git a/src/pages/PartnerTreaties/Images/lock.svg b/src/assets/icons/lock.svg similarity index 100% rename from src/pages/PartnerTreaties/Images/lock.svg rename to src/assets/icons/lock.svg diff --git a/src/pages/PartnerTreaties/Images/lockDone.svg b/src/assets/icons/lockDone.svg similarity index 100% rename from src/pages/PartnerTreaties/Images/lockDone.svg rename to src/assets/icons/lockDone.svg diff --git a/src/pages/PartnerTreaties/Images/mainTreaties.png b/src/assets/icons/mainTreaties.png similarity index 100% rename from src/pages/PartnerTreaties/Images/mainTreaties.png rename to src/assets/icons/mainTreaties.png diff --git a/src/images/paymentIcon.png b/src/assets/icons/paymentIcon.png similarity index 100% rename from src/images/paymentIcon.png rename to src/assets/icons/paymentIcon.png diff --git a/src/images/plus.svg b/src/assets/icons/plus.svg similarity index 100% rename from src/images/plus.svg rename to src/assets/icons/plus.svg diff --git a/src/images/remove.svg b/src/assets/icons/remove.svg similarity index 100% rename from src/images/remove.svg rename to src/assets/icons/remove.svg diff --git a/src/images/search.svg b/src/assets/icons/search.svg similarity index 100% rename from src/images/search.svg rename to src/assets/icons/search.svg diff --git a/src/images/send.svg b/src/assets/icons/send.svg similarity index 100% rename from src/images/send.svg rename to src/assets/icons/send.svg diff --git a/src/images/serchIcon.png b/src/assets/icons/serchIcon.png similarity index 100% rename from src/images/serchIcon.png rename to src/assets/icons/serchIcon.png diff --git a/src/images/settingIcon.png b/src/assets/icons/settingIcon.png similarity index 100% rename from src/images/settingIcon.png rename to src/assets/icons/settingIcon.png diff --git a/src/images/sideBarArrow.svg b/src/assets/icons/sideBarArrow.svg similarity index 100% rename from src/images/sideBarArrow.svg rename to src/assets/icons/sideBarArrow.svg diff --git a/src/images/summaryIcon.png b/src/assets/icons/summaryIcon.png similarity index 100% rename from src/images/summaryIcon.png rename to src/assets/icons/summaryIcon.png diff --git a/src/images/telegram-icon.svg b/src/assets/icons/telegram-icon.svg similarity index 100% rename from src/images/telegram-icon.svg rename to src/assets/icons/telegram-icon.svg diff --git a/src/images/telegram.png b/src/assets/icons/telegram.png similarity index 100% rename from src/images/telegram.png rename to src/assets/icons/telegram.png diff --git a/src/images/tgFooter.svg b/src/assets/icons/tgFooter.svg similarity index 100% rename from src/images/tgFooter.svg rename to src/assets/icons/tgFooter.svg diff --git a/src/images/tgLogo.svg b/src/assets/icons/tgLogo.svg similarity index 100% rename from src/images/tgLogo.svg rename to src/assets/icons/tgLogo.svg diff --git a/src/images/timerIcon.png b/src/assets/icons/timerIcon.png similarity index 100% rename from src/images/timerIcon.png rename to src/assets/icons/timerIcon.png diff --git a/src/images/trackerProject.svg b/src/assets/icons/trackerProject.svg similarity index 100% rename from src/images/trackerProject.svg rename to src/assets/icons/trackerProject.svg diff --git a/src/images/trackerTasks.svg b/src/assets/icons/trackerTasks.svg similarity index 100% rename from src/images/trackerTasks.svg rename to src/assets/icons/trackerTasks.svg diff --git a/src/images/userIcon.svg b/src/assets/icons/userIcon.svg similarity index 100% rename from src/images/userIcon.svg rename to src/assets/icons/userIcon.svg diff --git a/src/images/vkLogo.svg b/src/assets/icons/vkLogo.svg similarity index 100% rename from src/images/vkLogo.svg rename to src/assets/icons/vkLogo.svg diff --git a/src/images/watch.svg b/src/assets/icons/watch.svg similarity index 100% rename from src/images/watch.svg rename to src/assets/icons/watch.svg diff --git a/src/images/yandexZen.svg b/src/assets/icons/yandexZen.svg similarity index 100% rename from src/images/yandexZen.svg rename to src/assets/icons/yandexZen.svg diff --git a/src/images/Body_Text.png b/src/assets/images/Body_Text.png similarity index 100% rename from src/images/Body_Text.png rename to src/assets/images/Body_Text.png diff --git a/src/images/Contract.png b/src/assets/images/Contract.png similarity index 100% rename from src/images/Contract.png rename to src/assets/images/Contract.png diff --git a/src/images/Kek.png b/src/assets/images/Kek.png similarity index 100% rename from src/images/Kek.png rename to src/assets/images/Kek.png diff --git a/src/images/QualificationInfo.png b/src/assets/images/QualificationInfo.png similarity index 100% rename from src/images/QualificationInfo.png rename to src/assets/images/QualificationInfo.png diff --git a/src/images/QualificationInfoMiddle.png b/src/assets/images/QualificationInfoMiddle.png similarity index 100% rename from src/images/QualificationInfoMiddle.png rename to src/assets/images/QualificationInfoMiddle.png diff --git a/src/images/Reporting-1.png b/src/assets/images/Reporting-1.png similarity index 100% rename from src/images/Reporting-1.png rename to src/assets/images/Reporting-1.png diff --git a/src/images/Reporting-2.png b/src/assets/images/Reporting-2.png similarity index 100% rename from src/images/Reporting-2.png rename to src/assets/images/Reporting-2.png diff --git a/src/images/Reporting-3.png b/src/assets/images/Reporting-3.png similarity index 100% rename from src/images/Reporting-3.png rename to src/assets/images/Reporting-3.png diff --git a/src/images/Tax.png b/src/assets/images/Tax.png similarity index 100% rename from src/images/Tax.png rename to src/assets/images/Tax.png diff --git a/src/images/Taxes.png b/src/assets/images/Taxes.png similarity index 100% rename from src/images/Taxes.png rename to src/assets/images/Taxes.png diff --git a/src/images/Vector_Smart_Object.png b/src/assets/images/Vector_Smart_Object.png similarity index 100% rename from src/images/Vector_Smart_Object.png rename to src/assets/images/Vector_Smart_Object.png diff --git a/src/images/Vector_Smart_Object_black.png b/src/assets/images/Vector_Smart_Object_black.png similarity index 100% rename from src/images/Vector_Smart_Object_black.png rename to src/assets/images/Vector_Smart_Object_black.png diff --git a/src/images/act.png b/src/assets/images/act.png similarity index 100% rename from src/images/act.png rename to src/assets/images/act.png diff --git a/src/images/addIcon.png b/src/assets/images/addIcon.png similarity index 100% rename from src/images/addIcon.png rename to src/assets/images/addIcon.png diff --git a/src/images/align-left.png b/src/assets/images/align-left.png similarity index 100% rename from src/images/align-left.png rename to src/assets/images/align-left.png diff --git a/src/images/auth_img.png b/src/assets/images/auth_img.png similarity index 100% rename from src/images/auth_img.png rename to src/assets/images/auth_img.png diff --git a/src/pages/PartnerEmployees/avatarMok.png b/src/assets/images/avatarMok.png similarity index 100% rename from src/pages/PartnerEmployees/avatarMok.png rename to src/assets/images/avatarMok.png diff --git a/src/images/cross.png b/src/assets/images/cross.png similarity index 100% rename from src/images/cross.png rename to src/assets/images/cross.png diff --git a/src/images/deleteBtn.png b/src/assets/images/deleteBtn.png similarity index 100% rename from src/images/deleteBtn.png rename to src/assets/images/deleteBtn.png diff --git a/src/images/dog.jpg b/src/assets/images/dog.jpg similarity index 100% rename from src/images/dog.jpg rename to src/assets/images/dog.jpg diff --git a/src/pages/PartnerEmployees/emplInfo.png b/src/assets/images/emplInfo.png similarity index 100% rename from src/pages/PartnerEmployees/emplInfo.png rename to src/assets/images/emplInfo.png diff --git a/src/images/faq/arrow.svg b/src/assets/images/faq/arrow.svg similarity index 100% rename from src/images/faq/arrow.svg rename to src/assets/images/faq/arrow.svg diff --git a/src/images/faq/question.svg b/src/assets/images/faq/question.svg similarity index 100% rename from src/images/faq/question.svg rename to src/assets/images/faq/question.svg diff --git a/src/images/LogoITguild.svg b/src/assets/images/logo/LogoITguild.svg similarity index 100% rename from src/images/LogoITguild.svg rename to src/assets/images/logo/LogoITguild.svg diff --git a/src/images/astralLogo.png b/src/assets/images/logo/astralLogo.png similarity index 100% rename from src/images/astralLogo.png rename to src/assets/images/logo/astralLogo.png diff --git a/src/images/interviewLogo.svg b/src/assets/images/logo/interviewLogo.svg similarity index 100% rename from src/images/interviewLogo.svg rename to src/assets/images/logo/interviewLogo.svg diff --git a/src/images/konturLogo.png b/src/assets/images/logo/konturLogo.png similarity index 100% rename from src/images/konturLogo.png rename to src/assets/images/logo/konturLogo.png diff --git a/src/images/medium_male.png b/src/assets/images/medium_male.png similarity index 100% rename from src/images/medium_male.png rename to src/assets/images/medium_male.png diff --git a/src/images/medium_male_big.png b/src/assets/images/medium_male_big.png similarity index 100% rename from src/images/medium_male_big.png rename to src/assets/images/medium_male_big.png diff --git a/src/images/AvatarTest .png b/src/assets/images/mock/AvatarTest .png similarity index 100% rename from src/images/AvatarTest .png rename to src/assets/images/mock/AvatarTest .png diff --git a/src/images/avatarMoсk1.png b/src/assets/images/mock/avatarMoсk1.png similarity index 100% rename from src/images/avatarMoсk1.png rename to src/assets/images/mock/avatarMoсk1.png diff --git a/src/images/avatarMoсk2.png b/src/assets/images/mock/avatarMoсk2.png similarity index 100% rename from src/images/avatarMoсk2.png rename to src/assets/images/mock/avatarMoсk2.png diff --git a/src/images/avatarMoсkCreator.png b/src/assets/images/mock/avatarMoсkCreator.png similarity index 100% rename from src/images/avatarMoсkCreator.png rename to src/assets/images/mock/avatarMoсkCreator.png diff --git a/src/images/cardArticleItem.png b/src/assets/images/mock/cardArticleItem.png similarity index 100% rename from src/images/cardArticleItem.png rename to src/assets/images/mock/cardArticleItem.png diff --git a/src/images/cardArticleItem2.png b/src/assets/images/mock/cardArticleItem2.png similarity index 100% rename from src/images/cardArticleItem2.png rename to src/assets/images/mock/cardArticleItem2.png diff --git a/src/images/cardArticleItem3.png b/src/assets/images/mock/cardArticleItem3.png similarity index 100% rename from src/images/cardArticleItem3.png rename to src/assets/images/mock/cardArticleItem3.png diff --git a/src/images/cardArticleItem4.png b/src/assets/images/mock/cardArticleItem4.png similarity index 100% rename from src/images/cardArticleItem4.png rename to src/assets/images/mock/cardArticleItem4.png diff --git a/src/images/cardArticleItem5.png b/src/assets/images/mock/cardArticleItem5.png similarity index 100% rename from src/images/cardArticleItem5.png rename to src/assets/images/mock/cardArticleItem5.png diff --git a/src/images/cardArticleItem6.png b/src/assets/images/mock/cardArticleItem6.png similarity index 100% rename from src/images/cardArticleItem6.png rename to src/assets/images/mock/cardArticleItem6.png diff --git a/src/images/mockImgArticle.png b/src/assets/images/mock/mockImgArticle.png similarity index 100% rename from src/images/mockImgArticle.png rename to src/assets/images/mock/mockImgArticle.png diff --git a/src/images/mokPerson.png b/src/assets/images/mock/mokPerson.png similarity index 100% rename from src/images/mokPerson.png rename to src/assets/images/mock/mokPerson.png diff --git a/src/images/tasksMock.png b/src/assets/images/mock/tasksMock.png similarity index 100% rename from src/images/tasksMock.png rename to src/assets/images/mock/tasksMock.png diff --git a/src/images/money.png b/src/assets/images/money.png similarity index 100% rename from src/images/money.png rename to src/assets/images/money.png diff --git a/src/images/noProjects.png b/src/assets/images/noProjects.png similarity index 100% rename from src/images/noProjects.png rename to src/assets/images/noProjects.png diff --git a/src/images/note.png b/src/assets/images/note.png similarity index 100% rename from src/images/note.png rename to src/assets/images/note.png diff --git a/src/images/PersonalAdmin.svg b/src/assets/images/partnerProfile/PersonalAdmin.svg similarity index 100% rename from src/images/PersonalAdmin.svg rename to src/assets/images/partnerProfile/PersonalAdmin.svg diff --git a/src/images/PersonalArchitecture.svg b/src/assets/images/partnerProfile/PersonalArchitecture.svg similarity index 100% rename from src/images/PersonalArchitecture.svg rename to src/assets/images/partnerProfile/PersonalArchitecture.svg diff --git a/src/images/PersonalCopy.svg b/src/assets/images/partnerProfile/PersonalCopy.svg similarity index 100% rename from src/images/PersonalCopy.svg rename to src/assets/images/partnerProfile/PersonalCopy.svg diff --git a/src/images/PersonalDesign.svg b/src/assets/images/partnerProfile/PersonalDesign.svg similarity index 100% rename from src/images/PersonalDesign.svg rename to src/assets/images/partnerProfile/PersonalDesign.svg diff --git a/src/images/PersonalFrontend.svg b/src/assets/images/partnerProfile/PersonalFrontend.svg similarity index 100% rename from src/images/PersonalFrontend.svg rename to src/assets/images/partnerProfile/PersonalFrontend.svg diff --git a/src/images/PersonalMng.svg b/src/assets/images/partnerProfile/PersonalMng.svg similarity index 100% rename from src/images/PersonalMng.svg rename to src/assets/images/partnerProfile/PersonalMng.svg diff --git a/src/images/PersonalSMM.svg b/src/assets/images/partnerProfile/PersonalSMM.svg similarity index 100% rename from src/images/PersonalSMM.svg rename to src/assets/images/partnerProfile/PersonalSMM.svg diff --git a/src/images/PersonalTesters.svg b/src/assets/images/partnerProfile/PersonalTesters.svg similarity index 100% rename from src/images/PersonalTesters.svg rename to src/assets/images/partnerProfile/PersonalTesters.svg diff --git a/src/images/authCandidateFormImg.png b/src/assets/images/partnerProfile/authCandidateFormImg.png similarity index 100% rename from src/images/authCandidateFormImg.png rename to src/assets/images/partnerProfile/authCandidateFormImg.png diff --git a/src/images/back-end.webp b/src/assets/images/partnerProfile/back-end.webp similarity index 100% rename from src/images/back-end.webp rename to src/assets/images/partnerProfile/back-end.webp diff --git a/src/images/design.webp b/src/assets/images/partnerProfile/design.webp similarity index 100% rename from src/images/design.webp rename to src/assets/images/partnerProfile/design.webp diff --git a/src/images/front-end.webp b/src/assets/images/partnerProfile/front-end.webp similarity index 100% rename from src/images/front-end.webp rename to src/assets/images/partnerProfile/front-end.webp diff --git a/src/images/partnerAddRequestFirstImg.png b/src/assets/images/partnerProfile/partnerAddRequestFirstImg.png similarity index 100% rename from src/images/partnerAddRequestFirstImg.png rename to src/assets/images/partnerProfile/partnerAddRequestFirstImg.png diff --git a/src/images/partnerAddRequestSecondImg.png b/src/assets/images/partnerProfile/partnerAddRequestSecondImg.png similarity index 100% rename from src/images/partnerAddRequestSecondImg.png rename to src/assets/images/partnerProfile/partnerAddRequestSecondImg.png diff --git a/src/images/partnerAddRequestThirdInfo.png b/src/assets/images/partnerProfile/partnerAddRequestThirdInfo.png similarity index 100% rename from src/images/partnerAddRequestThirdInfo.png rename to src/assets/images/partnerProfile/partnerAddRequestThirdInfo.png diff --git a/src/images/personalBackEnd.svg b/src/assets/images/partnerProfile/personalBackEnd.svg similarity index 100% rename from src/images/personalBackEnd.svg rename to src/assets/images/partnerProfile/personalBackEnd.svg diff --git a/src/images/phone.png b/src/assets/images/phone.png similarity index 100% rename from src/images/phone.png rename to src/assets/images/phone.png diff --git a/src/images/question.png b/src/assets/images/question.png similarity index 100% rename from src/images/question.png rename to src/assets/images/question.png diff --git a/src/images/quiz/accempt.png b/src/assets/images/quiz/accempt.png similarity index 100% rename from src/images/quiz/accempt.png rename to src/assets/images/quiz/accempt.png diff --git a/src/images/quiz/compltedImage.png b/src/assets/images/quiz/compltedImage.png similarity index 100% rename from src/images/quiz/compltedImage.png rename to src/assets/images/quiz/compltedImage.png diff --git a/src/images/quiz/success.png b/src/assets/images/quiz/success.png similarity index 100% rename from src/images/quiz/success.png rename to src/assets/images/quiz/success.png diff --git a/src/images/quiz/timer.png b/src/assets/images/quiz/timer.png similarity index 100% rename from src/images/quiz/timer.png rename to src/assets/images/quiz/timer.png diff --git a/src/images/rectangle__calendar.png b/src/assets/images/rectangle__calendar.png similarity index 100% rename from src/images/rectangle__calendar.png rename to src/assets/images/rectangle__calendar.png diff --git a/src/images/rectangle_secondPage.png b/src/assets/images/rectangle_secondPage.png similarity index 100% rename from src/images/rectangle_secondPage.png rename to src/assets/images/rectangle_secondPage.png diff --git a/src/images/reports.png b/src/assets/images/reports.png similarity index 100% rename from src/images/reports.png rename to src/assets/images/reports.png diff --git a/src/images/specialists.png b/src/assets/images/specialists.png similarity index 100% rename from src/images/specialists.png rename to src/assets/images/specialists.png diff --git a/src/components/AuthBox/AuthBox.jsx b/src/components/AuthBox/AuthBox.jsx index dfa327d9..ab66caa0 100644 --- a/src/components/AuthBox/AuthBox.jsx +++ b/src/components/AuthBox/AuthBox.jsx @@ -12,7 +12,7 @@ import ModalErrorLogin from "../UI/ModalErrorLogin/ModalErrorLogin"; import { Loader } from "../Loader/Loader"; import { apiRequest } from "../../api/request"; -import ellipse from "../../images/ellipse.png"; +import ellipse from "../../assets/icons/ellipse.png"; import "./authBox.scss"; diff --git a/src/components/AuthHeader/AuthHeader.jsx b/src/components/AuthHeader/AuthHeader.jsx index b4728874..9f8416e5 100644 --- a/src/components/AuthHeader/AuthHeader.jsx +++ b/src/components/AuthHeader/AuthHeader.jsx @@ -2,7 +2,7 @@ import React from "react"; import { NavLink } from "react-router-dom"; import { scrollToForm } from "../../helper"; -import userIcon from "../../images/userIcon.svg"; +import userIcon from "../../assets/icons/userIcon.svg"; import "./authHeader.scss"; diff --git a/src/components/Calendar/Calendar.jsx b/src/components/Calendar/Calendar.jsx index 0f704f32..e230189e 100644 --- a/src/components/Calendar/Calendar.jsx +++ b/src/components/Calendar/Calendar.jsx @@ -9,7 +9,7 @@ import { LogoutButton } from "../LogoutButton/LogoutButton"; import { urlForLocal } from "../../helper"; import { selectCurrentCandidate } from "../../redux/outstaffingSlice"; -import rectangle from "../../images/rectangle_secondPage.png"; +import rectangle from "../../assets/images/rectangle_secondPage.png"; import "./calendar.scss"; diff --git a/src/components/Calendar/CalendarComponent.jsx b/src/components/Calendar/CalendarComponent.jsx index f3baeb88..be5ad967 100644 --- a/src/components/Calendar/CalendarComponent.jsx +++ b/src/components/Calendar/CalendarComponent.jsx @@ -1,9 +1,9 @@ import React, { useState, useEffect } from "react"; import { calendarHelper, currentMonthAndDay } from "./calendarHelper"; -import ellipse from "../../images/ellipse.png"; -import rectangle from "../../images/rectangle__calendar.png"; -import calendarIcon from "../../images/calendar.svg"; +import ellipse from "../../assets/icons/ellipse.png"; +import rectangle from "../../assets/images/rectangle__calendar.png"; +import calendarIcon from "../../assets/icons/calendar.svg"; import moment from "moment"; import "moment/locale/ru"; diff --git a/src/components/Candidate/Candidate.jsx b/src/components/Candidate/Candidate.jsx index 8e52dbd2..73203a45 100644 --- a/src/components/Candidate/Candidate.jsx +++ b/src/components/Candidate/Candidate.jsx @@ -17,12 +17,12 @@ import { import { apiRequest } from "../../api/request"; import { createMarkup } from "../../helper"; -import gitImgItem from "../../images/gitItemImg.svg"; -import rectangle from "../../images/rectangle_secondPage.png"; -import front from "../../images/front-end.webp"; -import back from "../../images/back-end.webp"; -import design from "../../images/design.webp"; -import rightArrow from "../../images/arrowRight.svg"; +import gitImgItem from "../../assets/icons/gitItemImg.svg"; +import rectangle from "../../assets/images/rectangle_secondPage.png"; +import front from "../../assets/images/partnerProfile/front-end.webp"; +import back from "../../assets/images/partnerProfile/back-end.webp"; +import design from "../../assets/images/partnerProfile/design.webp"; +import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; import { LEVELS, SKILLS } from "../../constants/constants"; diff --git a/src/components/Candidate/candidate.scss b/src/components/Candidate/candidate.scss index 1b6af0ee..ce21ac29 100644 --- a/src/components/Candidate/candidate.scss +++ b/src/components/Candidate/candidate.scss @@ -156,41 +156,6 @@ } } -//@media (max-width: 575.98px) { -// .candidate { -// &__title { -// h2 { -// font-size: 5em; -// line-height: normal; -// } -// } -// -// &__arrow { -// margin-bottom: 40px; -// -// &-img { -// img { -// cursor: pointer; -// } -// } -// -// &-sp { -// span { -// margin-left: 40px; -// margin-right: 120px; -// font-family: 'GT Eesti Pro Display', sans-serif; -// font-size: 1.8em; -// font-weight: 100; -// font-style: normal; -// letter-spacing: normal; -// line-height: 36px; -// text-align: left; -// } -// } -// } -// } -//} - @media (max-width: 375.98px) { .candidate { &__title { @@ -216,29 +181,6 @@ @media (max-width: 575.98px) { .candidate { - //&__header { - // display: flex; - // flex-direction: column; - // margin-left: 0; - // margin-top: 40px; - //} - - //&__main { - // &-description { - // h2 { - // font-size: 3.2em; - // text-align: center; - // position: absolute; - // top: -410px; - // left: 0; - // } - // - // img { - // display: none; - // } - // } - //} - &__btn { display: block; width: 221px; diff --git a/src/components/CardControl/CardControl.jsx b/src/components/CardControl/CardControl.jsx index 7db33a28..ac2948d4 100644 --- a/src/components/CardControl/CardControl.jsx +++ b/src/components/CardControl/CardControl.jsx @@ -1,7 +1,7 @@ import React from "react"; import { Link } from "react-router-dom"; -import rightArrow from "../../images/arrowRight.svg"; +import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; import "./CardControl.scss"; diff --git a/src/components/CategoriesItem/CategoriesItem.jsx b/src/components/CategoriesItem/CategoriesItem.jsx index 2800c4ff..375031a9 100644 --- a/src/components/CategoriesItem/CategoriesItem.jsx +++ b/src/components/CategoriesItem/CategoriesItem.jsx @@ -1,7 +1,7 @@ import React from "react"; import { Link } from "react-router-dom"; -import rightArrow from "../../images/arrowRight.svg"; +import rightArrow from "../../assets/icons/arrows/arrowRight.svg"; import "./categoriesItem.scss"; diff --git a/src/components/Description/Description.jsx b/src/components/Description/Description.jsx index 19e32042..589f07da 100644 --- a/src/components/Description/Description.jsx +++ b/src/components/Description/Description.jsx @@ -9,8 +9,8 @@ import { selectProfiles } from "../../redux/outstaffingSlice"; import { urlForLocal } from "../../helper"; -import rectangle from "../../images/rectangle_secondPage.png"; -import cursorImg from "../../images/cursorImg.svg"; +import rectangle from "../../assets/images/rectangle_secondPage.png"; +import cursorImg from "../../assets/icons/cursorImg.svg"; import "./description.scss"; diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx index acc2868e..bc515722 100644 --- a/src/components/Footer/Footer.jsx +++ b/src/components/Footer/Footer.jsx @@ -1,9 +1,9 @@ import React from "react"; -import logo from "../../images/LogoITguild.svg"; -import vk from "../../images/vkLogo.svg"; -import tg from "../../images/tgFooter.svg"; -import email from "../../images/emailLogo.svg"; +import logo from "../../assets/images/logo/LogoITguild.svg"; +import vk from "../../assets/icons/vkLogo.svg"; +import tg from "../../assets/icons/tgFooter.svg"; +import email from "../../assets/icons/emailLogo.svg"; import "./footer.scss"; diff --git a/src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.jsx b/src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.jsx index 4de0c3a5..741740f7 100644 --- a/src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.jsx +++ b/src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.jsx @@ -1,7 +1,7 @@ import React from "react"; import { Link } from "react-router-dom"; -import questionIcon from "./../../images/faq/question.svg"; +import questionIcon from "./../../assets/images/faq/question.svg"; import "./FrequentlyAskedQuestionsItem.scss"; diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx index d8721287..674a91f7 100644 --- a/src/components/Navigation/Navigation.jsx +++ b/src/components/Navigation/Navigation.jsx @@ -5,7 +5,7 @@ import { apiRequest } from "../../api/request"; import { useDispatch, useSelector } from "react-redux"; import { getProfileInfo, setProfileInfo } from "../../redux/outstaffingSlice"; -import avatarMok from "../../pages/PartnerTreaties/Images/avatarMok.png"; +import avatarMok from "../../assets/images/avatarMok.png"; export const Navigation = () => { const dispatch = useDispatch(); diff --git a/src/components/Outstaffing/Outstaffing.jsx b/src/components/Outstaffing/Outstaffing.jsx index fd1fa6e8..4bb47901 100644 --- a/src/components/Outstaffing/Outstaffing.jsx +++ b/src/components/Outstaffing/Outstaffing.jsx @@ -9,9 +9,9 @@ import { setPositionId, } from "../../redux/outstaffingSlice"; -import front from "../../images/front-end.webp"; -import back from "../../images/back-end.webp"; -import design from "../../images/design.webp"; +import front from "../../assets/images/partnerProfile/front-end.webp"; +import back from "../../assets/images/partnerProfile/back-end.webp"; +import design from "../../assets/images/partnerProfile/design.webp"; import "./outstaffing.scss"; diff --git a/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss b/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss index ec39e890..72d809cc 100644 --- a/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss +++ b/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss @@ -32,7 +32,7 @@ &:after { content: ""; - background-image: url("../../images/BreadcrumbsArrow.png"); + background-image: url("../../assets/icons/arrows/BreadcrumbsArrow.png"); background-repeat: no-repeat; width: 7px; height: 10px; diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index d271533f..03bf0498 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -15,9 +15,10 @@ import { } from "../Calendar/calendarHelper"; import ShortReport from "../ShortReport/ShortReport"; -import arrow from "../../images/arrowCalendar.png"; -import rectangle from "../../images/rectangle__calendar.png"; -import calendarIcon from "../../images/calendar.svg"; +import arrow from "../../assets/icons/arrows/arrowCalendar.png"; +import rectangle from "../../assets/images/rectangle__calendar.png"; +import calendarIcon from "../../assets/icons/calendar.svg"; + import moment from "moment"; import "moment/locale/ru"; diff --git a/src/components/ProjectTiket/ProjectTiket.jsx b/src/components/ProjectTiket/ProjectTiket.jsx index c503fb82..7a109312 100644 --- a/src/components/ProjectTiket/ProjectTiket.jsx +++ b/src/components/ProjectTiket/ProjectTiket.jsx @@ -7,10 +7,10 @@ import { deleteProject, modalToggle } from "../../redux/projectsTrackerSlice"; import { ModalSelect } from "../UI/ModalSelect/ModalSelect"; import TrackerModal from "../UI/TrackerModal/TrackerModal"; -import link from "../../images/link.svg"; -import archiveSet from "../../images/archive.svg"; -import del from "../../images/delete.svg"; -import edit from "../../images/edit.svg"; +import link from "../../assets/icons/link.svg"; +import archiveSet from "../../assets/icons/archive.svg"; +import del from "../../assets/icons/delete.svg"; +import edit from "../../assets/icons/edit.svg"; import "./projectTiket.scss"; diff --git a/src/components/ProtectedRoute/ProtectedRoute.js b/src/components/ProtectedRoute/ProtectedRoute.js index 03aa39d6..f58db84f 100644 --- a/src/components/ProtectedRoute/ProtectedRoute.js +++ b/src/components/ProtectedRoute/ProtectedRoute.js @@ -1,23 +1,30 @@ -import React from 'react'; -import { useSelector } from 'react-redux' -import { Route, Redirect } from 'react-router-dom'; -import { selectAuth } from '../../redux/outstaffingSlice'; +import React from "react"; +import { useSelector } from "react-redux"; +import { Route, Redirect } from "react-router-dom"; + +import { selectAuth } from "../../redux/outstaffingSlice"; export const ProtectedRoute = ({ component: Component, ...rest }) => { - const isAuth = useSelector(selectAuth) - const existingToken = localStorage.getItem('auth_token') - const expiresAt = localStorage.getItem('access_token_expired_at') + const isAuth = useSelector(selectAuth); + const existingToken = localStorage.getItem("auth_token"); + const expiresAt = localStorage.getItem("access_token_expired_at"); - const isTokenAlive = !isAuth && (existingToken && expiresAt && new Date(expiresAt).getTime() > (new Date()).getTime()); + const isTokenAlive = + !isAuth && + existingToken && + expiresAt && + new Date(expiresAt).getTime() > new Date().getTime(); - return ( - - // ( isAuth || isTokenAlive) ? ( - - // ) : - } - /> - ); - }; \ No newline at end of file + return ( + ( + // ( isAuth || isTokenAlive) ? ( + + ) + // ) : + } + /> + ); +}; diff --git a/src/components/ReportForm/ReportForm.jsx b/src/components/ReportForm/ReportForm.jsx index 82c2197d..4c886644 100644 --- a/src/components/ReportForm/ReportForm.jsx +++ b/src/components/ReportForm/ReportForm.jsx @@ -19,10 +19,10 @@ import { apiRequest } from "../../api/request"; import { Navigation } from "../Navigation/Navigation"; import { getReportDate } from "../../redux/reportSlice"; -import calendarIcon from "../../images/calendar.svg"; -import ellipse from "../../images/ellipse.png"; -import remove from "../../images/remove.svg"; -import arrow from "../../images/left-arrow.png"; +import calendarIcon from "../../assets/icons/calendar.svg"; +import ellipse from "../../assets/icons/ellipse.png"; +import remove from "../../assets/icons/remove.svg"; +import arrow from "../../assets/icons/arrows/left-arrow.png"; import "./reportForm.scss"; import "react-datepicker/dist/react-datepicker.css"; diff --git a/src/components/ReportForm/reportForm.scss b/src/components/ReportForm/reportForm.scss index d0f12e7c..e9e88658 100644 --- a/src/components/ReportForm/reportForm.scss +++ b/src/components/ReportForm/reportForm.scss @@ -1,5 +1,5 @@ .report-form { - background: #F1F1F1; + background: #f1f1f1; height: 100%; min-height: 100vh; font-family: "LabGrotesque", sans-serif; @@ -14,7 +14,7 @@ } &__content { - background: #FFFFFF; + background: #ffffff; border-radius: 12px; margin: 25px 0 80px; padding: 50px 40px; @@ -47,10 +47,9 @@ } &__block-title { - h2 { - color: #52B709; - font-family: 'GT Eesti Pro Display'; + color: #52b709; + font-family: "GT Eesti Pro Display"; font-size: 3.3em; font-weight: 700; font-style: normal; @@ -64,7 +63,7 @@ } h3 { - font-family: 'GT Eesti Pro Display'; + font-family: "GT Eesti Pro Display"; font-size: 2.1em; font-weight: 400; font-style: normal; @@ -90,7 +89,7 @@ background-color: #ffffff; display: flex; align-items: center; - font-family: 'GT Eesti Pro Display'; + font-family: "GT Eesti Pro Display"; font-size: 13px; font-weight: 700; font-style: normal; @@ -106,7 +105,6 @@ } &__task { - &-number { height: 14px; color: #282828; @@ -126,7 +124,7 @@ & > span { color: #18586e; - font-family: 'GT Eesti Pro Display'; + font-family: "GT Eesti Pro Display"; font-size: 2em; font-weight: 500; font-style: normal; @@ -150,7 +148,7 @@ margin-left: 50px; p { - font-family: 'GT Eesti Pro Display'; + font-family: "GT Eesti Pro Display"; font-size: 1.5em; font-style: normal; letter-spacing: normal; @@ -206,7 +204,6 @@ margin-left: 20px; &--description { - .checkTask { border-color: #fc0000; } @@ -282,17 +279,17 @@ display: flex; align-items: center; justify-content: center; - color: #4CAF50; + color: #4caf50; width: 38px; height: 38px; - background: #E8E8E8; + background: #e8e8e8; margin-bottom: 0; border-radius: 50px; font-size: 32px; } span { - font-family: 'GT Eesti Pro Display'; + font-family: "GT Eesti Pro Display"; font-size: 1.5em; font-style: normal; letter-spacing: normal; @@ -334,7 +331,7 @@ span { color: #18586e; - font-family: 'GT Eesti Pro Display'; + font-family: "GT Eesti Pro Display"; font-size: 2em; font-weight: 500; font-style: normal; @@ -371,7 +368,7 @@ rgba(255, 255, 255, 0) 100% ); color: #ffffff; - font-family: 'Muller'; + font-family: "Muller"; font-size: 1.6em; letter-spacing: normal; text-align: center; @@ -379,7 +376,7 @@ } &-text { - font-family: 'GT Eesti Pro Display'; + font-family: "GT Eesti Pro Display"; font-size: 1.9em; font-weight: 600; font-style: normal; @@ -416,7 +413,7 @@ margin-bottom: 28px; span { - font-family: 'GT Eesti Pro Display'; + font-family: "GT Eesti Pro Display"; font-size: 2em; font-weight: 700; font-style: normal; diff --git a/src/components/SideBar/SideBar.jsx b/src/components/SideBar/SideBar.jsx index 65d2cca8..b0ba62ca 100644 --- a/src/components/SideBar/SideBar.jsx +++ b/src/components/SideBar/SideBar.jsx @@ -1,8 +1,8 @@ import React, { useState } from "react"; import { Link } from "react-router-dom"; -import arrow from "../../images/sideBarArrow.svg"; -import LogoITguild from "../../images/LogoITguild.svg"; +import arrow from "../../assets/icons/sideBarArrow.svg"; +import LogoITguild from "../../assets/images/logo/LogoITguild.svg"; import "./sidebar.scss"; diff --git a/src/components/SkillSection/SkillSection.js b/src/components/SkillSection/SkillSection.jsx similarity index 65% rename from src/components/SkillSection/SkillSection.js rename to src/components/SkillSection/SkillSection.jsx index 40fb0c3e..b4206ac6 100644 --- a/src/components/SkillSection/SkillSection.js +++ b/src/components/SkillSection/SkillSection.jsx @@ -1,9 +1,10 @@ -import React from 'react' -import './skillSection.scss' +import React from "react"; + +import "./skillSection.scss"; const SkillSection = ({ skillsArr }) => { return ( -
+

Навыки:

    {skillsArr && @@ -12,7 +13,7 @@ const SkillSection = ({ skillsArr }) => { ))}
- ) -} + ); +}; -export default SkillSection +export default SkillSection; diff --git a/src/components/SliderWorkers/SliderWorkers.jsx b/src/components/SliderWorkers/SliderWorkers.jsx index 7a67ced9..e7f12106 100644 --- a/src/components/SliderWorkers/SliderWorkers.jsx +++ b/src/components/SliderWorkers/SliderWorkers.jsx @@ -1,7 +1,8 @@ import React, { useState } from "react"; import Slider from "react-slick"; import { Link } from "react-router-dom"; -import mockWorker from "../../images/mokPerson.png"; + +import mockWorker from "../../assets/images/mock/mokPerson.png"; import "./sliderWorkers.scss"; import "slick-carousel/slick/slick.css"; diff --git a/src/components/SliderWorkers/sliderWorkers.scss b/src/components/SliderWorkers/sliderWorkers.scss index fa95f0a2..5e038a4b 100644 --- a/src/components/SliderWorkers/sliderWorkers.scss +++ b/src/components/SliderWorkers/sliderWorkers.scss @@ -91,7 +91,7 @@ border-radius: 44px; &:before { - content: url("../../images/arrowViewReport.svg"); + content: url("../../assets/icons/arrows/arrowViewReport.svg"); } &:focus { @@ -113,7 +113,7 @@ border-radius: 44px; &:before { - content: url("../../images/ArrovLeftSlider.png"); + content: url("../../assets/icons/arrows/ArrovLeftSlider.png"); } &:focus { diff --git a/src/components/StarRating/StarRating.js b/src/components/StarRating/StarRating.js index 9175d00f..32be5fe3 100644 --- a/src/components/StarRating/StarRating.js +++ b/src/components/StarRating/StarRating.js @@ -1,4 +1,5 @@ import React, { useEffect, useState } from "react"; + import "./StarRating.scss"; const StarRating = ({ diff --git a/src/components/UI/CardArticle/CardArticle.jsx b/src/components/UI/CardArticle/CardArticle.jsx index e6a62e98..d7867bf6 100644 --- a/src/components/UI/CardArticle/CardArticle.jsx +++ b/src/components/UI/CardArticle/CardArticle.jsx @@ -1,7 +1,7 @@ import React from "react"; import { Link } from "react-router-dom"; -import cardCalendar from "../../../images/cardCalendar.svg"; +import cardCalendar from "../../../assets/icons/cardCalendar.svg"; import "./cardArticle.scss"; diff --git a/src/components/UI/FreeDevelopers/FreeDevelopers.jsx b/src/components/UI/FreeDevelopers/FreeDevelopers.jsx index 53fa1ec3..3567d852 100644 --- a/src/components/UI/FreeDevelopers/FreeDevelopers.jsx +++ b/src/components/UI/FreeDevelopers/FreeDevelopers.jsx @@ -8,8 +8,8 @@ import { Link } from "react-router-dom"; import { scrollToForm } from "../../../helper"; import { ProfileBreadcrumbs } from "../../ProfileBreadcrumbs/ProfileBreadcrumbs"; -import mockWorker from "../../../images/mokPerson.png"; -import arrow from "../../../images/arrow_left.png"; +import mockWorker from "../../../assets/images/mock/mokPerson.png"; +import arrow from "../../../assets/icons/arrows/arrow_left.png"; import "./freeDevelopers.scss"; diff --git a/src/components/UI/ModalAspt/ModalAspt.jsx b/src/components/UI/ModalAspt/ModalAspt.jsx index 569c95a2..f8f100f1 100644 --- a/src/components/UI/ModalAspt/ModalAspt.jsx +++ b/src/components/UI/ModalAspt/ModalAspt.jsx @@ -3,10 +3,10 @@ import React, { useState } from "react"; import { Link } from "react-router-dom"; import ModalLayout from "../ModalLayout/ModalLayout"; -import avatar from "../../../images/mokPerson.png"; -import logoTg from "../../../images/tgLogo.svg"; -import arrow from "../../../images/left-arrow.png"; -import interview from "../../../images/interviewLogo.svg"; +import avatar from "../../../assets/images/mock/mokPerson.png"; +import logoTg from "../../../assets/icons/tgLogo.svg"; +import arrow from "../../../assets/icons/arrows/left-arrow.png"; +import interview from "../../../assets/images/logo/interviewLogo.svg"; import "./modalAspt.scss"; diff --git a/src/components/UI/ModalRegistration/ModalRegistration.jsx b/src/components/UI/ModalRegistration/ModalRegistration.jsx index 8d4958a7..120a9a08 100644 --- a/src/components/UI/ModalRegistration/ModalRegistration.jsx +++ b/src/components/UI/ModalRegistration/ModalRegistration.jsx @@ -1,8 +1,8 @@ import React from "react"; -import telegramLogo from "../../../images/tgLogo.svg"; -import doc from "../../../images/doc.svg"; -import anyMoment from "../../../images/anyMoment.svg"; +import telegramLogo from "../../../assets/icons/tgLogo.svg"; +import doc from "../../../assets/icons/doc.svg"; +import anyMoment from "../../../assets/icons/anyMoment.svg"; import "./modalRegistration.scss"; diff --git a/src/components/UI/ModalTicket/ModalTicket.jsx b/src/components/UI/ModalTicket/ModalTicket.jsx index 4b9f754f..9abeaf74 100644 --- a/src/components/UI/ModalTicket/ModalTicket.jsx +++ b/src/components/UI/ModalTicket/ModalTicket.jsx @@ -11,18 +11,18 @@ import { } from "../../../redux/projectsTrackerSlice"; import { getCorrectDate } from "../../../components/Calendar/calendarHelper"; -import category from "../../../images/category.svg"; -import watch from "../../../images/watch.svg"; -import file from "../../../images/fileModal.svg"; -import arrow from "../../../images/arrowStart.png"; -import link from "../../../images/link.svg"; -import archive from "../../../images/archive.svg"; -import del from "../../../images/delete.svg"; -import edit from "../../../images/edit.svg"; -import send from "../../../images/send.svg"; -import plus from "../../../images/plus.svg"; -import fullScreen from "../../../images/inFullScreen.svg"; -import close from "../../../images/closeProjectPersons.svg"; +import category from "../../../assets/icons/category.svg"; +import watch from "../../../assets/icons/watch.svg"; +import file from "../../../assets/icons/fileModal.svg"; +import arrow from "../../../assets/icons/arrows/arrowStart.png"; +import link from "../../../assets/icons/link.svg"; +import archive from "../../../assets/icons/archive.svg"; +import del from "../../../assets/icons/delete.svg"; +import edit from "../../../assets/icons/edit.svg"; +import send from "../../../assets/icons/send.svg"; +import plus from "../../../assets/icons/plus.svg"; +import fullScreen from "../../../assets/icons/arrows/inFullScreen.svg"; +import close from "../../../assets/icons/closeProjectPersons.svg"; import "./ModalTicket.scss"; diff --git a/src/components/UI/TicketFullScreen/TicketFullScreen.jsx b/src/components/UI/TicketFullScreen/TicketFullScreen.jsx index 1daa4d22..ebf66bdf 100644 --- a/src/components/UI/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/UI/TicketFullScreen/TicketFullScreen.jsx @@ -21,21 +21,21 @@ import { apiRequest } from "../../../api/request"; import { urlForLocal } from "../../../helper"; import { getCorrectDate } from "../../Calendar/calendarHelper"; -import project from "../../../images/trackerProject.svg"; -import watch from "../../../images/watch.svg"; -import file from "../../../images/fileModal.svg"; -import send from "../../../images/send.svg"; -import arrow2 from "../../../images/arrowStart.png"; -import plus from "../../../images/plus.svg"; -import tasks from "../../../images/trackerTasks.svg"; -import archive from "../../../images/archiveTracker.svg"; -import selectArrow from "../../../images/select.svg"; -import arrow from "../../../images/arrowCalendar.png"; -import link from "../../../images/link.svg"; -import archive2 from "../../../images/archive.svg"; -import del from "../../../images/delete.svg"; -import edit from "../../../images/edit.svg"; -import close from "../../../images/closeProjectPersons.svg"; +import project from "../../../assets/icons/trackerProject.svg"; +import watch from "../../../assets/icons/watch.svg"; +import file from "../../../assets/icons/fileModal.svg"; +import send from "../../../assets/icons/send.svg"; +import arrow2 from "../../../assets/icons/arrows/arrowStart.png"; +import plus from "../../../assets/icons/plus.svg"; +import tasks from "../../../assets/icons/trackerTasks.svg"; +import archive from "../../../assets/icons/archiveTracker.svg"; +import selectArrow from "../../../assets/icons/arrows/select.svg"; +import arrow from "../../../assets/icons/arrows/arrowCalendar.png"; +import link from "../../../assets/icons/link.svg"; +import archive2 from "../../../assets/icons/archive.svg"; +import del from "../../../assets/icons/delete.svg"; +import edit from "../../../assets/icons/edit.svg"; +import close from "../../../assets/icons/closeProjectPersons.svg"; import "./ticketFullScreen.scss"; diff --git a/src/components/UI/TicketFullScreen/ticketFullScreen.scss b/src/components/UI/TicketFullScreen/ticketFullScreen.scss index c61ae18a..d84f8b65 100644 --- a/src/components/UI/TicketFullScreen/ticketFullScreen.scss +++ b/src/components/UI/TicketFullScreen/ticketFullScreen.scss @@ -11,10 +11,6 @@ } } -// .modal-tiket__content .content { -// width: 70%; -// } - .content-tabs { padding-bottom: 0; } diff --git a/src/components/UI/TrackerModal/TrackerModal.jsx b/src/components/UI/TrackerModal/TrackerModal.jsx index a9645a2b..a93be42b 100644 --- a/src/components/UI/TrackerModal/TrackerModal.jsx +++ b/src/components/UI/TrackerModal/TrackerModal.jsx @@ -16,7 +16,7 @@ import { addPersonToProject, } from "../../../redux/projectsTrackerSlice"; -import arrowDown from "../../../images/selectArrow.png"; +import arrowDown from "../../../assets/icons/arrows/selectArrow.png"; import "./trackerModal.scss"; diff --git a/src/components/features/Candidate-lk/HeadBottom.js b/src/components/features/Candidate-lk/HeadBottom.js index b9a56e50..d1997fa2 100644 --- a/src/components/features/Candidate-lk/HeadBottom.js +++ b/src/components/features/Candidate-lk/HeadBottom.js @@ -1,14 +1,16 @@ -import React from 'react' -import medium_male from "../../../images/medium_male.png" +import React from "react"; + +import medium_male from "../../../assets/images/medium_male.png"; export const HeadBottom = () => { return ( -
-
-
Мои тесты
-
-
- -
- ) -} +
+
+
Мои тесты
+
+ +
+
+
+ ); +}; diff --git a/src/components/features/quiz/AlertResult.js b/src/components/features/quiz/AlertResult.js index ea796156..01139380 100644 --- a/src/components/features/quiz/AlertResult.js +++ b/src/components/features/quiz/AlertResult.js @@ -1,21 +1,33 @@ -import React from 'react' -import suucessIcon from '../../../images/quiz/success.png' +import React from "react"; + +import suucessIcon from "../../../assets/images/quiz/success.png"; export const AlertResult = () => { + const successTest = false; - const successTest = false - - return ( -
-
- suucessIcon -
- Благодарим Вас за прохождение теста "Junior разработчик". Ваши результаты проверены, готовы пригласить Вас в команду -
-
- {!successTest &&
- -
} -
- ) -} + return ( +
+
+ suucessIcon +
+ Благодарим Вас за прохождение теста "Junior разработчик". Ваши + результаты проверены, готовы пригласить Вас в команду +
+
+ {!successTest && ( +
+ +
+ )} +
+ ); +}; diff --git a/src/components/features/quiz/BlockCompletedTest.js b/src/components/features/quiz/BlockCompletedTest.js index 0ca143ed..743b1c9a 100644 --- a/src/components/features/quiz/BlockCompletedTest.js +++ b/src/components/features/quiz/BlockCompletedTest.js @@ -1,24 +1,31 @@ -import React from 'react' -import compltedImage from "../../../images/quiz/compltedImage.png" -import { Link } from 'react-router-dom' +import React from "react"; +import { Link } from "react-router-dom"; + +import compltedImage from "../../../assets/images/quiz/compltedImage.png"; export const BlockCompletedTest = () => { - const id = localStorage.getItem('id') - return ( -
-
-
- -
-
- Спасибо!
- Ваши ответы получены -
-
- В течении дня в вашем кабинете будет отображены данные о прохождении тестирования -
- В кабинет -
-
- ) -} + const id = localStorage.getItem("id"); + return ( +
+
+
+ +
+
+ Спасибо!
+ Ваши ответы получены +
+
+ В течении дня в вашем кабинете будет отображены данные о прохождении + тестирования +
+ + В кабинет + +
+
+ ); +}; diff --git a/src/components/features/quiz/Card-introduction.js b/src/components/features/quiz/Card-introduction.js index 50dc9aa7..1c82db49 100644 --- a/src/components/features/quiz/Card-introduction.js +++ b/src/components/features/quiz/Card-introduction.js @@ -1,19 +1,19 @@ -import React from 'react' -import questionIcon from "../../../images/question.png" -import './quiz.scss' +import React from "react"; + +import questionIcon from "../../../assets/images/question.png"; + +import "./quiz.scss"; export const CardIntroduction = ({ title, description }) => { - return ( -
-
{title}
-
-
- -
-
- {description} -
-
-
- ) -} + return ( +
+
{title}
+
+
+ +
+
{description}
+
+
+ ); +}; diff --git a/src/components/features/quiz/CardAviableTest.js b/src/components/features/quiz/CardAviableTest.js index 195672d0..cfb0e23a 100644 --- a/src/components/features/quiz/CardAviableTest.js +++ b/src/components/features/quiz/CardAviableTest.js @@ -1,7 +1,7 @@ import React from "react"; import { Link } from "react-router-dom"; -import rightArrow from "../../../images/arrowRight.svg"; +import rightArrow from "../../../assets/icons/arrows/arrowRight.svg"; import StarRating from "../../StarRating/StarRating"; export const CardAvailableTest = ({ title, description, path, passedTest }) => { diff --git a/src/components/features/quiz/GetOptionTask.js b/src/components/features/quiz/GetOptionTask.js index 8e35fc17..1f28627c 100644 --- a/src/components/features/quiz/GetOptionTask.js +++ b/src/components/features/quiz/GetOptionTask.js @@ -1,38 +1,49 @@ -import React, { useEffect } from 'react'; -import { useSelector } from 'react-redux'; -import { selectedAnswersSelector, selectedTest } from '../../../redux/quizSlice'; +import React from "react"; +import { useSelector } from "react-redux"; +import { selectedTest } from "../../../redux/quizSlice"; -export const GetOptionTask = ({ type, answer, handleChange, inputValue}) => { +export const GetOptionTask = ({ type, answer, handleChange, inputValue }) => { + const id = localStorage.getItem("id"); + const dataTest = useSelector(selectedTest); - const id = localStorage.getItem('id'); - const dataTest = useSelector(selectedTest); + switch (type) { + case "1": + return ( +
+