Merge branch 'feature/profile-polish-1' into dev

Author: Parth Shah

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

@@ -6,28 +6,26 @@
   .info
     h1.handle(style="color:{{handleColor}};") {{profile.handle}}
 
-    h3.tenure(ng-if="profile.startMonth")
-      | Member Since {{profile.startMonth}}
-
     h3.location-challenges {{profile.homeCountryCode | isoCountry}}
       span.bar(ng-show="profile.homeCountryCode && numWins")  | 
       span(ng-show="numWins") {{numWins}} Wins
 
-    p.description {{profile.description}}
+    h3.tenure(ng-if="profile.startMonth")
+      | Member Since {{profile.startMonth}}
 
-    a.tc-btn.tc-btn-s.edit(ng-show="editProfileLink", ui-sref="settings.profile") Edit Profile
+    a.tc-btn.tc-btn-m.edit(ng-show="editProfileLink", ui-sref="settings.profile") Edit Profile
 
   .tracks-links
     .tracks
       .track(ng-repeat="track in (profile.tracks)", ng-click="profileVm.scrollTo(track)")
-        div(class="{{profileVm.imgMap[track]}}-icon")
+        div(class="track-icon {{profileVm.imgMap[track]}}-icon")
           div
         .text {{track | role}}
 
-    hr
+  p.description {{profile.description}}
 
-    .links
-      a.tc-btn.tc-btn-s.forums.link(ng-href="http://forums.{{DOMAIN}}/?module=History&userID={{profileVm.profile.userId}}")
-        | Forum Posts
-      button.tc-btn.tc-btn-s.badges.link(ng-click="profileVm.showBadges()", ng-show="profileVm.profile.badges.Achievements.length > 0")
-        | Badges
+  .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}}")
+      | Forum Posts

app/directives/responsive-carousel/responsive-carousel.directive.js

@@ -17,6 +17,10 @@
           activate();
 
           function activate() {
+
+            $scope.$watchCollection('data', function(newValue, oldValue) {
+              init();
+            });
             init();
 
             var window = angular.element($window);
@@ -72,8 +76,8 @@
             $scope.slideCounts[slidesCollection.length - 1] = slide.length;
             $scope.slidesCollection = slidesCollection;
           }
-        
+
       }]
     };
   });
-})();
+})();

app/filters/rating-color.filter.js

@@ -6,6 +6,9 @@
   function ratingColor() {
     return function(rating) {
       function ratingToColor(colors, rating) {
+        // in case rating is a number formatted string
+        if (typeof rating === 'string')
+          rating = parseInt(rating.replace(",", ""));
         colors = colors.filter(function(color) {
           return rating >= color.start && rating <= color.end;
         });

app/index.jade

@@ -259,6 +259,7 @@ html
     script(src="services/tags.service.js")
     script(src="services/tcAuth.service.js")
     script(src="services/user.service.js")
+    script(src="services/userStats.service.js")
     script(src="settings/settings.module.js")
     script(src="settings/account-info/account-info.controller.js")
     script(src="settings/edit-profile/edit-profile.controller.js")

app/profile/about/about.controller.js

@@ -67,7 +67,7 @@
       profileVm.skillsPromise.then(function() {
         // show section if user is viewing his/her own profile OR if we have data
         vm.fullSkills = profileVm.skills;
-        vm.someSkills = profileVm.skills.slice(0, 6);
+        vm.someSkills = profileVm.skills.slice(0, 10);
         vm.skills = vm.someSkills;
         vm.displaySection.skills = profileVm.showEditProfileLink || !!vm.skills.length;
       });

app/profile/about/about.jade

@@ -1,105 +1,103 @@
-.profile-header-container(ng-cloak)
-  profile-widget(profile="profileVm.profile", edit-profile-link="profileVm.showEditProfileLink", num-wins="profileVm.numWins", profile-vm="profileVm")
+.about-container
+  .profile-header-container(ng-cloak)
+    profile-widget(profile="profileVm.profile", edit-profile-link="profileVm.showEditProfileLink", num-wins="profileVm.numWins", profile-vm="profileVm")
 
-.profile-about-container
+  .profile-about-container
 
-  #skills
-    tc-section(ng-show="vm.displaySection.skills", state="profileVm.status.skills")
+    #skills
+      tc-section(ng-show="vm.displaySection.skills", state="profileVm.status.skills")
 
-      .skills
-        h3.activity Skills
+        .skills
+          h3.activity Skills
 
-        .list(ng-show="profileVm.skills && profileVm.skills.length > 0")
+          .list(ng-show="profileVm.skills && profileVm.skills.length > 0")
 
-          .skill(ng-repeat="skill in vm.skills")
-            skill-tile(skill="skill")
-
-        button.tc-btn.tc-btn-l.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
-        button.tc-btn.tc-btn-l.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS
-
-        .empty-state(ng-show="!profileVm.skills || (profileVm.skills && profileVm.skills.length == 0)")
-          .action-text Tell everyone what you know
-
-          .list
-            .skill(ng-repeat="skill in vm.sampleSkills")
+            .skill(ng-repeat="skill in vm.skills")
               skill-tile(skill="skill")
 
-          .description You can add languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
+          button.tc-btn.tc-btn-m.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
+          button.tc-btn.tc-btn-m.more(ng-if="vm.skills.length > 10", ng-click="vm.skills = vm.someSkills") VIEW LESS
 
-          button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") ADD SKILLS
+          .empty-state(ng-show="!profileVm.skills || (profileVm.skills && profileVm.skills.length == 0)")
+            .action-text Tell everyone what you know
 
-  #tcActivity
-    tc-section(ng-show="vm.displaySection.stats", state="profileVm.status.stats")
+            .list
+              .skill(ng-repeat="skill in vm.sampleSkills")
+                skill-tile(skill="skill")
 
-      .categories
+            .description You can add languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
 
-        h3.activity Activity on Topcoder
+            button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") ADD SKILLS
 
-        .empty-state(ng-if="!profileVm.numProjects")
-          .action-text Start competing within the community
-          .tracks
-            .track.noclick(ng-repeat="track in ['DEVELOP', 'DESIGN', 'DATA_SCIENCE']")
-              div(class="{{profileVm.imgMap[track]}}-icon")
-                div
-              .text {{track | track}}
-          .description Compete in challenges to win money, test yourself against the world's best, and learn new skills. Your performance rating will show up here.
-          a.tc-btn.tc-btn-l.link-button(href="/challenges") FIND CHALLENGES
+    #tcActivity
+      tc-section(ng-show="vm.displaySection.stats", state="profileVm.status.stats")
 
-        .track(
-          ng-repeat="track in profileVm.profile.tracks",
-          ng-if="profileVm.categories[track].length > 0",
-          id="{{track}}_TRACK"
-        )
+        .categories
 
-          div(class="name")
-            img(ng-if="track == 'DATA_SCIENCE'", src="/images/ico-track-data-outline.svg")
-            img(ng-if="track == 'DEVELOP'", src="/images/ico-track-develop-outline.svg")
-            img(ng-if="track == 'DESIGN'", src="/images/ico-track-design-outline.svg")
-            img(ng-if="track == 'COPILOT'", src="/images/ico-track-co_pilot-outline.svg")
-            span {{track | track | uppercase}}
+          .empty-state(ng-if="!profileVm.numProjects")
+            .action-text Start competing within the community
+            .tracks
+              .track.noclick(ng-repeat="track in ['DEVELOP', 'DESIGN', 'DATA_SCIENCE']")
+                div(class="{{profileVm.imgMap[track]}}-icon")
+                  div
+                .text {{track | track}} 
+            .description Compete in challenges to win money, test yourself against the world's best, and learn new skills. Your performance rating will show up here.
+            a.tc-btn.tc-btn-l.link-button(href="/challenges") FIND CHALLENGES
 
-          a.subtrack(
-            ng-repeat="subtrack in profileVm.categories[track] | orderBy:'mostRecentEventDate':true",
-            ui-sref="profile.subtrack({track: subtrack.track, subTrack: subtrack.subTrack})",
-            class="{{$index == 0 && 'first'}}"
+          .track(
+            ng-repeat="track in profileVm.profile.tracks",
+            ng-if="profileVm.categories[track].length > 0",
+            id="{{track}}_TRACK"
           )
-            .name {{subtrack.subTrack | track}}
 
-            .ranking(ng-if="subtrack.rating")
-              .number.rating(style="color: {{subtrack.rating | ratingColor}}")
-                | {{subtrack.rating}}
-                span.square(style="background-color: {{subtrack.rating | ratingColor}}")
+            div(class="name")
+              img(ng-if="track == 'DATA_SCIENCE'", src="/images/ico-track-data-outline.svg")
+              img(ng-if="track == 'DEVELOP'", src="/images/ico-track-develop-outline.svg")
+              img(ng-if="track == 'DESIGN'", src="/images/ico-track-design-outline.svg")
+              img(ng-if="track == 'COPILOT'", src="/images/ico-track-co_pilot-outline.svg")
+              span {{track | track | uppercase}} ACTIVITY
+
+            a.subtrack(
+              ng-repeat="subtrack in profileVm.categories[track] | orderBy:'mostRecentEventDate':true",
+              ui-sref="profile.subtrack({track: subtrack.track, subTrack: subtrack.subTrack})",
+              class="{{$index == 0 && 'first'}}"
+            )
+              .name {{subtrack.subTrack | track}}
+
+              .ranking(ng-if="subtrack.rating")
+                .number.rating(style="color: {{subtrack.rating | ratingColor}}")
+                  | {{subtrack.rating}}
 
-              .tag Rating
+                .tag Rating
 
-            .ranking(ng-if="subtrack.rank && !subtrack.rating")
-              .number {{subtrack.rank | ordinal}}
+              .ranking(ng-if="subtrack.rank && !subtrack.rating")
+                .number {{subtrack.rank | ordinal}}
 
-              .tag Ranking
+                .tag Ranking
 
-            .ranking(ng-if="subtrack.wins && !subtrack.rank && !subtrack.rating")
-              .number(style="color: #21B2F1") {{subtrack.wins}}
+              .ranking(ng-if="subtrack.wins && !subtrack.rank && !subtrack.rating")
+                .number(style="color: #21B2F1") {{subtrack.wins}}
 
-              .tag Wins
+                .tag Wins
 
-            .ranking(ng-if="subtrack.fulfillment")
-              .number {{subtrack.fulfillment + '%'}}
+              .ranking(ng-if="subtrack.fulfillment")
+                .number {{subtrack.fulfillment + '%'}}
 
-              .tag Fulfillment
+                .tag Fulfillment
 
-            img.arrow(src="/images/ico-arrow-big-right.svg")
+              img.arrow(src="/images/ico-arrow-big-right.svg")
 
-  #externalLinks
-    tc-section(ng-show="vm.displaySection.externalLinks", state="profileVm.status.externalLinks")
-      .external-links
-        h3.activity Activity across the web
-        external-links-data(ng-show="vm.hasLinks", external-links="vm.linkedExternalAccounts", linked-accounts-data="vm.linkedExternalAccountsData")
+    #externalLinks
+      tc-section(ng-show="vm.displaySection.externalLinks", state="profileVm.status.externalLinks")
+        .external-links
+          h3.activity on the web
+          external-links-data(ng-show="vm.hasLinks", external-links="vm.linkedExternalAccounts", linked-accounts-data="vm.linkedExternalAccountsData")
 
-        .empty-state(ng-hide="vm.hasLinks")
-          .action-text Showcase your work from around the web
+          .empty-state(ng-hide="vm.hasLinks")
+            .action-text Showcase your work from around the web
 
-          external-accounts.external-account-container(linked-accounts="[]", links-data="{}", read-only="true")
+            external-accounts.external-account-container(linked-accounts="[]", links-data="{}", read-only="true")
 
-          .description Show off your work and experience outside of Topcoder. Connect accounts from popular services and networks or add a link to any site.
+            .description Show off your work and experience outside of Topcoder. Connect accounts from popular services and networks or add a link to any site.
 
-          button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS
+            button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS