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/single task display screen #44

Closed
wants to merge 17 commits into from

Conversation

narayansharma-21
Copy link
Contributor

@@ -30,6 +31,15 @@ export function AppStackBottomTabNavigator() {
}}
component={GroupScreen}
/>
<AppStackBottomTab.Screen
Copy link
Contributor

Choose a reason for hiding this comment

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

prolly shouldnt be apart of bottom nav

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah for sure, just put it there so it'd be easy for me to access when testing on expo and since I didn't have access to the other task screens. I can just pull it out from here

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 from bottom nav?

package.json Outdated
@@ -0,0 +1,6 @@
{
Copy link
Contributor

Choose a reason for hiding this comment

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

extra package.json not needed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

:ahhhhhhhhh: forgot about that

@MattCMcCoy
Copy link
Contributor

Screenshot 2024-02-29 at 7 54 26 PM Getting an error while trying to fetch

@MattCMcCoy
Copy link
Contributor

Screenshot 2024-02-29 at 7 54 55 PM Screenshot 2024-02-29 at 7 55 19 PM Kind of a knit pick but anychance we can get this to look a lil closer to the figma?

@MattCMcCoy
Copy link
Contributor

Screenshot 2024-02-29 at 7 56 23 PM Small bug but this is see through 😢

@MattCMcCoy
Copy link
Contributor

Also can you fix merge conflicts?

@narayansharma-21
Copy link
Contributor Author

IMG_C2E4B00C4B1E-1

@MattCMcCoy sample task 1 displayed as shown. Lmk if there's any other changes that need to be made

@MattCMcCoy
Copy link
Contributor

something happened while merging showing files you didnt edit?

@narayansharma-21
Copy link
Contributor Author

@MattCMcCoy I think I merged in your last commit before the PR got merged which is why it shows that it's showing files I didn't edit. In terms of changes it should still be the exact same as what you pushed in main. I also just removed the single task screen from the nav bar

@MattCMcCoy
Copy link
Contributor

@narayansharma-21 what happens if you merge main into this?

@narayansharma-21
Copy link
Contributor Author

narayansharma-21 commented Mar 18, 2024

@MattCMcCoy I just merged main into my local and it just ran commitizen then made the merge but no files were changed

edit: also pushed my merge to origin

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:

@MattCMcCoy MattCMcCoy closed this Mar 25, 2024
@MattCMcCoy MattCMcCoy deleted the feature/single-task-display-screen branch March 25, 2024 15:12
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