Settings: update server list fetch failed notification

iTXTech · Dec 11, 2019 · 553be3e · 553be3e
1 parent 533f9f1
commit 553be3e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "vue-clipboard2": "^0.3.1",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.1.3",
-    "vuetify": "^2.1.13",
+    "vuetify": "^2.1.14",
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {

diff --git a/public/index.html b/public/index.html
@@ -4,6 +4,8 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="theme-color" content="#1e88e5"/>
+  <meta name="msapplication-navbutton-color" content="#1e88e5">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>iTXTech FlashMaster</title>
@@ -33,4 +35,4 @@
     firebase.analytics();
   </script>
 </body>
-</html>
+</html>
diff --git a/src/components/Drawer.vue b/src/components/Drawer.vue
@@ -39,8 +39,8 @@
                     transition="scale-transition"
                     width="40"
             />
-            <v-toolbar-title class="mr-12 align-center">
-                <span class="hidden-sm-and-down">iTXTech FlashMaster</span>
+            <v-toolbar-title class="title">
+                FlashMaster
             </v-toolbar-title>
             <v-spacer/>
 
@@ -114,6 +114,7 @@
         },
         methods: {
             changeLanguage(item) {
+                console.log(this.$vuetify.breakpoint.width)
                 this.$i18n.locale = item;
                 this.$vuetify.lang.current = item;
                 localStorage.lang = item;

diff --git a/src/lang/chs.js b/src/lang/chs.js
@@ -3,7 +3,8 @@ module.exports = {
     alert: {
         missingPartNumber: '请输入料号',
         fetchFailed: '获取失败：{0}',
-        missingFlashId: '请输入闪存ID'
+        missingFlashId: '请输入闪存ID',
+        fetchServerListFailed: '服务器列表获取失败：{0}',
     },
     nav: {
         decodePartNumber: '料号查询',

diff --git a/src/lang/eng.js b/src/lang/eng.js
@@ -3,7 +3,8 @@ module.exports = {
     alert: {
         missingPartNumber: 'Please Input Part Number',
         fetchFailed: 'Fetch Failed: {0}',
-        missingFlashId: 'Please Input Flash Id'
+        missingFlashId: 'Please Input Flash Id',
+        fetchServerListFailed: 'Fetch Server List Failed: {0}',
     },
     nav: {
         decodePartNumber: 'Decode Part Number',

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -95,9 +95,8 @@
                     bus.$emit("snackbar", {
                         timeout: 3000,
                         show: true,
-                        text: this.$t("alert.fetchFailed", [err])
+                        text: this.$t("alert.fetchServerListFailed", [err])
                     });
-                    bus.$emit("loading", false);
                 });
         },
         methods: {