Commit graph

553 commits

Author SHA1 Message Date
al8763be
e839d02cfd Merge branch 'dev' into frontend 2024-03-20 23:37:56 +01:00
al8763be
01b934969a fixed dep array 2024-03-20 23:24:28 +01:00
Davenludd
a4bd2c9315 Merge branch 'dev' into gruppDM 2024-03-20 22:50:56 +01:00
Mattias
1a87effc3a Changes to EditWeeklyReport component 2024-03-20 22:49:54 +01:00
al8763be
ddea76e24a fixed AllTimeReportsInProject 2024-03-20 22:47:02 +01:00
Davenludd
d0209094a9 Remove unused variable in EditWeeklyReport component 2024-03-20 22:10:53 +01:00
Davenludd
f91f0ff8f5 Merge branch 'dev' into gruppDM 2024-03-20 22:05:04 +01:00
Imbus
b00ce7a0ed Typescript type regeneration 2024-03-20 22:04:36 +01:00
al8763be
70cf40feb5 fixed getWeeklyReport 2024-03-20 22:02:34 +01:00
Davenludd
900797facc Fix initial state values and handle empty input values in NewWeeklyReport component 2024-03-20 21:53:27 +01:00
Davenludd
b9b17bf229 Merge branch 'dev' into gruppDM 2024-03-20 21:21:59 +01:00
al8763be
69d07624ce Merge remote-tracking branch 'origin/dev' into BumBranch 2024-03-20 20:55:53 +01:00
Johanna
ae77bcf0bb Added comments to TypeScript API, merge 2024-03-20 20:44:11 +01:00
al8763be
a9e515925e getWeeklyReportsForUser fixed 2024-03-20 20:24:56 +01:00
Peter KW
e4a0246b84 Merge branch 'frontend' into gruppPP 2024-03-20 18:41:01 +01:00
Peter KW
9b30b82237 Gets all project members and displays them properly now 2024-03-20 18:38:37 +01:00
Peter KW
bca12151b7 Added new type to match fetch for project members 2024-03-20 18:36:45 +01:00
Peter KW
8250c92694 Fixed so that it uses new type 2024-03-20 18:36:10 +01:00
Peter KW
d1be752ac3 getAllUsersProject uses new type 2024-03-20 18:35:02 +01:00
Imbus
0017e9b9ef Fixing error in ts API, fixing AllTimeReportsInProject 2024-03-20 17:31:59 +01:00
Davenludd
bf59503517 Update background images in LoginPage.css 2024-03-20 17:24:54 +01:00
Imbus
933191b076 Generate typescript types 2024-03-20 17:20:47 +01:00
Imbus
b405b44460 Merge frontend -> dev 2024-03-20 17:19:09 +01:00
Imbus
d19372d66b Frontend API interface fixed (untested) for getWeeklyReportsForUser 2024-03-20 17:10:11 +01:00
Peter KW
cd452459c2 getAllUsersProject API, fetches all users in a project 2024-03-20 17:02:36 +01:00
Peter KW
056ca3660d GetUsersInProject component 2024-03-20 16:59:54 +01:00
Imbus
49e3542dce Merge branch 'BumBranch' into dev 2024-03-20 16:49:59 +01:00
Davenludd
e4f5fbda44 Fix useEffect dependency in AllTimeReportsInProject component 2024-03-20 16:46:44 +01:00
Mattias
b99de71c38 Update links in PMProjectMembers component 2024-03-20 16:41:32 +01:00
Mattias
0befc4c7d1 Minor fix 2024-03-20 16:36:39 +01:00
Mattias
a3fc71f4bf Changed path in main 2024-03-20 16:36:32 +01:00
Mattias
4030031ce9 New comp TimePerActivity 2024-03-20 16:36:24 +01:00
Mattias
dd02c2c5c6 Brand new TimePerRole component deluxe edition 2024-03-20 16:24:38 +01:00
Mattias
287e97fe6f Updated path in main 2024-03-20 16:24:10 +01:00
pavel Hamawand
75e835895a minor fix 2024-03-20 15:48:45 +01:00
pavel Hamawand
d94f21ab67 minor fix 2024-03-20 15:47:34 +01:00
pavel Hamawand
ebb009bd20 BackButton 2024-03-20 15:33:56 +01:00
pavel Hamawand
32d9cc4684 backButton 2024-03-20 15:33:26 +01:00
pavel Hamawand
d3938f76e1 backButton 2024-03-20 15:32:40 +01:00
Davenludd
8084f722b5 Fixies in API and component code 2024-03-20 15:32:30 +01:00
Davenludd
caa793d036 Fix week validation in NewWeeklyReport component for safari and firefox 2024-03-20 15:32:14 +01:00
pavel Hamawand
196446be1f Backbutton 2024-03-20 15:31:18 +01:00
pavel Hamawand
0076a9f4bb backButton 2024-03-20 15:30:16 +01:00
Davenludd
847073c6f8 Merge branch 'BumBranch' into gruppDM 2024-03-20 15:21:26 +01:00
Davenludd
54e42cd2a8 Add support for week input in Chrome and Edge browsers 2024-03-20 15:19:09 +01:00
al8763be
af5813681d Jag avskyr denna handlern 2024-03-20 15:17:00 +01:00
al8763be
771118f85e Update API.ts 2024-03-20 15:13:00 +01:00
Imbus
a84c2c6129 Rename GetWeeklyReportsForProject -> GetWeeklyReportsForUser 2024-03-20 14:54:22 +01:00
Davenludd
eddf678f3a Merge branch 'BumBranch' into gruppDM 2024-03-20 14:48:32 +01:00
Mattias
14b68e4463 Formatting 2024-03-20 14:20:09 +01:00
Mattias
47ce986834 Minor fixes 2024-03-20 14:17:33 +01:00
Davenludd
0fb06790af Fix useEffect dependency array in ProjectMembers component 2024-03-20 14:09:16 +01:00
Davenludd
89cb3d23b7 Fix missing comma in getWeeklyReportsForProject function signature 2024-03-20 14:07:12 +01:00
Davenludd
adf9500bbf Fix useEffect dependency in AllTimeReportsInProject component 2024-03-20 14:06:54 +01:00
al8763be
74e1347162 Changed error message 2024-03-20 14:02:34 +01:00
Davenludd
4574af25cb Merge branch 'BumBranch' into gruppDM 2024-03-20 14:02:11 +01:00
al8763be
d41bfcf888 Fix for getWeeklyReportsForUser 2024-03-20 14:00:00 +01:00
Davenludd
29d893362c Docs/Comments to user project menu component 2024-03-20 13:57:02 +01:00
Davenludd
c7c38d4201 Docs/Comments to registration form component 2024-03-20 13:57:02 +01:00
Davenludd
d9068949cd Docs/Comments to new weekly report form component 2024-03-20 13:57:02 +01:00
Davenludd
7e7dbe2cc7 Docs/Comments to header component 2024-03-20 13:57:02 +01:00
Davenludd
cf6c8cd34c Docs/Comments to Footer component 2024-03-20 13:57:02 +01:00
Davenludd
dbeeb609b3 Docs/Comments to GetWeeklyReport component 2024-03-20 13:57:02 +01:00
Davenludd
aa5c4017bb Docs/Comments to DisplayUserProjects component 2024-03-20 13:57:02 +01:00
Davenludd
4212dae5bf Delete CountButton component 2024-03-20 13:57:02 +01:00
Davenludd
bd27b549aa Add JSDoc comments to Button component 2024-03-20 13:57:02 +01:00
Davenludd
af92f4faee Docs/Comments to BasicWindow component 2024-03-20 13:57:02 +01:00
Davenludd
2dffffde50 Docs/coments to background animation component 2024-03-20 13:57:02 +01:00
Davenludd
c0e03d7d0d Doc/Comments to BackButton comp 2024-03-20 13:57:02 +01:00
Davenludd
ff4ea47846 Doc/Comments in AllTimeReportsInProject component 2024-03-20 13:57:02 +01:00
Mattias
d3bb6f49e5 New comp changeRoles 2024-03-20 13:51:49 +01:00
Mattias
1b21b2574a Comp for displaying projectmembers and changed path in main 2024-03-20 12:36:30 +01:00
Peter KW
33b269e0c9 Now uses GetProjects 2024-03-20 12:25:59 +01:00
Peter KW
cea2b6c03c GetProjects compo 2024-03-20 12:25:07 +01:00
Peter KW
6317c7674c Now uses projectListAdmin to show projects 2024-03-20 11:53:27 +01:00
Peter KW
e271794b57 List for showing all projects as admin 2024-03-20 11:51:50 +01:00
Peter KW
a5adec82e2 Modul for showing projectinfo *not finished* 2024-03-20 11:51:04 +01:00
Davenludd
7ed9398bcb Merge branch 'frontend' into gruppDM 2024-03-20 11:19:02 +01:00
Davenludd
033268f4ef Added info to component 2024-03-20 08:47:11 +01:00
Peter KW
4e100229f5 Now uses GetAllUsers 2024-03-20 00:16:56 +01:00
Peter KW
b20817ec8a Small fix to props and imports 2024-03-20 00:16:30 +01:00
Peter KW
cc231dbfaa Component for getting all users 2024-03-20 00:14:23 +01:00
Peter KW
8300fb3a6f Added getAllUsers to API 2024-03-20 00:10:24 +01:00
Davenludd
b5d3ab7cb7 Refactor AllTimeReportsInProject component to use API for fetching weekly reports 2024-03-19 23:44:44 +01:00
Davenludd
863a14c316 Add WeeklyReport type and update getWeeklyReportsForProject method 2024-03-19 23:44:44 +01:00
Mattias
ffaa661628 Minor fix 2024-03-19 22:51:54 +01:00
Mattias
900c1614e9 minor fix 2024-03-19 22:50:57 +01:00
Mattias
cd2a81e7f2 Added unauthorizedpage and path in main 2024-03-19 22:50:40 +01:00
Mattias
cc9678f375 Created component for authorized route 2024-03-19 22:50:23 +01:00
Mattias
fe89ae0970 Added backbutton 2024-03-19 22:13:06 +01:00
Johanna
1974607fc7 Formating 2024-03-19 22:04:20 +01:00
Mattias
55a2dc7fac Add PMProjectMenu component and refactor PMProjectPage 2024-03-19 22:03:45 +01:00
Mattias
d355b55634 Add UserProjectMenu component and refactor UserProjectPage 2024-03-19 21:59:37 +01:00
Davenludd
08a0ebb533 Merge branch 'BumBranch' into gruppDM 2024-03-19 21:51:07 +01:00
Johanna
63fd2e9b6f //fix parse in NewWeeklyReport 2024-03-19 21:47:16 +01:00
Mattias
dc6ce4b725 Additional minor fix 2024-03-19 21:31:20 +01:00
Mattias
05b9740c36 Fixed links and changed path in main for pm 2024-03-19 21:29:37 +01:00
Mattias
3fea87a88a New component for displaying userprojects 2024-03-19 21:22:49 +01:00
al8763be
0b6edd359e Bumfix for BumCode on checkIfProjectManager 2024-03-19 20:29:36 +01:00
al8763be
e48bf5d98c Added checkIfProjectManager, hope it works 2024-03-19 20:25:26 +01:00
al8763be
74285dc1cf Before fuck up 2024-03-19 19:45:56 +01:00
Peter KW
a72aea1382 Removed unused authority check 2024-03-19 17:12:38 +01:00
Peter KW
cd84a2bb21 Everyone except admin has authority = 2 2024-03-19 17:12:09 +01:00
Peter KW
8dfe9dac96 Removed unused path 2024-03-19 17:09:45 +01:00
Davenludd
4568d68746 Merge branch 'frontend' into gruppDM 2024-03-19 17:02:50 +01:00
Peter KW
4bcbf162f9 Merge branch 'frontend' into gruppPP 2024-03-19 17:00:04 +01:00
Imbus
9c4ce0e733 Merge branch 'dev' into frontend 2024-03-19 16:57:49 +01:00
Imbus
2f3730ca90 New typescript types from tygo 2024-03-19 16:50:16 +01:00
Mattias
5803c7b29b Refactor fetchWeeklyReport function, updated submit button text, week fetched by params 2024-03-19 11:41:50 +01:00
Davenludd
d0d0e311e5 Add project name to UserViewTimeReportsPage and add AllTimeReportsInProject component 2024-03-19 11:10:47 +01:00
Davenludd
03819aff44 Update link to time reports in UserProjectPage 2024-03-19 11:10:02 +01:00
Davenludd
7fd128e1f3 Add AllTimeReportsInProject component 2024-03-19 11:09:52 +01:00
Davenludd
09a7cbced1 Update routes in main.tsx 2024-03-19 11:09:35 +01:00
Davenludd
ee2fb6d543 Minor change UserProjectPage 2024-03-19 09:41:24 +01:00
Davenludd
a30a6a4988 Fix button UserNewTimeReportPage 2024-03-19 09:37:13 +01:00
Mattias
cda2b72d08 projectName is now fetched from params 2024-03-19 09:35:15 +01:00
Davenludd
4f53f9de94 Fix initial value of week state in NewWeeklyReport component for error message 2024-03-19 09:33:20 +01:00
Davenludd
53f468d7c8 Update navigation in EditWeeklyReport component 2024-03-19 09:23:09 +01:00
Davenludd
d775a6e381 Update navigation in NewWeeklyReport component 2024-03-19 09:21:33 +01:00
Davenludd
08532444f0 Cleanup YourProjectsPage 2024-03-19 09:14:30 +01:00
al8763be
3df9ddcd4b Merge remote-tracking branch 'origin/gruppPP' into frontend 2024-03-19 03:44:02 +01:00
pavel Hamawand
cbb62438c8 implementing AdminChangeUsername 2024-03-19 03:40:17 +01:00
pavel Hamawand
8b7ad8911b implementing ChangeUser 2024-03-19 03:39:05 +01:00
pavel Hamawand
4df8d3f858 new component 2024-03-19 03:22:54 +01:00
pavel Hamawand
52aecd14d4 minor fix 2024-03-19 03:14:14 +01:00
al8763be
e3fd9f52ca Merge branch 'gruppPP' into BumBranch 2024-03-19 02:12:37 +01:00
al8763be
8081f289b5 fixed NewWeeklyReport 2024-03-19 02:11:47 +01:00
Peter KW
cdbd6ca0ce Small fixes to design 2024-03-19 01:48:01 +01:00
pavel Hamawand
6a84b1c14d fix backbutton 2024-03-19 01:03:38 +01:00
pavel Hamawand
c072aff9da added change username button 2024-03-19 01:02:39 +01:00
Davenludd
b8c69fabf5 Remove unused variable and update API call in YourProjectsPage.tsx 2024-03-19 00:35:27 +01:00
pavel Hamawand
d2a8399bde minor fix 2024-03-19 00:35:15 +01:00
Peter KW
b3dfbc47a4 Merge branch 'frontend' into gruppPP 2024-03-19 00:33:30 +01:00
Davenludd
17c30f5dd9 Merge branch 'frontend' into gruppDM 2024-03-19 00:28:12 +01:00
al8763be
d7e14f1886 quick fix for getUserProjects API 2024-03-19 00:27:35 +01:00
al8763be
59c4dab2e2 quick fix for getUserProjects API 2024-03-19 00:26:17 +01:00
Peter KW
d2ff2428cd Some corrections 2024-03-19 00:26:05 +01:00
Peter KW
36524e5cbb Changed so that it makes a modal for each user instead of a link 2024-03-19 00:25:37 +01:00
Davenludd
a2bc13ec22 Merge branch 'frontend' into gruppDM 2024-03-19 00:20:43 +01:00
al8763be
83f8097c2b API getUserProjects Fucked 2024-03-19 00:20:08 +01:00
Peter KW
a0759b099a Modul for viewing user info in admin manage users page 2024-03-19 00:17:29 +01:00
Peter KW
db4f869712 Delete user component 2024-03-19 00:15:42 +01:00
Davenludd
ff9eba039f Minor fixes YourProjectsPage 2024-03-18 23:36:59 +01:00
Davenludd
cc09eb0ead Remove duplicate import statements 2024-03-18 23:01:30 +01:00
Davenludd
8df3311f5a Remove duplicate code in UserProjectPage 2024-03-18 22:59:16 +01:00
Davenludd
f5a4c3d0e5 Merge branch 'frontend' into gruppDM 2024-03-18 22:05:50 +01:00
Davenludd
55fd42090d Remove username prop from BasicWindow component on all pages 2024-03-18 22:00:58 +01:00
Davenludd
5a4049eaf3 Remove username prop from BasicWindow component 2024-03-18 21:56:37 +01:00
Davenludd
59add3b6b3 Remove username prop from BasicWindow component 2024-03-18 21:55:47 +01:00
Davenludd
6982d21016 Add project name to URL in UserProjectPage 2024-03-18 21:55:15 +01:00
Davenludd
f16dc1722c Update project name in YourProjectsPage.tsx URL 2024-03-18 21:53:16 +01:00
Davenludd
31c5a78dae Refactor routing paths in main.tsx 2024-03-18 21:52:34 +01:00
Davenludd
93addc9870 Fixes in NewWeeklyReport component 2024-03-18 21:40:07 +01:00
Davenludd
847180cf75 Update user navigation route 2024-03-18 21:37:52 +01:00
Davenludd
b9d7e57f2c Update background image in Header component 2024-03-18 21:37:31 +01:00
Davenludd
25713443e2 Remove username prop from BasicWindow component 2024-03-18 21:33:20 +01:00
Imbus
e0de61dd94 Type fixes in frontend, Register & YourProjectsPage 2024-03-18 21:24:26 +01:00
al8763be
8eb23bf7f9 lint bro happ + test for getUserProject 2024-03-18 21:08:33 +01:00
Davenludd
d64ec708a1 Minor fixes 2024-03-18 19:37:37 +01:00
Davenludd
3e9dc87100 Add NotFoundPage to handle 404 errors 2024-03-18 19:36:28 +01:00
Davenludd
a2ad2913e4 Add NotFoundPage component 2024-03-18 19:34:15 +01:00
Peter KW
83e781c877 Fixed getting the username and removed comment 2024-03-18 18:31:58 +01:00
al8763be
4392b68397 Removed duplicate getUserProjects 2024-03-18 17:40:53 +01:00
Davenludd
531e9a0535 Fix links in UserProjectPage component 2024-03-18 17:38:45 +01:00
al8763be
d0cc6f2c1b Merge remote-tracking branch 'origin/dev' into BumBranch 2024-03-18 17:35:19 +01:00
Peter KW
d692165f99 Removed username prop from basicwindow in all pages 2024-03-18 17:27:32 +01:00
Peter KW
388a430613 Tiny fix 2024-03-18 17:22:40 +01:00
Peter KW
2493932f77 Removed username prop, no longer used 2024-03-18 17:20:29 +01:00
pavel Hamawand
b93ef48500 minor fix 2024-03-18 17:07:48 +01:00
pavel Hamawand
0f7f866cde minor fix 2024-03-18 17:06:05 +01:00
pavel Hamawand
3ec0d168eb minor fix 2024-03-18 17:05:37 +01:00
pavel Hamawand
e47b251c14 implement component 2024-03-18 17:03:02 +01:00
pavel Hamawand
39983c7f6f Render Project List 2024-03-18 17:01:11 +01:00
pavel Hamawand
f61ef87d5e Fetch Projects from API - needs fixing 2024-03-18 16:58:46 +01:00
pavel Hamawand
90afe80408 Implement State management 2024-03-18 16:54:16 +01:00
pavel Hamawand
4173003d32 initial component Setup 2024-03-18 16:53:13 +01:00
pavel Hamawand
b8f669e454 new component UserProjectListAdmin 2024-03-18 16:52:40 +01:00
pavel Hamawand
22b9580f51 fix backbutton 2024-03-18 16:52:40 +01:00
pavel Hamawand
8291f4caf3 delete component 2024-03-18 16:52:40 +01:00
pavel Hamawand
576a137038 new component 2024-03-18 16:52:40 +01:00
Peter KW
ace11570a5 Merge branch 'gruppDM' into gruppPP 2024-03-18 16:49:02 +01:00
Peter KW
2bd9878359 Merge branch 'frontend' into gruppPP 2024-03-18 16:44:13 +01:00
Imbus
0c2617d0cb Full fix for getProject route, testing, integration testing and frontend-API code 2024-03-18 16:42:35 +01:00
Mattias
437520183b removed import 2024-03-18 15:46:49 +01:00
Mattias
b962a856f4 fixes 2024-03-18 15:46:23 +01:00
Mattias
3bcb7a89b8 edited paths 2024-03-18 15:39:29 +01:00
Mattias
43f13dc534 Old paths in main are back 2024-03-18 15:33:19 +01:00
Mattias
1893340c63 Changed name of new component and minor fix 2024-03-18 15:17:53 +01:00
Mattias
3106e0f445 Fixes for viewing-report-component 2024-03-18 14:46:32 +01:00
al8763be
d6ce4a3c57 errMessage fixed 2024-03-18 14:43:28 +01:00
Mattias
b82f73d192 Removed button 2024-03-18 14:42:21 +01:00
Mattias
0634f83689 Now displaying the right component 2024-03-18 14:40:32 +01:00
Mattias
69d4067209 Added new component for viewing weeklyreport 2024-03-18 14:40:20 +01:00
pavel Hamawand
409d973d8a minor fix 2024-03-18 14:35:56 +01:00
Davenludd
3f8d56963b Add ProjectNameContext to NewWeeklyReport and handle project selection in YourProjectsPage 2024-03-18 12:49:58 +01:00
Davenludd
164ff781b3 Add useEffect hook to handle authority navigation and log response in YourProjectsPage 2024-03-18 10:44:15 +01:00
Davenludd
f6b2d17b97 Update Header component to use localStorage for username 2024-03-18 10:44:15 +01:00
Mattias
7a6b875aeb Token is now fetched from local storage 2024-03-18 10:28:20 +01:00
Davenludd
68b25350ef Add username to local storage and retrieve it in YourProjectsPage 2024-03-18 10:22:38 +01:00
Davenludd
3c8b7f9da2 Merge branch 'gruppPP' into gruppDM 2024-03-18 10:10:40 +01:00