Merge pull request #322 from appirio-tech/feature/intro-js

Feature/intro js

Author: nlitwin

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}}")

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);
   }
 })();

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")

app/layout/layout.module.js

@@ -1,7 +1,7 @@
 (function() {
   'use strict';
 
-  var dependencies = ['angular-intro'];
+  var dependencies = [];
 
   angular.module('tc.layout', dependencies);
 

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

app/profile/about/about.jade

@@ -25,12 +25,12 @@
       .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 SKILLS
-  
-  tc-section(id="tcActivity", ng-show="vm.displaySection.stats", state="profileVm.status.stats")
+
+  tc-section(ng-show="vm.displaySection.stats", state="profileVm.status.stats")
 
     .categories
 
-      h3.activity Activity on Topcoder
+      h3.activity(id="tcActivity") Activity on Topcoder
 
       .empty-state(ng-if="!profileVm.numProjects")
         .action-text Start competing within the community

app/profile/subtrack/data/data.jade

@@ -1,6 +1,6 @@
 .data.develop(ng-if="vm.track == 'DATA_SCIENCE'")
   .top
-    ul.horizontal-stats
+    ul.horizontal-stats(id="subtrack-stats")
       li.stat(ng-if="vm.typeStats.rank.rating")
         .value.rating(style="color: {{vm.typeStats.rank.rating | ratingColor}}") {{vm.typeStats.rank.rating}}
           span.square(style="background-color: {{vm.typeStats.rank.rating | ratingColor}}")
@@ -27,11 +27,11 @@
         .name WINS
 
     .tabs
-      a.left(id="stats", ng-click="vm.viewing = 'stats'",
+      a.left(id="statistics-tab", ng-click="vm.viewing = 'stats'",
         ng-class="vm.viewing == 'stats' ? 'selected' : ''"
       ) Statistics
 
-      a.right(id="challenges", ng-click="vm.viewing = 'challenges'",
+      a.right(id="challenges-tab", ng-click="vm.viewing = 'challenges'",
         ng-class="vm.viewing == 'challenges' ? 'selected' : ''"
       )
         span(ng-show="vm.subTrack == 'SRM'") Past SRMs

app/profile/subtrack/design/design.jade

@@ -1,6 +1,6 @@
 .design(ng-if="vm.track == 'DESIGN'")
   .top
-    ul.horizontal-stats
+    ul.horizontal-stats(id="subtrack-stats")
       li.stat(ng-if="vm.typeStats.wins")
         .value(style="color: #21B2F1") {{vm.typeStats.wins}}
         .name WINS
@@ -14,14 +14,11 @@
         .name CHALLENGES
 
     .tabs
-      a.right.selected(
-      ) Challenges
+      a.right.selected(id="challenges-tab") Challenges
 
     hr
 
-    tc-section(
-      state="vm.status.challenges"
-    )
+    tc-section(state="vm.status.challenges")
       tc-paginator(data="vm.challenges", page-params="vm.pageParams")
       .challenges
         .challenge.tile(ng-repeat="challenge in vm.challenges")

app/profile/subtrack/develop/develop.jade

@@ -1,6 +1,6 @@
 .develop(ng-if="vm.track == 'DEVELOP'")
   .top
-    ul.horizontal-stats
+    ul.horizontal-stats(id="subtrack-stats")
       li.stat(ng-if="vm.typeStats.rank.rating")
         .value.rating(style="color: {{vm.typeStats.rank.rating | ratingColor}}") {{vm.typeStats.rank.rating | empty}}
           span.square(ng-if="vm.typeStats.rank.rating", style="background-color: {{vm.typeStats.rank.rating | ratingColor}}")
@@ -31,20 +31,17 @@
         .name RELIABILITY
 
     .tabs
-      a.left(id="stats", ng-click="vm.viewing = 'stats'",
+      a.left(id="statistics-tab", ng-click="vm.viewing = 'stats'",
         ng-class="vm.viewing == 'stats' ? 'selected' : ''"
       ) Statistics
 
-      a.right(id="challenges", ng-click="vm.viewing = 'challenges'",
+      a.right(id="challenges-tab", ng-click="vm.viewing = 'challenges'",
         ng-class="vm.viewing == 'challenges' ? 'selected' : ''"
       ) Challenges
 
     hr
 
-    tc-section(
-      ng-show="vm.viewing == 'challenges'",
-      state="vm.status.challenges"
-    )
+    tc-section(ng-show="vm.viewing == 'challenges'", state="vm.status.challenges")
       tc-paginator(data="vm.challenges", page-params="vm.pageParams")
       .challenges
         .challenge.tile(ng-repeat="challenge in vm.challenges")
@@ -89,7 +86,7 @@
       li
         .left Submission Rate
         .right {{vm.typeStats.submissions.submissionRate | percentage | empty}}
-        
+
       li(ng-if="profileVm.isUser")
         .left Passed Screening
         .right {{vm.typeStats.submissions.passedScreening | empty}}

app/profile/subtrack/subtrack.jade

@@ -1,20 +1,22 @@
 .profile-subtrack-container(ng-cloak, ng-show="profileVm.status.stats === 'ready'")
-
   .nav
     a(ui-sref="profile.about({userHandle: profileVm.profile.handle})")
       img.arrow(ng-src="/images/ico-arrow-big-left.svg")
 
     .breadcrumbs
       .handle
         img.profile-circle(fallback-src="/images/avatarPlaceholder.png", ng-src="{{profileVm.profile.photoURL}}")
+
         a(ui-sref="profile.about({userHandle: profileVm.profile.handle})")
           | {{vm.userHandle}}
         |  / 
+
       .track {{vm.track | track}}
+
       .subtrack  // {{vm.subTrack | track}}
 
     .right
-      i(class="fa fa-th", ng-click="vm.showNav()")
+      i.fa.fa-th(ng-click="vm.showNav()")
 
   include ./develop/develop.jade
   include ./design/design.jade