Merge pull request #17 from aotianwinter/test

v0.1.3

Author: aotianwinter

package.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-deploy-app",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "dajiangyou",
   "description": "An electron-vue project",
   "license": "MIT",

src/main/index.js

@@ -20,9 +20,11 @@ function createWindow () {
    * Initial window options
    */
   mainWindow = new BrowserWindow({
-    height: 563,
-    useContentSize: true,
-    width: 1000
+    height: 800,
+    width: 1300,
+    minHeight: 800,
+    minWidth: 1000
+    // useContentSize: true
   })
 
   mainWindow.loadURL(winURL)

src/renderer/core/lazy_use.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import 'ant-design-vue/dist/antd.css'
 // base library
 import {
-  Tree,
+  // Affix,
   Empty,
   Collapse,
   ConfigProvider,
@@ -17,8 +17,8 @@ import {
   Card,
   Form,
   FormModel,
-  Row,
-  Col,
+  // Row,
+  // Col,
   Modal,
   Table,
   Tabs,
@@ -39,14 +39,13 @@ import {
   Divider,
   DatePicker,
   TimePicker,
-  Upload,
-  Progress,
-  Skeleton,
+  // Upload,
+  // Progress,
+  // Skeleton,
   Popconfirm,
-  PageHeader,
   Result,
-  Statistic,
-  Descriptions,
+  // Statistic,
+  // Descriptions,
   message,
   notification
 } from 'ant-design-vue'
@@ -60,7 +59,7 @@ import {
 // import PermissionHelper from '@/core/permission/permission'
 // import './directives/action'
 
-Vue.use(Tree)
+// Vue.use(Affix)
 Vue.use(Empty)
 Vue.use(Collapse)
 Vue.use(ConfigProvider)
@@ -75,8 +74,8 @@ Vue.use(Select)
 Vue.use(Card)
 Vue.use(Form)
 Vue.use(FormModel)
-Vue.use(Row)
-Vue.use(Col)
+// Vue.use(Row)
+// Vue.use(Col)
 Vue.use(Modal)
 Vue.use(Table)
 Vue.use(Tabs)
@@ -97,14 +96,13 @@ Vue.use(Tag)
 Vue.use(Divider)
 Vue.use(DatePicker)
 Vue.use(TimePicker)
-Vue.use(Upload)
-Vue.use(Progress)
-Vue.use(Skeleton)
+// Vue.use(Upload)
+// Vue.use(Progress)
+// Vue.use(Skeleton)
 Vue.use(Popconfirm)
-Vue.use(PageHeader)
 Vue.use(Result)
-Vue.use(Statistic)
-Vue.use(Descriptions)
+// Vue.use(Statistic)
+// Vue.use(Descriptions)
 
 Vue.prototype.$confirm = Modal.confirm
 Vue.prototype.$message = message

src/renderer/views/home/AppData.vue

@@ -1,6 +1,6 @@
 <template>
   <span>
-    <a-icon title="use helper" type="question-circle" @click="showModal" />
+    <a-icon title="Instructions for use" type="question-circle" @click="showModal" />
     <!-- modal -->
     <a-modal v-model="visible" title="Use Helper" @ok="visible = false" :width="1000">
       <a-divider orientation="left">

src/renderer/views/home/HelpView.vue

@@ -184,8 +184,7 @@ export default {
 <style lang="stylus" scoped>
 .path-span
   text-decoration underline
-  &:hover
-    color #409EFF
+  color #409EFF
   
 .anticon
   margin-right 6px

src/renderer/views/home/InstanceList.vue

@@ -4,8 +4,6 @@
       <a-tab-pane key="1" tab="Server Center">
         <div class="flex-card-wrap">
           <ServerList />
-          <!-- config card -->
-          <AppData style="margin-left: 1rem" />
         </div>
         <!-- action -->
         <div class="action-wrap">
@@ -16,7 +14,7 @@
         <TaskForm title="Create Task" :visible="deployActionVisible"
           :data="defaultForm" @cancel="closeAddForm" @submit="onSubmit" />
       </a-tab-pane>
-      <a-tab-pane key="2" tab="Executing task">
+      <a-tab-pane key="2" tab="Executing Task">
         <TaskCenter @switchTab="handleSwitchTab" />
       </a-tab-pane>
       <a-tab-pane key="3" tab="Task Instance">
@@ -44,13 +42,17 @@
     </a-drawer>
     <!-- footer -->
     <footer class="footer">
-      <p title="version">
-        <a-icon @click="openUrl('https://github.com/aotianwinter/auto-deploy-app/releases')" type="thunderbolt" />
-        v{{ version }}
-        <HelpView />
-      </p>
-      <p title="author 打酱油">
-        <a-icon @click="openUrl('https://github.com/electron/update-electron-app')" type="github" />
+      <div>
+        <span :title="`version: v${version}`" class="footer-link"
+          @click="openUrl('https://github.com/aotianwinter/auto-deploy-app/releases')">
+          <a-icon type="thunderbolt" />
+          v{{ version }}
+        </span>
+        <HelpView style="margin-left: 0.2rem" />
+      </div>
+      <p title="author 打酱油" class="footer-link"
+        @click="openUrl('https://github.com/aotianwinter/auto-deploy-app')">
+        <a-icon type="github" />
         打酱油
       </p>
     </footer>
@@ -59,7 +61,6 @@
 
 <script>
 import ServerList from './ServerList'
-import AppData from './AppData'
 import TaskForm from './TaskForm'
 import TaskCenter from './TaskCenter'
 import InstanceList from './InstanceList'
@@ -75,7 +76,6 @@ export default {
   mixins: [taskMixin, instanceMixin, appMixin],
   components: {
     ServerList,
-    AppData,
     TaskForm,
     TaskCenter,
     InstanceList,
@@ -167,11 +167,14 @@ export default {
     padding 1rem 0
   .footer
     display inline-flex
+    z-index 10
     justify-content space-between
     position fixed
     left 0
     bottom 0
     width 100%
     padding 4px 0.5rem
     background white
+    .footer-link
+      cursor pointer
 </style>