Merge pull request #28 from carlarenee/carlalocal

Carlalocal
zonkphins · Nov 28, 2016 · faadf0c · faadf0c
2 parents 0db0751 + a52615f
commit faadf0c
Show file tree

Hide file tree

Showing 19 changed files with 536 additions and 93 deletions.
diff --git a/dist/css/main.css b/dist/css/main.css
diff --git a/dist/css/main.css.map b/dist/css/main.css.map
diff --git a/dist/index.html b/dist/index.html
@@ -40,6 +40,16 @@
 
     <div id="root-container"></div>
 
+    <div id="root-container"></div>
+
+    <div id="root-container"></div>
+
+    <div id="root-container"></div>
+
+    <div id="root-container"></div>
+
+    <div id="root-container"></div>
+
 
 
 

diff --git a/dist/js/main.js b/dist/js/main.js
diff --git a/dist/js/main.js.map b/dist/js/main.js.map
diff --git a/models/images.js b/models/images.js
@@ -1,7 +1,8 @@
 const db = require('../db/db');
 
 function getFavorites(req, res, next) {
- db.any(`SELECT * FROM savedSearch;`)
+  console.log('the queried username is:', req.params.username )
+ db.any('SELECT * FROM savedSearch WHERE username = $1;', [req.params.username])
  .then((images) => {
    res.images = images;
    next();
@@ -15,6 +16,12 @@ function saveFavorites(req, res, next) {
  .catch(err => next(err));
 }
 
+function deleteImage(req, res, next) {
+  db.none(`DELETE FROM savedSearch WHERE search_id = $1;`, [req.params.id])
+  .then(next())
+  .catch(err => next(err));
+}
+
 // function deleteFavorite(req, res, next) {
 //  db.none(`DELETE FROM images WHERE id = $1`, [req.params.id])
 //  .then(next())
@@ -24,7 +31,8 @@ function saveFavorites(req, res, next) {
 
 module.exports = { 
   getFavorites,
-  saveFavorites 
+  saveFavorites,
+  deleteImage 
 };
  // showAllFavorites,
 

diff --git a/routes/images.js b/routes/images.js
@@ -1,14 +1,17 @@
 const images             = require('express').Router();
-const { saveFavorites, getFavorites }  = require('../models/images');
+const { saveFavorites, getFavorites, deleteImage }  = require('../models/images');
 
 
-images.get('/', getFavorites, (req, res) => {
+images.get('/:username', getFavorites, (req, res) => {
   res.json(res.images || []);
 })
 
 images.post('/', saveFavorites, (req, res) => {
   res.json({ message: 'successfully saved image' });
 })
 
+images.delete('/:id', deleteImage, (req, res) => {
+  res.json({message: 'removed'});
+})
 
 module.exports = images;