Skip to content

Commit 97851f2

Browse files
committed
move router to App.js
1 parent feb23a4 commit 97851f2

File tree

2 files changed

+48
-77
lines changed

2 files changed

+48
-77
lines changed

src/App.js

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,52 @@
1-
1+
import 'bootstrap/dist/css/bootstrap.css';
2+
import '@floating-ui/react';
23
import './App.css';
3-
import UserList from './components/userList';
4-
import Navbar from './components/navbar';
5-
import CreateUser from './components/userCreate';
4+
import Home from './routes/home';
5+
import UserLogin from './routes/login';
6+
import ErrorPage from "./routes/error-pages";
7+
import UserPage from './routes/users';
8+
9+
import {
10+
createBrowserRouter,
11+
RouterProvider,
12+
} from "react-router-dom";
13+
import SkillPage from './routes/skills';
14+
import UserDetail from './routes/userDetail';
15+
16+
17+
const router = createBrowserRouter([
18+
19+
{
20+
path: "/",
21+
element: <Home />,
22+
errorElement: <ErrorPage />,
23+
},
24+
{
25+
path: "/users",
26+
element: <UserPage />,
27+
errorElement: <ErrorPage />,
28+
},
29+
{
30+
path: "/users/:userId/",
31+
element: <UserDetail />,
32+
errorElement: <ErrorPage />,
33+
},
34+
{
35+
path: "/skills",
36+
element: <SkillPage />,
37+
errorElement: <ErrorPage />,
38+
},
39+
{
40+
path: "/login",
41+
element: <UserLogin />,
42+
errorElement: <ErrorPage />,
43+
},
44+
]);
45+
646

747
function App() {
848
return (
9-
10-
<div className="container-fluid">
11-
12-
<div className="row">
13-
<div className="col gap-3">
14-
<Navbar />
15-
</div>
16-
</div>
17-
18-
<br />
19-
20-
<div className="row align-items-center">
21-
<div className="col-4">
22-
<CreateUser />
23-
</div>
24-
</div>
25-
26-
<br />
27-
28-
<div className="row">
29-
<div className="col">
30-
<UserList />
31-
</div>
32-
</div>
33-
34-
<br />
35-
36-
</div>
49+
<RouterProvider router={router} />
3750
);
3851
}
3952

src/index.js

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,17 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom/client';
33
import './index.css';
4-
// import App from './App';
5-
// import './App.css';
4+
import App from './App';
5+
import './App.css';
66
import 'bootstrap/dist/css/bootstrap.css';
77
import '@floating-ui/react';
8-
import Home from './routes/home';
9-
import UserLogin from './routes/login';
108
import reportWebVitals from './reportWebVitals';
11-
import ErrorPage from "./routes/error-pages";
12-
import UserPage from './routes/users';
13-
14-
import {
15-
createBrowserRouter,
16-
RouterProvider,
17-
} from "react-router-dom";
18-
import SkillPage from './routes/skills';
19-
import UserDetail from './routes/userDetail';
20-
21-
22-
const router = createBrowserRouter([
23-
24-
{
25-
path: "/",
26-
element: <Home />,
27-
errorElement: <ErrorPage />,
28-
},
29-
{
30-
path: "/users",
31-
element: <UserPage />,
32-
errorElement: <ErrorPage />,
33-
},
34-
35-
{
36-
path: "/users/:userId/",
37-
element: <UserDetail />,
38-
errorElement: <ErrorPage />,
39-
},
40-
{
41-
path: "/skills",
42-
element: <SkillPage />,
43-
errorElement: <ErrorPage />,
44-
},
45-
{
46-
path: "/login",
47-
element: <UserLogin />,
48-
errorElement: <ErrorPage />,
49-
},
50-
]);
519

5210

5311
const root = ReactDOM.createRoot(document.getElementById('root'));
5412
root.render(
5513
<React.StrictMode>
56-
<RouterProvider router={router} />
14+
<App />
5715
</React.StrictMode>
5816
);
5917

0 commit comments

Comments
 (0)