Skip to content

Commit ac84177

Browse files
fix: routing issue
1 parent aa1f970 commit ac84177

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

src/App.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const App = () => {
2121
<Routes>
2222
<Route element={<Layout />}>
2323
<Route path='/' element={<Navigate to='/dashboard' replace />} />
24+
<Route path='/home' element={<Navigate to='/dashboard' replace />} />
2425
<Route path='/dashboard' element={<Dashboard />} />
2526
<Route path='/shop' element={<Shop />} />
2627
<Route path='/mock' element={<Mock />} />

src/components/BreadCrumb/index.tsx

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Box, Breadcrumbs, Link, Typography } from '@mui/material';
2+
import { Link as RouterLink } from 'react-router-dom';
23
import NavigateNextIcon from '@mui/icons-material/NavigateNext';
34

45
type Props = {
@@ -20,17 +21,24 @@ const CustomBreadCrumb = ({ title, location, location1, location2 }: Props) => {
2021
</Typography>
2122
<Breadcrumbs separator={<NavigateNextIcon fontSize='small' />} aria-label='breadcrumb'>
2223
{location && (
23-
<Link underline='hover' key='1' color='inherit' href={`/${decodeURIComponent(location)}`}>
24+
<Link
25+
component={RouterLink}
26+
underline='hover'
27+
key='1'
28+
color='inherit'
29+
to={`/${decodeURIComponent(location)}`}
30+
>
2431
{location}
2532
</Link>
2633
)}
2734

2835
{location1 && (
2936
<Link
37+
component={RouterLink}
3038
underline='hover'
3139
key='2'
3240
color='inherit'
33-
href={`/${decodeURIComponent(location1.split(' ').join('-'))}`}
41+
to={`/${decodeURIComponent(location1.split(' ').join('-'))}`}
3442
>
3543
{location1}
3644
</Link>

src/components/Navbar/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ const Navbar = () => {
3333
<Link component={RouterLink} to='/' className='nav-item'>
3434
Home
3535
</Link>
36-
<Link component={RouterLink} to='/' className='nav-item'>
36+
<Link component={RouterLink} to='/shop' className='nav-item'>
3737
Shop
3838
</Link>
39-
<Link component={RouterLink} to='/' className='nav-item'>
39+
<Link component={RouterLink} to='/about' className='nav-item'>
4040
About
4141
</Link>
42-
<Link component={RouterLink} to='/' className='nav-item'>
42+
<Link component={RouterLink} to='/contact' className='nav-item'>
4343
Contact
4444
</Link>
4545
</FlexBetween>

src/scenes/Footer/index.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ const Footer = () => {
2828
<Link component={RouterLink} to='/' className='nav-item'>
2929
Home
3030
</Link>
31-
<Link component={RouterLink} to='/' className='nav-item'>
31+
<Link component={RouterLink} to='/shop' className='nav-item'>
3232
Shop
3333
</Link>
34-
<Link component={RouterLink} to='/' className='nav-item'>
34+
<Link component={RouterLink} to='/about' className='nav-item'>
3535
About
3636
</Link>
37-
<Link component={RouterLink} to='/' className='nav-item'>
37+
<Link component={RouterLink} to='/contact' className='nav-item'>
3838
Contact
3939
</Link>
4040
</Box>
@@ -45,13 +45,13 @@ const Footer = () => {
4545
Help
4646
</Typography>
4747
<Box component='nav' display='flex' flexDirection='column' gap='1.5rem'>
48-
<Link component={RouterLink} to='/' className='nav-item'>
48+
<Link component={RouterLink} to='#' className='nav-item'>
4949
Payment Options
5050
</Link>
51-
<Link component={RouterLink} to='/' className='nav-item'>
51+
<Link component={RouterLink} to='#' className='nav-item'>
5252
Returns
5353
</Link>
54-
<Link component={RouterLink} to='/' className='nav-item'>
54+
<Link component={RouterLink} to='#' className='nav-item'>
5555
Policies
5656
</Link>
5757
</Box>

0 commit comments

Comments
 (0)