From 45112d1b33e588ca6db25a227b6392a82bd433cd Mon Sep 17 00:00:00 2001
From: Corentin Thomasset <corentin.thomasset74@gmail.com>
Date: Sun, 7 Jun 2020 19:06:07 +0200
Subject: [PATCH] feat: prevent non-integer bases

Signed-off-by: Corentin Thomasset <corentin.thomasset74@gmail.com>
---
 src/routes/tools/BaseConverter.vue | 23 +++++++++++++++++------
 src/utils/helpers.js               |  7 ++++++-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/routes/tools/BaseConverter.vue b/src/routes/tools/BaseConverter.vue
index ec26b2aa..298aa799 100644
--- a/src/routes/tools/BaseConverter.vue
+++ b/src/routes/tools/BaseConverter.vue
@@ -9,6 +9,7 @@
                             outlined
                             type="number"
                             v-model="inputBase"
+                            ref="inputBase"
                             hide-details="auto"
                             :rules="baseRules"
                     />
@@ -33,6 +34,7 @@
                             outlined
                             type="number"
                             v-model="outputBase"
+                            ref="outputBase"
                             :rules="baseRules"
                     />
                 </v-col>
@@ -54,7 +56,7 @@
 </template>
 
 <script>
-    import {copyToClipboard} from "../../utils/helpers";
+    import {copyToClipboard, isInt} from "../../utils/helpers";
 
     const convertBase = (value, fromBase, toBase) => {
         const range = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+/'.split('');
@@ -83,12 +85,17 @@
                 inputBase: 10,
                 outputBase: 16,
                 baseRules: [
+                    v => isInt(v) || 'Base should be an integer',
                     v => !!v || 'Required',
                     v => v > 1 || 'Base should be > 1',
-                    v => v <= 64 || 'Base should be <= 64',
+                    v => v <= 64 || 'Base should be <= 64'
                 ],
+                isMounted: false
             }
         },
+        mounted() {
+            this.isMounted = true;
+        },
         methods: {
             copy() {
                 copyToClipboard(this.outputNumber);
@@ -97,10 +104,14 @@
         },
         computed: {
             outputNumber() {
-                try{
-                    return convertBase(this.inputNumber, this.inputBase, this.outputBase)
-                }catch (e) {
-                    return e.message;
+                if(this.isMounted && this.$refs.inputBase.validate() && this.$refs.outputBase.validate()){
+                    try{
+                        return convertBase(this.inputNumber, this.inputBase, this.outputBase)
+                    }catch (e) {
+                        return e.message;
+                    }
+                }else {
+                    return ''
                 }
             }
         }
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
index 17f4b337..0254d1b8 100644
--- a/src/utils/helpers.js
+++ b/src/utils/helpers.js
@@ -24,8 +24,13 @@ const formatBytes = (bytes, decimals = 2) => {
     return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
 }
 
+const isInt = (value) => {
+    return !isNaN(value) && ((x) => (x | 0) === x)(parseFloat(value))
+}
+
 export {
     copyToClipboard,
     fileIsImage,
-    formatBytes
+    formatBytes,
+    isInt
 }
\ No newline at end of file