Skip to content

Commit 91493ee

Browse files
authored
Merge pull request #554 from topcoder-platform/dev
3.0 TCA Certifications - 2023-03-01 -> master
2 parents 1b00073 + 04acd1f commit 91493ee

File tree

378 files changed

+8438
-2825
lines changed

Some content is hidden

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

378 files changed

+8438
-2825
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ By overriding the app to use <b>port 443</b>, you can use the authorized URL and
153153

154154
>**NOTE:** Mac users will require running the app with elevated permissions in order to use a port lower than 500.
155155
156+
Easy way to overcome elevated permissions is to make use of:
157+
158+
```
159+
sudo setcap 'cap_net_bind_service=+ep' `which node`
160+
```
161+
156162
For easier development, it is recommended that you add this certificate to your trusted root authorities and as a trused cert in your browser. Google your browser and OS for more info on how to trust cert authorities.
157163

158164
Otherwise, you will need to override the exception each time you load the site. Firefox users may need to user an incognito browser in order to override the exception.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@topcoder-platform/platform-ui",
3-
"version": "2.0.7",
3+
"version": "3.0.0",
44
"private": true,
55
"scripts": {
66
"dev": "yarn react-app-rewired start",
@@ -42,6 +42,7 @@
4242
"moment": "^2.29.4",
4343
"moment-timezone": "^0.5.37",
4444
"prop-types": "^15.8.1",
45+
"qrcode.react": "^3.1.0",
4546
"qs": "^6.11.0",
4647
"rc-checkbox": "^2.3.2",
4748
"react": "^18.2.0",

src-ts/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ module.exports = {
7373
],
7474
'complexity': [
7575
'error',
76-
11
76+
14
7777
],
7878
'import/extensions': 'off',
7979
'import/no-named-default': 'off',

src-ts/App.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Routes } from 'react-router-dom'
33
import { toast, ToastContainer } from 'react-toastify'
44

55
import { Header } from './header'
6-
import { routeContext, RouteContextData } from './lib'
6+
import { routeContext, RouteContextData, useViewportUnitsFix } from './lib'
77

88
const App: FC<{}> = () => {
99

@@ -12,6 +12,8 @@ const App: FC<{}> = () => {
1212
const routeElements: Array<ReactElement> = allRoutes
1313
.map(route => getRouteElement(route))
1414

15+
useViewportUnitsFix()
16+
1517
return (
1618
<>
1719
<Header />

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { EnvironmentConfigModel } from './environment-config.model'
33

44
const COMMUNITY_WEBSITE: string = 'https://www.topcoder-dev.com'
5+
const TCA_WEBSITE: string = 'https://platform-ui.topcoder-dev.com'
56

67
export const EnvironmentConfigDefault: EnvironmentConfigModel = {
78
ANALYTICS: {
@@ -36,11 +37,13 @@ export const EnvironmentConfigDefault: EnvironmentConfigModel = {
3637
'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJ0ZXN0MSIsImV4cCI6MjU2MzA3NjY4OSwidXNlcklkIjoiNDAwNTEzMzMiLCJpYXQiOjE0NjMwNzYwODksImVtYWlsIjoidGVzdEB0b3Bjb2Rlci5jb20iLCJqdGkiOiJiMzNiNzdjZC1iNTJlLTQwZmUtODM3ZS1iZWI4ZTBhZTZhNGEifQ.jl6Lp_friVNwEP8nfsfmL-vrQFzOFp2IfM_HC7AwGcg',
3738
},
3839
TOPCODER_URLS: {
40+
ACCOUNT_PROFILE: `${COMMUNITY_WEBSITE}/settings/profile`,
3941
ACCOUNT_SETTINGS: `${COMMUNITY_WEBSITE}/settings/account`,
4042
API_BASE: `${COMMUNITY_WEBSITE}/api`,
4143
BLOG_PAGE: `${COMMUNITY_WEBSITE}/blog`,
4244
CHALLENGES_PAGE: `${COMMUNITY_WEBSITE}/challenges`,
4345
GIGS_PAGE: `${COMMUNITY_WEBSITE}/gigs`,
46+
TCA: `${TCA_WEBSITE}`,
4447
THRIVE_PAGE: `${COMMUNITY_WEBSITE}/thrive`,
4548
USER_PROFILE: `${COMMUNITY_WEBSITE}/members`,
4649
WP_CONTENT: `${COMMUNITY_WEBSITE}/wp-content`,

src-ts/config/environments/environment.prod.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { EnvironmentConfigModel } from './environment-config.model'
33
import { EnvironmentConfigDefault } from './environment.default.config'
44

55
const COMMUNITY_WEBSITE: string = 'https://www.topcoder.com'
6+
const TCA_WEBSITE: string = 'https://platform-ui.topcoder.com'
67

78
export const EnvironmentConfigProd: EnvironmentConfigModel = {
89
...EnvironmentConfigDefault,
@@ -34,11 +35,13 @@ export const EnvironmentConfigProd: EnvironmentConfigModel = {
3435
'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJ0ZXN0MSIsImV4cCI6MjU2MzA3NjY4OSwidXNlcklkIjoiNDAwNTEzMzMiLCJpYXQiOjE0NjMwNzYwODksImVtYWlsIjoidGVzdEB0b3Bjb2Rlci5jb20iLCJqdGkiOiJiMzNiNzdjZC1iNTJlLTQwZmUtODM3ZS1iZWI4ZTBhZTZhNGEifQ.jl6Lp_friVNwEP8nfsfmL-vrQFzOFp2IfM_HC7AwGcg',
3536
},
3637
TOPCODER_URLS: {
38+
ACCOUNT_PROFILE: `${COMMUNITY_WEBSITE}/settings/profile`,
3739
ACCOUNT_SETTINGS: `${COMMUNITY_WEBSITE}/settings/account`,
3840
API_BASE: `${COMMUNITY_WEBSITE}/api`,
3941
BLOG_PAGE: `${COMMUNITY_WEBSITE}/blog`,
4042
CHALLENGES_PAGE: `${COMMUNITY_WEBSITE}/challenges`,
4143
GIGS_PAGE: `${COMMUNITY_WEBSITE}/gigs`,
44+
TCA: `${TCA_WEBSITE}`,
4245
THRIVE_PAGE: `${COMMUNITY_WEBSITE}/thrive`,
4346
USER_PROFILE: `${COMMUNITY_WEBSITE}/members`,
4447
WP_CONTENT: `${COMMUNITY_WEBSITE}/wp-content`,

src-ts/header/Header.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ const Header: FC = () => {
145145

146146
return (
147147
<>
148-
<div id={navElementId} />
149148
<div
150149
id={PageSubheaderPortalId}
151150
className={classNames('full-width-relative', !ready && 'hidden')}

src-ts/lib/breadcrumb/Breadcrumb.module.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@
3838
display: inline-flex;
3939
align-items: center;
4040
padding: 0;
41-
41+
@include ltesm {
42+
flex: 0 1 auto;
43+
&:first-child {
44+
flex: 1 0 auto;
45+
}
46+
}
4247
a {
4348
@extend .overline;
4449
display: block;

src-ts/lib/button/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IconOutline } from '../svgs'
88
import '../styles/index.scss'
99

1010
export type ButtonSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl'
11-
export type ButtonStyle = 'icon' | 'icon-bordered' | 'link' | 'primary' | 'secondary' | 'tertiary' | 'text'
11+
export type ButtonStyle = 'icon' | 'icon-bordered' | 'link' | 'primary' | 'secondary' | 'tertiary' | 'text' | 'outline'
1212
export type ButtonType = 'button' | 'submit'
1313

1414
export interface ButtonProps {
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/* eslint-disable max-len */
2+
import { FC } from 'react'
3+
4+
const DefaultMemberIcon: FC = () => (
5+
<svg
6+
xmlns='http://www.w3.org/2000/svg'
7+
xmlnsXlink='http://www.w3.org/1999/xlink'
8+
width='141'
9+
height='141'
10+
viewBox='0 0 141 141'
11+
>
12+
<defs>
13+
<rect
14+
id='path-1'
15+
width='140'
16+
height='140'
17+
x='0.8'
18+
y='0.5'
19+
rx='306'
20+
/>
21+
</defs>
22+
<g fill='none' fillRule='evenodd' stroke='none' strokeWidth='1'>
23+
<g transform='translate(-205 -203) translate(205 203)'>
24+
<mask id='mask-2' fill='#fff'>
25+
<use xlinkHref='#path-1' />
26+
</mask>
27+
<use fill='#F0F0F0' xlinkHref='#path-1' />
28+
<path
29+
fill='#A3A3AE'
30+
stroke='#A3A3AE'
31+
strokeWidth='3'
32+
d='M118 137.143c0 4.345-3.501 7.857-7.833 7.857H31.833C27.51 145 24 141.488 24 137.143c0-15.714 15.142-30.376 30.62-36.174-8.937-5.54-14.953-15.377-14.953-26.683v-7.857C39.667 49.072 53.697 35 71 35c17.304 0 31.333 14.072 31.333 31.429v7.857c0 11.306-6.016 21.143-14.946 26.683 15.471 5.798 30.613 20.46 30.613 36.174h0z'
33+
mask='url(#mask-2)'
34+
opacity='0.2'
35+
/>
36+
</g>
37+
</g>
38+
</svg>
39+
)
40+
41+
export default DefaultMemberIcon

0 commit comments

Comments
 (0)