From 47c930d7f4549949e1eb9a4851a8000fe130d7db Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 15 Jan 2016 00:55:08 -0800
Subject: [PATCH] Add new help rooms and logic

---
 client/main.js                                |  7 +++++--
 common/models/challenge.json                  |  5 +++++
 seed/index.js                                 |  3 +++
 server/boot/challenge.js                      |  2 ++
 server/utils/getFromDisk$.js                  |  6 +++++-
 server/views/challenges/showBonfire.jade      |  8 +++----
 server/views/challenges/showHTML.jade         |  6 ------
 server/views/challenges/showJS.jade           |  8 +++----
 server/views/challenges/showVideo.html        |  0
 server/views/challenges/showVideo.jade        |  5 -----
 .../challenges/showZiplineOrBasejump.html     |  0
 .../challenges/showZiplineOrBasejump.jade     | 21 -------------------
 server/views/partials/challenge-footer.jade   |  7 +++++++
 13 files changed, 33 insertions(+), 45 deletions(-)
 delete mode 100644 server/views/challenges/showVideo.html
 delete mode 100644 server/views/challenges/showZiplineOrBasejump.html

diff --git a/client/main.js b/client/main.js
index eb58096ddd..e2bfa9b476 100644
--- a/client/main.js
+++ b/client/main.js
@@ -22,14 +22,17 @@ main = (function(main) {
     main.chat.GitterChat = e.detail.Chat;
 
     main.chat.createHelpChat = function(room, helpChatBtnClass, roomTitle) {
-      roomTitle = roomTitle || 'Waypoint Help';
+      // room is always in PascalCase
+      roomTitle = room
+        .replace(/([A-Z])/g, ' $1')
+        .replace('Java Script', 'JavaScript');
 
       $('body').append(
         '<aside id="chat-embed-help" class="gitter-chat-embed is-collapsed" />'
       );
 
       main.chat.helpChat = new main.chat.GitterChat({
-        room: room,
+        room: `freecodecamp/${room}`,
         activationElement: false,
         targetElement: $('#chat-embed-help')
       });
diff --git a/common/models/challenge.json b/common/models/challenge.json
index 67e8ee197a..9785a0d9cb 100644
--- a/common/models/challenge.json
+++ b/common/models/challenge.json
@@ -70,6 +70,11 @@
       "default": [],
       "description": "prepended to user code"
     },
+    "helpRoom": {
+      "type": "string",
+      "default": "Help",
+      "description": "Gitter help chatroom this challenge belongs too. Must be PascalCase"
+    },
     "fileName": {
       "type": "string",
       "description": "filename challenge comes from. Used in dev mode"
diff --git a/seed/index.js b/seed/index.js
index 0920aeb8f0..2b76db411e 100644
--- a/seed/index.js
+++ b/seed/index.js
@@ -22,6 +22,8 @@ destroy()
     var isBeta = !!challengeSpec.isBeta;
     var isComingSoon = !!challengeSpec.isComingSoon;
     var fileName = challengeSpec.fileName;
+    var helpRoom = challengeSpec.helpRoom || 'Help';
+
     console.log('parsed %s successfully', block);
 
     // challenge file has no challenges...
@@ -39,6 +41,7 @@ destroy()
           .replace(/\s/g, '-');
 
         challenge.fileName = fileName;
+        challenge.helpRoom = helpRoom;
         challenge.order = order;
         challenge.suborder = index + 1;
         challenge.block = block;
diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 9e10033dd5..c0d2992330 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -164,6 +164,7 @@ function getRenderData$(user, challenge$, origChallengeName, solution) {
         });
       }
 
+      console.log(challenge.helpRoom);
       // save user does nothing if user does not exist
       return Observable.just({
         data: {
@@ -485,6 +486,7 @@ module.exports = function(app) {
           }
           var view = challengeView[data.challengeType];
           res.cookie('currentChallengeId', data.id);
+          console.log(data.helpRoom);
           res.render(view, data);
         },
         next,
diff --git a/server/utils/getFromDisk$.js b/server/utils/getFromDisk$.js
index 87517465be..1f64f0551b 100644
--- a/server/utils/getFromDisk$.js
+++ b/server/utils/getFromDisk$.js
@@ -15,7 +15,11 @@ export default function getFromDisk$(challenge) {
   )];
 
   return Observable.just(require(path.join(basePath, challenge.fileName)))
-    .map(challengeSpec => challengeSpec.challenges[challenge.suborder - 1])
+    .map(challengeSpec => {
+      const _challenge = challengeSpec.challenges[challenge.suborder - 1];
+      _challenge.helpRoom = challengeSpec.helpRoom || 'Help';
+      return _challenge;
+    })
     .map(challenge => {
       challenge.head = challenge.head || [];
       challenge.tail = challenge.tail || [];
diff --git a/server/views/challenges/showBonfire.jade b/server/views/challenges/showBonfire.jade
index a89c2a91cd..abdb1457bf 100644
--- a/server/views/challenges/showBonfire.jade
+++ b/server/views/challenges/showBonfire.jade
@@ -99,8 +99,6 @@ block content
 
     include ../partials/challenge-footer
     script.
-      document.addEventListener('gitter-sidecar-ready', function(e) {
-        if (window.main) {
-          window.main.chat.createHelpChat('freecodecamp/helpbonfires', '#challenge-help-btn', 'Bonfires Help');
-        }
-      });
+      if (!!{JSON.stringify(MDNlinks.length)}) {
+          $('#MDN-links').addClass('collapse');
+      }
diff --git a/server/views/challenges/showHTML.jade b/server/views/challenges/showHTML.jade
index 85738f4269..28da873379 100644
--- a/server/views/challenges/showHTML.jade
+++ b/server/views/challenges/showHTML.jade
@@ -88,9 +88,3 @@ block content
       });
 
     include ../partials/challenge-footer
-    script.
-      document.addEventListener('gitter-sidecar-ready', function(e) {
-        if (window.main) {
-          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
-        }
-      });
diff --git a/server/views/challenges/showJS.jade b/server/views/challenges/showJS.jade
index d4ee03aeef..975a7b4e19 100644
--- a/server/views/challenges/showJS.jade
+++ b/server/views/challenges/showJS.jade
@@ -91,11 +91,9 @@ block content
 
     include ../partials/challenge-footer
     script.
-      document.addEventListener('gitter-sidecar-ready', function(e) {
-        if (window.main) {
-          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
-        }
-      });
+      if (!!{JSON.stringify(MDNlinks.length)}) {
+          $('#MDN-links').addClass('collapse');
+      }
 
       common.init.push(function() {
         common.editor.setOption('mode', 'javascript');
diff --git a/server/views/challenges/showVideo.html b/server/views/challenges/showVideo.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/server/views/challenges/showVideo.jade b/server/views/challenges/showVideo.jade
index 3f19d8706c..7be94ee6fd 100644
--- a/server/views/challenges/showVideo.jade
+++ b/server/views/challenges/showVideo.jade
@@ -87,9 +87,4 @@ block content
         });
       });
 
-      document.addEventListener('gitter-sidecar-ready', function(e) {
-        if (window.main) {
-          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
-        }
-      });
     include ../partials/challenge-footer
diff --git a/server/views/challenges/showZiplineOrBasejump.html b/server/views/challenges/showZiplineOrBasejump.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/server/views/challenges/showZiplineOrBasejump.jade b/server/views/challenges/showZiplineOrBasejump.jade
index f01928798b..f370ff1fa4 100644
--- a/server/views/challenges/showZiplineOrBasejump.jade
+++ b/server/views/challenges/showZiplineOrBasejump.jade
@@ -106,25 +106,4 @@ block content
           $('#complete-zipline-or-basejump-dialog').modal('show');
         });
       });
-
-
-
-      document.addEventListener('gitter-sidecar-ready', function(e) {
-        var room = 'freecodecamp/help';
-        var title;
-
-        if (common.challengeType === '4') {
-          room = 'freecodecamp/helpBasejumps';
-          title = 'Basejump Help';
-        }
-
-        if (common.challengeType === '3') {
-          room = 'freecodecamp/helpZiplines';
-          title = 'Zipline Help';
-        }
-
-        if (window.main) {
-          window.main.chat.createHelpChat(room, '#challenge-help-btn', title);
-        }
-      });
     include ../partials/challenge-footer
diff --git a/server/views/partials/challenge-footer.jade b/server/views/partials/challenge-footer.jade
index ed6be20a3f..732c9dadb6 100644
--- a/server/views/partials/challenge-footer.jade
+++ b/server/views/partials/challenge-footer.jade
@@ -5,3 +5,10 @@ script.
   if (typeof localStorage !== 'undefined') {
     localStorage.setItem('currentDashedName', typeof common !== 'undefined' && common.dashedName || '');
   }
+  var common = window.common || { init: [] };
+  common.helpRoom = !{JSON.stringify(helpRoom)};
+  document.addEventListener('gitter-sidecar-ready', function(e) {
+    if (window.main) {
+      window.main.chat.createHelpChat(common.helpRoom, '#challenge-help-btn');
+    }
+  });