Skip to content

Commit 8657210

Browse files
harikiranrommalaHari KiranMarSH-Up
authored
Webpage building (#3)
* Webpage building * [Fix][Remove package-lock * [Fix][Validation] * [Fix][Validation] * [Fix][Validation] * [Fix][Validation] * [Fix][Validation] * [Fix][Code]Structure update * [Fix][Code]Structure update * [Fix][Code]Structure update * [Fix][Slice]Return setLoading * [Fix][Slice]Return setLoading * [Fix][Slice]Return setLoading --------- Co-authored-by: Hari Kiran <[email protected]> Co-authored-by: MarSHub <[email protected]>
1 parent 952afb4 commit 8657210

25 files changed

+4253
-3031
lines changed

.github/workflows/node.js.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/validate.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
name: Validate NeuroJson_io Project
22

33
on:
4-
push:
5-
branches:
6-
- dev
7-
- main
84
pull_request:
95
branches:
10-
- dev
11-
- main
6+
- "*"
127

138
jobs:
149
validate:
@@ -21,16 +16,13 @@ jobs:
2116
- name: Set up Node.js
2217
uses: actions/setup-node@v3
2318
with:
24-
node-version: '18'
19+
node-version: "18"
2520

2621
- name: Install dependencies
2722
run: yarn install
2823

2924
- name: Compile TypeScript
3025
run: yarn build
3126

32-
- name: Run Linter
33-
run: yarn lint
34-
3527
- name: Run Security Audit
3628
run: yarn audit --level moderate

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.env
22
node_modules
33
.DS_Store
4+
package-lock.json

build/asset-manifest.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

build/index.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/static/js/main.44f93a4f.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

build/static/js/main.44f93a4f.js.LICENSE.txt

Lines changed: 0 additions & 116 deletions
This file was deleted.

build/static/js/main.44f93a4f.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222
"query-string": "^8.1.0",
2323
"react": "^18.2.0",
2424
"react-dom": "^18.2.0",
25+
"react-json-view": "^1.21.3",
2526
"react-redux": "^8.1.2",
2627
"react-router-dom": "^6.15.0",
27-
"react-scripts": "5.0.1",
28+
"react-scripts": "^5.0.1",
2829
"three": "^0.169.0",
2930
"typescript": "^5.1.6",
3031
"web-vitals": "^2.1.0"
@@ -62,5 +63,9 @@
6263
"last 1 firefox version",
6364
"last 1 safari version"
6465
]
66+
},
67+
"resolutions": {
68+
"postcss": "^8.4.31",
69+
"nth-check": "^2.0.1"
6570
}
6671
}

src/components/Routes.tsx

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,33 @@
1+
import React from "react";
12
import FullScreen from "design/Layouts/FullScreen";
23
import Home from "pages/Home";
3-
import { Navigate, Route, Routes as RoutesFromRouter } from "react-router-dom";
4+
import DatabasePage from "pages/DatabasePage";
5+
import DatasetPage from "pages/DatasetPage";
6+
import DatasetDetailPage from "pages/DatasetDetailPage";
7+
import { Navigate, Route, Routes as RouterRoutes } from "react-router-dom";
48
import RoutesEnum from "types/routes.enum";
59

610
const Routes = () => (
7-
<RoutesFromRouter>
8-
<Route element={<FullScreen />}>
9-
<Route path={RoutesEnum.HOME} element={<Home />} />
10-
</Route>
11+
<RouterRoutes>
12+
{/* FullScreen Layout */}
13+
<Route element={<FullScreen />}>
14+
{/* Home Page */}
15+
<Route path={RoutesEnum.HOME} element={<Home />} />
1116

12-
<Route path="*" element={<Navigate to="/" />} />
13-
</RoutesFromRouter>
17+
{/* Databases Page */}
18+
<Route path={RoutesEnum.DATABASES} element={<DatabasePage />} />
19+
20+
{/* Dataset List Page */}
21+
<Route path={`${RoutesEnum.DATABASES}/:dbName`} element={<DatasetPage />} />
22+
23+
{/* Dataset Details Page */}
24+
<Route path={`${RoutesEnum.DATABASES}/:dbName/:docId`} element={<DatasetDetailPage />} />
25+
</Route>
26+
27+
{/* Fallback Route */}
28+
<Route path="*" element={<Navigate to={RoutesEnum.HOME} />} />
29+
</RouterRoutes>
1430
);
31+
1532
export default Routes;
33+

0 commit comments

Comments
 (0)