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
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Nov 18, 2019

  1. Merge branch 'staging' into dashboard-view 

    # Conflicts:
#	utils/constants.js
#	views/index.js
    @lucymk
    lucymk committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    360562e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from InFact-coop/dashboard-view 

    Dashboard view
    @maxgerber
    maxgerber authored Nov 18, 2019
    Configuration menu
    Copy the full SHA
    27907a5 View commit details
    Browse the repository at this point in the history

  3. make app easier to navigate (temp)

    @lucymk
    lucymk committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    2a6a6ed View commit details
    Browse the repository at this point in the history

  4. Merge branch 'staging' into take-a-photo

    @lucymk
    lucymk committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    c640cc0 View commit details
    Browse the repository at this point in the history

  5. + Create FormSteps overarching component 

     + Create TextInput component
 + Create Postcode view

#12
    @maxgerber
    maxgerber committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    9642ce5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'staging' into onboarding-form 

    # Conflicts:
#	components/onboarding/PostCode.js
#	views/Onboarding.js
    @maxgerber
    maxgerber committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    6b852e6 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #11 from InFact-coop/onboarding-form 

    FormSteps
    @lucymk
    lucymk authored Nov 18, 2019
    Configuration menu
    Copy the full SHA
    73dfbb1 View commit details
    Browse the repository at this point in the history

  8. + Create tooltip 

    #26
    @maxgerber
    maxgerber committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    395520a View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. Turns button into file input and saves to state (2)

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    37e3fd5 View commit details
    Browse the repository at this point in the history

  2. sends uploaded photo to back end

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    c7b352a View commit details
    Browse the repository at this point in the history

  3. sends photo and moves to category page

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    663fc7f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'staging' into take-a-photo

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    2733a59 View commit details
    Browse the repository at this point in the history

  5. Begin with progress '...' tracker 

    Style controls
Style next button

#13 #19
    @maxgerber
    maxgerber committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    af4e68e View commit details
    Browse the repository at this point in the history

  6. Initial setup using onboarding Formik layout

    @Oliversw
    Oliversw committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    1a4e1f2 View commit details
    Browse the repository at this point in the history

  7. Update generated Prisma files

    @Oliversw
    Oliversw committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    af7f43c View commit details
    Browse the repository at this point in the history

  8. create error page

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    e2a4ae8 View commit details
    Browse the repository at this point in the history

  9. Add ratio and tags placeholders and moving between components

    @Oliversw
    Oliversw committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    e3b285b View commit details
    Browse the repository at this point in the history

  10. + Progress tracker 

     + Button and controls styling

#19 #13
    @maxgerber
    maxgerber committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    42ba8d2 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #12 from InFact-coop/onboarding-form 

    "Why do you need this?" Tooltip
    @lucymk
    lucymk authored Nov 19, 2019
    Configuration menu
    Copy the full SHA
    0ba7e6e View commit details
    Browse the repository at this point in the history

  12. Add back functionality including back to photo

    @Oliversw
    Oliversw committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    e3c3aa2 View commit details
    Browse the repository at this point in the history

  13. + Back and forward buttons 

     + Dot stylings

#19
    @maxgerber
    maxgerber committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    304ebb7 View commit details
    Browse the repository at this point in the history

  14. Remove grey background from white arrow svg

    @Oliversw
    Oliversw committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    c2868b4 View commit details
    Browse the repository at this point in the history

  15. Add some very basic styling

    @Oliversw
    Oliversw committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    0a9db07 View commit details
    Browse the repository at this point in the history

  16. adds cors

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    fd01a98 View commit details
    Browse the repository at this point in the history

  17. no message

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    aa28f6b View commit details
    Browse the repository at this point in the history

  18. Merge branch 'staging' into take-a-photo

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    cab9a11 View commit details
    Browse the repository at this point in the history

  19. + How many children step 

    #14
    @maxgerber
    maxgerber committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    f0610a3 View commit details
    Browse the repository at this point in the history

  20. returns cloudinary url (2)

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    51045b4 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #15 from InFact-coop/onboarding-form 

    < > ... | How many children? step
    @lucymk
    lucymk authored Nov 19, 2019
    Configuration menu
    Copy the full SHA
    1c1b87a View commit details
    Browse the repository at this point in the history

  22. Merge branch 'staging' into take-a-photo

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    803231d View commit details
    Browse the repository at this point in the history

  23. fixes or statement

    @lucymk
    lucymk committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    1ac21fc View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. creates confirmation /success page 46

    @lucymk
    lucymk committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    68a920e View commit details
    Browse the repository at this point in the history

  2. Change file and import names to match prisma

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    d62ce9e View commit details
    Browse the repository at this point in the history

  3. Create categories component for food data form

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    034e00b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18 from InFact-coop/feature/food-data-component 

    Feature/food data component
    @maxgerber
    maxgerber authored Nov 20, 2019
    Configuration menu
    Copy the full SHA
    4f5eeca View commit details
    Browse the repository at this point in the history

  5. Merge branch 'staging' into success-page

    @maxgerber
    maxgerber authored Nov 20, 2019
    Configuration menu
    Copy the full SHA
    ae03fc6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #17 from InFact-coop/success-page 

    Success page
    @maxgerber
    maxgerber authored Nov 20, 2019
    Configuration menu
    Copy the full SHA
    df378b7 View commit details
    Browse the repository at this point in the history

  7. + Begin creating Radio Input

    @maxgerber
    maxgerber committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    96a34c1 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'staging' into onboarding-form

    @maxgerber
    maxgerber committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    3eb0113 View commit details
    Browse the repository at this point in the history

  9. + Make multistep form controls less rigid

    @maxgerber
    maxgerber committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    6f48ea1 View commit details
    Browse the repository at this point in the history

  10. Change nodemon start script to watch for change in env variables

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    02dfc97 View commit details
    Browse the repository at this point in the history

  11. Initial conditional styling for checkboxes

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    57e892b View commit details
    Browse the repository at this point in the history

  12. Remove cors

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    3b68d39 View commit details
    Browse the repository at this point in the history

  13. Basic working version of clickable checkboxes

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    24a9f6f View commit details
    Browse the repository at this point in the history

  14. Import and render all checkbox icons

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    29544e8 View commit details
    Browse the repository at this point in the history

  15. Move state to own directory and add foodData context

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    9156f10 View commit details
    Browse the repository at this point in the history

  16. Display captured photo in food data view

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    17d1dbf View commit details
    Browse the repository at this point in the history

  17. Finish basic styling of the categories component

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    5e069d5 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #20 from InFact-coop/feature/category-selection 

    Feature/category selection
    @ivan-unfolds
    ivan-unfolds authored Nov 20, 2019
    Configuration menu
    Copy the full SHA
    a33b09c View commit details
    Browse the repository at this point in the history

  19. Merge pull request #19 from InFact-coop/photo 

    Photo
    @maxgerber
    maxgerber authored Nov 20, 2019
    Configuration menu
    Copy the full SHA
    a27f101 View commit details
    Browse the repository at this point in the history

  20. Adjust image positioning in foodData

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    27dfd9c View commit details
    Browse the repository at this point in the history

  21. Change categories from flex to grid

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    c06a030 View commit details
    Browse the repository at this point in the history

  22. Add constants for categories and update categories component

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    5724ef0 View commit details
    Browse the repository at this point in the history

  23. Remove extra FOOD_DATA from router context history

    @Oliversw
    Oliversw committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    732d05f View commit details
    Browse the repository at this point in the history

  24. Add vegetable and fruit proportion to multistep form

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    db248a1 View commit details
    Browse the repository at this point in the history

  25. Add vegetable tile

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    2626a86 View commit details
    Browse the repository at this point in the history

  26. Refactor foodData step components

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    eb117ac View commit details
    Browse the repository at this point in the history

  27. Add correct metadata for downloading to homescreen

    @ivan-unfolds
    ivan-unfolds committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    d164ad9 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2019

  1. Create very basic layout for results page

    @Oliversw
    Oliversw committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    e8f7bca View commit details
    Browse the repository at this point in the history

  2. Abstract out "step" elements

    @maxgerber
    maxgerber committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    802c1c6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #21 from InFact-coop/fix/category-grid 

    Fix/category grid
    @maxgerber
    maxgerber authored Nov 21, 2019
    Configuration menu
    Copy the full SHA
    c57d8e7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #22 from InFact-coop/portions 

    Portions
    @maxgerber
    maxgerber authored Nov 21, 2019
    Configuration menu
    Copy the full SHA
    a9cc54c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'staging' into feature/results

    @maxgerber
    maxgerber authored Nov 21, 2019
    Configuration menu
    Copy the full SHA
    039e609 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #23 from InFact-coop/feature/results 

    Feature/results
    @maxgerber
    maxgerber authored Nov 21, 2019
    Configuration menu
    Copy the full SHA
    502f250 View commit details
    Browse the repository at this point in the history

  7. + Create Step components for both forms 

     + Create Tags step

#28 #33
    @maxgerber
    maxgerber committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    e415bc0 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'staging' into food-data-form 

    # Conflicts:
#	components/foodData/Categories.js
#	components/foodData/Tags.js
#	views/FoodData.js
    @maxgerber
    maxgerber committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    b6c8db5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #24 from InFact-coop/food-data-form 

    Tagz
    @lucymk
    lucymk authored Nov 21, 2019
    Configuration menu
    Copy the full SHA
    b69acd3 View commit details
    Browse the repository at this point in the history

  10. Small styling fixes

    @ivan-unfolds
    ivan-unfolds committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    f7f5dee View commit details
    Browse the repository at this point in the history

  11. Fix back buttons

    @ivan-unfolds
    ivan-unfolds committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    5d14de3 View commit details
    Browse the repository at this point in the history

  12. Add results screen

    @ivan-unfolds
    ivan-unfolds committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    c372f7c View commit details
    Browse the repository at this point in the history

  13. Merge pull request #26 from InFact-coop/tweaks 

    Tweaks
    @lucymk
    lucymk authored Nov 21, 2019
    Configuration menu
    Copy the full SHA
    ff2ad83 View commit details
    Browse the repository at this point in the history

  14. Put correct icons in

    @ivan-unfolds
    ivan-unfolds committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    1c05243 View commit details
    Browse the repository at this point in the history

  15. Change border color and get rid of tap highlight

    @ivan-unfolds
    ivan-unfolds committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    0ef5262 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #27 from InFact-coop/icons 

    Put correct icons in
    @lucymk
    lucymk authored Nov 21, 2019
    Configuration menu
    Copy the full SHA
    a376aa3 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2019

  1. Adds Success stage to food data form 46

    @lucymk
    lucymk committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    1aba0fd View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. Merge pull request #28 from InFact-coop/meal-success 

    Adds Success stage to food data form 46
    @maxgerber
    maxgerber authored Nov 25, 2019
    Configuration menu
    Copy the full SHA
    dcec8a8 View commit details
    Browse the repository at this point in the history

  2. tidy up results page

    @lucymk
    lucymk committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    c978145 View commit details
    Browse the repository at this point in the history

  3. + Dynamic Ages Question 

    #16
    @maxgerber
    maxgerber committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    df13532 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2019

  1. Merge pull request #29 from InFact-coop/onboarding-form 

     + Dynamic Ages Question
    @lucymk
    lucymk authored Nov 26, 2019
    Configuration menu
    Copy the full SHA
    d1641fa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' into refactoring-meal-flow

    @lucymk
    lucymk committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    60f7ab8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #30 from InFact-coop/refactoring-meal-flow 

    Refactoring meal flow
    @maxgerber
    maxgerber authored Nov 26, 2019
    Configuration menu
    Copy the full SHA
    eb35c85 View commit details
    Browse the repository at this point in the history

  4. Add button to return to categories from results

    @Oliversw
    Oliversw committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    0dc4e47 View commit details
    Browse the repository at this point in the history

  5. Add return option to fruit and vegetable proportions

    @Oliversw
    Oliversw committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    3c70e4f View commit details
    Browse the repository at this point in the history

  6. Add return option to tags

    @Oliversw
    Oliversw committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    b8191fa View commit details
    Browse the repository at this point in the history

  7. Track last page and navigate back to results when revising answers

    @Oliversw
    Oliversw committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    f87aaf2 View commit details
    Browse the repository at this point in the history

  8. + Add slug to project datamodel 

    #1
    @maxgerber
    maxgerber committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    c5bced1 View commit details
    Browse the repository at this point in the history

  9. + Create project seeds and flush 

     + Create dev:seed and dev:flushdb scripts

#1
    @maxgerber
    maxgerber committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    886b63f View commit details
    Browse the repository at this point in the history

  10. + Create project context 

    #1
    @maxgerber
    maxgerber committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    9fb8a26 View commit details
    Browse the repository at this point in the history

  11. + Get project from slug API handler 

     + getLastPath util
 + getInitialProps and error handling

#4
    @maxgerber
    maxgerber committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    5d332c3 View commit details
    Browse the repository at this point in the history

  12. Fix merge conflicts

    @Oliversw
    Oliversw committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    1c3a062 View commit details
    Browse the repository at this point in the history

  13. update constants.js, seeds.js and flushDB.js

    @lucymk
    lucymk committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    ffab1d0 View commit details
    Browse the repository at this point in the history

  14. Add constants to foodData

    @Oliversw
    Oliversw committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    41e8621 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #31 from InFact-coop/fix/change-choices 

    Navigate to change choices from results
    @lucymk
    lucymk authored Nov 26, 2019
    Configuration menu
    Copy the full SHA
    f16ab9f View commit details
    Browse the repository at this point in the history

  16. Merge pull request #32 from InFact-coop/slugging-it 

    Slugging it
    @lucymk
    lucymk authored Nov 26, 2019
    Configuration menu
    Copy the full SHA
    be3f20f View commit details
    Browse the repository at this point in the history

  17. Merge branch 'staging' into submit-food-data 

    # Conflicts:
#	prisma/flushDB.ts
#	prisma/generated/js/index.d.ts
#	prisma/generated/ts/index.ts
#	prisma/seeds.ts
    @lucymk
    lucymk committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    853a40b View commit details
    Browse the repository at this point in the history

  18. creates submit food data route

    @lucymk
    lucymk committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    67698e1 View commit details
    Browse the repository at this point in the history

  19. fix not enough hooks error

    @lucymk
    lucymk committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    2eca9d1 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. Add privacy page assets and add to constants

    @Oliversw
    Oliversw committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    f4d9ff3 View commit details
    Browse the repository at this point in the history

  2. Add privacy page with styles

    @Oliversw
    Oliversw committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    c3ae3ce View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging' into feature/privacy-page

    @Oliversw
    Oliversw committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    4747130 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #33 from InFact-coop/submit-food-data 

    Updates seeds files
    @ivan-unfolds
    ivan-unfolds authored Nov 27, 2019
    Configuration menu
    Copy the full SHA
    8296bf1 View commit details
    Browse the repository at this point in the history

  5. Make eslint work with ts files

    @ivan-unfolds
    ivan-unfolds committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    486073d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #34 from InFact-coop/feature/privacy-page 

    Feature/privacy page
    @ivan-unfolds
    ivan-unfolds authored Nov 27, 2019
    Configuration menu
    Copy the full SHA
    ce067a7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'staging' into ts-eslint

    @ivan-unfolds
    ivan-unfolds committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    a181d7f View commit details
    Browse the repository at this point in the history

  8. Delete getView function and update lint-staged config

    @ivan-unfolds
    ivan-unfolds committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    c7fabdf View commit details
    Browse the repository at this point in the history

  9. Add fix flag to eslint

    @ivan-unfolds
    ivan-unfolds committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    16e4c2b View commit details
    Browse the repository at this point in the history

  10. Change state directory to be called context

    @ivan-unfolds
    ivan-unfolds committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    68f74cc View commit details
    Browse the repository at this point in the history

  11. submit food data 76

    @lucymk
    lucymk committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    cadf498 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'staging' into submit-food-data

    @lucymk
    lucymk committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    47c2237 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #35 from InFact-coop/ts-eslint 

    Ts eslint
    @lucymk
    lucymk authored Nov 27, 2019
    Configuration menu
    Copy the full SHA
    2378996 View commit details
    Browse the repository at this point in the history

  14. mergee staging

    @lucymk
    lucymk committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    d710e26 View commit details
    Browse the repository at this point in the history

  15. removes image upload from home

    @lucymk
    lucymk committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    5396508 View commit details
    Browse the repository at this point in the history

  16. Add @auth0/nextjs-auth0 library and auth backend routes

    @ivan-unfolds
    ivan-unfolds committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    0b48f2b View commit details
    Browse the repository at this point in the history

  17. Add auth context and create different apps based on authentication st… 

    …atus
    @ivan-unfolds
    ivan-unfolds committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    0031284 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'staging' into auth

    @ivan-unfolds
    ivan-unfolds committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    783e8c1 View commit details
    Browse the repository at this point in the history

  19. Style menu 48

    @lucymk
    lucymk committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    f90c77b View commit details
    Browse the repository at this point in the history

  20. update logo width

    @lucymk
    lucymk committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    4dbd7c0 View commit details
    Browse the repository at this point in the history

  21. Create proportion examples page

    @Oliversw
    Oliversw committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    3954387 View commit details
    Browse the repository at this point in the history

  22. Include link to examples page in VegetableProportion page

    @Oliversw
    Oliversw committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    0fd8f07 View commit details
    Browse the repository at this point in the history

  23. Add to FruitProportion page and write styles for link/button

    @Oliversw
    Oliversw committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    dcb818f View commit details
    Browse the repository at this point in the history

  24. Add state to food data form to track examples page and pass down to a… 

    …ppropriate components
    @Oliversw
    Oliversw committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    6703acd View commit details
    Browse the repository at this point in the history

  25. makes headers consistent between menu and home and exports header to … 

    …component for use in other pages
    @lucymk
    lucymk committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    a26215b View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2019

  1. Merge pull request #36 from InFact-coop/submit-food-data 

    Submit food data
    @maxgerber
    maxgerber authored Nov 28, 2019
    Configuration menu
    Copy the full SHA
    14ea58a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #37 from InFact-coop/menu 

    Menu
    @maxgerber
    maxgerber authored Nov 28, 2019
    Configuration menu
    Copy the full SHA
    6c979b0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging' into feature/proportion-examples

    @lucymk
    lucymk committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    6adf125 View commit details
    Browse the repository at this point in the history

  4. tidy up prop page

    @lucymk
    lucymk committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    6cfac59 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #38 from InFact-coop/feature/proportion-examples 

    Feature/proportion examples
    @lucymk
    lucymk authored Nov 28, 2019
    Configuration menu
    Copy the full SHA
    80e9f2a View commit details
    Browse the repository at this point in the history

  6. Merge staging in

    @ivan-unfolds
    ivan-unfolds committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    c70667d View commit details
    Browse the repository at this point in the history

  7. Put a check in home for cookie expiry and logout if so

    @ivan-unfolds
    ivan-unfolds committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    f57501a View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2019

  1. adds privacy, terems and conditions and updates security page

    @lucymk
    lucymk committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    2ad05d4 View commit details
    Browse the repository at this point in the history

  2. adds express sslify

    @lucymk
    lucymk committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    29ab651 View commit details
    Browse the repository at this point in the history

  3. + Errors and validation: 

     + Children
 + Postcode
 + Big Input
    @maxgerber
    maxgerber committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    3960bc9 View commit details
    Browse the repository at this point in the history

  4. + Start Ages dynamic validation] 

     + BLOCKED bug — infinite loop
    @maxgerber
    maxgerber committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    36d4af6 View commit details
    Browse the repository at this point in the history

  5. + hasInitialised check 

    semi working
    @maxgerber
    maxgerber committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    b7aa2f1 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Merge pull request #39 from InFact-coop/auth 

    Auth
    @lucymk
    lucymk authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    34713d1 View commit details
    Browse the repository at this point in the history

  2. merge staging

    @lucymk
    lucymk committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    348c961 View commit details
    Browse the repository at this point in the history

  3. adds sign out

    @lucymk
    lucymk committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    1d39952 View commit details
    Browse the repository at this point in the history

  4. + FieldArray validation bloody madness 

    #17
    @maxgerber
    maxgerber committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    5663b10 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #40 from InFact-coop/privacy-terms-pages 

    Privacy terms pages
    @maxgerber
    maxgerber authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    79caef5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'staging' into validation-errors

    @maxgerber
    maxgerber committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    0714c3a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #41 from InFact-coop/validation-errors 

    Validation madness
    @lucymk
    lucymk authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    5dc91e8 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. Add very basic styles to landing

    @Oliversw
    Oliversw committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    3207760 View commit details
    Browse the repository at this point in the history

  2. + Fix landscape image bug 

    #104
    @maxgerber
    maxgerber committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    01fc096 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #42 from InFact-coop/image-fix 

    Fix landscape image bug
    @lucymk
    lucymk authored Dec 3, 2019
    Configuration menu
    Copy the full SHA
    3d4b8d4 View commit details
    Browse the repository at this point in the history

  4. + Create Consent context/provider and plug into platform 

    #106
    @maxgerber
    maxgerber committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    fba1f7b View commit details
    Browse the repository at this point in the history

  5. + Create consent context 

     + Conditional advancing depending on consent
 + Create active/inactive button states
#106
    @maxgerber
    maxgerber committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    d6888b3 View commit details
    Browse the repository at this point in the history

  6. Create new unauthenticated route provider

    @Oliversw
    Oliversw committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    04b16ce View commit details
    Browse the repository at this point in the history

  7. Move landing page into a separate view

    @Oliversw
    Oliversw committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    fd146b3 View commit details
    Browse the repository at this point in the history

  8. adds styled error page to food data

    @lucymk
    lucymk committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    c5f77f1 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #43 from InFact-coop/consent-context 

    Consent context
    @lucymk
    lucymk authored Dec 3, 2019
    Configuration menu
    Copy the full SHA
    789eca5 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'staging' into error-page

    @lucymk
    lucymk committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    ac40eeb View commit details
    Browse the repository at this point in the history

  11. updates spinner component

    @lucymk
    lucymk committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    43ed694 View commit details
    Browse the repository at this point in the history

  12. Refactor security and welcome pages to use unauthed route provider

    @Oliversw
    Oliversw committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    7bccabe View commit details
    Browse the repository at this point in the history

  13. Merge pull request #44 from InFact-coop/error-page 

    Error page
    @maxgerber
    maxgerber authored Dec 3, 2019
    Configuration menu
    Copy the full SHA
    b4c8ab7 View commit details
    Browse the repository at this point in the history

  14. + Move colours to tailwind extend

    @maxgerber
    maxgerber committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    3c9ce41 View commit details
    Browse the repository at this point in the history

  15. + Change Ages error message 

     + Get projects asynchronously for dropdown
 + Create Project page
 + Create inspectPipe for Ramda util

#20
    @maxgerber
    maxgerber committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    34b49bb View commit details
    Browse the repository at this point in the history

  16. Separate security, privacy, and t&cs into separate components for aut… 

    …h/unauth
    @Oliversw
    Oliversw committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    e988087 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

  1. + Create Phone page 

     + Validate and sanitise phone number with library
 + Add phone number to db + seeds

#38 #61
    @maxgerber
    maxgerber committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    68a8de7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #45 from InFact-coop/onboarding-submit 

    Projectsz
    @lucymk
    lucymk authored Dec 4, 2019
    Configuration menu
    Copy the full SHA
    b8011f6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging' into mobile-question

    @lucymk
    lucymk committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    c387a6c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #46 from InFact-coop/mobile-question 

    Mobile question
    @lucymk
    lucymk authored Dec 4, 2019
    Configuration menu
    Copy the full SHA
    b06467b View commit details
    Browse the repository at this point in the history

  5. + Add useEffect subscription cancel

    @maxgerber
    maxgerber committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    948a286 View commit details
    Browse the repository at this point in the history

  6. Finish security pages

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    6115cde View commit details
    Browse the repository at this point in the history

  7. Refactor landing page for new design

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    0b2249c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'staging' into onboarding-submit

    @maxgerber
    maxgerber committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    fe15fdf View commit details
    Browse the repository at this point in the history

  9. Fix merge conflicts

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    575403d View commit details
    Browse the repository at this point in the history

  10. Initial styling for 404 page

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    3d28351 View commit details
    Browse the repository at this point in the history

  11. Move 404 to next js _errors page

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    6c5fc52 View commit details
    Browse the repository at this point in the history

  12. Change casing of Snapeat to SnapEat in website copy

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    4dbe069 View commit details
    Browse the repository at this point in the history

  13. Create button for reporting bugs, present on all pages

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    a2ec7e3 View commit details
    Browse the repository at this point in the history

  14. Add Airtable form to link

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    1ad01dc View commit details
    Browse the repository at this point in the history

  15. Fix bug with back button not appearing

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    a69aa3d View commit details
    Browse the repository at this point in the history

  16. Fix bug with photo not appearing

    @Oliversw
    Oliversw committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    1080fa7 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #47 from InFact-coop/feature/landing 

    Feature/landing
    @lucymk
    lucymk authored Dec 4, 2019
    Configuration menu
    Copy the full SHA
    e2fd675 View commit details
    Browse the repository at this point in the history

  18. Adds reminder text messages

    @lucymk
    lucymk committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    68a4ea2 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'staging' into feature/404

    @lucymk
    lucymk committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    db4fe86 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #48 from InFact-coop/feature/404 

    Feature/404
    @lucymk
    lucymk authored Dec 4, 2019
    Configuration menu
    Copy the full SHA
    ac4cef1 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'staging' into fix/snapeat-case

    @lucymk
    lucymk committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    afb8e46 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #49 from InFact-coop/fix/snapeat-case 

    Change casing of Snapeat to SnapEat in website copy
    @lucymk
    lucymk authored Dec 4, 2019
    Configuration menu
    Copy the full SHA
    2fdf185 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'staging' into feature/help-button

    @lucymk
    lucymk committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    6979a73 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #50 from InFact-coop/feature/help-button 

    Create button for reporting bugs, present on all pages
    @lucymk
    lucymk authored Dec 4, 2019
    Configuration menu
    Copy the full SHA
    a5ad248 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #51 from InFact-coop/fix/back-button 

    Fix/back button and image
    @lucymk
    lucymk authored Dec 4, 2019
    Configuration menu
    Copy the full SHA
    c40eed2 View commit details
    Browse the repository at this point in the history

  26. submit onboarding form 

    #21
    @maxgerber
    maxgerber committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    5eb1691 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'staging' into onboarding-submit 

    # Conflicts:
#	prisma/generated/js/index.d.ts
#	prisma/generated/ts/index.ts
    @maxgerber
    maxgerber committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    f155b48 View commit details
    Browse the repository at this point in the history

  28. + empty initvalues

    @maxgerber
    maxgerber committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    6db7d01 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #52 from InFact-coop/onboarding-submit 

    Onboarding submit
    @lucymk
    lucymk authored Dec 4, 2019
    Configuration menu
    Copy the full SHA
    c3e0be8 View commit details
    Browse the repository at this point in the history

  30. Journey through the centre of the app 

    	#109 #121
    @maxgerber
    maxgerber committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    f414e4f View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Merge pull request #53 from InFact-coop/onboarding-submit 

    Journey through the centre of the app
    @lucymk
    lucymk authored Dec 5, 2019
    Configuration menu
    Copy the full SHA
    4a091e2 View commit details
    Browse the repository at this point in the history

  2. - Mini fix first onboarding screen

    @maxgerber
    maxgerber committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    08a17d2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #54 from InFact-coop/onboarding-to-first-screen 

     - Mini fix first onboarding screen
    @lucymk
    lucymk authored Dec 5, 2019
    Configuration menu
    Copy the full SHA
    f3d2827 View commit details
    Browse the repository at this point in the history

  4. Make full login button clickable

    @maxgerber
    maxgerber committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    a21209b View commit details
    Browse the repository at this point in the history

  5. Update eslint setup to handle typescript files

    @ivan-unfolds
    ivan-unfolds committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    c057a83 View commit details
    Browse the repository at this point in the history

  6. + Absolute bottom positioning food data :o

    @maxgerber
    maxgerber committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    ce46756 View commit details
    Browse the repository at this point in the history

  7. Absolute onboarding controls so they don't obscure the screen when ke… 

    …yboard is up
    @maxgerber
    maxgerber committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    149789c View commit details
    Browse the repository at this point in the history

  8. fixes landing view design tweaks and adds staging seeds and commands

    @lucymk
    lucymk committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    c6d4924 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #55 from InFact-coop/onboarding-to-first-screen 

    Tweaks
    @lucymk
    lucymk authored Dec 5, 2019
    Configuration menu
    Copy the full SHA
    9c508d8 View commit details
    Browse the repository at this point in the history

  10. merge staging

    @lucymk
    lucymk committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    736ec1d View commit details
    Browse the repository at this point in the history

  11. adds test for iOS

    @lucymk
    lucymk committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    13394fb View commit details
    Browse the repository at this point in the history

  12. tidy up for PR

    @ivan-unfolds
    ivan-unfolds committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    423c6ef View commit details
    Browse the repository at this point in the history

  13. Fix positioning of next controls button

    @ivan-unfolds
    ivan-unfolds committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    3d92b67 View commit details
    Browse the repository at this point in the history

  14. fiixes form submit

    @lucymk
    lucymk committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    7618324 View commit details
    Browse the repository at this point in the history

  15. Merge commit '13394fbbdee11fb4c55710cea6444da564b8c2aa' into fix-submit

    @ivan-unfolds
    ivan-unfolds committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    3db2773 View commit details
    Browse the repository at this point in the history

  16. Merge branch '🐛' into fix-submit 

    # Conflicts:
#	pages/_error.js
#	pages/index.js
#	views/Landing.js
    @ivan-unfolds
    ivan-unfolds committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    42a7810 View commit details
    Browse the repository at this point in the history

  17. Merge changes

    @ivan-unfolds
    ivan-unfolds committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    aa7c947 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'staging' into sms-notifications 

    # Conflicts:
#	pages/index.js
    @lucymk
    lucymk committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    83ebce5 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'sms-notifications' into fix-submit 

    # Conflicts:
#	pages/index.js
    @lucymk
    lucymk committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    82ce656 View commit details
    Browse the repository at this point in the history

  20. edit timne

    @lucymk
    lucymk committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    566d04a View commit details
    Browse the repository at this point in the history

  21. Update lock file

    @ivan-unfolds
    ivan-unfolds committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    46b7c2d View commit details
    Browse the repository at this point in the history

  22. Fix uploading of meal if only one of fruit and veg is selected

    @ivan-unfolds
    ivan-unfolds committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    f78d45f View commit details
    Browse the repository at this point in the history

  23. Merge pull request #57 from InFact-coop/fix-submit 

    Fix submit
    @lucymk
    lucymk authored Dec 5, 2019
    Configuration menu
    Copy the full SHA
    30d775b View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2019

  1. + Dynamically get email from auth and plug into food data

    @maxgerber
    maxgerber committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    3940ca8 View commit details
    Browse the repository at this point in the history

  2. + Combine auth0 and prisma/snapeat user auth contexts so information… 

    … is available throughout the platform

 + Remove custom project context from platform
    @maxgerber
    maxgerber committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    b4f9d27 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #58 from InFact-coop/dynamic-variables 

    Dynamically get email from auth and plug into food data
    @lucymk
    lucymk authored Dec 6, 2019
    Configuration menu
    Copy the full SHA
    53a7abd View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. Removes postcode validation to allow user to submit the start of thei… 

    …r postcode
    @lucymk
    lucymk committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    ef9b148 View commit details
    Browse the repository at this point in the history

  2. edits postcode validation

    @lucymk
    lucymk committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    72f9f96 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #59 from InFact-coop/expanding=auth-context 

    Expanding=auth context
    @ivan-unfolds
    ivan-unfolds authored Dec 10, 2019
    Configuration menu
    Copy the full SHA
    533305f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #60 from InFact-coop/postcode-remove-validation 

    Removes postcode validation
    @ivan-unfolds
    ivan-unfolds authored Dec 10, 2019
    Configuration menu
    Copy the full SHA
    a5678c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. + Add airtableId's to db 

     + Moment and Airtable dependencies
 + Trigger airtable uploads on new user and new photo
 + Non blocking
    @maxgerber
    maxgerber committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    e85ed3b View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

  1. Pascal casing interface

    @maxgerber
    maxgerber committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    73ebbb3 View commit details
    Browse the repository at this point in the history

  2. [DEBUG] adding logs and debuggers

    @maxgerber
    maxgerber committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    588760f View commit details
    Browse the repository at this point in the history

  3. [DEBUG]

    @maxgerber
    maxgerber committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    3b13fed View commit details
    Browse the repository at this point in the history

  4. [DEBUG]

    @maxgerber
    maxgerber committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    8d9a32c View commit details
    Browse the repository at this point in the history

  5. [DEBUG]

    @maxgerber
    maxgerber committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    a345ac0 View commit details
    Browse the repository at this point in the history

  6. + Remove postcode error

    @maxgerber
    maxgerber committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    410d12d View commit details
    Browse the repository at this point in the history

  7. + Await for airtable-user flow

    @maxgerber
    maxgerber committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    1036faf View commit details
    Browse the repository at this point in the history

  8. removes back arrow if user has come from Results page

    @lucymk
    lucymk committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    17deafc View commit details
    Browse the repository at this point in the history

  9. refactors nextOnClick

    @lucymk
    lucymk committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    c0a3ba6 View commit details
    Browse the repository at this point in the history

  10. refactor

    @lucymk
    lucymk committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    e12e838 View commit details
    Browse the repository at this point in the history

  11. refactor useEffect

    @lucymk
    lucymk committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    9bcf361 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #63 from InFact-coop/bug-fixing 

    Bug fixing
    @ivan-unfolds
    ivan-unfolds authored Dec 16, 2019
    Configuration menu
    Copy the full SHA
    0ca6bcc View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. + Working airtable-user flow (need to return json)

    @maxgerber
    maxgerber committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    fc73e1e View commit details
    Browse the repository at this point in the history

  2. + Fix no email in FoodData after onboarding bug

    @maxgerber
    maxgerber committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    f98164b View commit details
    Browse the repository at this point in the history

  3. Await prisma call, and return from express to avoid duplicate request!

    @maxgerber
    maxgerber committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    7739fea View commit details
    Browse the repository at this point in the history

  4. + Remove console logs

    @maxgerber
    maxgerber committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    42915fe View commit details
    Browse the repository at this point in the history

  5. Merge pull request #61 from InFact-coop/export-to-airtable 

    Data viz / airtable
    @lucymk
    lucymk authored Dec 17, 2019
    Configuration menu
    Copy the full SHA
    55b2be9 View commit details
    Browse the repository at this point in the history

  6. script to push users from db into AT

    @lucymk
    lucymk committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    8540709 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'staging' into pushToAT

    @lucymk
    lucymk committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    1e3fc2f View commit details
    Browse the repository at this point in the history

  8. + non-crap error message for Ages component 

     + remove onSubmit from formik props (stop accidental submissions)
    @maxgerber
    maxgerber committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    f3b57d9 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #65 from InFact-coop/pushToAT 

    Push to at
    @maxgerber
    maxgerber authored Dec 17, 2019
    Configuration menu
    Copy the full SHA
    841a26a View commit details
    Browse the repository at this point in the history

  10. [DEBUG] Add in debuggers get-available-projects

    @maxgerber
    maxgerber committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    a480062 View commit details
    Browse the repository at this point in the history

  11. Remove debuggers

    @maxgerber
    maxgerber committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    44fb873 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. Merge pull request #66 from InFact-coop/export-to-airtable 

    Ages step validation fix
    @lucymk
    lucymk authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    3c901b5 View commit details
    Browse the repository at this point in the history

  2. + set review global env variables

    @maxgerber
    maxgerber committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    ce71524 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #68 from InFact-coop/review-configuration 

    Set review global env variables
    @ivan-unfolds
    ivan-unfolds authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    f3ad1d4 View commit details
    Browse the repository at this point in the history

  4. + Stop uploadToAirtable file breaking the app

    @maxgerber
    maxgerber committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    f0c4545 View commit details
    Browse the repository at this point in the history

  5. + Upload to Airtable script

    @maxgerber
    maxgerber committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    a41c979 View commit details
    Browse the repository at this point in the history

  6. + Remove required HOST variable

    @maxgerber
    maxgerber committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    c6ad94c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #69 from InFact-coop/review-configuration 

    Airtable script
    @ivan-unfolds
    ivan-unfolds authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    a156f7a View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. stop sending twilio reminders

    @lucymk
    lucymk committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    14f10f3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #71 from InFact-coop/cancel-twilio 

    stop sending twilio reminders
    @maxgerber
    maxgerber authored Dec 19, 2019
    Configuration menu
    Copy the full SHA
    5656b13 View commit details
    Browse the repository at this point in the history