Merge pull request #5 from ArqTras/master

Decimals, formating colours, explorer
arqma · Jul 14, 2019 · 5aa776f · 5aa776f
2 parents 1d40616 + 9842444
commit 5aa776f
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "arqma-electron-wallet",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "daemonVersion": "4.0.0",
   "description": "Modern GUI interface for Arqma Currency",
   "productName": "Arqma Electron Wallet",

diff --git a/quasar.conf.js b/quasar.conf.js
@@ -121,45 +121,30 @@ module.exports = function (ctx) {
                 background_color: "#ffffff",
                 theme_color: "#1ba7fd",
                 icons: [{
-                    "src": "src/statics/icons/16x16.png",
-                    "sizes": "16x16",
-                    "type": "image/png"
-                },
-                {
-                    "src": "src/statics/icons/24x24.png",
-                    "sizes": "24x24",
-                    "type": "image/png"
-                },
-                {
-                    "src": "src/statics/icons/32x32.png",
-                    "sizes": "32x32",
-                    "type": "image/png"
-                },
-                {
-                    "src": "src/statics/icons/48x48.png",
-                    "sizes": "48x48",
-                    "type": "image/png"
-                },
-                {
-                    "src": "src/statics/icons/64x64.png",
-                    "sizes": "64x64",
-                    "type": "image/png"
-                },
-                {
-                    "src": "src/statics/icons/96x96.png",
-                    "sizes": "96x96",
-                    "type": "image/png"
-                },
-                {
-                    "src": "src/statics/icons/128x12.png",
-                    "sizes": "128x128",
-                    "type": "image/png"
-                },
-                {
-                    "src": "src/statics/icons/256x256.png",
-                    "sizes": "256x256",
-                    "type": "image/png"
-                }
+                        "src": "statics/icons/icon-128x128.png",
+                        "sizes": "128x128",
+                        "type": "image/png"
+                    },
+                    {
+                        "src": "statics/icons/icon-192x192.png",
+                        "sizes": "192x192",
+                        "type": "image/png"
+                    },
+                    {
+                        "src": "statics/icons/icon-256x256.png",
+                        "sizes": "256x256",
+                        "type": "image/png"
+                    },
+                    {
+                        "src": "statics/icons/icon-384x384.png",
+                        "sizes": "384x384",
+                        "type": "image/png"
+                    },
+                    {
+                        "src": "statics/icons/icon-512x512.png",
+                        "sizes": "512x512",
+                        "type": "image/png"
+                    }
 
                 ]
             }

diff --git a/src-electron/main-process/modules/backend.js b/src-electron/main-process/modules/backend.js
@@ -234,7 +234,7 @@ export class Backend {
             }
 
             if (path) {
-                const baseUrl = net_type === "testnet" ? "https://stageblocks.arqma.com/" : "https://blocks.arqma.com"
+                const baseUrl = net_type === "testnet" ? "https://stageblocks.arqma.com/" : "https://vision.arqma.com/#"
                 const url = `${baseUrl}/${path}/`
                 require("electron").shell.openExternal(url + params.id)
             }

diff --git a/src/components/format_ryo.vue b/src/components/format_ryo.vue
@@ -6,7 +6,7 @@
 
 <script>
 export default {
-    name: "FormatRyo",
+    name: "FormatArqma",
     props: {
         amount: {
             required: true
@@ -15,14 +15,19 @@ export default {
             type: Boolean,
             required: false,
             default: false
+        },
+        rawValue: {
+            type: Boolean,
+            required: false,
+            default: false
         }
     },
     computed: {
         value () {
             let value = this.amount / 1e9
             if(this.round)
                 value = value.toFixed(3)
-            return value.toLocaleString()
+            return this.rawValue ? value : value.toLocaleString()
         }
 
     }

diff --git a/src/components/tx_list.vue b/src/components/tx_list.vue
@@ -16,10 +16,11 @@
                     <q-item-main>
                         <q-item-tile class="monospace ellipsis" label>{{ tx.txid }}</q-item-tile>
                         <q-item-tile sublabel>{{ formatHeight(tx) }}</q-item-tile>
+
                     </q-item-main>
                     <q-item-side>
                         <q-item-tile label>
-                            <FormatRyo :amount="tx.amount" />
+                            <FormatRyo :amount="tx.amount" raw-value />
                         </q-item-tile>
                         <q-item-tile sublabel>
                             <timeago :datetime="tx.timestamp*1000" :auto-update="60">

diff --git a/src/css/app.styl b/src/css/app.styl
@@ -187,6 +187,7 @@ footer,
             font-size: 14px;
             margin-top: 8px;
             color: #cecece;
+            text-transform: uppercase;
         }
 
         .value {
@@ -251,8 +252,14 @@ footer,
         }
 
         div {
-            padding: 0 8px;
+        display: inline-block;
+        padding: 0 8px;
+        }
+
+        div:last-child {
+        float:right;
         }
+
     }
 
     .status-bars {
@@ -290,23 +297,27 @@ footer,
 
 .tx-list {
 
-    .meta {
-        text-align:right;
-    }
-
     .q-item.tx-in,
-    .q-item.tx-pool,
-    .q-item.tx-miner,
-    .q-item.tx-snode,
-    .q-item.tx-gov {
-        .amount span {
+    .q-item.tx-pool {
+        .q-icon {
+            color: #333;
+        }
+        .q-item-label {
             color: #42A5F5;
-            &:before {
-                content: "+";
-                color: #42A5F5;
-            }
         }
-    }
+        &>div:last-child {
+            text-align:right;
+            &>div:first-child {
+                span {
+                    color: #42A5F5;
+                    &:before {
+                        content: "+";
+                        color: #42A5F5;
+                    }
+                }
+            }
+          }
+          }
 
     .q-item.tx-stake {
         .amount span {
@@ -316,15 +327,25 @@ footer,
 
     .q-item.tx-out,
     .q-item.tx-pending {
-        .amount span {
-            color: white;
-            &:before {
-                content: "-";
-                font-weight: bold;
-                color: white;
+    .q-icon {
+        color: #333;
+    }
+    .q-item-label {
+        color: gold;
+    }
+    &>div:last-child {
+        text-align:right;
+        &>div:first-child {
+            span {
+                color: gold;
+                &:before {
+                    content: "-";
+                    color: gold;
+                }
             }
         }
     }
+    }
 
     .q-item.tx-failed {
         .amount span {