10108555054

Committed 26 Jul 2024 08:53AM UTC coverage: 90.923% (+0.01%) from 90.912%

Build # 10108555054

Build Type

Pull #83

github

Committed by

aimedivin

Commit Message

fix(google-auth): resolve google oauth login issue

Pull Request Pull Request #83: resolve google oauth login issue

Run Details

1107 of 1370 branches covered (80.8%)

Branch coverage included in aggregate %.

136 of 138 new or added lines in 7 files covered. (98.55%)

24 existing lines in 2 files now uncovered.

11554 of 12555 relevant lines covered (92.03%)

12.45 hits per line

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

95.61

/src/Routes/Router.tsx

/* eslint-disable*/
import React, { useEffect } from 'react';
import { Navigate, Outlet, Route, Routes, To } 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 { 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 ProtectedRoute from './ProtectedRoute';
import NotFound from './NotFound';
import DashboardAccount from '../components/Dashboard/DashboardAccount/DashboardAccount';
import VendorOrder from '../pages/Orders/VendorOrder';
import SingleVendorOrder from '../pages/Orders/SingleVendorOrder';
import AdminOrders from '../pages/Orders/AdminOrders';
import SingleAdminOrder from '../pages/Orders/SingleAdminOrder';
import { JSX } from 'react/jsx-runtime';
import GoogleLogin from '../pages/Authentication/GoogleLogin';

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

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

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

  const conditionalNavigate = (
    adminPath: To,
    vendorPath: To,
    buyerPath: JSX.Element | To | any
  ) => (
    <>
      {userToken && isAdmin && <Navigate to={adminPath} />}
      {userToken && isVendor && <Navigate to={vendorPath} />}
      {userToken && isBuyer && <Navigate to={buyerPath} />}
    </>
  );

  return (
    <Routes>
      <Route
        path="/"
        element={
          <>
            {!isAdmin && !isVendor ? (
              <MainLayout>
                <PageTitle title="Knights Store" />
                <Home />
              </MainLayout>
            ) : (
              conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')
            )}
          </>
        }
      />

      <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 />
            {conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')}
          </MainLayout>
        }
      />

      <Route
        path="/reset-password"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Reset Password" />
            <ResetPassword />
            {conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')}
          </MainLayout>
        }
      />

      <Route
        path="/login"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Login" />
            {conditionalNavigate('/admin/dashboard/users', '/vendor/dashboard', '/')}
            {!userToken && <Login />}
          </MainLayout>
        }
      />

      <Route
        path="/login/google-auth"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Login" />
            {conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')}
            {!userToken && <GoogleLogin />}
          </MainLayout>
        }
      />

      <Route
        path="/suspended-account"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Suspended Account" />
            {userToken && <Navigate to="/" />}
            <SuspendedAccount />
          </MainLayout>
        }
      />

      <Route
        path="/otp-verification"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Verify OTP" />
            <OtpPage />
            {conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')}
          </MainLayout>
        }
      />

      <Route
        path="/wishlist"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Wishlist" />
            {userToken ? <WishlistPage /> : <Navigate to="/" />}
          </MainLayout>
        }
      />

      <Route
        path="/profile"
        element={
          <MainLayout>
            <PageTitle title="Knights Store | Profile" />
            {userToken ? <DashboardAccount /> : <Navigate to="/" />}
          </MainLayout>
        }
      />

      <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="/vendor/dashboard/*"
        element={
          <ProtectedRoute requiredRole="vendor">
            <DashboardLayout />
          </ProtectedRoute>
        }
      >
        <Route index element={<DashboardProducts />} />
        <Route path="account" element={<DashboarInnerLayout />}>
          <Route index element={<DashboardAccount />} />
        </Route>
        <Route path="orders" element={<Outlet />}>
          <Route path="" element={<VendorOrder />} />
          <Route path=":orderId" element={<SingleVendorOrder />} />
        </Route>
        <Route path="products" element={<DashboarInnerLayout />}>
          <Route index element={<DashboardProducts />} />
          <Route path="new" element={<DashboardNewProducts />} />
          <Route path=":id" element={<DashboardSingleProduct />} />
          <Route path=":id/edit" element={<DashboardEditProducts />} />
        </Route>
        <Route path="*" element={<NotFound />} />
      </Route>

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

      <Route element={<ProtectedRoute requiredRole="buyer" />}>
        <Route
          path="/checkout"
          element={
            <MainLayout>
              <PageTitle title="Knights Store | Create Order" />
              {userToken && isBuyer ? <CheckOutMain /> : <Navigate to="/login" />}
            </MainLayout>
          }
        />
        <Route
          path="/completion"
          element={
            <MainLayout>
              <PageTitle title="Knights Store | Payment successful" />
              <PaymentOk />
            </MainLayout>
          }
        />
        <Route
          path="/orders/:orderId"
          element={
            <MainLayout>
              <PageTitle title="Knights Store | Orders" />
              {conditionalNavigate('/admin/dashboard', '/vendor/dashboard', <SingleBuyerOrder />)}
              {!userToken && <Navigate to="/login" />}
            </MainLayout>
          }
        />
        <Route path="*" element={<NotFound />} />
      </Route>

      <Route
        path="/admin/dashboard"
        element={
          <ProtectedRoute requiredRole="admin">
            <DashboardLayout />
          </ProtectedRoute>
        }
      >
        <Route path="" element={<DashboarInnerLayout />}>
          <Route path="" element={<Users />} />
        </Route>
        <Route path="users" element={<DashboarInnerLayout />}>
          <Route path="" element={<Users />} />
          <Route path=":id" element={<SingleUser />} />
        </Route>
        <Route path="orders" element={<DashboarInnerLayout />}>
          <Route path="" element={<AdminOrders />} />
          <Route path=":orderId" element={<SingleAdminOrder />} />
        </Route>
        <Route path="account" element={<DashboarInnerLayout />}>
          <Route index element={<DashboardAccount />} />
        </Route>
      </Route>

      <Route path="*" element={<NotFound />} />
    </Routes>
  );
};

export default Router;

1	/* eslint-disable*/	1✔
2	import React, { useEffect } from 'react';	1✔
3	import { Navigate, Outlet, Route, Routes, To } from 'react-router-dom';	1✔
4	import PageTitle from '../components/PageTitle';	1✔
5	import Register from '../pages/Authentication/Register';	1✔
6	import RegisterVendor from '../pages/Authentication/RegisterVendor';	1✔
7	import VerifyEmail from '../pages/Authentication/VerifyEmail';	1✔
8	import Login, { DecodedToken } from '../pages/Authentication/Login';	1✔
9	import { useDispatch, useSelector } from 'react-redux';	1✔
10	import { RootState } from '../redux/store';	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 ProtectedRoute from './ProtectedRoute';	1✔
37	import NotFound from './NotFound';	1✔
38	import DashboardAccount from '../components/Dashboard/DashboardAccount/DashboardAccount';	1✔
39	import VendorOrder from '../pages/Orders/VendorOrder';	1✔
40	import SingleVendorOrder from '../pages/Orders/SingleVendorOrder';	1✔
41	import AdminOrders from '../pages/Orders/AdminOrders';	1✔
42	import SingleAdminOrder from '../pages/Orders/SingleAdminOrder';	1✔
43	import { JSX } from 'react/jsx-runtime';	1✔
44	import GoogleLogin from '../pages/Authentication/GoogleLogin';	1✔
45		1✔
46	const Router = () => {	1✔
47	const { userToken } = useSelector((state: RootState) => state.auth);	6✔
48	const { decodedToken } = useJwt<DecodedToken>(userToken);	6✔
49	const dispatch = useDispatch();	6✔
50	const location = useLocation();	6✔
51		6✔
52	const isAdmin = decodedToken?.role.toLowerCase() === 'admin';	6!
53	const isVendor = decodedToken?.role.toLowerCase() === 'vendor';	6!
54	const isBuyer = decodedToken?.role.toLowerCase() === 'buyer';	6!
55		6✔
56	useEffect(() => {	6✔
57	if (userToken && location.pathname === '/wishlist') {	3!
58	dispatch(setOnWishlistPage(true));	×
59	} else {	3✔
60	dispatch(setOnWishlistPage(false));	3✔
61	}	3✔
62	}, [location.pathname, dispatch, userToken]);	6✔
63		6✔
64	const conditionalNavigate = (	6✔
65	adminPath: To,	36✔
66	vendorPath: To,	36✔
67	buyerPath: JSX.Element \| To \| any	36✔
68	) => (	36✔
69	<>	36✔
70	{userToken && isAdmin && <Navigate to={adminPath} />}	36!
71	{userToken && isVendor && <Navigate to={vendorPath} />}	36!
72	{userToken && isBuyer && <Navigate to={buyerPath} />}	36!
73	</>	36✔
74	);	6✔
75		6✔
76	return (	6✔
77	<Routes>	6✔
78	<Route	6✔
79	path="/"	6✔
80	element={	6✔
81	<>	6✔
82	{!isAdmin && !isVendor ? (	6✔
83	<MainLayout>	6✔
84	<PageTitle title="Knights Store" />	6✔
85	<Home />	6✔
86	</MainLayout>	6!
NEW 87	) : (	×
NEW 88	conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')	×
89	)}	6✔
90	</>	6✔
91	}	6✔
92	/>	6✔
93		6✔
94	<Route	6✔
95	path="/register"	6✔
96	element={	6✔
97	<MainLayout>	6✔
98	<PageTitle title="Knights Store \| Register" />	6✔
99	<Register />	6✔
100	</MainLayout>	6✔
101	}	6✔
102	/>	6✔
103		6✔
104	<Route	6✔
105	path="/register-vendor"	6✔
106	element={	6✔
107	<MainLayout>	6✔
108	<PageTitle title="Knights Store \| Register Vendor" />	6✔
109	<RegisterVendor />	6✔
110	</MainLayout>	6✔
111	}	6✔
112	/>	6✔
113		6✔
114	<Route	6✔
115	path="/verify-email/:token"	6✔
116	element={	6✔
117	<MainLayout>	6✔
118	<PageTitle title="Knights Store \| Verify Email" />	6✔
119	<VerifyEmail />	6✔
120	</MainLayout>	6✔
121	}	6✔
122	/>	6✔
123		6✔
124	<Route	6✔
125	path="/forgot-password"	6✔
126	element={	6✔
127	<MainLayout>	6✔
128	<PageTitle title="Knights Store \| Forgot Password" />	6✔
129	<ForgotPassword />	6✔
130	{conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')}	6✔
131	</MainLayout>	6✔
132	}	6✔
133	/>	6✔
134		6✔
135	<Route	6✔
136	path="/reset-password"	6✔
137	element={	6✔
138	<MainLayout>	6✔
139	<PageTitle title="Knights Store \| Reset Password" />	6✔
140	<ResetPassword />	6✔
141	{conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')}	6✔
142	</MainLayout>	6✔
143	}	6✔
144	/>	6✔
145		6✔
146	<Route	6✔
147	path="/login"	6✔
148	element={	6✔
149	<MainLayout>	6✔
150	<PageTitle title="Knights Store \| Login" />	6✔
151	{conditionalNavigate('/admin/dashboard/users', '/vendor/dashboard', '/')}	6✔
152	{!userToken && <Login />}	6✔
153	</MainLayout>	6✔
154	}	6✔
155	/>	6✔
156		6✔
157	<Route	6✔
158	path="/login/google-auth"	6✔
159	element={	6✔
160	<MainLayout>	6✔
161	<PageTitle title="Knights Store \| Login" />	6✔
162	{conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')}	6✔
163	{!userToken && <GoogleLogin />}	6✔
164	</MainLayout>	6✔
165	}	6✔
166	/>	6✔
167		6✔
168	<Route	6✔
169	path="/suspended-account"	6✔
170	element={	6✔
171	<MainLayout>	6✔
172	<PageTitle title="Knights Store \| Suspended Account" />	6✔
173	{userToken && <Navigate to="/" />}	6!
174	<SuspendedAccount />	6✔
175	</MainLayout>	6✔
176	}	6✔
177	/>	6✔
178		6✔
179	<Route	6✔
180	path="/otp-verification"	6✔
181	element={	6✔
182	<MainLayout>	6✔
183	<PageTitle title="Knights Store \| Verify OTP" />	6✔
184	<OtpPage />	6✔
185	{conditionalNavigate('/admin/dashboard', '/vendor/dashboard', '/')}	6✔
186	</MainLayout>	6✔
187	}	6✔
188	/>	6✔
189		6✔
190	<Route	6✔
191	path="/wishlist"	6✔
192	element={	6✔
193	<MainLayout>	6✔
194	<PageTitle title="Knights Store \| Wishlist" />	6✔
195	{userToken ? <WishlistPage /> : <Navigate to="/" />}	6!
196	</MainLayout>	6✔
197	}	6✔
198	/>	6✔
199		6✔
200	<Route	6✔
201	path="/profile"	6✔
202	element={	6✔
203	<MainLayout>	6✔
204	<PageTitle title="Knights Store \| Profile" />	6✔
205	{userToken ? <DashboardAccount /> : <Navigate to="/" />}	6!
206	</MainLayout>	6✔
207	}	6✔
208	/>	6✔
209		6✔
210	<Route	6✔
211	path="/search"	6✔
212	element={	6✔
213	<MainLayout>	6✔
214	<PageTitle title="Knights Store \| Search" />	6✔
215	<SearchPage />	6✔
216	</MainLayout>	6✔
217	}	6✔
218	/>	6✔
219		6✔
220	<Route	6✔
221	path="/product/:id"	6✔
222	element={	6✔
223	<MainLayout>	6✔
224	<PageTitle title="Knights Store \| View Product" />	6✔
225	<SingleProduct />	6✔
226	</MainLayout>	6✔
227	}	6✔
228	/>	6✔
229		6✔
230	<Route	6✔
231	path="/vendor/dashboard/*"	6✔
232	element={	6✔
233	<ProtectedRoute requiredRole="vendor">	6✔
234	<DashboardLayout />	6✔
235	</ProtectedRoute>	6✔
236	}	6✔
237	>	6✔
238	<Route index element={<DashboardProducts />} />	6✔
239	<Route path="account" element={<DashboarInnerLayout />}>	6✔
240	<Route index element={<DashboardAccount />} />	6✔
241	</Route>	6✔
242	<Route path="orders" element={<Outlet />}>	6✔
243	<Route path="" element={<VendorOrder />} />	6✔
244	<Route path=":orderId" element={<SingleVendorOrder />} />	6✔
245	</Route>	6✔
246	<Route path="products" element={<DashboarInnerLayout />}>	6✔
247	<Route index element={<DashboardProducts />} />	6✔
248	<Route path="new" element={<DashboardNewProducts />} />	6✔
249	<Route path=":id" element={<DashboardSingleProduct />} />	6✔
250	<Route path=":id/edit" element={<DashboardEditProducts />} />	6✔
251	</Route>	6✔
252	<Route path="*" element={<NotFound />} />	6✔
253	</Route>	6✔
254		6✔
255	<Route	6✔
256	path="/cart"	6✔
257	element={	6✔
258	<MainLayout>	6✔
259	<PageTitle title="Knights Store \| Cart" />	6✔
260	<Cart />	6✔
261	</MainLayout>	6✔
262	}	6✔
263	/>	6✔
264		6✔
265	<Route element={<ProtectedRoute requiredRole="buyer" />}>	6✔
266	<Route	6✔
267	path="/checkout"	6✔
268	element={	6✔
269	<MainLayout>	6✔
270	<PageTitle title="Knights Store \| Create Order" />	6✔
271	{userToken && isBuyer ? <CheckOutMain /> : <Navigate to="/login" />}	6!
272	</MainLayout>	6✔
273	}	6✔
274	/>	6✔
275	<Route	6✔
276	path="/completion"	6✔
277	element={	6✔
278	<MainLayout>	6✔
279	<PageTitle title="Knights Store \| Payment successful" />	6✔
280	<PaymentOk />	6✔
281	</MainLayout>	6✔
282	}	6✔
283	/>	6✔
284	<Route	6✔
285	path="/orders/:orderId"	6✔
286	element={	6✔
287	<MainLayout>	6✔
288	<PageTitle title="Knights Store \| Orders" />	6✔
289	{conditionalNavigate('/admin/dashboard', '/vendor/dashboard', <SingleBuyerOrder />)}	6✔
290	{!userToken && <Navigate to="/login" />}	6✔
291	</MainLayout>	6✔
292	}	6✔
293	/>	6✔
294	<Route path="*" element={<NotFound />} />	6✔
295	</Route>	6✔
296		6✔
297	<Route	6✔
298	path="/admin/dashboard"	6✔
299	element={	6✔
300	<ProtectedRoute requiredRole="admin">	6✔
301	<DashboardLayout />	6✔
302	</ProtectedRoute>	6✔
303	}	6✔
304	>	6✔
305	<Route path="" element={<DashboarInnerLayout />}>	6✔
306	<Route path="" element={<Users />} />	6✔
307	</Route>	6✔
308	<Route path="users" element={<DashboarInnerLayout />}>	6✔
309	<Route path="" element={<Users />} />	6✔
310	<Route path=":id" element={<SingleUser />} />	6✔
311	</Route>	6✔
312	<Route path="orders" element={<DashboarInnerLayout />}>	6✔
313	<Route path="" element={<AdminOrders />} />	6✔
314	<Route path=":orderId" element={<SingleAdminOrder />} />	6✔
315	</Route>	6✔
316	<Route path="account" element={<DashboarInnerLayout />}>	6✔
317	<Route index element={<DashboardAccount />} />	6✔
318	</Route>	6✔
319	</Route>	6✔
320		6✔
321	<Route path="*" element={<NotFound />} />	6✔
322	</Routes>	6✔
323	);	6✔
324	};	6✔
325		1✔
326	export default Router;	1✔

atlp-rwanda / knights-ecomm-fe / 10108555054

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