Member Profile
Welcome to the new Topcoder Profile. It’s been reimagined as the premier place to showcase your experience, with three main sections.
' + intro: ' + ')
Member Profile
Welcome to the new Topcoder Profile. It’s been reimagined as the premier place to showcase your experience, with three main sections.
' }, { // element: '#skills', - intro: 'Skills
A quick way to understand your strengths. Skills include languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
', + intro: 'Skills
A quick way to understand your strengths. Skills include languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
', position: 'top' }, { // element: '#tcActivity', - intro: '
Activity on Topcoder
See your active sub-track ratings and explore detailed statistics and past challenges
', + intro: ' + ')
Activity on Topcoder
See your active sub-track ratings and explore detailed statistics and past challenges
', position: 'top' }, { // element: '#externalLinks', - intro: '
Activity across the web
Show off the best of your work and experience outside of Topcoder by connecting external accounts or adding links.
', + intro: ' + ')
Activity across the web
Show off the best of your work and experience outside of Topcoder by connecting external accounts or adding links.
', position: 'top' } ] @@ -100,21 +103,21 @@ subtrack: { steps: [ { - intro: '
Subtrack Details
Welcome to the new Sub-track Details page. This page summarizes your activity in a particular sub-track and has detailed historical metrics.
' + intro: ' + ')
Subtrack Details
Welcome to the new Sub-track Details page. This page summarizes your activity in a particular sub-track and has detailed historical metrics.
' }, { // element: '#subtrack-stats', - intro: 'Basic metrics
Understand your performance at a glance.
', + intro: 'Basic metrics
Understand your performance at a glance.
', position: 'bottom' }, { // element: '#challenges-tab', - intro: '
Charts & in-depth statistics
View charts and comprehensive metrics to get a granular understanding of the activity in this sub-track.
', + intro: ' + ')
Charts & in-depth statistics
View charts and comprehensive metrics to get a granular understanding of the activity in this sub-track.
', position: 'top' }, { // element: '#challenges-tab', - intro: '
Completed challenges
View all the challenges you’ve successfully completed in this sub-track.
', + intro: ' + ')
Completed challenges
View all the challenges you’ve successfully completed in this sub-track.
', position: 'top' } ] @@ -123,27 +126,27 @@ dashboard: { steps: [ { - intro: '
Topcoder Dashboard
Welcome to your new Topcoder Dashboard. It’s been revamped to bring your most-needed information to the fore. Let’s walk through some of the new sections.
' + intro: ' + ')
Topcoder Dashboard
Welcome to your new Topcoder Dashboard. It’s been revamped to bring your most-needed information to the fore. Let’s walk through some of the new sections.
' }, { // element: '#challenges', - intro: 'Your challenges
See your active challenges in a grid or list. Find the main challenge information, such as phase or action required, and click to go to the challenge details.
', + intro: 'Your challenges
See your active challenges in a grid or list. Find the main challenge information, such as phase or action required, and click to go to the challenge details.
', position: 'top' }, { // element: '#srms', - intro: '
Single round matches
Keep track of upcoming Single Round Matches and easily find links to past problems, match editorials, and the Arena.
', + intro: ' + ')
Single round matches
Keep track of upcoming Single Round Matches and easily find links to past problems, match editorials, and the Arena.
', position: 'top' }, { // element: '#community', - intro: '
Community updates
Don’t miss the latest happenings in our community. Events, member programs, fun challenges, and more!
', + intro: ' + ')
Community updates
Don’t miss the latest happenings in our community. Events, member programs, fun challenges, and more!
', position: 'top' } ] } - }; + } - return service; + return service } -})(); +})() diff --git a/app/services/jwtInterceptor.service.spec.js b/app/services/jwtInterceptor.service.spec.js index 2b13dcab4..760421cfc 100644 --- a/app/services/jwtInterceptor.service.spec.js +++ b/app/services/jwtInterceptor.service.spec.js @@ -1,3 +1,5 @@ +import angular from 'angular' + describe('JWT Interceptor Service', function() { var service; var apiUrl = 'https://api.topcoder-dev.com/'; @@ -33,7 +35,7 @@ describe('JWT Interceptor Service', function() { }; beforeEach(function() { - module('tc.services', function($provide) { + angular.mock.module('tc.services', function($provide) { $provide.value('AuthTokenService', fakeAuthTokenService); $provide.value('TcAuthService', fakeTcAuthService); $provide.value('$state', fakeState); diff --git a/app/services/nav.service.js b/app/services/nav.service.js index f33a6324c..be755f354 100644 --- a/app/services/nav.service.js +++ b/app/services/nav.service.js @@ -1,40 +1,42 @@ +import angular from 'angular' + (function() { - 'use strict'; + 'use strict' - angular.module('tc.services').factory('NavService', NavService); + angular.module('tc.services').factory('NavService', NavService) - NavService.$inject = ['CONSTANTS', '$state', 'UserService', 'TcAuthService']; + NavService.$inject = ['CONSTANTS', '$state', 'UserService', 'TcAuthService'] function NavService(CONSTANTS, $state, UserService, TcAuthService) { var service = { selectedTopLevelItem: null, getParent: getParent - }; + } service.menuLinks = { 'compete': [ - { 'href': "/challenges/design/active/?pageIndex=1", 'text': 'DESIGN CHALLENGES', 'icon': '/images/nav/track-design.svg' }, - { 'href': "/challenges/develop/active/?pageIndex=1", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/images/nav/track-develop.svg' }, - { 'href': "/challenges/data/active/?pageIndex=1", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/images/nav/track-data.svg' }, - { 'href': CONSTANTS.ARENA_URL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/track-cp.svg', 'target': '_blank' } + { 'href': '/challenges/design/active/?pageIndex=1', 'text': 'DESIGN CHALLENGES', 'icon': require('../../assets/images/nav/track-design.svg') }, + { 'href': '/challenges/develop/active/?pageIndex=1', 'text': 'DEVELOPMENT CHALLENGES', 'icon': require('../../assets/images/nav/track-develop.svg') }, + { 'href': '/challenges/data/active/?pageIndex=1', 'text': 'DATA SCIENCE CHALLENGES', 'icon': require('../../assets/images/nav/track-data.svg') }, + { 'href': CONSTANTS.ARENA_URL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': require('../../assets/images/nav/track-cp.svg'), 'target': '_blank' } ], 'learn': [ - { 'href': '/getting-started/', 'text': 'GETTING STARTED', 'icon': '/images/nav/rocket.svg' }, - { 'href': '/community/design/', 'text': 'DESIGN', 'icon': '/images/nav/book-design.svg' }, - { 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': '/images/nav/book-develop.svg' }, - { 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': '/images/nav/book-data.svg' }, - { 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/book-cp.svg' }, + { 'href': '/getting-started/', 'text': 'GETTING STARTED', 'icon': require('../../assets/images/nav/rocket.svg') }, + { 'href': '/community/design/', 'text': 'DESIGN', 'icon': require('../../assets/images/nav/book-design.svg') }, + { 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': require('../../assets/images/nav/book-develop.svg') }, + { 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': require('../../assets/images/nav/book-data.svg') }, + { 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': require('../../assets/images/nav/book-cp.svg') } ], 'community': [ - { 'sref': 'community.members', 'text': 'OVERVIEW', 'icon': '/images/nav/members.svg' }, - { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/images/nav/programs.svg' }, - { 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': '/images/nav/forums.svg' }, - { 'sref': 'community.statistics', 'text': 'STATISTICS', 'icon': '/images/nav/statistics.svg' }, - { 'href': '/community/events/', 'text': 'EVENTS', 'icon': '/images/nav/events.svg' }, - { 'href': '/blog/', 'text': 'BLOG', 'icon': '/images/nav/blog.svg' } + { 'sref': 'community.members', 'text': 'OVERVIEW', 'icon': require('../../assets/images/nav/members.svg') }, + { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': require('../../assets/images/nav/programs.svg') }, + { 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': require('../../assets/images/nav/forums.svg') }, + { 'sref': 'community.statistics', 'text': 'STATISTICS', 'icon': require('../../assets/images/nav/statistics.svg') }, + { 'href': '/community/events/', 'text': 'EVENTS', 'icon': require('../../assets/images/nav/events.svg') }, + { 'href': '/blog/', 'text': 'BLOG', 'icon': require('../../assets/images/nav/blog.svg') } ] - }; + } var userSrefs = [ {'href': 'profile'}, @@ -42,46 +44,46 @@ {'href': 'my-dashboard'}, {'href': 'dashboard'}, {'href': 'my-challenges'} - ]; + ] - service.hrefs = {}; + service.hrefs = {} service.menuLinks.compete.forEach(function(link) { - link.parent = 'compete'; - service.hrefs[link.href] = link; - }); + link.parent = 'compete' + service.hrefs[link.href] = link + }) service.menuLinks.learn.forEach(function(link) { - link.parent = 'learn'; - service.hrefs[link.href] = link; - }); + link.parent = 'learn' + service.hrefs[link.href] = link + }) service.menuLinks.community.forEach(function(link) { - link.parent = 'community'; - service.hrefs[link.href] = link; - }); + link.parent = 'community' + service.hrefs[link.href] = link + }) userSrefs.forEach(function(link) { - link.parent = 'user'; - service.hrefs[link.href] = link; - }); + link.parent = 'user' + service.hrefs[link.href] = link + }) function getParent(ref) { if (ref.indexOf('.') >= 0) { - ref = ref.slice(0, ref.indexOf('.')); + ref = ref.slice(0, ref.indexOf('.')) } if (ref.match(/profile/)) { if (TcAuthService.isAuthenticated() && $state.params && $state.params.userHandle == UserService.getUserIdentity().handle) { - return 'user'; + return 'user' } else { - return 'community'; + return 'community' } } else { - return service.hrefs[ref] && service.hrefs[ref].parent; + return service.hrefs[ref] && service.hrefs[ref].parent } } - return service; + return service } -})(); +})() diff --git a/app/services/notification.service.js b/app/services/notification.service.js index 90915da05..ebe15ce8c 100644 --- a/app/services/notification.service.js +++ b/app/services/notification.service.js @@ -1,50 +1,56 @@ -(function() { - 'use strict'; - - angular.module('topcoder').factory('NotificationService', NotificationService); - - NotificationService.$inject = ['notifications', 'ApiService', 'TcAuthService', '$rootScope']; - - function NotificationService(notifier, ApiService, TcAuthService, $rootScope) { - var service = { - getNotifications: getNotifications, - inform: inform - }; - return service; - - var showing = false; - - $rootScope.$on(CONSTANTS.EVENT_USER_LOGGED_OUT, function() { - showing = false; - // Not using notifications for anything at the moment - // getNotifications(); - }); - - function getNotifications() { - if (TcAuthService.isAuthenticated() === true && !showing) { - ApiService.restangularV3.one('notifications').get().then(function(notifications) { - showing = true; - angular.forEach(notifications, function(notification) { - - var opts = { - message: notification.notificationTypeId === 1 ? - 'Your checkpoint submission for Styx iOS... is due in 3 days' : - 'You received a notification of type: ' + notification.notificationTypeId - }; - - switch(notification.severity) { - case "HIGH": notifier.showError(opts); break; - case "MEDIUM": notifier.showWarning(opts); break; - default: notifier.showSuccess(opts); - } - - }) - }); - } - } - - function inform(message) { - notifier.showSuccess({message:message}); - } - } -})(); +// import angular from 'angular' + +// (function() { +// 'use strict' + +// angular.module('topcoder').factory('NotificationService', NotificationService) + +// NotificationService.$inject = ['notifications', 'ApiService', 'TcAuthService', '$rootScope'] + +// function NotificationService(notifier, ApiService, TcAuthService, $rootScope) { +// // var service = { +// // // getNotifications: getNotifications, +// // inform: inform +// // } +// // return service + +// // var showing = false + +// // $rootScope.$on(CONSTANTS.EVENT_USER_LOGGED_OUT, function() { +// // showing = false +// // // Not using notifications for anything at the moment +// // // getNotifications() +// // }) + +// // function getNotifications() { +// // if (TcAuthService.isAuthenticated() === true && !showing) { +// // ApiService.restangularV3.one('notifications').get().then(function(notifications) { +// // showing = true +// // angular.forEach(notifications, function(notification) { + +// // var opts = { +// // message: notification.notificationTypeId === 1 ? +// // 'Your checkpoint submission for Styx iOS... is due in 3 days' : +// // 'You received a notification of type: ' + notification.notificationTypeId +// // } + +// // switch(notification.severity) { +// // case 'HIGH': +// // notifier.showError(opts) +// // break +// // case 'MEDIUM': +// // notifier.showWarning(opts) +// // break +// // default: notifier.showSuccess(opts) +// // } + +// // }) +// // }) +// // } +// // } + +// // function inform(message) { +// // notifier.showSuccess({message:message}) +// // } +// } +// })() diff --git a/app/services/profile.service.spec.js b/app/services/profile.service.spec.js index 20e2b5557..3c4d316a1 100644 --- a/app/services/profile.service.spec.js +++ b/app/services/profile.service.spec.js @@ -1,3 +1,5 @@ +const mockData = require('../../tests/test-helpers/mock-data') + /* jshint -W117, -W030 */ describe('Profile Service', function() { var service; diff --git a/app/services/services.module.js b/app/services/services.module.js index ec2e3bf20..4e3fd7710 100644 --- a/app/services/services.module.js +++ b/app/services/services.module.js @@ -1,5 +1,8 @@ +import angular from 'angular' +import Auth0 from 'auth0-js' + (function() { - 'use strict'; + 'use strict' var dependencies = [ 'CONSTANTS', @@ -10,24 +13,24 @@ 'restangular', 'ngIsoConstants.services', 'blocks.logger' - ]; + ] angular.module('tc.services', dependencies) .config(['$provide', 'authProvider', 'CONSTANTS', function($provide, authProvider, CONSTANTS) { $provide.decorator('$log', ['$delegate', 'LogEnhancer', function($delegate, LogEnhancer) { - LogEnhancer.enhanceLogger($delegate); - return $delegate; - }]); + LogEnhancer.enhanceLogger($delegate) + return $delegate + }]) authProvider.init({ domain: CONSTANTS.auth0Domain, clientID: CONSTANTS.clientId, sso: false - }) + }, Auth0) }]) .factory('UserPrefStore', ['store', function(store) { - return store.getNamespacedStore('userSettings'); - }]); + return store.getNamespacedStore('userSettings') + }]) -})(); +})() diff --git a/app/services/userStats.service.spec.js b/app/services/userStats.service.spec.js index 437ebcbd5..e50180805 100644 --- a/app/services/userStats.service.spec.js +++ b/app/services/userStats.service.spec.js @@ -1,3 +1,5 @@ +const mockData = require('../../tests/test-helpers/mock-data') + /* jshint -W117, -W030 */ describe('User Stats Service', function() { var stats = mockData.getMockStats(); diff --git a/app/settings/account-info/account-info.controller.js b/app/settings/account-info/account-info.controller.js index 533d9c225..f0133d4db 100644 --- a/app/settings/account-info/account-info.controller.js +++ b/app/settings/account-info/account-info.controller.js @@ -1,119 +1,121 @@ +import angular from 'angular' +import _ from 'lodash' + (function () { - 'use strict'; + 'use strict' - angular.module('tc.settings').controller('AccountInfoController', AccountInfoController); + angular.module('tc.settings').controller('AccountInfoController', AccountInfoController) - AccountInfoController.$inject = ['userData', 'UserService', 'ProfileService', '$log', 'ISO3166', 'toaster', '$scope', '$timeout', '$state']; + AccountInfoController.$inject = ['userData', 'UserService', 'ProfileService', '$log', 'ISO3166', 'toaster', '$scope', '$timeout', '$state'] function AccountInfoController(userData, UserService, ProfileService, $log, ISO3166, toaster, $scope, $timeout, $state) { - var vm = this; - var originalUserData = userData; - vm.saveAccountInfo = saveAccountInfo; - vm.updateCountry = updateCountry; - vm.submitNewPassword = submitNewPassword; - vm.getAddr = getAddr; + var vm = this + vm.saveAccountInfo = saveAccountInfo + vm.updateCountry = updateCountry + vm.submitNewPassword = submitNewPassword + vm.getAddr = getAddr - activate(); + activate() function activate() { - vm.isSocialRegistrant = false; - vm.loading = true; + vm.isSocialRegistrant = false + vm.loading = true vm.formProcessing = { accountInfoForm: false, newPasswordForm: false - }; + } - vm.userData = userData.clone(); - processData(vm.userData); + vm.userData = userData.clone() + processData(vm.userData) UserService.getUserProfile({fields: 'credential'}) .then(function(res) { - vm.isSocialRegistrant = !res.credential.hasPassword; - vm.loading = false; + vm.isSocialRegistrant = !res.credential.hasPassword + vm.loading = false }) .catch(function(err) { - $log.error("Error fetching user profile. Redirecting to edit profile."); - $state.go('settings.profile'); - vm.loading = false; - }); + $log.error('Error fetching user profile. Redirecting to edit profile.') + $state.go('settings.profile') + vm.loading = false + }) - vm.countries = ISO3166.getAllCountryObjects(); - vm.countryObj = ISO3166.getCountryObjFromAlpha3(vm.userData.homeCountryCode); + vm.countries = ISO3166.getAllCountryObjects() + vm.countryObj = ISO3166.getCountryObjFromAlpha3(vm.userData.homeCountryCode) // Timeout needed since newPasswordForm.currentPassword doesn't exist until later $timeout(function(){ $scope.$watch('vm.currentPassword', function(newValue, oldValue) { - if (vm.newPasswordForm.currentPassword.$error.incorrect) { - // If the API returns "incorrect password", + if (vm.newPasswordForm && vm.newPasswordForm.currentPassword.$error.incorrect) { + // If the API returns 'incorrect password', // remove the error once the user types again. if (newValue !== oldValue) { - vm.newPasswordForm.currentPassword.$setValidity('incorrect', true); + vm.newPasswordForm.currentPassword.$setValidity('incorrect', true) } } - }); - }, 400); + }) + }, 400) } function updateCountry(angucompleteCountryObj) { - var countryCode = _.get(angucompleteCountryObj, 'originalObject.alpha3', undefined); + var countryCode = _.get(angucompleteCountryObj, 'originalObject.alpha3', undefined) - var isValidCountry = _.isUndefined(countryCode) ? false : true; - vm.accountInfoForm.country.$setValidity('required', isValidCountry); - vm.isValidCountry = isValidCountry; + var isValidCountry = _.isUndefined(countryCode) ? false : true + vm.accountInfoForm.country.$setValidity('required', isValidCountry) + vm.isValidCountry = isValidCountry if (isValidCountry) { - vm.userData.homeCountryCode = countryCode; + vm.userData.homeCountryCode = countryCode } } function getAddr() { - var add = vm.homeAddress; + var add = vm.homeAddress if (add.streetAddr1 && add.city && add.zip) { - add.type = add.type || 'home'; - return [add]; + add.type = add.type || 'home' + return [add] } else { - return []; + return [] } } function saveAccountInfo() { - vm.formProcessing.accountInfoForm = true; - vm.userData.addresses = getAddr(); + vm.formProcessing.accountInfoForm = true + vm.userData.addresses = getAddr() ProfileService.updateUserProfile(vm.userData) .then(function(data) { - vm.formProcessing.accountInfoForm = false; - toaster.pop('success', "Success!", "Your account information was updated."); - for (var k in vm.userData) userData[k] = vm.userData[k]; - vm.accountInfoForm.$setPristine(); + vm.formProcessing.accountInfoForm = false + toaster.pop('success', 'Success!', 'Your account information was updated.') + for (var k in vm.userData) userData[k] = vm.userData[k] + vm.accountInfoForm.$setPristine() }) .catch(function() { - vm.formProcessing.accountInfoForm = false; - toaster.pop('error', "Whoops!", "Something went wrong. Please try again later."); + vm.formProcessing.accountInfoForm = false + toaster.pop('error', 'Whoops!', 'Something went wrong. Please try again later.') }) } function processData(userData) { - vm.homeAddress = _.find(userData.addresses, {type: 'HOME'}) || {}; + vm.homeAddress = _.find(userData.addresses, {type: 'HOME'}) || {} } function submitNewPassword() { - vm.formProcessing.newPasswordForm = true; + vm.formProcessing.newPasswordForm = true UserService.updatePassword(vm.password, vm.currentPassword) .then(function(res) { - vm.formProcessing.newPasswordForm = false; - vm.password = ''; - vm.currentPassword = ''; - toaster.pop('success', "Success", "Password successfully updated"); - vm.newPasswordForm.$setPristine(); - vm.currentPasswordFocus = false; - - $log.info('Your password has been updated.'); + vm.formProcessing.newPasswordForm = false + vm.password = '' + vm.currentPassword = '' + toaster.pop('success', 'Success', 'Password successfully updated') + vm.newPasswordForm.$setPristine() + vm.currentPasswordFocus = false + + $log.info('Your password has been updated.') }) .catch(function(err) { - vm.formProcessing.newPasswordForm = false; - vm.newPasswordForm.currentPassword.$setValidity('incorrect', false); - $log.error(err); - }); + vm.formProcessing.newPasswordForm = false + vm.newPasswordForm.currentPassword.$setValidity('incorrect', false) + $log.error(err) + }) } } -})(); +})() diff --git a/app/settings/edit-profile/edit-profile.jade b/app/settings/edit-profile/edit-profile.jade index 9008cf203..cbc8e6507 100644 --- a/app/settings/edit-profile/edit-profile.jade +++ b/app/settings/edit-profile/edit-profile.jade @@ -13,7 +13,7 @@ .form-label your profile image .edit-image img.profile-circle(ng-show="vm.userData.photoURL && vm.userData.photoURL.length", ng-src="{{vm.userData.photoURL}}") - img.profile-circle(ng-show="!vm.userData.photoURL || !vm.userData.photoURL.length", src="/images/ico-user-default.svg") + img.profile-circle(ng-show="!vm.userData.photoURL || !vm.userData.photoURL.length", src=require("../../../assets/images/ico-user-default.svg")) .buttons button.file-upload.tc-btn.tc-btn-primary.tc-btn-s(ng-click="vm.changeImage()", type="button") diff --git a/app/settings/edit-profile/edit-profile.spec.js b/app/settings/edit-profile/edit-profile.spec.js index 23d136fe5..7c41f99eb 100644 --- a/app/settings/edit-profile/edit-profile.spec.js +++ b/app/settings/edit-profile/edit-profile.spec.js @@ -1,3 +1,5 @@ +const mockData = require('../../../tests/test-helpers/mock-data') + /* jshint -W117, -W030 */ describe('Edit Profile Controller', function() { var vm; diff --git a/app/settings/preferences/preferences.spec.js b/app/settings/preferences/preferences.spec.js index dd3bb19db..56bf437b0 100644 --- a/app/settings/preferences/preferences.spec.js +++ b/app/settings/preferences/preferences.spec.js @@ -1,3 +1,5 @@ +const mockData = require('../../../tests/test-helpers/mock-data') + /* jshint -W117, -W030 */ describe('Preferences Controller', function() { var vm; diff --git a/app/settings/settings.routes.js b/app/settings/settings.routes.js index dbb1e42f9..62a8ccfbb 100644 --- a/app/settings/settings.routes.js +++ b/app/settings/settings.routes.js @@ -1,20 +1,20 @@ +import angular from 'angular' + (function() { - 'use strict'; + 'use strict' angular.module('tc.settings').config([ '$stateProvider', - '$locationProvider', routes - ]); + ]) - function routes($stateProvider, $locationProvider) { - $locationProvider.html5Mode(true); + function routes($stateProvider) { var states = { 'settings': { parent: 'root', abstract: false, url: '/settings/', - templateUrl: 'settings/settings.html', + template: require('./settings')(), controller: 'SettingsController', controllerAs: 'settings', data: { @@ -22,16 +22,16 @@ }, resolve: { userHandle: ['UserService', function(UserService) { - return UserService.getUserIdentity().handle; + return UserService.getUserIdentity().handle }], userData: ['userHandle', 'ProfileService', function(userHandle, ProfileService) { - return ProfileService.getUserProfile(userHandle); + return ProfileService.getUserProfile(userHandle) }] - }, + } }, 'settings.profile': { url: 'profile/', - templateUrl: 'settings/edit-profile/edit-profile.html', + template: require('./edit-profile/edit-profile')(), controller: 'EditProfileController', controllerAs: 'vm', data: { @@ -40,7 +40,7 @@ }, 'settings.account': { url: 'account/', - templateUrl: 'settings/account-info/account-info.html', + template: require('./account-info/account-info')(), controller: 'AccountInfoController', controllerAs: 'vm', data: { @@ -49,18 +49,18 @@ }, 'settings.preferences': { url: 'preferences/', - templateUrl: 'settings/preferences/preferences.html', + template: require('./preferences/preferences')(), controller: 'PreferencesController', controllerAs: 'vm', data: { title: 'Preferences' } } - }; + } for (var name in states) { - var state = states[name]; - $stateProvider.state(name, state); + var state = states[name] + $stateProvider.state(name, state) } } -})(); +})() diff --git a/app/sitemap/sitemap.routes.js b/app/sitemap/sitemap.routes.js index 03c7b3320..04033fc2c 100644 --- a/app/sitemap/sitemap.routes.js +++ b/app/sitemap/sitemap.routes.js @@ -1,27 +1,26 @@ +import angular from 'angular' + (function() { - 'use strict'; + 'use strict' angular.module('tc.sitemap').config([ '$stateProvider', - '$locationProvider', routes - ]); - - function routes($stateProvider, $locationProvider) { - $locationProvider.html5Mode(true); + ]) + function routes($stateProvider) { var states = { 'sitemap': { parent: 'root', abstract: false, url: '/sitemap/', - templateUrl: 'sitemap/sitemap.html' + template: require('./sitemap')() } - }; + } for (var name in states) { - var state = states[name]; - $stateProvider.state(name, state); + var state = states[name] + $stateProvider.state(name, state) } } -})(); +})() diff --git a/app/skill-picker/skill-picker.jade b/app/skill-picker/skill-picker.jade index a1e67fa29..7bfb78248 100644 --- a/app/skill-picker/skill-picker.jade +++ b/app/skill-picker/skill-picker.jade @@ -10,8 +10,8 @@ .community(ng-repeat="(communityKey, community) in vm.communities", ng-class="{'community--disabled': !community.status}", ng-if="community.display") .community__details .community__icon(ng-class="{'community__icon--disabled': !community.status}") - img(ng-if="communityKey == 'ios' && community.status", src="/images/ico-ios-community.svg") - img(ng-if="communityKey == 'ios' && !community.status", src="/images/ico-ios-community-grey.svg") + img(ng-if="communityKey == 'ios' && community.status", src=require("../../assets/images/ico-ios-community.svg")) + img(ng-if="communityKey == 'ios' && !community.status", src=require("../../assets/images/ico-ios-community-grey.svg")) .community__text span.community__title(class="{{!community.status && 'disabled'}}") {{community.displayName}} @@ -20,8 +20,6 @@ onoff-switch(model="community.status", unique-id="'community-' + communityKey") - - .tracks-container .title tracks .description Topcoder's three categories of challenges… please pick at least one based on your skills and interests. @@ -36,10 +34,10 @@ .track-title select design skills .skills - .skill(ng-repeat="tag in vm.featuredSkills | filter:{categories: 'DESIGN'} | orderBy:'priority':true", + .skill(ng-repeat="tag in vm.featuredSkills | filter:{categories: 'DESIGN'} | orderBy:'priority':true", ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}") a(ng-click="vm.toggleSkill(tag.id.toString())") - .icon + .icon img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}images/skills/id-design.svg") .name {{tag.name}} @@ -47,10 +45,10 @@ .track-title select development skills .skills - .skill(ng-repeat="tag in vm.featuredSkills | filter:{categories: 'DEVELOP'} | orderBy:'priority':true", + .skill(ng-repeat="tag in vm.featuredSkills | filter:{categories: 'DEVELOP'} | orderBy:'priority':true", ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}") a(ng-click="vm.toggleSkill(tag.id.toString())") - .icon + .icon img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}images/skills/id-develop.svg") .name {{tag.name}} @@ -58,10 +56,10 @@ .track-title select data science skills .skills - .skill(ng-repeat="tag in vm.featuredSkills | filter:{categories: 'DATA_SCIENCE'} | orderBy:'priority':true", + .skill(ng-repeat="tag in vm.featuredSkills | filter:{categories: 'DATA_SCIENCE'} | orderBy:'priority':true", ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}") a(ng-click="vm.toggleSkill(tag.id.toString())") - .icon + .icon img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}images/skills/id-data.svg") .name {{tag.name}} diff --git a/app/skill-picker/skill-picker.routes.js b/app/skill-picker/skill-picker.routes.js index dcb69cdd9..ddf478d6f 100644 --- a/app/skill-picker/skill-picker.routes.js +++ b/app/skill-picker/skill-picker.routes.js @@ -1,15 +1,15 @@ +import angular from 'angular' +import _ from 'lodash' + (function() { - 'use strict'; + 'use strict' angular.module('tc.skill-picker').config([ '$stateProvider', - '$locationProvider', routes - ]); - - function routes($stateProvider, $locationProvider) { - $locationProvider.html5Mode(true); + ]) + function routes($stateProvider) { var states = { 'skillPicker': { parent: 'root', @@ -20,23 +20,23 @@ }, resolve: { userIdentity: ['UserService', function(UserService) { - return UserService.getUserIdentity(); + return UserService.getUserIdentity() }], userProfile: ['userIdentity', 'ProfileService', function(userIdentity, ProfileService) { - return ProfileService.getUserProfile(userIdentity.handle.toLowerCase()); + return ProfileService.getUserProfile(userIdentity.handle.toLowerCase()) }], featuredSkills: ['TagsService', function(TagsService) { return TagsService.getApprovedSkillTags().then(function(res) { - return _.filter(res, function(s) { return s.priority > 0}); - }); + return _.filter(res, function(s) { return s.priority > 0}) + }) }] }, views: { 'header@': { - templateUrl: 'layout/header/account-header.html' + template: require('../layout/header/account-header')() }, 'container@': { - templateUrl: 'skill-picker/skill-picker.html', + template: require('./skill-picker')(), controller: 'SkillPickerController', controllerAs: 'vm' }, @@ -46,11 +46,11 @@ } } } - }; + } for (var name in states) { - var state = states[name]; - $stateProvider.state(name, state); + var state = states[name] + $stateProvider.state(name, state) } } -})(); +})() diff --git a/app/skill-picker/skill-picker.spec.js b/app/skill-picker/skill-picker.spec.js index cad2670e8..18913f89d 100644 --- a/app/skill-picker/skill-picker.spec.js +++ b/app/skill-picker/skill-picker.spec.js @@ -1,3 +1,5 @@ +const mockData = require('../../tests/test-helpers/mock-data') + /* jshint -W117, -W030 */ describe('Skill Picker Controller', function() { var vm; @@ -23,7 +25,7 @@ describe('Skill Picker Controller', function() { } return deferred.promise; }); - + sinon.stub(memberCertService, 'registerMember', function(userId, programId) { var deferred = $q.defer(); var resp = {eventId: programId, userId: 12345}; diff --git a/app/specs.html b/app/specs.html deleted file mode 100644 index 982ab2f85..000000000 --- a/app/specs.html +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - -Spec Runner
-Make sure the REMOTE server is running
- Click on a description title to narrow the scope to just its specs
- (see "
- ?grep" in address bar).
- Click on a spec title to see the test implementation.
- Click on page title to start over.
-