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

Conversation

BlueColorPencils
Copy link

@BlueColorPencils BlueColorPencils commented Jun 25, 2016 •
edited
Loading

cristal + mindy
here it is. had fun with it

mcarson1111 and others added 30 commits June 14, 2016 14:53
@mcarson1111
created a route, controller and view for index
9d587a7
@mcarson1111
Created a route that responds to /zomg that serves a json-encoded method
41068be
added a tasks folder with a load_schema.. that currently doesn't load…
dc781ef 
… 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.
@mcarson1111
added pseudo routes
c072b52
@mcarson1111
did some changes to the schema files
8995ae3
@mcarson1111
changes words on schema file
ee3e937
following jeremy in class for seeding data
46e74c3
fixed the routes and added a function and callback for Movies.all
f30975b
added customers and movies controller and models
ed72207
added sequel statements to the customer and movie models instead of l…
514d424 
…oops within loops. only thing to finish is order bys and history.
@mcarson1111
tried fixing the queries for all rentals and specific rentals info
4afa5e1
@mcarson1111
kept both seed files
25d532b
successfully created a testing and development environment. db:reset …
93dc7d9 
…will reset both testing and development database. now to make sure models/controllers are in the development environment when necessary.
previously also created a setup.js and added istanbul for testing. ju…
671c213 
…st deleted a bunch of comments to clean up files
cleaned up conflicts from creating 2 diff env databases.
8b71202
reseeded to add a searchable title column and an inventory total. fix…
4856dbf 
…ed a syntax error in rentals.js. going to work on rentals for fun
finished rentals checkout
9c7f09a
@mcarson1111
got functions for seraching movie titles and searching for customers …
12791c9 
…who currently have queried movies checked out
@mcarson1111
got functions for seraching movie titles and searching for customers …
c80540d 
…who currently have queried movies checked out
added return functionality. it works
a4dabad
@mcarson1111
updated the find customers name function to show name instead of id
53fb652
finished return
b7da68f
changes were in rentals model and controller. commented out conflicti…
087ad12 
…ng code from Mindy. her code works we simply decided to use my formatting.
sending over rental model changes
a9df2f6
tried to finish overdue. turns out it was a problem with the order of…
c0ec829 
… our routes for rentals. we need to figure out how to get movie and customer info from the rentals row info in the model.
can find overdue rentals. had to split it up to be able to do time lo…
0fdb38a 
…gic with javascript.
@mcarson1111
added html view of api documentation
c61f37c
@mcarson1111
added instructions for customer_id sent through JSON body
3fc3ce8
finished overdue functionality for rentals
4944f85
Merge branch 'master' of github.com:mcarson1111/VideoStoreAPI
33cab26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yourFriendWes yourFriendWes

@annaleeherrera annaleeherrera

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BlueColorPencils @yourFriendWes @annaleeherrera @mcarson1111