Merge branch 'release/3.0.0-milestone2-1'

Colm3na · May 5, 2020 · 8f07507 · 8f07507
2 parents 9e4e269 + ad5a1d5
commit 8f07507
Show file tree

Hide file tree

Showing 13 changed files with 1,444 additions and 1,529 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/components/chart-header.vue b/components/chart-header.vue
@@ -32,12 +32,13 @@ export default {
       return this.last - this.first;
     },
     iconDirection: function() {
-      return this.last - this.first > 0
+      if (this.last - this.first === 0) return "";
+      return this.last - this.first >= 0
         ? "far fa-thumbs-up"
         : "far fa-thumbs-down";
     },
     textClass: function() {
-      return this.last - this.first > 0
+      return this.last - this.first >= 0
         ? "change text-success ml-3"
         : "change text-danger ml-3";
     }

diff --git a/components/identicon.vue b/components/identicon.vue
@@ -3,14 +3,15 @@
     v-clipboard:copy="value"
     class="clipboard"
     :title="title"
-    @click="makeToast(toastText, 'Notification', 'success', true)"
+    @click="showToast"
   >
     <Identicon :value="value" :size="size" :theme="theme" class="identicon" />
   </a>
 </template>
 
 <script>
 import Identicon from "@polkadot/vue-identicon";
+
 export default {
   components: {
     Identicon: Identicon
@@ -30,11 +31,14 @@ export default {
     };
   },
   methods: {
-    makeToast(content = "", title = "", variant = null, solid = false) {
-      this.$bvToast.toast(content, {
-        title: title,
-        variant: variant,
-        solid: solid
+    showToast() {
+      this.$toast.success(this.title, {
+        action: {
+          icon: "X",
+          onClick: (e, toastObject) => {
+            toastObject.goAway(0);
+          }
+        }
       });
     }
   }

diff --git a/locales/en.json b/locales/en.json
@@ -386,7 +386,8 @@
       "produced_block": "Produced Block",
       "status": "Status",
       "date_time": "Date and Time",
-      "charts": "Charts"
+      "charts": "Charts",
+      "produced_blocks": "Produced blocks"
     }
   }
 }
diff --git a/locales/es.json b/locales/es.json
@@ -1,7 +1,7 @@
 {
   "components": {
     "identicon": {
-      "copy_address": "Copiar dirección ",
+      "copy_address": "Se ha copiado la dirección ",
       "to_clipboard": " al portapapeles",
       "address": "Dirección ",
       "copied_to_the_clipboard": " copiada al portapapeles"
@@ -389,7 +389,8 @@
       "produced_block": "Bloques producidos",
       "status": "Status",
       "date_time": "Día y hora",
-      "charts": "Gráficas"
+      "charts": "Gráficas",
+      "produced_blocks": "Bloques producidos"
     }
   }
 }
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -38,7 +38,8 @@ export default {
     "nuxt-clipboard2",
     // https://www.npmjs.com/package/cookie-universal-nuxt
     ["cookie-universal-nuxt", { alias: "cookies" }],
-    ["@nuxtjs/apollo"]
+    ["@nuxtjs/apollo"],
+    "@nuxtjs/toast"
   ],
   buildModules: [
     // https://github.com/nuxt-community/analytics-module
@@ -83,5 +84,18 @@ export default {
   },
   router: {
     middleware: "i18n"
+  },
+  toast: {
+    position: "top-right"
+    // register: [
+    //   // Register custom toasts
+    //   {
+    //     name: "my-error",
+    //     message: "Oops...Something went wrong",
+    //     options: {
+    //       type: "error"
+    //     }
+    //   }
+    // ]
   }
 };