topcoder-archive · nlitwin · Oct 9, 2015 · Oct 5, 2015 · Oct 6, 2015 · Oct 6, 2015
diff --git a/app/account/login/login.jade b/app/account/login/login.jade
@@ -27,21 +27,21 @@
     p ------------ Or Log in With ------------
 
     .social-icons
-      .github
+      .network.github
         .ico(ng-click="vm.socialLogin('github')")
         p Github
-      .google-plus
+      .network.google-plus
         .ico(ng-click="vm.socialLogin('google-oauth2')")
         p Google
-      .facebook
+      .network.facebook
         .ico(ng-click="vm.socialLogin('facebook')")
         p Facebook
-      .twitter
+      .network.twitter
         .ico(ng-click="vm.socialLogin('twitter')")
         p Twitter
 
-  .join-topcoder
-    span Not a member yet? 
-    p.redirect
-      a(ui-sref="register(vm.$stateParams)") Join now
+.join-topcoder
+  span Not a member yet? 
+  p.redirect
+    a(ui-sref="register(vm.$stateParams)") Join now
 
diff --git a/app/account/register/register.jade b/app/account/register/register.jade
@@ -35,7 +35,10 @@
       )
 
       .form-errors
-        p.form-error(ng-show="vm.registerForm.country.$error.required") Please choose a country from the list.
+        p.form-error(ng-show="vm.registerForm.country.$error.required") Please choose a country from the list
+
+    .section-break
+      hr
 
     .validation-bar(ng-class="{ 'error-bar': (vm.registerForm.username.$error.usernameIsFree || vm.registerForm.username.$error.minlength || vm.registerForm.username.$error.maxlength), 'success-bar': (vm.registerForm.username.$valid && !vm.registerForm.username.$error.usernameIsFree) }")
       input-sticky-placeholder(sticky-placeholder="Username", ng-model="vm.username")
@@ -85,26 +88,26 @@
 
         p(ng-class="{ 'has-symbol-or-number': (vm.registerForm.password.$dirty && !vm.registerForm.password.$error.hasSymbolOrNumber) }") At least one number or symbol
 
-    button(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid", ng-class="{'enabled-button': vm.registerForm.$valid}") Join
+    section.terms
+      p By clicking "Join," you agree to Topcoder's #[a(href="http://www.topcoder.com/community/how-it-works/terms/", target="_blank") Terms of Service] and #[a(href="http://www.topcoder.com/community/how-it-works/privacy-policy/", target="_blank") Privacy Policy]
 
-  section.terms
-    p By clicking "Join," you agree to Topcoder's #[a(href="http://www.topcoder.com/community/how-it-works/terms/", target="_blank") Terms of Service] and #[a(href="http://www.topcoder.com/community/how-it-works/privacy-policy/", target="_blank") Privacy Policy]
+    button(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid", ng-class="{'enabled-button': vm.registerForm.$valid}") Join
 
   section.social
     p ------------ Or Register With ------------
 
     .social-icons
-      .github
+      .network.github
         .ico(ng-click="vm.socialRegister('github')")
         p Github
-      .google-plus
+      .network.google-plus
         .ico(ng-click="vm.socialRegister('google-oauth2')")
         p Google
-      .facebook
+      .network.facebook
         .ico(ng-click="vm.socialRegister('facebook')")
         p Facebook
 
-  .join-topcoder
-    span Already a member?
-    p.redirect
-      a(ui-sref="login(vm.$stateParams)") Log in
+.join-topcoder
+  span Already a member?
+  p.redirect
+    a(ui-sref="login(vm.$stateParams)") Log in
diff --git a/app/directives/challenge-tile/challenge-tile.directive.jade b/app/directives/challenge-tile/challenge-tile.directive.jade
@@ -59,7 +59,7 @@
 
       div(ng-switch-when="MARATHON_MATCH")
         .marathon-score
-          p.score {{challenge.pointTotal || 0 }
+          p.score {{challenge.pointTotal || 0 }}
 
           p Total Points
 

diff --git a/app/directives/external-account/external-account.directive.jade b/app/directives/external-account/external-account.directive.jade
@@ -1,4 +1,4 @@
-.ext-tile(ng-repeat="account in accountList | orderBy:'order'", ng-click="!account.disabled && !readOnly && !account.linked && link(account.provider)", ng-class="{'connected': account.linked, 'disabled': account.disabled, 'read-only': readOnly}")
+.ext-tile(ng-repeat="account in accountList | orderBy:'order'", ng-click="!account.disabled && !readOnly && handleClick(account.provider, account.linked)", ng-class="{'connected': account.linked, 'disabled': account.disabled, 'read-only': readOnly}")
   .external-account-box(ng-class="account.colorClass")
     i.fa(ng-if="readOnly || account.linked", ng-class="account.className", style="color: {{account.colorClass | externalLinkColor}}")
 

diff --git a/app/directives/external-account/external-account.directive.js b/app/directives/external-account/external-account.directive.js
@@ -1,7 +1,7 @@
 (function() {
   'use strict';
   var _supportedAccounts = [
-    { provider: "dribble", className: "fa-dribbble", displayName: "Dribble", disabled: true, order: 6, colorClass: 'el-dribble'},
+    { provider: "dribbble", className: "fa-dribbble", displayName: "Dribbble", disabled: false, order: 6, colorClass: 'el-dribble'},
     { provider: "linkedin", className: "fa-linkedin", displayName: "LinkedIn", disabled: true, order: 5, colorClass: 'el-linkedin'},
     { provider: "stackoverflow", className: "fa-stack-overflow", displayName: "Stack Overflow", disabled: false, order: 3, colorClass: 'el-stackoverflow'},
     { provider: "behance", className: "fa-behance", displayName: "Behance", disabled: true, order: 2, colorClass: 'el-behance'},
@@ -26,28 +26,36 @@
         function($log, $scope, ExternalAccountService, toaster) {
           $log = $log.getInstance("ExtAccountDirectiveCtrl")
           $scope.accountList = _.clone(_supportedAccounts, true);
-          $scope.$watch('linkedAccounts', function(newValue, oldValue) {
+          $scope.$watchCollection('linkedAccounts', function(newValue, oldValue) {
             for (var i=0;i<$scope.accountList.length;i++) {
               $scope.accountList[i].linked = !!_.find(newValue, function(a) {
                 return $scope.accountList[i].provider === a.providerType;
               });
             }
           });
 
-          $scope.link = function(provider) {
-            $log.debug(String.supplant('connecting to ' + provider));
-            // var callbackUrl = $state.href('settings.profile', {}, {absolute: true});
-            var extAccountProvider = _.result(_.find(_supportedAccounts, function(s) {
+          $scope.handleClick = function(provider, unlink) {
+            var provider = _.find(_supportedAccounts, function(s) {
               return s.provider === provider;
-            }), 'displayName');
-            ExternalAccountService.linkExternalAccount(provider, null)
+            });
+            if (unlink) {
+              $log.debug(String.supplant('UnLinking to ' + provider.displayName));
+              _unlink(provider);
+            } else {
+              $log.debug(String.supplant('Linking to ' + provider.displayName));
+              _link(provider);
+            }
+          };
+
+          function _link(provider) {
+            ExternalAccountService.linkExternalAccount(provider.provider, null)
             .then(function(resp) {
               $log.debug("Social account linked: " + JSON.stringify(resp));
               $scope.linkedAccounts.push(resp.profile);
               toaster.pop('success', "Success",
                 String.supplant(
                   "Your {provider} account has been linked. Data from your linked account will be visible on your profile shortly.",
-                  {provider: extAccountProvider}
+                  {provider: provider.displayName}
                 )
               );
             })
@@ -58,12 +66,40 @@
                   String.supplant(
                     "This {provider} account is linked to another account. \
                     If you think this is an error please contact <a href=\"mailTo:support@.appirio.com\">support@apprio.com</a>.",
-                    {provider: extAccountProvider }
+                    {provider: provider.displayName }
                   )
                 );
               }
             });
-          };
+          }
+
+          function _unlink(provider) {
+            return ExternalAccountService.unlinkExternalAccount(provider.provider)
+            .then(function(resp) {
+              $log.debug("Social account unlinked: " + JSON.stringify(resp));
+              var toRemove = _.findIndex($scope.linkedAccounts, function(la) {
+                return la.providerType === provider;
+              });
+              $scope.linkedAccounts.splice(toRemove, 1);
+              toaster.pop('success', "Success",
+                String.supplant(
+                  "Your {provider} account has been unlinked.",
+                  {provider: provider.displayName}
+                )
+              );
+            })
+            .catch(function(resp) {
+              var msg = resp.msg;
+              if (resp.status === 'SOCIAL_PROFILE_NOT_EXIST') {
+                $log.info("Social profile not linked to account");
+                msg = "{provider} account is not linked to your account. If you think this is an error please contact <a href=\"mailTo:support@.appirio.com\">support@apprio.com</a>.";
+              } else {
+                $log.info("Fatal error: " + msg);
+                msg = "Sorry! We are unable to unlink your {provider} account. If problem persists, please contact <a href=\"mailTo:support@.appirio.com\">support@apprio.com</a>";
+              }
+              toaster.pop('error', "Whoops!", String.supplant(msg, {provider: provider.displayName }));
+            });
+          }
         }
       ]
     };

diff --git a/app/directives/external-account/external-link-data.directive.jade b/app/directives/external-account/external-link-data.directive.jade
@@ -50,7 +50,7 @@
             .key likes
 
 
-      div(ng-switch-when="dribble")
+      div(ng-switch-when="dribbble")
         .handle {{account.data.handle}}
 
         .pending(ng-show="account.data.status === 'PENDING'")

diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade
@@ -18,8 +18,9 @@
       .registered(ng-show="vm.registered")
         i.fa.fa-check-circle-o
         p You are registered!
-      .unregistered(ng-hide="true")
+      .unregistered(ng-hide="vm.registered")
         button.srm-action Register
+
   .past-srm(ng-show="srm.status === 'PAST'")
     .challenge-track
 
@@ -52,7 +53,7 @@
       .registered(ng-show="vm.registered")
         i.fa.fa-check-circle-o
         p You are registered!
-      .unregistered(ng-hide="true")
+      .unregistered(ng-hide="vm.registered")
         button.srm-action Register
 
   .past-srm(ng-show="srm.status === 'PAST'")

diff --git a/app/index.jade b/app/index.jade
@@ -83,6 +83,8 @@ html
 
     #header(ui-view="header")
 
+    .intro-js-container(ng-intro-options="main.introOptions", ng-intro-method="main.startIntro")
+
     notifications-bar.notifications(closeIcon="fa fa-times-circle")
 
     toaster-container(toaster-options="{{main.globalToasterConfig}}")

diff --git a/app/layout/header/header.controller.js b/app/layout/header/header.controller.js
@@ -3,9 +3,9 @@
 
   angular.module('tc.layout').controller('HeaderController', HeaderController);
 
-  HeaderController.$inject = ['$state', 'TcAuthService', 'CONSTANTS', '$log', '$rootScope', 'UserService', 'ProfileService', 'IntroService'];
+  HeaderController.$inject = ['$state', 'TcAuthService', 'CONSTANTS', '$log', '$rootScope', 'UserService', 'ProfileService'];
 
-  function HeaderController($state, TcAuthService, CONSTANTS, $log, $rootScope, UserService, ProfileService, IntroService) {
+  function HeaderController($state, TcAuthService, CONSTANTS, $log, $rootScope, UserService, ProfileService) {
     var vm = this;
 
     vm.constants = CONSTANTS;
@@ -89,8 +89,5 @@
         $state.go('home');
       });
     };
-
-    // Intro data
-    vm.introOptions = IntroService.getIntroData($state.$current.name);
   }
 })();
diff --git a/app/layout/header/header.jade b/app/layout/header/header.jade
@@ -1,53 +1,60 @@
-// Header container
 .header-wrapper(ng-class="{'autocomplete': main.searchTerm.length > 0}")
-  // Main header element
-  div(ng-intro-options="vm.introOptions", ng-intro-method="launchIntro")
   header.top-header
     a.logo-link(href="/")
     // Header content visible on small screens
     .show-small.mobile-heading
       span.tc-text-logo(ng-if="main.menuVisible") [ topcoder ]
+
       button.btn-open-menu(type="button", ng-if="!main.menuVisible", ng-click="main.menuVisible = true") Menu
+
       button.btn-close-menu(type="button", ng-if="main.menuVisible", ng-click="main.menuVisible = false")
+
       // User link (profile or join)
       a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-switch="vm.isAuth" class="user-link" data-ng-if="!main.menuVisible")
         img(ng-switch-when="true", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
+
         span(ng-switch-when="false" class="btn-link") JOIN
 
-    // main menu 
     ul.main-menu
-      // search container
       li.menu-item.search-wrapper
         .menu-item-header.show-large #[button.btn-expand-search.search-icon(type="button")]
+
         .submenu
           input(type="text" placeholder="find people" ng-model="vm.searchTerm" ng-keyup="vm.checkSubmit($event)")
           // Suggestion list container
           // ul.suggestion-list(ng-if="main.searchTerm.length > 0")
-          //   li(ng-repeat="suggestion in main.suggestions | filter:main.searchTerm | limitTo:5") 
+          //   li(ng-repeat="suggestion in main.suggestions | filter:main.searchTerm | limitTo:5")
           //     a(href="javascript:;" class="menu-link") {{suggestion}}
 
-      // user menu
       li.menu-item.link-group.user-menu(ng-switch="vm.isAuth", ng-class="{'anonymous-menu': !vm.isAuth}")
         // links for logged in user
         div(ng-switch-when="true")
           .menu-item-header
             span(ui-sref="profile.about({userHandle: vm.userHandle})")
               img(class="user-avatar", ng-src="{{vm.profile.photoURL}}")
+
               span.username {{vm.userHandle}}
+
           a.btn-link.btn-edit-profile.show-small(ui-sref="settings.profile") EDIT
+
           ul.submenu
             header-menu-item(ng-repeat="item in vm.userMenu" item="item")
+
             li.submenu-item
               a.menu-link(ng-click="vm.logout(); main.menuVisible = vm.isAuth = false")
                 img.menu-icon(ng-src="/images/nav/logout.svg")
                 .menu-text LOG OUT
+
         // links for anonymous user
         .menu-item-header(ng-switch-when="false")
           a.btn-link(ui-sref="register") REGISTER
+
           a.btn-link.secondary-link(ui-sref="login") LOGIN
-          a(ng-click="launchIntro();", ng-show="!!vm.introOptions") Intro
+
+          //- a(ng-click="launchIntro();", ng-show="!!vm.introOptions") Intro
 
       li.menu-item.link-group(ng-repeat="(menu, items) in vm.menuLinks")
         .menu-item-header {{menu}}
+
         ul.submenu
           header-menu-item(ng-repeat="item in items" item="item")
diff --git a/app/layout/layout.module.js b/app/layout/layout.module.js
@@ -1,7 +1,7 @@
 (function() {
   'use strict';
 
-  var dependencies = ['angular-intro'];
+  var dependencies = [];
 
   angular.module('tc.layout', dependencies);
 

diff --git a/app/my-challenges/my-challenges.controller.js b/app/my-challenges/my-challenges.controller.js
@@ -81,6 +81,7 @@
 
       return ChallengeService.getUserChallenges(handle, params)
       .then(function(challenges){
+        ChallengeService.processActiveDevDesignChallenges(challenges);
         if (challenges.length > 0) {
           vm.myChallenges = challenges;
           vm.userHasChallenges = true;

diff --git a/app/my-dashboard/my-challenges/my-challenges.jade b/app/my-dashboard/my-challenges/my-challenges.jade
@@ -45,7 +45,7 @@ section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading", ng-class="{ '
 
     challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="vm.challengeView", ng-class="vm.challengeView + '-view'")
 
-.my-challenges-links(ng-if="vm.userHasChallenges && !vm.loading")
+.my-challenges-links(id="viewAllChallenges", ng-if="vm.userHasChallenges && !vm.loading")
   a(ui-sref="my-challenges({status: 'active'})") View All Active Challenges
 
   a(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges
diff --git a/app/my-dashboard/programs/programs.controller.js b/app/my-dashboard/programs/programs.controller.js
@@ -63,7 +63,7 @@
           orderBy: 'submissionEndDate'
         }),
         ChallengeService.getChallenges({
-          filter: "technologies=ios,swift&status=active",
+          filter: "platforms=ios&technologies=swift&status=active",
           limit: 3,
           offset: 0,
           orderBy: 'submissionEndDate'

diff --git a/app/my-dashboard/programs/programs.jade b/app/my-dashboard/programs/programs.jade
@@ -17,7 +17,7 @@ section.ios(ng-hide="vm.loading")
       .info-links
         a(ng-click="vm.registerUser()") Participate
 
-        a(ng-href="ios.{{DOMAIN}}") Learn More
+        a(ng-href="https://ios.{{DOMAIN}}", target="_blank") Learn More
 
   .registered(ng-show="vm.registered")
     .badge-and-challenges