From f4169683f767a36cb4264966e9b3789898ec438f Mon Sep 17 00:00:00 2001 From: Carmen Perezchica Date: Mon, 18 Dec 2017 15:24:47 -0800 Subject: [PATCH 1/3] added api url heroku --- models/image.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/image.js b/models/image.js index 3d24fd0..2e748bb 100644 --- a/models/image.js +++ b/models/image.js @@ -1,7 +1,7 @@ 'use strict'; var app = app || {}; -// const API_URL = 'heroku route'; +// const API_URL = 'https://code-301-mars.herokuapp.com/'; const API_URL = 'http://localhost:3000/api/v1'; (function (module) { @@ -16,11 +16,11 @@ const API_URL = 'http://localhost:3000/api/v1'; Image.fetchImages = (cb) => { let camShort = ''; if($('#camera option:selected').text() == 'Navigation') { - camShort = "navcam"; + camShort = "NAVCAM"; }else if($('#camera option:selected').text() == 'Front Hazard') { - camShort = "fhaz"; + camShort = "FHAZ"; }else{ - camShort = "rhaz"; + camShort = "RHAZ"; } const options = { From 8afa3f97da5344bc66d60be335fc170acafcd28e Mon Sep 17 00:00:00 2001 From: Carmen Perezchica Date: Mon, 18 Dec 2017 15:51:41 -0800 Subject: [PATCH 2/3] modified camera name based on nasa api camera data --- models/image.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/image.js b/models/image.js index 2e748bb..194c7ad 100644 --- a/models/image.js +++ b/models/image.js @@ -9,7 +9,7 @@ const API_URL = 'http://localhost:3000/api/v1'; this.id = obj.id; this.rover = obj.rover; this.camera = obj.camera; - this.url = obj.url; + this.url = obj.url; } Image.all = []; From a682cec9ab5102c17bdd4279480f5ff86bf87462 Mon Sep 17 00:00:00 2001 From: Katlyn Tucker Date: Mon, 18 Dec 2017 18:12:08 -0800 Subject: [PATCH 3/3] adding untracked package-lock.json --- package-lock.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +}