From 035aeda7b42cd79a41471b4940fd40d4c394a7e3 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 26 Dec 2019 00:12:57 +0800
Subject: [PATCH 1/5] feat: add static pages manage in tool list.

---
 src/views/system/ToolList.vue | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/system/ToolList.vue b/src/views/system/ToolList.vue
index 8d3e22a2..96c6c35d 100644
--- a/src/views/system/ToolList.vue
+++ b/src/views/system/ToolList.vue
@@ -18,7 +18,7 @@
             <div slot="title">
               <a-icon type="experiment" /> 开发者选项
             </div>
-            <p>点击进入开发者选项页面</p>
+            <p style="min-height: 50px;">点击进入开发者选项页面</p>
             <a-button
               type="primary"
               style="float:right"
@@ -26,6 +26,28 @@
             >进入</a-button>
           </a-card>
         </a-col>
+        <a-col
+          :xl="6"
+          :lg="6"
+          :md="12"
+          :sm="24"
+          :xs="24"
+          :style="{ marginBottom: '12px' }"
+        >
+          <a-card
+            :bordered="false"
+            :bodyStyle="{ padding: '16px' }"
+          >
+            <div slot="title">
+              <a-icon type="html5" /> 静态部署
+            </div>
+            <p style="min-height: 50px;">生成静态页面并部署到 Github Pages 之类的托管平台</p>
+            <a-button
+              type="primary"
+              style="float:right"
+            >管理</a-button>
+          </a-card>
+        </a-col>
         <a-col
           :xl="6"
           :lg="6"
@@ -41,7 +63,7 @@
             <div slot="title">
               <a-icon type="hdd" /> 博客备份
             </div>
-            <p>支持备份全站数据</p>
+            <p style="min-height: 50px;">备份全站数据，支持下载到本地</p>
             <a-button
               type="primary"
               style="float:right"
@@ -64,7 +86,7 @@
             <div slot="title">
               <a-icon type="file-markdown" /> Markdown 文章导入
             </div>
-            <p>支持 Hexo/Jekyll 文章导入并解析元数据</p>
+            <p style="min-height: 50px;">支持 Hexo/Jekyll 文章导入并解析元数据</p>
             <a-button
               type="primary"
               style="float:right"

From be2d518c22749764d0b2d29d0d4270e35011f433 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 26 Dec 2019 00:26:02 +0800
Subject: [PATCH 2/5] feat: add static pages manage in tool list.

---
 babel.config.js                               |  2 +-
 src/config/router.config.js                   |  7 ++++
 src/views/system/ToolList.vue                 |  4 +++
 .../system/staticpages/StaticPagesManage.vue  | 32 +++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/views/system/staticpages/StaticPagesManage.vue

diff --git a/babel.config.js b/babel.config.js
index d8e93c42..a35822f3 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -16,4 +16,4 @@ module.exports = {
     ]
   ],
   plugins
-}
\ No newline at end of file
+}
diff --git a/src/config/router.config.js b/src/config/router.config.js
index 2c32156c..c4fed704 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -185,6 +185,13 @@ export const asyncRouterMap = [
             component: () => import('@/views/system/ToolList'),
             meta: { title: '小工具', hiddenHeaderContent: false }
           },
+          {
+            path: '/system/tools/staticpages',
+            name: 'StaticPagesManage',
+            hidden: true,
+            component: () => import('@/views/system/staticpages/StaticPagesManage'),
+            meta: { title: '静态部署', hiddenHeaderContent: false }
+          },
           {
             path: '/system/about',
             name: 'About',
diff --git a/src/views/system/ToolList.vue b/src/views/system/ToolList.vue
index 96c6c35d..669284a3 100644
--- a/src/views/system/ToolList.vue
+++ b/src/views/system/ToolList.vue
@@ -45,6 +45,7 @@
             <a-button
               type="primary"
               style="float:right"
+              @click="handleToStaticPagesManage"
             >管理</a-button>
           </a-card>
         </a-col>
@@ -150,6 +151,9 @@ export default {
     handleToDeveloperOptions() {
       this.$router.push({ name: 'DeveloperOptions' })
     },
+    handleToStaticPagesManage() {
+      this.$router.push({ name: 'StaticPagesManage' })
+    },
     onUploadClose() {
       this.$refs.upload.handleClearFileList()
     }
diff --git a/src/views/system/staticpages/StaticPagesManage.vue b/src/views/system/staticpages/StaticPagesManage.vue
new file mode 100644
index 00000000..939c7408
--- /dev/null
+++ b/src/views/system/staticpages/StaticPagesManage.vue
@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <a-row>
+      <a-col :span="24">
+        <div class="card-container">
+          <a-tabs type="card">
+            <a-tab-pane key="environment">
+              <span slot="tab">
+                <a-icon type="folder" />文件列表
+              </span>
+            </a-tab-pane>
+            <a-tab-pane key="runtimeLogs">
+              <span slot="tab">
+                <a-icon type="appstore" />部署平台
+              </span>
+            </a-tab-pane>
+            <a-tab-pane key="optionsList">
+              <span slot="tab">
+                <a-icon type="setting" />配置
+              </span>
+            </a-tab-pane>
+          </a-tabs>
+        </div>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+<script>
+export default {
+  name: 'StaticPagesManage'
+}
+</script>

From 7a0334a4693093229168212859a0e640b2fcffe9 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 26 Dec 2019 14:19:36 +0800
Subject: [PATCH 3/5] feat: add static pages manage in tool list.

---
 src/api/staticPage.js                         |  39 +++++++
 .../system/developer/tabs/SettingsForm.vue    |  13 ++-
 .../system/staticpages/StaticPagesManage.vue  |  13 ++-
 .../staticpages/tabs/DeploySettingsForm.vue   | 100 +++++++++++++++++
 .../system/staticpages/tabs/SettingsForm.vue  |  10 ++
 .../staticpages/tabs/StaticPagesList.vue      | 105 ++++++++++++++++++
 6 files changed, 277 insertions(+), 3 deletions(-)
 create mode 100644 src/api/staticPage.js
 create mode 100644 src/views/system/staticpages/tabs/DeploySettingsForm.vue
 create mode 100644 src/views/system/staticpages/tabs/SettingsForm.vue
 create mode 100644 src/views/system/staticpages/tabs/StaticPagesList.vue

diff --git a/src/api/staticPage.js b/src/api/staticPage.js
new file mode 100644
index 00000000..10f5150f
--- /dev/null
+++ b/src/api/staticPage.js
@@ -0,0 +1,39 @@
+import service from '@/utils/service'
+
+const baseUrl = '/api/admin/static_page'
+
+const staticPageApi = {}
+
+staticPageApi.list = () => {
+  return service({
+    url: baseUrl,
+    method: 'get'
+  })
+}
+
+staticPageApi.generate = () => {
+  return service({
+    url: `${baseUrl}/generate`,
+    method: 'get'
+  })
+}
+
+staticPageApi.deploy = () => {
+  return service({
+    url: `${baseUrl}/deploy`,
+    method: 'get'
+  })
+}
+
+staticPageApi.deployType = {
+  GIT: {
+    type: 'GIT',
+    text: 'Git'
+  },
+  NETLIFY: {
+    type: 'NETLIFY',
+    text: 'Netlify'
+  }
+}
+
+export default staticPageApi
diff --git a/src/views/system/developer/tabs/SettingsForm.vue b/src/views/system/developer/tabs/SettingsForm.vue
index 646e26d0..f1fe7b86 100644
--- a/src/views/system/developer/tabs/SettingsForm.vue
+++ b/src/views/system/developer/tabs/SettingsForm.vue
@@ -1,5 +1,8 @@
 <template>
-  <a-form layout="vertical">
+  <a-form
+    layout="vertical"
+    :wrapperCol="wrapperCol"
+  >
     <a-form-item label="开发者选项：">
       <a-switch v-model="options.developer_mode" />
     </a-form-item>
@@ -18,7 +21,13 @@ export default {
   name: 'SettingsForm',
   data() {
     return {
-      options: []
+      options: [],
+      wrapperCol: {
+        xl: { span: 8 },
+        lg: { span: 8 },
+        sm: { span: 12 },
+        xs: { span: 24 }
+      }
     }
   },
   created() {
diff --git a/src/views/system/staticpages/StaticPagesManage.vue b/src/views/system/staticpages/StaticPagesManage.vue
index 939c7408..b273740b 100644
--- a/src/views/system/staticpages/StaticPagesManage.vue
+++ b/src/views/system/staticpages/StaticPagesManage.vue
@@ -8,16 +8,19 @@
               <span slot="tab">
                 <a-icon type="folder" />文件列表
               </span>
+              <StaticPagesList />
             </a-tab-pane>
             <a-tab-pane key="runtimeLogs">
               <span slot="tab">
                 <a-icon type="appstore" />部署平台
               </span>
+              <DeploySettingsForm />
             </a-tab-pane>
             <a-tab-pane key="optionsList">
               <span slot="tab">
                 <a-icon type="setting" />配置
               </span>
+              <SettingsForm />
             </a-tab-pane>
           </a-tabs>
         </div>
@@ -26,7 +29,15 @@
   </div>
 </template>
 <script>
+import StaticPagesList from './tabs/StaticPagesList'
+import DeploySettingsForm from './tabs/DeploySettingsForm'
+import SettingsForm from './tabs/SettingsForm'
 export default {
-  name: 'StaticPagesManage'
+  name: 'StaticPagesManage',
+  components: {
+    StaticPagesList,
+    DeploySettingsForm,
+    SettingsForm
+  }
 }
 </script>
diff --git a/src/views/system/staticpages/tabs/DeploySettingsForm.vue b/src/views/system/staticpages/tabs/DeploySettingsForm.vue
new file mode 100644
index 00000000..c9a1a4fb
--- /dev/null
+++ b/src/views/system/staticpages/tabs/DeploySettingsForm.vue
@@ -0,0 +1,100 @@
+<template>
+  <a-form
+    layout="vertical"
+    :wrapperCol="wrapperCol"
+  >
+    <a-form-item label="部署平台：">
+      <a-select v-model="options.static_deploy_type">
+        <a-select-option
+          v-for="item in Object.keys(deployType)"
+          :key="item"
+          :value="item"
+        >{{ deployType[item].text }}</a-select-option>
+      </a-select>
+    </a-form-item>
+    <div
+      id="gitForm"
+      v-show="options.static_deploy_type === 'GIT'"
+    >
+      <a-form-item label="域名：">
+        <a-input v-model="options.git_static_deploy_domain" />
+      </a-form-item>
+      <a-form-item label="仓库：">
+        <a-input v-model="options.git_static_deploy_repository" />
+      </a-form-item>
+      <a-form-item label="分支：">
+        <a-input v-model="options.git_static_deploy_branch" />
+      </a-form-item>
+      <a-form-item label="仓库用户名：">
+        <a-input v-model="options.git_static_deploy_username" />
+      </a-form-item>
+      <a-form-item label="邮箱：">
+        <a-input v-model="options.git_static_deploy_email" />
+      </a-form-item>
+      <a-form-item label="Token：">
+        <a-input-password v-model="options.git_static_deploy_token" />
+      </a-form-item>
+      <a-form-item label="CNAME：">
+        <a-input v-model="options.git_static_deploy_cname" />
+      </a-form-item>
+    </div>
+    <div
+      id="netlifyForm"
+      v-show="options.static_deploy_type === 'NETLIFY'"
+    >
+      <a-form-item label="域名：">
+        <a-input v-model="options.netlify_static_deploy_domain" />
+      </a-form-item>
+      <a-form-item label="Site ID：">
+        <a-input v-model="options.netlify_static_deploy_site_id" />
+      </a-form-item>
+      <a-form-item label="Token：">
+        <a-input-password v-model="options.netlify_static_deploy_token" />
+      </a-form-item>
+    </div>
+    <a-form-item>
+      <a-button
+        type="primary"
+        @click="handleSaveOptions"
+      >保存</a-button>
+    </a-form-item>
+  </a-form>
+</template>
+<script>
+import staticPageApi from '@/api/staticPage'
+import optionApi from '@/api/option'
+import { mapActions } from 'vuex'
+export default {
+  name: 'DeploySettingsForm',
+  data() {
+    return {
+      deployType: staticPageApi.deployType,
+      wrapperCol: {
+        xl: { span: 8 },
+        lg: { span: 8 },
+        sm: { span: 12 },
+        xs: { span: 24 }
+      },
+      options: []
+    }
+  },
+  mounted() {
+    this.loadFormOptions()
+  },
+  methods: {
+    ...mapActions(['loadOptions']),
+    loadFormOptions() {
+      optionApi.listAll().then(response => {
+        this.options = response.data.data
+      })
+    },
+    handleSaveOptions() {
+      optionApi.save(this.options).then(response => {
+        this.loadFormOptions()
+        this.loadOptions()
+        this.$message.success('保存成功！')
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/system/staticpages/tabs/SettingsForm.vue b/src/views/system/staticpages/tabs/SettingsForm.vue
new file mode 100644
index 00000000..2202e09b
--- /dev/null
+++ b/src/views/system/staticpages/tabs/SettingsForm.vue
@@ -0,0 +1,10 @@
+<template>
+  <div>
+    SettingsForm
+  </div>
+</template>
+<script>
+export default {
+  name: 'SettingsForm'
+}
+</script>
diff --git a/src/views/system/staticpages/tabs/StaticPagesList.vue b/src/views/system/staticpages/tabs/StaticPagesList.vue
new file mode 100644
index 00000000..9b77cdf3
--- /dev/null
+++ b/src/views/system/staticpages/tabs/StaticPagesList.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="option-tab-wrapper">
+    <a-card
+      :bordered="false"
+      :bodyStyle="{ padding: 0 }"
+    >
+      <div class="table-operator">
+        <a-button
+          type="primary"
+          icon="reload"
+          @click="handleGenerate"
+        >生成</a-button>
+        <a-button
+          icon="cloud-upload"
+          @click="handleDeploy"
+          :loading="deployLoading"
+          :disabled="deployLoading"
+        >
+          部署
+        </a-button>
+        <a-button
+          icon="sync"
+          @click="loadStaticPageList"
+          :loading="loading"
+          :disabled="loading"
+        >
+          刷新
+        </a-button>
+      </div>
+      <div style="margin-top:15px">
+        <a-table
+          :rowKey="record => record.name"
+          :columns="columns"
+          :dataSource="staticPages"
+          :pagination="false"
+          size="middle"
+          :loading="loading"
+        >
+          <span
+            slot="name"
+            slot-scope="name"
+          >
+            <ellipsis
+              :length="64"
+              tooltip
+            >
+              {{ name }}
+            </ellipsis>
+          </span>
+        </a-table>
+      </div>
+    </a-card>
+  </div>
+</template>
+<script>
+import staticPageApi from '@/api/staticPage'
+const columns = [
+  {
+    title: '文件名',
+    dataIndex: 'name',
+    scopedSlots: { customRender: 'name' }
+  }
+]
+export default {
+  name: 'StaticPagesList',
+  data() {
+    return {
+      columns: columns,
+      staticPages: [],
+      loading: false,
+      deployLoading: false
+    }
+  },
+  created() {
+    this.loadStaticPageList()
+  },
+  methods: {
+    loadStaticPageList() {
+      this.loading = true
+      staticPageApi.list().then(response => {
+        this.staticPages = response.data.data
+        this.loading = false
+      })
+    },
+    handleGenerate() {
+      this.loading = true
+      const hide = this.$message.loading('生成中...', 0)
+      staticPageApi.generate().then(response => {
+        hide()
+        this.$message.success('生成成功！')
+        this.loadStaticPageList()
+      })
+    },
+    handleDeploy() {
+      this.deployLoading = true
+      const hide = this.$message.loading('部署中...', 0)
+      staticPageApi.deploy().then(response => {
+        hide()
+        this.deployLoading = false
+        this.$message.success('部署成功！')
+      })
+    }
+  }
+}
+</script>

From 4b47e2519ab758977b9c05547ef29011ccdc0c47 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 26 Dec 2019 20:17:29 +0800
Subject: [PATCH 4/5] fix: table row key error.

---
 src/views/system/developer/tabs/StaticStorage.vue     | 2 +-
 src/views/system/staticpages/tabs/StaticPagesList.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/developer/tabs/StaticStorage.vue b/src/views/system/developer/tabs/StaticStorage.vue
index 767dbd08..fadfbfac 100644
--- a/src/views/system/developer/tabs/StaticStorage.vue
+++ b/src/views/system/developer/tabs/StaticStorage.vue
@@ -27,7 +27,7 @@
       </div>
       <div style="margin-top:15px">
         <a-table
-          :rowKey="record => record.name"
+          :rowKey="record => record.id"
           :columns="columns"
           :dataSource="sortedStatics"
           :pagination="false"
diff --git a/src/views/system/staticpages/tabs/StaticPagesList.vue b/src/views/system/staticpages/tabs/StaticPagesList.vue
index 9b77cdf3..826e323f 100644
--- a/src/views/system/staticpages/tabs/StaticPagesList.vue
+++ b/src/views/system/staticpages/tabs/StaticPagesList.vue
@@ -29,7 +29,7 @@
       </div>
       <div style="margin-top:15px">
         <a-table
-          :rowKey="record => record.name"
+          :rowKey="record => record.id"
           :columns="columns"
           :dataSource="staticPages"
           :pagination="false"

From cab0dbef32dd614d46def97fba0c760c2d1e9f2d Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 26 Dec 2019 20:38:50 +0800
Subject: [PATCH 5/5] refactor: static pages generate and deploy method.

---
 .../staticpages/tabs/StaticPagesList.vue      | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/system/staticpages/tabs/StaticPagesList.vue b/src/views/system/staticpages/tabs/StaticPagesList.vue
index 826e323f..56fc626e 100644
--- a/src/views/system/staticpages/tabs/StaticPagesList.vue
+++ b/src/views/system/staticpages/tabs/StaticPagesList.vue
@@ -85,20 +85,28 @@ export default {
     handleGenerate() {
       this.loading = true
       const hide = this.$message.loading('生成中...', 0)
-      staticPageApi.generate().then(response => {
-        hide()
-        this.$message.success('生成成功！')
-        this.loadStaticPageList()
-      })
+      staticPageApi
+        .generate()
+        .then(response => {
+          this.$message.success('生成成功！')
+        })
+        .finally(response => {
+          this.loadStaticPageList()
+          hide()
+        })
     },
     handleDeploy() {
       this.deployLoading = true
       const hide = this.$message.loading('部署中...', 0)
-      staticPageApi.deploy().then(response => {
-        hide()
-        this.deployLoading = false
-        this.$message.success('部署成功！')
-      })
+      staticPageApi
+        .deploy()
+        .then(response => {
+          this.$message.success('部署成功！')
+        })
+        .finally(response => {
+          this.deployLoading = false
+          hide()
+        })
     }
   }
 }