From 1c0b86428cf87e143f832408d4d1982954328b1f Mon Sep 17 00:00:00 2001
From: yaziming <tou_tou@126.com>
Date: Sun, 1 Sep 2019 00:36:59 +0800
Subject: [PATCH] 1. Fix Some I18n Warning. 2. Fix Navigation Duplicated Error
 When Current Route Path is `/login`. 3. Fix  Parent Level Named Route
 Warning. 4. Change `request` function From Promise Syntax To Await/Async.

---
 frontend/src/api/request.js                  | 46 +++++++++++++++-----
 frontend/src/i18n/zh.js                      | 19 +++++++-
 frontend/src/router/index.js                 |  6 ---
 frontend/src/views/node/NodeList.vue         |  2 +-
 frontend/src/views/schedule/ScheduleList.vue | 12 ++---
 5 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/frontend/src/api/request.js b/frontend/src/api/request.js
index 5b612719..22707159 100644
--- a/frontend/src/api/request.js
+++ b/frontend/src/api/request.js
@@ -3,13 +3,13 @@ import router from '../router'
 
 let baseUrl = process.env.VUE_APP_BASE_URL ? process.env.VUE_APP_BASE_URL : 'http://localhost:8000'
 
-const request = (method, path, params, data, others = {}) => {
-  return new Promise((resolve, reject) => {
+const request = async (method, path, params, data, others = {}) => {
+  try {
     const url = baseUrl + path
     const headers = {
       'Authorization': window.localStorage.getItem('token')
     }
-    axios({
+    const response = await axios({
       method,
       url,
       params,
@@ -17,15 +17,37 @@ const request = (method, path, params, data, others = {}) => {
       headers,
       ...others
     })
-      .then(resolve)
-      .catch(error => {
-        console.log(error)
-        if (error.response.status === 401) {
-          router.push('/login')
-        }
-        reject(error)
-      })
-  })
+    // console.log(response)
+    return response
+  } catch (e) {
+    if (e.response.status === 401 && router.currentRoute.path !== '/login') {
+      router.push('/login')
+    }
+    await Promise.reject(e)
+  }
+
+  // return new Promise((resolve, reject) => {
+  //   const url = baseUrl + path
+  //   const headers = {
+  //     'Authorization': window.localStorage.getItem('token')
+  //   }
+  //   axios({
+  //     method,
+  //     url,
+  //     params,
+  //     data,
+  //     headers,
+  //     ...others
+  //   })
+  //     .then(resolve)
+  //     .catch(error => {
+  //       console.log(error)
+  //       if (error.response.status === 401) {
+  //         router.push('/login')
+  //       }
+  //       reject(error)
+  //     })
+  // })
 }
 
 const get = (path, params) => {
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 58317ec3..d3c8243f 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -247,7 +247,7 @@ export default {
   'username already exists': '用户名已存在',
   'Deleted successfully': '成功删除',
   'Saved successfully': '成功保存',
-
+  'English': 'English',
   // 登录
   'Sign in': '登录',
   'Sign-in': '登录',
@@ -266,5 +266,20 @@ export default {
   'admin': '管理用户',
   'Role': '角色',
   'Edit User': '更改用户',
-  'Users': '用户'
+  'Users': '用户',
+  tagsView: {
+    closeOthers: '关闭其他',
+    close: '关闭',
+    refresh: '刷新',
+    closeAll: '关闭所有'
+  },
+  nodeList: {
+    type: '节点类型'
+  },
+  schedules: {
+    cron: 'Cron',
+    add_cron: '生成Cron',
+    // Cron Format: [second] [minute] [hour] [day of month] [month] [day of week]
+    cron_format: 'Cron 格式: [秒] [分] [小时] [日] [月] [周]'
+  }
 }
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 9a238d08..84c96cd3 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -46,7 +46,6 @@ export const constantRouterMap = [
     ]
   },
   {
-    name: 'Node',
     path: '/nodes',
     component: Layout,
     meta: {
@@ -76,7 +75,6 @@ export const constantRouterMap = [
     ]
   },
   {
-    name: 'Spider',
     path: '/spiders',
     component: Layout,
     meta: {
@@ -106,7 +104,6 @@ export const constantRouterMap = [
     ]
   },
   {
-    name: 'Task',
     path: '/tasks',
     component: Layout,
     meta: {
@@ -136,7 +133,6 @@ export const constantRouterMap = [
     ]
   },
   {
-    name: 'Schedule',
     path: '/schedules',
     component: Layout,
     meta: {
@@ -157,7 +153,6 @@ export const constantRouterMap = [
     ]
   },
   {
-    name: 'Site',
     path: '/sites',
     component: Layout,
     hidden: true,
@@ -178,7 +173,6 @@ export const constantRouterMap = [
     ]
   },
   {
-    name: 'User',
     path: '/users',
     component: Layout,
     meta: {
diff --git a/frontend/src/views/node/NodeList.vue b/frontend/src/views/node/NodeList.vue
index 641009f3..9ea51502 100644
--- a/frontend/src/views/node/NodeList.vue
+++ b/frontend/src/views/node/NodeList.vue
@@ -163,7 +163,7 @@ export default {
       columns: [
         { name: 'name', label: 'Name', width: '220' },
         { name: 'ip', label: 'IP', width: '160' },
-        { name: 'type', label: 'Type', width: '120' },
+        { name: 'type', label: 'nodeList.type', width: '120' },
         // { name: 'port', label: 'Port', width: '80' },
         { name: 'status', label: 'Status', width: '120' },
         { name: 'description', label: 'Description', width: 'auto' }
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 28ca4961..477302b8 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -38,21 +38,21 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('Cron')" prop="cron" :rules="cronRules" required>
+        <el-form-item :label="$t('schedules.cron')" prop="cron" :rules="cronRules" required>
           <template slot="label">
-            <el-tooltip :content="$t('Cron Format: [second] [minute] [hour] [day of month] [month] [day of week]')"
+            <el-tooltip :content="$t('schedules.cron_format')"
                         placement="top">
               <span>
-                {{$t('Cron')}}
+                {{$t('schedules.cron')}}
                 <i class="fa fa-exclamation-circle"></i>
               </span>
             </el-tooltip>
           </template>
           <el-input style="width:calc(100% - 100px);padding-right:10px"
                     v-model="scheduleForm.cron"
-                    :placeholder="$t('Cron')">
+                    :placeholder="$t('schedules.cron')">
           </el-input>
-          <el-button size="small" style="width:100px" type="primary" @click="onShowCronDialog">{{$t('生成Cron')}}</el-button>
+          <el-button size="small" style="width:100px" type="primary" @click="onShowCronDialog">{{$t('schedules.add_cron')}}</el-button>
         </el-form-item>
         <el-form-item :label="$t('Execute Command')" prop="params">
           <el-input v-model="spider.cmd"
@@ -156,7 +156,7 @@ export default {
     return {
       columns: [
         { name: 'name', label: 'Name', width: '180' },
-        { name: 'cron', label: 'Cron', width: '120' },
+        { name: 'cron', label: 'schedules.cron', width: '120' },
         { name: 'node_name', label: 'Node', width: '150' },
         { name: 'spider_name', label: 'Spider', width: '150' },
         { name: 'description', label: 'Description', width: 'auto' }