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/file upload screen #66

Merged
merged 10 commits into from
Apr 4, 2024
Merged

Feature/file upload screen #66

merged 10 commits into from
Apr 4, 2024

Conversation

wyattchris
Copy link
Contributor

@wyattchris wyattchris commented Apr 1, 2024

Description

Link to Ticket

Please include a summary of the changes and the related issue. Please also
include relevant motivation, context, and images!

Screen to upload files! edited routes, DB, + tanstack to include labels + additional notes.

How Has This Been Tested?

Tested backend routes + DB via Swagger, tested FE uploading locally with Expo

Checklist

  • I have performed a self-review of my code
  • I have reached out to another developer to review my code
  • I have commented my code, particularly in hard-to-understand areas
  • New and existing unit tests pass locally with my changes

@wyattchris wyattchris requested a review from MattCMcCoy April 2, 2024 16:41
@MattCMcCoy
Copy link
Contributor

yooo @wyattchris can you fix merge conflicts with this?

backend/db/migrations/5.files.sql Outdated Show resolved Hide resolved
client/components/nav_buttons/BackButton.tsx Outdated Show resolved Hide resolved
client/screens/FileUpload.tsx Outdated Show resolved Hide resolved
client/screens/FileUpload.tsx Outdated Show resolved Hide resolved
client/screens/Profile/Profile.tsx Outdated Show resolved Hide resolved
client/screens/FileUpload.tsx Outdated Show resolved Hide resolved
client/screens/FileUpload.tsx Outdated Show resolved Hide resolved
package.json Outdated
Comment on lines 1 to 6
{
"dependencies": {
"@expo-google-fonts/manrope": "^0.2.3",
"@expo-google-fonts/montserrat": "^0.2.3"
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you remove this and run task build

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yarrrr

Comment on lines 24 to 30
export const getLabelsByGroup = async (
groupID: number
): Promise<TaskLabel[]> => {
const { data } = await axios.get(`${api_url}/group/${groupID}/labels`);
return data;
};

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason for not usin tan stack?

@@ -11,9 +11,9 @@ export function BackButton() {

return (
<IconButton
className="align-center m-2 flex h-[50px] w-[52px] justify-center rounded-xl border border-carewallet-lightgray bg-carewallet-white"
className="align-center m-2 flex h-[50px] w-[52px] justify-center rounded-xl bg-carewallet-blue"
Copy link
Contributor

@MattCMcCoy MattCMcCoy Apr 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would make sure this matches all the current pages that are hifis right now, seems its applying a blue background I think it should be white (at least for profile which is in the app rn)

@@ -8,6 +8,7 @@ export type AppStackParamList = {
Profile: undefined;
PatientView: undefined;
ProfileScreens: undefined;
FileUploadScreen: undefined;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add the ability to navigate to file upload screen in the patient view theres already a button for it?

Copy link
Contributor

@MattCMcCoy MattCMcCoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :shipit:

@wyattchris wyattchris merged commit 1676582 into main Apr 4, 2024
6 checks passed
@MattCMcCoy MattCMcCoy deleted the feature/file-upload-screen branch April 5, 2024 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants