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

Commit 3fb7080

Browse files
author
vikasrohit
committed
Merge branch 'dev' into feature/filestack-int
* dev: (81 commits) fixing linting errors Branch name fix for qa env adding a coupel of media types for zip 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 Restricted the version of webpack-config to be 0.3.6 to have the mail chimp constants. fixing unit tests AS#100297043256582, Move all login to link of Members to accounts.topcoder.com Merge branch 'dev' into feature/sso-accounts-app-integration AS#131482348128949, Refactor Mailchimp API wrapper to be generic user preferences service AS#131482348128949, Refactor Mailchimp API wrapper to be generic user preferences service supporting sentry logging supporting sentry logging Fixed lint errors Added code comments Removed tabs updated package.json Final fix - all review comments ... Conflicts: app/directives/tc-fp-file-input/tc-fp-file-input.directive.js app/services/submissions.service.js app/submissions/submit-design-files/submit-design-files.controller.js webpack.config.js
2 parents 7112ada + 02307de commit 3fb7080

Some content is hidden

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

52 files changed

+619
-1339
lines changed

app/account/account.routes.js

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -14,100 +14,6 @@ import angular from 'angular'
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-
}]
29-
},
30-
'login': {
31-
parent: 'auth',
32-
url: '/login/?next&code&state&status&userJWTToken&utm_source&utm_medium&utm_campaign',
33-
params: { 'notifyReset': false },
34-
data: {
35-
title: 'Login'
36-
},
37-
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'
57-
},
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/',
75-
data: {
76-
title: 'Registered',
77-
authRequired: false
78-
},
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')()
110-
}
11117
}
11218
},
11319
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)