nodejs screencast now opens in fit-width-height-modal, sends stats, more work on courses

Author: iliakan

client/head/index.js

@@ -27,3 +27,4 @@ require('./trackLinks');
 // must use CommonsChunkPlugin
 // to ensure that other modules use exactly this (initialized) client/notify
 require('client/notification').init();
+

course

@@ -0,0 +1 @@
+/js/course

handlers/courses/controller/coursesByUser.js

@@ -31,37 +31,51 @@ exports.get = function*(next) {
   this.body = [];
 
   for (let i = 0; i < invites.length; i++) {
-    let group = formatGroup(invites[i].group);
-    group.links = [{
+
+    let group = invites[i].group;
+    let groupInfo = formatGroup(group);
+    groupInfo.links = [{
       url: group.getUrl(),
       title: 'Описание курса'
     }];
-    group.isParticipant = false;
-    group.inviteToken = invites[i].token;
-    this.body.push(group);
+    groupInfo.inviteUrl = '/courses/invite/' + invites[i].token;
+    this.body.push(groupInfo);
   }
 
   for (let i = 0; i < groups.length; i++) {
-    let group = formatGroup(groups[i]);
-    group.links = [{
+    let group = groups[i];
+    let groupInfo = formatGroup(group);
+    groupInfo.links = [{
       url: group.getUrl(),
       title: 'Описание курса'
     }, {
       url: `/courses/groups/${group.slug}/info`,
       title: 'Инструкции по настройке окружения'
     }];
-    //if ()
-    group.isParticipant = true;
-    this.body.push(group);
+
+    var materials = yield groups[i].readMaterials();
+    if (materials.length) {
+      groupInfo.links.push({
+        url: `/courses/groups/${group.slug}/download`,
+        title: 'Материалы для обучения'
+      });
+    }
+    this.body.push(groupInfo);
   }
 
+  for (var i = 0; i < this.body.length; i++) {
+    var groupInfo = this.body[i];
+    groupInfo.status = groupInfo.inviteToken ? 'invite' :
+      (groupInfo.dateStart > new Date()) ? 'accepted' :
+        (groupInfo.dateEnd > new Date()) ? 'started' : 'ended';
+  }
+
+
 };
 
 function formatGroup(group) {
   return {
     title: group.title,
-    groupUrl: group.getUrl(),
-    groupSlug: group.slug,
     dateStart: group.dateStart,
     dateEnd: group.dateEnd,
     timeDesc: group.timeDesc

handlers/courses/controller/invite.js

@@ -134,7 +134,14 @@ function* acceptParticipant(invite) {
     user: this.user._id,
     courseName: this.request.body.courseName || this.user.displayName
   });
+
+  this.user.profileTabsEnabled.addToSet('courses');
+  yield this.user.persist();
+
   yield invite.accept();
+
+  invite.group.decreaseParticipantsLimit();
+
   yield invite.group.persist();
   this.redirect('/courses/invite/' + invite.token);
 }

handlers/courses/lib/onPaid.js

@@ -41,11 +41,9 @@ module.exports = function* (order) {
       user: order.user._id,
       courseName: order.data.contactName
     });
-    group.participantsLimit--;
-  }
-  if (group.participantsLimit < 0) group.participantsLimit = 0;
-  if (group.participantsLimit === 0) {
-    group.isOpenForSignup = false; // we're full!
+    group.decreaseParticipantsLimit();
+    order.user.profileTabsEnabled.addToSet('courses');
+    yield order.user.persist();
   }
   yield group.persist();
 

handlers/courses/models/courseGroup.js

@@ -1,5 +1,9 @@
 var mongoose = require('mongoose');
 var Schema = mongoose.Schema;
+var config = require('config');
+var fs = require('mz/fs');
+var path = require('path');
+var log = require('log')();
 
 // the schema follows http://openexchangerates.org/api/latest.json response
 var schema = new Schema({
@@ -61,17 +65,18 @@ var schema = new Schema({
       index: true,
       required: true
     },
-    courseName: {
+    courseName: { // how to call this user in-course?
       type: String,
       required: true
     },
     videoKey: {
       type: String
-      // not required
+      // there may be groups without video & keys
     }
   }],
 
-  // room jid, gotowebinar id
+  // room jid AND gotowebinar id
+  // an offline group may not have this
   webinarId: {
     type: String
   },
@@ -101,6 +106,36 @@ schema.methods.getUrl = function() {
   return '/courses/groups/' + this.slug;
 };
 
+schema.methods.readMaterials = function*() {
+  var groupDir = path.join(config.courseRoot, this.slug);
+
+
+  try {
+    var files = yield fs.readdir(groupDir);
+    return files.map(function(file) {
+      if (file[0] == '.') return null;
+      return {
+        path: path.join(groupDir, file),
+        url: `/courses/groups/${this.slug}/download/${file}`,
+        title: file
+      };
+    }).filter(Boolean);
+  } catch (e) {
+    log.error("Group dir must be a directory", groupDir);
+
+    return [];
+  }
+
+};
+
+schema.methods.decreaseParticipantsLimit = function(count) {
+  count = count === undefined ? 1 : count;
+  this.participantsLimit -= count;
+  if (this.participantsLimit < 0) this.participantsLimit = 0;
+  if (this.participantsLimit === 0) {
+    this.isOpenForSignup = false; // we're full!
+  }
+};
 
 module.exports = mongoose.model('CourseGroup', schema);
 

handlers/courses/router.js

@@ -13,4 +13,4 @@ router.get('/groups/:group/info', require('./controller/groupInfo').get);
 router.all('/invite/:inviteToken?', require('./controller/invite').all);
 
 // for profile
-router.get('/user/:userById', require('./controller/coursesByUser').get);
+router.get('/profile/:userById', require('./controller/coursesByUser').get);

handlers/nodejsScreencast/client/index.js

@@ -2,6 +2,7 @@ var Modal = require('client/head/modal');
 var courseForm = require('../templates/course-form.jade');
 var clientRender = require('client/clientRender');
 var newsletter = require('newsletter/client');
+var gaHitCallback = require('gaHitCallback');
 
 exports.init = function() {
   initList();
@@ -60,6 +61,52 @@ function initList() {
       '</div>'
     );
   }
+
+  var links = document.querySelectorAll('a[data-video-id]');
+  for (var i = 0; i < links.length; i++) {
+    var link = links[i];
+    link.onclick = function(e) {
+      e.preventDefault();
+      var videoId = this.getAttribute('data-video-id');
+      window.ga('send', 'event', 'nodejs-screencast', 'open', videoId, {
+        hitCallback: gaHitCallback(function() {
+          openVideo(videoId);
+        })
+      });
+    };
+  }
 }
 
+function openVideo(videoId) {
+  // sizes from https://developers.google.com/youtube/iframe_api_reference
+  var sizeList = [
+    {width: 0, height: 0}, // mobile screens lower than any player => new window
+    {width: 640, height: 360 + 30},
+    {width: 853, height: 480 + 30},
+    {width: 1280, height: 720 + 30}
+  ];
+
+  for(var i=0; i<sizeList.length; i++) {
+    if (document.documentElement.clientHeight < sizeList[i].height ||
+      document.documentElement.clientWidth < sizeList[i].width) break;
+  }
+  i--;
+
+  var width = sizeList[i].width;
+  var height = sizeList[i].height;
+  window.ga('send', 'event', 'nodejs-screencast', 'open', videoId + '-' + width + 'x' + height, {
+    hitCallback: gaHitCallback(function() {
+
+      if (i === 0) {
+        window.location.href = '//www.youtube.com/watch?v=' + videoId;
+      } else {
+        var modal = new Modal();
+        modal.setContent(
+          `<iframe width="${width}" height="${height}" src="//www.youtube.com/embed/${videoId}" frameborder="0" allowfullscreen></iframe>`
+        );
+      }
+    })
+  });
 
+
+}