Skip to content

Commit edeef65

Browse files
committed
fix router to implement multiple pages
1 parent 5849429 commit edeef65

File tree

6 files changed

+162
-17
lines changed

6 files changed

+162
-17
lines changed

greenscoutjs/package-lock.json

Lines changed: 144 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

greenscoutjs/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"dependencies": {
1313
"react": "^19.2.0",
1414
"react-dom": "^19.2.0",
15-
"react-router-dom": "^7.10.1"
15+
"react-router-dom": "^7.10.1",
16+
"styled-components": "^6.1.19"
1617
},
1718
"devDependencies": {
1819
"@eslint/js": "^9.39.1",

greenscoutjs/src/App.jsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import { Route } from "react-router-dom";
21
import "./App.css";
32
import Login from "./components/loginpage/Login";
43
import Home from "./components/homepage/Home";
4+
import { BrowserRouter as Router, Route, Routes} from "react-router-dom";
55
// import { nanoid } from "nanoid";
66

77
function App () {
88
return (
9-
// <Routes>
10-
// <Route path="/" element={<Login></Login>}/>
11-
// <Route path="/home" element={<Home></Home>}/>
12-
// </Routes>
13-
<Login></Login>
9+
<Router>
10+
<Routes>
11+
<Route exact path="/" element={<Login/>}/>
12+
<Route path="/home" element={<Home/>}/>
13+
</Routes>
14+
</Router>
1415
)
1516
}
1617

greenscoutjs/src/components/loginpage/loginButton/GuestButton.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import { Navigate, useNavigate } from "react-router-dom";
12
import "./GuestButton.css"
23

34
function GuestButton () {
5+
const navigate = useNavigate();
6+
47
function handleClick() {
5-
alert("Logged In As Guest");
8+
navigate("/home")
69
}
710
return (
811
<p onClick={handleClick}>Login As Guest</p>

greenscoutjs/src/components/loginpage/loginButton/LoginButton.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import "./LoginButton.css"
2+
import { Navigate, useNavigate } from "react-router-dom";
23

34
function LoginButton () {
5+
const navigate = useNavigate();
6+
47
function handleClick() {
5-
alert ('hi')
8+
navigate("/home")
69
}
710

811
return (

greenscoutjs/src/main.jsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { StrictMode } from "react";
2-
import { BrowserRouter } from "react-router-dom"
32
import { createRoot } from "react-dom/client";
43
import "./index.css";
54
import App from "./App.jsx";
65

76
createRoot(document.getElementById("root")).render(
87
<StrictMode>
9-
<BrowserRouter>
10-
<App/>
11-
</BrowserRouter>
8+
<App/>
129
</StrictMode>,
1310
);

0 commit comments

Comments
 (0)