From 17d0f70416a93a3f12e521115c126adb73885f91 Mon Sep 17 00:00:00 2001
From: KarimAldeen <MhmadKarimAldeen@gmail.com>
Date: Sat, 30 Mar 2024 12:05:35 +0300
Subject: [PATCH] change_error_section

---
 src/Layout/Dashboard/DashBody.tsx | 10 ++------
 src/Layout/app/ErrorPage.tsx      | 40 +++++++++++++++++++++++++++++++
 src/Pages/Users/View/EditForm.tsx |  3 ++-
 src/Pages/Users/formUtil.ts       |  3 ++-
 src/translate/ar.json             |  8 ++++++-
 src/translate/de.json             |  8 ++++++-
 src/translate/en.json             |  8 ++++++-
 7 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 src/Layout/app/ErrorPage.tsx

diff --git a/src/Layout/Dashboard/DashBody.tsx b/src/Layout/Dashboard/DashBody.tsx
index 4bd1fac..8f2f449 100644
--- a/src/Layout/Dashboard/DashBody.tsx
+++ b/src/Layout/Dashboard/DashBody.tsx
@@ -3,6 +3,7 @@ import { QueryStatusEnum } from "../../config/QueryStatus"
 import LoadingPage from "../app/LoadingPage"
 import { useTranslation } from "react-i18next"
 import { BsEmojiFrown } from "react-icons/bs";
+import ErrorPage from "../app/ErrorPage";
 
 
 const DashBody = ({ children , status }: { children: React.ReactNode ,status?:QueryStatusEnum }) => {
@@ -17,14 +18,7 @@ const DashBody = ({ children , status }: { children: React.ReactNode ,status?:Qu
   // Add Your Custom Error Page 
   if(status === QueryStatusEnum.ERROR){
     return (
-    <div className="error_show">
-      <span className="error_icon"><BsEmojiFrown/></span>
-      <span className="error_text">
-        {t("Ops")}...<br/>
-        {t("An Error According")} <br/>
-        {t("Please Try Again Later")}
-      </span>
-    </div>
+  <ErrorPage/>
     )
   }
   
diff --git a/src/Layout/app/ErrorPage.tsx b/src/Layout/app/ErrorPage.tsx
new file mode 100644
index 0000000..6394925
--- /dev/null
+++ b/src/Layout/app/ErrorPage.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { CloseCircleOutlined } from '@ant-design/icons';
+import { Button, Result, Typography } from 'antd';
+import { useTranslation } from 'react-i18next'; // Import useTranslation hook
+import { useNavigate } from 'react-router-dom';
+
+const { Paragraph, Text } = Typography;
+
+const ErrorPage: React.FC = () => {
+  const { t } = useTranslation(); // Initialize useTranslation hook
+  const naviagate = useNavigate()
+
+  const handleRefetch = () => {
+    window.location.reload();
+  };
+
+  const handleGoToLogin = () => {
+    naviagate("/")
+  };
+
+  return (
+    <Result
+      status="error"
+      title={t('errorPage.networkError')}
+      subTitle={t('errorPage.checkAndModify')} 
+      extra={[
+        <Button type="primary" key="refetch" onClick={handleRefetch}>
+          {t('errorPage.refetch')} {/* Translate button text */}
+        </Button>,
+        <Button key="goToLogin" onClick={handleGoToLogin}>
+          {t('errorPage.goToHome')} {/* Translate button text */}
+        </Button>,
+      ]}
+    >
+     
+    </Result>
+  );
+};
+
+export default ErrorPage;
diff --git a/src/Pages/Users/View/EditForm.tsx b/src/Pages/Users/View/EditForm.tsx
index ea8e61b..07060c0 100644
--- a/src/Pages/Users/View/EditForm.tsx
+++ b/src/Pages/Users/View/EditForm.tsx
@@ -7,12 +7,13 @@ function Form() {
   return (
     <Row xs={1} sm={1} md={1} lg={2} xl={2}>
       <Col>
-      <ValidationField name="password" />
+      <ValidationField name="new_password" />
 
 
       </Col>
       <Col>
     
+      <ValidationField name="old_password" />
 
       </Col>
 
diff --git a/src/Pages/Users/formUtil.ts b/src/Pages/Users/formUtil.ts
index b879477..7d5e227 100644
--- a/src/Pages/Users/formUtil.ts
+++ b/src/Pages/Users/formUtil.ts
@@ -7,7 +7,8 @@ export const getInitialValues = (objectToEdit: any | null = null): any => {
   //@ts-ignore
   return {
     // id: objectToEdit?.id ,
-    password: objectToEdit?.password ,
+    new_password: objectToEdit?.password ,
+    old_password: objectToEdit?.old_password ,
 
 
   };
diff --git a/src/translate/ar.json b/src/translate/ar.json
index 047a930..9f0b9af 100644
--- a/src/translate/ar.json
+++ b/src/translate/ar.json
@@ -160,7 +160,13 @@
   "EditDetails": "تعديل التفاصيل",
   "OrderItems": "عناصر الطلب",
   "reset": "إعادة تعيين",
-  "submit": "إرسال"
+  "submit": "إرسال",
+  "errorPage": {
+    "networkError": "خطأ في الشبكة",
+    "checkAndModify": "يرجى التحقق من الشبكة الخاصة بك وإعادة تحميل الصفحة.",
+    "refetch": "إعادة تحميل الصفحة",
+    "goToHome": "الانتقال إلى الصفحة الرئيسية"
+  }
 
 
 
diff --git a/src/translate/de.json b/src/translate/de.json
index 24d548d..8ebcc84 100644
--- a/src/translate/de.json
+++ b/src/translate/de.json
@@ -157,7 +157,13 @@
   "EditDetails": "Details bearbeiten",
   "OrderItems": "Bestellpositionen",
   "reset": "Zurücksetzen",
-  "submit": "Absenden"
+  "submit": "Absenden",
+  "errorPage": {
+    "networkError": "Netzwerkfehler",
+    "checkAndModify": "Bitte überprüfen Sie Ihr Netzwerk und laden Sie die Seite erneut.",
+    "refetch": "Seite neu laden",
+    "goToHome": "Zum Startseite"
+  }
 
 
 
diff --git a/src/translate/en.json b/src/translate/en.json
index c58cf23..c65299c 100644
--- a/src/translate/en.json
+++ b/src/translate/en.json
@@ -162,7 +162,13 @@
   "EditDetails": "Edit Details",
   "OrderItems": "Order Items",
   "reset": "Reset",
-  "submit": "Submit"
+  "submit": "Submit",
+  "errorPage": {
+    "networkError": "Network Error",
+    "checkAndModify": "Please check your network and refetch the page.",
+    "refetch": "Refetch Page",
+    "goToHome": "Go to Home"
+  }
 
 
 }
\ No newline at end of file