Merge pull request #790 from appirio-tech/feature/mailchimp

Feature/mailchimp

Author: vikasrohit

app/services/mailchimp.service.js

@@ -48,11 +48,7 @@ import angular from 'angular'
         interests: {}
       }
       if (!preferences) {
-        subscription.interests[CONSTANTS.MAILCHIMP_NL_TCO] = true
-        subscription.interests[CONSTANTS.MAILCHIMP_NL_IOS] = true
-        subscription.interests[CONSTANTS.MAILCHIMP_NL_DEV] = true
-        subscription.interests[CONSTANTS.MAILCHIMP_NL_DESIGN] = true
-        subscription.interests[CONSTANTS.MAILCHIMP_NL_DATA] = true
+        subscription.interests[CONSTANTS.MAILCHIMP_NL_GEN] = true
       } else {
         subscription.interests = preferences
       }

app/settings/email/email.controller.js

@@ -19,9 +19,9 @@ import angular from 'angular'
     function activate() {
       vm.newsletters = [
         {
-          id: CONSTANTS.MAILCHIMP_NL_DEV,
-          name: 'Developer Newsletter',
-          desc: 'Software architecture, component assembly, application development and bug hunting',
+          id: CONSTANTS.MAILCHIMP_NL_GEN,
+          name: 'General Newsletter',
+          desc: 'News summary from all tracks and programs',
           enabled: false,
           dirty: false
         },
@@ -32,6 +32,13 @@ import angular from 'angular'
           enabled: false,
           dirty: false
         },
+        {
+          id: CONSTANTS.MAILCHIMP_NL_DEV,
+          name: 'Developer Newsletter',
+          desc: 'Software architecture, component assembly, application development, and bug hunting',
+          enabled: false,
+          dirty: false
+        },
         {
           id: CONSTANTS.MAILCHIMP_NL_DATA,
           name: 'Data Science Newsletter',
@@ -40,16 +47,16 @@ import angular from 'angular'
           dirty: false
         },
         {
-          id: CONSTANTS.MAILCHIMP_NL_TCO,
-          name: 'TCO Newsletter',
-          desc: 'Software architecture, component assembly, application development and bug hunting',
+          id: CONSTANTS.MAILCHIMP_NL_IOS,
+          name: 'iOS Community Newsletter',
+          desc: 'Mobile app design and development for iOS, with Swift emphasis',
           enabled: false,
           dirty: false
         },
         {
-          id: CONSTANTS.MAILCHIMP_NL_IOS,
-          name: 'iOS Community Newsletter',
-          desc: 'Software architecture, component assembly, application development and bug hunting',
+          id: CONSTANTS.MAILCHIMP_NL_TCO,
+          name: 'TCO Newsletter',
+          desc: 'Our annual online and onsite tournament to celebrate and reward the community',
           enabled: false,
           dirty: false
         }

app/settings/email/email.jade

@@ -1,8 +1,8 @@
 .email-preferences-container
   .settings-section.newsletters
     .section-info
-      h2 Always be up to date
-      .description Select the email notifications that you'd like to receive. We send them once every week, so you can be up to date with latest news, events and callenges.
+      h2 Email Preferences
+      .description Choose the community newsletters that you would like to receive. They are sent about once a week and have the latest news on challenges, events, and special programs.
 
     .section-fields
       .processing(ng-show="vm.loading")

app/topcoder.constants.js

@@ -22,6 +22,7 @@ angular.module('CONSTANTS', []).constant('CONSTANTS', {
   'TCO16_URL'               : process.env.TCO16_URL,
   'MAILCHIMP_LIST_ID'       : process.env.MAILCHIMP_LIST_ID,
   'MAILCHIMP_NL_CATEGORY_ID': process.env.MAILCHIMP_NL_CATEGORY_ID,
+  'MAILCHIMP_NL_GEN'        : process.env.MAILCHIMP_NL_GEN,
   'MAILCHIMP_NL_TCO'        : process.env.MAILCHIMP_NL_TCO,
   'MAILCHIMP_NL_IOS'        : process.env.MAILCHIMP_NL_IOS,
   'MAILCHIMP_NL_DEV'        : process.env.MAILCHIMP_NL_DEV,

assets/css/settings/email.scss

@@ -57,7 +57,6 @@
           font-size: 16px;
           line-height: 28px;
           @include sofia-pro-medium;
-          text-transform: uppercase;
           transition: .1s color;
           &.disabled {
             color: #b7b7b7;