Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.

Commit e072483

Browse files
authored
Merge branch 'develop' into dependabot/npm_and_yarn/terser-4.8.1
2 parents 7d53af8 + ff4c1fb commit e072483

153 files changed

Lines changed: 13250 additions & 638 deletions

File tree

Some content is hidden

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

.env.example

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ REACT_APP_API_AMAZON_COGNITO=https://abc123.auth.your-region.amazoncognito.com/o
1515
REACT_APP_COGNITO_REDIRECT_URI=https://abc123.api.your-region.amazonaws.com/dev/auth/login_social
1616
REACT_APP_COGNITO_CLIENTID=your-cognito-client-id
1717
REACT_APP_API_LOGOUT_SOCIAL=https://auth.com/logout?client_id=123
18-
REACT_APP_GITHUB_IDENTITY_PROVIDER=ProviderName
18+
REACT_APP_GITHUB_IDENTITY_PROVIDER=ProviderName
19+
REACT_APP_FEEDBACK_SLACK=https://abc123.api.your-region.amazonaws.com/dev/webhook/client-feedback
20+
REACT_APP_PRESIGN_URL_UPLOAD_FEEDBACK_IMAGE=https://abc123.api.your-region.amazonaws.com/devdaitabeapp/feedback/presign_url_image
21+
REACT_APP_CREATE_PROJECT_SAMPLE=https://abc123.api.your-region.amazonaws.com

package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "daita-interface",
3-
"version": "0.1.0",
3+
"version": "1.1.0",
44
"private": true,
55
"description": "React-based user interface for the DAITA platform.",
66
"author": "DAITA Technologies",
@@ -44,13 +44,15 @@
4444
"@types/crypto-js": "^4.0.2",
4545
"@types/file-saver": "^2.0.4",
4646
"@types/lodash": "^4.14.177",
47-
"@types/node": "^12.20.14",
47+
"@types/node": "17.0.29",
4848
"@types/react": "^17.0.9",
4949
"@types/react-dom": "^17.0.6",
5050
"@types/react-google-recaptcha": "^2.1.3",
5151
"@types/react-helmet": "^6.1.5",
5252
"@types/react-router-dom": "^5.1.7",
5353
"@types/react-virtualized": "^9.21.15",
54+
"@types/react-window": "^1.8.5",
55+
"@types/uuid": "^8.3.4",
5456
"axios": "^0.21.1",
5557
"axios-middleware": "^0.3.1",
5658
"chart.js": "^3.7.1",
@@ -61,28 +63,34 @@
6163
"history": "^4.10.1",
6264
"js-base64": "^3.7.2",
6365
"jszip": "^3.9.1",
66+
"konva": "^8.3.10",
6467
"lodash": "^4.17.21",
6568
"moment": "^2.29.2",
69+
"p-limit": "^4.0.0",
6670
"react": "^17.0.2",
6771
"react-chartjs-2": "^4.1.0",
72+
"react-colorful": "^5.6.1",
6873
"react-dom": "^17.0.2",
6974
"react-dropzone": "^11.4.2",
7075
"react-google-recaptcha": "^2.1.0",
7176
"react-helmet": "^6.1.0",
7277
"react-hook-form": "^7.9.0",
7378
"react-infinite-scroll-component": "^6.1.0",
79+
"react-konva": "17.0.2-6",
7480
"react-markdown": "^8.0.3",
7581
"react-redux": "^7.2.4",
7682
"react-router-dom": "^5.2.0",
7783
"react-scripts": "4.0.3",
7884
"react-toastify": "^8.1.0",
7985
"react-virtualized": "^9.22.3",
86+
"react-window": "^1.8.7",
8087
"redux": "^4.1.0",
8188
"redux-devtools-extension": "^2.13.9",
8289
"redux-saga": "^1.1.3",
8390
"styled-components": "^5.3.1",
8491
"typescript": "^4.3.2",
85-
"uuid": "^8.3.2"
92+
"use-image": "^1.0.12",
93+
"uuid": "^9.0.0"
8694
},
8795
"devDependencies": {
8896
"@typescript-eslint/eslint-plugin": "^5.4.0",
@@ -105,18 +113,11 @@
105113
"react-app/jest"
106114
]
107115
},
108-
"browserslist": {
109-
"production": [
110-
">0.2%",
111-
"not dead",
112-
"not op_mini all"
113-
],
114-
"development": [
115-
"last 1 chrome version",
116-
"last 1 firefox version",
117-
"last 1 safari version"
118-
]
119-
},
116+
"browserslist": [
117+
">0.2%",
118+
"not dead",
119+
"not op_mini all"
120+
],
120121
"engines": {
121122
"node": ">=14.17.5",
122123
"npm": ">=6.14.14"
938 Bytes
Loading
Lines changed: 109 additions & 0 deletions
Loading

src/App.tsx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { Box } from "@mui/material";
22
import { Layout, PageLoading, ScrollToTop } from "components";
3+
import EmptyLayout from "components/Layout/EmptyLayout";
34
import GuestLayout from "components/Layout/GuestLayout";
45
import routeConfig, {
56
customLayoutRouteConfig,
67
CustomRoute,
8+
emptyLayoutRouteConfig,
79
} from "config/routeConfig";
810
import { TOKEN_NAME } from "constants/defaultValues";
911
import { Redirect, Route, Router, Switch } from "react-router-dom";
@@ -59,6 +61,23 @@ Apply here: contact@daita.tech
5961
</Switch>
6062
</GuestLayout>
6163
</Route>
64+
<Route path={emptyLayoutRouteConfig.map((t) => t.path)}>
65+
<EmptyLayout>
66+
<Switch>
67+
{emptyLayoutRouteConfig.map(
68+
({ path, exact, component, isPrivate }) => (
69+
<CustomRoute
70+
key={`route-${path}`}
71+
path={path}
72+
exact={exact}
73+
component={component}
74+
isPrivate={isPrivate}
75+
/>
76+
)
77+
)}
78+
</Switch>
79+
</EmptyLayout>
80+
</Route>
6281
<Route path={routeConfig.map((t) => t.path)}>
6382
<Layout>
6483
<Switch>

0 commit comments

Comments
 (0)