From fcc0c9e6335c08ccd44cafefff91450c8733611d Mon Sep 17 00:00:00 2001 From: Christopher Justice Date: Tue, 19 Dec 2017 14:47:02 -0500 Subject: [PATCH 1/5] Connect to Api,events returned --- package.json | 3 ++- server/controllers/eventsCtrl.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 69dfc96..52fa569 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "jquery": "^3.2.1", "mongoose": "^4.10.0", "morgan": "^1.8.1", - "request": "^2.81.0" + "request": "^2.81.0", + "yarn": "^1.3.2" }, "devDependencies": { "babel-core": "^6.26.0", diff --git a/server/controllers/eventsCtrl.js b/server/controllers/eventsCtrl.js index 31d1a29..4b88777 100644 --- a/server/controllers/eventsCtrl.js +++ b/server/controllers/eventsCtrl.js @@ -15,3 +15,4 @@ module.exports = { }); } }; + From ae4e792ec74288fc7b09fb5cb70aab70e7291502 Mon Sep 17 00:00:00 2001 From: Christopher Justice Date: Tue, 19 Dec 2017 16:50:46 -0500 Subject: [PATCH 2/5] Update api information --- package.json | 2 +- server/controllers/eventsCtrl.js | 2 +- server/controllers/menuCtrl.js | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 52fa569..7837d96 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "body-parser": "^1.17.2", "bootstrap": "3.3.7", "colors": "^1.1.2", - "express": "^4.15.3", + "express": "^4.16.2", "jquery": "^3.2.1", "mongoose": "^4.10.0", "morgan": "^1.8.1", diff --git a/server/controllers/eventsCtrl.js b/server/controllers/eventsCtrl.js index 4b88777..cf6a3ca 100644 --- a/server/controllers/eventsCtrl.js +++ b/server/controllers/eventsCtrl.js @@ -8,7 +8,7 @@ module.exports = { request(url, (err, response, body) => { if(!err && response.statusCode == 200) { - res.json((JSON.parse(body)).data); + res.json((JSON.parse(body)).data); } else { console.log("ERROR: ", err); } diff --git a/server/controllers/menuCtrl.js b/server/controllers/menuCtrl.js index db07326..c238196 100644 --- a/server/controllers/menuCtrl.js +++ b/server/controllers/menuCtrl.js @@ -1,8 +1,8 @@ var menu = require('../data/menu.json'); module.exports = { - // get things from the json file - get: (req, res) => { - res.json(menu); - } -}; \ No newline at end of file + // get things from the json file + get: (req, res) => { + res.json(menu); + } +}; From 7c81ae68ad8236d45be4088b88fa9d08bc0d3187 Mon Sep 17 00:00:00 2001 From: Christopher Justice Date: Tue, 19 Dec 2017 17:36:02 -0500 Subject: [PATCH 3/5] format date --- client/app/events/components/events.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/events/components/events.component.js b/client/app/events/components/events.component.js index a0e4b2f..e5ceee8 100644 --- a/client/app/events/components/events.component.js +++ b/client/app/events/components/events.component.js @@ -27,7 +27,7 @@ const events = {
{{ value.name }}
-
Time: {{ value.start_time }} - {{ value.end_time }}
+ {{ value.start_time | date:"MM/dd/yyyy 'at' h:mma"}} - {{ value.end_time | date:"MM/dd/yyyy 'at' h:mma"}}
Description: {{ value.description }}
From d9229b9ef0057ac1e3a3bf79096e35232635c558 Mon Sep 17 00:00:00 2001 From: Christopher Justice Date: Tue, 19 Dec 2017 19:02:44 -0500 Subject: [PATCH 4/5] Add logic for dates --- client/app/events/components/events.component.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/client/app/events/components/events.component.js b/client/app/events/components/events.component.js index e5ceee8..89bf192 100644 --- a/client/app/events/components/events.component.js +++ b/client/app/events/components/events.component.js @@ -10,6 +10,18 @@ const events = { // Store array of JSON events. ctrl.events = res.data; console.log(ctrl.events); +// Data to compare dates + +// ctrl.events.forEach(date => { +// let currentDate = new Date(); +// let todayDate = currentDate.getFullYear()+'-'+(currentDate.getMonth()+1)+'-'+currentDate.getDate(); +// let eventDate = date.start_time.split("T").slice(0,1).join(); +//// console.log(todayDate) +//// console.log(eventDate) +// if (todayDate > eventDate) { +// eventDate; +// } + }) }) .then(function(data, status) { console.log('Data: ', data); From e4315901b10b7e6631e2a42739b6e5415915592f Mon Sep 17 00:00:00 2001 From: Christopher Justice Date: Sun, 24 Dec 2017 19:02:15 -0500 Subject: [PATCH 5/5] Add if/else to template --- .../app/events/components/events.component.js | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/client/app/events/components/events.component.js b/client/app/events/components/events.component.js index 89bf192..4f4b429 100644 --- a/client/app/events/components/events.component.js +++ b/client/app/events/components/events.component.js @@ -9,19 +9,6 @@ const events = { .then(function(res) { // Store array of JSON events. ctrl.events = res.data; - console.log(ctrl.events); -// Data to compare dates - -// ctrl.events.forEach(date => { -// let currentDate = new Date(); -// let todayDate = currentDate.getFullYear()+'-'+(currentDate.getMonth()+1)+'-'+currentDate.getDate(); -// let eventDate = date.start_time.split("T").slice(0,1).join(); -//// console.log(todayDate) -//// console.log(eventDate) -// if (todayDate > eventDate) { -// eventDate; -// } - }) }) .then(function(data, status) { console.log('Data: ', data); @@ -37,14 +24,25 @@ const events = { {{ $ctrl.events[0].place.location.state }} {{ $ctrl.events[0].place.location.zip }}
-
+
{{ value.name }}
{{ value.start_time | date:"MM/dd/yyyy 'at' h:mma"}} - {{ value.end_time | date:"MM/dd/yyyy 'at' h:mma"}}
Description: {{ value.description }}
+
+

Send us an email to schedule an event

+ email +
` }; angular.module('5340-site.events').component('events', events); + + + + + + +