yo - #11

Open

BlueColorPencils wants to merge 35 commits into

Ada-C5:masterfrom

mcarson1111:master

Commits on Jun 14, 2016

created a route, controller and view for index
mcarson1111
committed
9d587a7
Created a route that responds to /zomg that serves a json-encoded method
mcarson1111
committed
41068be
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 packag…
Cristal Tay
committed
dc781ef
added pseudo routes
mcarson1111
committed
c072b52

Commits on Jun 15, 2016

did some changes to the schema files
mcarson1111
committed
8995ae3
changes words on schema file
mcarson1111
committed
ee3e937

Commits on Jun 16, 2016

following jeremy in class for seeding data
Cristal Tay
committed
46e74c3
fixed the routes and added a function and callback for Movies.all
Cristal Tay
committed
f30975b

Commits on Jun 17, 2016

added customers and movies controller and models
Cristal Tay
committed
ed72207
added sequel statements to the customer and movie models instead of loops within loops. only thing to finish is order bys and history.
Cristal Tay
committed
514d424

Commits on Jun 20, 2016

tried fixing the queries for all rentals and specific rentals info
mcarson1111
committed
4afa5e1
kept both seed files
mcarson1111
committed
25d532b
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 ne…
Cristal Tay
committed
93dc7d9
previously also created a setup.js and added istanbul for testing. just deleted a bunch of comments to clean up files
Cristal Tay
committed
671c213
cleaned up conflicts from creating 2 diff env databases.
Cristal Tay
committed
8b71202
reseeded to add a searchable title column and an inventory total. fixed a syntax error in rentals.js. going to work on rentals for fun
Cristal Tay
committed
4856dbf

Commits on Jun 21, 2016

finished rentals checkout
Cristal Tay
committed
9c7f09a
got functions for seraching movie titles and searching for customers who currently have queried movies checked out
mcarson1111
committed
12791c9
got functions for seraching movie titles and searching for customers who currently have queried movies checked out
mcarson1111
committed
c80540d
added return functionality. it works
Cristal Tay
committed
a4dabad
updated the find customers name function to show name instead of id
mcarson1111
committed
53fb652

Commits on Jun 22, 2016

finished return
Cristal Tay
committed
b7da68f
changes were in rentals model and controller. commented out conflicting code from Mindy. her code works we simply decided to use my formatting.
Cristal Tay
committed
087ad12
sending over rental model changes
Cristal Tay
committed
a9df2f6
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
c0ec829

Commits on Jun 23, 2016

can find overdue rentals. had to split it up to be able to do time logic with javascript.
Cristal Tay
committed
0fdb38a

Commits on Jun 24, 2016

added html view of api documentation
mcarson1111
committed
c61f37c
added instructions for customer_id sent through JSON body
mcarson1111
committed
3fc3ce8
finished overdue functionality for rentals
Cristal Tay
committed
4944f85
Merge branch 'master' of github.com:mcarson1111/VideoStoreAPI
Cristal Tay
committed
33cab26
finished json api documentation
mcarson1111
committed
300cb04
Merge branch 'master' of github.com:mcarson1111/VideoStoreAPI
mcarson1111
committed
f71636a
added controller tests for customers, movie and rentals
Cristal Tay
committed
8e796ef
Merge branch 'master' of github.com:mcarson1111/VideoStoreAPI
Cristal Tay
committed
3c9c0cc

Commits on Jun 25, 2016

finished model testings for customers
Cristal Tay
committed
4ccb782