Commit Graph

789 Commits

Author SHA1 Message Date
Victor Batischev
2268e6e281 layout rework in progress 2024-02-14 16:34:12 +03:00
4ea80eb460 Merge pull request 'trackerTask' (#19) from trackerTask into main
Reviewed-on: #19
2024-02-14 16:27:29 +03:00
Mikola
990abb491b partner active nav 2024-02-14 16:24:08 +03:00
Mikola
d2b53392fa partner active nav 2024-02-14 16:23:50 +03:00
Victor Batischev
12dd238c13 start footer rework 2024-02-14 16:22:15 +03:00
Victor Batischev
ef6d8f4331 rework footer layout 2024-02-14 16:09:09 +03:00
Victor Batischev
97813c875c employee flex container 2024-02-14 15:40:58 +03:00
Mikola
47fccf9a9f loaders, outSelectClose, notifications 2024-02-14 15:00:07 +03:00
Mikola
f1a21a0821 Merge branch 'main' into trackerTask
# Conflicts:
#	src/pages/Quiz/QuizPage.js
2024-02-14 14:59:20 +03:00
Mikola
6ec0264bbf loaders, outSelectClose, notifications 2024-02-14 14:55:25 +03:00
Mikola
183659459a loaders, outSelectClose, notifications 2024-02-14 14:54:45 +03:00
Victor Batischev
04db457944 fix 2024-02-13 20:55:01 +03:00
Victor Batischev
4d758a4ecc fix creator style 2024-02-13 20:54:41 +03:00
Victor Batischev
53bd5a661d redesign cards 2024-02-13 20:12:07 +03:00
Mikola
3a7929689d loaders, outSelectClose, notifications 2024-02-13 15:32:48 +03:00
Mikola
992afead80 loaders, outSelectClose, notifications 2024-02-13 15:32:32 +03:00
ad8c975004 ProfileCalendarComponent 2024-02-12 16:21:37 +03:00
9e7af42817 highlighting an overdue task(ProjectTracker) 2024-02-12 16:11:30 +03:00
Victor Batischev
4915af89db fix styles 2024-02-09 22:50:45 +03:00
Victor Batischev
56caee4453 card redesign 2024-02-09 22:40:54 +03:00
Victor Batischev
a196b174e2 partner card styles 2024-02-09 22:19:49 +03:00
Victor Batischev
6ce0da40c6 finish tags style remake 2024-02-09 21:47:19 +03:00
Victor Batischev
a7ceb942a8 start tags rework 2024-02-09 20:59:44 +03:00
Victor Batischev
5450400315 style fix 2024-02-09 20:34:29 +03:00
e1516910ee Merge branch 'main' of https://git.itguild.info/apuc/guild_front
debag-conflict
2024-02-09 18:27:43 +03:00
af07631abe refactoring allStyles styleStyle -> style-style 2024-02-09 18:17:15 +03:00
Mikola
4d2ccf91eb partner reg, fix employers bug, edit report 2024-02-09 17:59:19 +03:00
Mikola
b43a6a1fcf partner reg, fix employers bug, edit report 2024-02-09 17:58:52 +03:00
Victor Batischev
2f61f7f130 start rework project cards 2024-02-09 16:15:37 +03:00
Victor Batischev
b4f5e6869c create task rework 2024-02-09 15:58:13 +03:00
Victor Batischev
2c146df294 remove work time 2024-02-08 20:06:02 +03:00
Victor Batischev
f738805d1e fix styles 2024-02-08 19:53:39 +03:00
Victor Batischev
4ac2cddabe prettier 2024-02-08 18:47:26 +03:00
Victor Batischev
db7a599a32 fix tracker styles 2024-02-08 18:47:05 +03:00
Victor Batischev
51ae926a2f quiz styles 2024-02-08 16:39:22 +03:00
Victor Batischev
5b44a97329 fix quiz and tracker modal styles 2024-02-08 15:42:08 +03:00
Mikola
1fd6a73652 active links in nav, delete report, loaders in report, changes routes 2024-02-07 18:54:55 +03:00
Mikola
b75b846335 active links in nav, delete report, loaders in report, changes routes 2024-02-07 18:54:21 +03:00
Victor Batischev
455be87e26 fix adaptive tracker tabs 2024-02-06 19:57:27 +03:00
Victor Batischev
8c68366152 add user by email 2024-02-06 18:59:08 +03:00
Victor Batischev
ef8a0813b3 small fix 2024-02-06 18:22:06 +03:00
Victor Batischev
e9235884dd fix layout min height 2024-02-05 17:32:18 +03:00
Victor Batischev
7a3a70ccd3 fix active nav link state 2024-02-05 17:14:30 +03:00
Victor Batischev
3cc306bbc3 fix adaptive layout in project list 2024-02-05 16:44:03 +03:00
Mikola
8a2876e30b employeeReport 2024-02-02 18:44:11 +03:00
Mikola
5825015706 employeeReport 2024-02-02 18:43:52 +03:00
Mikola
dafb05619d fix 2024-02-01 23:46:58 +03:00
Mikola
40937472b7 fix 2024-02-01 23:32:16 +03:00
Mikola
903ae0062c fix 2024-02-01 23:32:02 +03:00
Mikola
cf1bbf136e catalogSpecialists 2024-02-01 23:14:42 +03:00
Mikola
f07589217a catalogSpecialists 2024-02-01 23:14:29 +03:00
Mikola
0acbef4195 catalogSpecialists 2024-02-01 22:33:22 +03:00
Mikola
6dbb4eb609 catalogSpecialists 2024-02-01 22:32:55 +03:00
Victor Batischev
66e6b4c7d7 fix style names 2024-01-31 16:57:22 +03:00
Victor Batischev
78249348eb fix style names 2024-01-31 16:46:16 +03:00
Victor Batischev
73c9101be2 style fix 2024-01-31 16:25:06 +03:00
Victor Batischev
8462d38862 fix list employees 2024-01-30 20:26:58 +03:00
Victor Batischev
43cd44f0a9 full screen ticket fix 2024-01-30 20:16:21 +03:00
Victor Batischev
a32533fdea tracker add task fix 2024-01-30 20:02:28 +03:00
Victor Batischev
7a5d6fc9ec fix tracker card 2024-01-30 18:28:57 +03:00
Victor Batischev
c59d2100d2 small fix 2024-01-30 17:40:40 +03:00
Mikola
9e1d7aa594 catalogSpecialists 2024-01-29 21:20:15 +03:00
Mikola
31faa56d9f catalogSpecialists 2024-01-29 21:19:39 +03:00
Mikola
3765f96c56 catalogSpecialists 2024-01-29 21:19:20 +03:00
Mikola
03bf3f2085 fixes 2024-01-26 18:07:32 +03:00
Mikola
583e15ba0b fixes 2024-01-26 18:07:10 +03:00
Mikola
cc704810c2 fixes 2024-01-16 21:29:41 +03:00
Mikola
c78a094127 fixes 2024-01-16 21:29:24 +03:00
Mikola
d08b6e9be8 fixes 2024-01-12 19:12:01 +03:00
Mikola
a24ce7d7a1 fixes 2024-01-12 19:11:36 +03:00
Mikola
d5f6f5ba60 registration setting 2024-01-11 17:43:25 +03:00
Mikola
d8e34980f2 registration setting 2024-01-11 17:43:09 +03:00
Victor Batischev
f9aa37fec6 add quiz link to sidebar 2024-01-10 18:46:28 +03:00
Victor Batischev
a2270ee6b9 registraion modal adaptive 2024-01-10 18:40:14 +03:00
8d0cb1c831 add logout in AuthBlock and fix layout 2024-01-10 16:28:33 +03:00
0764002a60 fix ModalRegistration 2024-01-09 20:13:51 +03:00
4b0176079e debug ModalRegistration and
RegistrationForCandidate
2023-12-29 12:23:54 +03:00
94a13f4903 refactoring useFormValidation and
registationForCandidate, adaptive
modalRegistration and registationForCandidate
2023-12-28 07:09:15 +03:00
c345bdf5ca add adaptive registationForCandidate,
modalRegistration,
create hook useFormValidation,
add Validation in registationForCandidate
2023-12-26 02:42:49 +03:00
Mikola
ce6c2d965a fix api /me 2023-12-25 20:59:25 +03:00
Mikola
80ebf85347 fix api /me 2023-12-25 20:58:18 +03:00
Victor Batischev
5e7c9dec79 prettier 2023-12-22 15:18:36 +03:00
Victor Batischev
fc5d67dc2d finished reports adaptive 2023-12-22 15:18:13 +03:00
Victor Batischev
72766efa39 remove short report, refactor range days 2023-12-22 14:47:55 +03:00
2996b78e6e ProfileCalendar 2023-12-21 17:31:52 +03:00
2d0a824aa4 add adaptive-candidate 2023-12-21 17:25:53 +03:00
Victor Batischev
6207ac2097 prettier 2023-12-20 19:56:09 +03:00
Victor Batischev
442cbeca41 fix report bug 2023-12-20 19:55:37 +03:00
Victor Batischev
74009f60d6 reports adaptive 2023-12-20 19:44:03 +03:00
Victor Batischev
68c6aa5327 format 2023-12-20 16:15:14 +03:00
Victor Batischev
7a1eeb6886 fix hour calculation and report form 2023-12-20 16:14:30 +03:00
MaxOvs19
663cfc924f Prettier format 2023-12-19 20:47:35 +03:00
MaxOvs19
369b77c1aa Added new modal in tracker 2023-12-19 20:42:46 +03:00
Victor Batischev
5d03502e5c prettier config 2023-12-19 17:36:30 +03:00
Victor Batischev
05f966b877 fix login, report textarea 2023-12-19 17:31:27 +03:00
MaxOvs19
bd6f6af8de Fixed req in user/me for partners 2023-12-14 16:28:21 +03:00
Mikola
22c0a0d065 fix 2023-12-12 16:06:31 +03:00
0134ab9662 Merge pull request 'quiz' (#3) from quiz into main
Reviewed-on: #3
2023-12-12 15:19:51 +03:00
Mikola
dcf0bbbe68 quiz 2023-12-12 15:18:12 +03:00
Mikola
7e5503e576 quiz 2023-12-12 15:18:04 +03:00
Mikola
2588a72b02 quiz 2023-12-12 11:23:06 +03:00
Mikola
6e2a14d58e quiz 2023-12-12 11:22:53 +03:00
MaxOvs19
7e36248e69 Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed-pages 2023-12-11 14:16:52 +03:00
Mikola
15183d3ada quiz 2023-12-10 03:25:05 +03:00
Mikola
cf827cc185 quiz 2023-12-10 03:24:55 +03:00
Mikola
178fd4362a Merge branch 'main' into quiz 2023-12-10 03:17:41 +03:00
MaxOvs19
f98e788201 Fixed err in undef arrays 2023-12-06 18:26:47 +03:00
MaxOvs19
585604d0b9 Finished working in paginations 2023-12-05 20:19:33 +03:00
MaxOvs19
01b12d7e9d Fixed pagination 2023-12-05 19:29:03 +03:00
5861fbe4b1 Merge pull request 'summary-skills' (#1) from summary-skills into main
Reviewed-on: #1
2023-12-05 16:03:56 +03:00
Mikola
a353f96d16 editSkills 2023-12-05 16:02:59 +03:00
Mikola
35b1b871c4 editSkills 2023-12-05 16:02:47 +03:00
Victor Batischev
6fc708255c report form adaptive start 2023-12-05 15:46:25 +03:00
Victor Batischev
50504109cb settings page adaptive 2023-12-05 15:31:26 +03:00
Victor Batischev
e90ab69e5f settings adaptive 2023-12-05 15:18:28 +03:00
Victor Batischev
6086026617 auth candidate adaptive 2023-12-05 14:50:15 +03:00
Victor Batischev
522a67bf6b registration adaptive 2023-12-05 14:22:45 +03:00
Mikola
9e10088494 test 2023-12-05 14:15:04 +03:00
MaxOvs19
47a38c45b2 Working in pagination 2023-12-04 23:32:41 +03:00
Victor Batischev
93c1dd3945 reports adaptive 2023-12-04 21:08:45 +03:00
Victor Batischev
7f0e5be087 reports adaptive 2023-12-04 21:08:15 +03:00
Victor Batischev
4e15f79c76 fix calendar 2023-12-04 20:13:10 +03:00
Victor Batischev
db9a7b24c6 resume adaptive 2023-12-04 19:34:59 +03:00
Victor Batischev
cdf06c7984 fix mobile resolution 2023-12-04 19:28:40 +03:00
Victor Batischev
d4eba820e0 remove auth for dev 2023-12-04 18:36:02 +03:00
MaxOvs19
1edc9109d5 Fixed archive1 2023-12-04 18:31:36 +03:00
MaxOvs19
6ff18fe751 Fixed archive 2023-12-04 18:31:13 +03:00
Victor Batischev
5bfc953ecc fix errors, change logo 2023-12-04 18:01:04 +03:00
Victor Batischev
887656da3b fix errors, change logo 2023-12-04 18:00:12 +03:00
MaxOvs19
154fb0dfa6 Working in paginations 2023-12-04 17:30:52 +03:00
Mikola
ca2e917fc4 editSummary 2023-11-30 16:42:50 +03:00
Mikola
c514062efe editSummary 2023-11-30 16:42:24 +03:00
MaxOvs19
8338414b1b Fixed Routes 2023-11-29 22:18:25 +03:00
MaxOvs19
f78e394834 fixed page auth 2023-11-28 22:03:56 +03:00
MaxOvs19
5dc5b75f9e Fixed tracker pages 2023-11-27 17:32:38 +03:00
Mikola
2f30a8e298 setSettings 2023-11-27 14:39:40 +03:00
Mikola
c613dfa879 setSettings 2023-11-27 14:39:11 +03:00
MaxOvs19
40f64371f6 Merge branch 'main' of https://github.com/apuc/outstaffing-react into fixed-pages 2023-11-24 17:25:58 +03:00
MaxOvs19
6bb948befb Fixed list tags 2023-11-24 17:24:43 +03:00
MaxOvs19
652918cd0a Fixed styles pages 2023-11-23 18:15:46 +03:00
Mikola
3696ccb02c registration and reset warning text 2023-11-23 16:48:56 +03:00
Mikola
185572cbf3 registration and reset warning text 2023-11-23 16:48:45 +03:00
b0c9884fe4 quiz 2023-11-21 17:46:57 +03:00
ec7d0716b3 quiz 2023-11-21 17:31:22 +03:00
Mikola
4301732c26 task priority 2023-11-21 16:53:05 +03:00
Mikola
8c440ce7c7 task priority 2023-11-21 16:41:18 +03:00
Mikola
5b60001013 task priority 2023-11-21 16:40:58 +03:00
NikoM1k
67f3f3b437
Merge pull request #151 from apuc/registration
Registration
2023-11-19 20:02:23 +03:00
Mikola
e61cb35f8e fixes 2023-11-19 20:01:50 +03:00
Mikola
9697c375e7 fixes 2023-11-19 20:01:27 +03:00
Mikola
44725b014b task files 2023-11-19 19:04:42 +03:00
Mikola
3f5f221702 validate registration 2023-11-19 18:50:04 +03:00
Mikola
c69adb0d14 validate registration 2023-11-19 18:49:52 +03:00
MaxOvs19
0372cf6b74 Fixed scroll 2023-11-17 17:19:46 +03:00
MaxOvs19
090c0cc01e Merge branch 'main' of https://github.com/apuc/outstaffing-react into fixed-pages 2023-11-17 15:47:14 +03:00
NikoM1k
25717ad9b9
Merge pull request #149 from apuc/registration
hide phone
2023-11-16 17:42:35 +03:00
Mikola
07eb0147b8 hide phone 2023-11-16 17:41:41 +03:00
MaxOvs19
059f133254 Fixed modal tiket 2023-11-10 13:58:03 +03:00
MaxOvs19
7f751728a8 Fixed tags in tracker 2023-11-09 21:03:19 +03:00
MaxOvs19
63f46b080f Fixed add user modal 2023-11-09 17:35:44 +03:00
Mikola
bc00c72e7d registration 2023-11-08 22:04:18 +03:00
Mikola
b3a2851329 registration 2023-11-08 18:27:58 +03:00
Mikola
b9cea4e7f7 registration 2023-11-08 18:27:42 +03:00
MaxOvs19
b0049cbd7e Fixed project card 2023-11-07 16:37:03 +03:00
Mikola
59fde487ea registration 2023-11-05 20:42:03 +03:00
Mikola
321b84a80e registration 2023-11-05 20:41:40 +03:00
Mikola
1e9ee3699d registration 2023-11-04 02:44:40 +03:00
Mikola
98bf179b9e registration 2023-11-04 02:39:58 +03:00
Mikola
baf353d7cd registration 2023-11-03 16:23:49 +03:00
Mikola
7304b01a5d registration 2023-11-03 16:23:21 +03:00
MaxOvs19
ad111d0c6c Fixed req in candidate 2023-10-30 11:40:40 +03:00
MaxOvs19
04d3f68da8 Merge branch 'main' of https://github.com/apuc/outstaffing-react into fixed-pages 2023-10-30 11:24:24 +03:00
Mikola
512a8c6121 create task with tags 2023-10-30 01:35:28 +03:00
Mikola
c2c57e3791 create task with tags 2023-10-30 01:35:06 +03:00
Mikola
7fb04005bb outClick 2023-10-28 17:57:58 +03:00
Mikola
6dd8ac7604 outClick 2023-10-28 17:57:32 +03:00
MaxOvs19
6a74ddb424 Fixed calendar and req profile 2023-10-27 18:32:37 +03:00
NikoM1k
5e69e922f5
Merge pull request #140 from apuc/tracker-mark
Tracker mark
2023-10-26 14:45:59 +03:00
Mikola
db0f0e1f24 marks 2023-10-26 14:45:14 +03:00
Mikola
5c72dae35a marks 2023-10-26 14:44:39 +03:00
NikoM1k
64374a4aff
Merge pull request #139 from apuc/tracker-mark
Tracker mark
2023-10-25 16:33:54 +03:00
Mikola
1fc6cc3f73 marks 2023-10-25 16:33:26 +03:00
Mikola
fc9d18a380 marks 2023-10-25 16:33:08 +03:00
Mikola
33b70c7fbd marks 2023-10-24 22:58:45 +03:00
Mikola
c4a4fa1333 marks 2023-10-24 22:49:12 +03:00
MaxOvs19
76b2c4622f fixed calendar periods 2023-10-24 19:41:59 +03:00
MaxOvs19
e670e2a9a7 Fixed archive 2023-10-23 17:26:47 +03:00
MaxOvs19
66f815f4f0 Update my task 2023-10-23 16:42:12 +03:00
MaxOvs19
8b170fe43d new design tasks 2023-10-20 19:15:04 +03:00
MaxOvs19
4be52d429c Fixed pages 2023-10-19 19:19:45 +03:00
MaxOvs19
c8ee505543 Finish work archive 2023-10-13 21:42:18 +03:00
MaxOvs19
cc38b06bdf Merge branch 'main' of https://github.com/apuc/outstaffing-react into fix-tracker-and-statistics 2023-10-13 17:49:45 +03:00
Mikola
2af61e5a7a traсker 2023-10-13 14:39:01 +03:00
Mikola
356104b475 traker 2023-10-13 14:38:11 +03:00
MaxOvs19
f051508071 Merge branch 'main' of https://github.com/apuc/outstaffing-react into fix-tracker-and-statistics 2023-10-12 15:31:39 +03:00
Mikola
95ba471e1f calendar range days 2023-10-12 12:50:17 +03:00
Mikola
8b49a3a7c2 calendar range days 2023-10-12 12:50:02 +03:00
MaxOvs19
40133b72a3 working in archive page 2023-10-11 19:56:36 +03:00
MaxOvs19
b226ee88bd Merge branch 'main' of https://github.com/apuc/outstaffing-react into fix-tracker-and-statistics 2023-10-11 12:22:00 +03:00
MaxOvs19
be411ffef2 Fixed archive and select modal 2023-10-10 19:29:08 +03:00