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

yo #11

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

yo #11

wants to merge 35 commits into from

Commits on Jun 14, 2016

  1. created a route, controller and view for index

    @mcarson1111
    mcarson1111 committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    9d587a7 View commit details
    Browse the repository at this point in the history

  2. Created a route that responds to /zomg that serves a json-encoded method

    @mcarson1111
    mcarson1111 committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    41068be View commit details
    Browse the repository at this point in the history

  3. added a tasks folder with a load_schema.. that currently doesn't load… 

    … schema. but we added in our 3 tables for movies, customers and rentals in the schema.sql setup. called the seed files in package.json mebbe. still dk how to seed.
    Cristal Tay committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    dc781ef View commit details
    Browse the repository at this point in the history

  4. added pseudo routes

    @mcarson1111
    mcarson1111 committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    c072b52 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2016

  1. did some changes to the schema files

    @mcarson1111
    mcarson1111 committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    8995ae3 View commit details
    Browse the repository at this point in the history

  2. changes words on schema file

    @mcarson1111
    mcarson1111 committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    ee3e937 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2016

  1. following jeremy in class for seeding data

    Cristal Tay committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    46e74c3 View commit details
    Browse the repository at this point in the history

  2. fixed the routes and added a function and callback for Movies.all

    Cristal Tay committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    f30975b View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. added customers and movies controller and models

    Cristal Tay committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    ed72207 View commit details
    Browse the repository at this point in the history

  2. added sequel statements to the customer and movie models instead of l… 

    …oops within loops. only thing to finish is order bys and history.
    Cristal Tay committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    514d424 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. tried fixing the queries for all rentals and specific rentals info

    @mcarson1111
    mcarson1111 committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    4afa5e1 View commit details
    Browse the repository at this point in the history

  2. kept both seed files

    @mcarson1111
    mcarson1111 committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    25d532b View commit details
    Browse the repository at this point in the history

  3. successfully created a testing and development environment. db:reset … 

    …will reset both testing and development database. now to make sure models/controllers are in the development environment when necessary.
    Cristal Tay committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    93dc7d9 View commit details
    Browse the repository at this point in the history

  4. previously also created a setup.js and added istanbul for testing. ju… 

    …st deleted a bunch of comments to clean up files
    Cristal Tay committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    671c213 View commit details
    Browse the repository at this point in the history

  5. cleaned up conflicts from creating 2 diff env databases.

    Cristal Tay committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    8b71202 View commit details
    Browse the repository at this point in the history

  6. reseeded to add a searchable title column and an inventory total. fix… 

    …ed a syntax error in rentals.js. going to work on rentals for fun
    Cristal Tay committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    4856dbf View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2016

  1. finished rentals checkout

    Cristal Tay committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    9c7f09a View commit details
    Browse the repository at this point in the history

  2. got functions for seraching movie titles and searching for customers … 

    …who currently have queried movies checked out
    @mcarson1111
    mcarson1111 committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    12791c9 View commit details
    Browse the repository at this point in the history

  3. got functions for seraching movie titles and searching for customers … 

    …who currently have queried movies checked out
    @mcarson1111
    mcarson1111 committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    c80540d View commit details
    Browse the repository at this point in the history

  4. added return functionality. it works

    Cristal Tay committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    a4dabad View commit details
    Browse the repository at this point in the history

  5. updated the find customers name function to show name instead of id

    @mcarson1111
    mcarson1111 committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    53fb652 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2016

  1. finished return

    Cristal Tay committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    b7da68f View commit details
    Browse the repository at this point in the history

  2. changes were in rentals model and controller. commented out conflicti… 

    …ng code from Mindy. her code works we simply decided to use my formatting.
    Cristal Tay committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    087ad12 View commit details
    Browse the repository at this point in the history

  3. sending over rental model changes

    Cristal Tay committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    a9df2f6 View commit details
    Browse the repository at this point in the history

  4. tried to finish overdue. turns out it was a problem with the order of… 

    … our routes for rentals. we need to figure out how to get movie and customer info from the rentals row info in the model.
    Cristal Tay committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    c0ec829 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. can find overdue rentals. had to split it up to be able to do time lo… 

    …gic with javascript.
    Cristal Tay committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    0fdb38a View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2016

  1. added html view of api documentation

    @mcarson1111
    mcarson1111 committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    c61f37c View commit details
    Browse the repository at this point in the history

  2. added instructions for customer_id sent through JSON body

    @mcarson1111
    mcarson1111 committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    3fc3ce8 View commit details
    Browse the repository at this point in the history

  3. finished overdue functionality for rentals

    Cristal Tay committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    4944f85 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:mcarson1111/VideoStoreAPI

    Cristal Tay committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    33cab26 View commit details
    Browse the repository at this point in the history

  5. finished json api documentation

    @mcarson1111
    mcarson1111 committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    300cb04 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:mcarson1111/VideoStoreAPI

    @mcarson1111
    mcarson1111 committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    f71636a View commit details
    Browse the repository at this point in the history

  7. added controller tests for customers, movie and rentals

    Cristal Tay committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    8e796ef View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of github.com:mcarson1111/VideoStoreAPI

    Cristal Tay committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    3c9c0cc View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2016

  1. finished model testings for customers

    Cristal Tay committed Jun 25, 2016
    Configuration menu
    Copy the full SHA
    4ccb782 View commit details
    Browse the repository at this point in the history