From eab0b7bb00e3a13ccdf33e5c51c9f4fa650c475a Mon Sep 17 00:00:00 2001 From: Tiancheng Luo Date: Sat, 11 Feb 2017 21:38:35 +0000 Subject: [PATCH 1/6] Revert "Revert "Add dynamic "next meetup" to home page"" So that I can get the code back~ This reverts commit cfc403aea0ec6c2c76f5a577eccda5cfd94775ad. --- css/main.css | 5 +++++ index.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/css/main.css b/css/main.css index 923c135..949933b 100644 --- a/css/main.css +++ b/css/main.css @@ -88,3 +88,8 @@ body{ border: 1px solid #555; } /* Jumbotron end */ + +/* meetup-event for the home page */ +#meetup-event a { + color: white; +} \ No newline at end of file diff --git a/index.html b/index.html index 4a3f56c..aa81550 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@

Welcome to techcorridor.io

TechCorridor.io is a developer group in Iowa City and Cedar Rapids, IA. If you’re interested in programming, the intertubes, and whatnot, this is the group for you.

Join us at one of our Meetups!

+

@@ -28,3 +29,56 @@

Twitter

+ +{% raw %} + +{% endraw %} \ No newline at end of file From 0fb041e7f3be8943133f6178dd0021287de7bc25 Mon Sep 17 00:00:00 2001 From: Tiancheng Luo Date: Sat, 11 Feb 2017 21:58:57 +0000 Subject: [PATCH 2/6] Remove debug code --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index aa81550..1b4f062 100644 --- a/index.html +++ b/index.html @@ -44,7 +44,6 @@

Twitter

} var meetup = new Meetup(configuration.url).getEvents(function(data) { eventPresenter = EventPresenter(data.results[0]); - console.log(eventPresenter); createEventParagraph(eventPresenter); }); From e71a23a3cfc7de8bc2e09b77671d78c15f933865 Mon Sep 17 00:00:00 2001 From: Tiancheng Luo Date: Sat, 11 Feb 2017 22:05:01 +0000 Subject: [PATCH 3/6] Add date to the link text --- index.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 1b4f062..ea16b7f 100644 --- a/index.html +++ b/index.html @@ -48,7 +48,7 @@

Twitter

}); var createEventParagraph = function (event) { - var template = "Next meetup: {{name}}"; + var template = "Next meetup: {{name}} ({{formattedDate}})"; Mustache.parse(template); // optional, speeds up future uses var rendered = Mustache.render(template, event); $('#meetup-event').html(rendered); @@ -68,10 +68,8 @@

Twitter

"September", "October", "November", "December" ]; - return day[date.getDay()] + ', ' - + months[date.getMonth()] + ' ' - + date.getDate() + ', ' - + date.getFullYear(); + return months[date.getMonth()] + ' ' + + date.getDate(); } event.venueLink = formatVenueLink(event.venue); From 0831c50c3f4a84258e677bca9612184975739a2a Mon Sep 17 00:00:00 2001 From: iLtc Date: Mon, 12 Mar 2018 22:14:18 -0500 Subject: [PATCH 4/6] Moved JS Code to meetup-events.js --- index.html | 48 ++++++--------------------------------------- js/meetup-events.js | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/index.html b/index.html index ea16b7f..d1b9878 100644 --- a/index.html +++ b/index.html @@ -30,52 +30,16 @@

Twitter

-{% raw %} -{% endraw %} \ No newline at end of file + }; + \ No newline at end of file diff --git a/js/meetup-events.js b/js/meetup-events.js index 2e67cbc..e7e0ed9 100644 --- a/js/meetup-events.js +++ b/js/meetup-events.js @@ -36,3 +36,50 @@ var Meetup = function(meetupURL) { }); }; }; + +var EventPresenter = function(event) { + var formatVenueLink = function(venue) { + return "http://maps.google.com/?q=" + encodeURI(venue.address_1) + '+' + encodeURI(venue.city); + }; + + var day = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; + var months = [ + "January", "February", "March", "April", + "May", "June", "July", "August", + "September", "October", "November", "December" + ]; + + var formatShortDate = function(date) { + // Pretty print the event date + return months[date.getMonth()] + ' ' + date.getDate(); + }; + + var formatLongDate = function(date) { + // Pretty print the event date + + return day[date.getDay()] + ', ' + + months[date.getMonth()] + ' ' + + date.getDate() + ', ' + + date.getFullYear() + + ' at ' + + (date.getHours() % 12) + ':' + + (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes()) + + ' ' + + (date.getHours() < 12 ? 'AM' : 'PM'); + }; + + var eventDate = new Date(event.time); + + event.venueLink = formatVenueLink(event.venue); + event.formattedShortDate = formatShortDate(eventDate); + event.formattedLongDate = formatLongDate(eventDate); + + return event; +}; + +var createEventParagraph = function (event) { + var template = "Next meetup: {{name}} ({{formattedShortDate}})"; + Mustache.parse(template); // optional, speeds up future uses + var rendered = Mustache.render(template, event); + $('#meetup-event').html(rendered); +}; \ No newline at end of file From a59a1b00b547cec8b4ebbe59f54a67205721291d Mon Sep 17 00:00:00 2001 From: iLtc Date: Mon, 12 Mar 2018 22:24:32 -0500 Subject: [PATCH 5/6] Moved '+' to the end of the line --- js/meetup-events.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/js/meetup-events.js b/js/meetup-events.js index e7e0ed9..966822e 100644 --- a/js/meetup-events.js +++ b/js/meetup-events.js @@ -57,15 +57,13 @@ var EventPresenter = function(event) { var formatLongDate = function(date) { // Pretty print the event date - return day[date.getDay()] + ', ' - + months[date.getMonth()] + ' ' - + date.getDate() + ', ' - + date.getFullYear() - + ' at ' - + (date.getHours() % 12) + ':' - + (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes()) - + ' ' - + (date.getHours() < 12 ? 'AM' : 'PM'); + return day[date.getDay()] + ', ' + + months[date.getMonth()] + ' ' + + date.getDate() + ', ' + + date.getFullYear() + ' at ' + + (date.getHours() % 12) + ':' + + (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes()) + ' ' + + (date.getHours() < 12 ? 'AM' : 'PM'); }; var eventDate = new Date(event.time); From 46cb7146aabb95dfef2c29252ae77bc9622f25e6 Mon Sep 17 00:00:00 2001 From: iLtc Date: Mon, 12 Mar 2018 22:31:14 -0500 Subject: [PATCH 6/6] Changed ' to " --- js/meetup-events.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/js/meetup-events.js b/js/meetup-events.js index 966822e..ab569c5 100644 --- a/js/meetup-events.js +++ b/js/meetup-events.js @@ -39,14 +39,15 @@ var Meetup = function(meetupURL) { var EventPresenter = function(event) { var formatVenueLink = function(venue) { - return "http://maps.google.com/?q=" + encodeURI(venue.address_1) + '+' + encodeURI(venue.city); + return 'http://maps.google.com/?q=' + encodeURI(venue.address_1) + + '+' + encodeURI(venue.city); }; - var day = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; + var day = [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; var months = [ - "January", "February", "March", "April", - "May", "June", "July", "August", - "September", "October", "November", "December" + 'January', 'February', 'March', 'April', + 'May', 'June', 'July', 'August', + 'September', 'October', 'November', 'December' ]; var formatShortDate = function(date) { @@ -76,7 +77,8 @@ var EventPresenter = function(event) { }; var createEventParagraph = function (event) { - var template = "Next meetup: {{name}} ({{formattedShortDate}})"; + var template = 'Next meetup: ' + + '{{name}} ({{formattedShortDate}})'; Mustache.parse(template); // optional, speeds up future uses var rendered = Mustache.render(template, event); $('#meetup-event').html(rendered);