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

Commit 74d3e8a

Browse files
author
vikasrohit
committed
Merge branch 'dev' into feature/sup-3127-marathonmatch-details-link
* dev: (121 commits) AS#145923029536767, Expand submission comment box to allow 1,000 characters -- Upgraded the limit for comments box AS#145923029536741, Filestack: restyle interface -- implemented suggested design. fixing linting errors AS#145319139176894, Submissions: File picker not working on dev -- Fixed minor styling AS#145319139176894, Submissions: File picker not working on dev -- Fixed file picker loading Revert "AS#145319139176894, Submissions: File picker not working on dev" AS#145319139176894, Submissions: File picker not working on dev Updated QA AWS secrets fix badge position problem updating images to centralize crowd for good badge in UI adding space on the earned on date of badges tooltip AS#100297043256582, Move all login to link of Members to accounts.topcoder.com AS#100297043256582, Move all login to link of Members to accounts.topcoder.com AS#100297043256582, Move all login to link of Members to accounts.topcoder.com Updated QA AWS secrets AS#100297043256582, Move all login to link of Members to accounts.topcoder.com AS#100297043256582, Move all login to link of Members to accounts.topcoder.com AS#100297043256582, Move all login to link of Members to accounts.topcoder.com AS#100297043256582, Move all login to link of Members to accounts.topcoder.com support crowd for good badge ...
2 parents dfd4bc4 + 2c841b6 commit 74d3e8a

File tree

84 files changed

+1269
-1980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1269
-1980
lines changed

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.gitignore
2+
assets/scripts/*.*
3+
report/**/*.*

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ env:
4646
# DEV_AWS_SECRET
4747
- secure: p+od0xD/9vpMbR2AI6gZWknNAtvvIfq6jXIF98DEsDlqrrMFv4SwtuXLlCmX5PBnB/cWOkwgRhymI7/3+fLrDC+wqlhDEWyzSpVOvAcVAb5LEP7IDen0W8kTj2q9I2VRX+keL7lxQCknAf/21sRZeJfJhLGR+O3NcytEdsjlpFCopA6luZYv1QSd+nRJiTsI7I69T0hr7jZk+YioyjEEp/4qzI2qyJH7E5Ry+DD3gXnC3zva48Huq6rvOtLpgFmio1b1rNAcA55Q9Y3vb1jJyZhKpRvtel9OM9ekTxANEGJVaMzxyZXT7EFTxwxS+ub5c2HRzxedMnD3tY29ku2JJx7Ofm+Yxt9DZXSK7EV99xxE71kIhI9lZFiWZviym08MHGc4pee6+Cl6ZkiV44v4XnwbgUq8GCOkmDMQBQtGhXq7dC6jB/r7P7CJs+DIGDF7qNt/xizVOC1THS8GUCN68aWMVperP+IlUXo5d2XekhO6vjHk6o44K8A1s7yblBWXj54B6NfJnBzUK2X0g6Y2xdW6tmoKtad1r1I3062skc+UiU+6m4fGS8pLFElJNj+8N7QANoEw9oJDZfuQ47uVQzPjAA1/qdcy3ksMek0siNFbpZnMqzOJTPf2Xe7YgKuCPg0QczESXIjOeEIU0om7SWmGEIuMFqt6obQW0M3VHn0=
4848
# QA_AWS_KEY
49-
- secure: CObZrZ37F2BE67xgLw+oCbS+zy6iyZYszERY75yuDqrXn6wyui2rgHOpDIdsemWueLTZImMdHD7WtCRRnqO2JDxt+DwmeaVXgx3IJiB1+UNa0syRsVpj/+TKNQ2/y/bw7u21Yr0JL0VxlyyB6+vexEZ6EkmJxmlKczsBZ96LLkkX0xSNYA4Co7ieGpAsPlXYqCGIg92rhdhXZ1aPkU91tI1A6Jq3CEVnKDbdNXQksxt5WPsAu/1LUj0iqLwTk+x5vYipC+r6scF/gDIDmrmziT2N0u11Xl1qKYvOAHhI2G/CIkrW/IuirurLTPh2i/FxKbacpHU2RnN5zECEf6/7UEOXJhYo9ajySwXPLs8u0pLbC4iIzrv7j76k9wgUeBMnUOo0WJNV4hKnKflvJrnKDuzZFl0gTItXRwKXLYwx28bDxtMcAq5FnuxV0QMORMhCLizP7Dt/BQSPOAXcoEgnmj/fFfobU0ZP+LsRtvNo5D/XykxVLrG7/x9BIpVqpnj4Me34xEJvyRmx7v2x2y425sA6h8IucbD/5JqRg56OUqfg8xut2LqtnvBpBClKPEjSTIn9iHixTMLU7yji7Ysjp/7EsL4zyImNhsRH40q/0OpE+ORTTNMYyJ4bmoSZzndvEDSMg1ivWrbDJcHOoADPQDDP8AP+FxO6Y6jGyzyJ7R8=
49+
- secure: XG8fvQkBGUSbrZ+ZcHJadpPGKze1HrO17pl9WAzXOAFaomgZpXJIQrEmH8H03QpeFwhhM0pmWeHwnLAzSQ3j8dU8RidlR5/72X9Jdz74YJNPun7O4EJ4LE4qd3bjsS1+0IhyoaatV9OvIbCJDm1ujpHATkvUwHqt2WvVKxmy76raYqzMBNJD0xq0JrceZWwy2i0mnxLNSe/PqGREPDVWIFjb/rgLo0k2NPH7Z/ZqzTN9F/HzT7b4qmEJaQsjgBwWnMDIYdFKIVhP4nUlQBhZhuiiirUh7STOxloxe245xu2FRr+m5la2Eqpw8yf+nwsevtgnk1SaWF9LVp2VOV6AONWI5fMC/PGlEoVKf/Wt+S39wxlsIG4RL8RH0I9IypxHyfWcKz/iBVKWwpEH+IGa9Pl2XnCDJs5xHBkaVKuX76Nk8NSEG/ZxkCLBhlDSMmiivw4dQShQQv/qto1nz8rVzhj2gZUJbynsfKId2x/VrcnaPVRMSHuTRI/112wzLfENpcy1WhOJrKHZjMuoUVOLYNZs/kqygNTjqUbiqBb1t2RRuULB7RjBFMJBJKFbQA6wha1Ieh0lut3ZWbXPFkpsGCfC7S3l6Iy6U4BQcFpRDGw8MiAI+y5IPzePgKwhWxKZl0nY34trdzK4KaCabvdORYviSaBbxGiXPVsja/SY3T8=
5050
# QA_AWS_SECRET
51-
- secure: azM3x9Cf7jSEe1TC/uhozJbP82oLfTiydvFBuE70SZ8tIJJUGSVGPe7wF6YJfF1zkTCAZJrnzFRLxt3Unecx21ibxabwr6DdlJI+ptJH7VA/TeOL1+PGGjOK46Qb7qF1D2Y8m48uNy4GC7+K4Rs3r6xa702OjAFED+REQRBFDDoaNDLz4K+uYwgGrsu/o/B3y6tPmTFgrKiTCvCWPO0gGZ/mbqbW4ZDcTo/quIXb8vTrInxf978vR6TQDdKaTjgz/u1cNQ1e27ZXl9lkS9I8OBKiVMd8ixM2idC44wTw5HhbInYc0jzUQrOV/LBQfvx4csifRtwX9xm0jD8UqUqlqI/Ay1sVZKRBgMSWkrAfvVF4XeoqjXLhAq0vndblhIFcsUkRtECQePCGQhHPTE+vi6BhcoA9RxF+0vRoFQe2lQsK+GeLB4bww5JmCZ9E0gQzpe48F5p3x2qvuVj070lKeEDCdQ2Dym6VnR6vUUtExuOxlI9ggfcuR7hId1aL9OakMxe8iyui+bouFE9uvUddtxqF0hwt3wuHaOd2gFRjFzPt3iFHf3rtFm6RCFalNYXAmrQ7ODZ1FcwV/wzs0mdVDmMp39Hb8Vm21tBNkGgy8ynB1DC1Zyv+PiivG0cMfJnD7eD/b0mDITUTxJB8My2e1vkKCctxmhRJ78C1ftJafXU=
51+
- secure: ALKnhODYCEtEjaDKe7YCupZPr7krQpLHkhlumUPkZVdYvNbunNDQcSDIJAEx97W9PJ0jRLQzYgoosQ+49CKOi7Lv2K+GHszBtiJ7Mc689v+lkQ686pSrGTrnTV626wLT6fxtprrFofTF8Q7Ywpp8q5A6vmTOpUFIkFBzlfEoInmvSXtM3BFTg11OFQdyhP1Pv2vSdDjFvbulCBhFo1sw8f1pRlUxALaYTE1ar1kN2EysrS5VSuK7ZdyXrmleJCwnIFshECqNUpHPU7LwYxeoTlaFGdeMFK5TuqrxR/LC6lSWTQvhMtQJzMFh8W2FwNJNqPNFmttD7G86/6o6jNxW4E0xo35VINaPi3qPdlHXFLBxMjkRzVS+I2EUjb80Hft5gK1/JXBl0RqX38sqgVGb1/u63hPR0iNqLW9CPEXXxrdifLrex+x3hW2Shg8kzGwRdE181zgdIIhnV8JiD1lsO1XrpusCjia+QjZJKp+fglq/1KGGRqHllxTN0T+6E9V8O4Opy+59aWcO8nkIJ5+INRl67MhpgJmutAfF2lgd5hMAWju5GNA77Bfd31zwpbOdetwmyp2fo81iKs1rgK4M9rFTtKsRFObDnalEqP+mwmwAg0yzhmWAMpmegYDAGfHOBPLSHpFDPRW7lrI4HTMrW2zP2W/NCIwHWpqPM/82bnc=
5252
# MASTER_AWS_KEY
53-
- secure: O6zyOKot+s0t0ANCM84Jd6QSfaKe4ICQX4SoQBJF394Su2+jXDOCvim8L8Z8JfzyB3uub7UE25AXwXSpIDfUTlCbMNIaAnHDjcFqNmcQ/v4kSQ0COK1VlHLHRAQHr8bzocOa1N6sjsQXxZGKWsHWzTQPbfmSdhHpL+NkSOQtM9gQYC8haafnosIEZPxHnRM99s9Ku7lHlEBN3+mMrTZjIU2qeKL9NxyCjPLZkAPQQR1qCYQsF4bG+BNj6OsRKh2rts3GBDz8upRmzStGh0IGX+xgryhu9yC3KV96ZXkMV/i35UQLSQsYo7AKxhljEx/1741GbkaRrLysS1YJ5xg6zMQbsT/Rj+p6WyjqBRH9QjnBwzUVij1GaOOi9gG6UjsULXEuOTwtHPvIod0il8kvjpoau0S63YwmYCVA+7fjNyzx/yZENnZS9hGetKs0Jso84JvzcSnm3HRBxlDyIJPlTXCX4TSpCFJM7p/eyC5XlpItW9Y2qjMOa/6gHOeHt+1AR4wq4BPCa4omYAwDRRYaNRW96VK+hTMHwdcZTuGY7kst/rhnU7ShZg12g/t1OyA4+jY3xm2RAMfMwuuiPffLe/2g5HPltfLKoQSzyuMypwqjH6ECoWCGHGq1NZQu6wSsuxAz/ucAE9a3NlLgnzub2BwN8j2fh8n5mMnfoOXV5Xg=
53+
- secure: natX9uNNhOZBAkVht/f/dxT2Rkv/EP4maS3h9/dRXqejEHO9YQCTnvApGFE1SkDuH+NHoH06yx7RpAh+Gswn8CldHPF3daVnJHVgZYU2gBTyxlc5hFFV3ZmZ+hFSZgzWAXRSedw3l/SD7ceo8RebeVpSH/weDxzmHHSb429f0809wM+gWeUsNAG1sAr/oKw1t++7xIZA9p9k7EpCy8oBpHNRB30vknORNY/VFZMbp/RHfJohiL8SM9Nub2rnh27LKxik32BDCNypm+wE1cMB8642wL+MysIN7b1b1PJ9Hkahzcym8tImY0zJrui/j7tZ2ho0ATaHIc4DHna3TeM/tIK56Rtb+w4/b5rZrtIGCqCDoo6MQMkh1jL45KKeoa9Q5OgdgKqRgOQIkhy9MPQyqayUi/6RTplYXt1MO0vpHKUD2yMDZSfXWfin0XnHywTKAjjdc/lyvvC7YtrucbUu3DSbY6Eq5DH9przWdHWtXQDA0+hNjjxa6M8w2hPYBqOSM5GHF1VjlwY15hDLx/oua1VyGSfe7msd6xo0gkA/lvbA4QrOcuPYduF0cOvXuzj/RsaVqcHOAzRHvyKHaQR2UmmEQH7JoKr0/0mjXTNZX/xPlGtqRBDiWajfHhIjG4RlApbGTcdFUiuMrTNp0USA3QyV72yljWvkZ4L/9PbDjq8=
5454
# MASTER_AWS_SECRET
55-
- secure: kyqe9fRjYLFZ3OhsEnB7iie4GKnARq0vJYaXrFZx2A3dJPm6fljNnrbVS0zdEZgaKMtYMz6Ts+hlE4Oia5VRkXDhpKfPcieatRNTjsApbRo50Ax70qrTsyAaBIfkZxrJcyxC028uv0xhB8d5kv7MVim8tiSHroOd+QwZABZsGBc41U9sj/v5zPQpslsyKv0MJJmB+QwXqx/7GxY5N2dT8LfcBJdoUdJMAyRPBUox5+LmtrW6ws6fx106C2Eh/i8jhssmiIq0MEguiqVZKYH4u01XXsH131uue2AzYu+nVdFpRnvqxgQLzNrNGCMcBsutJKQJ/Iz5f1mRlWDeVlmVDNPJO8195G6P0QO/g4RpR+fybiB9jiNri7HtRDP4dvpRgDqUpXaGfEte533FGGJFhSGCYgkx9zIfkcHWxbYHAelEXSzyJFz7Z40bOQK/rh51xhz+FGNhzHn/MikFOflIftm3WGU+4ZvjQJdbPLEQk9wVl1EUg1YdWnuohBPdX1fiT9hUUjdwJsRDNlmRT4dNQr2+GR1yXeSl8USzVo9G2LxgdaIS31EvvVEDL6ZQ3qPZnxXV8EVP32i7aYyt+TXb0rb+Y8TXTbcMQQEb2y+41ZN5NJqFuyOxbK3WvOUcmGtQgY12PTZJlQh80DiFS0svQRQ9bk54USRyQpG0jNBJZXU=
55+
- secure: fO89NVR5/+qbWD0tcHOftkGGSCa89vrYeH+UJ4zaE9kgos2W7QpIsc/ENt9NscuBOERBsrlOCzS+mBBC1ss40/GxIQbM8xS9b6y8odJqEKDCR34YDWcPEmb/kSbC0Cb7Q6r6r8fbJ0GFBOunYgiGFaGyPLlhVd68NBH2YzzRZ5R24KU7T1/3mFUz50DO/q+6NU56WurkrqTIes6YT3UNAPaXDaHJHtTifts+TibP6NpAsTDcj38gBH4re6+5MkI/iPUAaN7iA+aooDtHsKNWI0iCTyyBORfzNbCd0Nbbqv6GH/3v9RlZXg05+uOWOxjPLSH8TK3aQfGZD9uf1NmZRsNkLVVYMjUHAAZU3g0k8fxXMUtkL0nqbIoi9FTAMdHzc3aHQlU41DPbS7YV+Cs9Y2aHOx+kX1eqber6g0PUSrDSGmdFDlJqJrabHXomgRZxJ/uPyZ/JzGZQDYZxqWuhmtap79uGJOe/OKa1Oubj8wfwH3BIA1IFbLS2I5wAN5UOb0eQkTQTXS8LVtO2VicbX9YdZF1cE5uCpK1cXCv6+cNhziTXIrRFp7W/cYPMN7eZoQNxRgGfTSY+yNCKR3Qh+S8Ota8lZoB60wiPb6ISPIXbO0AwTtRHjrTUsPEfxsQPLZT4AZkYgjGbMEkzuhDVh3vR1gpQ67L8hPbNPAwh0ts=
5656
addons:
5757
apt:
5858
sources:

app/account/account.routes.js

Lines changed: 15 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -5,110 +5,37 @@ import angular from 'angular'
55

66
angular.module('tc.account').config(routes)
77

8-
routes.$inject = ['$stateProvider']
8+
routes.$inject = ['$stateProvider', 'CONSTANTS']
99

10-
function routes($stateProvider) {
10+
function routes($stateProvider, CONSTANTS) {
1111
var states = {
1212
'auth': {
1313
parent: 'root',
1414
abstract: true,
1515
data: {
1616
authRequired: false
17-
},
18-
onEnter: ['$state', '$stateParams', 'TcAuthService', 'logger', function($state, $stateParams, TcAuthService, logger) {
19-
if (TcAuthService.isAuthenticated()) {
20-
// redirect to next if exists else dashboard
21-
if ($stateParams.next) {
22-
logger.debug('Redirecting: ' + $stateParams.next)
23-
window.location.href = decodeURIComponent($stateParams.next)
24-
} else {
25-
$state.go('dashboard')
26-
}
27-
}
28-
}]
17+
}
2918
},
3019
'login': {
31-
parent: 'auth',
3220
url: '/login/?next&code&state&status&userJWTToken&utm_source&utm_medium&utm_campaign',
33-
params: { 'notifyReset': false },
34-
data: {
35-
title: 'Login'
36-
},
3721
views: {
38-
'header@': {
39-
template: require('../layout/header/account-header')()
40-
},
41-
'container@': {
42-
template: require('./login/login')(),
43-
controller: 'LoginController',
44-
controllerAs: 'vm'
45-
},
46-
'footer@': {
47-
controller: 'FooterController as vm',
48-
template: require('../layout/footer/account-footer')()
49-
}
50-
}
51-
},
52-
'register': {
53-
parent: 'auth',
54-
url: '/register/?next&utm_source&utm_medium&utm_campaign',
55-
data: {
56-
title: 'Join'
22+
'header@': {},
23+
'container@': {},
24+
'footer@': {}
5725
},
58-
views: {
59-
'header@': {
60-
template: require('../layout/header/account-header')()
61-
},
62-
'container@': {
63-
template: require('./register/register')(),
64-
controller: 'RegisterController',
65-
controllerAs: 'vm'
66-
},
67-
'footer@': {
68-
controller: 'FooterController as vm',
69-
template: require('../layout/footer/account-footer')()
70-
}
71-
}
72-
},
73-
'registeredSuccessfully': {
74-
url: '/registered-successfully/',
7526
data: {
76-
title: 'Registered',
7727
authRequired: false
7828
},
79-
views: {
80-
'header@': {
81-
template: require('../layout/header/account-header')()
82-
},
83-
'container@': {
84-
template: require('./register/registered-successfully')()
85-
},
86-
'footer@': {
87-
controller: 'FooterController as vm',
88-
template: require('../layout/footer/account-footer')()
89-
}
90-
}
91-
},
92-
'resetPassword': {
93-
parent: 'auth',
94-
url: '/reset-password/?token&handle',
95-
data: {
96-
title: 'Reset Password'
97-
},
98-
views: {
99-
'header@': {
100-
template: require('../layout/header/account-header')()
101-
},
102-
'container@': {
103-
template: require('./reset-password/reset-password')(),
104-
controller: 'ResetPasswordController',
105-
controllerAs: 'vm'
106-
},
107-
'footer@': {
108-
controller: 'FooterController as vm',
109-
template: require('../layout/footer/account-footer')()
29+
onEnter: ['$state', '$window', '$stateParams', 'logger',
30+
function($state, $window, $stateParams, logger) {
31+
var next = $state.href('dashboard', {}, {absolute: true})
32+
if ($stateParams.next) {
33+
next = decodeURIComponent($stateParams.next)
34+
}
35+
$window.location = CONSTANTS.ACCOUNTS_APP_URL + '?retUrl=' + encodeURIComponent(next)
11036
}
111-
}
37+
]
38+
11239
},
11340
logout: {
11441
url: '/logout/',

app/account/login/login.controller.js

Lines changed: 0 additions & 132 deletions
This file was deleted.

app/account/login/login.jade

Lines changed: 0 additions & 47 deletions
This file was deleted.

app/account/login/login.spec.js

Lines changed: 0 additions & 24 deletions
This file was deleted.

app/account/logout/logout.controller.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ import angular from 'angular'
88
LogoutController.$inject = ['logger', 'TcAuthService', '$window', 'CONSTANTS']
99

1010
function LogoutController(logger, TcAuthService, $window, CONSTANTS) {
11-
12-
TcAuthService.logout()
13-
.then(function() {
14-
logger.debug('Successfully logged out.')
15-
16-
// Redirect to home
11+
TcAuthService.logout().then(() => {
12+
logger.debug('MAIN_URL=> ' + CONSTANTS.MAIN_URL)
1713
$window.location.href = CONSTANTS.MAIN_URL
1814
})
1915
}

0 commit comments

Comments
 (0)