Commit Graph
100 Commits
Author SHA1 Message Date
Dejan f7860a5af8 - Fixed issue with parents not being able to approve groceries 2024-12-16 23:39:32 +01:00
Dejan 8c28f049f7 - Changed number of weeks when creating recurring todo 2024-12-16 23:20:10 +01:00
Dejan 0733c25892 Merge remote-tracking branch 'origin/dev' into dev 2024-12-15 22:44:43 +01:00
Dejan 335905335e -Fixed create todo issues 2024-12-15 22:44:33 +01:00
Dejan b59a8bf97d Merge remote-tracking branch 'origin/dev' into dev 2024-12-15 17:05:30 +01:00
Dejan 5cafd10f09 - Changed the members dependency check when defining the todo filter options 2024-12-15 17:05:18 +01:00
Dejan 4f96bb071b - Added validation on todo creation to avoid creating todos with Every week repeat type, but no selected days
- Reworked and improved the creation of repeat todo
2024-12-15 15:31:55 +01:00
Dejan d30ed9b130 - Fixed issue with todo filter not being updated after adding deleting users 2024-12-15 11:51:23 +01:00
Dejan f382d403cd - Removed background color of the grocery items text for number of items 2024-12-08 14:06:19 +01:00
Dejan 1c2f18e288 - Grocery list changes
- Removed the Add item button from the bottom and added an empty grocery box
2024-12-08 14:01:35 +01:00
Dejan 47a0ea2f36 - Added Done category in the grocery list and pushed it to the bottom 2024-12-08 13:38:27 +01:00
Dejan 12f1a51292 - Added delete button on the checked grocery items 2024-12-08 13:15:06 +01:00
Dejan ecee34bf26 - Added functionality to the add todo button in the groceries page to open a todo dialog with preselected title 2024-12-08 13:05:09 +01:00
Dejan 89bb924b40 - Fixed issue with date resetting every time a repeat type is selected
- Showing take turns button when todo has repeat rule and has more than 1 assignee
2024-12-08 12:00:42 +01:00
Dejan 11115d151d - Filtered out the Family device user type from the todo filter options 2024-12-08 11:17:33 +01:00
Dejan 9700a6b269 - Default todo repeat type - None 2024-12-07 11:39:27 +01:00
Dejan 5866004f6a - Default selected attendee when creating events to be the creator of the event
- Added validation to not allow events without any attendees
2024-12-07 11:36:29 +01:00
Dejan 29ec985ffa - Fixed event coloring issue on the my view/family view 2024-11-21 23:53:18 +01:00
Dejan fb27079f10 - Added validation for title and attendees when creation/updating event 2024-11-21 23:32:50 +01:00
Dejan 726668921b - Changed the location field style
- Added creator information on the events in the events dialog
2024-11-21 23:25:52 +01:00
Dejan c528f72b2e - Added created by label in the todo item 2024-11-21 22:55:54 +01:00
Dejan edea14b32c Merge remote-tracking branch 'origin/dev' into dev 2024-11-20 23:58:21 +01:00
Dejan 4f80525f13 - Added User update dialog, useUpdateSubUser.ts hook and implemented update of a selected user from the family group 2024-11-20 23:58:13 +01:00
Dejan b1a5d4c171 - Added validation when adding todos to restrict having todos without any assignees 2024-11-20 20:36:09 +01:00
Dejan e113d78575 - Added todo filter option for Everyone to show all the family's tasks 2024-11-20 20:24:37 +01:00
Dejan 012a70313b - Allowed selecting date when Repeat type is set to "None"
- Enabled opening the repeat freq picker with click on the Repeat todo icon
2024-11-20 20:04:23 +01:00
Dejan cc2a649f8c - Reverted the Add todo press functionality to open the Add todo dialog instead of redirecting to Todos page 2024-11-20 19:27:14 +01:00
Dejan 89d00cdead - Fixed issue with events not being mapped correctly when fetched(missing attributes)
- Fixed issue with editing of events because of incorrect attribute name
- Color events created by other user, but assigned to current user in the current user's color
2024-11-18 17:46:01 +01:00
Dejan d8e7dc6bf7 - Enabled Add todo button and added navigation to the todos page on click 2024-11-18 17:11:39 +01:00
Dejan f269c9c136 Merge remote-tracking branch 'origin/dev' into dev 2024-11-18 00:17:58 +01:00
Dejan eace5da5cb - Implemented saving of location to the event 2024-11-18 00:17:49 +01:00
Dejan c9b796bd40 - Improvements to the todo filter 2024-11-17 22:53:11 +01:00
Dejan c1f7113dfc Merge remote-tracking branch 'origin/dev' into dev 2024-11-17 20:24:11 +01:00
Dejan f21f70a45d - Fixed infinite rendering in the todos page 2024-11-17 20:24:01 +01:00
Dejan 4fa18a6913 - Reverted useSignUp.ts changes 2024-11-17 19:10:37 +01:00
Dejan a95191c890 - Filtering todos 2024-11-17 19:06:50 +01:00
Dejan e2aae47c34 - Changed the todo repeat icon 2024-11-10 18:11:22 +01:00
Dejan 5b80a3ba80 - Added Daily repeat type for the todos and implemented creating and updating this kinds of todos 2024-11-10 18:00:17 +01:00
Dejan 7da8005fb1 - Added alert if title is empty on todo save 2024-11-10 17:33:47 +01:00
Dejan f7909de546 - Added preslected assignee to be the current user when creating todo 2024-11-10 17:25:00 +01:00
Dejan 9d81fa5ba5 - Set the points step to 5 and styled the points slider 2024-11-04 23:41:42 +01:00
Dejan dbfe7d6e9c Added the reccuring todos that repeat weekly to be created for the next 52 weeks 2024-11-04 23:32:13 +01:00
Dejan 5beadcce01 Moved color settings to manage my profile 2024-11-04 23:16:09 +01:00
Dejan ebd6fcbfab - Sorted the users when adding todo 2024-11-04 22:37:56 +01:00
Dejan a08b924cf1 Merge remote-tracking branch 'origin/dev' into dev 2024-11-01 01:23:51 +01:00
Dejan b52c9cb74f - Redesigned the calendar settings page and connecting, disconnecting and syncing calendars, fixed issues with syncing 2024-11-01 01:23:28 +01:00
Dejan f7c121772a - Reverted check if start time and end time overlap, caused an issue 2024-10-30 23:37:43 +01:00
Dejan b9aa24a0c2 - Take turns implementation for the todos 2024-10-29 00:05:15 +01:00
Dejan 7771f397b6 - Added validation to not allow end time to be before start time on add and edit event 2024-10-28 21:01:12 +01:00
Dejan c234a6260a - Removed the grocery item check box for all other profile types besides parent
- Allowed for all profile types to create new todos
2024-10-28 20:26:44 +01:00
Dejan 45747747dd - Removed the grocery item check box for all other profile types besides parent
- Allowed for all profile types to create new todos
- Modified the fetch todos query to fetch all the assigned and created by for child type of profiles
2024-10-28 20:26:37 +01:00
Dejan 5f09610e5b - Fixed issue with add grocery item form not closing on close button click 2024-10-27 18:27:18 +01:00
Dejan e863b0c38e - Fixed issue with grocery edit not closing, reverted to the category resolving solution(fuzzy search categories), added check button for saving the grocery after editing, made code improvemnets around the groceries page 2024-10-27 18:23:29 +01:00
Dejan 3187844b50 - Fixed issue with undefined value for the grocery requested by section 2024-10-27 17:38:09 +01:00
Dejan 6a9d446c11 - Added user based access in the todos page and fetched only the todos that are assigned to a child type profile and all the family todos to a parent type profile 2024-10-27 17:30:41 +01:00
Dejan c25ddfcdf5 - Fixed an issue with missing id when creating events and unable to update after 2024-10-26 16:04:42 +02:00
Dejan c597e96c20 - FIxed an issue with completing todos 2024-10-26 15:38:54 +02:00
Dejan b2b1e5d1e4 - Restricted editing of grocery and todo item for children 2024-10-26 15:36:01 +02:00
Dejan 731af8a3b8 - Added the profile image or the initials if profile picture is missing to the grocery item 2024-10-26 14:58:44 +02:00
Dejan c7e2dcfdf9 - Removed the pending grocery items check and decline buttons for every other types of profiles besides the parent profile 2024-10-26 14:53:33 +02:00
Dejan e5d39107d1 - Fixed issue with adding new grocery item but without a category always 2024-10-26 14:45:52 +02:00
Dejan 675ecedd86 - Implemented the complete update of recurring todo and handle changing the recurring rule and date 2024-10-26 13:20:31 +02:00
Dejan 5c67ffccbd - Implemented the complete update of recurring todo and handle changing the recurring rule and date 2024-10-26 13:20:09 +02:00
Dejan 2ec014bcc7 - Implementation of update todo and removing days in the rule for a repeatable todo 2024-10-25 16:49:32 +02:00
Dejan f35033f5e7 - Fixed an issue with the Tod dialog
- Implementation of update todo and adding new days in the rule for a repeatable todo
2024-10-25 14:04:13 +02:00
Dejan 04f9e31ce4 - Added the repeat days selected for the created todos in the edit dialog 2024-10-25 12:18:23 +02:00
Dejan 6bb32f3281 - Implemented creation of the repeatable todos for every repeat type 2024-10-24 23:55:49 +02:00
Dejan 0b11381fce - Implemented handling of repeat days change 2024-10-24 20:35:42 +02:00
Dejan 0d498829ad - Added the assignees to the todo item 2024-10-21 20:51:57 +02:00
Dejan f6dc0a62fb - Fixed an issue with opening the add and edit dialog in the todos page 2024-10-20 20:59:37 +02:00
Dejan 709b333ee1 - Implemented assigning todos 2024-10-20 20:45:09 +02:00
Dejan 206ffd5a88 - Implemented connecting multiple accounts for apple 2024-10-20 19:34:15 +02:00
Dejan be28266696 - Implemented connecting multiple accounts for microsoft 2024-10-20 19:16:48 +02:00
Dejan d6d1bcf3cf Merge remote-tracking branch 'origin/dev' into dev 2024-10-20 18:34:56 +02:00
Dejan bb72c6c011 - Implemented connecting multiple accounts for google 2024-10-20 18:34:48 +02:00
Dejan 80cc184498 - Removed console.log
- Fixed an issue with title undefined when syncing events
2024-10-20 18:32:16 +02:00
Dejan e2d18cf7d5 - Sorted the todo list and showed the todos by sorted date 2024-10-15 22:52:53 +02:00
Dejan dc05090f49 - Implemented editing of the todos
- Modified the AddChoreDialog.tsx to be able to edit or add new items
2024-10-15 22:31:53 +02:00
Dejan 0f75be8d1e Fixed issue with groceries update 2024-10-15 20:34:18 +02:00
Dejan 515b5738bb Implementation of fetching, adding and updating todos to db 2024-10-13 13:34:31 +02:00
Dejan ed0c654a55 Seconds & time logic 2024-10-12 20:44:29 +02:00
Dejan cd62837198 Shopping List backend implementation
- Added creatorId to the grocery item in db and showed the name of the user that requested to add the new grocery
2024-10-11 18:02:13 +02:00
Dejan 86231daba4 Shopping List backend implementation
- Small code improvements
2024-10-11 16:28:17 +02:00
Dejan 22e962a8b2 Shopping List backend implementation
- Fixed issue with groceries not fetching after update
2024-10-11 16:20:37 +02:00
Dejan e6758a014f Removed leftover logging 2024-10-11 16:12:00 +02:00
Dejan 9b94aa8e70 Shopping List backend implementation
- Implemented fetching, create and update of groceries in db
2024-10-11 16:11:46 +02:00
Dejan a05de1b333 Editing calendar events
- Fixed an issue with the profile data not being read from db becaue of the local state not being updated instantly
2024-10-11 16:08:39 +02:00
Dejan 562da49806 Editing calendar events
- Added new hook for updating events
- Updated the selected event in db
- Added document id as id to the event object when fetching events
- Removed unused react-native-google sign-in library
2024-10-11 13:24:25 +02:00
Dejan 7d9d41acfc - Added proper oauth2 authentication with google and saving of the access token to the profile 2024-10-11 10:28:49 +02:00
Dejan 2234fac075 - Fixed wrong method being called when fetching microsoft events 2024-10-05 22:11:22 +02:00
Dejan d1d3fd0ca1 - Introduced attribute id in the eventData type
- INtroduced new method to save the event data from the google and microsoft providers only if there isn't already an event with the same id
2024-10-05 21:59:59 +02:00
Dejan 6ad587ef31 - Fixed an issue with the required date format for the start and end date when fetching the google events 2024-10-05 21:41:40 +02:00
Dejan d9853481de - Fixed label 2024-10-05 21:08:41 +02:00
Dejan 977bf45fb2 - Additional comment 2024-10-05 16:20:15 +02:00
Dejan b5a8712af8 - Prepared methods for microsoft authorization and added a button to handle microsoft auth
- Saved the microsoft token to the profile of the current user
2024-10-05 16:17:55 +02:00
Dejan d4b5ebcb80 - Added googleToken attribute to the user profile interface 2024-10-05 15:53:54 +02:00
Dejan 7eb040a8a9 - Implemented google sign in and saved the id token in db for the current user
- Used the id token for the current user for fetching the google calendar events
2024-10-05 15:53:20 +02:00
Dejan 8161accdb6 - Introduced a button for syncing Microsoft calendar
- Implemented saving of the microsoft event data in db
2024-10-05 00:32:57 +02:00
Dejan 59efcc16c5 - Implementation of a google authentication with a react-native library 2024-10-04 01:37:36 +02:00
Dejan fc0ea611af - Fixed wrong date format when saving the google events 2024-10-04 01:28:56 +02:00