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

236 simple api rebased #290

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open

236 simple api rebased #290

wants to merge 35 commits into from

Commits on Jan 6, 2018

  1. Updated dev-envt config file

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    614ba53 View commit details
    Browse the repository at this point in the history

  2. Create Adopted controller for API, and wrote initial auth/authorizati… 

    …on code for API using basic auth
    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    2274f4d View commit details
    Browse the repository at this point in the history

  3. Add API route, and setting to allow for basic_auth

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    c007d1c View commit details
    Browse the repository at this point in the history

  4. Forgot to add the helper file

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    e1c2f24 View commit details
    Browse the repository at this point in the history

  5. Edited authentication controller so that a session isn't created on t… 

    …he back-end, Added admin check, Render json for adopted drains
    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    8b188b5 View commit details
    Browse the repository at this point in the history

  6. Adopted Drains API controller test

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    d16cbb3 View commit details
    Browse the repository at this point in the history

  7. Trying to fix Travis CI errors

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    6615a92 View commit details
    Browse the repository at this point in the history

  8. Added formatting for different content types, and edited fields to be… 

    … output
    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    ac6c3f7 View commit details
    Browse the repository at this point in the history

  9. (Finally realized I can run Rubocop on my local machine)

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    b7d863a View commit details
    Browse the repository at this point in the history

  10. More controller tests

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    e2052d0 View commit details
    Browse the repository at this point in the history

  11. Add Faker gem in order to make sample users

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    ffbe684 View commit details
    Browse the repository at this point in the history

  12. Adding some user seeds

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    cfee6da View commit details
    Browse the repository at this point in the history

  13. Added a rake task for DEV so mock users can automatically adopt drain… 

    …s. I created this initially to test out how the API would handle load
    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    96aae96 View commit details
    Browse the repository at this point in the history

  14. Passing rubocop

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    056ed5c View commit details
    Browse the repository at this point in the history

  15. Changing !nil to nil... !nil evaluates to true

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    0f816bf View commit details
    Browse the repository at this point in the history

  16. Initial comments for cursor funcionality

    @jszwedko
    root authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    395ad25 View commit details
    Browse the repository at this point in the history

  17. Adding Kaminari gem for pagination

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    227ee70 View commit details
    Browse the repository at this point in the history

  18. added pagination functionality to API

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    9ce0b74 View commit details
    Browse the repository at this point in the history

  19. Made is so that a CSV template is rendered with all results rather th… 

    …an paged results
    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    3ec42b8 View commit details
    Browse the repository at this point in the history

  20. auto_adopt task comment for further clarification

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    b945bec View commit details
    Browse the repository at this point in the history

  21. Added a total_pages variable, changed default page to 1, and a adopte… 

    …d_drains var
    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    0423a9c View commit details
    Browse the repository at this point in the history

  22. Updating versions

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    d822448 View commit details
    Browse the repository at this point in the history

  23. Removed format options - JSON is the only format available now

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    2c71f1b View commit details
    Browse the repository at this point in the history

  24. Updated pagination defaults

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    32f2243 View commit details
    Browse the repository at this point in the history

  25. Uncommenting so I could add drains

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    ca68a43 View commit details
    Browse the repository at this point in the history

  26. Making this clearer, and printing out info

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    c385883 View commit details
    Browse the repository at this point in the history

  27. Response data tests for pagination counts and drain data

    @jszwedko
    James Fowler authored and jszwedko committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    9bb9fdf View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Adding seed data for API controller test that asserts page counts

    James Fowler authored and James Fowler committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    de24cf8 View commit details
    Browse the repository at this point in the history

  2. Moving adopted_controller before_action filters for :index, to better… 

    … organize
    James Fowler authored and James Fowler committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    89dcd50 View commit details
    Browse the repository at this point in the history

  3. Using the Thing.adopted scope in place of a where clause

    James Fowler authored and James Fowler committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    eda7dcb View commit details
    Browse the repository at this point in the history

  4. Removing API template for rendering CSV, since we are only allowing JSON

    James Fowler authored and James Fowler committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    186b923 View commit details
    Browse the repository at this point in the history

  5. Getting tests to pass

    James Fowler authored and James Fowler committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    bb6afe4 View commit details
    Browse the repository at this point in the history

  6. Changing require Rake to rake

    James Fowler authored and James Fowler committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    4c71b20 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2018

  1. Trying to get the Github tests to pass - Unsure of the problem

    James Fowler authored and James Fowler committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    5a92109 View commit details
    Browse the repository at this point in the history

  2. Remove test file

    James Fowler authored and James Fowler committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    d760550 View commit details
    Browse the repository at this point in the history