for bugfix purposes

.gitignore

@@ -1,39 +1,3 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
 node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
 
 dev.sqlite3

README.md

@@ -1,24 +1,25 @@
-# Boilerplate: Knex.js
+# Movie-randomiser
+ An app with a big button that lets you randomly choose a movie to watch (by genre if you want).
 
-Phase 1 boilerplate project with:
+### User stories
+* I want to watch a movie with my class but we can't decide on what movie to watch.
+* I'm at home and I want to be able ot pick an actor or actress that I like, then click a button to randomly generate a movie.
 
- - Express
- - Knex
- - SQLite3
- - Express Handlebars
- - body-parser
- - AVA
- - Node Inspector
- - nodemon
+### MVP
+* An app with a big button to click on which randomly selects a movie to watch (by genre if desired).
+* Have a drop down menu that allows user to select either 'All' genres or by a specific genre.
+* Have a database for movies with a title, year and blurb column.
+* Have a database with a bunch of genre options.
+* Have a database which joins movies with their genres (as some movies may have more than one genre).
 
+### Stretch
+* A user can add more movies to the database through a form
 
-## Install
-
-```
-npm install
-npm run knex migrate:latest
-npm run knex seed:run
-npm run dev
-```
-
-Be sure to check out the other npm scripts too.
+### Instructions for use:
+- Open up Terminal and type the following:
+- Git clone https://github.com/natalie-perret/movie-randomiser.git
+- Navigate to the movie-randomiser repository
+- npm install
+- Open the repository using your favourered text editor
+- Open a browser and visit localhost:3000
+- Click on the movie randomiser. Enjoy

db.js

@@ -1,22 +1,158 @@
 
+var movieDb = require('moviedb')('5d6500fd40637e64552fe0ce86c7e9ca')
 
 function allGenres (connection) {
   return connection('genres').select(name)
 }
 
+function allMovies (connection) {
+  return connection('movies')
+}
+
 function getMovie (id, connection) {
   return connection('movies').select()
     .where('id', id)
     .first()
 }
 
+function genreId (name, connection) {
+  return connection('genres').select('id')
+    .where('name', name)
+    .first()
+}
+
 function getMovieGenres (movieId, connection) {
   return connection('genres')
   .join()
 }
 
+
+function addRandom(connection) {
+  getLatestMovie()
+    .then(findById)
+    .then((result) => {
+      connection('movies')
+        .insert({
+          title: result.original_title,
+          year: result.release_date.slice(0,4) || "No release date data",
+          blurb: result.overview || "No description data"
+        })
+        .then((movieid) => {
+          connection('types')
+            .insert({
+              movie_id: movieid,
+              genre_id: 15
+            })
+        })
+        .then((result) => {
+          console.log(result)
+        })
+    })
+    .catch(console.log)
+}
+
+
+function allGenres(connection) {
+  return connection('genres').select('name')
+}
+
+function getLatestMovie() {
+  return new Promise((resolve, reject) => {
+    movieDb.miscLatestMovies((err, res) => {
+      if (err) {
+        reject(err)
+      }
+      resolve(res)
+    })
+  })
+}
+
+
+function findById(result) {
+  let randId = Math.floor(Math.random() * result.id) + 1
+  return new Promise((resolve, reject) => {
+    movieDb.movieInfo({id: randId}, (err, res) => {
+      if (err) {
+        if (err.response.body.status_code != 34) { reject(err) }
+        resolve(findById(result))
+      }
+      resolve(res)
+    })
+  })
+}
+
+function getMovieGenres (movieId, connection) {
+  return connection('genres')
+    .join('types', 'genre_id', '=', 'genres.id')
+    .where('movie_id', movieId)
+}
+
+
+function getGenreMovies (genreId, connection) {
+  return connection('movies')
+    .join('types', 'movie_id', '=', 'movies.id')
+    .where('genre_id', genreId)
+}
+
+function randomise(movies) {
+  return new Promise ((resolve, reject) => {
+    var size = movies.length
+    if (size == 0) reject("No movies in db of this genre")
+    var pick = Math.floor(Math.random() * size)
+    console.log(pick);
+    resolve(movies[pick])
+  })
+}
+
+function searchMovies(keyword) {
+  return new Promise((resolve, reject) => {
+    movieDb.searchMovie({query: keyword}, (err, result) => {
+      if (err) {
+        console.log(err)
+        reject(err)
+      } else {
+        resolve(result)
+      }
+  })
+})
+}
+
+function addTitle(movie_id, connection) {
+  return new Promise((resolve, reject) => {
+    movieDb.movieInfo({id: movie_id}, (err, res) => {
+      if (err) {
+        console.log(err)
+        reject(err)
+      }
+      connection('movies')
+        .insert({
+          title: res.original_title,
+          year: res.release_date.slice(0,4) || "No release date data",
+          blurb: res.overview || "No description data"
+        })
+        .then((movieid) => {
+          return connection('types')
+            .insert({
+              movie_id: movieid,
+              genre_id: 15
+            })
+        })
+        .then((result) => {
+          resolve(res)
+        })
+    })
+  })
+}
+
 module.exports = {
-  allGenres: allGenres,
-  getMovie: getMovie,
-  getMovieGenres: getMovieGenres
+  allMovies: allMovies,
+  genreId: genreId,
+  getGenreMovies: getGenreMovies,
+  randomise: randomise,
+  searchMovies,
+  addRandom,
+  addTitle,
+  allGenres,
+  getMovie,
+  getMovieGenres
 }

migrations/20170512095626_movies.js

@@ -4,7 +4,7 @@ exports.up = function (knex, Promise) {
     table.increments('id').primary()
     table.string('title')
     table.string('year')
-    table.string('blurb')
+    table.text('blurb')
   })
 }
 

package.json

@@ -35,6 +35,8 @@
     "body-parser": "^1.16.0",
     "express": "^4.14.1",
     "express-handlebars": "^3.0.0",
-    "knex": "^0.12.6"
+    "knex": "^0.12.6",
+    "moviedb": "^0.2.8",
+    "pg": "^6.1.5"
   }
 }

public/main.css

@@ -0,0 +1,76 @@
+font-family: 'Raleway', sans-serif;
+
+
+* {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -box-sizing: border-box;
+
+
+}
+
+.headerbox{
+
+  border-radius: 25px;
+  border: 25px solid white;
+  padding: 25px;
+  margin: 25px;
+  text-align: center;
+}
+
+.header {
+  font-family: 'Ubuntu', sans-serif;
+  padding-top: 5px;
+    padding-bottom: 5px;
+    padding-left: 0px
+
+}
+
+body{
+  font-family: 'Raleway', sans-serif;
+    background-image: url("https://i.ytimg.com/vi/JvIONJQ54Mw/maxresdefault.jpg");
+    background-size: cover;
+    background-repeat: no-repeat;
+    color: white;
+}
+
+.bigbox{
+
+  border-radius: 25px;
+  border: 25px solid white;
+  padding: 25px;
+  margin: 25px;
+  text-align: center;
+}
+
+h1 {
+  font-size: 12rem
+}
+
+#genreList {
+  color: black
+}
+
+input[type=submit] {
+  margin: 20px;
+  color: white;
+  background-color: blue;
+  border: 2px;
+  cursor: pointer;
+}
+
+input[type=text] {
+  margin: 20px;
+  color: black;
+  background-color: white;
+  border: 2px;
+  cursor: pointer;
+}
+
+button[type=submit] {
+  margin: 20px;
+  color: white;
+  background-color: blue;
+  border: 2px;
+  cursor: pointer;
+}