From b3f6aa542e8c8795be2e45b2a3ea6313a1c396f4 Mon Sep 17 00:00:00 2001
From: mitroio <mitroio@uni.coventry.ac.uk>
Date: Tue, 16 Oct 2018 11:16:41 +0100
Subject: [PATCH] Done all tasks for week 2

---
 .vscode/settings.json                         |   2 ++
 .../02_dynamic_website/bookshop/.eslintrc     |   1 +
 .../02_dynamic_website/bookshop/bookshop.db   | Bin 49152 -> 49152 bytes
 .../02_dynamic_website/bookshop/index.js      |   4 ++--
 .../02_dynamic_website/bookshop/package.json  |   3 ++-
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 exercises/01_nodejs/02_dynamic_website/bookshop/.eslintrc

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/.eslintrc b/exercises/01_nodejs/02_dynamic_website/bookshop/.eslintrc
new file mode 100644
index 0000000..8a78d20
--- /dev/null
+++ b/exercises/01_nodejs/02_dynamic_website/bookshop/.eslintrc
@@ -0,0 +1 @@
+{ "parserOptions": { "ecmaVersion": 6 } }
\ No newline at end of file
diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/bookshop.db b/exercises/01_nodejs/02_dynamic_website/bookshop/bookshop.db
index 5672988bea5eb9e97020b4b5f83f7a68e87ca536..fb5921594ce302509643e9009d488b235ce357c4 100755
GIT binary patch
delta 111
zcmZo@U~Xt&o*>Q0IZ?)$m6JhFrD0>rY<)()O$IChJS>bS7&ruZKQo@-J-At*;Sx6!
z<HOBQy6-X?8Srs1D6-lzFffFqR+K1&WR~QlGRW+kDJ2q;ky)$&M2QL|AeoZX;u3|V
M{QT_ApL=<Y00ajjmjD0&

delta 64
zcmZo@U~Xt&o*>Q0F;T{um4iW#F=}JVY<))FO$IChJj{$I7&ruZKLaW5%>oUVxS5!Q
TH$UmV%Q*RNyV2&)y}U*MFYOci

diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/index.js b/exercises/01_nodejs/02_dynamic_website/bookshop/index.js
index c55bbaf..b27d1f0 100644
--- a/exercises/01_nodejs/02_dynamic_website/bookshop/index.js
+++ b/exercises/01_nodejs/02_dynamic_website/bookshop/index.js
@@ -34,7 +34,7 @@ const db = new sqlite3.Database('./bookshop.db', (err) => {
 })*/
 
 app.get('/', async(req, res) => {
-	let sql = 'SELECT id, title FROM books;'
+	let sql = 'SELECT id, title, description, year FROM books;'
 	// --------
 	let querystring = ''
 	console.log(req.query.q)
@@ -50,7 +50,7 @@ app.get('/', async(req, res) => {
 	db.all(sql, (err, data) => {
 		if(err) console.error(err.message)
 		console.log(data)
-		res.render('newindex', {books: data, query: querystring})
+		res.render('newindex', {books: data, query: querystring || ' '})
 	})
 }) 
 
diff --git a/exercises/01_nodejs/02_dynamic_website/bookshop/package.json b/exercises/01_nodejs/02_dynamic_website/bookshop/package.json
index 6a345b1..4b246dc 100644
--- a/exercises/01_nodejs/02_dynamic_website/bookshop/package.json
+++ b/exercises/01_nodejs/02_dynamic_website/bookshop/package.json
@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "eslint index.js"
   },
   "author": "",
   "license": "ISC",