Merge branch 'dev' of github.com:appirio-tech/topcoder-app into dev

Author: Parth Shah

app/account/register/register.controller.js

@@ -98,16 +98,21 @@
 
     vm.socialRegister = function(provider) {
       TcAuthService.socialRegistration(provider, null)
-      .then(function(socialData) {
-        vm.socialUserId = socialData.socialUserId;
-        vm.username = socialData.username;
-        vm.firstname = socialData.firstname;
-        vm.lastname = socialData.lastname;
-        vm.email = socialData.email;
-        vm.isSocialRegistration = true;
-        vm.socialProfile = socialData.socialProfile;
-        vm.socialProvider = socialData.socialProvider;
-        vm.socialContext.accessToken = socialData.socialaccessToken;
+      .then(function(resp) {
+        if (resp.status === 'SUCCESS') {
+          var socialData = resp.data;
+          vm.socialUserId = socialData.socialUserId;
+          vm.username = socialData.username;
+          vm.firstname = socialData.firstname;
+          vm.lastname = socialData.lastname;
+          vm.email = socialData.email;
+          vm.socialProfile = socialData.socialProfile;
+          vm.socialProvider = socialData.socialProvider;
+          vm.socialContext= {'accessToken':  socialData.accessToken};
+          vm.isSocialRegistration = true;
+        } else {
+          vm.isSocialRegistration = false;
+        }
       })
     .catch(function(result) {
         switch (result.status) {

app/directives/profile-widget/profile-widget.jade

@@ -27,5 +27,5 @@
   .links
     a.badges.link(ng-click="profileVm.showBadges()", ng-show="profileVm.profile.badges.Achievements.length > 0")
       | Badges
-    a.forums.link(ng-href="http://forums.{{DOMAIN}}/?module=History&userID={{profileVm.profile.userId}}")
+    a.forums.link(ng-href="https://apps.{{DOMAIN}}/forums/?module=History&userID={{profileVm.profile.userId}}")
       | Forum Posts

app/my-dashboard/srms/srms.jade

@@ -12,11 +12,11 @@ section(ng-hide="vm.loading")
       .flex-wrapper
         h2 Practice on past problems
 
-        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost(ng-href="https://community.{{DOMAIN}}/tc?module=ProblemArchive") Problem Archives
+        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost(ng-href="https://arena.{{DOMAIN}}/#/u/practiceProblemList") Problem Archives
 
         a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost(ng-href="https://community.{{DOMAIN}}/wiki/display/tc/Algorithm+Problem+Set+Analysis") Match Editorials
 
-        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost(ng-href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
+        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost(ng-href="https://www.{{DOMAIN}}/member-onboarding") Learn More
 
 .srms-links(ng-hide="vm.loading")
   a(ui-sref="my-srms") View Past SRMs

app/services/tcAuth.service.js

@@ -154,7 +154,7 @@
         } else {
           $log.error('Unsupported social login provider: ' + provider);
           reject({
-            status: "failed",
+            status: "FAILED",
             "error": "Unsupported social login provider '" + provider + "'"
           });
         }

assets/css/my-dashboard/srms.scss

@@ -78,7 +78,7 @@
       .srm-links-card {
         display: inline;
         width: 270px;
-        height: 319px;
+        height: 321px;
         margin-bottom: 15px;
         padding: 0 21px;
         border: 1px solid #DCDCDC;