Implement new webmaker login

Author: Christopher De Cairos

Gruntfile.coffee

@@ -16,8 +16,8 @@ module.exports = (grunt) ->
     'app/_bower_components/locompleter/locompleter.js'
     'app/_bower_components/webmaker-analytics/analytics.js'
     'app/_bower_components/spiiin/src/spiiin.js'
-    'app/_bower_components/webmaker-login-angular/dist/ngWebmakerLogin.js'
-    'app/_bower_components/webmaker-login-angular/dist/templates/ngWebmakerLogin.templates.js'
+    'app/_bower_components/webmaker-login-ux/dist/ngWebmakerLogin.js'
+    'app/_bower_components/webmaker-login-ux/dist/templates/ngWebmakerLogin.templates.js'
     'app/_js/app.js'
     'app/_js/services.js'
     'app/_js/controllers.js'

app/_js/app.js

@@ -15,9 +15,9 @@ angular.module('wmProfile', [
 config(['$routeProvider', '$locationProvider',
   function ($routeProvider, $locationProvider) {
     $routeProvider.when('/:locale?/user/:username/badges', {
-        templateUrl: '/user/_partials/badges.html',
-        controller: 'badges'
-      })
+      templateUrl: '/user/_partials/badges.html',
+      controller: 'badges'
+    })
       .when('/:locale?/user/:username/badges', {
         templateUrl: '/user/_partials/badges.html',
         controller: 'badges'
@@ -59,10 +59,10 @@ run(['$rootScope', '$http', 'jQuery',
     };
 
     $.ajax({
-        async: false,
-        url: '/user/_service/env.json',
-        dataType: 'json'
-      })
+      async: false,
+      url: '/user/_service/env.json',
+      dataType: 'json'
+    })
       .done(function (config) {
         $rootScope.WMP.config = config;
         // Set locale information

app/_js/directives.js

@@ -12,35 +12,37 @@ angular.module('wmProfile.directives', [])
       }
     };
   })
-  .directive('wmpSrc', ['jQuery', function (jQuery) {
-    // Add wmp-src to an img to only give it a src if the target is loadable
-    // This prevents broken images from displaying and creates hooks for other display logic
-    return {
-      restrict: 'A',
-      scope: {
-        url: '@wmpSrc',
-        didFail: '=wmpSrcFailed'
-      },
-      link: function ($scope, el, attrs) {
-        var elLoader = jQuery('<img>');
-        el.fadeTo(0, 0);
-
-        elLoader.on('load', function () {
-          el.attr('src', $scope.url).fadeTo(200, 1);
-          $scope.didFail = false;
-          $scope.$apply();
-        });
+  .directive('wmpSrc', ['jQuery',
+    function (jQuery) {
+      // Add wmp-src to an img to only give it a src if the target is loadable
+      // This prevents broken images from displaying and creates hooks for other display logic
+      return {
+        restrict: 'A',
+        scope: {
+          url: '@wmpSrc',
+          didFail: '=wmpSrcFailed'
+        },
+        link: function ($scope, el, attrs) {
+          var elLoader = jQuery('<img>');
+          el.fadeTo(0, 0);
 
-        elLoader.on('error', function () {
-          $scope.didFail = true;
-          $scope.$apply();
-        });
+          elLoader.on('load', function () {
+            el.attr('src', $scope.url).fadeTo(200, 1);
+            $scope.didFail = false;
+            $scope.$apply();
+          });
 
-        // Attempt to load target image in a non attached IMG element
-        elLoader.attr('src', $scope.url);
-      }
-    };
-  }])
+          elLoader.on('error', function () {
+            $scope.didFail = true;
+            $scope.$apply();
+          });
+
+          // Attempt to load target image in a non attached IMG element
+          elLoader.attr('src', $scope.url);
+        }
+      };
+    }
+  ])
   .directive('wmpLogin', ['$rootScope',
     function ($rootScope) {
       return {

app/_less/components/imports.less

@@ -14,4 +14,4 @@
 @import "../_bower_components/selectize/dist/less/selectize";
 
 // Webmaker Login
-@import "../_bower_components/webmaker-login-angular/dist/css/webmakerLogin.css";
+@import "../_bower_components/webmaker-login-ux/dist/css/webmakerLogin.css";

bower.json

@@ -20,8 +20,7 @@
     "selectize": "0.9.0",
     "makeapi-client": "https://github.com/mozilla/makeapi-client.git#v0.5.24",
     "makerstrap": "0.1.3",
-    "webmaker-auth-client": "0.1.11",
-    "webmaker-login-angular": "https://github.com/cadecairos/webmaker-login-angular/archive/8ba3f24d7f68b784a75b75387165b44c175f7430.tar.gz",
+    "webmaker-login-ux": "1.0.1",
     "ngInfiniteScroll": "1.1.2",
     "spiiin": "0.2.0"
   }

package.json

@@ -22,7 +22,7 @@
     "morgan": "1.0.1",
     "newrelic": "1.5.5",
     "optimist": "0.6.1",
-    "webmaker-auth": "0.1.4",
+    "webmaker-auth": "0.2.1",
     "webmaker-i18n": "0.3.22",
     "webmaker-locale-mapping": "0.0.5",
     "webmaker-translation-stats": "0.0.1",

server/server.js

@@ -55,7 +55,7 @@ module.exports = function (config) {
     translation_directory: path.resolve(__dirname, '../locale')
   }));
 
-  var webmakerLoginJSON = require('../app/_bower_components/webmaker-login-angular/locale/en_US/webmaker-login.json');
+  var webmakerLoginJSON = require('../app/_bower_components/webmaker-login-ux/locale/en_US/webmaker-login.json');
 
   i18n.addLocaleObject({
     'en-US': webmakerLoginJSON