From 2d63f2ff425107935e5d9878462e448eae26a9ca Mon Sep 17 00:00:00 2001
From: Molunerfinn <marksz@teamsz.xyz>
Date: Fri, 21 Dec 2018 17:25:42 +0800
Subject: [PATCH] Added: other-picbed page

---
 package.json                          |  2 +-
 src/datastore/pic-bed-handler.js      | 21 ----------
 src/renderer/layouts/SettingPage.vue  |  5 +++
 src/renderer/pages/PicGoSetting.vue   | 16 ++++----
 src/renderer/pages/picbeds/Others.vue | 57 +++++++++++++++++++++++++++
 src/renderer/router/index.js          |  5 +++
 yarn.lock                             |  7 ++--
 7 files changed, 79 insertions(+), 34 deletions(-)
 delete mode 100644 src/datastore/pic-bed-handler.js
 create mode 100644 src/renderer/pages/picbeds/Others.vue

diff --git a/package.json b/package.json
index 473e928..0da9c91 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "lowdb": "^1.0.0",
     "md5": "^2.2.1",
     "melody.css": "^1.0.2",
-    "picgo": "^1.1.13",
+    "picgo": "^1.1.14",
     "qiniu": "^7.1.1",
     "request": "^2.83.0",
     "request-promise": "^4.2.2",
diff --git a/src/datastore/pic-bed-handler.js b/src/datastore/pic-bed-handler.js
deleted file mode 100644
index 9aa6cf2..0000000
--- a/src/datastore/pic-bed-handler.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import weiboUpload from '../main/utils/weiboUpload'
-import qiniuUpload from '../main/utils/qiniuUpload'
-import tcYunUpload from '../main/utils/tcYunUpload'
-import upYunUpload from '../main/utils/upYunUpload'
-import githubUpload from '../main/utils/githubUpload'
-import smmsUpload from '../main/utils/smmsUpload'
-import aliYunUpload from '../main/utils/aliYunUpload'
-import imgurUpload from '../main/utils/imgurUpload'
-
-const picBedHandler = {
-  weibo: weiboUpload,
-  qiniu: qiniuUpload,
-  tcyun: tcYunUpload,
-  upyun: upYunUpload,
-  github: githubUpload,
-  smms: smmsUpload,
-  aliyun: aliYunUpload,
-  imgur: imgurUpload
-}
-
-export default picBedHandler
diff --git a/src/renderer/layouts/SettingPage.vue b/src/renderer/layouts/SettingPage.vue
index ef9f89d..41e3ffa 100644
--- a/src/renderer/layouts/SettingPage.vue
+++ b/src/renderer/layouts/SettingPage.vue
@@ -254,6 +254,11 @@ export default {
 }
 </script>
 <style lang='stylus'>
+.view-title
+  color #eee
+  font-size 20px
+  text-align center
+  margin 10px auto
 #setting-page
   .fake-title-bar
     -webkit-app-region drag
diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue
index ef10a65..64be480 100644
--- a/src/renderer/pages/PicGoSetting.vue
+++ b/src/renderer/pages/PicGoSetting.vue
@@ -17,7 +17,7 @@
             <el-button type="primary" round size="mini" @click="openConfigFile">点击打开</el-button>
           </el-form-item>
           <el-form-item
-            label="修改快捷键"
+            label="修改上传快捷键"
           >
             <el-button type="primary" round size="mini" @click="keyBindingVisible = true">点击设置</el-button>
           </el-form-item>
@@ -34,7 +34,7 @@
           <el-form-item
             label="检查更新"
           >
-            <el-button type="primary" round size="mini" @click="checkUpdate">点击设置</el-button>
+            <el-button type="primary" round size="mini" @click="checkUpdate">点击检查</el-button>
           </el-form-item>
           <el-form-item
             label="打开更新助手"
@@ -87,7 +87,7 @@
             ></el-switch>
           </el-form-item>
           <el-form-item
-            label="mini窗口置顶"
+            label="Mini窗口置顶"
           >
             <el-switch
               v-model="form.miniWindowOntop"
@@ -115,7 +115,7 @@
       </el-col>
     </el-row>
     <el-dialog
-      title="修改快捷键"
+      title="修改上传快捷键"
       :visible.sync="keyBindingVisible"
       :modal-append-to-body="false"
     >
@@ -134,8 +134,8 @@
         </el-form-item>
       </el-form>
       <span slot="footer">
-        <el-button @click="cancelKeyBinding">取消</el-button>
-        <el-button type="primary" @click="confirmKeyBinding">确定</el-button>
+        <el-button @click="cancelKeyBinding" round>取消</el-button>
+        <el-button type="primary" @click="confirmKeyBinding" round>确定</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -164,8 +164,8 @@
         如[]($url)
       </div>
       <span slot="footer">
-        <el-button @click="cancelCustomLink">取消</el-button>
-        <el-button type="primary" @click="confirmCustomLink">确定</el-button>
+        <el-button @click="cancelCustomLink" round>取消</el-button>
+        <el-button type="primary" @click="confirmCustomLink" round>确定</el-button>
       </span>
     </el-dialog>
     <el-dialog
diff --git a/src/renderer/pages/picbeds/Others.vue b/src/renderer/pages/picbeds/Others.vue
new file mode 100644
index 0000000..e0d976e
--- /dev/null
+++ b/src/renderer/pages/picbeds/Others.vue
@@ -0,0 +1,57 @@
+<template>
+  <div id="others-view">
+    <el-row :gutter="16">
+      <el-col :span="16" :offset="4">
+        <div class="view-title">
+          Imgur图床设置
+        </div>
+        <el-form 
+          ref="imgur"
+          label-position="right"
+          label-width="120px"
+          :model="form"
+          size="mini">
+          <el-form-item
+            label="设定ClientId"
+            prop="clientId"
+            :rules="{
+              required: true, message: 'ClientId不能为空', trigger: 'blur'
+            }">
+            <el-input v-model="form.clientId" placeholder="ClientId" @keyup.native.enter="confirm"></el-input>
+          </el-form-item>
+          <el-form-item
+            label="设定代理"
+            prop="proxy"
+            >
+            <el-input v-model="form.proxy" placeholder="例如：http://127.0.0.1:1080" @keyup.native.enter="confirm"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button type="primary" @click="confirm" round>确定</el-button>
+              <el-button type="success" @click="setDefaultPicBed(type)" round :disabled="defaultPicBed === type">设为默认图床</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import mixin from '@/utils/ConfirmButtonMixin'
+export default {
+  name: 'OtherPicBed',
+  mixins: [mixin],
+  data () {
+    return {
+      type: ''
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      console.log(vm)
+    })
+  }
+}
+</script>
+<style lang='stylus'>
+</style>
\ No newline at end of file
diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index 281408e..4b28355 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -70,6 +70,11 @@ export default new Router({
           component: require('@/pages/picbeds/Imgur').default,
           name: 'imgur'
         },
+        {
+          path: 'others',
+          component: require('@/pages/picbeds/Others').default,
+          name: 'others'
+        },
         {
           path: 'gallery',
           component: require('@/pages/Gallery').default,
diff --git a/yarn.lock b/yarn.lock
index 6115495..51c1511 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6196,10 +6196,9 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
-picgo@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.1.13.tgz#77b6c8ac74a49edc3932c9de9d441e34e31adfd1"
-  integrity sha512-gLRCGeeeTEdRN+gXMOtIsr3Y0sdOKsyU6HRLwEWAgPCAEulXTNr5mTi8eBOp3RNxfwxnmh4jz+0N2jeZ4XPeyA==
+picgo@^1.1.14:
+  version "1.1.14"
+  resolved "http://registry.npm.taobao.org/picgo/download/picgo-1.1.14.tgz#ed03b4f0eb887a9eeee6afccc21c321c2fda20e1"
   dependencies:
     chalk "^2.4.1"
     commander "^2.17.0"