Merge pull request rambl#63 from tmoc/master

Added alert when attemping to create account that already exists.

client/app/home/home.html

@@ -17,6 +17,7 @@ <h1 class="logo text-center">Rambl</h1>
   <div class="signin">
     <div id='login' class="jumbotron signin_div">
       <form name='loginForm' ng-submit='login();'>
+        <div class="alert alert-danger" ng-show="invalidAccountInfo">Invalid email/password.</div>
         <input placeholder="Email" required class="form-control" type='email' maxlength="32" ng-model='user.email'>
         <input placeholder="Password" required class="form-control" type='password' maxlength="32" ng-model='user.password'>
         <br />

client/app/home/home.js

@@ -3,6 +3,8 @@ angular.module('ramblApp.home', [])
 .controller('homeController', ['$scope', '$window', '$location', 'Auth', 'EasyRTC',
   function ($scope, $window, $location, Auth, EasyRTC) {
 
+    $scope.invalidAccountInfo = false;
+
     // if user has userName and token, redirect to lobby, else check if they're coming from
     // lobby/room having signed out and if so remove them from room and/or disconnect from easyrtc
     if ($window.localStorage.getItem('ramblUsername') && $window.localStorage.getItem('ramblToken')) {
@@ -19,7 +21,11 @@ angular.module('ramblApp.home', [])
     $scope.login = function () {
       Auth.login($scope.user)
         .then(function (userObject) {
-          Auth.processLogin(userObject);
+          if (userObject.token !== undefined && userObject.userName !== undefined) {
+            Auth.processLogin(userObject);
+          } else {
+            $scope.invalidAccountInfo = true;
+          }
         })
         .catch(function (error) {
           console.error(error);

client/app/signup/signup.html

@@ -15,6 +15,7 @@
     <div id="signup" class="jumbotron signup_div">
       <h2>Sign Up!</h2>
       <form name="signupForm" ng-submit="signup();">
+        <div class="alert alert-danger" ng-show="accountAlreadyExists">Account already exists.</div>
         <input placeholder='Your email' required class="form-control" type="email" maxlength="32" ng-model="user.email">
         <input placeholder='Your display name' required class="form-control" type="text" maxlength="32" ng-model="user.name">
         <input placeholder='Password' required class="form-control" type="password" maxlength="32" ng-model="user.password">

client/app/signup/signup.js

@@ -2,6 +2,8 @@ angular.module('ramblApp.signup', [])
 
 .controller('signupController', ['$scope', '$window', '$location', 'Auth', 'EasyRTC',
   function ($scope, $window, $location, Auth, EasyRTC) {
+
+    $scope.accountAlreadyExists = false;
 
     // if user has userName and token, redirect to lobby, else check if they're coming from
     // lobby/room having signed out and if so remove them from room and/or disconnect from easyrtc
@@ -21,6 +23,8 @@ angular.module('ramblApp.signup', [])
         .then(function (userObject) {
           if (userObject.token !== undefined && userObject.userName !== undefined) {
             Auth.processLogin(userObject);
+          } else {
+            $scope.accountAlreadyExists = true;
           }
         })
         .catch(function (error) {