Merge

Author: jakeloo

_config.yml

@@ -4,9 +4,10 @@ subtitle: Where the coders belong
 email: info@dvcoders.com
 description: DVCoders club website
 baseurl: "" # the subpath of your site, e.g. /blog/
-url: "http://dvcoders.com" # the base hostname & protocol for your site
+url: "https://dvcoders.com" # the base hostname & protocol for your site
 twitter_username: dvcoders
 github_username:  dvcoders
+# facebook_username : 
 footer_note: dvcoders 2015
 collections:
     - projects

_sass/_base.scss

@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Raleway:400,300,100);
+@import url(https://fonts.googleapis.com/css?family=Raleway:400,300,100);
 
 /**
  * Reset some basic elements

_sass/_vtimeline.scss

@@ -94,13 +94,13 @@ Modules - reusable parts of our design
   margin-left: -12px;
   margin-top: -12px;
 }
-.cd-timeline-img.cd-picture {
+.cd-timeline-block:nth-child(3n+0) .cd-timeline-img{
   background: #75ce66;
 }
-.cd-timeline-img.cd-movie {
+.cd-timeline-block:nth-child(3n+1) .cd-timeline-img{
   background: #c03b44;
 }
-.cd-timeline-img.cd-location {
+.cd-timeline-block:nth-child(3n+2) .cd-timeline-img{
   background: #f0ca45;
 }
 @media only screen and (min-width: 1170px) {

event.html

@@ -0,0 +1,10 @@
+---
+layout: page
+title: Events
+subtitle: Definitely not a waste of time
+permalink: /events/
+javascript: [jquery-1.11.2.min.js, modernizr.js, events.js]
+---
+<section id="cd-timeline" class="cd-container">
+
+</section> <!-- cd-timeline -->

events.html

@@ -1,8 +1,8 @@
 ---
 layout: page
-title: Project
+title: Projects
 subtitle: Do a thing
-permalink: /project/
+permalink: /projects/
 ---
 
 <div class="projects">

project.html renamed to projects.html

@@ -1,19 +1,58 @@
-jQuery(document).ready(function($){
-	var $timeline_block = $('.cd-timeline-block');
-
-	//hide timeline blocks which are outside the viewport
-	$timeline_block.each(function(){
-		if($(this).offset().top > $(window).scrollTop()+$(window).height()*0.75) {
-			$(this).find('.cd-timeline-img, .cd-timeline-content').addClass('is-hidden');
-		}
-	});
-
-	//on scolling, show/animate timeline blocks when enter the viewport
-	$(window).on('scroll', function(){
-		$timeline_block.each(function(){
-			if( $(this).offset().top <= $(window).scrollTop()+$(window).height()*0.75 && $(this).find('.cd-timeline-img').hasClass('is-hidden') ) {
-				$(this).find('.cd-timeline-img, .cd-timeline-content').removeClass('is-hidden').addClass('bounce-in');
-			}
-		});
-	});
+$(document).ready(function($) {
+  $.ajax({
+    url: 'https://api.dvcoders.com/events?start=' + Date.now(),
+    method: 'GET',
+    success: function(data) {
+      var results = data.result;
+
+      var newHtml;
+      results.forEach(function(result) {
+        newHtml =
+          '<div class="cd-timeline-block">' +
+          '<div class="cd-timeline-img"></div>' +
+          '<div class="cd-timeline-content">' +
+          '<h2>' + result.title + '</h2>' +
+          '<p>' + result.location + '</p>' +
+          '<p>' + result.description + '</p>' +
+          '<span class="cd-date">' + formatDate(result.start, result.end) + '</span>' +
+          '</div>' +
+          '</div>';
+        $('#cd-timeline').append(newHtml);
+      });
+
+      var timeline_block = $('.cd-timeline-block');
+
+      //hide timeline blocks which are outside the viewport
+      timeline_block.each(function() {
+        if ($(this).offset().top > $(window).scrollTop() + $(window).height() * 0.75) {
+          $(this).find('.cd-timeline-img, .cd-timeline-content').addClass('is-hidden');
+        }
+      });
+
+      //on scolling, show/animate timeline blocks when enter the viewport
+      $(window).on('scroll', function() {
+        timeline_block.each(function() {
+          if ($(this).offset().top <= $(window).scrollTop() + $(window).height() * 0.75 && $(this).find('.cd-timeline-img').hasClass('is-hidden')) {
+            $(this).find('.cd-timeline-img, .cd-timeline-content').removeClass('is-hidden').addClass('bounce-in');
+          }
+        });
+      });
+
+
+      function formatDate(startMillis, endMillis) {
+        var formatted;
+        var start = new Date(startMillis);
+        var end = new Date(endMillis);
+
+        formatted = start.toDateString().substring(4, 10) + " "; // Include only the month and date
+        formatted += start.toTimeString().substring(0, 5) + " - "; // Include only the hours:minutes
+        if (end.getDate() > start.getDate()) { // If it ends on a different day, include the day
+          formatted += end.toDateString().substring(4, 10) + " ";
+        }
+        formatted += end.toTimeString().substring(0, 5);
+
+        return formatted;
+      }
+    }
+  });
 });