From 0404fd611bba80c54da2b14aff137a8c4b99ba77 Mon Sep 17 00:00:00 2001 From: Abdullah Chaudhry Date: Wed, 26 Jul 2017 16:29:01 +0100 Subject: [PATCH 1/6] Update Readme --- README.md | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 303b5b8..08196f6 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,43 @@ # week-5-CADJ - ## WHY (describing the purpose) -Abdullah spends so much time trying to find a movie to watch that he ends up not watching one. +Abdullah spends so much time trying to find a movie to watch that he ends up not watching one at all. He would like to be able to choose a year and/or a genre and get a random movie suggestion fitting those requirements. -A movie discovery website +He would like to see the movies poster, a summary, it's release data and running time and a review if possible. It would be nice if he could see a trailer for the movie aswell. ## WHAT (describing your site) +FilmByte returns a random film based on a chose genre and year a user selects. + ### User Stories +As a user, I can: + +1. Enter a date between 1896-2017 +2. Select a genre from a dropdown menu +3. Get a random movie suggestion + ### Stretch Goals -- [ ] stretch 1 -- [ ] stretch 2 -- [ ] stretch 3 +- [ ] Add review to movie info +- [ ] Be able to search for a movie +- [ ] Movie suggestion in modal box ## HOW (describing the journey to completion) + ### Architecture + #### Drawing out our user experience + #### Separation of Concerns -### Data Storage and Retrival -### API transport considerations +### API -### DOM Manipulation ### Useful Links + + From fcf614186a62f2c462650715795a4e31e0ab30fc Mon Sep 17 00:00:00 2001 From: Constantina Date: Wed, 26 Jul 2017 16:46:20 +0100 Subject: [PATCH 2/6] firstfiles gitignore and package json --- .eslintrc.json | 7 ++++++ .gitignore/.gitignore => .gitignore | 3 ++- package.json | 34 +++++++++++++++++++++++++++++ public/dom.js | 0 public/index.html | 0 public/index.js | 0 public/style.css | 0 src/handler.js | 0 src/router.js | 0 src/selectmovie.js | 0 src/server.js | 0 tests/index.test.js | 0 tests/router.test.js | 0 tests/selectmovie.test.js | 0 14 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 .eslintrc.json rename .gitignore/.gitignore => .gitignore (98%) create mode 100644 package.json create mode 100644 public/dom.js create mode 100644 public/index.html create mode 100644 public/index.js create mode 100644 public/style.css create mode 100644 src/handler.js create mode 100644 src/router.js create mode 100644 src/selectmovie.js create mode 100644 src/server.js create mode 100644 tests/index.test.js create mode 100644 tests/router.test.js create mode 100644 tests/selectmovie.test.js diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..fb1652b --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,7 @@ +{ + "extends": ["eslint:recommended"], + "env": { + "browser": true, + "node":true + } +} diff --git a/.gitignore/.gitignore b/.gitignore similarity index 98% rename from .gitignore/.gitignore rename to .gitignore index 00cbbdf..1b53bc1 100644 --- a/.gitignore/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +node_modules + # Logs logs *.log @@ -56,4 +58,3 @@ typings/ # dotenv environment variables file .env - diff --git a/package.json b/package.json new file mode 100644 index 0000000..f98b4aa --- /dev/null +++ b/package.json @@ -0,0 +1,34 @@ +{ + "name": "week-5-cadj", + "version": "1.0.0", + "description": "Movie suggester", + "main": "index.js", + "directories": { + "test": "tests" + }, + "scripts": { + "test": "node tests/*.test.js | tap-spec", + "devStart": "nodemon src/server.js", + "coverage": "./node_modules/.bin/istanbul cover tape ./tests/*.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/AbdullahChaudhry/week-5-CADJ.git" + }, + "author": "Abs, Constantina, Dak, James", + "license": "ISC", + "bugs": { + "url": "https://github.com/AbdullahChaudhry/week-5-CADJ/issues" + }, + "homepage": "https://github.com/AbdullahChaudhry/week-5-CADJ#readme", + "devDependencies": { + "eslint": "^4.3.0", + "istanbul": "^0.4.5", + "nodemon": "^1.11.0", + "tap-spec": "^4.1.1", + "tape": "^4.7.0" + }, + "dependencies": { + "request": "^2.81.0" + } +} diff --git a/public/dom.js b/public/dom.js new file mode 100644 index 0000000..e69de29 diff --git a/public/index.html b/public/index.html new file mode 100644 index 0000000..e69de29 diff --git a/public/index.js b/public/index.js new file mode 100644 index 0000000..e69de29 diff --git a/public/style.css b/public/style.css new file mode 100644 index 0000000..e69de29 diff --git a/src/handler.js b/src/handler.js new file mode 100644 index 0000000..e69de29 diff --git a/src/router.js b/src/router.js new file mode 100644 index 0000000..e69de29 diff --git a/src/selectmovie.js b/src/selectmovie.js new file mode 100644 index 0000000..e69de29 diff --git a/src/server.js b/src/server.js new file mode 100644 index 0000000..e69de29 diff --git a/tests/index.test.js b/tests/index.test.js new file mode 100644 index 0000000..e69de29 diff --git a/tests/router.test.js b/tests/router.test.js new file mode 100644 index 0000000..e69de29 diff --git a/tests/selectmovie.test.js b/tests/selectmovie.test.js new file mode 100644 index 0000000..e69de29 From b0cc038db16508afea5ada093722d0751c2e9b14 Mon Sep 17 00:00:00 2001 From: Dakshina Scott Date: Wed, 26 Jul 2017 16:58:45 +0100 Subject: [PATCH 3/6] Adds shot fixes #9 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index f98b4aa..4a992ac 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "eslint": "^4.3.0", "istanbul": "^0.4.5", "nodemon": "^1.11.0", + "shot": "^3.4.2", "tap-spec": "^4.1.1", "tape": "^4.7.0" }, From 891aa87f016173e4b8a8d4d676c168b56a5acf61 Mon Sep 17 00:00:00 2001 From: Dakshina Scott Date: Wed, 26 Jul 2017 17:03:52 +0100 Subject: [PATCH 4/6] Adds shot fixes #9 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index f98b4aa..4a992ac 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "eslint": "^4.3.0", "istanbul": "^0.4.5", "nodemon": "^1.11.0", + "shot": "^3.4.2", "tap-spec": "^4.1.1", "tape": "^4.7.0" }, From 19816ea4dd205891f34133778aa86479d31e8173 Mon Sep 17 00:00:00 2001 From: RogeredBacon Date: Thu, 27 Jul 2017 11:26:12 +0100 Subject: [PATCH 5/6] Added form and title items to index.html #2 --- public/index.html | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/public/index.html b/public/index.html index e69de29..1f2aa3d 100644 --- a/public/index.html +++ b/public/index.html @@ -0,0 +1,49 @@ + + + + + + + + FilmByte + + + + + +

FilmByte

+

Randomise your dreams!

+
+
+ + + + + +
+
+ + From cf3758188c0577a0d51d5e9f5907ad542f198b99 Mon Sep 17 00:00:00 2001 From: RogeredBacon Date: Thu, 27 Jul 2017 11:49:54 +0100 Subject: [PATCH 6/6] Added div for the DOM to manipulate #2 --- public/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/index.html b/public/index.html index 1f2aa3d..4be4f94 100644 --- a/public/index.html +++ b/public/index.html @@ -45,5 +45,8 @@

Randomise your dreams!

+
+ +