Feature generic card and popup modal #20
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Basic card and modal skeleton
fixed card and popup to have the requirments
|
hey are you able to resolve the merge conflicts? :) |
|
I figured there was going to be a merge conflict, we can resolve that and update the branch. Does it matter if our commits are kinda jank (aka should we clean them up) or does it not really matter? |
|
Nah, theres a squash and merge option which when it gets merged into main it will merge all of the commits into a single commit. Ill let yall know how to do that when we get there! |
|
Perfect, less rebasing for us :) |
|
@MattCMcCoy Merged main into our branch, removed our components from App.tsx as recommended by our glorious leader @Blais3D |
MattCMcCoy
approved these changes
Jan 31, 2024
|
Can we squash and merge this? |
Womp Womp |
andrewcaplan1
pushed a commit
that referenced
this pull request
Feb 6, 2024
* Intial card/button * Basic card and modal Basic card and modal skeleton * fixed card and popup to have the requirments fixed card and popup to have the requirments * wip for passing medication data into Card component * trying to get stuff workin * trying to get comps workin * stuff * Final Working Card + Popup --------- Co-authored-by: AdharshKan42 <[email protected]>
oliviaseds
added a commit
that referenced
this pull request
Feb 17, 2024
* Added mock data * feat: get tasks by gid/uid/status/type/date * style: formatting * fix: Remove commitizen branch * test: fix task tests * style: quick reformat * feat: assign user(s) to a task CRUD and test * style: quick style * refactor: abstract queries, enable multiple * refactor: abstract filter query/arg building logic * crud routes for create new task, delete task, and update task info * Feat: generic card and popup modal (#20) * Intial card/button * Basic card and modal Basic card and modal skeleton * fixed card and popup to have the requirments fixed card and popup to have the requirments * wip for passing medication data into Card component * trying to get stuff workin * trying to get comps workin * stuff * Final Working Card + Popup --------- Co-authored-by: AdharshKan42 <[email protected]> * fix: go formatting stuff werent running through entire directory (#23) * feat: add a user context provider to the app (#24) * feat: userContext stuff idk man * refactor: general all around fixes (removing unused imports, fixing navigation errors) * refactor: all over the place with this commit, but added swagger docs for file upload * refactor: make context more general * refactor: utilize card and popup in the medlist FE * backend hot reload * feat: added hot reloading for backend code * refactor: abstract queries, enable multiple * refactor: routes are updated * feat: new route backend * feat: add a new label crud and test * feat: delete label crud and test * refactor: FE remove extra card file * test: fix typo in db, tests passing locally * refactor: modify task filter to bind to query * feat: update task name and color route and test * docs: fix swaggo comment style for task assignment and deletion * docs: same swagger changes for label routes * refactor: implement inclusive data range filter * refactor: keep consistency between route groups * docs: fix a swagger doc return type --------- Co-authored-by: bedrockdude10 <[email protected]> Co-authored-by: haleymartin-6 <[email protected]> Co-authored-by: CaitlinFlynn <[email protected]> Co-authored-by: AdharshKan42 <[email protected]> Co-authored-by: Matt McCoy <[email protected]> Co-authored-by: Matt McCoy <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Link to Ticket
Created a clickable card and popup modal component that currently shows medication data. Created using react native paper so tailwind can not be used for styling.
How Has This Been Tested?
Tested visually
Checklist