Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/connect all task fe #59

Merged
merged 54 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
7b3e223
feat(SingleTask.tsx): Hardcoded screen
narayansharma-21 Feb 24, 2024
b0c3391
feat(SingleTask.tsx): Added route functionality
narayansharma-21 Feb 26, 2024
b6dc1ad
feat: task type rough screen and type/category enum
oliviaseds Feb 26, 2024
ae2cd86
feat(SingleTask.tsx): Implemented entirety of v4 of lofi with additio…
narayansharma-21 Feb 27, 2024
5cb2b67
feat: all hands screen (no functionality)
oliviaseds Feb 27, 2024
f088c0a
feat: filter button
oliviaseds Feb 29, 2024
7a432a8
fix(task.ts): Refactored service routes to use tanStack in the Single…
narayansharma-21 Mar 1, 2024
8383ae5
Merge branch 'main' into feature/task-type-frontend
oliviaseds Mar 11, 2024
1574f21
feat: migrated all changes from previous branch
wyattchris Mar 11, 2024
724465b
refactor: remove ScrollView and non-Tailwind styling
oliviaseds Mar 12, 2024
db9dd79
style: prettier
oliviaseds Mar 12, 2024
b74253b
Merge remote-tracking branch 'origin/feature/task-type-frontend' into…
wyattchris Mar 12, 2024
d1b38c2
feat: filter button progress
wyattchris Mar 12, 2024
e644709
refactor: refactor all styling to be tailwind + button half implemented
wyattchris Mar 13, 2024
4e32def
feat: filter button implementation + pr fixes
wyattchris Mar 13, 2024
c0c6d77
refactor: fix cicd
wyattchris Mar 16, 2024
59695d3
Merge branch 'main' into feature/task-list-screen-3
wyattchris Mar 16, 2024
e49287f
fix(Attempted-to-fix-the-query): SingleTask.tsx
narayansharma-21 Mar 16, 2024
85dcfe0
refactor(delete-svgs): delete svgs
wyattchris Mar 16, 2024
d70d203
fix(SingleTask.tsx): Fixed undefined error on xcode
narayansharma-21 Mar 16, 2024
4c3a6fc
feat: snapped w my boy matt
wyattchris Mar 16, 2024
0760bc7
Merge branch 'main' into feature/single-task-display-screen
narayansharma-21 Mar 16, 2024
8a2cfa5
fix(SingleTask.tsx): Bug fix
narayansharma-21 Mar 16, 2024
7139ac2
feat: add title to task db table
MattCMcCoy Mar 18, 2024
d329142
fix: cycle import in app nav
MattCMcCoy Mar 18, 2024
17bc80a
Merge branch 'bugfix/cycleimport' into feature/addtitletotaskmodel
MattCMcCoy Mar 18, 2024
0039498
fix(SingleTask.tsx): Initial fix to title issue
narayansharma-21 Mar 18, 2024
7cfd5f7
Merge remote-tracking branch 'origin/feature/addtitletotaskmodel' int…
narayansharma-21 Mar 18, 2024
3f3389c
fix(SingleTask.tsx): Utilized new backend route to dynamically show t…
narayansharma-21 Mar 18, 2024
8f16fba
fix(AppStackBottomTabNavigator): removed single task display from nav…
narayansharma-21 Mar 18, 2024
3c14bba
Merge branch 'main' into feature/single-task-display-screen
narayansharma-21 Mar 18, 2024
2325fa5
style(Task.tsx): Updated svgs and got rid of TaskInfo type
narayansharma-21 Mar 18, 2024
fec3010
feat(lebron-james): lebron james
wyattchris Mar 18, 2024
50ed5b4
Merge branch 'main' into feature/task-list-screen-3
wyattchris Mar 19, 2024
4502b3e
refactor: add import for tasklist
wyattchris Mar 19, 2024
1e6691d
test: fix backend go tests for tasks
wyattchris Mar 19, 2024
2078c9a
Merge branch 'main' into feature/task-list-screen-3
wyattchris Mar 19, 2024
3163b27
feat(navigation-between-calendar-and-task-list-screen): navigation be…
wyattchris Mar 19, 2024
fa4566d
fix: add back haley
wyattchris Mar 20, 2024
2b1fbbf
refactor(refactor-component-to-tailwind): refactor component to tailwind
wyattchris Mar 20, 2024
a64fb9b
Merge branch 'feature/task-list-screen-3' into feature/connect-all-ta…
MattCMcCoy Mar 22, 2024
c782304
fix: some fixes towards calendar task list connection
MattCMcCoy Mar 22, 2024
3553639
refactor: move label call into render method for tasks
MattCMcCoy Mar 22, 2024
01454f6
Merge branch 'feature/single-task-display-screen' into feature/connec…
MattCMcCoy Mar 23, 2024
1c253e8
feat: task connenction and group role user routes
MattCMcCoy Mar 23, 2024
826781c
fix: fix delete test to actually utilize db connection
MattCMcCoy Mar 23, 2024
a28a61d
test: user tests
MattCMcCoy Mar 23, 2024
b0a2251
feat: commit progress
MattCMcCoy Mar 24, 2024
0d9c4d9
fix: separate assigned from task by task id
MattCMcCoy Mar 24, 2024
4c46f09
fix: general fixes to code and remove refetch interval bc ngrok limit…
MattCMcCoy Mar 24, 2024
0be2a39
fix: test for updating group role
MattCMcCoy Mar 25, 2024
ba2cf86
fix: merge mishaps i think
MattCMcCoy Mar 25, 2024
c59d35f
fix: remove some extra unneeded stuff
MattCMcCoy Mar 25, 2024
994a65f
refactor: remove some unneded stuff
MattCMcCoy Mar 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/db/migrations/1.user.sql
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ VALUES
('8Sy7xBkGiGQv4ZKphcQfY8PxAqw1', 'Narayan', 'Sharma', '[email protected]', '', ''),
('iL7PnjS4axQffmlPceobjUUZ9DF2', 'Caitlin', 'Flynn', '[email protected]', '', ''),
('5JgN2PQxCRM9VoCiiFPlQPNqkL32', 'Linwood', 'Blaisdell', '[email protected]', '', ''),
('P03ggWcw63N0RSY7ltbkeBoR6bd2', 'Chris', 'Wyatt', '[email protected]', '', ''),
('9rIMSUo6qNf8ToTABkCfNqnByRv1', 'Haley', 'Martin', '[email protected]', '', '')

-- End Care-Wallet Team
Expand Down
2 changes: 1 addition & 1 deletion backend/db/migrations/2.group.sql
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ VALUES
(5, 'onrQs8HVGBVMPNz4Fk1uE94bSxg1', 'SECONDARY'),
(5, '8Sy7xBkGiGQv4ZKphcQfY8PxAqw1', 'SECONDARY'),
(5, 'iL7PnjS4axQffmlPceobjUUZ9DF2', 'SECONDARY'),
(5, 'P03ggWcw63N0RSY7ltbkeBoR6bd2', 'SECONDARY'),
(5, '9rIMSUo6qNf8ToTABkCfNqnByRv1', 'SECONDARY')

-- End Care-Wallet Team
;
5 changes: 4 additions & 1 deletion backend/db/migrations/3.task.sql
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ VALUES
('task 2', 2, 'user3', '2024-02-20 23:59:59', '2024-02-10 14:30:00', NULL, 'Schedule doctor appointment', 'INCOMPLETE', 'other', FALSE),
('task 3', 3, 'user4', '2020-02-05 11:00:00', NULL, '2024-02-20 23:59:59', 'Submit insurance claim', 'PARTIAL', 'financial', FALSE),
('task 4', 4, 'user1', '2006-01-02 15:04:05', NULL, NULL, 'Refill water pitcher', 'COMPLETE', 'other', TRUE),
('task 1 - NO LABEL', 1, 'user2', '2024-02-03 10:45:00', '2024-02-05 10:00:00', '2024-02-05 11:00:00', 'Pick up medication from pharmacy', 'INCOMPLETE', 'med_mgmt', FALSE),
('task 5', 5, 'user1', '2024-03-19 11:00:00', '2024-03-19 15:00:00', '2024-03-19 19:00:00', 'Get medications', 'INCOMPLETE', 'dr_appt', TRUE),
('task 6', 5, 'user2', '2024-03-19 11:00:00', '2024-03-19 11:00:00', '2024-03-19 13:00:00', 'File Papers', 'INCOMPLETE', 'med_mgmt', TRUE),
('task 7', 5, 'user3', '2024-03-19 11:00:00', '2024-03-19 07:00:00', '2024-03-19 09:00:00', 'Send check to Drs', 'INCOMPLETE', 'financial', TRUE),
('task 8', 5, 'user1', '2024-03-19 11:00:00', '2024-03-19 15:00:00', '2024-03-19 19:00:00', 'Get medications', 'INCOMPLETE', 'dr_appt', FALSE),
('task 9', 5, 'user2', '2024-03-19 11:00:00', '2024-03-19 11:00:00', '2024-03-19 13:00:00', 'File Papers', 'INCOMPLETE', 'med_mgmt', FALSE),
('task 10', 5, 'user3', '2024-03-19 11:00:00', '2024-03-19 07:00:00', '2024-03-19 09:00:00', 'Send check to Drs', 'INCOMPLETE', 'financial', FALSE)
('task 10', 5, 'user3', '2024-03-19 11:00:00', '2024-03-19 07:00:00', '2024-03-19 09:00:00', 'Send check to Drs', 'INCOMPLETE', 'financial', FALSE),
('test tile', 5, 'P03ggWcw63N0RSY7ltbkeBoR6bd2', '2020-02-05 11:00:00', NULL, '2024-02-20 23:59:59', 'Submit insurance claim', 'PARTIAL', 'financial', FALSE),
('test tile', 5, 'P03ggWcw63N0RSY7ltbkeBoR6bd2', '2024-02-20 23:59:59', '2024-02-10 14:30:00', NULL, 'Schedule doctor appointment', 'INCOMPLETE', 'med_mgmt', FALSE)
;

INSERT INTO task_assignees (task_id, user_id, assignment_status, assigned_by, assigned_date)
Expand Down
8 changes: 6 additions & 2 deletions backend/db/migrations/4.label.sql
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,17 @@ VALUES
(2, 'Appointments', 'green'),
(3, 'Financial', 'orange'),
(4, 'Household', 'purple'),
(1, 'Household', 'purple')
(1, 'Household', 'purple'),
(5, 'Financial', 'orange'),
(5, 'Appointments', 'green')
;

INSERT INTO task_labels (task_id, group_id, label_name)
VALUES
(1, 1, 'Medication'),
(2, 2, 'Appointments'),
(3, 3, 'Financial'),
(4, 4, 'Household')
(4, 4, 'Household'),
(6, 5, 'Financial'),
(7, 5, 'Appointments')
;
129 changes: 129 additions & 0 deletions backend/docs/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,135 @@ const docTemplate = `{
}
}
},
"/group/{groupId}/{uid}": {
"delete": {
"description": "removes a user from a group given a group id and user id",
"tags": [
"group"
],
"summary": "Remove a user from a group",
"parameters": [
{
"type": "string",
"description": "groupId",
"name": "groupId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "userId",
"name": "uid",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/models.GroupRole"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
}
}
}
},
"/group/{groupId}/{uid}/{role}": {
"put": {
"description": "add a user to a group given a user id and group id and role",
"tags": [
"group"
],
"summary": "Add a user to a group",
"parameters": [
{
"type": "string",
"description": "groupId",
"name": "groupId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "userId",
"name": "uid",
"in": "path",
"required": true
},
{
"type": "string",
"description": "Group\tRole",
"name": "role",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/models.GroupRole"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
}
}
},
"patch": {
"description": "Change a user group role based off of group id and user id and role",
"tags": [
"group"
],
"summary": "Change a user group role",
"parameters": [
{
"type": "string",
"description": "groupId",
"name": "groupId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "userId",
"name": "uid",
"in": "path",
"required": true
},
{
"type": "string",
"description": "New User Group Role",
"name": "role",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
}
}
}
},
"/medications": {
"get": {
"description": "get all user medications",
Expand Down
129 changes: 129 additions & 0 deletions backend/docs/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,135 @@
}
}
},
"/group/{groupId}/{uid}": {
"delete": {
"description": "removes a user from a group given a group id and user id",
"tags": [
"group"
],
"summary": "Remove a user from a group",
"parameters": [
{
"type": "string",
"description": "groupId",
"name": "groupId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "userId",
"name": "uid",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/models.GroupRole"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
}
}
}
},
"/group/{groupId}/{uid}/{role}": {
"put": {
"description": "add a user to a group given a user id and group id and role",
"tags": [
"group"
],
"summary": "Add a user to a group",
"parameters": [
{
"type": "string",
"description": "groupId",
"name": "groupId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "userId",
"name": "uid",
"in": "path",
"required": true
},
{
"type": "string",
"description": "Group\tRole",
"name": "role",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/models.GroupRole"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
}
}
},
"patch": {
"description": "Change a user group role based off of group id and user id and role",
"tags": [
"group"
],
"summary": "Change a user group role",
"parameters": [
{
"type": "string",
"description": "groupId",
"name": "groupId",
"in": "path",
"required": true
},
{
"type": "string",
"description": "userId",
"name": "uid",
"in": "path",
"required": true
},
{
"type": "string",
"description": "New User Group Role",
"name": "role",
"in": "path",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
}
}
}
},
"/medications": {
"get": {
"description": "get all user medications",
Expand Down
Loading
Loading