Skip to content

Commit 7d15254

Browse files
vas3avas3a
committed
PM-973 - make sure email urls are pointing to work manager instead of connect
1 parent b011612 commit 7d15254

File tree

11 files changed

+38
-29
lines changed

11 files changed

+38
-29
lines changed

‎connect/config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ module.exports = {
3636
DEFAULT_REPLY_EMAIL: process.env.DEFAULT_REPLY_EMAIL,
3737

3838
CONNECT_URL: process.env.CONNECT_URL || 'https://connect.topcoder-dev.com',
39+
WORK_MANAGER_URL: process.env.WORK_MANAGER_URL || 'https://challenges.topcoder-dev.com',
3940
ACCOUNTS_APP_URL: process.env.ACCOUNTS_APP_URL || 'https://accounts-auth0.topcoder-dev.com',
4041
TC_CDN_URL: process.env.TC_CDN_URL,
4142
};

‎connect/notificationServices/email.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ function handleScheduledEvents(events, setEventsStatus) {
9999
const bundleData = {
100100
subject: 'Your Topcoder project updates',
101101
connectURL: config.CONNECT_URL,
102+
workManagerUrl: config.WORK_MANAGER_URL,
102103
accountsAppURL: config.ACCOUNTS_APP_URL,
103104
projects: _.chain(userEvents)
104105
.groupBy('data.data.projectId')
@@ -167,6 +168,7 @@ function wrapIndividualNotification(data) {
167168
return {
168169
subject,
169170
connectURL: config.CONNECT_URL,
171+
workManagerUrl: config.WORK_MANAGER_URL,
170172
accountsAppURL: config.ACCOUNTS_APP_URL,
171173
projects: [{
172174
id: data.data.data.projectId,

‎emails/src/partials/invites.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<table class="main-child">
88
<tr>
99
<td class="empty-child-one"></td>
10-
<td class="comment-box"><img src="{{@root.connectURL}}/static/comment.jpg" alt="IMG"></td>
10+
<td class="comment-box"><img src="{{@root.workManagerUrl}}/static/comment.jpg" alt="IMG"></td>
1111
<td class="empty-child-two"></td>
1212
<td>
1313
<strong>{{title}}</a>.
@@ -51,7 +51,7 @@
5151
<tr>
5252
<td class="empty-child-one"></td>
5353
<td class="second-child" align="center">
54-
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{projectId}}">
54+
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.workManagerUrl}}/projects/{{projectId}}">
5555
SSO Login
5656
</a>
5757
</td>
@@ -86,7 +86,7 @@
8686
<tr>
8787
<td class="empty-child-one"></td>
8888
<td class="second-child" align="center">
89-
<a href="{{@root.accountsAppURL}}/?regSource=tcBusiness&retUrl={{@root.connectURL}}">
89+
<a href="{{@root.accountsAppURL}}/?regSource=tcBusiness&retUrl={{@root.workManagerUrl}}projects/{{projectId}}/invitation">
9090
Register
9191
</a>
9292
</td>

‎emails/src/partials/project-files.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<table class="main-child">
88
<tr>
99
<td class="empty-child-one"></td>
10-
<td class="comment-box"><img src="{{@root.connectURL}}/static/comment.jpg" alt="IMG"></td>
10+
<td class="comment-box"><img src="{{@root.workManagerUrl}}/static/comment.jpg" alt="IMG"></td>
1111
<td class="empty-child-two"></td>
1212
<td>
1313
{{title}}
@@ -59,8 +59,8 @@
5959
<tr>
6060
<td class="empty-child-one"></td>
6161
<td class="second-child" align="center">
62-
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
63-
View project on Connect
62+
<a href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}">
63+
View project
6464
</a>
6565
</td>
6666
<td class="empty-child-one"></td>

‎emails/src/partials/project-links.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<table class="main-child">
88
<tr>
99
<td class="empty-child-one"></td>
10-
<td class="comment-box"><img src="{{@root.connectURL}}/static/comment.jpg" alt="IMG"></td>
10+
<td class="comment-box"><img src="{{@root.workManagerUrl}}/static/comment.jpg" alt="IMG"></td>
1111
<td class="empty-child-two"></td>
1212
<td>
1313
{{title}}
@@ -30,8 +30,8 @@
3030
<tr>
3131
<td class="empty-child-one"></td>
3232
<td class="second-child" align="center">
33-
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
34-
View project on Connect
33+
<a href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}">
34+
View project
3535
</a>
3636
</td>
3737
<td class="empty-child-one"></td>

‎emails/src/partials/project-plan.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<table class="main-child">
88
<tr>
99
<td class="empty-child-one"></td>
10-
<td class="comment-box"><img src="{{@root.connectURL}}/static/comment.jpg" alt="IMG"></td>
10+
<td class="comment-box"><img src="{{@root.workManagerUrl}}/static/comment.jpg" alt="IMG"></td>
1111
<td class="empty-child-two"></td>
1212
<td>
1313
{{title}}
@@ -96,7 +96,7 @@
9696
<tr>
9797
<td class="empty-child-one"></td>
9898
<td class="second-child" align="center">
99-
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}/plan">
99+
<a href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}/plan">
100100
View plan on Connect
101101
</a>
102102
</td>

‎emails/src/partials/project-specification.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<table class="main-child">
77
<tr>
88
<td class="empty-child-one"></td>
9-
<td class="comment-box"><img src="{{@root.connectURL}}/static/comment.jpg" alt="IMG"></td>
9+
<td class="comment-box"><img src="{{@root.workManagerUrl}}/static/comment.jpg" alt="IMG"></td>
1010
<td class="empty-child-two"></td>
1111
<td>
1212
{{title}}
@@ -29,8 +29,8 @@
2929
<tr>
3030
<td class="empty-child-one"></td>
3131
<td class="second-child" align="center">
32-
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
33-
View project on Connect
32+
<a href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}">
33+
View project
3434
</a>
3535
</td>
3636
<td class="empty-child-one"></td>

‎emails/src/partials/project-status.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<table class="main-child">
88
<tr>
99
<td class="empty-child-one"></td>
10-
<td class="comment-box"><img src="{{@root.connectURL}}/static/comment.jpg" alt="IMG"></td>
10+
<td class="comment-box"><img src="{{@root.workManagerUrl}}/static/comment.jpg" alt="IMG"></td>
1111
<td class="empty-child-two"></td>
1212
<td>
1313
{{title}}
@@ -81,8 +81,8 @@
8181
<tr>
8282
<td class="empty-child-one"></td>
8383
<td class="second-child" align="center">
84-
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
85-
View project on Connect
84+
<a href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}">
85+
View project
8686
</a>
8787
</td>
8888
<td class="empty-child-one"></td>

‎emails/src/partials/project-team.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<table class="main-child">
88
<tr>
99
<td class="empty-child-one"></td>
10-
<td class="comment-box"><img src="{{@root.connectURL}}/static/comment.jpg" alt="IMG"></td>
10+
<td class="comment-box"><img src="{{@root.workManagerUrl}}/static/comment.jpg" alt="IMG"></td>
1111
<td class="empty-child-two"></td>
1212
<td>
1313
{{title}}
@@ -104,25 +104,25 @@
104104
<td class="empty-child-one for-two-buttons"></td>
105105
{{#if notifications.[0].[isSSO]}}
106106
<td class="second-child" align="center">
107-
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}%3Finvitation%3Daccept">
107+
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}/invitation/accepted">
108108
Join Project
109109
</a>
110110
</td>
111111
<td class="empty-width-10"></td>
112112
<td class="second-child" align="center">
113-
<a class="second-btn" href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}%3Finvitation%3Ddecline">
113+
<a class="second-btn" href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}/invitation/refused">
114114
Decline
115115
</a>
116116
</td>
117117
{{else}}
118118
<td class="second-child" align="center">
119-
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}?invitation=accept">
119+
<a href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}/invitation/accepted">
120120
Join Project
121121
</a>
122122
</td>
123123
<td class="empty-width-10"></td>
124124
<td class="second-child" align="center">
125-
<a class="second-btn" href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}?invitation=decline">
125+
<a class="second-btn" href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}/invitation/refused">
126126
Decline
127127
</a>
128128
</td>
@@ -132,17 +132,17 @@
132132
<td class="empty-child-one"></td>
133133
<td class="second-child" align="center">
134134
{{#if notifications.[0].[connect.notification.project.member.invite.requested]}}
135-
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}#manageTopcoderTeam">
135+
<a href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}#manageTopcoderTeam">
136136
Manage project team
137137
</a>
138138
{{else}}
139139
{{#if notifications.[0].[isSSO]}}
140-
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
140+
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}">
141141
SSO Login
142142
</a>
143143
{{else}}
144-
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
145-
View project on Connect
144+
<a href="{{@root.workManagerUrl}}/projects/{{notifications.[0].projectId}}">
145+
View project
146146
</a>
147147
{{/if}}
148148
{{/if}}

‎emails/src/partials/topics_and_posts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<table class="main-child">
88
<tr>
99
<td class="empty-child-one"></td>
10-
<td class="comment-box"><img src="{{@root.connectURL}}/static/comment.jpg" alt="IMG"></td>
10+
<td class="comment-box"><img src="{{@root.workManagerUrl}}/static/comment.jpg" alt="IMG"></td>
1111
<td class="empty-child-two"></td>
1212
<td>
1313
<strong>{{title}}</a>.

‎emails/src/template.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@
2020
<td class="main-td">
2121
<table class="main-child">
2222
<tr>
23-
<td class="logo-box"><img src="{{@root.connectURL}}/static/logo.jpg" width="54" height="35" alt="IMG"></td>
23+
<td class="logo-box">
24+
{{#if @root.connectURL}}
25+
<img src="{{@root.connectURL}}/static/logo.jpg" width="54" height="35" alt="IMG">
26+
{{else}}
27+
<img src="{{@root.workManagerUrl}}/static/logo.jpg" width="54" height="35" alt="IMG">
28+
{{/if}}
29+
</td>
2430
<td class="main-heading">YOUR TOPCODER PROJECT UPDATES</td>
2531
<td class="dummy-head-child"></td>
2632
</tr>
@@ -95,7 +101,7 @@
95101
<tr><td class="html-entities">&#9679;&#9679;&#9679;</td></tr>
96102
<tr class="empty-10"><td></td></tr>
97103
<tr>
98-
<td>You are receiving this email based on your Connect account preferences. To change which emails you receive from Connect, go to your <a href="{{@root.connectURL}}/settings/notifications">Notification Settings.</a>
104+
<td>You are receiving this email based on your Connect account preferences. To change which emails you receive from Connect, go to your <a href="{{@root.workManagerUrl}}/settings/notifications">Notification Settings.</a>
99105
</tr>
100106
</table>
101107
</td>

0 commit comments

Comments
 (0)