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.

Sign up for GitHub

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

Jump to bottom

Staging #15

Merged
merged 46 commits into from
Oct 8, 2021
Merged

Staging #15

merged 46 commits into from
Oct 8, 2021

Conversation

Phaceial
Copy link
Contributor

@Phaceial Phaceial commented Oct 7, 2021

Scrum week 2

rebeccarobb and others added 30 commits October 1, 2021 09:56
@rebeccarobb
fix package error
a4a5a66
@Phaceial
Authentication and firebase properly implemented
316fa8a
@Phaceial
Now working correctly with context and state
e60e27c
@Phaceial
Solution to Login Flow
63cd94e
@Phaceial
Added signout button for testing
7e98b64
@KarlSchaller
Remove EditScreenInfo component
1f699df 
It's just supposed to help setting up expo
@KarlSchaller
Setup JSDoc
bb478d0 
pain
@Phaceial
Started a database interface but that's another ticket.
596c005
@Phaceial
Merge branch 'staging' into TEM-78
a405e7c
@Phaceial
Merge pull request #9 from Capstone-Projects-2021-Fall/TEM-78
1261f88 
Tem 78
@Phaceial
get rid of unecessary boiler plate code and add the necessary library
b894722
@Phaceial
Refactoring names for clarity
e46df6f
@tuj39467
Adding form to store cat info
19e31ce
@Phaceial
Fixed issue line 43 missing ,
2ffdfa1
@KarlSchaller
Add documentation
9940ef1
@KarlSchaller
Merge branch 'staging' into TEM-83
5ad3893
@tuj39467
Added Form component to create fields for CatForm.
de4a920
@KarlSchaller
Fix some merge conflicts
e93651e
@Phaceial
Merge pull request #10 from Capstone-Projects-2021-Fall/TEM-83
dc9411b 
Tem 83
@Phaceial
Remove unused boiler plate code
b7f07c4
@Phaceial
Database functionality might have been cleared in a merge
ee57923
@tuj39467
Added Form and service for cat form.
ae10b73
@tuj39467
Merge branch 'staging' of https://github.com/Capstone-Projects-2021-F…
2dbb4a9 
…all/project-teams-temple-cats into TEM-53
@tuj39467
Updated components without React DOM.
25da14b
@tuj39467
Added AddCatData.tsx
1bbd75c
@jordanbillie
Added multiple marker functionality
85a6136
@jordanbillie
Added functionality where markers can be queried from database
d679132
@Phaceial
Add Button component and firebase types
f458bd1
@tuj39467
Trying to have form work with Firebase
72bf55b
@tuj39467
Completely changed the way CatForm is set up. Will include screen ins…
790ad50 
…tead.
tuj39467 and others added 16 commits October 5, 2021 19:01
@tuj39467
Added CatForm.tsx screen
1d817c7
@jordanbillie
Seperted map component from pins component
e788f0d
@jordanbillie
Merge branch 'TEM-44' of https://github.com/Capstone-Projects-2021-Fa…
59957ef 
…ll/project-teams-temple-cats into TEM-44
@tuj39467
Check to see if user filled out all fields.
f126a3c
@Phaceial
replace cat map with clean version
e4523e0
@tuj39467
Created button that can open cat form
24237a9
@tuj39467
Can now open CatForm with the Announcements icon
e77a334
@tuj39467
Pulled TEM-53 into this branch to get Cat Form
2053c89
@tuj39467
Created new branch and then pulled from TEM-63
414417e
@tuj39467
Data is now saved from Cat Form submission
7c98e55
@tuj39467
Changed font and added eye color
004b904
@Phaceial
Correct Solution for TEM-44
b6756c4
@Phaceial
Proper solution to TEM-44
7372202
@KarlSchaller
Merge pull request #13 from Capstone-Projects-2021-Fall/TEM-43
bff0621 
Tem 43
@Phaceial
Merge branch 'staging' into TEM-44
992f9cc
@rebeccarobb
Merge pull request #14 from Capstone-Projects-2021-Fall/TEM-44
1f53571 
Tem 44
tuj39467
tuj39467 approved these changes Oct 8, 2021
View reviewed changes
Copy link
Contributor

@tuj39467 tuj39467 left a comment

Choose a reason for hiding this comment

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

LGTM

@tuj39467
Copy link
Contributor

tuj39467 commented Oct 8, 2021

LGTM

@tuj39467 tuj39467 merged commit b333f31 into main Oct 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tuj39467 tuj39467 tuj39467 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Phaceial @tuj39467 @rebeccarobb @KarlSchaller @jordanbillie