Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Ningsang-Jabegu authored Feb 16, 2024
2 parents e285772 + b37a480 commit 3969af9
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 120 deletions.
138 changes: 20 additions & 118 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"@mui/material": "^5.15.9",
"@mui/styled-engine-sc": "^6.0.0-alpha.16",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^13.5.0",
"link-react": "^3.0.0",
"react": "^18.2.0",
"react-countdown": "^2.3.5",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.3",
"react-router-dom": "^6.22.0",
"react-scripts": "5.0.1",
"react-scroll": "^1.9.0",
"react-swipeable-views-react-18": "^0.14.7",
Expand Down
3 changes: 3 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ function App() {
<Route path="/" element={<HomePage />} />
<Route path="/contact" element={<ContactPage />} />
<Route path="/privacy" element={<PrivacyPage />} />
<Route path="/" element={<HomePage/>} />
<Route path="/contact" element={<ContactPage />} />
<Route path="/privacy" element={<PrivacyPage/>} />
<Route path="/terms" element={<TermsPage />} />
<Route path="/login" element={<SignInPage />} />
<Route path="/signin" element={<SignInPage />} />
Expand Down

0 comments on commit 3969af9

Please sign in to comment.