Merge remote-tracking branch 'origin/master'

appdotnet · Sep 5, 2013 · 72ee9a4 · 72ee9a4
2 parents f953032 + b47f60c
commit 72ee9a4
Show file tree

Hide file tree

Showing 16 changed files with 113 additions and 41 deletions.
diff --git a/app.js b/app.js
@@ -10,6 +10,7 @@ nconf.add('asset_map', {type: 'file', file: asset_map_path});
 var express = require('express');
 var jade = require('jade');
 var app = express();
+var raven = require('raven');
 var server = require('http').createServer(app);
 var redisurl = require('./ohe/redisurl');
 var RedisStore = require('connect-redis')(express);
@@ -23,6 +24,7 @@ var _ = require('underscore');
 var multiprocess = nconf.get('deploy:multiprocess');
 var connect_to_stream = nconf.get('deploy:master') || !multiprocess;
 var on_heroku = nconf.get('deploy:heroku');
+var SENTRY_DSN = nconf.get('sentry:dsn');
 
 if (on_heroku) {
     nconf.set('sessions:redis_url', process.env.REDISTOGO_URL);
@@ -99,6 +101,7 @@ app.configure(function () {
     app.use(express.bodyParser());
     app.use("/static", express['static'](__dirname + '/static'));
     app.use(app.router);
+    app.use(raven.middleware.express(SENTRY_DSN));
     app.use(express.errorHandler());
 });
 
@@ -115,6 +118,7 @@ app.get('/channel/:channel_id', routes.index);
 app.get('/new-message', routes.index);
 app.get('/return', routes.oauth_return);
 app.get('/logout', routes.logout);
+app.get('/logout-and-login', routes.logout_and_login);
 app.get('/healthcheck', routes.healthcheck);
 app.get('/camofy-url', routes.camofy_url);
 app.get('/file-url', routes.file_url);

diff --git a/config.sample.json b/config.sample.json
@@ -15,5 +15,8 @@
     "camo": {
         "host": "",
         "key": ""
+    },
+    "sentry": {
+        "dsn": ""
     }
 }
diff --git a/ohe/auth.js b/ohe/auth.js
@@ -97,7 +97,8 @@ exports.get_authenticate_url = function (req) {
         response_type: 'code',
         redirect_uri: redirect_uri,
         scope: scope,
-        client_id: client_id
+        client_id: client_id,
+        new_onboarding: 1
     });
 };
 

diff --git a/package.json b/package.json
@@ -6,15 +6,16 @@
   "private": true,
   "dependencies": {
     "nconf": "0.6.5",
-    "express": "3.0.3",
+    "express": "3.2.4",
     "event-stream": "3.0.7",
     "request": "2.12.0",
     "connect-redis": "1.4.5",
     "jade": "0.28.1",
     "redis": "0.8.2",
     "underscore": "1.4.2",
     "http-proxy": "0.8.4",
-    "hiredis": "0.1.14"
+    "hiredis": "0.1.15",
+    "raven": "0.5.1"
   },
   "engines": {
     "node": "0.8.x",

diff --git a/routes/index.js b/routes/index.js
@@ -39,6 +39,12 @@ exports.logout = function (req, res) {
     });
 };
 
+exports.logout_and_login = function (req, res) {
+    auth.logout(req, function () {
+        res.redirect(auth.get_authenticate_url(req));
+    });
+}
+
 exports.healthcheck = function (req, res) {
     res.send('healthcheck=OK');
 };

diff --git a/static/images/appdotnet-omega.png b/static/images/appdotnet-omega.png
diff --git a/static/images/apple-touch-icon.png b/static/images/apple-touch-icon.png
diff --git a/static/images/omega-logo.png b/static/images/omega-logo.png
diff --git a/static/images/[email protected] b/static/images/[email protected]
diff --git a/static/js/channels.js b/static/js/channels.js
@@ -172,5 +172,11 @@
         $scope.getRoster = function () {
             return $scope.selectedUsers;
         };
-    }]);
+    }]).directive('channelListEntry', function () {
+        return {
+            restrict: 'E',
+            replace: true,
+            templateUrl: 'channel-list-entry.html'
+        };
+    });
 })();
diff --git a/static/js/messages.js b/static/js/messages.js
@@ -334,7 +334,19 @@
             restrict: 'E',
             controller: 'MessageFormCtrl',
             replace: true,
-            templateUrl: 'message-form.html'
+            templateUrl: 'message-form.html',
+            link: function (scope, element) {
+                $(element).keypress(function (e) {
+                    // prevent Enter key from opening file attachment dialog when
+                    // Send button is disabled
+                    if (e.which === 13) { // Enter key
+                        var submit_btn = $(element).find('button[value="submit"]');
+                        if (submit_btn.attr('disabled') === 'disabled') {
+                            return false;
+                        }
+                    }
+                });
+            }
         };
     }).directive('messageContainer', ['utils', '$http', function (utils, $http) {
         return {

diff --git a/static/js/ohe.js b/static/js/ohe.js
@@ -10,7 +10,7 @@
             var error = function (response) {
                 var status = response.status;
                 if (status === 401) {
-                    window.location.href = window.location.href;
+                    window.location.pathname = '/logout-and-login';
                 }
                 return $q.reject(response);
             };

diff --git a/static/scss/_ohe.scss b/static/scss/_ohe.scss
@@ -1,8 +1,17 @@
 $grayHighlight: #FBFBFB;
 
 html.omega {
-    .nav.header .logo {
-        background-image: url("/static/images/appdotnet-omega.png");
+    .nav.header {
+        .logo {
+            background-image: url("/static/images/omega-logo.png");
+            width: 146px;
+            height: 32px;
+            background-size: 146px 32px;
+            margin-top: 23px;
+        }
+        &.logged-out .logo {
+            margin-bottom: 23px;
+        }
     }
     .navbar .nav .active > a {
         background-color: $grayHighlight;
@@ -14,6 +23,24 @@ html.omega {
         font-size: 14px;
     }
 }
+html.breakpoint-retina {
+    .nav.header .logo {
+        background-image: url("/static/images/[email protected]");
+    }
+}
+html.breakpoint-phone {
+    .nav.header {
+        .logo {
+            margin: 6px 0 0 0;
+            width: 32px;
+            height: 32px;
+        }
+        &.logged-out .logo {
+            margin-bottom: 6px;
+        }
+    }
+}
+
 
 .logged-in-block a {
     outline: 0;

diff --git a/static/templates/channel-list-entry.html b/static/templates/channel-list-entry.html
@@ -0,0 +1,25 @@
+<a href="{{ channel.detail_url() }}">
+    <div class="row {{channel.has_unread && 'unread'}} channel">
+        <div class='pull-left img-block'>
+            <img width=50 height=50 alt='channel icon {{ channel.get_visible_user().username }}' ng-src="{{ channel.get_visible_user().avatar_image.url }}?w=50">
+        </div>
+        <div class='content-block'>
+            <div class='timestamp pull-right'>
+                <small class='muted'>{{ channel.recent_message.created_at | date:'MMM-d h:mm a' }}</small>
+            </div>
+            <div class='users'>
+                <span ng-repeat="user in channel.get_users()">
+                  <span ng-show="user.is_complete">
+                    {{ user.username }}<span ng-show="!$last">, </span>
+                  </span>
+                </span>
+            </div>
+            <div class='recent-message'>
+                <small class='muted'>
+                    <span ui-if="channel.recent_message.user.id == user_id">&larr; </span>
+                    {{channel.recent_message.text}}
+                </small>
+            </div>
+        </div>
+    </div>
+</a>
diff --git a/static/templates/channel-list.html b/static/templates/channel-list.html
@@ -10,38 +10,25 @@
   </div>
   <div class="channel-list yui3-u-2-3 m-yui3-u-1">
     <div class="row-fluid">
-      <div class='ul-container yui3-u-1'>
-          <ul class='unstyled'>
-              <li ng-repeat="channel in (selectedNav == 'inbox' && channel_list || muted_channel_list) | orderBy:['-has_unread', '-recent_message.created_at'] | limitTo:((selectedNav == 'inbox' && num_channels_to_show) || muted_channel_list.length)" ng-class="{'last':$last}">
-                  <a href="{{ channel.detail_url() }}">
-                      <div class="row {{channel.has_unread && 'unread'}} channel">
-                          <div class='pull-left img-block'>
-                              <img width=50 height=50 alt='channel icon {{ channel.get_visible_user().username }}' ng-src="{{ channel.get_visible_user().avatar_image.url }}?w=50">
-                          </div>
-                          <div class='content-block'>
-                              <div class='timestamp pull-right'>
-                                  <small class='muted'>{{ channel.recent_message.created_at | date:'MMM-d h:mm a' }}</small>
-                              </div>
-                              <div class='users'>
-                                  <span ng-repeat="user in channel.get_users()">
-                                    <span ng-show="user.is_complete">
-                                      {{ user.username }}<span ng-show="!$last">, </span>
-                                    </span>
-                                  </span>
-                              </div>
-                              <div class='recent-message'>
-                                  <small class='muted'>
-                                      <span ui-if="channel.recent_message.user.id == user_id">&larr; </span>
-                                      {{channel.recent_message.text}}
-                                  </small>
-                              </div>
-                          </div>
-                      </div>
-                  </a>
-              </li>
-              <li class='show-older-channels ta-center' ng-show="selectedNav == 'inbox' && has_more_channels() && channel_list.length >= channel_fetch_size"><a href='#' ng-click="loadOlderChannels()">Show Older <i class='icon-chevron-down'></i></a></li>
-              <div class='no-channels' ng-show="!channel_list || channel_list.length == 0">No messages yet</div>
-          </ul>
+      <div class='ul-container yui3-u-1' ng-switch on="selectedNav">
+          <div ng-switch-default>
+              <ul class='unstyled'>
+                  <li ng-repeat="channel in channel_list | orderBy:['-has_unread', '-recent_message.created_at'] | limitTo: num_channels_to_show" ng-class="{'last':$last}">
+                      <channel-list-entry></channel-list-entry>
+                  </li>
+                  <li class='show-older-channels ta-center' ng-show="has_more_channels()">
+                      <a href='#' ng-click="loadOlderChannels()">Show Older <i class='icon-chevron-down'></i></a>
+                  </li>
+                  <div class='no-channels' ng-show="!channel_list || channel_list.length == 0">No messages yet</div>
+              </ul>
+          </div>
+          <div ng-switch-when="muted">
+              <ul class='unstyled'>
+                  <li ng-repeat="channel in muted_channel_list | orderBy:['-has_unread', '-recent_message.created_at']" ng-class="{'last':$last}">
+                      <channel-list-entry></channel-list-entry>
+                  </li>
+              </ul>
+          </div>
       </div>
     </div>
   </div>

diff --git a/views/index.jade b/views/index.jade
@@ -67,7 +67,7 @@ html(lang="en", ng-app="ohe", class="omega new-app-dot-net")
 
   body
     div.wrapper
-      div.nav.header.yui3-u-1
+      div(class="#{is_authenticated ? '' : 'logged-out'} nav header yui3-u-1")
         div.container
           div.yui3-u-1.clearfix
             a.pull-left.logo(href="/")