9817952445

Committed 06 Jul 2024 08:32AM UTC coverage: 88.231% (+0.1%) from 88.103%

Build # 9817952445

Build Type

Pull #53

github

Committed by

Calebgisa72

Commit Message

Merge pull request #51 from atlp-rwanda/ft-vender-product-update

Feature updating products item

Pull Request Pull Request #53: feat-wishlist-management

Run Details

449 of 623 branches covered (72.07%)

Branch coverage included in aggregate %.

390 of 424 new or added lines in 15 files covered. (91.98%)

49 existing lines in 4 files now uncovered.

5316 of 5911 relevant lines covered (89.93%)

8.31 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

90.37

/src/Routes/Router.tsx

import React, { useEffect } from 'react';
import { Navigate, Route, Routes } from 'react-router-dom';
import PageTitle from '../components/PageTitle';
import Register from '../pages/Authentication/Register';
import RegisterVendor from '../pages/Authentication/RegisterVendor';
import VerifyEmail from '../pages/Authentication/VerifyEmail';
import Login, { DecodedToken } from '../pages/Authentication/Login';
import { useDispatch, useSelector } from 'react-redux';
import { RootState } from '../redux/store';
import GoogleLoginSuccess from '../pages/Authentication/GoogleLoginSuccess';
import { useJwt } from 'react-jwt';
import OtpPage from '../pages/Authentication/OtpPage';
import SuspendedAccount from '../components/SuspendedAccount/SuspendedAccount';
import { ForgotPassword } from '../pages/Authentication/ForgotPassword';
import { ResetPassword } from '../pages/Authentication/ResetPassword';
import DashboardLayout from '../layout/DashboardLayout';
import DashboarInnerLayout from '../layout/DashboarInnerLayout';
import DashboardProducts from '../components/Products/DashboardProducts/DashboardProducts';
import DashboardSingleProduct from '../components/Products/DashboardSingleProduct/DashboardSingleProduct';
import DashboardNewProducts from '../components/Products/DashboardNewProducts/DashboardNewProducts';
import MainLayout from '../layout/MainLayout';
import Home from '../pages/LandingPage/Home';
import SearchPage from '../pages/searchPage';
import DashboardEditProducts from '../components/Products/DashboardEditProducts/DashboardEditProducts';
import WishlistPage from '../pages/WishlistPage/WishlistPage';
import { setOnWishlistPage } from '../redux/reducers/wishlistReducer';
import { useLocation } from 'react-router-dom';

const Router = () => {
  const { userToken } = useSelector((state: RootState) => state.auth);
  const { decodedToken } = useJwt<DecodedToken>(userToken);

  const isAdmin = decodedToken?.role.toLowerCase() === 'admin';
  const isVendor = decodedToken?.role.toLowerCase() === 'vendor';
  const isBuyer = decodedToken?.role.toLowerCase() === 'buyer';

  const location = useLocation();
  const dispatch = useDispatch();

  useEffect(() => {
    if (location.pathname === '/wishlist') {
      dispatch(setOnWishlistPage(true));
    } else {
      dispatch(setOnWishlistPage(false));
    }
  }, [location.pathname, dispatch]);

  return (
    <Routes>
      <Route
        path="/"
        element={
          <MainLayout>
            <PageTitle title="Knights Store" />
            <Home />
          </MainLayout>
        }
      />

      <Route
        path="/register"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Register" />
            <Register />
          </MainLayout>
        }
      />

      <Route
        path="/register-vendor"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Register Vendor" />
            <RegisterVendor />
          </MainLayout>
        }
      />

      <Route
        path="/verify-email/:token"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Verify Email" />
            <VerifyEmail />
          </MainLayout>
        }
      />

      <Route
        path="/forgot-password"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Forgot Password" />
            <ForgotPassword />
            {userToken && isAdmin && <Navigate to="/admin/dashboard" />}
            {userToken && isVendor && <Navigate to="/vendor/dashboard" />}
            {userToken && isBuyer && <Navigate to="/" />}
          </MainLayout>
        }
      />

      <Route
        path="/reset-password"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Reset Password" />
            <ResetPassword />
            {userToken && isAdmin && <Navigate to="/admin/dashboard" />}
            {userToken && isVendor && <Navigate to="/vendor/dashboard" />}
            {userToken && isBuyer && <Navigate to="/" />}
          </MainLayout>
        }
      />

      <Route
        path="/login"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Login" />
            {userToken && isAdmin && <Navigate to="/admin/dashboard" />}
            {userToken && isVendor && <Navigate to="/vendor/dashboard" />}
            {userToken && isBuyer && <Navigate to="/" />}
            {!userToken && <Login />}
          </MainLayout>
        }
      />
      <Route
        path="/login/google-auth"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Login" />
            {userToken && isAdmin && <Navigate to="/admin/dashboard" />}
            {userToken && isVendor && <Navigate to="/vendor/dashboard" />}
            {userToken && isBuyer && <Navigate to="/" />}
            {!userToken && <GoogleLoginSuccess />}
          </MainLayout>
        }
      />
      <Route
        path="/suspended-account"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Suspended Account" />
            {userToken && <Navigate to="/" />}
            <SuspendedAccount />
          </MainLayout>
        }
      />
      <Route
        path="/otp-verficaton"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Verify OTP" />
            <OtpPage />
            {userToken && isAdmin && <Navigate to="/admin/dashboard" />}
            {userToken && isVendor && <Navigate to="/vendor/dashboard" />}
            {userToken && isBuyer && <Navigate to="/" />}
          </MainLayout>
        }
      />

      <Route
        path="/wishlist"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Wishlist" />
            <WishlistPage />
          </MainLayout>
        }
      />

      <Route path="/vendor/dashboard" element={<DashboardLayout />}>
        <Route path="products" element={<DashboarInnerLayout />}>
          <Route path="" element={<DashboardProducts />} />
          <Route path="new" element={<DashboardNewProducts />} />
          <Route path=":id" element={<DashboardSingleProduct />} />
          <Route path=":id/edit" element={<DashboardEditProducts />} />
        </Route>
      </Route>

      <Route
        path="/search"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Search" />
            <SearchPage />
          </MainLayout>
        }
      />
    </Routes>
  );
};

export default Router;

1	import React, { useEffect } from 'react';	1✔
2	import { Navigate, Route, Routes } from 'react-router-dom';	1✔
3	import PageTitle from '../components/PageTitle';	1✔
4	import Register from '../pages/Authentication/Register';	1✔
5	import RegisterVendor from '../pages/Authentication/RegisterVendor';	1✔
6	import VerifyEmail from '../pages/Authentication/VerifyEmail';	1✔
7	import Login, { DecodedToken } from '../pages/Authentication/Login';	1✔
8	import { useDispatch, useSelector } from 'react-redux';	1✔
9	import { RootState } from '../redux/store';	1✔
10	import GoogleLoginSuccess from '../pages/Authentication/GoogleLoginSuccess';	1✔
11	import { useJwt } from 'react-jwt';	1✔
12	import OtpPage from '../pages/Authentication/OtpPage';	1✔
13	import SuspendedAccount from '../components/SuspendedAccount/SuspendedAccount';	1✔
14	import { ForgotPassword } from '../pages/Authentication/ForgotPassword';	1✔
15	import { ResetPassword } from '../pages/Authentication/ResetPassword';	1✔
16	import DashboardLayout from '../layout/DashboardLayout';	1✔
17	import DashboarInnerLayout from '../layout/DashboarInnerLayout';	1✔
18	import DashboardProducts from '../components/Products/DashboardProducts/DashboardProducts';	1✔
19	import DashboardSingleProduct from '../components/Products/DashboardSingleProduct/DashboardSingleProduct';	1✔
20	import DashboardNewProducts from '../components/Products/DashboardNewProducts/DashboardNewProducts';	1✔
21	import MainLayout from '../layout/MainLayout';	1✔
22	import Home from '../pages/LandingPage/Home';	1✔
23	import SearchPage from '../pages/searchPage';	1✔
24	import DashboardEditProducts from '../components/Products/DashboardEditProducts/DashboardEditProducts';	1✔
25	import WishlistPage from '../pages/WishlistPage/WishlistPage';	1✔
26	import { setOnWishlistPage } from '../redux/reducers/wishlistReducer';	1✔
27	import { useLocation } from 'react-router-dom';	1✔
28		1✔
29	const Router = () => {	1✔
30	const { userToken } = useSelector((state: RootState) => state.auth);	6✔
31	const { decodedToken } = useJwt<DecodedToken>(userToken);	6✔
32		6✔
33	const isAdmin = decodedToken?.role.toLowerCase() === 'admin';	6!
34	const isVendor = decodedToken?.role.toLowerCase() === 'vendor';	6!
35	const isBuyer = decodedToken?.role.toLowerCase() === 'buyer';	6!
36		6✔
37	const location = useLocation();	6✔
38	const dispatch = useDispatch();	6✔
39		6✔
40	useEffect(() => {	6✔
41	if (location.pathname === '/wishlist') {	3!
NEW 42	dispatch(setOnWishlistPage(true));	×
43	} else {	3✔
44	dispatch(setOnWishlistPage(false));	3✔
45	}	3✔
46	}, [location.pathname, dispatch]);	6✔
47		6✔
48	return (	6✔
49	<Routes>	6✔
50	<Route	6✔
51	path="/"	6✔
52	element={	6✔
53	<MainLayout>	6✔
54	<PageTitle title="Knights Store" />	6✔
55	<Home />	6✔
56	</MainLayout>	6✔
57	}	6✔
58	/>	6✔
59		6✔
60	<Route	6✔
61	path="/register"	6✔
62	element={	6✔
63	<MainLayout>	6✔
64	<PageTitle title="Knights Store \| Register" />	6✔
65	<Register />	6✔
66	</MainLayout>	6✔
67	}	6✔
68	/>	6✔
69		6✔
70	<Route	6✔
71	path="/register-vendor"	6✔
72	element={	6✔
73	<MainLayout>	6✔
74	<PageTitle title="Knights Store \| Register Vendor" />	6✔
75	<RegisterVendor />	6✔
76	</MainLayout>	6✔
77	}	6✔
78	/>	6✔
79		6✔
80	<Route	6✔
81	path="/verify-email/:token"	6✔
82	element={	6✔
83	<MainLayout>	6✔
84	<PageTitle title="Knights Store \| Verify Email" />	6✔
85	<VerifyEmail />	6✔
86	</MainLayout>	6✔
87	}	6✔
88	/>	6✔
89		6✔
90	<Route	6✔
91	path="/forgot-password"	6✔
92	element={	6✔
93	<MainLayout>	6✔
94	<PageTitle title="Knights Store \| Forgot Password" />	6✔
95	<ForgotPassword />	6✔
96	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
97	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
98	{userToken && isBuyer && <Navigate to="/" />}	6!
99	</MainLayout>	6✔
100	}	6✔
101	/>	6✔
102		6✔
103	<Route	6✔
104	path="/reset-password"	6✔
105	element={	6✔
106	<MainLayout>	6✔
107	<PageTitle title="Knights Store \| Reset Password" />	6✔
108	<ResetPassword />	6✔
109	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
110	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
111	{userToken && isBuyer && <Navigate to="/" />}	6!
112	</MainLayout>	6✔
113	}	6✔
114	/>	6✔
115		6✔
116	<Route	6✔
117	path="/login"	6✔
118	element={	6✔
119	<MainLayout>	6✔
120	<PageTitle title="Knights Store \| Login" />	6✔
121	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
122	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
123	{userToken && isBuyer && <Navigate to="/" />}	6!
124	{!userToken && <Login />}	6✔
125	</MainLayout>	6✔
126	}	6✔
127	/>	6✔
128	<Route	6✔
129	path="/login/google-auth"	6✔
130	element={	6✔
131	<MainLayout>	6✔
132	<PageTitle title="Knights Store \| Login" />	6✔
133	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
134	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
135	{userToken && isBuyer && <Navigate to="/" />}	6!
136	{!userToken && <GoogleLoginSuccess />}	6✔
137	</MainLayout>	6✔
138	}	6✔
139	/>	6✔
140	<Route	6✔
141	path="/suspended-account"	6✔
142	element={	6✔
143	<MainLayout>	6✔
144	<PageTitle title="Knights Store \| Suspended Account" />	6✔
145	{userToken && <Navigate to="/" />}	6!
146	<SuspendedAccount />	6✔
147	</MainLayout>	6✔
148	}	6✔
149	/>	6✔
150	<Route	6✔
151	path="/otp-verficaton"	6✔
152	element={	6✔
153	<MainLayout>	6✔
154	<PageTitle title="Knights Store \| Verify OTP" />	6✔
155	<OtpPage />	6✔
156	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
157	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
158	{userToken && isBuyer && <Navigate to="/" />}	6!
159	</MainLayout>	6✔
160	}	6✔
161	/>	6✔
162		6✔
163	<Route	6✔
164	path="/wishlist"	6✔
165	element={	6✔
166	<MainLayout>	6✔
167	<PageTitle title="Knights Store \| Wishlist" />	6✔
168	<WishlistPage />	6✔
169	</MainLayout>	6✔
170	}	6✔
171	/>	6✔
172		6✔
173	<Route path="/vendor/dashboard" element={<DashboardLayout />}>	6✔
174	<Route path="products" element={<DashboarInnerLayout />}>	6✔
175	<Route path="" element={<DashboardProducts />} />	6✔
176	<Route path="new" element={<DashboardNewProducts />} />	6✔
177	<Route path=":id" element={<DashboardSingleProduct />} />	6✔
178	<Route path=":id/edit" element={<DashboardEditProducts />} />	6✔
179	</Route>	6✔
180	</Route>	6✔
181		6✔
182	<Route	6✔
183	path="/search"	6✔
184	element={	6✔
185	<MainLayout>	6✔
186	<PageTitle title="Knights Store \| Search" />	6✔
187	<SearchPage />	6✔
188	</MainLayout>	6✔
189	}	6✔
190	/>	6✔
191	</Routes>	6✔
192	);	6✔
193	};	6✔
194		1✔
195	export default Router;	1✔

atlp-rwanda / knights-ecomm-fe / 9817952445

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous