Commit Graph

270 Commits

Author SHA1 Message Date
MaxOvs19
3fa9f636c1 Fixed Errorbonary 2023-04-27 12:11:09 +03:00
MaxOvs19
8553adcf08 Fixed catalog pages and added modal 2023-04-26 21:29:50 +03:00
6c79e61e9d Merge remote-tracking branch 'origin/update-modal-app' into candidate-area
# Conflicts:
#	src/App.js
2023-04-25 16:12:28 +03:00
MaxOvs19
cb79f3c063 Added fullScreen ticket 2023-04-20 20:10:08 +03:00
37d8ab385d merge branch and partnerRequest candidate 2023-04-19 22:42:46 +03:00
f4ada281da Merge remote-tracking branch 'origin/lk_candidate' into candidate-area
# Conflicts:
#	src/App.js
#	src/components/Footer/footer.scss
#	src/components/ProfileHeader/ProfileHeader.js
#	src/pages/AuthForCandidate/authForCandidate.scss
2023-04-19 20:37:40 +03:00
f2d7730214 quiz + lk-candidate 2023-04-19 20:22:06 +03:00
MaxOvs19
ab2ff123a0 Finished project menu 2023-04-14 15:52:21 +03:00
MaxOvs19
e19ee11560 added new modal settings 2023-04-13 22:10:20 +03:00
MaxOvs19
b91c8acd0c Fixed candidate pages 2023-04-13 16:10:35 +03:00
MaxOvs19
2e7375f18e Added new modal Aspt and fixed pages/modals 2023-04-12 22:20:05 +03:00
MaxOvs19
1e4e79897a Finished update modal for tracker 2023-04-12 18:22:25 +03:00
MaxOvs19
19865fb9e3 Added new ModalAdd 2023-04-10 21:22:22 +03:00
418b268425 fixes 2023-04-10 18:55:37 +03:00
d0eda91f91 fixes 2023-04-10 18:49:30 +03:00
57e877c5f2 fixes 2023-04-10 18:31:51 +03:00
b99d7a4cdd Merge remote-tracking branch 'origin/parthners-area-fix-tracker-modal' into candidate-area
# Conflicts:
#	src/App.js
#	src/pages/Tracker/Tracker.js
2023-04-10 18:20:55 +03:00
2b65b42494 fixes 2023-04-10 18:12:36 +03:00
MaxOvs19
ae3416c4b2 Fixed auth page and adaptation freeDev 2023-04-10 18:08:41 +03:00
2e13c16c27 select skills on partnerRequest 2023-04-09 05:05:33 +03:00
MaxOvs19
943bc1abea Added page in free worker 2023-04-07 21:49:09 +03:00
911d095120 new footer 2023-04-05 20:13:38 +03:00
ccab602ae4 fixes 2023-04-05 19:38:38 +03:00
4e61ea043d candidate auth 2023-04-04 19:07:19 +03:00
MaxOvs19
8bd7bb7535 Fixed settings page and modals 2023-04-03 14:37:27 +03:00
MaxOvs19
9bab7d17cd Fixed modal and added new img 2023-03-29 19:43:49 +03:00
MaxOvs19
df9e1d5a23 Added modal registr 2023-03-28 20:42:18 +03:00
c1eb60d3ab Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area 2023-03-28 14:42:58 +03:00
MaxOvs19
76334aec99 Fixed auth page and tracker 2023-03-27 19:08:01 +03:00
dedf0588b1 partner catalog and no requests block 2023-03-27 16:30:35 +03:00
5f4dc3a5f2 partner catalog and no requests block 2023-03-27 16:03:24 +03:00
MaxOvs19
a21063663c Fixed modal 2023-03-23 21:18:48 +03:00
fd372b47ae Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area
# Conflicts:
#	src/pages/PartnerSettings/PartnerSettings.js
2023-03-23 16:47:15 +03:00
6419b9dd97 fixes 2023-03-23 16:43:37 +03:00
850b0d1bb6 partner employees 2023-03-23 14:00:34 +03:00
MaxOvs19
4d8f7e6c65 Added new reducer for tracker 2023-03-22 21:48:06 +03:00
MaxOvs19
8b8dda215f Fixed sidebar, AuthBox, and modalError 2023-03-22 15:33:12 +03:00
MaxOvs19
84e55a0f54 Fixed slider, auth pages and modal 2023-03-21 21:26:38 +03:00
eb30ede5c0 fix 2023-03-20 14:38:52 +03:00
653af43f52 partner treaties 2023-03-20 14:00:10 +03:00
MaxOvs19
7ca1239002 Finish update modal error 2023-03-20 13:05:27 +03:00
MaxOvs19
2bc8457af7 Added modal error 2023-03-17 21:50:11 +03:00
9a048a2c7c Merge remote-tracking branch 'origin/update-page-auth' into parthners-area 2023-03-16 17:35:41 +03:00
MaxOvs19
cc2b0f144a Fixed styles 2023-03-14 18:49:45 +03:00
MaxOvs19
021c07f0c6 Finished adaptation for mobile 2023-03-14 18:07:45 +03:00
ca9702ecb7 tracker 2023-03-13 23:33:12 +03:00
MaxOvs19
93ebf0ed83 Added buttons change 2023-03-13 18:35:26 +03:00
MaxOvs19
b17386ba48 Adaptation slider in mobile 2023-03-10 19:58:47 +03:00
MaxOvs19
cb937dd790 Added slider for Dev and Partners auth page 2023-03-10 18:12:25 +03:00
MaxOvs19
fd3ff67915 Fixed header auth 2023-03-10 12:15:03 +03:00
bf5873e5e8 drag and drop on tracker 2023-03-10 01:20:15 +03:00
MaxOvs19
ce2342ff5d Added header auth page 2023-03-09 19:38:56 +03:00
MaxOvs19
a11c85ad14 Work of sidebar finished 2023-03-09 18:44:31 +03:00
MaxOvs19
b4adb4bdd5 Working in sideBar 2023-03-08 20:01:57 +03:00
MaxOvs19
cb677a3f0b Added SideBar component 2023-03-08 13:27:02 +03:00
MaxOvs19
9e9a87dea0 Added modal in project 2023-03-08 11:36:34 +03:00
MaxOvs19
b80824088d Added modal to tracker 2023-03-07 19:40:52 +03:00
cf0cf69a6e Merge remote-tracking branch 'origin/trecker-modal-tiсket' into tracker
# Conflicts:
#	src/pages/Tracker/Tracker.js
#	src/pages/Tracker/tracker.scss
2023-03-07 19:05:04 +03:00
eaa0b2c3ac fix 2023-03-07 19:00:41 +03:00
MaxOvs19
c62a453e9d Create modal in projects 2023-03-07 18:05:52 +03:00
MaxOvs19
84a7f267ff Modal ticket finished 2023-03-07 15:44:54 +03:00
MaxOvs19
792b8542c0 Modal - 90% 2023-03-07 15:18:11 +03:00
MaxOvs19
06f6a99b07 Added description in modal 2023-03-06 20:08:39 +03:00
MaxOvs19
00a3fc0941 Added styles in modal 2023-03-06 17:34:40 +03:00
MaxOvs19
42db13cef8 Added modal ticket 2023-03-06 12:16:52 +03:00
fceaa1d190 new fixes 2023-03-01 23:40:23 +03:00
28a0c7f843 new fixes 2023-03-01 00:28:58 +03:00
f4fb2d857a partner-personal-area 2023-02-27 16:57:33 +03:00
9f96ce6167 Merge branch 'main' into partner-personal-area 2023-02-27 16:50:52 +03:00
31cc5acbe1 partner-personal-area 2023-02-27 16:50:32 +03:00
760949f39a Merge remote-tracking branch 'origin/main' into main 2023-02-27 14:08:09 +03:00
15ed4b8c1d partner bid page 2023-02-23 14:57:26 +03:00
e26b8cc22e personal area partner with fixes report 2023-02-21 19:05:04 +03:00
6b5eeb2942 fixes 2023-02-17 15:19:49 +03:00
a2e768e5c0 change calendar month 2023-02-09 20:46:02 +03:00
dbfab55bd3 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	package-lock.json
2023-02-07 18:39:05 +03:00
df1e8707d1 Удалил старые запросы к апи, переписал страницу тестов на новый конструктор запроса. Обновил библиотеки, в том числе реакт до последней версии, переписал устаревший код с библиотек. 2023-02-07 18:38:23 +03:00
b10d6bc326 dataPicker on reportPage 2023-02-07 15:11:11 +03:00
c60e1b43d2 Удалил старые запросы к апи, переписал страницу тестов на новый конструктор запроса. Обновил библиотеки, в том числе реакт до последней версии, переписал устаревший код с библиотек. 2023-02-02 18:10:44 +03:00
80316d3ba8 Merge branch 'main' into webpack-5
# Conflicts:
#	src/components/ProfileCalendar/ProfileCalendar.js
#	src/hooks/useRequest.js
2023-01-25 16:52:34 +03:00
5c8a8160bd fixs, Убрал стейты для формы авторизации, переписал на форм дату 2023-01-25 16:50:36 +03:00
ffae420834 preLoader and validate report form 2023-01-24 19:11:24 +03:00
107a00b915 view ReportPage 2023-01-23 14:59:57 +03:00
da45d38f39 change img imports 2023-01-23 14:59:48 +03:00
172196f561 fix errors 2023-01-20 18:39:54 +03:00
3081c5fd7d rename TagSelect.css 2023-01-20 18:32:01 +03:00
7c87fc7e88 rename TagSelect.css 2023-01-20 17:06:25 +03:00
3476ef367e rename TagSelect.css 2023-01-20 16:36:47 +03:00
56f63dbed2 Переписываю спорные решения
Фикс отправки отчета, проверка на массив в map в Description.js
2023-01-20 16:20:06 +03:00
642a8a9641 фиксы 2023-01-18 17:37:52 +03:00
6b0b5e991c Переписываю спорные решения
Фикс отправки отчета, проверка на массив в map в Description.js
2023-01-17 22:14:05 +03:00
8be95f8ea7 Merge branch 'profileCalendar' into profilePage
# Conflicts:
#	src/components/ProfileCalendar/ProfileCalendar.js
2023-01-16 21:17:29 +03:00
bcf89c01f5 fix report 2023-01-16 21:11:46 +03:00
d4fc723b25 Merge branch 'profileCalendar' into profilePage 2023-01-16 20:43:04 +03:00
907f3e830d Переписываю спорные решения 2023-01-16 20:42:27 +03:00
50ab182135 fixes styles and routes 2023-01-16 20:38:33 +03:00
f75510b20c Переписываю спорные решения 2023-01-16 19:58:03 +03:00
549e0eac74 Переписываю спорные решения 2023-01-16 19:57:55 +03:00
794a5fa44e Merge branch 'profileCalendar' into profilePage
# Conflicts:
#	src/App.js
#	src/components/ProfileCalendar/ProfileCalendar.js
#	src/components/ReportForm/ReportForm.js
#	src/pages/Profile.js
2023-01-16 19:20:49 +03:00
1d8b30370d Переписываю спорные решения 2023-01-16 19:12:44 +03:00