From eb7f988af5b828f82127f4def15d8fa66714cf3c Mon Sep 17 00:00:00 2001
From: Charlie Heiner <heinercj@gmail.com>
Date: Sun, 17 Dec 2017 11:40:14 -0800
Subject: [PATCH 1/2] getting values from user selections and putting into an
 object

---
 index.html         |  4 ++--
 views/imageView.js | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 65a8ee7..83053a2 100644
--- a/index.html
+++ b/index.html
@@ -38,7 +38,7 @@
             <div id="searchHowTo"></div>
                 <p>This is a test, this is ONLY a test....</p>
         <fieldset>
-            <form id="dropDowns">
+            <form id="dropdowns">
                 <div id= "rovers">
                     <label>Rovers</label>
                         <select id="rover">
@@ -59,7 +59,7 @@
 
                 <div id= "dates">
                     <label>Date(yyyy-mm-dd)</label>
-                        <input type="text" name ="dateInput" required>
+                        <input id="date" type="text" name ="dateInput" required>
                 </div>
 
                 <button id ="searchButton" type="submit">SEARCH</button>
diff --git a/views/imageView.js b/views/imageView.js
index a6c1149..ee0a63e 100644
--- a/views/imageView.js
+++ b/views/imageView.js
@@ -9,13 +9,13 @@ var app = app || {};
         $('main section').hide();
         $('#photos').show();
 
-        $('#dropDowns').on('submit', (e) => {
+        $('#dropdowns').on('submit', (e) => {
                 e.preventDefault();
                 const object = {
-                    rover: $('#dropDowns select[value="rover"]').value(),
-                    // camera: $('#dropDowns select[name="camera"]').value(),
-                    // date: $('#dropDowns input[name = "dateInput"]').val()
-                };
+                    rover: $('#rover option:selected').text(),
+                    camera: $('#camera option:selected').text(),
+                    date: $('#date').val()
+                }
             console.log(object);
         })
     //    app.Image.all.map(image => $('#photos').append(image.toHtml()));

From d54abc1002d813783e51a4730b843323caa2f570 Mon Sep 17 00:00:00 2001
From: Charlie Heiner <heinercj@gmail.com>
Date: Sun, 17 Dec 2017 12:27:42 -0800
Subject: [PATCH 2/2] can use search dropdowns to get images to page

---
 models/image.js    | 18 ++++++++++++++----
 views/imageView.js |  9 ++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/models/image.js b/models/image.js
index 9a2024a..e83a231 100644
--- a/models/image.js
+++ b/models/image.js
@@ -14,10 +14,20 @@ const API_URL = 'http://localhost:3000/api/v1';
     Image.all = [];
 
     Image.fetchImages = (cb) => {
+        let camShort = '';
+        if($('#camera option:selected').text() == 'Navigation') {
+            camShort = "navcam";
+        }else if($('#camera option:selected').text() == 'Front Hazard') {
+            camShort = "fhaz";
+        }else{
+            camShort = "rhaz";
+        }
+
+    
         const options = {
-            rover: 'curiosity',
-            camera: 'fhaz',
-            date: '2015-12-13'
+            rover: $('#rover option:selected').text(),
+            camera: camShort,
+            date: $('#date').val()
         }
         $.get(`${API_URL}/nasa`, options)
         .then(Image.loadAll)
@@ -28,7 +38,7 @@ 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.initDiscoverPage();
     }
 
     Image.prototype.toHtml = function () {
diff --git a/views/imageView.js b/views/imageView.js
index ee0a63e..a76a888 100644
--- a/views/imageView.js
+++ b/views/imageView.js
@@ -11,14 +11,9 @@ var app = app || {};
 
         $('#dropdowns').on('submit', (e) => {
                 e.preventDefault();
-                const object = {
-                    rover: $('#rover option:selected').text(),
-                    camera: $('#camera option:selected').text(),
-                    date: $('#date').val()
-                }
-            console.log(object);
+                app.Image.fetchImages();
         })
-    //    app.Image.all.map(image => $('#photos').append(image.toHtml()));
+       app.Image.all.map(image => $('#photos').append(image.toHtml()));
     };
 
     imageView.initHomePage = () => {