From dc4b93a062010a49a811e842adce86af3e8a4325 Mon Sep 17 00:00:00 2001
From: lulu <lulu.li@tron.network>
Date: Mon, 2 Sep 2024 10:00:15 +0800
Subject: [PATCH] fix: 3.1

---
 src/assets/img/lock-dark.svg       |  4 +--
 src/assets/img/lock.svg            |  2 +-
 src/assets/styles/main.scss        | 18 +++++++++++++
 src/components/Lock/AccountLock.js |  8 +++---
 src/components/Login/Endpoint.js   | 41 +++++-------------------------
 src/layouts/Admin.js               |  8 +++---
 src/utils/checks.js                |  2 +-
 src/views/login/Login.js           | 27 ++++++++++----------
 8 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/src/assets/img/lock-dark.svg b/src/assets/img/lock-dark.svg
index 4eda39e..d559fbb 100644
--- a/src/assets/img/lock-dark.svg
+++ b/src/assets/img/lock-dark.svg
@@ -2,7 +2,7 @@
 <svg width="14px" height="18px" viewBox="0 0 14 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>suoding</title>
     <g id="03.-Dashboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Set1备份" transform="translate(-129.000000, -850.000000)" fill="#5A607F" fill-rule="nonzero">
+        <g id="Set1备份" transform="translate(-129.000000, -850.000000)" fill="#FFF" fill-rule="nonzero">
             <g id="编组-7备份-2" transform="translate(116.000000, 840.000000)">
                 <g id="suoding" transform="translate(13.000000, 10.000000)">
                     <path d="M13.6350646,8.72288608 C13.3917177,8.47454583 13.1016322,8.35031381 12.7647594,8.35031381 L11.6417693,8.35031381 L9.37699172,8.35031381 L4.69788242,8.35031381 L2.33955466,8.35031381 L1.2165888,8.35031381 C0.879716015,8.35031381 0.592662276,8.47454583 0.355645879,8.72288608 C0.118556717,8.97135013 0,9.26750622 0,9.6114286 L0,15.6688357 C0,15.9872282 0.0530691663,16.2866777 0.159110486,16.5668621 C0.265151805,16.8471456 0.414899979,17.0923906 0.608306535,17.3025475 C0.801713091,17.5127539 1.03567339,17.6815827 1.31011472,17.80891 C1.58465306,17.9363364 1.89035861,18 2.22725564,18 L11.6792184,18 C12.0160912,18 12.3248529,17.9363364 12.6056489,17.80891 C12.8864207,17.6815827 13.1296948,17.50639 13.3356167,17.2834558 C13.5414416,17.0605464 13.7036567,16.7993298 13.8222377,16.4999794 C13.9407944,16.2006537 14,15.8789678 14,15.5350206 L14,9.61142862 C14,9.26750622 13.8783387,8.97135015 13.6350646,8.72288608 Z M7.43659576,13.1056741 L7.43659576,15.4092781 C7.43659576,15.6554393 7.24112756,15.854998 7.00001212,15.854998 C6.75889669,15.854998 6.56342849,15.6554393 6.56342849,15.4092781 L6.56342851,13.1056741 C6.04117747,12.9210223 5.66600662,12.4147836 5.66600662,11.8187571 C5.66600662,11.0665801 6.26325302,10.4568354 7.00001215,10.4568354 C7.73677127,10.4568354 8.33401768,11.0665801 8.33401768,11.8187571 C8.33401768,12.4147588 7.9588468,12.9210223 7.43659576,13.1056741 Z" id="形状"></path>
@@ -11,4 +11,4 @@
             </g>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/assets/img/lock.svg b/src/assets/img/lock.svg
index 4eda39e..9ef469a 100644
--- a/src/assets/img/lock.svg
+++ b/src/assets/img/lock.svg
@@ -11,4 +11,4 @@
             </g>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss
index b5cc7a9..0b8eed6 100644
--- a/src/assets/styles/main.scss
+++ b/src/assets/styles/main.scss
@@ -328,3 +328,21 @@
 .ant-form-item .ant-input{
     background-color: transparent
 }
+
+
+.account-lock{
+    .lock-img-hover{
+        display: none
+        }
+      .lock-img{
+            display: block
+        }
+    &:hover{
+        .lock-img{
+            display: none
+        }
+        .lock-img-hover{
+            display: block
+        }
+    }
+}
diff --git a/src/components/Lock/AccountLock.js b/src/components/Lock/AccountLock.js
index ef09b69..e306f36 100644
--- a/src/components/Lock/AccountLock.js
+++ b/src/components/Lock/AccountLock.js
@@ -29,9 +29,11 @@ const AccountLock = () => {
     }, [theme]);
 
     return (
-        <button onClick={lockAccount} className="ml-2 round-btn theme-round-btn ">
-            {theme === 'light' && <img src={require(`assets/img/lock.svg`).default} alt="" />}
-            {theme === 'dark' && <img src={require(`assets/img/lock-dark.svg`).default} alt="" />}
+        <button onClick={lockAccount} className="ml-2 round-btn theme-round-btn account-lock">
+            <img  className="lock-img" src={require(`assets/img/lock.svg`).default} alt="" />
+            <img  className="lock-img-hover " src={require(`assets/img/lock-dark.svg`).default} alt="" />
+            {//theme === 'dark' && <img src={require(`assets/img/lock-dark.svg`).default} alt="" />
+                }
         </button>
     );
 };
diff --git a/src/components/Login/Endpoint.js b/src/components/Login/Endpoint.js
index b268cfa..a304b95 100644
--- a/src/components/Login/Endpoint.js
+++ b/src/components/Login/Endpoint.js
@@ -1,28 +1,16 @@
-import React, { useContext,useState ,useRef,useEffect} from 'react';
-import { mainContext } from 'reducer';
-import { Dropdown, Menu } from 'antd';
-import themeStyle from 'utils/themeStyle.js';
+import React, {useState ,useRef,useEffect} from 'react';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import Emitter from 'utils/eventBus';
-
-import { nodeStatusCheck, getPrivateKey, getRepo, setApiUrl } from 'services/otherService.js';
 import { urlCheck } from 'utils/checks.js';
-
 import { Tooltip } from 'antd';
-import { Truncate } from 'utils/text.js';
 import { t } from 'utils/text.js';
-import ClipboardCopy from 'components/Utils/ClipboardCopy';
 
 
 
 
 const Endpoint = ({ color }) => {
-    // const { dispatch, state } = useContext(mainContext);
-    // const { account } = state;
     const inputRef = useRef(null);
-    const { dispatch, state } = useContext(mainContext);
     const [endpoint, setEndpoint] = useState('');
-    const [loading, setLoading] = useState(false);
 
 
     const getEndpoint = ()=>{
@@ -31,7 +19,6 @@ const Endpoint = ({ color }) => {
         if(NODE_URL){
             inputRef.current.value = NODE_URL;
         }
-        // const isMainMode = await getPageMode();
     }
 
       const getNodeUrl = () => {
@@ -46,28 +33,11 @@ const Endpoint = ({ color }) => {
       };
 
     const save = async (e, wallet) => {
-        const node_url2 = getNodeUrl();
-        Emitter.emit('handleEndpoint', node_url2);
-        return
+        e.preventDefault();
+        e.stopPropagation();
         const node_url = getNodeUrl();
         if (!node_url) return;
-        let result = await nodeStatusCheck(node_url);
-        if (result) {
-          window.nodeStatus = true;
-          dispatch({
-            type: 'SET_NODE_STATUS',
-            nodeStatus: true,
-          });
-        //   getPath();
-        //   Emitter.emit('showMessageAlert', { message: 'setting_success', status: 'success', type: 'frontEnd' });
-        //   Emitter.emit('getHostId')
-          Emitter.emit('handleEndpoint', node_url);
-        } else {
-        //   setPath('');
-        //   Emitter.emit('showMessageAlert', { message: 'setting_error', status: 'error', type: 'frontEnd' });
-        }
-        //   Emitter.emit('handleEndpoint', {});
-        //   Emitter.emit('handleEndpoint', { checked, parentIndex, childIndex });
+        Emitter.emit('handleEndpoint', node_url);
     };
 
     const handleChange = (e) => {
@@ -96,10 +66,11 @@ const Endpoint = ({ color }) => {
               </div>
                 <input
                     type="text"
-                    className="mr-2 common-input theme-bg theme-border-color"
+                    className="mr-2 common-input  theme-border-color"
                     defaultValue="http://localhost:5001"
                     ref={inputRef}
                     onChange={handleChange}
+                    placeholder="http://localhost:5001"
                 />
                 <button className="mt-5 common-btn theme-common-btn login-btn" type="button" onClick={save}>
                     {t('next')}
diff --git a/src/layouts/Admin.js b/src/layouts/Admin.js
index cb4ddd1..90f7d40 100755
--- a/src/layouts/Admin.js
+++ b/src/layouts/Admin.js
@@ -117,9 +117,9 @@ export default function Admin() {
       return;
     }
     const isMainMode = await getPageMode();
-    if (!NODE_URL && !window.location.href.includes('/admin/settings')) {
-      history.push('/admin/settings');
-    } else {
+    // if (!NODE_URL && !window.location.href.includes('/admin/settings')) {
+    //   history.push('/admin/settings');
+    // } else {
       // check node status
       window.loading = true;
       let result = await nodeStatusCheck(NODE_URL, isMainMode);
@@ -138,7 +138,7 @@ export default function Admin() {
           nodeStatus: false,
         });
       }
-    }
+    // }
     window.body = document.getElementsByTagName('body')[0];
   };
 
diff --git a/src/utils/checks.js b/src/utils/checks.js
index ea2118c..4897bc0 100644
--- a/src/utils/checks.js
+++ b/src/utils/checks.js
@@ -55,4 +55,4 @@ export const bttcScanLinkCheck = () => {
 
     return BTTCSCAN_MAIN
 
-};
\ No newline at end of file
+};
diff --git a/src/views/login/Login.js b/src/views/login/Login.js
index 442c21c..80cd0eb 100644
--- a/src/views/login/Login.js
+++ b/src/views/login/Login.js
@@ -1,18 +1,16 @@
-import React, { useEffect, useContext, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import Emitter from 'utils/eventBus';
-import { mainContext } from 'reducer';
-import FilesStats from 'components/Stats/FilesStats.js';
 import Endpoint from 'components/Login/Endpoint.js';
 import SetPassword from 'components/Login/SetPassword.js';
 import PasswordLogin from 'components/Login/PasswordLogin.js';
 import MessageAlert from 'components/Alerts/MessageAlert';
 import { checkLoginPassword } from 'services/login.js';
-import { HashRouter, Route, Switch, Redirect } from 'react-router-dom';
 
 export default function Login(props) {
     const [isReset, setIsReset] = useState(false);
     const [endpoint, setEndpoint] = useState('');
     const [hasPassword, setHasPassword] = useState(true);
+    const [loading, setLoading] = useState(false);
 
     // const { state } = useContext(mainContext);
     // const { theme } = state;
@@ -28,32 +26,35 @@ export default function Login(props) {
     //     // const isMainMode = await getPageMode();
     // }
 
-    const checkLoginPassowrd = async () => {
+    const endpointChange = async val => {
+        if(loading)return;
+        setLoading(true)
         try {
             let res = await checkLoginPassword();
+            setLoading(false)
+            if(res.Type === 'error'){
+                Emitter.emit('showMessageAlert', { message: res.Message || 'error', status: 'error' });
+                return;
+            }
             if (res && res.Success) {
                 setHasPassword(true);
+                setEndpoint(val);
             } else if (res && !res.Success) {
-                // setHasPassword(false);
+                setHasPassword(false);
             }
         } catch (error) {
-            console.log(error,);
+            console.log(error);
         }
     };
 
-    const endpointChange = async val => {
-        await checkLoginPassowrd();
-        setEndpoint(val);
-    };
-
     const lostPassword = () => {
-        // setlostPassword
         setIsReset(true);
     };
 
     useEffect(() => {
         Emitter.on('handleEndpoint', endpointChange);
         Emitter.on('handleLostPassword', lostPassword);
+        document.documentElement.classList.remove('dark');
     }, []);
 
     return (