Merge pull request #185 from jason5ng32/dev

Bug Fixed
jason5ng32 · Apr 17, 2024 · f50c3e9 · f50c3e9
2 parents 39abf08 + e8db9b9
commit f50c3e9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/src/components/connectivity.vue b/src/components/connectivity.vue
@@ -28,7 +28,7 @@
       </div>
       <div class="row">
         <div v-for="test in connectivityTests" :key="test.id" class="col-6 col-md-3 mb-4">
-          <div class="card jn-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
+          <div class="card jn-card keyboard-shortcut-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
             <div class="card-body">
               <p class="jn-con-title card-title"><i class="bi" :class="'bi-' + test.icon"></i> {{ test.name }}</p>
               <p class="card-text" :class="{

diff --git a/src/components/dnsleaks.vue b/src/components/dnsleaks.vue
@@ -13,7 +13,7 @@
     </div>
     <div class="row">
       <div v-for="(leak, index) in leakTest" :key="leak.id" class="col-lg-3 col-md-6 col-12 mb-4">
-        <div class="card jn-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
+        <div class="card jn-card keyboard-shortcut-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
           <div class="card-body">
             <p class="jn-con-title card-title"><i class="bi bi-heart-pulse-fill"></i> {{ leak.name }}
               <i class="bi" :class="'bi-' + (index + 1) + '-square'"></i>&nbsp;

diff --git a/src/components/ipcheck.vue b/src/components/ipcheck.vue
@@ -61,7 +61,7 @@
       <div class="row">
         <div v-for="(card, index) in ipDataCards" :key="card.id" :ref="card.id"
           :class="{ 'jn-opacity': !card.ip || card.ip === $t('ipInfos.IPv4Error') || card.ip === $t('ipInfos.IPv6Error'), 'col-xl-4': true, 'col-lg-6': true, 'col-md-6': true, 'mb-4': true }">
-          <div class="card jn-card" :class="{
+          <div class="card jn-card keyboard-shortcut-card" :class="{
             'dark-mode dark-mode-border': isDarkMode,
             'jn-ip-card1': !isMobile && ipGeoSource === 0,
             'jn-ip-card2': !isMobile && ipGeoSource !== 0,
@@ -748,6 +748,7 @@ export default {
             }
           } catch (error) {
             console.error("Error fetching IP details from source " + source.id + ":", error);
+            this.sources[source.id].enabled = false;
             currentSourceIndex = (currentSourceIndex + 1) % sources.length;
             attempts++;
           }
@@ -1057,4 +1058,7 @@ export default {
   border-left: 2px dashed #e3e3e3;
   z-index: 1;
 }
+.dropdown-item.disabled, .dropdown-item:disabled {
+  text-decoration: line-through;
+}
 </style>
diff --git a/src/components/speedtest.vue b/src/components/speedtest.vue
@@ -10,7 +10,7 @@
     </div>
     <div class="row">
       <div class="col-12 mb-3">
-        <div class="card jn-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
+        <div class="card jn-card keyboard-shortcut-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
           <div class="card-body">
 
             <div class="row justify-content-end mt-3 mb-4" :data-bs-theme="isDarkMode ? 'dark' : ''">

diff --git a/src/components/webrtc.vue b/src/components/webrtc.vue
@@ -12,7 +12,7 @@
     </div>
     <div class="row">
       <div v-for="stun in stunServers" :key="stun.id" class="col-lg-3 col-md-6 col-12 mb-4">
-        <div class="card jn-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
+        <div class="card jn-card keyboard-shortcut-card" :class="{ 'dark-mode dark-mode-border': isDarkMode }">
           <div class="card-body">
             <p class="card-title jn-con-title"><i class="bi bi-sign-merge-left-fill"></i> {{ stun.name }}</p>
             <p class="card-text text-secondary" style="font-size: 10pt;"><i class="bi bi-hdd-network-fill"></i> {{

diff --git a/src/shortcut.js b/src/shortcut.js
@@ -31,7 +31,7 @@ const mappingKeys = (...keys) => {
 // 导航
 const navigateCards = (direction) => {
   const mainPart = document.getElementById('mainpart');
-  const cardBodies = mainPart.querySelectorAll('.jn-card');
+  const cardBodies = mainPart.querySelectorAll('.keyboard-shortcut-card');
   const cards = Array.from(cardBodies);
   let currentIndex = cards.findIndex(card => card.getAttribute('data-keyboard-hover') === 'true');