From 2e1b1daf470e6cf53e22933dd5b98342bec7fcde Mon Sep 17 00:00:00 2001 From: Charlie Heiner Date: Tue, 19 Dec 2017 19:13:29 -0800 Subject: [PATCH 1/3] can stay on page and do multiple seaches and image saves --- models/image.js | 6 +++++- views/imageView.js | 48 +++++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/models/image.js b/models/image.js index 54b8f8a..e3f694c 100644 --- a/models/image.js +++ b/models/image.js @@ -37,7 +37,11 @@ const API_URL = 'http://localhost:3000/api/v1'; Image.loadAll = (data) => { Image.all = data.map(obj => new Image(obj)); console.log(Image.all); - app.imageView.initDiscoverPage(); + app.imageView.append(); + Image.all = []; + + + // app.imageView.initDiscoverPage(); } Image.saveImage = (image) =>{ diff --git a/views/imageView.js b/views/imageView.js index 8591351..9f38241 100644 --- a/views/imageView.js +++ b/views/imageView.js @@ -13,32 +13,35 @@ var app = app || {}; e.preventDefault(); app.Image.fetchImages(); }) - app.Image.all.map(image => $('#gallery-wrapper').append(image.toHtml())); - - $('.favImage').on('submit', function (event) { - event.preventDefault(); - - const rover = $('#rover option:selected').text(); - const img_id = $(this).find('img').attr('id'); - const img_num = img_id.slice(1); - const src = $(this).find('img').attr('src'); - - const image = { - image_id: img_num, - rover: rover, - camera: $('#camera option:selected').text(), - url: src, - user: $('#user').val() - } - - + - app.Image.saveImage(image); - }); - }; +}; + imageView.append = () => { + + $('#gallery-wrapper').empty(); + app.Image.all.map(image => $('#gallery-wrapper').append(image.toHtml())); + $('.favImage').on('submit', function (event) { + event.preventDefault(); + + const rover = $('#rover option:selected').text(); + const img_id = $(this).find('img').attr('id'); + const img_num = img_id.slice(1); + const src = $(this).find('img').attr('src'); + + const image = { + image_id: img_num, + rover: rover, + camera: $('#camera option:selected').text(), + url: src, + user: $('#user').val() + } + app.Image.saveImage(image); + + }); + } imageView.initHomePage = () => { $('main section').hide(); @@ -54,6 +57,7 @@ var app = app || {}; $('main section').hide(); $('#favePhotos').show(); + // $('').on('submit') } From a575e520a1b69985eb9054eaf44cf532d3ad0d8d Mon Sep 17 00:00:00 2001 From: Charlie Heiner Date: Tue, 19 Dec 2017 19:48:24 -0800 Subject: [PATCH 2/3] started front side request to api for favorites --- models/image.js | 13 +++++++++++++ views/imageView.js | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/models/image.js b/models/image.js index e3f694c..aed73e8 100644 --- a/models/image.js +++ b/models/image.js @@ -12,6 +12,7 @@ const API_URL = 'http://localhost:3000/api/v1'; this.url = obj.url; } Image.all = []; + Image.faves = []; Image.fetchImages = (cb) => { let camShort = ''; @@ -34,6 +35,18 @@ const API_URL = 'http://localhost:3000/api/v1'; .fail(console.error); } + Image.fetchFaves = () =>{ + Image.all = []; + $.get(`${API_URL}/favorites`) + .then(Image.loadAll) + .fail(console.error); + + } + Image.loadFaves = (data) => { + Image.faves = data.map(obj => new Image(obj)); + console.log(ImageFaves.all); + } + Image.loadAll = (data) => { Image.all = data.map(obj => new Image(obj)); console.log(Image.all); diff --git a/views/imageView.js b/views/imageView.js index 9f38241..ce952e9 100644 --- a/views/imageView.js +++ b/views/imageView.js @@ -57,7 +57,10 @@ var app = app || {}; $('main section').hide(); $('#favePhotos').show(); - // $('').on('submit') + $('#getFaves').on('submit', (e) => { + e.preventDefault(); + app.Image.fetchFaves(); + }) } From aa74512efb8948bd2c36c2bfaf36461a984b1714 Mon Sep 17 00:00:00 2001 From: Charlie Heiner Date: Tue, 19 Dec 2017 20:14:46 -0800 Subject: [PATCH 3/3] can pull images from database and append --- models/image.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/image.js b/models/image.js index aed73e8..f6510bd 100644 --- a/models/image.js +++ b/models/image.js @@ -40,7 +40,7 @@ const API_URL = 'http://localhost:3000/api/v1'; $.get(`${API_URL}/favorites`) .then(Image.loadAll) .fail(console.error); - + } Image.loadFaves = (data) => { Image.faves = data.map(obj => new Image(obj));