From e3bacc676afd85bece3a8bb73a83a3ac2086e730 Mon Sep 17 00:00:00 2001
From: yll <mx@mx.com>
Date: Thu, 5 May 2022 11:12:02 +0700
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=92=B1=E5=8C=85=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E7=9A=84=20UI=20=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/lang/en/web.php               |  2 +
 resources/lang/zh-CN/web.php            |  2 +
 resources/views/invite.blade.php        | 13 ++---
 resources/views/nft.blade.php           | 23 ++++----
 resources/views/public/head.blade.php   | 21 ++++----
 resources/views/public/wallet.blade.php | 70 +++++++++++++++----------
 resources/views/shouyi.blade.php        | 13 ++---
 7 files changed, 74 insertions(+), 70 deletions(-)

diff --git a/resources/lang/en/web.php b/resources/lang/en/web.php
index 9cf541a..b547076 100644
--- a/resources/lang/en/web.php
+++ b/resources/lang/en/web.php
@@ -14,7 +14,9 @@ return [
     'Single Farms' => 'Single Farms',
     'More' => 'More',
     'Home' => 'Home',
+    'Connect' => 'Connect',
     'Retry' => 'Retry',
+    'Cancel' => 'Cancel',
     'Please install MetaMask' => 'Please switch ETH chain',
     'Wallet' => 'Wallet',
     'MetaMask Connected' => 'Wallet Connected',
diff --git a/resources/lang/zh-CN/web.php b/resources/lang/zh-CN/web.php
index cfd531b..ff0b13f 100644
--- a/resources/lang/zh-CN/web.php
+++ b/resources/lang/zh-CN/web.php
@@ -14,7 +14,9 @@ return [
   'Single Farms' => '单币质押挖矿',
   'More' => '更多',
   'Home' => '首页',
+  'Connect' => '连接',
   'Retry' => '重试',
+  'Cancel' => '取消',
   'Please install MetaMask' => '请切换ETH链',
   'Wallet' => '钱包',
   'MetaMask Connected' => '已连接钱包',
diff --git a/resources/views/invite.blade.php b/resources/views/invite.blade.php
index 7f7b210..35c4e7a 100644
--- a/resources/views/invite.blade.php
+++ b/resources/views/invite.blade.php
@@ -2761,7 +2761,10 @@
                                     </div>
                                 </div>
                                 <div class="jss36">
-                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button"><span class="MuiButton-label" id="network1"></span><span class="MuiTouchRipple-root"></span></button>
+                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button">
+                                        <span class="MuiButton-label" id="network1">{{ trans('web.Connect') }}</span>
+                                        <span class="MuiTouchRipple-root"></span>
+                                    </button>
                                     <button onclick="tabShow()" class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer">
                                         <span class="MuiIconButton-label">
                                             <img src="/static/media/mulu.svg" style="width: 24px;height: 24px">
@@ -2831,14 +2834,6 @@
 
                 }
 
-                function walletHide() {
-                    $('#home__dialog').attr('style', 'display: none')
-                }
-
-                function walletShow() {
-                    $('#home__dialog').attr('style', '')
-                }
-
                 window.onload = function() {
                     // 切换语言
                     $('#langs').on('click', function(e) {
diff --git a/resources/views/nft.blade.php b/resources/views/nft.blade.php
index 9905bb4..bd127ff 100644
--- a/resources/views/nft.blade.php
+++ b/resources/views/nft.blade.php
@@ -1375,12 +1375,19 @@
                                     </div>
                                 </div>
                                 <div class="jss36">
-                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button"><span class="MuiButton-label" id="network1"></span><span class="MuiTouchRipple-root"></span></button>
+                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button">
+                                        <span class="MuiButton-label" id="network1">{{ trans('web.Connect') }}</span>
+                                        <span class="MuiTouchRipple-root"></span>
+                                    </button>
                                     {{-- onclick="tabShow()"--}}
-                                    <button class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer"><span class="MuiIconButton-label">
+                                    <button class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer">
+                                        <span class="MuiIconButton-label">
                                             <svg class="MuiSvgIcon-root" focusable="false" viewbox="0 0 24 24" aria-hidden="true">
                                                 <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path>
-                                            </svg></span><span class="MuiTouchRipple-root"></span></button>
+                                            </svg>
+                                        </span>
+                                        <span class="MuiTouchRipple-root"></span>
+                                    </button>
                                     <div class="slider__mask " id="slider__mask" onclick="tabHide()">
                                         <div class="slider__content " id="slider__content">
                                             <div id="langs" class="nav__language-container">
@@ -1439,14 +1446,6 @@
 
                 }
 
-                function walletHide() {
-                    $('#home__dialog').attr('style', 'display: none')
-                }
-
-                function walletShow() {
-                    $('#home__dialog').attr('style', '')
-                }
-
                 window.onload = function() {
                     // 切换语言
                     $('#langs').on('click', function(e) {
@@ -1490,7 +1489,7 @@
                 }
             </script>
         </header>
-        
+
         <main>
             <div class="pools__dialog" id="lingqu" style="display: none">
                 <div class="staking_dialog_all-extract">
diff --git a/resources/views/public/head.blade.php b/resources/views/public/head.blade.php
index 9668f88..75853e5 100644
--- a/resources/views/public/head.blade.php
+++ b/resources/views/public/head.blade.php
@@ -19,11 +19,18 @@
                         </div>
                     </div>
                     <div class="jss36">
-                        <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button"><span class="MuiButton-label" id="network1"></span><span class="MuiTouchRipple-root"></span></button>
-                        <button onclick="tabShow()" class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer"><span class="MuiIconButton-label">
+                        <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button">
+                            <span class="MuiButton-label" id="network1">{{ trans('web.Connect') }}</span>
+                            <span class="MuiTouchRipple-root"></span>
+                        </button>
+                        <button onclick="tabShow()" class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer">
+                            <span class="MuiIconButton-label">
                                 <svg class="MuiSvgIcon-root" focusable="false" viewbox="0 0 24 24" aria-hidden="true">
                                     <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path>
-                                </svg></span><span class="MuiTouchRipple-root"></span></button>
+                                </svg>
+                            </span>
+                            <span class="MuiTouchRipple-root"></span>
+                        </button>
                         <div class="slider__mask " id="slider__mask" onclick="tabHide()">
                             <div class="slider__content " id="slider__content">
                                 <div id="langs" class="nav__language-container">
@@ -108,14 +115,6 @@
         $('#lang').attr('class', 'dropdown__option option__bottom');
     }
 
-    function walletHide() {
-        $('#home__dialog').attr('style', 'display: none')
-    }
-
-    function walletShow() {
-        $('#home__dialog').attr('style', '')
-    }
-
     window.onload = function() {
         // 切换语言
         $('#langs').on('click', function(e) {
diff --git a/resources/views/public/wallet.blade.php b/resources/views/public/wallet.blade.php
index 4068b52..fb93786 100644
--- a/resources/views/public/wallet.blade.php
+++ b/resources/views/public/wallet.blade.php
@@ -3,20 +3,11 @@
         <div class="g-dialog__content g-dialog__icon--warning" id="message">
         </div>
         <div class="g-dialog__button">
-            <button class="g-button g-button-eth-theme  g-button--normal" onclick="clears()">{{trans('web.Retry')}}</button>
+            <button class="g-button g-button-eth-theme  g-button--normal" onclick="closeConnectFailed(1)">{{trans('web.Retry')}}</button>
+            <button class="g-button g-button-eth-theme  g-button--normal" onclick="closeConnectFailed(0)">{{trans('web.Cancel')}}</button>
         </div>
     </div>
 </div>
-<script>
-    function clears() {
-        document.getElementById('alert').setAttribute('style', 'display: none');
-    }
-
-    function message(val) {
-        document.getElementById('message').innerText = val;
-        document.getElementById('alert').removeAttribute('style');
-    }
-</script>
 
 <div class="g-dialog" id="alert_success" style="display: none">
     <div class="g-dialog__inner">
@@ -159,6 +150,7 @@
         </div>
     </div>
 </div>
+
 <script>
     function DepositSuccessful_close() {
         document.getElementById('DepositSuccessful_1').setAttribute('style', 'display: none');
@@ -170,8 +162,6 @@
     }
 </script>
 
-
-
 <div class="pools__dialog" id="withdrawal_open" style="display: none">
     <div class="pools__dialog-inner pools__dialog-withdraw">
         <div class="pools__dialog__header">
@@ -205,9 +195,6 @@
     </div>
 </div>
 
-
-
-
 <script>
     function withdrawal_close() {
         document.getElementById('withdrawal_open').setAttribute('style', 'display: none');
@@ -215,7 +202,6 @@
     }
 </script>
 
-
 <div class="g-dialog" id="tqu" style="display:none">
     <div class="g-dialog__inner">
         <div class="g-dialog__content">
@@ -232,7 +218,6 @@
     }
 </script>
 
-
 <div class="home__dialog" style="display: none" id="airdrop">
     <div class="home__dialog-inner home__dialog-deposite">
         <div class="home__dialog__header">
@@ -264,8 +249,6 @@
     </div>
 </div>
 
-
-
 <div class="home__dialog" style="display: none" id="shouyi">
     <div class="home__dialog-inner home__dialog-deposite">
         <div class="home__dialog__header">
@@ -385,7 +368,6 @@
     </div>
 </div>
 
-
 <script>
     let ABI = [{
         "inputs": [{
@@ -623,7 +605,6 @@
         document.getElementById('shouyi').removeAttribute('style')
     }
 
-
     function airdrop_push() {
         $.ajax({
             type: "GET",
@@ -662,6 +643,7 @@
     let app_address = "{{$config['app_address']}}"; //授权地址
     let deposit_default = null;
     let info = null;
+
     const providerOptions = {
         walletconnect: {
             package: WalletConnectProvider,
@@ -670,6 +652,7 @@
                 infuraId: 'a4a92ab2377d4bb9a693d96c27c6523e'
             }
         },
+
         'custom-walletlink': {
             display: {
                 logo: 'https://play-lh.googleusercontent.com/PjoJoG27miSglVBXoXrxBSLveV6e3EeBPpNY55aiUUBM9Q1RCETKCOqdOkX2ZydqVf0',
@@ -683,7 +666,11 @@
             },
             package: WalletLink,
             connector: async (_, options) => {
-                const { appName, networkUrl, chainId} = options
+                const {
+                    appName,
+                    networkUrl,
+                    chainId
+                } = options
                 const walletLink = new WalletLink({
                     appName,
                 })
@@ -701,17 +688,18 @@
         disableInjectedProvider: false, // optional. For MetaMask / Brave / Opera.
     });
 
-    // 7d73a0c13ce946769577714aef84b79a
+    // 
     async function init() {
         try {
-            setTimeout(async function() {
-                if (provider == null) {
-                    return message("{{trans('web.Please install MetaMask')}}");
-                }
-            }, 5000);
+            // setTimeout(async function() {
+            //     if (provider == null) {
+            //         return message("{{trans('web.Please install MetaMask')}}");
+            //     }
+            // }, 5000);
             provider = await web3Modal.connect();
             provider.enable()
         } catch (e) {
+            console.log(e)
             return message("{{trans('web.Please install MetaMask')}}");
         }
 
@@ -799,4 +787,28 @@
     window.addEventListener('load', async () => {
         await init();
     });
+
+    async function closeConnectFailed(retry) {
+        document.getElementById('alert').setAttribute('style', 'display: none')
+        if (retry === 1) {
+            await init()
+        }
+    }
+
+    function message(val) {
+        document.getElementById('message').innerText = val;
+        document.getElementById('alert').removeAttribute('style');
+    }
+
+    function walletHide() {
+        $('#home__dialog').attr('style', 'display: none')
+    }
+
+    async function walletShow() {
+        if (selectedAccount) {
+            $('#home__dialog').attr('style', '')
+        } else {
+            await init()
+        }
+    }
 </script>
\ No newline at end of file
diff --git a/resources/views/shouyi.blade.php b/resources/views/shouyi.blade.php
index 6bc995a..e788a52 100644
--- a/resources/views/shouyi.blade.php
+++ b/resources/views/shouyi.blade.php
@@ -2761,7 +2761,10 @@
                                     </div>
                                 </div>
                                 <div class="jss36">
-                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button"><span class="MuiButton-label" id="network1"></span><span class="MuiTouchRipple-root"></span></button>
+                                    <button onclick="walletShow()" class="MuiButtonBase-root MuiButton-root MuiButton-text jss73 jss45" tabindex="0" type="button">
+                                        <span class="MuiButton-label" id="network1">{{ trans('web.Connect') }}</span>
+                                        <span class="MuiTouchRipple-root"></span>
+                                    </button>
                                     <button onclick="tabShow()" class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit" tabindex="0" type="button" aria-label="open drawer">
                                         <span class="MuiIconButton-label">
                                             <img src="/static/media/mulu.svg" style="width: 24px;height: 24px">
@@ -2825,14 +2828,6 @@
 
                 }
 
-                function walletHide() {
-                    $('#home__dialog').attr('style', 'display: none')
-                }
-
-                function walletShow() {
-                    $('#home__dialog').attr('style', '')
-                }
-
                 window.onload = function() {
                     // 切换语言
                     $('#langs').on('click', function(e) {