Changed: renderer files' structure

.electron-vue/webpack.renderer.config.js

@@ -134,7 +134,9 @@ let rendererConfig = {
     alias: {
       '@': path.join(__dirname, '../src/renderer'),
       'vue$': 'vue/dist/vue.esm.js',
-      'utils': path.join(__dirname, '../src/renderer/utils')
+      'utils': path.join(__dirname, '../src/renderer/utils'),
+      '~': path.join(__dirname, '../src'),
+      'root': path.join(__dirname, '../')
     },
     extensions: ['.js', '.vue', '.json', '.css', '.node']
   },

src/renderer/layouts/SettingPage.vue

@@ -132,11 +132,11 @@
   </div>
 </template>
 <script>
-import pkg from '../../../package.json'
+import pkg from 'root/package.json'
 import keyDetect from 'utils/key-binding'
 import { remote } from 'electron'
-import db from '../../datastore'
+import db from '~/datastore'
-import mixin from './mixin'
+import mixin from '@/utils/mixin'
 const { Menu, dialog, BrowserWindow } = remote
 export default {
   name: 'setting-page',

src/renderer/pages/Gallery.vue

@@ -75,11 +75,9 @@
 </template>
 <script>
 import gallerys from 'vue-gallery'
-import pasteStyle from '../../../main/utils/pasteTemplate'
+import pasteStyle from '~/main/utils/pasteTemplate'
-import mixin from '../mixin'
 export default {
   name: 'gallery',
-  mixins: [mixin],
   components: {
     gallerys
   },

src/renderer/pages/MiniPage.vue

@@ -9,15 +9,15 @@
     :class="{ 'is-dragover': dragover, uploading: showProgress, linux: os === 'linux' }" @drop.prevent="onDrop" @dragover.prevent="dragover = true" @dragleave.prevent="dragover = false"
     :style="{ backgroundPosition: '0 ' + progress + '%'}"
   >
-    <div id="upload-dragger" @dblclick="openUplodWindow">
+    <div id="upload-dragger" @dblclick="openUploadWindow">
       <input type="file" id="file-uploader" @change="onChange" multiple>
     </div>
   </div>
   </div>
 </template>
 <script>
-import mixin from './mixin'
+import mixin from '@/utils/mixin'
-import picBed from '../../datastore/pic-bed.js'
+import picBed from '~/datastore/pic-bed.js'
 export default {
   name: 'mini-page',
   mixins: [mixin],
@@ -73,7 +73,7 @@ export default {
       this.dragover = false
       this.ipcSendFiles(e.dataTransfer.files)
     },
-    openUplodWindow () {
+    openUploadWindow () {
       document.getElementById('file-uploader').click()
     },
     onChange (e) {
@@ -116,7 +116,7 @@ export default {
       this.dragging = false
       if (this.screenX === e.screenX && this.screenY === e.screenY) {
         if (e.button === 0) { // left mouse
-          this.openUplodWindow()
+          this.openUploadWindow()
         } else {
           let _this = this
           const types = picBed.map(item => item.type)

src/renderer/pages/PicGoSetting.vue

@@ -182,7 +182,7 @@
 <script>
 // import db from '../../../datastore'
 import keyDetect from 'utils/key-binding'
-import pkg from '../../../../package.json'
+import pkg from 'root/package.json'
 const release = 'https://api.github.com/repos/Molunerfinn/PicGo/releases/latest'
 const downloadUrl = 'https://github.com/Molunerfinn/PicGo/releases/latest'
 export default {

src/renderer/pages/Plugin.vue

@@ -79,12 +79,10 @@
   </div>
 </template>
 <script>
-import ConfigForm from '../ConfigForm'
+import ConfigForm from '@/components/ConfigForm'
 import { debounce } from 'lodash'
-import mixin from '../mixin'
 export default {
   name: 'plugin',
-  mixins: [mixin],
   components: {
     ConfigForm
   },

src/renderer/pages/RenamePage.vue

@@ -22,7 +22,7 @@
   </div>
 </template>
 <script>
-import mixin from './mixin'
+import mixin from '@/utils/mixin'
 export default {
   name: 'rename-page',
   mixins: [mixin],

src/renderer/pages/TrayPage.vue

@@ -23,8 +23,8 @@
 </template>
 
 <script>
-  import mixin from './mixin'
+  import mixin from '@/utils/mixin'
-  import pasteTemplate from '../../main/utils/pasteTemplate'
+  import pasteTemplate from '~/main/utils/pasteTemplate'
   export default {
     name: 'tray-page',
     mixins: [mixin],

src/renderer/pages/Upload.vue

@@ -7,7 +7,10 @@
         </div>
         <div
           id="upload-area"
-          :class="{ 'is-dragover': dragover }" @drop.prevent="onDrop" @dragover.prevent="dragover = true" @dragleave.prevent="dragover = false"
+          :class="{ 'is-dragover': dragover }"
+          @drop.prevent="onDrop"
+          @dragover.prevent="dragover = true"
+          @dragleave.prevent="dragover = false"
         >
           <div id="upload-dragger" @click="openUplodWindow">
             <i class="el-icon-upload"></i>
@@ -53,10 +56,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'upload',
-  mixins: [mixin],
   data () {
     return {
       dragover: false,

src/renderer/pages/picbeds/AliYun.vue

@@ -65,10 +65,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'aliyun',
-  mixins: [mixin],
   data () {
     return {
       form: {

src/renderer/pages/picbeds/GitHub.vue

@@ -57,10 +57,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'upyun',
-  mixins: [mixin],
   data () {
     return {
       form: {

src/renderer/pages/picbeds/Imgur.vue

@@ -37,10 +37,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'imgur',
-  mixins: [mixin],
   data () {
     return {
       form: {

src/renderer/pages/picbeds/Qiniu.vue

@@ -75,10 +75,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'qiniu',
-  mixins: [mixin],
   data () {
     return {
       form: {

src/renderer/pages/picbeds/SMMS.vue

@@ -16,10 +16,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'upyun',
-  mixins: [mixin],
   data () {
     return {}
   },

src/renderer/pages/picbeds/TcYun.vue

@@ -86,10 +86,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'tcyun',
-  mixins: [mixin],
   data () {
     return {
       form: {

src/renderer/pages/picbeds/UpYun.vue

@@ -65,10 +65,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'upyun',
-  mixins: [mixin],
   data () {
     return {
       form: {

src/renderer/pages/picbeds/Weibo.vue

@@ -62,10 +62,8 @@
   </div>
 </template>
 <script>
-import mixin from '../mixin'
 export default {
   name: 'weibo',
-  mixins: [mixin],
   data () {
     return {
       form: {

src/renderer/router/index.js

@@ -8,81 +8,81 @@ export default new Router({
     {
       path: '/',
       name: 'tray-page',
-      component: require('@/components/TrayPage').default
+      component: require('@/pages/TrayPage').default
     },
     {
       path: '/rename-page',
       name: 'rename-page',
-      component: require('@/components/RenamePage').default
+      component: require('@/pages/RenamePage').default
     },
     {
       path: '/mini-page',
       name: 'mini-page',
-      component: require('@/components/MiniPage').default
+      component: require('@/pages/MiniPage').default
     },
     {
       path: '/setting',
       name: 'setting-page',
-      component: require('@/components/SettingPage').default,
+      component: require('@/layouts/SettingPage').default,
       children: [
         {
           path: 'upload',
-          component: require('@/components/SettingView/Upload').default,
+          component: require('@/pages/Upload').default,
           name: 'upload'
         },
         {
           path: 'weibo',
-          component: require('@/components/SettingView/Weibo').default,
+          component: require('@/pages/picbeds/Weibo').default,
           name: 'weibo'
         },
         {
           path: 'qiniu',
-          component: require('@/components/SettingView/Qiniu').default,
+          component: require('@/pages/picbeds/Qiniu').default,
           name: 'qiniu'
         },
         {
           path: 'tcyun',
-          component: require('@/components/SettingView/TcYun').default,
+          component: require('@/pages/picbeds/TcYun').default,
           name: 'tcyun'
         },
         {
           path: 'upyun',
-          component: require('@/components/SettingView/UpYun').default,
+          component: require('@/pages/picbeds/UpYun').default,
           name: 'upyun'
         },
         {
           path: 'github',
-          component: require('@/components/SettingView/GitHub').default,
+          component: require('@/pages/picbeds/GitHub').default,
           name: 'github'
         },
         {
           path: 'smms',
-          component: require('@/components/SettingView/SMMS').default,
+          component: require('@/pages/picbeds/SMMS').default,
           name: 'smms'
         },
         {
           path: 'aliyun',
-          component: require('@/components/SettingView/AliYun').default,
+          component: require('@/pages/picbeds/AliYun').default,
           name: 'aliyun'
         },
         {
           path: 'imgur',
-          component: require('@/components/SettingView/Imgur').default,
+          component: require('@/pages/picbeds/Imgur').default,
           name: 'imgur'
         },
         {
           path: 'gallery',
-          component: require('@/components/SettingView/Gallery').default,
+          component: require('@/pages/Gallery').default,
           name: 'gallery'
         },
         {
           path: 'setting',
-          component: require('@/components/SettingView/PicGoSetting').default,
+          component: require('@/pages/PicGoSetting').default,
           name: 'setting'
         },
         {
           path: 'plugin',
-          component: require('@/components/SettingView/Plugin').default,
+          component: require('@/pages/Plugin').default,
           name: 'plugin'
         }
       ]

src/renderer/utils/mixin.js

@@ -1,4 +1,4 @@
-import db from '../../datastore'
+import db from '~/datastore'
 export default {
   mounted () {
     this.disableDragEvent()