Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app into sup-1349-new-nav

Author: thabofletcher

.version

@@ -0,0 +1 @@
+v1.0.0

app/directives/challenge-tile/challenge-tile.directive.jade

@@ -1,4 +1,3 @@
-// TILE VIEW
 .challenge.tile-view(ng-show="view === 'tile'", ng-class="challenge.track")
   .challenge-track
 
@@ -11,7 +10,7 @@
     p.currentPhase {{challenge.userCurrentPhase}}
 
     .challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
-      p.starts-in Ends In
+      p.ends-in Ends In
       p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
       p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
 
@@ -45,36 +44,46 @@
 
         p Forum
 
-// LIST VIEW
-.challenge.list-view(ng-show="view=='list'")
-  .challenge-icons
-    img(ng-show="challenge.track === 'DEVELOP'", src="/images/member-program/svg/development-generic.svg")
-    img(ng-show="challenge.track === 'DESIGN' || challenge.track === 'Data Science'", src="/images/member-program/svg/design-generic.svg")
+.challenge.list-view(ng-show="view=='list'", ng-class="challenge.track")
+  .challenge-track
 
-  .challenge-name
+  header
     a(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}") {{challenge.name}}
-    .phase-status(ng-show="challenge.status === 'Active'")
-      i.fa.fa-check-circle-o
 
-      p {{challenge.memberStatusMsg}}
+    p.subtrack {{challenge.subTrack | underscoreStrip}}
 
-  .roles
-    p Roles : {{challenge.userDetails.roles | listRoles}}
+    // Only show if not data science track
+    p.roles(ng-hide="challenge.track === 'DATA SCIENCE'") #[span Role:] {{challenge.userDetails.roles | listRoles}}
+
+  .challenge-details
+    .challenge-info
+      p.currentPhase {{challenge.userCurrentPhase}}
 
-  p.days-remaining(ng-show="challenge.status === 'Active'") {{challenge.registrationEndDate | timeDiff}}
-    span Registration Ends
-  p.completion-date(ng-show="challenge.status === 'Completed'")
-    span Ended {{challenge.submissionEndDate | date: "mediumDate"}}
+      p.ends-in(ng-show="challenge.userCurrentPhaseEndTime") Ends: {{challenge.userCurrentPhaseEndTime[2] | localTime}}
+
+      p.ends-in(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
+
+    .phase-action(ng-switch="challenge.userAction")
+      .submit(ng-switch-when="Submit") Submit
 
-  .stats
-    .registrants(ng-show="challenge.numRegistrants > 0")
-      i.fa.fa-user
-      a(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant") {{challenge.numRegistrants}}
-    .submissions(ng-show="challenge.numSubmissions > 0")
-      i.fa.fa-files-o
-      a(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant") {{challenge.numSubmissions}}
+      .submitted(ng-switch-when="Submitted") Submitted
 
+      // Need styling and JS logic for this one
+      .registered(ng-switch-when="Registered") Registered
 
   .challenge-links
-    a(ng-href="http://apps.{{DOMAIN}}/forums//?module=Category&categoryID={{challenge.forumId}}")
-      i.fa.fa-comment
+    a.registrants(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
+      p {{challenge.numRegistrants}}
+
+      .registrants-icon
+
+    a.submissions(ng-hide="challenge.track === 'DATA SCIENCE'", ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
+      p {{challenge.numSubmissions}}
+
+      .submissions-icon
+
+    a.forum(ng-href="http://apps.{{DOMAIN}}/forums//?module=Category&categoryID={{challenge.forumId}}")
+      .forum-icon
+
+      p Forum
+

app/directives/distribution-graph/distribution-graph.directive.jade

@@ -10,4 +10,4 @@
       .label RATING
 
     button.compare(ng-click="graphState.show = 'history'")
-      | COMPARE
+      | BACK TO YOUR RATING

app/directives/history-graph/history-graph.directive.jade

@@ -8,4 +8,4 @@
     .history-info(ng-if="historyRating")
       | Attained on {{historyDate}} in challenge "{{historyChallenge}}"
     .lower
-      button.compare(ng-click="graphState.show = 'distribution'") COMPARE
+      button.compare(ng-click="graphState.show = 'distribution'") COMMUNITY RATINGS

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

@@ -9,7 +9,7 @@
       | Member Since {{profile.startMonth}}
 
     h3.location-challenges {{profile.homeCountryCode | isoCountry}}
-      span.bar(ng-show="profile.homeCountryCode && numChallenges")  | 
+      span.bar(ng-show="profile.homeCountryCode && numChallenges")  | 
       span(ng-show="numChallenges") {{numChallenges}} Challenges
 
     p.description {{profile.quote}}
@@ -21,7 +21,7 @@
       .track(ng-repeat="track in (profile.tracks)")
         div(class="{{profileVm.imgMap[track]}}-icon")
           div
-        .text {{track | track}}
+        .text {{track | role}}
 
     hr
 

app/filters/filters.spec.js

@@ -19,12 +19,12 @@ describe('filters', function() {
   describe('track filter', function() {
     it('should handle strings', function() {
       expect(trackFilter('DATA_SCIENCE')).to.equal('Data Science');
-      expect(trackFilter('DEVELOP')).to.equal('Develop');
+      expect(trackFilter('DEVELOP')).to.equal('DEVELOPMENT');
       expect(trackFilter('FIRST_2_FINISH')).to.equal('First2Finish');
     });
 
     it('should handle arrays', function() {
-      expect(trackFilter(['DATA_SCIENCE', 'DEVELOP'])).to.include('Develop');
+      expect(trackFilter(['DATA_SCIENCE', 'DEVELOP'])).to.include('DEVELOPMENT');
     });
   });
 

app/filters/local-time.filter.js

@@ -6,7 +6,7 @@
   function localTime() {
     var timezone = jstz.determine().name();
     return function(input) {
-      return moment(input).tz(timezone).format('MM/DD/YY hh:mm A z');
+      return moment(input).tz(timezone).format('MM/DD/YY hh:mm a z');
     };
   };
 

app/filters/role.filter.js

@@ -7,7 +7,8 @@
     var map = {
       'DESIGN' : 'Designer',
       'DEVELOP': 'Developer',
-      'DATA_SCIENCE': 'Data Scientist'
+      'DATA_SCIENCE': 'Data Scientist',
+      'COPILOT': 'Copilot'
     };
     return function(tracks) {
       if (tracks) {

app/filters/track.filter.js

@@ -18,7 +18,8 @@
         'WIDGET_OR_MOBILE_SCREEN_DESIGN': 'Widget or Mobile Screen Design',
         'FRONT_END_FLASH': 'Front-End Flash',
         'APPLICATION_FRONT_END_DESIGN': 'Application Front-End Design',
-        'DESIGN_FIRST_2_FINISH': 'Design First2Finish'
+        'DESIGN_FIRST_2_FINISH': 'Design First2Finish',
+        'DEVELOP': 'DEVELOPMENT'
       };
 
       function capitalized(str) {

app/index.jade

@@ -96,7 +96,7 @@ html
     script(src='../bower_components/angucomplete-alt/angucomplete-alt.js')
     script(src='../bower_components/angular-cookies/angular-cookies.js')
     script(src='../bower_components/angular-dropdowns/dist/angular-dropdowns.js')
-    script(src='../bower_components/angular-filter/dist/angular-filter.js')
+    script(src='../bower_components/angular-filter/dist/angular-filter.min.js')
     script(src='../bower_components/angular-img-fallback/angular.dcb-img-fallback.js')
     script(src='../bower_components/intro.js/intro.js')
     script(src='../bower_components/angular-intro.js/src/angular-intro.js')

app/my-challenges/my-challenges.jade

@@ -10,7 +10,9 @@
 
       p.viewOptions
         a(ng-click="vm.changeView('list')", ng-class="{disabled: vm.view == 'list'}") List
+
         span   |  
+
         a(ng-click="vm.changeView('tile')", ng-class="{disabled: vm.view == 'tile'}") Tile
 
       p.filters
@@ -22,6 +24,7 @@
 
     section.challenges(ng-show="vm.userHasChallenges && !vm.loading")
       tc-paginator(data="vm.myChallenges", page-params="vm.pageParams")
+
       .data(ng-class="vm.view + '-view'")
         challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="vm.view", ng-class="vm.view + '-view'")
 

app/my-dashboard/my-challenges/my-challenges.controller.js

@@ -10,6 +10,8 @@
     vm.domain = CONSTANTS.domain;
     vm.loading = true;
     vm.userHasChallenges = true;
+    vm.challengeView = 'tile';
+    vm.toggleView = toggleView;
 
     var handle = userIdentity.handle;
 
@@ -65,5 +67,11 @@
         vm.loading = false;
       });
     }
+
+    function toggleView(view) {
+      if (vm.challengeView !== view) {
+        vm.challengeView = view;
+      }
+    }
   }
 })();

app/my-dashboard/my-challenges/my-challenges.jade

@@ -1,6 +1,11 @@
 header(ng-hide="vm.loading")
   h1.section-title(ng-bind="vm.userHasChallenges ? 'My Challenges' : 'Challenges'")
 
+  .challenge-view-toggle
+    button.tile(ng-click="vm.toggleView('tile')", ng-class="{ disabled: vm.challengeView === 'tile' }") Grid
+
+    button.list(ng-click="vm.toggleView('list')", ng-class="{ disabled: vm.challengeView === 'list' }") List
+
 .section-loading(ng-show="vm.loading")
 
 section.noChallenges(ng-if="!vm.userHasChallenges && !vm.loading")
@@ -29,9 +34,15 @@ section.noChallenges(ng-if="!vm.userHasChallenges && !vm.loading")
 
   a(href="") Learn More
 
-section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading")
-  .challenges
-    challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="'tile'", ng-class="'tile-view'")
+section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading", ng-class="{ 'list-view-active': vm.challengeView === 'list' }")
+  .section-titles(ng-show="vm.challengeView === 'list'")
+    .challenge-title Challenges
+    .phase-title Phase
+    .regs-subs-title Registrations & Submissions
+
+  .challenges(ng-class="vm.challengeView + '-view'")
+
+    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")
     a(ui-sref="my-challenges") View All Active Challenges

app/my-dashboard/subtrack-stats/subtrack-stats.controller.js

@@ -15,19 +15,34 @@
     activate();
 
     function activate() {
-      var handle = userIdentity.handle;
+      vm.handle = userIdentity.handle;
 
-      ProfileService.getUserStats(handle)
+      ProfileService.getUserStats(vm.handle)
       .then(function(stats) {
         var subtrackRanks = [];
 
         var trackRanks = ProfileService.getRanks(stats);
+
         angular.forEach(trackRanks, function(subtracks, track) {
           if (Array.isArray(subtracks) && subtracks.length) {
             subtrackRanks = subtrackRanks.concat(subtracks);
           }
         });
 
+        angular.forEach(subtrackRanks, function(subtrack) {
+          if (subtrack.track === 'COPILOT') {
+            subtrack.stat = subtrack.activeContests;
+            subtrack.statType = 'Active Contests';
+          } else if (subtrack.track === 'DESIGN') {
+            subtrack.stat = subtrack.wins;
+            subtrack.statType = 'Wins';
+          } else {
+            subtrack.stat = subtrack.rating;
+            subtrack.statType = 'Rating';
+          }
+        });
+        console.log('subtrackRanks: ', subtrackRanks);
+
         vm.subtrackRanks = subtrackRanks;
         vm.hasRanks = !!vm.subtrackRanks.length;
         vm.loading = false;

app/my-dashboard/subtrack-stats/subtrack-stats.jade

@@ -3,10 +3,11 @@
 
 .ratings(ng-if="vm.hasRanks && !vm.loading")
   .tracks
-    .track(ng-repeat="subtrack in vm.subtrackRanks | orderBy: ['track', 'rank']", ui-sref="profile.develop({userHandle: vm.profile.handle, track: subtrack.track, subTrack: subtrack.subTrack})")
-      p.subtrack {{subtrack.subTrack | underscoreStrip}}
+    .track(ng-repeat="subtrack in vm.subtrackRanks | orderBy: ['track', 'rank']", ui-sref="profile.subtrack({userHandle: vm.handle, track: subtrack.track, subTrack: subtrack.subTrack})")
+      .flex-wrapper
+        p.subtrack {{subtrack.subTrack | underscoreStrip}}
 
-      p.rating {{subtrack.rating | number}}
-        span
+        p.rating {{subtrack.stat | number}}
+          span(style="background-color: {{subtrack.stat | ratingColor}}", ng-if="subtrack.track === 'DEVELOP' || subtrack.track === 'DATA_SCIENCE'")
 
-      p Rating
+        p {{subtrack.statType}}

app/profile/about/about.controller.js

@@ -40,7 +40,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, 9);
+        vm.someSkills = profileVm.skills.slice(0, 6);
         vm.skills = vm.someSkills;
         vm.displaySection.skills = profileVm.showEditProfileLink || !!vm.skills.length;
       });

app/profile/about/about.jade

@@ -4,41 +4,42 @@
 .profile-about-container
 
   tc-section(id="skills", ng-show="vm.displaySection.skills" state="profileVm.status.skills" class="skills")
-    h3.activity Skills & Technologies  
+    h3.activity Skills
+
     .list(ng-show="profileVm.skills && profileVm.skills.length > 0")
 
       .skill(ng-repeat="skill in vm.skills")
         skill-tile(skill="skill")
 
-    button.more(ng-show="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW MORE
+    button.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
+    button.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 show us your skills &amp; tools, we'd love that!
+      .action-text Tell everyone what you know
 
       .list
         .skill(ng-repeat="skill in vm.sampleSkills")
           skill-tile(skill="skill")
 
-      .description The more the better. Skills are important for all challenge organizers and
-        | the community at large. So, go ahead and tell us more about you.
+      .description You can add languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
 
-      button.link-button(ui-sref="settings.profile") ADD YOUR SKILLS
+      button.link-button(ui-sref="settings.profile") ADD SKILLS
 
   tc-section(id="tcActivity", state="profileVm.status.stats")
 
     .categories
 
-      h3.activity Topcoder Activity
+      h3.activity Activity on Topcoder
 
       .empty-state(ng-if="!profileVm.numProjects")
-        .action-text SHOW US YOU'RE A NINJA!
+        .action-text Start competing within the community
         .tracks
           .track(ng-repeat="track in ['DEVELOP', 'DESIGN', 'DATA_SCIENCE']")
             div(class="{{profileVm.imgMap[track]}}-icon")
               div
             .text {{track | track}}
-        .description Hey, whatever your like might be—Design, Development, or Data Science—we have it! Explore the Challenges section and show us what you’re made of!
-        button.link-button(ui-sref="settings.profile") CHALLENGE ME!
+        .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.
+        button.link-button(ui-sref="settings.profile") FIND CHALLENGES
 
       .track(
         ng-repeat="track in profileVm.profile.tracks",
@@ -49,6 +50,7 @@
           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}}
 
         .subtrack(
@@ -83,14 +85,14 @@
           img.arrow(src="/images/ico-arrow-big-right.svg")
 
   tc-section(id="externalLinks", ng-show="vm.displaySection.externalLinks" state="profileVm.status.externalLinks" class="external-links")
-    h3.activity Links
+    h3.activity Activity across the web
     external-links-data(ng-show="vm.hasLinks" linked-accounts-data="vm.linkedExternalAccountsData")
 
     .empty-state(ng-hide="vm.hasLinks")
-      .action-text you are connected, be proud of it
+      .action-text Showcase your work from around the web
 
       external-accounts.external-account-container(linked-accounts="[]" read-only="true")
 
-      .description Adding your links to your profile will allow you to build your reputation, and show the other members how you're connected.
+      .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.link-button(ui-sref="settings.profile") ADD YOUR LINKS
+      button.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS