Commit graph

360 commits

Author SHA1 Message Date
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
Davenludd
5bef01396b Add user-specific project list and API integration 2024-03-18 10:09:12 +01:00
Mattias
711f46f960 fixed import 2024-03-18 09:56:07 +01:00
Davenludd
ba58fea1e3 Merge branch 'frontend' into gruppDM 2024-03-18 09:01:05 +01:00
Peter KW
92119dd49e Added path + fixed import 2024-03-18 01:56:04 +01:00
Peter KW
8a2152395f Small fixes 2024-03-18 01:31:58 +01:00
Peter KW
516784c6bb Merge branch 'frontend' into gruppPP 2024-03-18 00:51:34 +01:00
Peter KW
4876038613 Merge remote-tracking branch 'origin/frontend' into gruppPP 2024-03-18 00:48:21 +01:00
Peter KW
f7b8ea7d97 Path fix 2024-03-18 00:46:04 +01:00
Peter KW
bd588048dd Import fix 2024-03-18 00:45:49 +01:00
Peter KW
070e9cc1e5 Link to button 2024-03-18 00:45:22 +01:00
Peter KW
844e94ed26 Small fixes to layout and added 2024-03-18 00:44:56 +01:00
Peter KW
0044b61ac8 Uses input field component instead now 2024-03-18 00:44:11 +01:00
Peter KW
3b49faec2d Import fix 2024-03-18 00:42:22 +01:00
Peter KW
8249678488 Using local storage for token 2024-03-18 00:42:05 +01:00
Peter KW
24e7e68ea0 Logout functionality 2024-03-18 00:41:46 +01:00
Peter KW
200da51633 AddProject component 2024-03-18 00:41:18 +01:00
Peter KW
d97516e0cd Added some paths again 2024-03-18 00:40:42 +01:00
al8763be
953c06212d API Changes 2024-03-18 00:22:32 +01:00
al8763be
7cc74866fc Merge branch 'dev' into frontend 2024-03-18 00:13:04 +01:00
al8763be
b45a20c9f5 Merge branch 'dev' into frontend 2024-03-18 00:06:20 +01:00
al8763be
ff6af1d250 Merge branch 'dev' into BumBranch 2024-03-17 23:11:49 +01:00
Imbus
e012b6ff12 Error checking in register component, redirect to login if success 2024-03-17 22:48:38 +01:00
al8763be
c3ce25236f Full implementation of getWeeklyProject 2024-03-17 22:35:51 +01:00
al8763be
6823102b44 Deleted API test 2024-03-17 22:27:21 +01:00
al8763be
7339a69bce getWeeklyReport 2024-03-17 22:20:34 +01:00
Davenludd
ead1482e50 Merge branch 'frontend' into gruppDM 2024-03-17 21:39:19 +01:00
Davenludd
07aaab5530 Merge branch 'frontend' into gruppDM 2024-03-17 21:22:10 +01:00
al8763be
447f2b73eb Merge branch 'gruppPP' into BumBranch 2024-03-17 19:42:01 +01:00
Peter KW
888256e9f6 Changed logincheck type and error clarification 2024-03-17 19:38:51 +01:00
al8763be
402b0ac08b Update API.test.ts 2024-03-17 19:28:03 +01:00
Peter KW
1977125923 Now exporting APIResponse interface 2024-03-17 19:18:03 +01:00
Peter KW
b999e47f94 Changes to handlesubmit 2024-03-17 19:17:34 +01:00
Peter KW
e7e79ced13 Now checks if user is in database with api.login and sets proper authority level based on name for now 2024-03-17 19:16:57 +01:00
Imbus
eae252c2a4 Merge branch 'frontend' of github.com:imbus64/TTime into frontend 2024-03-17 19:07:55 +01:00
Imbus
30cf0b6065 Making linter bro happy 2024-03-17 19:07:49 +01:00
al8763be
14668ea675 Test file for API 2024-03-17 19:05:39 +01:00
Mattias
17a081e816 minor fixes 2024-03-17 16:55:51 +01:00
Mattias
81893ae3e8 Minor fixes 2024-03-17 16:24:09 +01:00
Davenludd
9dd47f3d71 Update import paths for Types 2024-03-17 16:23:37 +01:00
pavel Hamawand
141e5c8bb6 minor fix 2024-03-17 16:21:36 +01:00
Davenludd
2ba10e837a Refactor API.ts to handle error response in submitWeeklyReport 2024-03-17 16:14:50 +01:00
al8763be
d57fe55074 Changes to SubmitWeeklyReport 2024-03-17 16:11:03 +01:00
Peter KW
b7fcafd75c Merge branch 'frontend' into gruppPP 2024-03-17 15:54:06 +01:00
Davenludd
830c234325 Update login response type in API.ts 2024-03-17 15:50:50 +01:00
al8763be
386f7c3a94 API Login return { success: true, data: data.token } 2024-03-17 15:49:34 +01:00
al8763be
d11e5e64f6 API Login return { success: true, data } data as JSON with token 2024-03-17 15:41:23 +01:00
Peter KW
060dc1ee3d Merge branch 'frontend' into gruppPP 2024-03-17 15:39:16 +01:00
Davenludd
c708ec47ca Merge branch 'frontend' into gruppDM 2024-03-17 15:36:41 +01:00
al8763be
a28bab459a API login returns { success: true, data: token } 2024-03-17 15:36:39 +01:00
al8763be
9511d509ca API imports fixed 2024-03-17 15:31:15 +01:00
Davenludd
b1f57e5ed8 Merge branch 'frontend' into gruppDM 2024-03-17 15:28:20 +01:00
al8763be
f5787fbc2e correct routes in main 2024-03-17 15:23:21 +01:00
al8763be
179a5196e9 Merge branch 'BumBranch' into frontend 2024-03-17 15:10:19 +01:00
al8763be
5327ac7ad1 lint + login function for API 2024-03-17 15:03:34 +01:00
Imbus
ff00b984fe Formatting and typing to make linter happy v2 2024-03-17 14:52:13 +01:00
Davenludd
6d5c25be5c Refactor Register component to use InputField component 2024-03-17 14:49:42 +01:00
Mattias
d6d2b6d170 Visual fixes 2024-03-17 14:49:42 +01:00
Imbus
cab7c3bdfd Formatting and typing to make linter happy 2024-03-17 14:44:25 +01:00
al8763be
2eecf17d42 Login feature API 2024-03-17 14:43:09 +01:00
Davenludd
46eebee84f Refactor API.ts for improved readability and maintainability 2024-03-17 14:21:38 +01:00
Mattias
f3931f905a Minor changes 2024-03-17 14:19:57 +01:00
pavel Hamawand
79eb59ad46 button fix 2024-03-17 14:13:35 +01:00
Mattias
62f1926305 Corrected NewWeeklyReport (prev. TimeReports) and changed imports 2024-03-17 13:39:16 +01:00
Peter KW
9bab627255 Change typ on button to submit 2024-03-17 12:57:18 +01:00
al8763be
8d0da111eb API - SubmitWeeklyReport & getUserProjects added 2024-03-17 12:35:53 +01:00
Peter KW
b6535c883d Small fix 2024-03-17 11:34:39 +01:00
Peter KW
3e73b11698 Merge branch 'frontend' into gruppPP 2024-03-17 11:02:44 +01:00
al8763be
d6d4eb3336 Merge branch 'master' into gruppDM 2024-03-17 10:51:23 +01:00
Peter KW
5e0b96ed87 Merge branch 'frontend' into gruppPP 2024-03-17 10:43:49 +01:00
Peter KW
8cf873a98b Changed so that most functionality was moved to separate components 2024-03-17 10:39:57 +01:00
Peter KW
15ec2108d3 Everything run from this file 2024-03-17 10:38:25 +01:00
Peter KW
02332c284b Login field component 2024-03-17 10:36:29 +01:00
Peter KW
94f5d3f85b Component for checking login, to be replaced with proper fetching 2024-03-17 10:35:48 +01:00
Peter KW
217b7b4a22 Input field component 2024-03-17 10:34:47 +01:00
Peter KW
2921458d82 Made backround animation on login page to its own component 2024-03-17 10:34:15 +01:00
Peter KW
c12e19770e Restructuring, less paths 2024-03-17 10:33:37 +01:00
Imbus
887f31dde0 goTypes generated from go code with tygo 2024-03-17 04:23:26 +01:00
Davenludd
d58720cdbd Refactor Register component to use InputField component 2024-03-16 18:38:42 +01:00
Mattias
92a4808cdd Created new type for timereport 2024-03-16 18:38:42 +01:00
Mattias
f3c5ce57eb Submit-button has been moved to the timereport 2024-03-16 18:38:42 +01:00
Mattias
3419898c66 Created groundwork for the timereport 2024-03-16 18:38:42 +01:00
Mattias
aae05acedb Added the register component to content 2024-03-16 18:38:42 +01:00
Mattias
a225020f6f Visual fixes 2024-03-16 18:38:42 +01:00
Mattias
2ce480707a Removed duplicate path 2024-03-16 18:38:42 +01:00
pavel Hamawand
17edf6b911 backButton 2024-03-16 18:01:14 +01:00
pavel Hamawand
31e3b99448 backbutton 2024-03-16 18:00:10 +01:00
pavel Hamawand
38378c7a10 babkbutton 2024-03-16 17:59:25 +01:00
pavel Hamawand
92336ff4fd backbutton 2024-03-16 17:58:27 +01:00
pavel Hamawand
17e9fa9d0a backbutton 2024-03-16 17:57:51 +01:00
pavel Hamawand
bdd6f68470 Time / role link 2024-03-16 17:56:59 +01:00
pavel Hamawand
9aa5087871 time / activity link 2024-03-16 17:54:34 +01:00
pavel Hamawand
8164ba9040 fix back button 2024-03-16 17:50:15 +01:00
pavel Hamawand
49305d507f link to projectMembers 2024-03-16 17:48:23 +01:00