Fix error routes for 404 pages

Author: tduyng

src/routes/ErrorRoutes.tsx

@@ -1,17 +1,9 @@
-import React, { lazy, Suspense } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import { Loading } from 'src/components/Loading';
-const NotFoundPage = lazy(() => import('src/pages/ErrorPages/404Pages'));
+import { NotFoundPage } from 'src/pages/ErrorPages/404Pages';
 export const ErrorRoutes = () => {
   return (
     <Switch>
-      <Route
-        component={() => (
-          <Suspense fallback={<Loading />}>
-            <NotFoundPage />
-          </Suspense>
-        )}
-      />
+      <Route component={NotFoundPage} />;
     </Switch>
   );
 };

src/routes/ProductRoutes.tsx

@@ -3,14 +3,15 @@ import { Switch } from 'react-router-dom';
 import { PATH } from 'src/constants/paths';
 import { Loading } from 'src/components/Loading';
 import { AuthenticatedGuard } from 'src/guards/AuthenticatedGuard';
+import { ErrorRoutes } from './ErrorRoutes';
 const ProductList = lazy(
   () => import('src/pages/ProductPages/ProductListPage'),
 );
 const ProductItem = lazy(
   () => import('src/pages/ProductPages/ProductItemPage'),
 );
 
-export const AuthRoutes = () => {
+export const ProductRoutes = () => {
   return (
     <Switch>
       <AuthenticatedGuard
@@ -24,13 +25,14 @@ export const AuthRoutes = () => {
       />
       <AuthenticatedGuard
         exact
-        path="/products/:id"
+        path={PATH.PRODUCTS + '/:id'}
         component={() => (
           <Suspense fallback={<Loading />}>
             <ProductItem />
           </Suspense>
         )}
       />
+      <ErrorRoutes />
     </Switch>
   );
 };

src/routes/index.tsx

@@ -2,14 +2,14 @@ import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
 import { StaticPageRoutes } from './StaticPageRoutes';
 import { AuthRoutes } from './AuthRoutes';
-import { ErrorRoutes } from './ErrorRoutes';
+import { ProductRoutes } from './ProductRoutes';
 
 export const Routes = () => {
   return (
     <BrowserRouter>
       <StaticPageRoutes />
       <AuthRoutes />
-      <ErrorRoutes />
+      <ProductRoutes />
     </BrowserRouter>
   );
 };