Skip to content

Commit 4152a3b

Browse files
testflyjetstestflyjets
authored
Merge pull request #621 from topcoder-platform/dev
v3.2 May Release
2 parents 901729d + 37dd8c9 commit 4152a3b

File tree

71 files changed

+649
-401
lines changed

Some content is hidden

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

71 files changed

+649
-401
lines changed

‎config/dev.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
module.exports = {
2+
TC_DOMAIN: 'topcoder-dev.com',
23
/**
34
* URL of Topcoder Community Website
45
*/
56
TOPCODER_COMMUNITY_WEBSITE_URL: "https://topcoder-dev.com",
67
TERMS_URL:
78
"https://www.topcoder-dev.com/challenges/terms/detail/317cd8f9-d66c-4f2a-8774-63c612d99cd4",
89
PRIVACY_POLICY_URL: "https://www.topcoder-dev.com/policy",
9-
SIGN_IN_URL: `https://accounts-auth0.topcoder-dev.com/?retUrl=https%3A%2F%2Fplatform-ui.topcoder-dev.com%2Fself-service%2Fwizard&regSource=selfService`,
10-
SIGN_UP_URL: `https://accounts-auth0.topcoder-dev.com/?retUrl=https%3A%2F%2Fplatform-ui.topcoder-dev.com%2Fself-service%2Fwizard&regSource=selfService&mode=signUp`,
10+
SIGN_IN_URL: `https://accounts-auth0.topcoder-dev.com/?retUrl=https%3A%2F%2Fwork.topcoder-dev.com%2Fself-service%2Fwizard&regSource=selfService`,
11+
SIGN_UP_URL: `https://accounts-auth0.topcoder-dev.com/?retUrl=https%3A%2F%2Fwork.topcoder-dev.com%2Fself-service%2Fwizard&regSource=selfService&mode=signUp`,
1112
/**
1213
* URL of Topcoder Connect Website
1314
*/

‎config/prod.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
module.exports = {
2+
TC_DOMAIN: 'topcoder.com',
23
/**
34
* URL of Topcoder Community Website
45
*/
56
TOPCODER_COMMUNITY_WEBSITE_URL: "https://topcoder.com",
67
TERMS_URL:
78
"https://www.topcoder.com/challenges/terms/detail/564a981e-6840-4a5c-894e-d5ad22e9cd6f",
89
PRIVACY_POLICY_URL: "https://www.topcoder.com/policy",
9-
SIGN_IN_URL: `https://accounts-auth0.topcoder.com/?retUrl=https%3A%2F%2Fplatform-ui.topcoder.com%2Fself-service%2Fwizard&regSource=selfService`,
10-
SIGN_UP_URL: `https://accounts-auth0.topcoder.com/?retUrl=https%3A%2F%2Fplatform-ui.topcoder.com%2Fself-service%2Fwizard&regSource=selfService&mode=signUp`,
10+
SIGN_IN_URL: `https://accounts-auth0.topcoder.com/?retUrl=https%3A%2F%2Fwork.topcoder.com%2Fself-service%2Fwizard&regSource=selfService`,
11+
SIGN_UP_URL: `https://accounts-auth0.topcoder.com/?retUrl=https%3A%2F%2Fwork.topcoder.com%2Fself-service%2Fwizard&regSource=selfService&mode=signUp`,
1112

1213
/**
1314
* URL of Topcoder Connect Website

‎src-ts/config/constants.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
export enum AppSubdomain {
2+
dev = 'devcenter',
3+
game = 'gamification-admin',
4+
tca = 'academy',
5+
work = 'work',
6+
}
7+
18
export enum ToolTitle {
29
dev = 'Dev Center',
310
game = 'Gamification Admin',

‎src-ts/config/environments/environment-config.model.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ import { AppHostEnvironmentType } from './app-host-environment.type'
55
export interface EnvironmentConfigModel extends GlobalConfig {
66
// override the ENV var to require that it's defined in the type
77
ENV: AppHostEnvironmentType,
8+
9+
SUBDOMAIN: string,
810
}

‎src-ts/config/environments/environment.default.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export const EnvironmentConfigDefault: EnvironmentConfigModel = {
2525
SERVICE: 'platform-ui',
2626
},
2727
MEMBER_VERIFY_LOOKER: 3322,
28+
REACT_APP_ENABLE_EMSI_SKILLS: process.env.REACT_APP_ENABLE_EMSI_SKILLS as unknown as boolean || false,
2829
REACT_APP_ENABLE_TCA_CERT_MONETIZATION: process.env.REACT_APP_ENABLE_TCA_CERT_MONETIZATION as unknown as boolean || false,
2930
REAUTH_OFFSET: 55,
3031
SPRIG: {
@@ -39,6 +40,7 @@ export const EnvironmentConfigDefault: EnvironmentConfigModel = {
3940
CUSTOMER_TOKEN:
4041
'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJ0ZXN0MSIsImV4cCI6MjU2MzA3NjY4OSwidXNlcklkIjoiNDAwNTEzMzMiLCJpYXQiOjE0NjMwNzYwODksImVtYWlsIjoidGVzdEB0b3Bjb2Rlci5jb20iLCJqdGkiOiJiMzNiNzdjZC1iNTJlLTQwZmUtODM3ZS1iZWI4ZTBhZTZhNGEifQ.jl6Lp_friVNwEP8nfsfmL-vrQFzOFp2IfM_HC7AwGcg',
4142
},
43+
SUBDOMAIN: window.location.hostname.split('.')[0],
4244
TOPCODER_URLS: {
4345
ACCOUNT_PROFILE: `${COMMUNITY_WEBSITE}/settings/profile`,
4446
ACCOUNT_SETTINGS: `${COMMUNITY_WEBSITE}/settings/account`,

‎src-ts/lib/breadcrumb/breadcrumb-item/BreadcrumbItem.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const BreadcrumbItem: FC<BreadcrumbItemProps> = (props: BreadcrumbItemProps) =>
2626
<Link
2727
className={classNames(props.item.isElipsis && styles.elipsis)}
2828
to={props.item.url}
29+
state={props.item.state}
2930
>
3031
{props.item.name}
3132
</Link>

‎src-ts/lib/breadcrumb/breadcrumb-item/breadcrumb-item.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ export interface BreadcrumbItemModel {
33
name: string
44
onClick?: (item: BreadcrumbItemModel) => void
55
url: string
6+
state?: any
67
}

‎src-ts/lib/global-config.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@ export interface GlobalConfig {
4646
}
4747
MEMBER_VERIFY_LOOKER: number,
4848
REACT_APP_ENABLE_TCA_CERT_MONETIZATION: boolean
49+
REACT_APP_ENABLE_EMSI_SKILLS: boolean
4950
}

‎src-ts/lib/route-provider/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ export * from './route-context-data.model'
44
export { default as routeContext } from './route.context'
55
export * from './route.provider'
66
export * from './router.utils'
7+
export * from './rewrite'

‎src-ts/lib/route-provider/platform-route.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export interface PlatformRoute {
2+
domain?: string
23
alternativePaths?: Array<string>
34
authRequired?: boolean
45
children?: Array<PlatformRoute>

0 commit comments

Comments
 (0)