refacor: update dir struct

diff --git a/package-lock.json b/package-lock.json
index f627699..dc7709e 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -9757,6 +9757,11 @@
         }
       }
     },
+    "vue-loading-overlay": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vue-loading-overlay/-/vue-loading-overlay-3.0.1.tgz",
+      "integrity": "sha512-1y7Yghbb8SFw0DzMVz6tVKUz7wvsmWw+78mKQ148ZWDfGroX86wCUmsurx4BxNggziVfWWGvS0QexpwkmdSMgw=="
+    },
     "vue-style-loader": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz",

diff --git a/package.json b/package.json
index 9f37091..d8d9de6 100644 (file)
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
     "iview": "^3.0.0",
     "moment": "^2.22.2",
     "qrcodejs2": "0.0.2",
-    "vue": "^2.5.11"
+    "vue": "^2.5.11",
+    "vue-loading-overlay": "^3.0.1"
   },
   "browserslist": [
     "> 1%",

diff --git a/src/background/bytom.js b/src/background/bytom.js
index 247cce7..398dc51 100644 (file)
--- a/src/background/bytom.js
+++ b/src/background/bytom.js
@@ -1,10 +1,10 @@
 import Bytom from "bytom-js-sdk";
 
-let netWork = {
-  solonet: "http://52.82.24.155:3000/"
+let network = {
+  testnet: "http://52.82.24.155:3000/"
 };
 
-var bytom = new Bytom(netWork, chrome.runtime.getURL("wasm/main.wasm"));
-bytom.setNetType("solonet");
+var bytom = new Bytom(network, chrome.runtime.getURL("wasm/main.wasm"));
+bytom.setNetType("testnet");
 
 export default bytom.sdk;

diff --git a/src/popup/App.vue b/src/popup/App.vue
index fb30cff..fd6dc94 100644 (file)
--- a/src/popup/App.vue
+++ b/src/popup/App.vue
@@ -8,8 +8,8 @@
 </template>
 
 <script>
-import Home from "./framework/home";
-import Login from "./framework/login";
+import Home from "./home/main";
+import Login from "./login/main";
 import bytom from "./script/bytom";
 
 export default {

diff --git a/src/popup/components/spin/index.js b/src/popup/components/spin/index.js
deleted file mode 100644 (file)
index ffba3c7..0000000
--- a/src/popup/components/spin/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Spin from './spin.js';
-
-let spinInstance;
-
-function getSpinInstance (render = undefined) {
-    spinInstance = spinInstance || Spin.newInstance({
-        render: render
-    });
-
-    return spinInstance;
-}
-
-function loading (options) {
-    const render = ('render' in options) ? options.render : undefined;
-    let instance  = getSpinInstance(render);
-
-    instance.show(options);
-}
-
-Spin.show = function (props = {}) {
-    return loading(props);
-};
-Spin.hide = function () {
-    if (!spinInstance) return false;
-
-    const instance = getSpinInstance();
-
-    instance.remove(() => {
-        spinInstance = null;
-    });
-};
-
-export default Spin;
\ No newline at end of file

diff --git a/src/popup/components/spin/spin.js b/src/popup/components/spin/spin.js
deleted file mode 100644 (file)
index 940c865..0000000
--- a/src/popup/components/spin/spin.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import Vue from 'vue';
-import Spin from './spin.vue';
-
-Spin.newInstance = properties => {
-    const _props = properties || {};
-
-    const Instance = new Vue({
-        data: Object.assign({}, _props, {
-
-        }),
-        render (h) {
-            let vnode = '';
-            if (this.render) {
-                vnode = h(Spin, {
-                    props: {
-                        fix: true,
-                        fullscreen: true
-                    }
-                }, [this.render(h)]);
-            } else {
-                vnode = h(Spin, {
-                    props: {
-                        size: 'large',
-                        fix: true,
-                        fullscreen: true
-                    }
-                });
-            }
-            return h('div', {
-                'class': 'ivu-spin-fullscreen ivu-spin-fullscreen-wrapper',
-                'style': {
-                    'z-index': 999999
-                }
-            }, [vnode]);
-        }
-    });
-
-    const component = Instance.$mount();
-    document.body.appendChild(component.$el);
-    const spin = Instance.$children[0];
-
-    return {
-        show () {
-            spin.visible = true;
-            // tIndex = handleGetIndex();
-        },
-        remove (cb) {
-            spin.visible = false;
-            setTimeout(function() {
-                spin.$parent.$destroy();
-                if (document.getElementsByClassName('ivu-spin-fullscreen')[0] !== undefined) {
-                    document.body.removeChild(document.getElementsByClassName('ivu-spin-fullscreen')[0]);
-                }
-                cb();
-            }, 500);
-        },
-        component: spin
-    };
-};
-
-export default Spin;
\ No newline at end of file

diff --git a/src/popup/components/spin/spin.vue b/src/popup/components/spin/spin.vue
deleted file mode 100644 (file)
index 10a69eb..0000000
--- a/src/popup/components/spin/spin.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<style>
-.ivu-spin-fullscreen-wrapper {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background-color: rgba(255, 255, 255, 0.7);
-}
-</style>
-
-<template>
-    <transition name="fade">
-        <div :class="classes" v-if="fullscreenVisible">
-            <div :class="mainClasses">
-                <span :class="dotClasses"></span>
-                <div :class="textClasses"><slot></slot></div>
-            </div>
-        </div>
-    </transition>
-</template>
-<script>
-// import { oneOf } from '../../utils/assist';
-// import ScrollbarMixins from '../modal/mixins-scrollbar';
-const prefixCls = "ivu-spin";
-export default {
-  name: "Spin",
-  // mixins: [ ScrollbarMixins ],
-  props: {
-    size: {
-      //     validator (value) {
-      //         return oneOf(value, ['small', 'large', 'default']);
-      //     },
-      default() {
-        return !this.$IVIEW || this.$IVIEW.size === ""
-          ? "default"
-          : this.$IVIEW.size;
-      }
-    },
-    fix: {
-      type: Boolean,
-      default: false
-    },
-    fullscreen: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      showText: false,
-      // used for $Spin
-      visible: false
-    };
-  },
-  computed: {
-    classes() {
-      return [
-        `${prefixCls}`,
-        {
-          [`${prefixCls}-${this.size}`]: !!this.size,
-          [`${prefixCls}-fix`]: this.fix,
-          [`${prefixCls}-show-text`]: this.showText,
-          [`${prefixCls}-fullscreen`]: this.fullscreen
-        }
-      ];
-    },
-    mainClasses() {
-      return `${prefixCls}-main`;
-    },
-    dotClasses() {
-      return `${prefixCls}-dot`;
-    },
-    textClasses() {
-      return `${prefixCls}-text`;
-    },
-    fullscreenVisible() {
-      if (this.fullscreen) {
-        return this.visible;
-      } else {
-        return true;
-      }
-    }
-  },
-  watch: {
-    visible(val) {
-      // if (val) {
-      //     this.addScrollEffect();
-      // } else {
-      //     this.removeScrollEffect();
-      // }
-    }
-  },
-  mounted() {
-    this.showText = this.$slots.default !== undefined;
-  }
-};
-</script>
\ No newline at end of file

diff --git a/src/popup/framework/components/menu/page/backup.vue b/src/popup/home/components/menu-backup.vue
similarity index 93%
rename from src/popup/framework/components/menu/page/backup.vue
rename to src/popup/home/components/menu-backup.vue
index 3cca294..4ea183b 100644 (file)
--- a/src/popup/framework/components/menu/page/backup.vue
+++ b/src/popup/home/components/menu-backup.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import bytom from "../../../../script/bytom";
+import bytom from "../../script/bytom";
 import FileSaver from "file-saver";
 export default {
   name: "",

diff --git a/src/popup/framework/components/menu/page/creation.vue b/src/popup/home/components/menu-creation.vue
similarity index 88%
rename from src/popup/framework/components/menu/page/creation.vue
rename to src/popup/home/components/menu-creation.vue
index 5f6200d..e383417 100644 (file)
--- a/src/popup/framework/components/menu/page/creation.vue
+++ b/src/popup/home/components/menu-creation.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import bytom from "../../../../script/bytom";
+import bytom from "../../script/bytom";
 export default {
   name: "",
   components: {},
@@ -72,19 +72,28 @@ export default {
         return;
       }
 
+      let loader = this.$loading.show({
+        // Optional parameters
+        container: this.fullPage ? null : this.$refs.formContainer,
+        canCancel: true,
+        onCancel: this.onCancel
+      });
+
       bytom.Account.create(
         this.formItem.accAlias,
         this.formItem.keyAlias,
         this.formItem.passwd1
       )
         .then(res => {
+          loader.hide();
           this.close();
           console.log(res);
           this.formItem = {};
         })
         .catch(err => {
+          loader.hide();
           console.log(err);
-          alert(err)
+          alert(err);
           // this.tips = err.message;
         });
     }

diff --git a/src/popup/framework/components/menu/page/help.vue b/src/popup/home/components/menu-help.vue
similarity index 100%
rename from src/popup/framework/components/menu/page/help.vue
rename to src/popup/home/components/menu-help.vue

diff --git a/src/popup/framework/components/menu/page/recovery.vue b/src/popup/home/components/menu-recovery.vue
similarity index 95%
rename from src/popup/framework/components/menu/page/recovery.vue
rename to src/popup/home/components/menu-recovery.vue
index 91248ad..60228f6 100644 (file)
--- a/src/popup/framework/components/menu/page/recovery.vue
+++ b/src/popup/home/components/menu-recovery.vue
@@ -23,7 +23,7 @@ input {
 </template>
 
 <script>
-import bytom from "../../../../script/bytom";
+import bytom from "../../script/bytom";
 export default {
   name: "",
   data() {

diff --git a/src/popup/framework/components/menu/page/settings.vue b/src/popup/home/components/menu-settings.vue
similarity index 100%
rename from src/popup/framework/components/menu/page/settings.vue
rename to src/popup/home/components/menu-settings.vue

diff --git a/src/popup/framework/components/trans/qrcode.vue b/src/popup/home/components/qrcode.vue
similarity index 100%
rename from src/popup/framework/components/trans/qrcode.vue
rename to src/popup/home/components/qrcode.vue

diff --git a/src/popup/framework/components/trans/trans-detail.vue b/src/popup/home/components/trans-detail.vue
similarity index 100%
rename from src/popup/framework/components/trans/trans-detail.vue
rename to src/popup/home/components/trans-detail.vue

diff --git a/src/popup/framework/components/trans/trans-list.vue b/src/popup/home/components/trans-list.vue
similarity index 100%
rename from src/popup/framework/components/trans/trans-list.vue
rename to src/popup/home/components/trans-list.vue

diff --git a/src/popup/framework/components/trans/transfer.vue b/src/popup/home/components/transfer.vue
similarity index 98%
rename from src/popup/framework/components/trans/transfer.vue
rename to src/popup/home/components/transfer.vue
index 3ff1ea6..4a7d6aa 100644 (file)
--- a/src/popup/framework/components/trans/transfer.vue
+++ b/src/popup/home/components/transfer.vue
@@ -69,7 +69,7 @@
         <section class="header bg-green">
             <i class="iconfont icon-back" @click="show=false; confirmClose()"></i>
             <div class="balance">
-              <img src="../../../../assets/logo.png" class="token-icon">
+              <img src="../../../assets/logo.png" class="token-icon">
               <div style="display: flex">
                 <h1>{{balance}}</h1>
                 <span> BTM</span>
@@ -152,7 +152,7 @@
 </template>
 
 <script>
-import bytom from "../../../script/bytom";
+import bytom from "../../script/bytom";
 export default {
   name: "",
   data() {

diff --git a/src/popup/framework/home.vue b/src/popup/home/main.vue
similarity index 96%
rename from src/popup/framework/home.vue
rename to src/popup/home/main.vue
index 9fd5df8..7bf025b 100644 (file)
--- a/src/popup/framework/home.vue
+++ b/src/popup/home/main.vue
@@ -147,11 +147,11 @@
 </template>
 
 <script>
-import Menu from "./components/menu/main";
-import Qrcode from "./components/trans/qrcode";
-import Transfer from "./components/trans/transfer";
-import TransList from "./components/trans/trans-list";
-import TransDetail from "./components/trans/trans-detail";
+import Menu from "./menu";
+import Qrcode from "./components/qrcode";
+import Transfer from "./components/transfer";
+import TransList from "./components/trans-list";
+import TransDetail from "./components/trans-detail";
 import bytom from "../script/bytom";
 export default {
   name: "",

diff --git a/src/popup/framework/components/menu/main.vue b/src/popup/home/menu.vue
similarity index 93%
rename from src/popup/framework/components/menu/main.vue
rename to src/popup/home/menu.vue
index d4984ba..1e6cdda 100644 (file)
--- a/src/popup/framework/components/menu/main.vue
+++ b/src/popup/home/menu.vue
@@ -115,12 +115,12 @@ li.active {
 </template>
 
 <script>
-import Creation from "./page/creation";
-import Recovery from "./page/recovery";
-import Bakcup from "./page/backup";
-import Help from "./page/help";
-import Settings from "./page/settings";
-import bytom from "../../../script/bytom";
+import Creation from "./components/menu-creation";
+import Recovery from "./components/menu-recovery";
+import Bakcup from "./components/menu-backup";
+import Help from "./components/menu-help";
+import Settings from "./components/menu-settings";
+import bytom from "../script/bytom";
 export default {
   name: "",
   components: {

diff --git a/src/popup/index.js b/src/popup/index.js
index 159be35..16e50b1 100644 (file)
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -1,10 +1,11 @@
 import Vue from "vue";
-import Spin from "./components/spin";
 import App from "./App.vue";
+import Loading from 'vue-loading-overlay';
 import moment from "moment";
 import "../assets/style.css";
+import 'vue-loading-overlay/dist/vue-loading.css';
 
-Vue.prototype.$Spin = Spin;
+Vue.use(Loading);
 Vue.filter("moment", function(value, formatString) {
   formatString = formatString || "YYYY-MM-DD HH:mm:ss";
   return moment(value * 1000).format(formatString);

diff --git a/src/popup/framework/components/login/form-addon.vue b/src/popup/login/components/form-addon.vue
similarity index 91%
rename from src/popup/framework/components/login/form-addon.vue
rename to src/popup/login/components/form-addon.vue
index d0e61ef..429fa9e 100644 (file)
--- a/src/popup/framework/components/login/form-addon.vue
+++ b/src/popup/login/components/form-addon.vue
@@ -5,7 +5,7 @@
 <template>
     <div class="warp bg-gray">
         <section class="login-header bg-green">
-            <img src="../../../../assets/logo.png">
+            <img src="../../../assets/logo.png">
         </section>
         <section class="login-content">
             <h4>创建账户</h4>
@@ -14,9 +14,8 @@
                     <label class="form-item-label">选择网络</label>
                     <div class="form-item-content" style="margin-left: 60px;">
                         <select name="" id="">
-                            <option value="BYTOM私有网络">BYTOM私有网络</option>
                             <!-- <option value="BYTOM主网络">BYTOM主网络</option> -->
-                            <!-- <option value="BYTOM测试网络">BYTOM测试网络</option> -->
+                            <option value="BYTOM测试网络">BYTOM测试网络</option>
                         </select>
                     </div>
                 </div>
@@ -54,7 +53,7 @@
 </template>
 
 <script>
-import bytom from "../../../script/bytom";
+import bytom from "../../script/bytom";
 export default {
   name: "",
   data() {

diff --git a/src/popup/framework/components/login/form-recover.vue b/src/popup/login/components/form-recover.vue
similarity index 93%
rename from src/popup/framework/components/login/form-recover.vue
rename to src/popup/login/components/form-recover.vue
index 8188a31..1dabe84 100644 (file)
--- a/src/popup/framework/components/login/form-recover.vue
+++ b/src/popup/login/components/form-recover.vue
@@ -4,7 +4,7 @@
 <template>
     <div class="warp bg-gray">
         <section class="login-header bg-green">
-            <img src="../../../../assets/logo.png">
+            <img src="../../../assets/logo.png">
         </section>
         <section class="login-content">
             <h4>从种子导入</h4>
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import bytom from "../../../script/bytom";
+import bytom from "../../script/bytom";
 export default {
   name: "",
   data() {

diff --git a/src/popup/framework/components/login/protocol.vue b/src/popup/login/components/protocol.vue
similarity index 91%
rename from src/popup/framework/components/login/protocol.vue
rename to src/popup/login/components/protocol.vue
index 4fea146..8d9841b 100644 (file)
--- a/src/popup/framework/components/login/protocol.vue
+++ b/src/popup/login/components/protocol.vue
@@ -10,7 +10,7 @@
 <template>
     <div class="warp bg-gray">
         <section class="login-header bg-green">
-            <img src="../../../../assets/logo.png">
+            <img src="../../../assets/logo.png">
         </section>
         <section class="login-content">
             <h4>钱包使用条款</h4>

diff --git a/src/popup/framework/components/login/welcome.vue b/src/popup/login/components/welcome.vue
similarity index 90%
rename from src/popup/framework/components/login/welcome.vue
rename to src/popup/login/components/welcome.vue
index c08f794..7898129 100644 (file)
--- a/src/popup/framework/components/login/welcome.vue
+++ b/src/popup/login/components/welcome.vue
@@ -3,7 +3,7 @@
   height: 534px;
   text-align: center;
   font-size: 15px;
-  background: url('../../../../assets/welcome.jpeg') no-repeat;
+  background: url('../../../assets/welcome.jpeg') no-repeat;
   background-size: 100%;
 }
 .welcome-top p {

diff --git a/src/popup/framework/login.vue b/src/popup/login/main.vue
similarity index 87%
rename from src/popup/framework/login.vue
rename to src/popup/login/main.vue
index 324f4d1..cc8916f 100644 (file)
--- a/src/popup/framework/login.vue
+++ b/src/popup/login/main.vue
@@ -40,10 +40,10 @@
 </template>
 
 <script>
-import Welcome from "./components/login/welcome";
-import Protocol from "./components/login/protocol";
-import FormAddon from "./components/login/form-addon";
-import FormRecover from "./components/login/form-recover";
+import Welcome from "./components/welcome";
+import Protocol from "./components/protocol";
+import FormAddon from "./components/form-addon";
+import FormRecover from "./components/form-recover";
 
 export default {
   components: {