From 4275a8911c32f121397948ec48b11d2395fc5479 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 9 May 2016 11:46:05 +0530 Subject: [PATCH 1/7] AS#125999129126033, 1 Million users hero banner on Dashboard -- Added banner --- app/directives/tc-banner/tc-banner.jade | 4 ++-- app/my-dashboard/my-dashboard.jade | 2 ++ app/services/bannerDataService.js | 10 ++++++++++ assets/css/my-dashboard/my-dashboard.scss | 22 ++++++++++++++++++++-- assets/images/1M-banner-hero.png | Bin 0 -> 22655 bytes 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 assets/images/1M-banner-hero.png diff --git a/app/directives/tc-banner/tc-banner.jade b/app/directives/tc-banner/tc-banner.jade index 697a39c77..cadaf290f 100644 --- a/app/directives/tc-banner/tc-banner.jade +++ b/app/directives/tc-banner/tc-banner.jade @@ -1,9 +1,9 @@ .tc-banner-placeholder(class="{{vm.theme}}") .image img(ng-src="{{vm.img}}") - .title(ng-bind="vm.title") + .title(ng-bind="vm.title", ng-show="vm.title !== null") .content(ng-transclude, ng-show="transcluded") - .description(ng-bind-html="vm.description") + .description(ng-bind-html="vm.description", ng-show="vm.description !== null") .ctas .cta(ng-repeat="link in vm.ctas") a(class="{{link.cssClass}}", title="{{link.title}}", ng-href="{{link.url}}", ng-if="link.url") {{link.title}} diff --git a/app/my-dashboard/my-dashboard.jade b/app/my-dashboard/my-dashboard.jade index c1452f50e..43c19350f 100644 --- a/app/my-dashboard/my-dashboard.jade +++ b/app/my-dashboard/my-dashboard.jade @@ -7,6 +7,8 @@ //- .ttl //- tc-banner(theme="black", banner-name="ttl") + .one-million + tc-banner(theme="black", banner-name="1million") .tco tc-banner(theme="black", banner-name="tco16") diff --git a/app/services/bannerDataService.js b/app/services/bannerDataService.js index dd4b8f2c8..59f1ced59 100644 --- a/app/services/bannerDataService.js +++ b/app/services/bannerDataService.js @@ -35,6 +35,16 @@ import angular from 'angular' url: 'http://tco16.topcoder.com/latest/overview/', cssClass: 'tc-btn tc-btn-s tco-cta' }] + }, + '1million': { + title: null, + img: require('../../assets/images/1M-banner-hero.png'), + description: null, + ctas: [{ + title: 'Learn More', + url: 'https://www.topcoder.com/blog/1-million-members-strong/', + cssClass: 'tc-btn tc-btn-s tco-cta' + }] } // Commenting out instead of deleting in case there is // another one with a similar format soon diff --git a/assets/css/my-dashboard/my-dashboard.scss b/assets/css/my-dashboard/my-dashboard.scss index c60aca5eb..fea5f1ddb 100644 --- a/assets/css/my-dashboard/my-dashboard.scss +++ b/assets/css/my-dashboard/my-dashboard.scss @@ -11,7 +11,7 @@ background-color: $white; } - .challenges, .srms, .programs, .tco, .ttl, .community-updates { + .challenges, .srms, .programs, .tco, .ttl, .one-million, .community-updates { @include module-l; margin-top: 1px; width: 100%; @@ -34,7 +34,25 @@ } } - .challenges, .srms, .programs, .tco, .ttl, .community-updates { + .one-million { + .tc-banner-placeholder { + background: none $tc-gray-90; + .image { + img { + width: auto; + } + } + + .ctas { + // specific css override to reduce the gap between image and ctas + // ideally we should have separate title, image and description + // however, here we have all 3 in single image + margin-top: 0px; + } + } + } + + .challenges, .srms, .programs, .tco, .ttl, .one-million, .community-updates { padding-top: 0px; } diff --git a/assets/images/1M-banner-hero.png b/assets/images/1M-banner-hero.png new file mode 100644 index 0000000000000000000000000000000000000000..cb2e87dd91db42c19e32ac683dfbe112df409fd5 GIT binary patch literal 22655 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 Date: Mon, 9 May 2016 11:49:15 +0530 Subject: [PATCH 2/7] AS#125999129126033, 1 Million users hero banner on Dashboard -- Change cta button color --- app/services/bannerDataService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/bannerDataService.js b/app/services/bannerDataService.js index 59f1ced59..bb25bfa4b 100644 --- a/app/services/bannerDataService.js +++ b/app/services/bannerDataService.js @@ -43,7 +43,7 @@ import angular from 'angular' ctas: [{ title: 'Learn More', url: 'https://www.topcoder.com/blog/1-million-members-strong/', - cssClass: 'tc-btn tc-btn-s tco-cta' + cssClass: 'tc-btn tc-btn-s' }] } // Commenting out instead of deleting in case there is From 17470353f56b6576a16f2f31822fc0f159dee8d3 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 9 May 2016 11:54:47 +0530 Subject: [PATCH 3/7] AS#117776517568889, Dashboard blog links are broken -- Fixed --- app/services/blog.service.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/services/blog.service.js b/app/services/blog.service.js index 89d8e2dad..3047dcceb 100644 --- a/app/services/blog.service.js +++ b/app/services/blog.service.js @@ -31,6 +31,9 @@ import X2JS from 'xml2js' result.forEach(function(item) { item.title = $sce.trustAsHtml(item.title.toString()) item.description = $sce.trustAsHtml(item.description.toString()) + if (item.link && Array.isArray(item.link) && item.link.length) { + item.link = item.link[0] + } }) deferred.resolve(result) From beb2108b3e03003b143d65345f9375c21dfd6fa2 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 9 May 2016 13:06:34 +0530 Subject: [PATCH 4/7] AS#125016930691282, Add min height to loading state so separator (border) is correct height -- Added min height --- assets/css/settings/email.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/settings/email.scss b/assets/css/settings/email.scss index e8d38e568..cabb86142 100644 --- a/assets/css/settings/email.scss +++ b/assets/css/settings/email.scss @@ -8,6 +8,7 @@ display: flex; justify-content: center; align-items: center; + min-height: 100px; } .newsletters { From c743981fba5895f940d5fc2b281883f52b41f84f Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 9 May 2016 13:07:12 +0530 Subject: [PATCH 5/7] AS#121262308049584, Reorder newsletter options and add "General Newsletter" -- Renamed 'Developer Newsletter' to 'Development Newsletter' --- app/settings/email/email.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/email/email.controller.js b/app/settings/email/email.controller.js index 443265c54..8e1c2f742 100644 --- a/app/settings/email/email.controller.js +++ b/app/settings/email/email.controller.js @@ -34,7 +34,7 @@ import angular from 'angular' }, { id: CONSTANTS.MAILCHIMP_NL_DEV, - name: 'Developer Newsletter', + name: 'Development Newsletter', desc: 'Software architecture, component assembly, application development, and bug hunting', enabled: false, dirty: false From de42c067eab89cfee55257bcdeaebd3ff850087d Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 9 May 2016 15:35:51 +0530 Subject: [PATCH 6/7] AS#118090147171048, Mail chimp Integration -- Fixed delay in loading Email tab --- app/settings/email/email.controller.js | 12 ++++++------ app/settings/settings.routes.js | 8 -------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/settings/email/email.controller.js b/app/settings/email/email.controller.js index 8e1c2f742..7086c4d74 100644 --- a/app/settings/email/email.controller.js +++ b/app/settings/email/email.controller.js @@ -5,9 +5,9 @@ import angular from 'angular' angular.module('tc.settings').controller('EmailSettingsController', EmailSettingsController) - EmailSettingsController.$inject = ['$rootScope', 'userProfile', 'ProfileService', 'MailchimpService', 'logger', 'CONSTANTS', 'toaster', '$q', '$scope'] + EmailSettingsController.$inject = ['$rootScope', 'userData', 'ProfileService', 'MailchimpService', 'logger', 'CONSTANTS', 'toaster', '$q', '$scope'] - function EmailSettingsController($rootScope, userProfile, ProfileService, MailchimpService, logger, CONSTANTS, toaster, $q, $scope) { + function EmailSettingsController($rootScope, userData, ProfileService, MailchimpService, logger, CONSTANTS, toaster, $q, $scope) { var vm = this vm.loading = false vm.saving = false @@ -63,11 +63,11 @@ import angular from 'angular' ] vm.loading = true - return MailchimpService.getMemberSubscription(userProfile).then(function(subscription) { + return MailchimpService.getMemberSubscription(userData).then(function(subscription) { vm.loading = false if (!subscription) { - // add member to the list with empty preferences - MailchimpService.addSubscription(userProfile, {}).then(function(resp) { + // add member to the list with default preferences + MailchimpService.addSubscription(userData, {}).then(function(resp) { logger.debug(resp) }).catch(function(err) { // no error to user @@ -102,7 +102,7 @@ import angular from 'angular' vm.newsletters.forEach(function(newsletter) { preferences[newsletter.id] = newsletter.enabled }) - MailchimpService.addSubscription(userProfile, preferences).then(function(resp) { + MailchimpService.addSubscription(userData, preferences).then(function(resp) { vm.loading = false vm.saving = false // reset dirty state for all newsletter options diff --git a/app/settings/settings.routes.js b/app/settings/settings.routes.js index 031faed38..58d3ef6eb 100644 --- a/app/settings/settings.routes.js +++ b/app/settings/settings.routes.js @@ -54,14 +54,6 @@ import angular from 'angular' controllerAs: 'vm', data: { title: 'Email Preferences' - }, - resolve: { - userIdentity: ['UserService', function(UserService) { - return UserService.getUserIdentity() - }], - userProfile: ['userIdentity', 'ProfileService', function(userIdentity, ProfileService) { - return ProfileService.getUserProfile(userIdentity.handle.toLowerCase()) - }] } }, 'settings.preferences': { From 059f0e8a8d46813219f271c50eb4bb5a07775eea Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Mon, 9 May 2016 09:26:40 -0700 Subject: [PATCH 7/7] Replace usersnap with zendesk --- app/index.jade | 1 + app/index.js | 2 +- assets/scripts/usersnap.analytics.js | 8 -------- assets/scripts/zendesk-widget.jade | 3 +++ 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 assets/scripts/usersnap.analytics.js create mode 100644 assets/scripts/zendesk-widget.jade diff --git a/app/index.jade b/app/index.jade index bb39b0aaa..5a5a0beeb 100644 --- a/app/index.jade +++ b/app/index.jade @@ -18,6 +18,7 @@ html })(document); include ../assets/scripts/google.analytics.jade + include ../assets/scripts/zendesk-widget.jade if htmlWebpackPlugin.options.NEW_RELIC_APPLICATION_ID include ../assets/scripts/newrelic.analytics.jade diff --git a/app/index.js b/app/index.js index 30f039869..e698b267b 100644 --- a/app/index.js +++ b/app/index.js @@ -41,7 +41,7 @@ require('../node_modules/font-awesome/fonts/fontawesome-webfont.woff') require('../node_modules/font-awesome/fonts/fontawesome-webfont.woff2') require('../node_modules/font-awesome/css/font-awesome.css') -// Require non-npm scripts +// Require non-npm scripts, e.g. kissmetrics, munchkin (analytics via jade are included in index.html) requireContextFiles(require.context('../assets/scripts/', true, /^(.*\.(js$))[^.]*$/igm)) // Require Angular modules first diff --git a/assets/scripts/usersnap.analytics.js b/assets/scripts/usersnap.analytics.js deleted file mode 100644 index 0f8d9fba0..000000000 --- a/assets/scripts/usersnap.analytics.js +++ /dev/null @@ -1,8 +0,0 @@ -(function() { - var s = document.createElement('script') - s.type = 'text/javascript' - s.async = true - s.src = '//api.usersnap.com/load/'+'cda7d23b-04e6-4908-8cde-f7e3f858e8a0.js' - var x = document.getElementsByTagName('script')[0] - x.parentNode.insertBefore(s, x)} -)() diff --git a/assets/scripts/zendesk-widget.jade b/assets/scripts/zendesk-widget.jade new file mode 100644 index 000000000..1864804d4 --- /dev/null +++ b/assets/scripts/zendesk-widget.jade @@ -0,0 +1,3 @@ +script(type="text/javascript"). + /*'),o.close()}("https://assets.zendesk.com/embeddable_framework/main.js","topcoder.zendesk.com"); +/*]]>*/