Skip to content

Commit abe59cd

Browse files
committed
Merge branch 'dev' of github.com:topcoder-platform/platform-ui into TSJR-314_skill-manager_landing-page
2 parents 3c1fbb7 + 0ef2d21 commit abe59cd

File tree

139 files changed

+4186
-44
lines changed

Some content is hidden

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

139 files changed

+4186
-44
lines changed

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ end_of_line = lf
1010
charset = utf-8
1111
trim_trailing_whitespace = true
1212
insert_final_newline = true
13+
quote_type = single

.prettierrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"semi": false
3+
}

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"editor.defaultFormatter": "esbenp.prettier-vscode",
3+
"prettier.requireConfig": true,
4+
"editor.formatOnSave": false
5+
}

craco.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ module.exports = {
4343
'@gamificationAdmin': resolve('src/apps/gamification-admin/src'),
4444
'@talentSearch': resolve('src/apps/talent-search/src'),
4545
'@profiles': resolve('src/apps/profiles/src'),
46+
'@wallet': resolve('src/apps/wallet/src'),
4647

4748
'@platform': resolve('src/apps/platform/src'),
4849
// aliases used in SCSS files

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"@storybook/react": "^7.0.5",
3131
"@stripe/react-stripe-js": "1.13.0",
3232
"@stripe/stripe-js": "1.41.0",
33+
"@tanstack/react-table": "^8.11.7",
3334
"@types/testing-library__jest-dom": "^5.14.5",
3435
"apexcharts": "^3.36.0",
3536
"axios": "^1.1.2",
@@ -85,6 +86,7 @@
8586
"react-helmet": "^6.1.0",
8687
"react-html-parser": "^2.0.2",
8788
"react-markdown": "8.0.6",
89+
"react-otp-input": "^3.1.1",
8890
"react-popper": "^2.3.0",
8991
"react-redux": "^8.0.4",
9092
"react-redux-toastr": "^7.6.10",

src/apps/platform/src/platform.routes.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ import { talentSearchRoutes } from '~/apps/talent-search'
1010
import { accountsRoutes } from '~/apps/accounts'
1111
import { onboardingRoutes } from '~/apps/onboarding'
1212
import { adminRoutes } from '~/apps/admin'
13+
import { walletRoutes } from '~/apps/wallet'
1314

14-
const Home: LazyLoadedComponent = lazyLoad(() => import('./routes/home'), 'HomePage')
15+
const Home: LazyLoadedComponent = lazyLoad(
16+
() => import('./routes/home'),
17+
'HomePage',
18+
)
1519

1620
const homeRoutes: ReadonlyArray<PlatformRoute> = [
1721
{
@@ -33,6 +37,7 @@ export const platformRoutes: Array<PlatformRoute> = [
3337
...gamificationAdminRoutes,
3438
...talentSearchRoutes,
3539
...profilesRoutes,
40+
...walletRoutes,
3641
...accountsRoutes,
3742
...adminRoutes,
3843
...homeRoutes,

src/apps/wallet/.prettierrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"semi": false,
3+
"trailingComma": "all",
4+
"jsxSingleQuote": true,
5+
"jsxBracketSameLine": true,
6+
"printWidth": 120
7+
}

src/apps/wallet/README.md

Whitespace-only changes.

src/apps/wallet/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './src'

src/apps/wallet/src/WalletApp.tsx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { FC, useContext } from 'react'
2+
import { Outlet, Routes } from 'react-router-dom'
3+
4+
import { routerContext, RouterContextData } from '~/libs/core'
5+
6+
import { toolTitle } from './wallet.routes'
7+
import { WalletSwr } from './lib'
8+
9+
const AccountsApp: FC<{}> = () => {
10+
const { getChildRoutes }: RouterContextData = useContext(routerContext)
11+
12+
return (
13+
<WalletSwr>
14+
<Outlet />
15+
<Routes>{getChildRoutes(toolTitle)}</Routes>
16+
</WalletSwr>
17+
)
18+
}
19+
20+
export default AccountsApp

0 commit comments

Comments
 (0)