10080887320

Committed 24 Jul 2024 05:01PM UTC coverage: 90.242% (-0.6%) from 90.801%

Build # 10080887320

Build Type

Pull #76

github

Committed by

maxCastro1

Commit Message

Merge pull request #64 from atlp-rwanda/ft-buyer-checkout-and-pay

This PR is for the addition of Stripe Payment Integration with Payment and Success Routes

Pull Request Pull Request #76: feature Implement Transactions View for Admin to Display All Payments

Run Details

815 of 1043 branches covered (78.14%)

Branch coverage included in aggregate %.

178 of 191 new or added lines in 4 files covered. (93.19%)

152 existing lines in 14 files now uncovered.

8794 of 9605 relevant lines covered (91.56%)

9.52 hits per line

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

81.63

/src/Routes/Router.tsx

import React, { useEffect } from 'react';
import { Link, 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 SingleProduct from '../components/SingleProduct/SingleProduct';
import Cart from '../components/Cart/Cart';
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';
import BuyerOrders from '../pages/Orders/BuyerOrders';
import SingleBuyerOrder from '../pages/Orders/SingleBuyerOrder';
import Users from '../components/Dashboard/adminDashbord/Users';
import SingleUser from '../components/Dashboard/adminDashbord/SingleUser';
import CheckOutMain from '../pages/Cart/checkOutMain';
import PaymentOk from '../pages/PaymentOk';
import Transctions from '../pages/Transctions/Transctions';

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 (userToken && location.pathname === '/wishlist') {
      dispatch(setOnWishlistPage(true));
    } else {
      dispatch(setOnWishlistPage(false));
    }
  }, [location.pathname, dispatch, userToken]);

  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/users" />}
            {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" />
            {userToken ? <WishlistPage /> : <Navigate to="/" />}
          </MainLayout>
        }
      />

      {isVendor && (
        <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>
      )}

      {userToken ? (
        isAdmin ? (
          <Route path="/Admin/dashboard" element={<DashboardLayout />}>
            <Route path="users" element={<DashboarInnerLayout />}>
              <Route path="" element={<Users />} />
              <Route path=":id" element={<SingleUser />} />
            </Route>
            <Route path="transaction" element={<Transctions />} />
          </Route>
        ) : (
          <Route
            path="/Admin/dashboard"
            element={
              <div className="flex flex-col gap-3 items-center mt-40">
                <p className="text-xl">You are not authorized to use this link because you are not an Admin !!</p>
                <Link to={'/'}>
                  <p className="underline cursor-pointer">Go to Home page</p>
                </Link>
              </div>
            }
          />
        )
      ) : (
        <Route path="/Admin/dashboard" element={<Navigate to="/login" />} />
      )}

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

      <Route
        path="/product/:id"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | View Product " />
            <SingleProduct />
          </MainLayout>
        }
      />
      <Route
        path="/cart"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Cart" />
            <Cart />
          </MainLayout>
        }
      />

      <Route
        path="/orders"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Orders" />
            {userToken && isAdmin && <Navigate to="/admin/dashboard" />}
            {userToken && isVendor && <Navigate to="/vendor/dashboard" />}
            {userToken && isBuyer && <BuyerOrders />}
            {!userToken && <Navigate to="/login" />}
          </MainLayout>
        }
      />

      <Route
        path="/orders/:orderId"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Orders" />
            {userToken && isAdmin && <Navigate to="/admin/dashboard" />}
            {userToken && isVendor && <Navigate to="/vendor/dashboard" />}
            {userToken && isBuyer && <SingleBuyerOrder />}
            {!userToken && <Navigate to="/login" />}
          </MainLayout>
        }
      />

      <Route
        path="/checkout"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Create Order" />
            {userToken && isBuyer && <CheckOutMain />}
            {!userToken && <Navigate to="/login" />}
          </MainLayout>
        }
      />
      <Route
        path="/completion"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Payment successful" />
            <PaymentOk />
          </MainLayout>
        }
      />
    </Routes>
  );
};

export default Router;

1	import React, { useEffect } from 'react';	1✔
2	import { Link, 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 SingleProduct from '../components/SingleProduct/SingleProduct';	1✔
25	import Cart from '../components/Cart/Cart';	1✔
26	import DashboardEditProducts from '../components/Products/DashboardEditProducts/DashboardEditProducts';	1✔
27	import WishlistPage from '../pages/WishlistPage/WishlistPage';	1✔
28	import { setOnWishlistPage } from '../redux/reducers/wishlistReducer';	1✔
29	import { useLocation } from 'react-router-dom';	1✔
30	import BuyerOrders from '../pages/Orders/BuyerOrders';	1✔
31	import SingleBuyerOrder from '../pages/Orders/SingleBuyerOrder';	1✔
32	import Users from '../components/Dashboard/adminDashbord/Users';	1✔
33	import SingleUser from '../components/Dashboard/adminDashbord/SingleUser';	1✔
34	import CheckOutMain from '../pages/Cart/checkOutMain';	1✔
35	import PaymentOk from '../pages/PaymentOk';	1✔
36	import Transctions from '../pages/Transctions/Transctions';	1✔
37		1✔
38	const Router = () => {	1✔
39	const { userToken } = useSelector((state: RootState) => state.auth);	6✔
40	const { decodedToken } = useJwt<DecodedToken>(userToken);	6✔
41		6✔
42	const isAdmin = decodedToken?.role.toLowerCase() === 'admin';	6!
43	const isVendor = decodedToken?.role.toLowerCase() === 'vendor';	6!
44	const isBuyer = decodedToken?.role.toLowerCase() === 'buyer';	6!
45		6✔
46	const location = useLocation();	6✔
47	const dispatch = useDispatch();	6✔
48		6✔
49	useEffect(() => {	6✔
50	if (userToken && location.pathname === '/wishlist') {	3!
UNCOV 51	dispatch(setOnWishlistPage(true));	×
52	} else {	3✔
53	dispatch(setOnWishlistPage(false));	3✔
54	}	3✔
55	}, [location.pathname, dispatch, userToken]);	6✔
56		6✔
57	return (	6✔
58	<Routes>	6✔
59	<Route	6✔
60	path="/"	6✔
61	element={	6✔
62	<MainLayout>	6✔
63	<PageTitle title="Knights Store" />	6✔
64	<Home />	6✔
65	</MainLayout>	6✔
66	}	6✔
67	/>	6✔
68		6✔
69	<Route	6✔
70	path="/register"	6✔
71	element={	6✔
72	<MainLayout>	6✔
73	<PageTitle title="Knights Store \| Register" />	6✔
74	<Register />	6✔
75	</MainLayout>	6✔
76	}	6✔
77	/>	6✔
78		6✔
79	<Route	6✔
80	path="/register-vendor"	6✔
81	element={	6✔
82	<MainLayout>	6✔
83	<PageTitle title="Knights Store \| Register Vendor" />	6✔
84	<RegisterVendor />	6✔
85	</MainLayout>	6✔
86	}	6✔
87	/>	6✔
88		6✔
89	<Route	6✔
90	path="/verify-email/:token"	6✔
91	element={	6✔
92	<MainLayout>	6✔
93	<PageTitle title="Knights Store \| Verify Email" />	6✔
94	<VerifyEmail />	6✔
95	</MainLayout>	6✔
96	}	6✔
97	/>	6✔
98		6✔
99	<Route	6✔
100	path="/forgot-password"	6✔
101	element={	6✔
102	<MainLayout>	6✔
103	<PageTitle title="Knights Store \| Forgot Password" />	6✔
104	<ForgotPassword />	6✔
105	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
106	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
107	{userToken && isBuyer && <Navigate to="/" />}	6!
108	</MainLayout>	6✔
109	}	6✔
110	/>	6✔
111		6✔
112	<Route	6✔
113	path="/reset-password"	6✔
114	element={	6✔
115	<MainLayout>	6✔
116	<PageTitle title="Knights Store \| Reset Password" />	6✔
117	<ResetPassword />	6✔
118	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
119	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
120	{userToken && isBuyer && <Navigate to="/" />}	6!
121	</MainLayout>	6✔
122	}	6✔
123	/>	6✔
124		6✔
125	<Route	6✔
126	path="/login"	6✔
127	element={	6✔
128	<MainLayout>	6✔
129	<PageTitle title="Knights Store \| Login" />	6✔
130	{userToken && isAdmin && <Navigate to="/admin/dashboard/users" />}	6!
131	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
132	{userToken && isBuyer && <Navigate to="/" />}	6!
133	{!userToken && <Login />}	6✔
134	</MainLayout>	6✔
135	}	6✔
136	/>	6✔
137	<Route	6✔
138	path="/login/google-auth"	6✔
139	element={	6✔
140	<MainLayout>	6✔
141	<PageTitle title="Knights Store \| Login" />	6✔
142	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
143	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
144	{userToken && isBuyer && <Navigate to="/" />}	6!
145	{!userToken && <GoogleLoginSuccess />}	6✔
146	</MainLayout>	6✔
147	}	6✔
148	/>	6✔
149	<Route	6✔
150	path="/suspended-account"	6✔
151	element={	6✔
152	<MainLayout>	6✔
153	<PageTitle title="Knights Store \| Suspended Account" />	6✔
154	{userToken && <Navigate to="/" />}	6!
155	<SuspendedAccount />	6✔
156	</MainLayout>	6✔
157	}	6✔
158	/>	6✔
159	<Route	6✔
160	path="/otp-verficaton"	6✔
161	element={	6✔
162	<MainLayout>	6✔
163	<PageTitle title="Knights Store \| Verify OTP" />	6✔
164	<OtpPage />	6✔
165	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6!
166	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6!
167	{userToken && isBuyer && <Navigate to="/" />}	6!
168	</MainLayout>	6✔
169	}	6✔
170	/>	6✔
171		6✔
172	<Route	6✔
173	path="/wishlist"	6✔
174	element={	6✔
175	<MainLayout>	6✔
176	<PageTitle title="Knights Store \| Wishlist" />	6✔
177	{userToken ? <WishlistPage /> : <Navigate to="/" />}	6!
178	</MainLayout>	6✔
179	}	6✔
180	/>	6✔
181		6✔
182	{isVendor && (	6!
UNCOV 183	<Route path="/vendor/dashboard" element={<DashboardLayout />}>	×
UNCOV 184	<Route path="products" element={<DashboarInnerLayout />}>	×
UNCOV 185	<Route path="" element={<DashboardProducts />} />	×
UNCOV 186	<Route path="new" element={<DashboardNewProducts />} />	×
UNCOV 187	<Route path=":id" element={<DashboardSingleProduct />} />	×
UNCOV 188	<Route path=":id/edit" element={<DashboardEditProducts />} />	×
UNCOV 189	</Route>	×
UNCOV 190	</Route>	×
191	)}	6✔
192		6✔
193	{userToken ? (	6!
UNCOV 194	isAdmin ? (	×
UNCOV 195	<Route path="/Admin/dashboard" element={<DashboardLayout />}>	×
UNCOV 196	<Route path="users" element={<DashboarInnerLayout />}>	×
UNCOV 197	<Route path="" element={<Users />} />	×
UNCOV 198	<Route path=":id" element={<SingleUser />} />	×
199	</Route>	×
NEW 200	<Route path="transaction" element={<Transctions />} />	×
201	</Route>	×
202	) : (	×
203	<Route	×
204	path="/Admin/dashboard"	×
205	element={	×
206	<div className="flex flex-col gap-3 items-center mt-40">	×
207	<p className="text-xl">You are not authorized to use this link because you are not an Admin !!</p>	×
208	<Link to={'/'}>	×
209	<p className="underline cursor-pointer">Go to Home page</p>	×
210	</Link>	×
211	</div>	×
UNCOV 212	}	×
UNCOV 213	/>	×
UNCOV 214	)	×
UNCOV 215	) : (	×
216	<Route path="/Admin/dashboard" element={<Navigate to="/login" />} />	6✔
217	)}	6✔
218		6✔
219	<Route	6✔
220	path="/search"	6✔
221	element={	6✔
222	<MainLayout>	6✔
223	<PageTitle title="Knights Store \| Search" />	6✔
224	<SearchPage />	6✔
225	</MainLayout>	6✔
226	}	6✔
227	/>	6✔
228		6✔
229	<Route	6✔
230	path="/product/:id"	6✔
231	element={	6✔
232	<MainLayout>	6✔
233	<PageTitle title="Knights Store \| View Product " />	6✔
234	<SingleProduct />	6✔
235	</MainLayout>	6✔
236	}	6✔
237	/>	6✔
238	<Route	6✔
239	path="/cart"	6✔
240	element={	6✔
241	<MainLayout>	6✔
242	<PageTitle title="Knights Store \| Cart" />	6✔
243	<Cart />	6✔
244	</MainLayout>	6✔
245	}	6✔
246	/>	6✔
247		6✔
248	<Route	6✔
249	path="/orders"	6✔
250	element={	6✔
251	<MainLayout>	6✔
252	<PageTitle title="Knights Store \| Orders" />	6✔
253	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6✔
254	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6✔
255	{userToken && isBuyer && <BuyerOrders />}	6!
256	{!userToken && <Navigate to="/login" />}	6!
257	</MainLayout>	6!
258	}	6✔
259	/>	6✔
260		6✔
261	<Route	6✔
262	path="/orders/:orderId"	6✔
263	element={	6✔
264	<MainLayout>	6✔
265	<PageTitle title="Knights Store \| Orders" />	6✔
266	{userToken && isAdmin && <Navigate to="/admin/dashboard" />}	6✔
267	{userToken && isVendor && <Navigate to="/vendor/dashboard" />}	6✔
268	{userToken && isBuyer && <SingleBuyerOrder />}	6!
269	{!userToken && <Navigate to="/login" />}	6!
270	</MainLayout>	6!
271	}	6✔
272	/>	6✔
273		6✔
274	<Route	6✔
275	path="/checkout"	6✔
276	element={	6✔
277	<MainLayout>	6✔
278	<PageTitle title="Knights Store \| Create Order" />	6✔
279	{userToken && isBuyer && <CheckOutMain />}	6✔
280	{!userToken && <Navigate to="/login" />}	6✔
281	</MainLayout>	6!
282	}	6✔
283	/>	6✔
284	<Route	6✔
285	path="/completion"	6✔
286	element={	6✔
287	<MainLayout>	6✔
288	<PageTitle title="Knights Store \| Payment successful" />	6✔
289	<PaymentOk />	6✔
290	</MainLayout>	6✔
291	}	6✔
292	/>	6✔
293	</Routes>	6✔
294	);	6✔
295	};	6✔
296		6✔
297	export default Router;	6✔

atlp-rwanda / knights-ecomm-fe / 10080887320

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