From 5f23ef23223ee002678266c803aeec235034a9ce Mon Sep 17 00:00:00 2001
From: dragon1211 <inddev0807@gmail.com>
Date: Sat, 29 Jan 2022 16:05:35 -0800
Subject: [PATCH] fixed alert_state_msg

---
 backend/public/js/index.js                    | 25 ++++++++++++++++---
 .../js/component/alert_state_msg.jsx          | 13 +++++++---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/backend/public/js/index.js b/backend/public/js/index.js
index 669aed7a..8421d768 100644
--- a/backend/public/js/index.js
+++ b/backend/public/js/index.js
@@ -34758,6 +34758,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
+
 function AlertStateMessage() {
   var _useLocation = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_3__.useLocation)(),
       pathname = _useLocation.pathname,
@@ -34770,20 +34771,36 @@ function AlertStateMessage() {
       _success = _useState2[0],
       setSuccess = _useState2[1];
 
+  var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
+      _useState4 = _slicedToArray(_useState3, 2),
+      _400error = _useState4[0],
+      set400Error = _useState4[1];
+
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     if (state) {
-      setSuccess(state);
+      if (pathname.search('/register/error') > 0) {
+        set400Error(state);
+      } else {
+        setSuccess(state);
+      }
+
       navigator(pathname);
     }
   }, [pathname]);
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.Fragment, {
-    children: _success ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_alert__WEBPACK_IMPORTED_MODULE_1__["default"], {
+  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.Fragment, {
+    children: [_400error ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_alert__WEBPACK_IMPORTED_MODULE_1__["default"], {
+      type: "fail",
+      hide: function hide() {
+        return set400Error('');
+      },
+      children: _400error
+    }) : null, _success ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_alert__WEBPACK_IMPORTED_MODULE_1__["default"], {
       type: "success",
       hide: function hide() {
         return setSuccess('');
       },
       children: _success
-    }) : null
+    }) : null]
   });
 }
 
diff --git a/backend/resources/js/component/alert_state_msg.jsx b/backend/resources/js/component/alert_state_msg.jsx
index 44f4f93f..9aeb2a3b 100644
--- a/backend/resources/js/component/alert_state_msg.jsx
+++ b/backend/resources/js/component/alert_state_msg.jsx
@@ -6,16 +6,23 @@ export default function AlertStateMessage() {
   const { pathname, state } = useLocation();
   const navigator = useNavigate();
   const [_success, setSuccess] = useState('');
+  const [_400error, set400Error] = useState('');
 
   useEffect(() => {
-      if(state){
+    if(state){
+      if( pathname.search('/register/error') > 0){
+        set400Error(state);
+      }
+      else{
         setSuccess(state);
-        navigator(pathname);
-      } 
+      }
+      navigator(pathname);
+    } 
   }, [pathname]);
 
   return (
     <>
+    {  _400error ? <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> : null}
     {  _success ?  <Alert type="success" hide={()=>setSuccess('')}>{ _success }</Alert> : null}
     </>
   );