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

[HOLD] Staging -> Master #62

Open
wants to merge 295 commits into
base: master
Choose a base branch
from
Open

[HOLD] Staging -> Master #62

wants to merge 295 commits into from

Conversation

maxgerber
Copy link
Contributor

No description provided.

lucymk and others added 30 commits November 18, 2019 15:51
@lucymk
Merge branch 'staging' into dashboard-view
360562e 
# Conflicts:
#	utils/constants.js
#	views/index.js
@maxgerber
Merge pull request #10 from InFact-coop/dashboard-view
27907a5 
Dashboard view
@lucymk
make app easier to navigate (temp)
2a6a6ed
@lucymk
Merge branch 'staging' into take-a-photo
c640cc0
@maxgerber
+ Create FormSteps overarching component
9642ce5 
 + Create TextInput component
 + Create Postcode view

#12
@maxgerber
Merge branch 'staging' into onboarding-form
6b852e6 
# Conflicts:
#	components/onboarding/PostCode.js
#	views/Onboarding.js
@lucymk
Merge pull request #11 from InFact-coop/onboarding-form
73dfbb1 
FormSteps
@maxgerber
+ Create tooltip
395520a 
#26
@lucymk
Turns button into file input and saves to state (2)
37e3fd5
@lucymk
sends uploaded photo to back end
c7b352a
@lucymk
sends photo and moves to category page
663fc7f
@lucymk
Merge branch 'staging' into take-a-photo
2733a59
@maxgerber
Begin with progress '...' tracker
af4e68e 
Style controls
Style next button

#13 #19
@Oliversw
Initial setup using onboarding Formik layout
1a4e1f2
@Oliversw
Update generated Prisma files
af7f43c
@lucymk
create error page
e2a4ae8
@Oliversw
Add ratio and tags placeholders and moving between components
e3b285b
@maxgerber
+ Progress tracker
42ba8d2 
 + Button and controls styling

#19 #13
@lucymk
Merge pull request #12 from InFact-coop/onboarding-form
0ba7e6e 
"Why do you need this?" Tooltip
@Oliversw
Add back functionality including back to photo
e3c3aa2
@maxgerber
+ Back and forward buttons
304ebb7 
 + Dot stylings

#19
@Oliversw
Remove grey background from white arrow svg
c2868b4
@Oliversw
Add some very basic styling
0a9db07
@lucymk
adds cors
fd01a98
@lucymk
no message
aa28f6b
@lucymk
Merge branch 'staging' into take-a-photo
cab9a11
@maxgerber
+ How many children step
f0610a3 
#14
@lucymk
returns cloudinary url (2)
51045b4
@lucymk
Merge pull request #15 from InFact-coop/onboarding-form
1c1b87a 
< > ... | How many children? step
@lucymk
Merge branch 'staging' into take-a-photo
803231d
@ivan-unfolds ivan-unfolds temporarily deployed to snapeat-staging December 16, 2019 18:49 Inactive
@lucymk lucymk temporarily deployed to snapeat-staging December 17, 2019 12:47 Inactive
@ivan-unfolds ivan-unfolds temporarily deployed to snapeat-staging December 18, 2019 16:27 Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@maxgerber @ivan-unfolds @lucymk @Oliversw