Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Feature/mailchimp #790

Merged
merged 4 commits into from
May 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions app/services/mailchimp.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
25 changes: 16 additions & 9 deletions app/settings/email/email.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand All @@ -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',
Expand All @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions app/settings/email/email.jade
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
1 change: 1 addition & 0 deletions app/topcoder.constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion assets/css/settings/email.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
font-size: 16px;
line-height: 28px;
@include sofia-pro-medium;
text-transform: uppercase;
transition: .1s color;
&.disabled {
color: #b7b7b7;
Expand Down