From 5b304c89523c44414ce40fdaed4cbbd982b0fe79 Mon Sep 17 00:00:00 2001
From: Moaz Dawalibi <moaazaldwalibi@gmail.com>
Date: Wed, 23 Oct 2024 16:41:08 +0300
Subject: [PATCH] fixes

---
 src/Layout/Ui/SideBar.tsx                     |  3 +-
 src/Pages/Admin/Notifications/Page.tsx        | 45 +++++++++++++------
 .../Admin/Roles/Permissions/FormTable.tsx     | 17 ++++---
 src/Pages/Admin/Roles/Permissions/Table.tsx   |  2 +-
 src/Pages/Admin/Setting/Form/SettingTabs.tsx  |  7 ++-
 src/Pages/Admin/Student/useTableColumns.tsx   |  5 +--
 src/Styles/Pages/notifications.scss           |  4 ++
 src/api/reseller.ts                           |  4 +-
 src/translate/ar.json                         |  3 +-
 src/types/Notifications.ts                    |  4 +-
 10 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/src/Layout/Ui/SideBar.tsx b/src/Layout/Ui/SideBar.tsx
index 70ac7b0..d499f9a 100644
--- a/src/Layout/Ui/SideBar.tsx
+++ b/src/Layout/Ui/SideBar.tsx
@@ -34,10 +34,9 @@ const SideBar = ({
   return (
     <div className={isOpen ? "side_bar" : "side_bar side_bar_closed"}>
       <div className="side_bar_header">
-        <img src={isOpen ? "/App/Logo.svg" : "/App/Logo.svg"} alt="" />
+        <img src={"/App/Logo.svg"} alt="" />
         <HiMenuAlt3 onClick={toggleSidebar} />
       </div>
-      {/* <Divider /> */}
       <HiMenuAlt2
         className="side_bar_close_menu"
         style={isOpen ? { display: "none" } : { display: "inline" }}
diff --git a/src/Pages/Admin/Notifications/Page.tsx b/src/Pages/Admin/Notifications/Page.tsx
index 4ad956c..b2eec17 100644
--- a/src/Pages/Admin/Notifications/Page.tsx
+++ b/src/Pages/Admin/Notifications/Page.tsx
@@ -4,16 +4,24 @@ import { NotificationArray } from './NotificationArray';
 import { notifications } from '../../../types/Notifications';
 import Card from './Card';
 import TrashButton from '../../../Components/Ui/TrashButton';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 
 const Page = () => {
     const {t} = useTranslation(); 
-    const [pop, setPop] = useState(NotificationArray)
+    const [pop, setPop] = useState(NotificationArray);
+    const [isEmpty, setIsEmpty] = useState(pop.length < 1 ? true : false);
 
     const handleDeleteAll = () => {
         setPop([])
     }
-    
+
+    useEffect(()=>{
+        if(pop.length < 1){
+            setIsEmpty(true);
+        }else{
+            setIsEmpty(false);
+        }
+    },[pop])
   return (
     <div className='notification_container'>
         <div className='notification_header'>
@@ -23,17 +31,26 @@ const Page = () => {
              name='delete_all'/>
         </div>
         <Divider/>
-        <div className="notification_body">
-            {pop?.map((not:notifications)=>(
-                <Card
-                 id={not?.id}
-                 name={not?.name} 
-                 date={not?.date} 
-                 pop={pop}
-                 setPop={setPop}
-                 image={not?.image}/>
-            ))}
-        </div>
+        {
+            isEmpty === false 
+            ?
+            <div className="notification_body">
+                {pop?.map((not:notifications)=>(
+                    <Card
+                    id={not?.id}
+                    name={not?.name} 
+                    date={not?.date} 
+                    pop={pop}
+                    setPop={setPop}
+                    image={not?.image}/>
+                ))}
+            </div>
+            :
+            <div className='notification_body_empty'>
+                {t("practical.does_not_exist_notification")}
+            </div>
+            
+        }
     </div>
   )
 }
diff --git a/src/Pages/Admin/Roles/Permissions/FormTable.tsx b/src/Pages/Admin/Roles/Permissions/FormTable.tsx
index bc68f7d..a46c49e 100644
--- a/src/Pages/Admin/Roles/Permissions/FormTable.tsx
+++ b/src/Pages/Admin/Roles/Permissions/FormTable.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import DataTable from '../../../../Layout/Dashboard/Table/DataTable'
 import { useColumns } from './useTableColumns'
 import { useFormikContext } from 'formik'
@@ -15,14 +14,14 @@ const FormTable = ({response,...props}:IFormTable) => {
     <div>
       
       <DataTable
-      response={response}
-      useColumns={useColumns}
-      dataSource={values}
-      pagination={false}
-      loading={false}
-      rowKey={"name"}
-      {...props}
-    />
+        response={response}
+        useColumns={useColumns}
+        dataSource={values}
+        pagination={false}
+        loading={false}
+        rowKey={"name"}
+        {...props}
+      />
 
     </div>
   )
diff --git a/src/Pages/Admin/Roles/Permissions/Table.tsx b/src/Pages/Admin/Roles/Permissions/Table.tsx
index e58f42d..9d2f6f2 100644
--- a/src/Pages/Admin/Roles/Permissions/Table.tsx
+++ b/src/Pages/Admin/Roles/Permissions/Table.tsx
@@ -84,7 +84,7 @@ const App: React.FC = () => {
                   </Suspense>
                 ),
                 size: "large",
-              }}
+              }}  
             />
           
           </Form>
diff --git a/src/Pages/Admin/Setting/Form/SettingTabs.tsx b/src/Pages/Admin/Setting/Form/SettingTabs.tsx
index 42f595a..b2775af 100644
--- a/src/Pages/Admin/Setting/Form/SettingTabs.tsx
+++ b/src/Pages/Admin/Setting/Form/SettingTabs.tsx
@@ -3,10 +3,9 @@ import type { TabsProps } from 'antd';
 import { Tabs } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { useWindowResize } from '../../../../Hooks/useWindowResize';
-const FileSetting = lazy(() => import("./FileSetting"));
-const SecuritySetting = lazy(() => import("./SecuritySetting"));
-const Notification = lazy(() => import("./Notification"));
-
+import FileSetting from './FileSetting';
+import SecuritySetting from './SecuritySetting';
+import Notification from './Notification';
 type TabPosition = 'left' | 'right' | 'top' | 'bottom';
 
 const SettingTabs: React.FC = () => {
diff --git a/src/Pages/Admin/Student/useTableColumns.tsx b/src/Pages/Admin/Student/useTableColumns.tsx
index a882da3..10b0d6e 100644
--- a/src/Pages/Admin/Student/useTableColumns.tsx
+++ b/src/Pages/Admin/Student/useTableColumns.tsx
@@ -19,7 +19,7 @@ export const useColumns = () => {
   const navigate = useNavigate();
 
   const handelShow = (record: Student) => {
-    navigate(`${record?.user_id}`);
+    // navigate(`${record?.user_id}`);
   };
 
   const handelDelete = (data: Student) => {
@@ -56,7 +56,6 @@ export const useColumns = () => {
       align: "center",
       render: (_text, record) => record?.last_name,
       ellipsis:true,
-
     },
     {
       title: `${t("columns.sex")}`,
@@ -76,7 +75,7 @@ export const useColumns = () => {
           <ActionButtons
             canDelete={canDeleteStudent}
             canEdit={canEditStudent}
-            canShow={canShowStudent}
+            // canShow={canShowStudent}
             index={index}
             onDelete={() => handelDelete(record)}
             onEdit={() => handleEdit(record)}
diff --git a/src/Styles/Pages/notifications.scss b/src/Styles/Pages/notifications.scss
index 35f5982..a8a6513 100644
--- a/src/Styles/Pages/notifications.scss
+++ b/src/Styles/Pages/notifications.scss
@@ -20,6 +20,10 @@
             color: var(--secondary);
         }
     }
+    
+    .notification_body_empty{
+        @include Flex;
+    }
 
     .notification_body {
         display: flex;
diff --git a/src/api/reseller.ts b/src/api/reseller.ts
index dc1fddf..d16bc8a 100644
--- a/src/api/reseller.ts
+++ b/src/api/reseller.ts
@@ -15,7 +15,7 @@ const KEY = "reseller";
 export const useGetAllReseller = (params?: any, options?: any) =>
   useGetQuery(KEY, API.GET, params, options);
 export const useAddReseller = () => useAddMutation(KEY, API.ADD);
-export const useUpdateReseller = (params?: any) =>
+export const useUpdateReseller = () =>
   useUpdateMutation(KEY, API.GET);
-export const useDeleteReseller = (params?: any) =>
+export const useDeleteReseller = () =>
   useDeleteMutation(KEY, API.DELETE);
diff --git a/src/translate/ar.json b/src/translate/ar.json
index 6d5c734..c9e2730 100644
--- a/src/translate/ar.json
+++ b/src/translate/ar.json
@@ -325,7 +325,8 @@
     "Hide":"اخفاء",
     "sale":"بيع",
     "financial_collection":"التحصيلات",
-    "show_collection":"حصيلة"
+    "show_collection":"حصيلة",
+    "does_not_exist_notification":"عذرا لا يوجد إشعارات..."
   },
   "Table": {
     "header": "",
diff --git a/src/types/Notifications.ts b/src/types/Notifications.ts
index f1ed1e2..f107b4c 100644
--- a/src/types/Notifications.ts
+++ b/src/types/Notifications.ts
@@ -2,5 +2,7 @@ export type notifications = {
     id:number,
     name:string,
     date:string,
-    image:string
+    image:string,
+    setPop?:any,
+    pop?:any,
 }