Skip to content

Update React Router to version 6 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oshadhashiro404 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update React Router to version 6 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04e1c43
install react-router v6
oshadhashiro404 Jan 28, 2022
06c7f69
Setup react-router v6
oshadhashiro404 Jan 28, 2022
a00f630
fixed error
oshadhashiro404 Jan 28, 2022
66411be
fixed unused vars
oshadhashiro404 Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24,886 changes: 24,794 additions & 92 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@types/react-transition-group": "^4.4.4",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.3.0",
"react-router-dom": "^6.2.1",
"react-scripts": "4.0.3",
"react-transition-group": "^4.4.2",
"socket.io-client": "^4.3.2",
Expand Down
116 changes: 63 additions & 53 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,65 +11,75 @@ import AdminLayout from './components/UI/AdminLayout';
import AdminHome from './pages/Admin/Home';
import AdminSingleMatch from './pages/Admin/SingleMatch';
import { authContext } from './context/authContext';
import { Route, Switch, Redirect } from 'react-router-dom';
import { Route, Routes, Navigate } from 'react-router-dom';
import './App.css';

function App() {
const ctx = useContext(authContext);
console.log(ctx.token);
return (
<Switch>
<Route path="/" exact>
<NavBar imgSrc={PRImg}>
<Home />
</NavBar>
</Route>
<Route path="/leaderboard">
<NavBar imgSrc={PRImg}>
<Leaderboard />
</NavBar>
</Route>
<Route path="/chat/:matchId">
<NavBar imgSrc={PRImg}>
<Chat />
</NavBar>
</Route>
<Route path="/rewards">
<NavBar imgSrc={PRImg}>
<Rewards />
</NavBar>
</Route>
<Route path="/user/login">
<UserLogin isAdmin={false} />
</Route>
<Route path="/user/register">
<UserRegister isAdmin={false} />
</Route>
<Route path="/admin" exact>
{ctx.token ? (
<AdminLayout>
<AdminHome />
</AdminLayout>
) : (
<Redirect to="/admin/login" />
)}
</Route>
<Route path="/admin/login">
<UserLogin isAdmin={true} />
</Route>
<Route path="/admin/register">
<UserRegister isAdmin={true} />
</Route>
<Route path="/admin/matches/:matchId" exact>
{ctx.token ? (
<AdminLayout>
<AdminSingleMatch />
</AdminLayout>
) : (
<Redirect to="/admin/login" />
)}
</Route>
</Switch>
<Routes>
<Route
path="/"
element={
<NavBar imgSrc={PRImg}>
<Home />
</NavBar>
}
/>
<Route
path="/leaderboard"
element={
<NavBar imgSrc={PRImg}>
<Leaderboard />
</NavBar>
}
/>
<Route
path="/chat/:matchId"
element={
<NavBar imgSrc={PRImg}>
<Chat />
</NavBar>
}
/>
<Route
path="/rewards"
element={
<NavBar imgSrc={PRImg}>
<Rewards />
</NavBar>
}
/>
<Route path="/user/login" element={<UserLogin isAdmin={false} />} />
<Route path="/user/register" element={<UserRegister isAdmin={false} />} />
<Route
path="/admin"
element={
ctx.token ? (
<AdminLayout>
<AdminHome />
</AdminLayout>
) : (
<Route path="*" element={<Navigate to="/user/login" />} />
)
}
></Route>
<Route path="/admin/login" element={<UserLogin isAdmin={true} />} />
<Route path="/admin/register" element={<UserRegister isAdmin={true} />} />
<Route
path="/admin/matches/:matchId"
element={
ctx.token ? (
<AdminLayout>
<AdminSingleMatch />
</AdminLayout>
) : (
<Route path="*" element={<Navigate to="/admin/login" />} />
)
}
/>
</Routes>
);
}

Expand Down
14 changes: 12 additions & 2 deletions src/components/UI/AdminLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,23 @@ const AdminLayout = (props: { children: ReactElement | ReactElement[] }) => {
<nav className={classes.Nav}>
<ul>
<li>
<NavLink to="/admin/" activeClassName={classes.Active}>
<NavLink
to="/admin/"
className={(navData) =>
navData.isActive ? classes.Active : ''
}
>
Home
</NavLink>
</li>
<li>
{ctx.isAdmin && ctx.token && (
<NavLink to="/admin/new-match" activeClassName={classes.Active}>
<NavLink
to="/admin/new-match"
className={(navData) =>
navData.isActive ? classes.Active : ''
}
>
New match
</NavLink>
)}
Expand Down
12 changes: 6 additions & 6 deletions src/components/UI/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,34 +53,34 @@ const NavBar = ({ imgSrc, children }: Props) => {
</NavLink>
)}
<li>
<NavLink to="/rewards" activeClassName={classes.Active}>
<NavLink to="/rewards" className={(navData) => navData.isActive ? classes.Active : "" }>
Rewards
</NavLink>
</li>
<li>
<NavLink to="/leaderboard" activeClassName={classes.Active}>
<NavLink to="/leaderboard" className={(navData) => navData.isActive ? classes.Active : "" }>
Leaderboard
</NavLink>
</li>
<li>
<NavLink to="/pastMatches" activeClassName={classes.Active}>
<NavLink to="/pastMatches" className={(navData) => navData.isActive ? classes.Active : "" }>
Past Matches
</NavLink>
</li>
<li>
<NavLink to="/about" activeClassName={classes.Active}>
<NavLink to="/about" className={(navData) => navData.isActive ? classes.Active : "" }>
About
</NavLink>
</li>
{ctx.token ? (
<li>
<NavLink to="/profile" activeClassName={classes.Active}>
<NavLink to="/profile" className={(navData) => navData.isActive ? classes.Active : "" }>
Profile
</NavLink>
</li>
) : (
<li>
<NavLink to="/login" activeClassName={classes.Active}>
<NavLink to="/login" className={(navData) => navData.isActive ? classes.Active : "" }>
Profile
</NavLink>
</li>
Expand Down
Loading