From cf4d0ad5ed3b2a67a09e5aa52a5496a013217717 Mon Sep 17 00:00:00 2001 From: Jiachun Xiang Date: Mon, 1 Jul 2024 18:13:20 -0400 Subject: [PATCH 1/4] install react-router-dom --- package-lock.json | 39 +++++++++++++++++++++++++++++++++++++++ package.json | 1 + 2 files changed, 40 insertions(+) diff --git a/package-lock.json b/package-lock.json index afb4187..8c86682 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router-dom": "^6.24.0", "react-scripts": "5.0.1", "sass": "^1.66.1" } @@ -3241,6 +3242,14 @@ } } }, + "node_modules/@remix-run/router": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.17.0.tgz", + "integrity": "sha512-2D6XaHEVvkCn682XBnipbJjgZUU7xjLtA4dGJRBVUKpEaDYOZMENZoZjAOSb7qirxt5RupjzZxz4fK2FO+EFPw==", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -14690,6 +14699,36 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "6.24.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.24.0.tgz", + "integrity": "sha512-sQrgJ5bXk7vbcC4BxQxeNa5UmboFm35we1AFK0VvQaz9g0LzxEIuLOhHIoZ8rnu9BO21ishGeL9no1WB76W/eg==", + "dependencies": { + "@remix-run/router": "1.17.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.24.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.24.0.tgz", + "integrity": "sha512-960sKuau6/yEwS8e+NVEidYQb1hNjAYM327gjEyXlc6r3Skf2vtwuJ2l7lssdegD2YjoKG5l8MsVyeTDlVeY8g==", + "dependencies": { + "@remix-run/router": "1.17.0", + "react-router": "6.24.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", diff --git a/package.json b/package.json index bffab90..fd5cc60 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router-dom": "^6.24.0", "react-scripts": "5.0.1", "sass": "^1.66.1" }, From e26bfc51bba24e1c164171d3f704f317f90cb4a4 Mon Sep 17 00:00:00 2001 From: Jiachun Xiang Date: Mon, 1 Jul 2024 18:14:03 -0400 Subject: [PATCH 2/4] change import name for home --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 8c51061..ec3b196 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,5 @@ import { Routes, Route } from "react-router-dom"; -import Home from "./Pages/Home/Home"; +import Home from "./Pages/HomePage/HomePage"; function App() { return ( From fc3979d665059d5745e0bee90f1eb6652faf2b0b Mon Sep 17 00:00:00 2001 From: Jiachun Xiang Date: Mon, 1 Jul 2024 18:17:34 -0400 Subject: [PATCH 3/4] try to fix complier problems with changing import --- package-lock.json | 1 + package.json | 1 + src/App.js | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c86682..3466b81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router": "^6.24.0", "react-router-dom": "^6.24.0", "react-scripts": "5.0.1", "sass": "^1.66.1" diff --git a/package.json b/package.json index fd5cc60..7a3ccff 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router": "^6.24.0", "react-router-dom": "^6.24.0", "react-scripts": "5.0.1", "sass": "^1.66.1" diff --git a/src/App.js b/src/App.js index ec3b196..d99a71e 100644 --- a/src/App.js +++ b/src/App.js @@ -1,10 +1,10 @@ import { Routes, Route } from "react-router-dom"; -import Home from "./Pages/HomePage/HomePage"; +import HomePage from "./Pages/HomePage/HomePage"; function App() { return ( - } /> + } /> ); } From 99881e8305eee022563faf36ab5eb0992313c775 Mon Sep 17 00:00:00 2001 From: Jiachun Xiang Date: Mon, 1 Jul 2024 18:19:52 -0400 Subject: [PATCH 4/4] fix home import --- src/App.js | 2 +- src/pages/HomePage/HomePage.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index d99a71e..25515a2 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,5 @@ import { Routes, Route } from "react-router-dom"; -import HomePage from "./Pages/HomePage/HomePage"; +import HomePage from "./pages/HomePage/HomePage"; function App() { return ( diff --git a/src/pages/HomePage/HomePage.jsx b/src/pages/HomePage/HomePage.jsx index 794885b..64b273c 100644 --- a/src/pages/HomePage/HomePage.jsx +++ b/src/pages/HomePage/HomePage.jsx @@ -1,4 +1,4 @@ -import "./Home.scss"; +import "./HomePage.scss"; const Home = () => { return (