chore(deps): bump

components/collections/SaveRequest.vue

@@ -9,6 +9,7 @@
             class="input floating-input"
             placeholder=" "
             type="text"
+            @keyup.enter="saveRequestAs"
           />
           <label for="selectLabelSaveReq">
             {{ $t("request.name") }}

components/collections/graphql/EditFolder.vue

@@ -12,6 +12,7 @@
           class="input floating-input"
           placeholder=" "
           type="text"
+          @keyup.enter="editFolder"
         />
         <label for="selectLabelGqlEditFolder">
           {{ $t("label") }}

components/http/BodyParameters.vue

@@ -13,7 +13,7 @@
         justify-between
       "
     >
-      <label for="reqParamList" class="font-semibold">
+      <label class="font-semibold">
         {{ $t("request_body") }}
       </label>
       <div class="flex">
@@ -21,7 +21,13 @@
           v-tippy="{ theme: 'tooltip' }"
           :title="$t('clear')"
           icon="clear_all"
-          @click.native="clearContent('bodyParams', $event)"
+          @click.native="clearContent"
+        />
+        <ButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          :title="$t('add.new')"
+          icon="add"
+          @click.native="addBodyParam"
         />
       </div>
     </div>
@@ -31,7 +37,29 @@
       class="divide-x divide-dividerLight border-b border-dividerLight flex"
       :class="{ 'border-t': index == 0 }"
     >
+      <SmartEnvInput
+        v-if="EXPERIMENTAL_URL_BAR_ENABLED"
+        v-model="param.key"
+        :placeholder="$t('count.parameter', { count: index + 1 })"
+        styles="
+          bg-primaryLight
+          flex
+          font-semibold font-mono
+          flex-1
+          py-1
+          px-4
+          focus:outline-none
+        "
+        @change="
+          updateBodyParam(index, {
+            key: $event.target.value,
+            value: param.value,
+            active: param.active,
+          })
+        "
+      />
       <input
+        v-else
         class="
           bg-primaryLight
           flex
@@ -45,11 +73,37 @@
         :name="'param' + index"
         :value="param.key"
         autofocus
-        @change="updateBodyParams($event, index, `setKeyBodyParams`)"
+        @change="
-        @keyup.prevent="setRouteQueryState"
+          updateBodyParam(index, {
+            key: $event.target.value,
+            value: param.value,
+            active: param.active,
+          })
+        "
+      />
+      <SmartEnvInput
+        v-if="EXPERIMENTAL_URL_BAR_ENABLED && !requestBodyParamIsFile(index)"
+        v-model="param.value"
+        :placeholder="$t('count.value', { count: index + 1 })"
+        styles="
+          bg-primaryLight
+          flex
+          font-semibold font-mono
+          flex-1
+          py-1
+          px-4
+          focus:outline-none
+        "
+        @change="
+          updateBodyParam(index, {
+            key: param.key,
+            value: $event.target.value,
+            active: param.active,
+          })
+        "
       />
       <input
-        v-if="!requestBodyParamIsFile(index)"
+        v-if="!EXPERIMENTAL_URL_BAR_ENABLED && !requestBodyParamIsFile(index)"
         class="
           bg-primaryLight
           flex
@@ -63,11 +117,12 @@
         :name="'value' + index"
         :value="param.value"
         @change="
-          // if input is form data, set value to be an array containing the value
+          updateBodyParam(index, {
-          // only
+            key: param.key,
-          updateBodyParams($event, index, `setValueBodyParams`)
+            value: $event.target.value,
+            active: param.active,
+          })
         "
-        @keyup.prevent="setRouteQueryState"
       />
       <div v-else class="file-chips-container">
         <div class="file-chips-wrapper">
@@ -80,27 +135,31 @@
           </SmartDeletableChip>
         </div>
       </div>
-      <div>
+      <ButtonSecondary
-        <ButtonSecondary
+        v-tippy="{ theme: 'tooltip' }"
-          v-tippy="{ theme: 'tooltip' }"
+        :title="
-          :title="
+          param.hasOwnProperty('active')
-            param.hasOwnProperty('active')
+            ? param.active
-              ? param.active
+              ? $t('action.turn_off')
-                ? $t('action.turn_off')
+              : $t('action.turn_on')
-                : $t('action.turn_on')
+            : $t('action.turn_off')
-              : $t('action.turn_off')
+        "
-          "
+        :icon="
-          :icon="
+          param.hasOwnProperty('active')
-            param.hasOwnProperty('active')
+            ? param.active
-              ? param.active
+              ? 'check_box'
-                ? 'check_box'
+              : 'check_box_outline_blank'
-                : 'check_box_outline_blank'
+            : 'check_box'
-              : 'check_box'
+        "
-          "
+        color="green"
-          color="green"
+        @click.native="
-          @click.native="toggleActive(index, param)"
+          updateBodyParam(index, {
-        />
+            key: param.key,
-      </div>
+            value: param.value,
+            active: param.hasOwnProperty('active') ? !param.active : false,
+          })
+        "
+      />
       <div>
         <label for="attachment" class="p-0">
           <ButtonSecondary
@@ -118,15 +177,27 @@
           @change="setRequestAttachment($event, index)"
         />
       </div>
-      <div>
+      <ButtonSecondary
-        <ButtonSecondary
+        v-tippy="{ theme: 'tooltip' }"
-          v-tippy="{ theme: 'tooltip' }"
+        :title="$t('delete')"
-          :title="$t('delete')"
+        icon="delete"
-          icon="delete"
+        color="red"
-          color="red"
+        @click.native="deleteBodyParam(index)"
-          @click.native="removeRequestBodyParam(index)"
+      />
-        />
+    </div>
-      </div>
+    <div
+      v-if="bodyParams.length === 0"
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
+    >
+      <i class="opacity-75 pb-2 material-icons">post_add</i>
+      <span class="text-center pb-4">
+        {{ $t("empty.parameters") }}
+      </span>
+      <ButtonSecondary
+        :label="$t('add.new')"
+        outline
+        @click.native="addBodyParam"
+      />
     </div>
   </AppSection>
 </template>
@@ -145,10 +216,11 @@ export default {
     bodyParams: {
       handler(newValue) {
         if (
-          newValue[newValue.length - 1]?.key !== "" ||
+          (newValue[newValue.length - 1]?.key !== "" ||
-          newValue[newValue.length - 1]?.value !== ""
+            newValue[newValue.length - 1]?.value !== "") &&
+          newValue.length
         )
-          this.addRequestBodyParam()
+          this.addBodyParam()
       },
       deep: true,
     },
@@ -159,11 +231,8 @@ export default {
     }
   },
   methods: {
-    clearContent(bodyParams, $event) {
+    clearContent() {
-      this.$emit("clear-content", bodyParams, $event)
+      this.$emit("clear-content")
-    },
-    setRouteQueryState() {
-      this.$emit("set-route-query-state")
     },
     removeRequestBodyParam(index) {
       const paramArr = this.$store.state.request.bodyParams.filter(

components/http/RawBody.vue

@@ -5,8 +5,8 @@
         bg-primary
         border-b border-dividerLight
         flex flex-1
-        pl-4
         top-upperSecondaryStickyFold
+        pl-4
         z-10
         sticky
         items-center
@@ -53,8 +53,8 @@
         v-model="rawParamsBody"
         :lang="rawInputEditorLang"
         :options="{
-          maxLines: 16,
+          maxLines: Infinity,
-          minLines: 8,
+          minLines: 16,
           fontSize: '12px',
           autoScrollEditorIntoView: true,
           showPrintMargin: false,

components/http/Request.vue

@@ -165,6 +165,7 @@
             name="request-name"
             type="text"
             class="mb-2 input"
+            @keyup.enter="saveOptions.tippy().hide()"
           />
           <SmartItem
             ref="copyRequest"

nuxt.config.js

@@ -138,7 +138,7 @@ export default {
     // https://github.com/nuxt-community/modules/tree/master/packages/toast
     "@nuxtjs/toast",
     // https://github.com/nuxt-community/i18n-module
-    "nuxt-i18n",
+    "@nuxtjs/i18n",
     // https://github.com/nuxt-community/robots-module
     "@nuxtjs/robots",
     // https://github.com/nuxt-community/sitemap-module

package.json

@@ -27,6 +27,7 @@
     "@nuxtjs/axios": "^5.13.6",
     "@nuxtjs/composition-api": "^0.26.0",
     "@nuxtjs/gtm": "^2.4.0",
+    "@nuxtjs/i18n": "^7.0.1",
     "@nuxtjs/robots": "^2.5.0",
     "@nuxtjs/sitemap": "^2.4.0",
     "@nuxtjs/toast": "^3.3.1",
@@ -35,7 +36,7 @@
     "acorn-walk": "^8.1.1",
     "core-js": "^3.16.0",
     "esprima": "^4.0.1",
-    "firebase": "^8.8.1",
+    "firebase": "^8.9.0",
     "graphql": "^15.5.0",
     "graphql-language-service-interface": "^2.8.4",
     "json-loader": "^0.5.7",
@@ -43,7 +44,6 @@
     "mustache": "^4.2.0",
     "node-interval-tree": "^1.3.3",
     "nuxt": "^2.15.7",
-    "nuxt-i18n": "^6.28.1",
     "paho-mqtt": "^1.1.0",
     "rxjs": "^6.0.0",
     "socket.io-client": "^4.1.3",
@@ -102,7 +102,7 @@
     "stylelint-config-prettier": "^8.0.2",
     "stylelint-config-standard": "^22.0.0",
     "ts-jest": "^27.0.4",
-    "typescript": "^4.3.5",
+    "typescript": "^4.2",
     "vue-jest": "^3.0.7",
     "worker-loader": "^3.0.8"
   }

tsconfig.json

@@ -17,7 +17,7 @@
     "types": [
       "@types/node",
       "@nuxt/types",
-      "nuxt-i18n",
+      "@nuxtjs/i18n",
       "@nuxtjs/toast",
       "vue-rx"
     ]

vue-shim.d.ts

@@ -1,5 +1,4 @@
-import Vue from "vue"
-
 declare module "*.vue" {
+  import Vue from "vue"
   export default Vue
 }