Merge pull request #52 from CodersTV/telescope-integration

Telescope integration
CodersTV · Mar 29, 2015 · f101598 · f101598
2 parents 6740aaf + b2dda61
commit f101598
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/client/views/layout/header.less b/client/views/layout/header.less
@@ -16,6 +16,7 @@
     vertical-align: text-top;
     margin-top: 18px;
     margin-right: 20px;
+    margin-left: 10px !important;
   }
   .navbar-nav > li > a {
     color: #CCC;

diff --git a/client/views/layout/layout.html b/client/views/layout/layout.html
@@ -79,7 +79,7 @@ <h1 class="oswald text-muted">Loading...</h1>
 
 <template name="header">
   <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-    <div class="container">
+    <div class="container-fluid">
       <div class="navbar-header">
         <button type="button" class="navbar-toggle" data-target=".navbar-collapse">
           <span class="sr-only">Toggle navigation</span>
@@ -100,6 +100,9 @@ <h1 class="oswald text-muted">Loading...</h1>
           <li>
             <a href="{{pathFor 'dashboard'}}"><i class="fa fa-video-camera"></i>Start a Broadcast</a>
           </li>
+          <li>
+            <a href="http://forums.coderstv.com" target="_blank"><i class="fa fa-comment"></i>Forums</a>
+          </li>
         </ul>
 
         <!-- Search form for extra small screens -->

diff --git a/server/collections/users.js b/server/collections/users.js
@@ -22,6 +22,10 @@ Meteor.users.allow({
   }
 });
 
+Meteor.users.before.insert(function addTelescopeFields (userId, doc) {
+  doc.profile.email = doc.services.google.email;
+});
+
 Meteor.users.after.insert(function (userId, doc) {
   if (! doc.services.google.refreshToken) return;
 
@@ -34,7 +38,7 @@ Meteor.users.after.insert(function (userId, doc) {
     return;
   }
   doc.superchat = Meteor.users.saveSuperchatInfo(profile);
-  doc.gplus = profile; 
+  doc.gplus = profile;
   debug('Finished saving profile.');
 });
 

diff --git a/server/methods.js b/server/methods.js
@@ -35,6 +35,8 @@ Meteor.methods({
   setUsername: function (username) {
     var user = Meteor.user();
 
+    check(username, String);
+
     if (user.username) {
       throw new Meteor.Error(400, 'User already has username defined.');
     }
@@ -44,7 +46,11 @@ Meteor.methods({
     }
 
     Meteor.users.update({_id: user._id}, {
-      $set: {'profile.username': username}
+      $set: {
+        'profile.username': username,
+        username: username,
+        slug: username.toLowerCase()
+      }
     });
 
     return 'You have changed your username successfully. Your username now is ' + username;