Merge pull request #57 from atlp-rwanda/bg-fix-dashboard

src/__tests__/CreateProdudash.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import Page from '@/app/dashboard/addproduct/page';
+import Page from '@/app/dashboard/product/create/page';
 import request from '@/utils/axios';
 import { useRouter } from 'next/navigation';
 

src/__tests__/ProfileeditDashboard.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import Page from '@/app/dashboard/profile_/[id]/page';
+import Page from '@/app/dashboard/profile/[id]/page';
 import request from '@/utils/axios';
 import { useRouter } from 'next/navigation';
 

src/__tests__/UpdateReduce.test.tsx

@@ -72,7 +72,7 @@ describe('updatePassword slice', () => {
 
     const action = {
       type: updatePassword.rejected.type,
-      error: 'Failed to update password',
+      erro: 'Failed to update password',
     };
 
     const state = reducer(initialState, action);

src/__tests__/ZcartManagement.test.tsx

@@ -284,10 +284,6 @@ describe('userCartSlice', () => {
     // Assertions
     expect(mockedRequest.put).toHaveBeenCalledWith('/carts', expectedItems);
     const actions = dispatch.mock.calls.map((call) => call[0]);
-    console.log(
-      '1111111111111111111111111111111111111111111111111111111111111111111111111111111',
-      result,
-    );
     expect(result.payload).toEqual({ data: 'success' });
     expect(actions[0].type).toBe(handleRemoveItemInCart.pending.type);
     expect(actions[1].type).toBe(handleRemoveItemInCart.rejected.type);

src/__tests__/app.test.tsx

@@ -55,7 +55,6 @@ describe('Signup Components', () => {
     expect(screen.getByPlaceholderText('Confirm Password')).toBeInTheDocument();
   });
   it('displays error message on Signup failure', async () => {
-    console.log('this is env cccccccccccccccccccccc', process.env.URL);
     mockaxios.onPost(`${process.env.URL}/users/signup`).reply(409, {
       message: 'User with this email already exists',
     });

src/__tests__/singleProduct.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import Page from '@/app/dashboard/products_/[id]/page';
+import Page from '@/app/dashboard/product/[id]/page';
 import request from '@/utils/axios';
 import { useRouter } from 'next/navigation';
 

src/__tests__/updatesDash.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import Page from '@/app/dashboard/product_/[id]/page';
+import Page from '@/app/dashboard/product/[id]/edit/page';
 import request from '@/utils/axios';
 import { useRouter } from 'next/navigation';
 import { Provider } from 'react-redux';

src/app/dashboard/product_/[id]/page.tsx → src/app/dashboard/product/[id]/edit/page.tsx

@@ -34,11 +34,11 @@ function page() {
       <ProductPopup
         product={product}
         isOpen={true}
-        onClose={() => console.log('nothing')}
+        onClose={() => router.back()}
       />
-      ;
+
     </LayoutDashboard>
-  );
+  )
 }
 
 export default page;

src/app/dashboard/addproduct/page.tsx → src/app/dashboard/product/create/page.tsx

@@ -26,7 +26,7 @@ function page() {
     <LayoutDashboard pageName="Create Product" isLoading={!user ? true : false}>
       <ProductPopup isOpen={true} onClose={() => console.log('nothing')} />;
     </LayoutDashboard>
-  );
+  )
 }
 
 export default page;

src/app/dashboard/users/page.tsx

@@ -1,17 +1,19 @@
 'use client';
 import React, { use, useEffect, useState } from 'react';
-import DashNavbar from '@/components/DashNavbar';
-import HeaderDash from '@/components/headerDash';
 import UsersPageAdmin from '@/components/UsersAdmin';
 import LayoutDashboard from '@/components/LayoutDashboard';
+import { useRouter } from 'next/navigation';
 
 function page() {
-  const [user, setUser] = useState<any>();
+  const [user, setUser] = useState<any>(); 
+  const router = useRouter()
   useEffect(() => {
     const categ = async () => {
       const user = localStorage.getItem('profile') || '';
       const finalUser = JSON.parse(user);
-
+      if (finalUser.User.Role.name !== 'admin') {
+        router.back();
+      }
       setUser(finalUser?.User);
       console.log(finalUser);
     };