Merge branch 'master' into searchfix

Author: philawsophizing

README.md

@@ -1,6 +1,8 @@
 # week6-facn-hosers
 App to list food and coffee locations around Nazareth
 
+Check it out hosted on [heroku](https://facn-app.herokuapp.com/)
+
 ## User Stories
 As a tourist in Nazareth looking for somewhere to eat or drink
 > I want to visit the site and see a list of places with locations, ratings, prices, and descriptions

src/DBquery.js

@@ -1,35 +1,22 @@
-const dbConnection = require('../database/db_connection.js');
+const dbConnection = require('../database/db_connection.js')
 
-function getData(search, cb){
-  if (!search){
-    dbConnection.query('SELECT shop_name, shop_rating, cost, address, description, tags FROM shops;', (err, res) => {
-      if (err) cb(err);
-      cb(null, res.rows);
-    });
-  }
-  else {
-    // dbConnection.query(`SELECT shop_name, shop_rating, cost, address, description,tags FROM shops WHERE tags LIKE '%`+ search +`%';`, (err, res)
 
-    dbConnection.query(`SELECT shop_name, shop_rating, cost, address, description,tags FROM shops WHERE tags ILIKE '%${search}%';`,
-     (err, res) => {
-      if (err) cb(err);
-      cb(null, res.rows);
-    });
-  };
+function getAllData(cb){
+  dbConnection.query('SELECT shop_name, shop_rating, cost, address, description, tags FROM shops;', (err, res) => {
+    if (err) return cb(err);
+    cb(null, res.rows);
+  });
 }
 
-// function render(err, res){
-//   if (err) {
-//     console.log(err);
-//     return;
-//   }
-//   else {
-//     console.log(res);
-//   }
-// }
-// getData(render);
-// getData(render, 'coffee');
+function getSearchData(search, cb){
+  dbConnection.query(`SELECT shop_name, shop_rating, cost, address, description,tags FROM shops WHERE tags ILIKE '%${search}%';`,
+   (err, res) => {
+    if (err) return cb(err);
+    cb(null, res.rows);
+  });
+}
 
 module.exports = {
-  getData: getData
+  getAllData: getAllData,
+  getSearchData: getSearchData
 }

src/handler.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 const DBquery = require('./DBquery');
-const url = require('url');
 
 const extensionType = {
   'js': 'application/javascript',
@@ -39,7 +38,7 @@ const assetsHandler = (req, res) => {
 }
 
 const allDataHandler = (req, res) => {
-  DBquery.getData(null,(err, result) => {
+  DBquery.getAllData((err, result) => {
     if (err) throw err;
     let table = JSON.stringify(result);
     res.writeHead(200, {"content-type": 'application/json'});
@@ -50,7 +49,7 @@ const allDataHandler = (req, res) => {
 const searchHandler = (req, res) => {
   let searchUrl = req.url;
   let searchString = searchUrl.split('?')[1];
-  DBquery.getData(searchString,(err, result) => {
+  DBquery.getSearchData(searchString,(err, result) => {
     if (err) throw err;
     let table = JSON.stringify(result);
     res.writeHead(200, {"content-type": 'application/json'});