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.

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

Video Stores #2

Open
wants to merge 91 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
1f9bb09
added customers and movies route files
annamm77 Jun 14, 2016
e3ccafe
added movies and customers routes to app.js
annamm77 Jun 14, 2016
86d8707
moved something
annamm77 Jun 14, 2016
3aac48f
tested zomg route and it worked
annamm77 Jun 14, 2016
2d87356
Added massive to npm, and gave it wave1 scripts
nicosaki Jun 14, 2016
3125a51
single route change /sort
nicosaki Jun 14, 2016
085fa3d
db/setup schema
nicosaki Jun 14, 2016
6289482
load schema and (non functional) seeding tasks
nicosaki Jun 14, 2016
4b9a5c9
Updated package.json; scripts + seed to db:reset (not yet working)
nicosaki Jun 14, 2016
44cf9d1
Added instance of controller to customers routes
nicosaki Jun 14, 2016
80cc378
Added instance of movies to movies routes
nicosaki Jun 14, 2016
92c4acf
extra index routes
nicosaki Jun 14, 2016
c13105c
fixed scripts, seed still bad
nicosaki Jun 14, 2016
82528b9
Idunnolol
nicosaki Jun 14, 2016
d064cb3
Controller scaffolding, no complete methods
nicosaki Jun 14, 2016
9e4f462
Customers routes updated
nicosaki Jun 14, 2016
4334276
task to seed - INCORRECT
nicosaki Jun 14, 2016
aeaad3c
movies routes to controller, includes rentals
nicosaki Jun 14, 2016
8b82b56
not sure what you want me to commit, git
nicosaki Jun 14, 2016
ea9ab9b
log stuff that probably goes in the .gitignore
nicosaki Jun 14, 2016
740a680
moved controllers to correct file, deleted extra movies controller
annamm77 Jun 15, 2016
d967453
updated seed script, unknown if works
nicosaki Jun 15, 2016
d0f5940
finished seed script with asynch functionality
nicosaki Jun 15, 2016
e1b1b14
fixed schema - still no index but is working
nicosaki Jun 15, 2016
e0bfbbc
fixed massive db errors
nicosaki Jun 15, 2016
273fb94
edited an error where massive was being referred to as a database. ch…
annamm77 Jun 15, 2016
3399dab
fixed seed script
nicosaki Jun 15, 2016
7ce6835
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
nicosaki Jun 15, 2016
0d437a2
two SQL commands for movies controller
annamm77 Jun 16, 2016
c51dd94
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
nicosaki Jun 16, 2016
f100322
sorttitle controller function returns JSON of sorted movie titles
annamm77 Jun 16, 2016
ea0a928
movies sortrelease works
annamm77 Jun 16, 2016
b254141
created rentals seed
annamm77 Jun 16, 2016
c445524
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
nicosaki Jun 16, 2016
730fd1c
Added rental seed script
nicosaki Jun 16, 2016
28c1ac3
Ability to see currently checked out movies by id number
nicosaki Jun 16, 2016
b1a410f
Ability to see previously checked out movies by id number
nicosaki Jun 16, 2016
0abe12d
added rentals to app.js routes
annamm77 Jun 16, 2016
444e42a
no rentals routes nevermind hehe
annamm77 Jun 16, 2016
8b5b222
Added all movies endpoints and rentalsTitle(NONFUNCTIONAL) to movies …
nicosaki Jun 16, 2016
58900ea
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
nicosaki Jun 16, 2016
f8acce5
added customer id to movie routes that check in and check out movies
annamm77 Jun 16, 2016
465c269
scaffolded return function
annamm77 Jun 16, 2016
378b6b3
updated movies/rentals/return route to a get
annamm77 Jun 17, 2016
05362cf
return function does what it's supposed to. might want to change what…
annamm77 Jun 17, 2016
4359739
return route returns 200 success upon update
annamm77 Jun 17, 2016
24d49ec
changed movies/returns/checkout to get
annamm77 Jun 17, 2016
362f029
checkout function will create a new rental instance
annamm77 Jun 17, 2016
49d5632
Methods all complete and functional for customer routes
nicosaki Jun 17, 2016
5ab6d98
All methods added for movie routes, functional, wheee
nicosaki Jun 17, 2016
c372c91
All endpoints complete and functional
nicosaki Jun 17, 2016
172a544
added movies / route
annamm77 Jun 17, 2016
8efb962
added allMovies controller function for / path
annamm77 Jun 17, 2016
3faea59
moved rentals/overdue route above rentals/:id route because it was ge…
annamm77 Jun 17, 2016
09714e0
overdue controller function works
annamm77 Jun 17, 2016
4ea9647
Fixed customer info show for current and history sorts
nicosaki Jun 17, 2016
08c4f34
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
nicosaki Jun 17, 2016
def6b6f
added start-test and test scripts
annamm77 Jun 17, 2016
4de6aee
added customers controller spec file
annamm77 Jun 17, 2016
da60deb
added n and p to queries involving configurable sorting
nicosaki Jun 17, 2016
78d72af
movies controller with custome information displayed in current/histo…
nicosaki Jun 17, 2016
644b1db
fixed route for sorting by release-date
nicosaki Jun 17, 2016
457d37c
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
nicosaki Jun 17, 2016
a60b62f
all endpoints complete and functionally tested. Formal testing next
nicosaki Jun 17, 2016
e5f18d0
checkout function deducts from customers account
annamm77 Jun 20, 2016
e0b5145
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
annamm77 Jun 20, 2016
8e7ff34
checkout and return are now posts instead of gets. works in postman s…
annamm77 Jun 20, 2016
43b7613
installed istanbul
annamm77 Jun 20, 2016
50e9829
remove coverage from git tracking
annamm77 Jun 20, 2016
0cd3c08
updated test script to include instanbul and it works yey
annamm77 Jun 20, 2016
57a09ab
Created documentation for our API, have not yet connected its existen…
nicosaki Jun 20, 2016
775ae32
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
nicosaki Jun 20, 2016
9aee2be
tests for /movies route
annamm77 Jun 20, 2016
aa195e6
testing for /customers
annamm77 Jun 20, 2016
4a3e3aa
Added .json documentation endpoint, successful.
nicosaki Jun 20, 2016
1044e71
Merge branch 'master' of github.com:annamw77/VideoStoreAPI
nicosaki Jun 20, 2016
3e8b816
added array of objects tests for movies and cusomters
annamm77 Jun 21, 2016
8dc8e1e
Minor test change
nicosaki Jun 21, 2016
e9121ec
test coverage for more endpoints in movies
annamm77 Jun 21, 2016
8a34e0d
fixmerge
nicosaki Jun 22, 2016
5b5a978
MERGE ALREADY
nicosaki Jun 22, 2016
d21395e
Fixed tests, all pass; functional testing not being checked by istanbul
nicosaki Jun 23, 2016
8d89d2c
deleted a bracket because javascript
annamm77 Jun 23, 2016
5169923
removed the bracket i worked so hard to delete
annamm77 Jun 23, 2016
3370f6b
refactored doubled sql commands
annamm77 Jun 23, 2016
226ab50
added details for checkout route
annamm77 Jun 24, 2016
6b1acb1
fixed bug with rentalstitle
annamm77 Jun 24, 2016
8cd23ac
edited checkout URL
annamm77 Jun 24, 2016
93668cc
added statement about errors
annamm77 Jun 24, 2016
3158e46
edited some so that errors will show
annamm77 Jun 24, 2016
439fb49
minor edits
annamm77 Jun 24, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added start-test and test scripts
  • Loading branch information
annamm77 committed Jun 17, 2016
commit def6b6f95f7ec2f425503f6b79d5c8d6bcbebc09
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
"private": true,
"scripts": {
"start": "nodemon ./bin/www",
"start-test": "NODE_ENV=test ./node_modules/.bin/nodemon ./bin/www",
"test": "clear; jasmine-node --verbose spec/",
"db:create": "createdb video_store",
"db:seed": "clear; node tasks/db_seed.js",