Skip to content

Commit a393519

Browse files
maxceemmaxceem
committed
Merge branch 'develop' into feature/datepicker-update
2 parents b1214ca + 470d5fd commit a393519

File tree

63 files changed

+655
-128
lines changed

Some content is hidden

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

63 files changed

+655
-128
lines changed

‎.circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -230,21 +230,22 @@ workflows:
230230
filters:
231231
branches:
232232
only:
233-
- hot-fix
233+
- develop
234+
- auth0-hotfix-v3
234235
# This is alternate dev env for parallel testing
235236
- "build-test":
236237
context : org-global
237238
filters:
238239
branches:
239240
only:
240-
- hot-fix
241+
- apollo-site
241242
# This is alternate dev env for parallel testing
242243
- "build-qa":
243244
context : org-global
244245
filters:
245246
branches:
246247
only:
247-
- listing-develop-sync
248+
- issue-5041
248249
# This is beta env for production soft releases
249250
- "build-prod-beta":
250251
context : org-global
@@ -260,7 +261,6 @@ workflows:
260261
branches:
261262
only:
262263
- develop
263-
- listing-develop-sync
264264
# Production builds are exectuted
265265
# when PR is merged to the master
266266
# Don't change anything in this configuration

‎__tests__/client/client.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ const mockTcAccounts = {
106106
decodeToken: () => ({ exp: Date.now() }),
107107
getFreshToken: () => Promise.resolve(tokenV3),
108108
};
109-
jest.setMock('tc-accounts', mockTcAccounts);
109+
jest.setMock('@topcoder-platform/tc-auth-lib', mockTcAccounts);
110110
111111
/* Mock auth actions */
112112
/*

‎__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
4949
</a>
5050
<a
5151
className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost src-shared-components-Dashboard-SRM-___styles__tc-btn___3no83"
52-
href="https://www.topcoder-dev.com/member-onboarding/learning-practicing-skills/"
52+
href="https://www.topcoder-dev.com/thrive/articles/How%20To%20Compete%20in%20SRMs"
5353
>
5454
Learn More
5555
</a>

‎__tests__/shared/components/Header/__snapshots__/index.jsx.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ exports[`Default render 1`] = `
165165
auth={null}
166166
authURLs={
167167
Object {
168-
"href": "https://accounts.topcoder-dev.com/member/registration?utm_source=community-app-main",
169-
"location": "https://accounts.topcoder-dev.com/member?retUrl=%S&utm_source=community-app-main",
168+
"href": "https://accounts-auth0.topcoder-dev.com?utm_source=community-app-main",
169+
"location": "https://accounts-auth0.topcoder-dev.com?retUrl=%S&utm_source=community-app-main",
170170
}
171171
}
172172
loggedIn={true}

‎__tests__/shared/components/ProfilePage/__snapshots__/index.jsx.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ exports[`renders a full Profile correctly 1`] = `
1616
>
1717
<Sticky
1818
activeClass="active"
19-
bottomBoundary={-250}
19+
bottomBoundary={0}
2020
enableTransforms={true}
2121
enabled={true}
2222
onStateChange={null}
@@ -630,7 +630,7 @@ exports[`renders an empty Profile correctly 1`] = `
630630
>
631631
<Sticky
632632
activeClass="active"
633-
bottomBoundary={-250}
633+
bottomBoundary={0}
634634
enableTransforms={true}
635635
enabled={true}
636636
onStateChange={null}

‎__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap

+5-5
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 1`] = `
106106
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
107107
>
108108
<a
109-
href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science"
109+
href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science&tax="
110110
>
111111
Data Science
112112
</a>
@@ -115,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
115115
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
116116
>
117117
<a
118-
href="https://www.topcoder-dev.com/thrive/tracks?track=Design"
118+
href="https://www.topcoder-dev.com/thrive/tracks?track=Design&tax="
119119
>
120120
Design
121121
</a>
@@ -124,7 +124,7 @@ exports[`Matches shallow shapshot 1`] = `
124124
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
125125
>
126126
<a
127-
href="https://www.topcoder-dev.com/thrive/tracks?track=Development"
127+
href="https://www.topcoder-dev.com/thrive/tracks?track=Development&tax="
128128
>
129129
Development
130130
</a>
@@ -133,7 +133,7 @@ exports[`Matches shallow shapshot 1`] = `
133133
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
134134
>
135135
<a
136-
href="https://www.topcoder-dev.com/thrive/tracks?track=QA"
136+
href="https://www.topcoder-dev.com/thrive/tracks?track=QA&tax="
137137
>
138138
QA
139139
</a>
@@ -316,7 +316,7 @@ exports[`Matches shallow shapshot 1`] = `
316316
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
317317
>
318318
<a
319-
href="https://accounts.topcoder.com/member/registration?utm_source=community&utm_campaign=tc-footer&utm_medium=promotion"
319+
href="https://accounts-auth0.topcoder-dev.com?utm_source=community&utm_campaign=tc-footer&utm_medium=promotion&retUrl="
320320
>
321321
Join Community
322322
</a>

‎__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ exports[`Matches shallow shapshot 1`] = `
1616
/>
1717
</div>
1818
<Footer
19-
hideTcLinksInFooter={false}
19+
hideTcLinksInFooter={true}
2020
/>
2121
</div>
2222
`;
@@ -37,7 +37,7 @@ exports[`Matches shallow shapshot 2`] = `
3737
/>
3838
</div>
3939
<Footer
40-
hideTcLinksInFooter={false}
40+
hideTcLinksInFooter={true}
4141
/>
4242
</div>
4343
`;

‎__tests__/shared/components/tc-communities/Footer.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ test('render properly', () => {
4141
<Wrapper
4242
menuItems={[]}
4343
communityId="wipro"
44-
registerUrl="https://accounts.topcoder-dev.com/member/registration"
45-
loginUrl="https://accounts.topcoder-dev.com/member"
44+
registerUrl="https://accounts-auth0.topcoder-dev.com/member/registration"
45+
loginUrl="https://accounts-auth0.topcoder-dev.com/member"
4646
isAuthorized
4747
/>
4848
));
@@ -63,8 +63,8 @@ test('render properly', () => {
6363
url: 'leaderboard',
6464
}]}
6565
communityId="wipro"
66-
registerUrl="https://accounts.topcoder-dev.com/member/registration"
67-
loginUrl="https://accounts.topcoder-dev.com/member"
66+
registerUrl="https://accounts-auth0.topcoder-dev.com/member/registration"
67+
loginUrl="https://accounts-auth0.topcoder-dev.com/member"
6868
isAuthorized={false}
6969
theme={{
7070
container: 'container',

‎__tests__/shared/components/tc-communities/__snapshots__/AccessDenied.jsx.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[`Matches shallow shapshot 1`] = `
2020
>
2121
<a
2222
className="tc-btn-md tc-btn-primary"
23-
href="http://accounts.topcoder-dev.com/member?utm_source="
23+
href="https://accounts-auth0.topcoder-dev.com/member?utm_source="
2424
onClick={[Function]}
2525
>
2626
Log In Here

‎__tests__/shared/reducers/auth.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const mockActions = {
2424
2525
_.merge(actions, mockActions);
2626
27-
jest.setMock('tc-accounts', {
27+
jest.setMock('@topcoder-platform/tc-auth-lib', {
2828
decodeToken: () => 'User object',
2929
isTokenExpired: () => false,
3030
});

‎__tests__/shared/reducers/challenge.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { mock, actions } from 'topcoder-react-lib';
1111
1212
const { mockAction } = mock;
1313
14-
jest.setMock('tc-accounts', {
14+
jest.setMock('@topcoder-platform/tc-auth-lib', {
1515
decodeToken: () => 'User object',
1616
isTokenExpired: () => false,
1717
});

‎bin/www

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* Enables Babel for the server-side code (with exception of this very file). */
66
require('babel-register')({
77
ignore: [
8-
/node_modules\/(?!appirio-tech.*|topcoder|tc-)/,
8+
/node_modules\/(?!appirio-tech.*|topcoder|tc-|@topcoder)/,
99
/node_modules\/topcoder-react-utils/,
1010
],
1111
});

‎config/default.js

+10-14
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,6 @@ module.exports = {
7878
},
7979
},
8080

81-
/* Amount of time [seconds] before expiration of authentication tokens,
82-
* when the frontend will automatically trigger their refreshment. Once
83-
* ready, it will either write to the Redux store fresh token, or will
84-
* remove auth tokens from the store.
85-
* NOTE: With the current implementation of accounts-app this value must be
86-
* smaller than 60 seconds (earlier than 60 seconds before expiration of an
87-
* auth token, a call to the getFreshToken() method returns the old token,
88-
* due to caching). */
89-
REAUTH_TIME: 55,
90-
9181
/* API key for Segment.io. For development environment the value is set inside
9282
* development.json, for production environment it is set via CircleCI
9383
* variables. */
@@ -104,7 +94,7 @@ module.exports = {
10494
* platform. */
10595
URL: {
10696
/* Connector URL of the TC accounts App. */
107-
ACCOUNTS_APP_CONNECTOR: 'https://accounts.topcoder-dev.com/connector.html',
97+
ACCOUNTS_APP_CONNECTOR: 'https://accounts-auth0.topcoder-dev.com',
10898

10999
/* The remote address where the app is deployed. */
110100
APP: 'https://community-app.topcoder-dev.com',
@@ -114,7 +104,7 @@ module.exports = {
114104
COMMUNITY_APP: 'https://community-app.topcoder-dev.com',
115105

116106
ARENA: 'https://arena.topcoder-dev.com',
117-
AUTH: 'http://accounts.topcoder-dev.com',
107+
AUTH: 'https://accounts-auth0.topcoder-dev.com',
118108
BASE: 'https://www.topcoder-dev.com',
119109
HOME: '/my-dashboard',
120110
BLOG: 'https://www.topcoder-dev.com/blog',
@@ -129,6 +119,8 @@ module.exports = {
129119
BLOCKCHAIN: 'https://blockchain.topcoder-dev.com',
130120
COGNITIVE: 'https://cognitive.topcoder-dev.com',
131121
ZURICH: 'https://community-app.topcoder-dev.com/__community__/zurich',
122+
COMCAST: 'https://community-app.topcoder-dev.com/__community__/comcast',
123+
CS: 'https://community-app.topcoder-dev.com/__community__/cs',
132124
},
133125

134126
/* Dedicated section to group together links to various articles in
@@ -143,6 +135,9 @@ module.exports = {
143135
STUDIO_FONTS_POLICY:
144136
'http://help.topcoder.com/hc/en-us/articles/217959447-Font-Policy-for-Design-Challenges',
145137
TOPCODER_TERMS: 'https://www.topcoder.com/community/how-it-works/terms/',
138+
HOWTOCOMPETEINMARATHON: 'https://www.topcoder.com/thrive/articles/How%20To%20Compete%20in%20a%20Marathon%20Match',
139+
USABLECODEDEV: 'https://www.topcoder.com/thrive/articles/Usable%20Code%20in%20Dev%20Challenges',
140+
EXTENSIONVSCODE: 'https://marketplace.visualstudio.com/items?itemName=Topcoder.topcoder-workflow&ssr=false#overview',
146141
},
147142

148143
IOS: 'https://ios.topcoder-dev.com',
@@ -152,6 +147,7 @@ module.exports = {
152147
STUDIO: 'https://studio.topcoder-dev.com',
153148
TCO: 'https://www.topcoder.com/tco',
154149
TCO17: 'https://tco17.topcoder.com/',
150+
TCO19: 'https://community-app.topcoder-dev.com/__community__/tco19',
155151

156152
TOPGEAR: 'https://dev-topgear.wipro.com',
157153

@@ -384,8 +380,8 @@ module.exports = {
384380
],
385381
HEADER_MENU_THEME: 'light',
386382
HEADER_AUTH_URLS: {
387-
href: 'https://accounts.topcoder-dev.com/member/registration?utm_source=community-app-main',
388-
location: 'https://accounts.topcoder-dev.com/member?retUrl=%S&utm_source=community-app-main',
383+
href: 'https://accounts-auth0.topcoder-dev.com?utm_source=community-app-main',
384+
location: 'https://accounts-auth0.topcoder-dev.com?retUrl=%S&utm_source=community-app-main',
389385
},
390386
ACCOUNT_MENU: [
391387
{

‎config/jest/default.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const config = require('topcoder-react-utils/config/jest/default');
22
const nodeConfig = require('config');
33

4-
config.transformIgnorePatterns[0] = '/node_modules/(?!appirio-tech|topcoder|tc-)';
4+
config.transformIgnorePatterns[0] = '/node_modules/(?!appirio-tech|topcoder|tc-|@topcoder)';
55
// config.testMatch[0] = '**/__tests__/shared/containers/challenge-listing/FilterPanel.jsx';
66

77
// Include the directories whose tests has been written to minimize coverage time

‎config/production.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = {
2626
* as a more verbose name for the param. */
2727
COMMUNITY_APP: 'https://community-app.topcoder.com',
2828

29-
AUTH: 'https://accounts.topcoder.com',
29+
AUTH: 'https://accounts-auth0.topcoder.com',
3030
BASE: 'https://www.topcoder.com',
3131
HOME: '/my-dashboard',
3232
COMMUNITY: 'https://community.topcoder.com',
@@ -39,8 +39,9 @@ module.exports = {
3939
IOS: 'https://ios.topcoder.com',
4040

4141
/* Connector URL of the TC accounts App. */
42-
ACCOUNTS_APP_CONNECTOR: 'https://accounts.topcoder.com/connector.html',
42+
ACCOUNTS_APP_CONNECTOR: 'https://accounts-auth0.topcoder.com/',
4343
TCO17: 'https://tco17.topcoder.com/',
44+
TCO19: 'https://tco19.topcoder.com/',
4445

4546
TOPGEAR: 'https://topgear-app.wipro.com',
4647

@@ -50,6 +51,8 @@ module.exports = {
5051
BLOCKCHAIN: 'https://blockchain.topcoder.com',
5152
COGNITIVE: 'https://cognitive.topcoder.com',
5253
ZURICH: 'https://zurich.topcoder.com',
54+
COMCAST: 'https://comcast.topcoder.com',
55+
CS: 'https://cs.topcoder.com',
5356
},
5457
EMAIL_VERIFY_URL: 'http://www.topcoder.com/settings/account/changeEmail',
5558
},
@@ -184,8 +187,8 @@ module.exports = {
184187
],
185188
HEADER_MENU_THEME: 'light',
186189
HEADER_AUTH_URLS: {
187-
href: 'https://accounts.topcoder.com/member/registration?utm_source=community-app-main',
188-
location: 'https://accounts.topcoder.com/member?retUrl=%S&utm_source=community-app-main',
190+
href: 'https://accounts-auth0.topcoder.com?utm_source=community-app-main',
191+
location: 'https://accounts-auth0.topcoder.com?retUrl=%S&utm_source=community-app-main',
189192
},
190193
ACCOUNT_MENU: [
191194
{

‎config/webpack/development.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const standardDevelopmentConfig = configFactory({
1717

1818
const jsxRule = standardDevelopmentConfig.module.rules.find(rule => rule.loader === 'babel-loader');
1919
jsxRule.exclude = [
20-
/node_modules[\\/](?!appirio-tech.*|topcoder|tc-)/,
20+
/node_modules[\\/](?!appirio-tech.*|topcoder|tc-|@topcoder)/,
2121
/src[\\/]assets[\\/]fonts/,
2222
/src[\\/]assets[\\/]images[\\/]dashboard/,
2323
];

‎config/webpack/production.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const standardDevelopmentConfig = configFactory({
2424

2525
const jsxRule = standardDevelopmentConfig.module.rules.find(rule => rule.loader === 'babel-loader');
2626
jsxRule.exclude = [
27-
/node_modules[\\/](?!appirio-tech.*|topcoder|tc-)/,
27+
/node_modules[\\/](?!appirio-tech.*|topcoder|tc-|@topcoder)/,
2828
/src[\\/]assets[\\/]fonts/,
2929
/src[\\/]assets[\\/]images[\\/]dashboard/,
3030
];

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
},
3838
"dependencies": {
3939
"@hapi/joi": "^16.1.4",
40+
"@topcoder-platform/tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.1",
4041
"aos": "^2.3.4",
4142
"atob": "^2.1.1",
4243
"babel-register": "^6.26.0",
@@ -140,10 +141,9 @@
140141
"showdown": "^1.8.6",
141142
"slick-carousel": "^1.8.1",
142143
"supertest": "^3.1.0",
143-
"tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
144144
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
145145
"tc-ui": "^1.0.12",
146-
"topcoder-react-lib": "1.0.8",
146+
"topcoder-react-lib": "1.1.1",
147147
"topcoder-react-ui-kit": "2.0.1",
148148
"topcoder-react-utils": "0.7.8",
149149
"turndown": "^4.0.2",

0 commit comments

Comments
 (0)