refactor: update directions

diff --git a/src/popup/script/bytom.js b/src/app/common/bytom.js
similarity index 100%
rename from src/popup/script/bytom.js
rename to src/app/common/bytom.js

diff --git a/src/popup/script/utils.js b/src/app/common/utils.js
similarity index 100%
rename from src/popup/script/utils.js
rename to src/app/common/utils.js

diff --git a/src/popup/components/dialog/component.vue b/src/app/components/dialog/component.vue
similarity index 100%
rename from src/popup/components/dialog/component.vue
rename to src/app/components/dialog/component.vue

diff --git a/src/popup/components/dialog/index.js b/src/app/components/dialog/index.js
similarity index 100%
rename from src/popup/components/dialog/index.js
rename to src/app/components/dialog/index.js

diff --git a/src/popup/components/menu-page/index.js b/src/app/components/menu-page/index.js
similarity index 100%
rename from src/popup/components/menu-page/index.js
rename to src/app/components/menu-page/index.js

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

diff --git a/src/popup/components/select/index.js b/src/app/components/select/index.js
similarity index 100%
rename from src/popup/components/select/index.js
rename to src/app/components/select/index.js

diff --git a/src/popup/components/select/mixins/ajax.js b/src/app/components/select/mixins/ajax.js
similarity index 100%
rename from src/popup/components/select/mixins/ajax.js
rename to src/app/components/select/mixins/ajax.js

diff --git a/src/popup/components/select/mixins/index.js b/src/app/components/select/mixins/index.js
similarity index 100%
rename from src/popup/components/select/mixins/index.js
rename to src/app/components/select/mixins/index.js

diff --git a/src/popup/components/select/mixins/pointerScroll.js b/src/app/components/select/mixins/pointerScroll.js
similarity index 100%
rename from src/popup/components/select/mixins/pointerScroll.js
rename to src/app/components/select/mixins/pointerScroll.js

diff --git a/src/popup/components/select/mixins/typeAheadPointer.js b/src/app/components/select/mixins/typeAheadPointer.js
similarity index 100%
rename from src/popup/components/select/mixins/typeAheadPointer.js
rename to src/app/components/select/mixins/typeAheadPointer.js

diff --git a/src/popup/components/select/select.vue b/src/app/components/select/select.vue
similarity index 100%
rename from src/popup/components/select/select.vue
rename to src/app/components/select/select.vue

diff --git a/src/popup/home/main.vue b/src/app/entryHome.vue
similarity index 96%
rename from src/popup/home/main.vue
rename to src/app/entryHome.vue
index af8cd86..1e67351 100644 (file)
--- a/src/popup/home/main.vue
+++ b/src/app/entryHome.vue
@@ -116,7 +116,7 @@
 </style>
 
 <template>
-  <div class="warp">
+  <div id="app" class="warp">
     <section class="bg-green">
       <div class="topbar">
           <div class="topbar-right">
@@ -132,7 +132,7 @@
           </div>
       </div>
       <div class="content">
-          <img src="../../assets/logo.png" class="token-icon">
+          <img src="../assets/logo.png" class="token-icon">
           <div v-if="accountInfo.address!=undefined" class="amount">
               <div class="token-amount">{{accountInfo.balance}}<span class="asset">BTM</span></div>
               <p class="account-address">
@@ -173,12 +173,12 @@
 
 <script>
 import ClipboardJS from "clipboard";
-import Menu from "./menu";
-import Qrcode from "./components/qrcode";
-import Transfer from "./components/transfer";
-import TxInfo from "./components/tx-info";
-import bytom from "../script/bytom";
-import utils from "../script/utils";
+import Menu from "./home/menu";
+import Qrcode from "./transfer/qrcode";
+import Transfer from "./transfer/transfer";
+import TxInfo from "./transfer/detail";
+import bytom from "./common/bytom";
+import utils from "./common/utils";
 export default {
   name: "",
   components: {
@@ -325,6 +325,7 @@ export default {
     }
   },
   mounted() {
+    console.log(2222)
     if (localStorage.bytomNet != undefined) {
       this.network = localStorage.bytomNet;
     }

diff --git a/src/popup/login/main.vue b/src/app/entryWelcome.vue
similarity index 87%
rename from src/popup/login/main.vue
rename to src/app/entryWelcome.vue
index 3a23d43..e1e8e80 100644 (file)
--- a/src/popup/login/main.vue
+++ b/src/app/entryWelcome.vue
@@ -29,7 +29,7 @@
 </style>
 
 <template>
-  <section id="app">
+  <section id="welcome">
     <transition-group name="panels">
       <Welcome class="view" key="welcome" v-show="view.welcome" @next="currView='protocol'"></Welcome>
       <Protocol class="view" key="protocol" v-show="view.protocol" @next="currView='formAddon'"></Protocol>
@@ -40,10 +40,10 @@
 </template>
 
 <script>
-import Welcome from "./components/welcome";
-import Protocol from "./components/protocol";
-import FormAddon from "./components/form-addon";
-import FormRecover from "./components/form-recover";
+import Welcome from "./welcome/welcome";
+import Protocol from "./welcome/protocol";
+import FormAddon from "./welcome/form-addon";
+import FormRecover from "./welcome/form-recover";
 
 export default {
   components: {

diff --git a/src/popup/home/components/menu-backup.vue b/src/app/home/menu-backup.vue
similarity index 93%
rename from src/popup/home/components/menu-backup.vue
rename to src/app/home/menu-backup.vue
index 994f701..9774c31 100644 (file)
--- a/src/popup/home/components/menu-backup.vue
+++ b/src/app/home/menu-backup.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import bytom from "../../script/bytom";
+import bytom from "../common/bytom";
 import FileSaver from "file-saver";
 export default {
   name: "",

diff --git a/src/popup/home/components/menu-creation.vue b/src/app/home/menu-creation.vue
similarity index 98%
rename from src/popup/home/components/menu-creation.vue
rename to src/app/home/menu-creation.vue
index 75e590d..a98f7ca 100644 (file)
--- a/src/popup/home/components/menu-creation.vue
+++ b/src/app/home/menu-creation.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import bytom from "../../script/bytom";
+import bytom from "../common/bytom";
 export default {
   name: "",
   components: {},

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

diff --git a/src/popup/home/components/menu-recovery.vue b/src/app/home/menu-recovery.vue
similarity index 91%
rename from src/popup/home/components/menu-recovery.vue
rename to src/app/home/menu-recovery.vue
index 02ca894..f11aec9 100644 (file)
--- a/src/popup/home/components/menu-recovery.vue
+++ b/src/app/home/menu-recovery.vue
@@ -17,8 +17,8 @@ input {
 </template>
 
 <script>
-import bytom from "../../script/bytom";
-import getLang from "../../../assets/language/sdk";
+import bytom from "../common/bytom";
+import getLang from "../../assets/language/sdk";
 export default {
   name: "",
   data() {

diff --git a/src/popup/home/components/menu-settings.vue b/src/app/home/menu-settings.vue
similarity index 78%
rename from src/popup/home/components/menu-settings.vue
rename to src/app/home/menu-settings.vue
index 2b3271f..d4d12a1 100644 (file)
--- a/src/popup/home/components/menu-settings.vue
+++ b/src/app/home/menu-settings.vue
@@ -37,15 +37,18 @@
 </template>
 
 <script>
-import {have} from "../../../assets/language";
+import { have } from "../../assets/language";
 
 export default {
   name: "",
   data() {
     return {
       unit: "BTM",
-      i18nOptions: [{label: "中文", value: "cn"}, {label: "English", value: "en"}],
-      selected: {label: "中文", value: "cn"},
+      i18nOptions: [
+        { label: "中文", value: "cn" },
+        { label: "English", value: "en" }
+      ],
+      selected: { label: "中文", value: "cn" },
       hashVersion: ""
     };
   },
@@ -67,10 +70,10 @@ export default {
   mounted: function() {
     this.hashVersion = version.hash;
     if (have(localStorage.lang)) {
-      if(localStorage.lang == 'cn') {
-        this.selected = {label: "中文", value: "cn"};
-      } else if (localStorage.lang == 'en') {
-        this.selected = {label: "English", value: "en"};
+      if (localStorage.lang == "cn") {
+        this.selected = { label: "中文", value: "cn" };
+      } else if (localStorage.lang == "en") {
+        this.selected = { label: "English", value: "en" };
       }
     }
   }

diff --git a/src/popup/home/menu.vue b/src/app/home/menu.vue
similarity index 94%
rename from src/popup/home/menu.vue
rename to src/app/home/menu.vue
index d71ceab..1bbbec9 100644 (file)
--- a/src/popup/home/menu.vue
+++ b/src/app/home/menu.vue
@@ -96,12 +96,12 @@
 </template>
 
 <script>
-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";
+import Creation from "./menu-creation";
+import Recovery from "./menu-recovery";
+import Bakcup from "./menu-backup";
+import Help from "./menu-help";
+import Settings from "./menu-settings";
+import bytom from "../common/bytom";
 export default {
   name: "",
   components: {

diff --git a/src/app/index.js b/src/app/index.js
new file mode 100644 (file)
index 0000000..1225425
--- /dev/null
+++ b/src/app/index.js
@@ -0,0 +1,61 @@
+import Vue from "vue";
+import moment from "moment";
+import VueI18n from "vue-i18n";
+import Loading from "vue-loading-overlay";
+import vuescroll from "vuescroll/dist/vuescroll-native";
+import "vue-loading-overlay/dist/vue-loading.css";
+import "vuescroll/dist/vuescroll.css";
+
+import Home from "./entryHome";
+import Welcome from "./entryWelcome";
+import Dialog from "./components/dialog";
+import vSelect from "./components/select";
+import MenuPage from "./components/menu-page";
+import messages, { have } from "../assets/language";
+import "../assets/style.css";
+
+Vue.use(VueI18n);
+const i18n = new VueI18n({
+  fallbackLocale: "en",
+  locale: have(localStorage.lang) ? localStorage.lang : "cn",
+  messages
+});
+Vue.use(i18n);
+Vue.use(vuescroll);
+Vue.use(MenuPage);
+Vue.use(Loading);
+Vue.use(Dialog, i18n);
+Vue.component("v-select", vSelect);
+
+Vue.prototype.$vuescrollConfig = {
+  mode: "pure-native",
+  bar: {
+    keepShow: true,
+    background: "#c9c9c9"
+  }
+};
+
+Vue.filter("moment", function(value, formatString) {
+  formatString = formatString || "YYYY-MM-DD HH:mm:ss";
+  return moment(value * 1000).format(formatString);
+});
+
+let Application = {};
+
+Application.launth = function() {
+  new Vue({
+    el: "#app",
+    i18n: i18n,
+    render: h => h(Home)
+  });
+};
+
+Application.welcome = function() {
+  new Vue({
+    el: "#app",
+    i18n: i18n,
+    render: h => h(Welcome)
+  });
+};
+
+export default Application;

diff --git a/src/popup/home/components/transfer-confirm.vue b/src/app/transfer/confirm.vue
similarity index 96%
rename from src/popup/home/components/transfer-confirm.vue
rename to src/app/transfer/confirm.vue
index ea69cc1..32e8e14 100644 (file)
--- a/src/popup/home/components/transfer-confirm.vue
+++ b/src/app/transfer/confirm.vue
@@ -111,10 +111,10 @@
 </template>
 
 <script>
-import bytom from "../../script/bytom";
-import utils from "../../script/utils";
+import bytom from "../common/bytom";
+import utils from "../common/utils";
 import modalPasswd from "./modal-passwd";
-import getLang from "../../../assets/language/sdk";
+import getLang from "../../assets/language/sdk";
 export default {
   components: {
     modalPasswd

diff --git a/src/popup/home/components/tx-info.vue b/src/app/transfer/detail.vue
similarity index 97%
rename from src/popup/home/components/tx-info.vue
rename to src/app/transfer/detail.vue
index 9700f54..89543ef 100644 (file)
--- a/src/popup/home/components/tx-info.vue
+++ b/src/app/transfer/detail.vue
@@ -89,7 +89,7 @@
         <section>
           <vue-scroll>
             <div class="transaction">
-              <p class="time">{{transaction.timestamp | moment}}</p>
+              <p class="time">{{transaction.block_timestamp | moment}}</p>
               <div class="info">
                 <section>
                   <p class="label">{{ $t('transactionDetail.fee') }}(BTM)</p>

diff --git a/src/popup/home/components/modal-passwd.vue b/src/app/transfer/modal-passwd.vue
similarity index 100%
rename from src/popup/home/components/modal-passwd.vue
rename to src/app/transfer/modal-passwd.vue

diff --git a/src/popup/home/components/qrcode.vue b/src/app/transfer/qrcode.vue
similarity index 95%
rename from src/popup/home/components/qrcode.vue
rename to src/app/transfer/qrcode.vue
index e617618..faf3e7f 100644 (file)
--- a/src/popup/home/components/qrcode.vue
+++ b/src/app/transfer/qrcode.vue
@@ -1,8 +1,10 @@
 <style scoped>
 .warp {
+  position: absolute;
+  left: 35px;
+  top: 135px;
   width: 220px;
   height: 200px;
-  margin: 128px auto;
   border-radius: 5px;
   text-align: center;
   padding: 30px;

diff --git a/src/popup/home/components/transfer.vue b/src/app/transfer/transfer.vue
similarity index 95%
rename from src/popup/home/components/transfer.vue
rename to src/app/transfer/transfer.vue
index 0a99c83..98a8d00 100644 (file)
--- a/src/popup/home/components/transfer.vue
+++ b/src/app/transfer/transfer.vue
@@ -56,7 +56,7 @@
         <section class="header bg-green">
           <i class="iconfont icon-back" @click="close"></i>
           <div class="balance">
-            <img src="../../../assets/logo.png" class="token-icon">
+            <img src="../../assets/logo.png" class="token-icon">
             <div class="token-amount">{{account.balance}}<span class="asset">BTM</span></div>
           </div>
         </section>
@@ -104,17 +104,17 @@
       </div>
     </transition>
 
-    <TransferConfirm ref="transferConfirm" @on-success="close"></TransferConfirm>
+    <Confirm ref="transferConfirm" @on-success="close"></Confirm>
   </div>
 </template>
 
 <script>
-import bytom from "../../script/bytom";
-import getLang from "../../../assets/language/sdk";
-import TransferConfirm from "./transfer-confirm";
+import bytom from "../common/bytom";
+import getLang from "../../assets/language/sdk";
+import Confirm from "./confirm";
 export default {
   components: {
-    TransferConfirm
+    Confirm
   },
   data() {
     const ASSET_BTM =

diff --git a/src/popup/login/components/form-addon.vue b/src/app/welcome/form-addon.vue
similarity index 97%
rename from src/popup/login/components/form-addon.vue
rename to src/app/welcome/form-addon.vue
index 66f8ea9..c64f843 100644 (file)
--- a/src/popup/login/components/form-addon.vue
+++ b/src/app/welcome/form-addon.vue
@@ -8,7 +8,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">
             <div class="title">{{ $t('createAccount.title') }}</div>
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import bytom from "../../script/bytom";
+import bytom from "../common/bytom";
 export default {
   name: "",
   data() {

diff --git a/src/popup/login/components/form-recover.vue b/src/app/welcome/form-recover.vue
similarity index 91%
rename from src/popup/login/components/form-recover.vue
rename to src/app/welcome/form-recover.vue
index e25d669..1f42781 100644 (file)
--- a/src/popup/login/components/form-recover.vue
+++ b/src/app/welcome/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">
             <div class="title">{{ $t('createAccount.import') }}</div>
@@ -25,8 +25,8 @@
 </template>
 
 <script>
-import bytom from "../../script/bytom";
-import getLang from "../../../assets/language/sdk";
+import bytom from "../common/bytom";
+import getLang from "../../assets/language/sdk";
 export default {
   name: "",
   data() {

diff --git a/src/popup/login/components/protocol.vue b/src/app/welcome/protocol.vue
similarity index 92%
rename from src/popup/login/components/protocol.vue
rename to src/app/welcome/protocol.vue
index 5f7980c..6700689 100644 (file)
--- a/src/popup/login/components/protocol.vue
+++ b/src/app/welcome/protocol.vue
@@ -7,7 +7,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 protocol">
             <div class="title">{{ $t('welcome.terms') }}</div>

diff --git a/src/popup/login/components/welcome.vue b/src/app/welcome/welcome.vue
similarity index 92%
rename from src/popup/login/components/welcome.vue
rename to src/app/welcome/welcome.vue
index f606be4..e9b83e4 100644 (file)
--- a/src/popup/login/components/welcome.vue
+++ b/src/app/welcome/welcome.vue
@@ -3,7 +3,7 @@
   height: 505px;
   text-align: center;
   font-size: 18px;
-  background: url("../../../assets/welcome.jpeg") no-repeat;
+  background: url("../../assets/welcome.jpeg") no-repeat;
   background-size: 100%;
 }
 .welcome-top p {

diff --git a/src/assets/style.css b/src/assets/style.css
index 1c5a892..7894120 100644 (file)
--- a/src/assets/style.css
+++ b/src/assets/style.css
@@ -38,11 +38,15 @@ a {
   text-decoration: none;
 }
 
-#app {
+#app,
+#welcome {
   font-family: "Avenir", Helvetica, Arial, sans-serif;
   color: #fff;
+  width: 350px;
+  height: 600px;
   font-size: 18px;
   line-height: 25px;
+  overflow: hidden;
 }
 
 .float-right {
@@ -319,8 +323,8 @@ hr {
 }
 .form-item input::-webkit-outer-spin-button,
 .form-item input::-webkit-inner-spin-button {
-    -webkit-appearance: none !important;
-    margin: 0;
+  -webkit-appearance: none !important;
+  margin: 0;
 }
 
 .form-item input,

diff --git a/src/popup/App.vue b/src/popup/App.vue
deleted file mode 100644 (file)
index 601deb3..0000000
--- a/src/popup/App.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <section id="app">
-    <transition-group name="panels" tag="div" class="app-wrapper">
-      <Login class="view" key="login" v-show="view.login"></Login>
-      <Home class="view" key="home" v-show="view.home"></Home>
-    </transition-group>
-  </section>
-</template>
-
-<script>
-import Home from "./home/main";
-import Login from "./login/main";
-
-export default {
-  components: {
-    Login,
-    Home
-  },
-  data() {
-    return {
-      currView: "home"
-    };
-  },
-  computed: {
-    view() {
-      const { currView } = this;
-      return {
-        login: currView === "login",
-        home: currView === "home"
-      };
-    }
-  },
-  methods: {},
-  mounted() {
-    if (localStorage.login == undefined) {
-      this.currView = "login";
-      return;
-    }
-  }
-};
-</script>
\ No newline at end of file

diff --git a/src/popup/index.js b/src/popup/index.js
index a6255bc..f32e6e6 100644 (file)
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -1,46 +1,14 @@
-import Vue from "vue";
-import App from "./App.vue";
-import moment from "moment";
-import Loading from "vue-loading-overlay";
-import vuescroll from "vuescroll/dist/vuescroll-native";
-import Dialog from "./components/dialog";
-import vSelect from "./components/select";
-import MenuPage from "./components/menu-page";
-import VueI18n from "vue-i18n";
-import messages, {have} from "../assets/language";
-import "../assets/style.css";
-import "vuescroll/dist/vuescroll.css";
-import "vue-loading-overlay/dist/vue-loading.css";
+import App from "../app";
 
-Vue.use(vuescroll);
-Vue.use(MenuPage);
-Vue.use(Loading);
-Vue.use(VueI18n);
-Vue.component('v-select', vSelect);
-Vue.prototype.$vuescrollConfig = {
-  mode: "pure-native",
-  bar: {
-    keepShow: true,
-    background: "#c9c9c9"
-  }
-};
-Vue.filter("moment", function(value, formatString) {
-  formatString = formatString || "YYYY-MM-DD HH:mm:ss";
-  return moment(value * 1000).format(formatString);
-});
+class Popup {
+  constructor() {
+    if (localStorage.login == undefined) {
+      App.welcome();
+      return;
+    }
 
-let lang = "cn";
-if (have(localStorage.lang)) {
-  lang = localStorage.lang;
+    App.launth();
+  }
 }
-const i18n = new VueI18n({
-  fallbackLocale: "en",
-  locale: lang,
-  messages
-});
-Vue.use(Dialog, i18n);
-new Vue({
-  el: "#app",
-  i18n: i18n,
-  render: h => h(App)
-});
+
+const popup = new Popup();

diff --git a/src/prompt/App.vue b/src/prompt/App.vue
deleted file mode 100644 (file)
index eb2bcb2..0000000
--- a/src/prompt/App.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <section id="app">
-    <div>test succ</div>
-  </section>
-</template>
-
-<script>
-export default {
-  name: "",
-  data() {
-    return {};
-  }
-};
-</script>
-
-<style lang="" scoped>
-</style>
\ No newline at end of file

diff --git a/src/prompt/index.js b/src/prompt/index.js
index 8e2d2f3..8ccd553 100644 (file)
--- a/src/prompt/index.js
+++ b/src/prompt/index.js
@@ -1,8 +1,9 @@
-import Vue from "vue";
-import App from "./App.vue";
+import App from "../app";
 
-new Vue({
-  el: "#app",
-  render: h => h(App)
-});
+class Prompt {
+  constructor() {
+    App.transfer();
+  }
+}
 
+const prompt = new Prompt();