59 Commits

Author SHA1 Message Date
Chris Sanden
e18fc525cf added logout button to guided setup screens 2026-05-06 20:32:19 +02:00
Chris Sanden
f2312bce38 removed automatic change for subject to inactive if all assignments are completed 2026-05-06 17:01:05 +02:00
Chris Sanden
66efbecf2f changed sequence of completion logic 2026-05-05 21:54:32 +02:00
Chris Sanden
ac6bfa1022 don't ask me how, but it works 2026-05-05 20:58:03 +02:00
Chris Sanden
27d04b2a3b Merge branch 'main' into timerTask 2026-05-05 20:34:58 +02:00
Chris Sanden
2f8a770c2a added tab icons 2026-05-05 20:13:05 +02:00
Chris Sanden
5035ced7af updated help modals 2026-05-05 18:08:55 +02:00
Chris Sanden
9bb3bb1163 polished and finalised onboarding flow 2026-05-05 17:36:34 +02:00
Chris Sanden
2bb2ac63a0 loads of polish and bug fixes 2026-05-05 15:41:44 +02:00
Teodor Salvesen
e5982c2eb3 Merge branch 'main' into tailwind 2026-05-05 14:31:02 +02:00
Teodor Salvesen
68f520b99e Merge pull request #6 from Fhj0607/tests
Tests
2026-05-05 14:25:27 +02:00
Chris Sanden
a4f99a50d0 trying to get this shit finished 2026-05-05 13:51:59 +02:00
Chris Sanden
245b6db3fd reworked the timer flow, set a default timer duration, updated help button modal and more 2026-05-04 17:19:59 +02:00
Chris Sanden
907fa18841 'some' changes 2026-05-03 23:05:22 +02:00
Chris Sanden
31d3cbfba6 fixded bug where active sprint would stop upcoming tasks from showing on dashboard 2026-05-02 20:05:22 +02:00
Chris Sanden
219d599617 added help button and improved dashboard styling to be in line with the rest of the project 2026-05-02 20:01:40 +02:00
Chris Sanden
b437643475 added total time spent functionality for tasks and updated dashboard to display upcoming, uncompleted tasks sorted by date ascending 2026-05-02 17:44:11 +02:00
Chris Sanden
c74062c84c Implemented timer into task details, uploaded example images for app and centred headers on all screens 2026-05-01 21:37:58 +02:00
Chris Sanden
cd4d2056b0 Merge pull request #5 from Fhj0607/timerTask
Small comment addition
2026-05-01 14:04:27 +02:00
Fhj0607
ae613f8707 redesigned completion and reopening subjects/assignments/tasks and how it is rendered 2026-05-01 12:36:58 +02:00
Fhj0607
e3c0b286b8 Assignment Progress now only renders when the subject has one or more assignments 2026-05-01 12:08:19 +02:00
Fhj0607
efb2e11893 Task Progress bar now only renders when totalTasks > 0 2026-05-01 12:06:15 +02:00
Fhj0607
7e33500fad subjects now loads instead of showing errors, before rendering db items 2026-05-01 12:04:44 +02:00
Teodor
3dcd392cd3 Adjusted crud tests + added auth tests 2026-04-30 22:21:56 +02:00
Teodor
545027a766 Merge branch 'main' of github.com:Fhj0607/Study-Sprint 2026-04-30 17:16:33 +02:00
Fhj0607
2f483b8ef9 refactor create/editTask into one upsertTask page, and remove all remaining console.log and debugging helpers 2026-04-30 11:34:26 +02:00
Fhj0607
152a91718a Merge branch 'tailwind' 2026-04-30 11:24:50 +02:00
Fhj0607
6f5158ff41 app now correctly handles the hierarchy subject -> assignment -> task. Implemented consistent styling and coloring on all three levels and correctly configured expo routing 2026-04-30 11:23:41 +02:00
Fhj0607
67c625f42c add date.ts for global formatting, remove redundant pill completed : in progress from viewAssignmentDetails.tsx 2026-04-29 11:37:27 +02:00
Fhj0607
473eb0efbb fetch color and title together as subjectMeta 2026-04-29 11:29:40 +02:00
Fhj0607
4205961542 show current subject inside assignment details page as a pill 2026-04-29 11:27:30 +02:00
Fhj0607
c46508d233 implement x out of y progress text 2026-04-29 11:06:20 +02:00
Fhj0607
e8f7f45f11 createSubject and editSubject removed, upsertSubject added. Tasks and assignments removed from top-level tabs and now only accessible through Subjects -> Assignments -> Tasks. More styling in general. 2026-04-27 16:30:43 +02:00
Teodor
d7dc3cc72f crud tests for subjects, assignments and tasks 2026-04-25 23:32:11 +02:00
Chris Sanden
9e145d4d8f wrote proposal for fetching timer after app has been exited / closed 2026-04-25 17:22:55 +02:00
Fhj0607
9b3069153d Merge branch 'tailwind' 2026-04-25 15:57:26 +02:00
Chris Sanden
a27c949a27 Merge branch 'main' into timer 2026-04-25 15:49:06 +02:00
Chris Sanden
666bdc1942 timer complete - ready for implementation 2026-04-25 15:43:31 +02:00
Chris Sanden
c68aeba709 reverting to chase a bug w expo 2026-04-24 22:48:43 +02:00
Chris Sanden
b191a1eced implemented last few features and refactored for readability 2026-04-24 22:31:01 +02:00
Chris Sanden
0aa0c18bb5 removed unnecessary animation dependency 2026-04-23 21:58:59 +02:00
Chris Sanden
fbc26ff9dd timer basically feature-complete. polish remains 2026-04-23 21:57:52 +02:00
Chris Sanden
5e93dc06c9 Implemented cancel button for timer 2026-04-23 16:09:24 +02:00
Teodor
9f214a9451 Fixed issues with assignment progress tracking + added subject progress tracking 2026-04-23 04:37:34 +02:00
Teodor
a35353f45b Added progress bar for assignments (UI fix needed) 2026-04-23 03:27:26 +02:00
Teodor
4947d012c0 Notifications + AsyncStorage 2026-04-22 20:58:00 +02:00
Chris Sanden
1879c7c1f7 Added placeholder task info and made some UI/UX improvements 2026-04-22 20:41:19 +02:00
Chris Sanden
b7d62637e6 Fixed bug where timer would count space below nav bar as 'usable' space 2026-04-22 19:12:34 +02:00
Teodor
cb6368a068 Fixed some UI issues and routing issues 2026-04-22 15:53:30 +02:00
Fhj0607
88c450a7cb restyle subject, assignment, and task screens with card layouts, consistent inputs, custom theme classes. replaced buttons with pressables and fixed some saving issues 2026-04-22 12:43:50 +02:00