From 91a7d2092316e57f9f356e1406d4e800d5fd600c Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Wed, 21 Oct 2020 13:49:02 +0530
Subject: [PATCH] Lint + ES6

---
 assets/scss/themes.scss                         |  2 +-
 .../environments/import-export-environment.vue  |  4 ++--
 pages/graphql.vue                               | 17 ++++++++---------
 pages/index.vue                                 | 10 +++++-----
 pages/settings.vue                              |  6 +++---
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/assets/scss/themes.scss b/assets/scss/themes.scss
index 1782d1d92..196cec130 100644
--- a/assets/scss/themes.scss
+++ b/assets/scss/themes.scss
@@ -1,6 +1,6 @@
 @mixin baseTheme {
   --font-body: "Poppins", "sans-serif";
-  --font-mono: "Roboto Mono", "monoscpace";
+  --font-mono: "Roboto Mono", "monospace";
   --font-icon: "Material Icons";
 }
 
diff --git a/components/environments/import-export-environment.vue b/components/environments/import-export-environment.vue
index 0068f6a21..9f2aa193b 100644
--- a/components/environments/import-export-environment.vue
+++ b/components/environments/import-export-environment.vue
@@ -144,8 +144,8 @@ export default {
       })
     },
     importFromPostman({ name, values }) {
-      let environment = { name: name, variables: [] }
-      values.forEach(({ key, value }) => environment.variables.push({ key: key, value: value }))
+      let environment = { name, variables: [] }
+      values.forEach(({ key, value }) => environment.variables.push({ key, value }))
       let environments = [environment]
       this.importFromPostwoman(environments)
     },
diff --git a/pages/graphql.vue b/pages/graphql.vue
index 24ae5e60d..7e9e434f8 100644
--- a/pages/graphql.vue
+++ b/pages/graphql.vue
@@ -471,12 +471,12 @@ export default {
 
       if (!fields || fields.length === 0) return []
 
-      return fields.filter((field) => {
-        return this.isTextFoundInGraphqlFieldObject({
+      return fields.filter((field) =>
+        this.isTextFoundInGraphqlFieldObject({
           text: this.graphqlFieldsFilterText,
           graphqlFieldObject: field,
         })
-      })
+      )
     },
     isTextFoundInGraphqlFieldObject({ text, graphqlFieldObject }) {
       const normalizedText = text.toLowerCase()
@@ -491,9 +491,9 @@ export default {
     getFilteredGraphqlFields({ filterText, fields }) {
       if (!filterText) return fields
 
-      return fields.filter((field) => {
-        return this.isTextFoundInGraphqlFieldObject({ text: filterText, graphqlFieldObject: field })
-      })
+      return fields.filter((field) =>
+        this.isTextFoundInGraphqlFieldObject({ text: filterText, graphqlFieldObject: field })
+      )
     },
     getFilteredGraphqlTypes({ filterText, types }) {
       if (!filterText) return types
@@ -509,12 +509,11 @@ export default {
         }
 
         const isFilterTextMatchingAtLeastOneField = Object.values(type._fields || {}).some(
-          (field) => {
-            return this.isTextFoundInGraphqlFieldObject({
+          (field) =>
+            this.isTextFoundInGraphqlFieldObject({
               text: filterText,
               graphqlFieldObject: field,
             })
-          }
         )
 
         return isFilterTextMatchingAtLeastOneField
diff --git a/pages/index.vue b/pages/index.vue
index 0805ebf45..76eac606e 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1361,7 +1361,7 @@ export default {
             : true,
       },
       currentMethodIndex: 0,
-      codegens: codegens,
+      codegens,
       methodMenuItems: [
         "GET",
         "HEAD",
@@ -1416,7 +1416,7 @@ export default {
       this.setRouteQueryState()
     },
     params: {
-      handler: function (newValue) {
+      handler(newValue) {
         if (!this.paramsWatchEnabled) {
           this.paramsWatchEnabled = true
           return
@@ -1474,7 +1474,7 @@ export default {
         ? "application/json"
         : ""
     },
-    preRequestScript: function (val, oldVal) {
+    preRequestScript(val, oldVal) {
       this.uri = this.uri
     },
   },
@@ -1826,7 +1826,7 @@ export default {
         httpUser: this.httpUser,
         httpPassword: this.httpPassword,
         bearerToken: this.bearerToken,
-        headers: headers,
+        headers,
         rawInput: this.rawInput,
         rawParams: this.rawParams,
         rawRequestBody: this.rawRequestBody,
@@ -1860,7 +1860,7 @@ export default {
         if (env.name === "Globals" || env.name === "globals") {
           preRequestScriptString += this.useSelectedEnvironment({
             environment: env,
-            environments: environments,
+            environments,
           })
         }
       }
diff --git a/pages/settings.vue b/pages/settings.vue
index d16007f59..c89104182 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -257,9 +257,9 @@ export default {
   watch: {
     proxySettings: {
       deep: true,
-      handler(value) {
-        this.applySetting("PROXY_URL", value.url)
-        this.applySetting("PROXY_KEY", value.key)
+      handler({ url, key }) {
+        this.applySetting("PROXY_URL", url)
+        this.applySetting("PROXY_KEY", key)
       },
     },
   },