Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: turingschool/Crate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: tylertomlinson/Crate
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
6 contributors

Commits on Jul 1, 2020

  1. Setup db

    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 1, 2020
    Copy the full SHA
    7be8bd6 View commit details

  2. Remove username from dev db

    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 1, 2020
    Copy the full SHA
    98c99a3 View commit details

  3. Add script for heroku-api

    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 1, 2020
    Copy the full SHA
    49de7ac View commit details

  4. Add PR template

    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 1, 2020
    Copy the full SHA
    7029a34 View commit details

Commits on Jul 5, 2020

  1. Setup db, add gender to signup form, add route to surveypreferences a… 

    …nd setup Survey component, add gender to api mutations, queries, and types
    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 5, 2020
    Copy the full SHA
    5e1949b View commit details

  2. Comment out gender field in the user Auth query

    @michellekaplan7 @kristastadler
    michellekaplan7 authored and kristastadler committed Jul 5, 2020
    Copy the full SHA
    7addf3c View commit details

  3. Add gender into the fields in user type

    @michellekaplan7 @kristastadler
    michellekaplan7 authored and kristastadler committed Jul 5, 2020
    Copy the full SHA
    aeabaaf View commit details

  4. Add whitespace to history.push onSubmit method

    @michellekaplan7 @kristastadler
    michellekaplan7 authored and kristastadler committed Jul 5, 2020
    Copy the full SHA
    3fdd63a View commit details

Commits on Jul 6, 2020

  1. Create migration for user table with style + gender

    @tylertomlinson
    tylertomlinson committed Jul 6, 2020
    Copy the full SHA
    b46e1cc View commit details

  2. Create migration for user table with style + gender

    @tylertomlinson
    tylertomlinson committed Jul 6, 2020
    Copy the full SHA
    111da69 View commit details

  3. Update user model

    @tylertomlinson
    tylertomlinson committed Jul 6, 2020
    Copy the full SHA
    41e664b View commit details

  4. Update user resolvers

    @tylertomlinson
    tylertomlinson committed Jul 6, 2020
    Copy the full SHA
    0669292 View commit details

  5. Update user types

    @tylertomlinson
    tylertomlinson committed Jul 6, 2020
    Copy the full SHA
    a9586f8 View commit details

  6. Update user mutations

    @tylertomlinson
    tylertomlinson committed Jul 6, 2020
    Copy the full SHA
    2f16d3d View commit details

  7. Merge branch 'Update_DB' of github.com:tylertomlinson/Crate into Upda… 

    …te_DB
    @tylertomlinson
    tylertomlinson committed Jul 6, 2020
    Copy the full SHA
    bcb00e4 View commit details

  8. Merge branch 'master' of github.com:tylertomlinson/Crate into Update_DB

    @tylertomlinson
    tylertomlinson committed Jul 6, 2020
    Copy the full SHA
    fab86e9 View commit details

  9. Merge pull request #35 from tylertomlinson/Update_DB 

    We worked on this code base as a group, approving the PR to add these changes to master.
    @kristastadler
    kristastadler authored Jul 6, 2020
    Copy the full SHA
    573ace3 View commit details

Commits on Jul 7, 2020

  1. Add publish heroku to package.json

    @broxbury @tylertomlinson
    broxbury authored and tylertomlinson committed Jul 7, 2020
    Copy the full SHA
    49311a3 View commit details

  2. Attempt to integrate BE with sign up form for gender

    @broxbury @tylertomlinson
    broxbury authored and tylertomlinson committed Jul 7, 2020
    Copy the full SHA
    0d812ab View commit details

  3. Add gender funcionality to log in and save to Redux

    @broxbury @tylertomlinson
    broxbury authored and tylertomlinson committed Jul 7, 2020
    Copy the full SHA
    348fd29 View commit details

  4. Add ability to pick gender on login and save to redux and mutate and … 

    …query GraphQl
    @broxbury @tylertomlinson
    broxbury authored and tylertomlinson committed Jul 7, 2020
    Copy the full SHA
    3ad77de View commit details

  5. Attempt to display only 3 crates

    @broxbury @tylertomlinson
    broxbury authored and tylertomlinson committed Jul 7, 2020
    Copy the full SHA
    bd0b3e9 View commit details

  6. Added userUpdateStyle mutation functionality 

    Add publish heroku to package.json
    “Krista committed Jul 7, 2020
    Copy the full SHA
    43cac38 View commit details

  7. Add gender funcionality to log in and save to Redux

    @broxbury
    broxbury authored and “Krista committed Jul 7, 2020
    Copy the full SHA
    2e22013 View commit details

  8. Add ability to pick gender on login and save to redux and mutate and … 

    …query GraphQl
    @broxbury
    broxbury authored and “Krista committed Jul 7, 2020
    Copy the full SHA
    2485c13 View commit details

  9. Merge branch 'master' of github.com:tylertomlinson/Crate into userUpd… 

    …ateStyle-Mutation-BE
    “Krista committed Jul 7, 2020
    Copy the full SHA
    74ca678 View commit details

  10. Merge pull request #38 from tylertomlinson/userUpdateStyle-Mutation-BE 

    userUpdateStyle
    @tylertomlinson
    tylertomlinson authored Jul 7, 2020
    Copy the full SHA
    98f3775 View commit details

Commits on Jul 8, 2020

  1. Remove seederStorage from development DB

    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 8, 2020
    Copy the full SHA
    3c8f35f View commit details

  2. Update crate back to default name

    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 8, 2020
    Copy the full SHA
    20a93d6 View commit details

  3. Remove gender from user migration

    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 8, 2020
    Copy the full SHA
    795f447 View commit details

  4. Add user with gender + style in seeder

    @tylertomlinson @kristastadler
    tylertomlinson authored and kristastadler committed Jul 8, 2020
    Copy the full SHA
    8bc4f50 View commit details

  5. Completed setup of Jest for backend testing framework

    “Krista committed Jul 8, 2020
    Copy the full SHA
    6a76460 View commit details

  6. Merge branch 'master' into be-testing

    @tylertomlinson
    tylertomlinson authored Jul 8, 2020
    Copy the full SHA
    20ca85d View commit details

  7. Merge pull request #40 from tylertomlinson/be-testing 

    Be testing
    @tylertomlinson
    tylertomlinson authored Jul 8, 2020
    Copy the full SHA
    78a82ce View commit details

Commits on Jul 9, 2020

  1. Add images for survey, complete Survey component, update Tile ui back… 

    …ground size
    @michellekaplan7
    michellekaplan7 committed Jul 9, 2020
    Copy the full SHA
    42cb66a View commit details

  2. Merge pull request #42 from tylertomlinson/feature/survey 

    FE: Survey
    @broxbury
    broxbury authored Jul 9, 2020
    Copy the full SHA
    de8e241 View commit details

Commits on Jul 10, 2020

  1. Added initial testing setup

    @broxbury @kristastadler
    broxbury authored and kristastadler committed Jul 10, 2020
    Copy the full SHA
    a38895c View commit details

  2. Initial singup and login tests complete

    @broxbury @kristastadler
    broxbury authored and kristastadler committed Jul 10, 2020
    Copy the full SHA
    80374bc View commit details

  3. Working on logic using string of values

    @kristastadler
    “Krista authored and kristastadler committed Jul 10, 2020
    Copy the full SHA
    e36a183 View commit details

  4. Logic for mutation is working

    @kristastadler
    “Krista authored and kristastadler committed Jul 10, 2020
    Copy the full SHA
    6f3f6b8 View commit details

  5. Add mutation to actions for survey

    @broxbury @kristastadler
    broxbury authored and kristastadler committed Jul 10, 2020
    Copy the full SHA
    d69434d View commit details

  6. Add frontend integrations with redux and graph ql

    @broxbury @kristastadler
    broxbury authored and kristastadler committed Jul 10, 2020
    Copy the full SHA
    2bb8c88 View commit details

Commits on Jul 11, 2020

  1. Completed Backend Testing

    “Krista committed Jul 11, 2020
    Copy the full SHA
    d564c84 View commit details

  2. Add images for survey, complete Survey component, update Tile ui bacg… 

    …round size
    @michellekaplan7
    michellekaplan7 authored and “Krista committed Jul 11, 2020
    Copy the full SHA
    e6b0758 View commit details

  3. Logic for mutation is working

    “Krista committed Jul 11, 2020
    Copy the full SHA
    9afea10 View commit details

  4. Add mutation to actions for survey

    @broxbury
    broxbury authored and “Krista committed Jul 11, 2020
    Copy the full SHA
    80ce7ff View commit details

  5. Add frontend integrations with redux and graph ql

    @broxbury
    broxbury authored and “Krista committed Jul 11, 2020
    Copy the full SHA
    a230e77 View commit details

  6. Merge pull request #48 from tylertomlinson/tyler-testing 

    Backend Testing
    @tylertomlinson
    tylertomlinson authored Jul 11, 2020
    Copy the full SHA
    8116e4d View commit details

  7. Update crate seeders

    @michellekaplan7
    michellekaplan7 committed Jul 11, 2020
    Copy the full SHA
    bcbd9b8 View commit details

  8. Conditionally render path on crate item depending on status of style

    @michellekaplan7
    michellekaplan7 committed Jul 11, 2020
    Copy the full SHA
    b079289 View commit details
Showing 423 changed files with 39,317 additions and 7,612 deletions.
23 changes: 23 additions & 0 deletions .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## All Submissions:

### Issues

Resolves #

### New Feature Submissions:

* [ ] Have you added an explanation of what your changes do?
* [ ] Have you lint your code locally prior to submission?

### Testing:

* [ ] Have you written new tests for your core changes, as applicable?
* [ ] Have you successfully ran tests with your changes locally?
* [ ] All new and existing tests passed?
* [ ] Have you run linter?

**Test coverage** =
--------------------------------------------------------------------------------
### Change Log:

### Technical debt:
Loading