Skip to content

Commit cf058fc

Browse files
Merge branch 'qa' into PROD-1532_upgrade_node_version
2 parents 1c1c80c + d39dcf7 commit cf058fc

File tree

413 files changed

+9842
-5915
lines changed

Some content is hidden

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

413 files changed

+9842
-5915
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ workflows:
7575
filters:
7676
branches:
7777
only:
78-
- develop
78+
# - develop
79+
- qa
7980

8081
# Production builds are exectuted only on tagged commits to the
8182
# master branch.

babel.config.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,18 @@ module.exports = function (api) {
2626
generateScopedName,
2727
},
2828
],
29-
"inline-react-svg",
29+
[
30+
"inline-react-svg",
31+
{
32+
"svgo": {
33+
"plugins": [
34+
{
35+
"cleanupIDs": false
36+
}
37+
]
38+
}
39+
}
40+
],
3041
],
3142
env: {
3243
test: {

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
"@testing-library/jest-dom": "^5.5.0",
2828
"@testing-library/react": "^9.4.0",
2929
"@types/jest": "^25.2.3",
30+
"@types/lodash": "^4.14.182",
3031
"@types/node": "^17.0.24",
32+
"@types/reach__router": "^1.3.10",
3133
"@types/react": "^18.0.5",
3234
"@types/react-dom": "^18.0.1",
3335
"@types/react-redux-toastr": "^7.6.2",

src-ts/App.tsx

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import { FC, ReactElement, useContext } from 'react'
2+
import { Routes } from 'react-router-dom'
3+
import { toast, ToastContainer } from 'react-toastify'
4+
5+
import { Header } from './header'
6+
import { routeContext, RouteContextData } from './lib'
7+
8+
const App: FC<{}> = () => {
9+
10+
const { allRoutes, getRouteElement }: RouteContextData = useContext(routeContext)
11+
12+
const routeElements: Array<ReactElement> = allRoutes
13+
.map(route => getRouteElement(route))
14+
15+
return (
16+
<>
17+
<Header />
18+
<Routes>
19+
{routeElements}
20+
</Routes >
21+
<ToastContainer
22+
position={toast.POSITION.TOP_RIGHT}
23+
autoClose={3000}
24+
hideProgressBar={false}
25+
newestOnTop
26+
closeOnClick
27+
rtl={false}
28+
pauseOnFocusLoss
29+
draggable
30+
pauseOnHover
31+
/>
32+
</>
33+
)
34+
}
35+
36+
export default App

src-ts/config/constants.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
export enum ToolTitle {
2-
designLib = 'Design Library',
3-
settings = 'Profile Settings',
2+
settings = 'Account Settings',
43
work = 'Work',
54
}
5+
6+
export enum FooterSocialConfig {
7+
facebook = 'https://www.facebook.com/topcoder',
8+
youtube = 'https://www.youtube.com/channel/UCFv29ANLT2FQmtvS9DRixNA',
9+
linkedin = 'https://www.linkedin.com/company/topcoder',
10+
twitter = 'https://twitter.com/topcoder',
11+
instagram = 'https://www.instagram.com/topcoder',
12+
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ import { EnvironmentConfigProd } from './environment.prod.config'
88

99
function getEnvironmentConfig(): GlobalConfig {
1010

11-
// switch (process.env.REACT_APP_HOST_ENV) {
12-
// TODO: allow the use of a separate
13-
// process var (REACT_APP_HOST_ENV)
14-
// so that we can have more than just local/dev/prod
1511
switch (process.env.APPENV) {
1612

1713
case AppHostEnvironment.bsouza:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import { AppHostEnvironment } from './app-host-environment.enum'
44

55
export const EnvironmentConfigDefault: GlobalConfig = {
66
API: {
7+
FORUM_ACCESS_TOKEN: 'va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV',
8+
FORUM_V2: 'https://vanilla.topcoder-dev.com/api/v2',
79
V3: 'https://api.topcoder-dev.com/v3',
810
V5: 'https://api.topcoder-dev.com/v5',
911
},
1012
ENV: AppHostEnvironment.default,
1113
LOGGING: {
1214
PUBLIC_TOKEN: 'puba0825671e469d16f940c5a30dc738f11',
13-
SERVICE: 'platform-ui',
15+
SERVICE: 'mfe-customer-work',
1416
},
1517
REAUTH_OFFSET: 55,
1618
TAG_MANAGER_ID: undefined,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { EnvironmentConfigDefault } from './environment.default.config'
77
export const EnvironmentConfigProd: GlobalConfig = {
88
...EnvironmentConfigDefault,
99
API: {
10+
FORUM_V2: 'https://vanilla.topcoder.com/api/v2',
1011
V3: 'https://api.topcoder.com/v3',
1112
V5: 'https://api.topcoder.com/v5',
1213
},

src-ts/declarations.d.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,17 @@ declare module '*.scss' {
88
export = scssFile
99
}
1010

11-
declare module 'tc-auth-lib'
11+
declare module '*.svg' {
12+
import * as React from 'react'
13+
14+
export const ReactComponent: React.FunctionComponent<React.SVGProps<
15+
SVGSVGElement
16+
> & { title?: string }>
17+
18+
const src: string
19+
export default src
20+
}
1221

1322
declare module '@topcoder/mfe-header'
1423

15-
declare module 'react-redux-toastr'
24+
declare module 'tc-auth-lib'

src-ts/header/Header.module.scss

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
@import '../lib/styles/includes';
2+
3+
.header-wrap {
4+
display: block;
5+
background-color: $tc-black;
6+
}
7+
8+
.header {
9+
display: grid;
10+
height: $header-height;
11+
align-items: center;
12+
width: 100%;
13+
margin: 0 auto;
14+
max-width: $xxl-min;
15+
@include pagePaddings;
16+
grid-template-columns: 78px 1fr auto;
17+
18+
@include ltemd {
19+
grid-template-columns: $header-height 1fr $header-height;
20+
align-items: center;
21+
}
22+
}
23+
24+
.subheader {
25+
width: 100%;
26+
position: relative;
27+
}

0 commit comments

Comments
 (0)