From 5e740a6ed6535b15f249285ef1976beeb282f3c7 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Tue, 13 Jul 2021 12:48:57 +0530
Subject: [PATCH] refactor(ui): minor stylings

---
 components/http/Headers.vue                   |  13 +-
 components/http/Parameters.vue                |  13 +-
 components/http/ResponseMeta.vue              |  32 +++--
 components/lenses/ResponseBodyRenderer.vue    |   3 +-
 .../lenses/renderers/HTMLLensRenderer.vue     |  17 ++-
 .../lenses/renderers/ImageLensRenderer.vue    |   1 +
 .../lenses/renderers/JSONLensRenderer.vue     |   1 +
 .../lenses/renderers/RawLensRenderer.vue      |   1 +
 .../lenses/renderers/XMLLensRenderer.vue      |   1 +
 components/smart/AceEditor.vue                | 132 +++++++-----------
 components/smart/JsEditor.vue                 |   4 +-
 pages/index.vue                               |  12 +-
 12 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/components/http/Headers.vue b/components/http/Headers.vue
index 0906f23ce..efc6fbbfa 100644
--- a/components/http/Headers.vue
+++ b/components/http/Headers.vue
@@ -1,6 +1,17 @@
 <template>
   <AppSection label="headers">
-    <div class="flex flex-1 items-center justify-between pl-4">
+    <div
+      class="
+        sticky
+        top-110px
+        z-10
+        bg-primary
+        flex flex-1
+        items-center
+        justify-between
+        pl-4
+      "
+    >
       <label for="headerList" class="font-semibold text-xs">
         {{ $t("header_list") }}
       </label>
diff --git a/components/http/Parameters.vue b/components/http/Parameters.vue
index 6179da61a..0f3502c29 100644
--- a/components/http/Parameters.vue
+++ b/components/http/Parameters.vue
@@ -1,6 +1,17 @@
 <template>
   <AppSection label="parameters">
-    <div class="flex flex-1 items-center justify-between pl-4">
+    <div
+      class="
+        sticky
+        top-110px
+        z-10
+        bg-primary
+        flex flex-1
+        items-center
+        justify-between
+        pl-4
+      "
+    >
       <label for="paramList" class="font-semibold text-xs">
         {{ $t("parameter_list") }}
       </label>
diff --git a/components/http/ResponseMeta.vue b/components/http/ResponseMeta.vue
index b77e2b855..64fb2638a 100644
--- a/components/http/ResponseMeta.vue
+++ b/components/http/ResponseMeta.vue
@@ -12,21 +12,23 @@
       space-x-8
     "
   >
-    <i v-if="response.type === 'loading'" class="animate-spin material-icons"
-      >refresh</i
-    >
-    <span v-else>
-      <span class="text-secondaryDark"> Status: </span>
-      {{ response.statusCode || $t("waiting_send_req") }}
-    </span>
-    <span class="text-xs">
-      <span class="text-secondaryDark"> Time: </span>
-      {{ `${response.meta.responseDuration} ms` }}
-    </span>
-    <span class="text-xs">
-      <span class="text-secondaryDark"> Size: </span>
-      {{ `${response.meta.responseSize} B` }}
-    </span>
+    <i v-if="response.type === 'loading'" class="animate-spin material-icons">
+      refresh
+    </i>
+    <div v-else :class="statusCategory.className">
+      <span v-if="response.statusCode">
+        <span class="text-secondaryDark"> Status: </span>
+        {{ response.statusCode || $t("waiting_send_req") }}
+      </span>
+      <span v-if="response.meta.responseDuration" class="text-xs">
+        <span class="text-secondaryDark"> Time: </span>
+        {{ `${response.meta.responseDuration} ms` }}
+      </span>
+      <span v-if="response.meta.responseSize" class="text-xs">
+        <span class="text-secondaryDark"> Size: </span>
+        {{ `${response.meta.responseSize} B` }}
+      </span>
+    </div>
   </div>
 </template>
 
diff --git a/components/lenses/ResponseBodyRenderer.vue b/components/lenses/ResponseBodyRenderer.vue
index e303bc805..0f67a9177 100644
--- a/components/lenses/ResponseBodyRenderer.vue
+++ b/components/lenses/ResponseBodyRenderer.vue
@@ -12,7 +12,8 @@
     <SmartTab
       v-if="Object.keys(response.headers).length !== 0"
       id="headers"
-      :label="`Headers \xA0 • \xA0 ${Object.keys(response.headers).length}`"
+      :label="$t('Headers')"
+      :info="Object.keys(response.headers).length.toString()"
     >
       <LensesHeadersRenderer :headers="response.headers" />
     </SmartTab>
diff --git a/components/lenses/renderers/HTMLLensRenderer.vue b/components/lenses/renderers/HTMLLensRenderer.vue
index dbe4627af..920a61fad 100644
--- a/components/lenses/renderers/HTMLLensRenderer.vue
+++ b/components/lenses/renderers/HTMLLensRenderer.vue
@@ -1,7 +1,20 @@
 <template>
   <div>
-    <div class="flex flex-1 items-center justify-between">
-      <label for="body">{{ $t("response_body") }}</label>
+    <div
+      class="
+        flex flex-1
+        sticky
+        top-23
+        z-10
+        bg-primary
+        items-center
+        justify-between
+        border-b border-divider
+      "
+    >
+      <label for="body" class="px-4 font-semibold text-xs">
+        {{ $t("response_body") }}
+      </label>
       <div>
         <ButtonSecondary
           v-if="response.body"
diff --git a/components/lenses/renderers/ImageLensRenderer.vue b/components/lenses/renderers/ImageLensRenderer.vue
index 4a3303def..dca558c32 100644
--- a/components/lenses/renderers/ImageLensRenderer.vue
+++ b/components/lenses/renderers/ImageLensRenderer.vue
@@ -9,6 +9,7 @@
         bg-primary
         items-center
         justify-between
+        border-b border-divider
       "
     >
       <label for="body" class="px-4 font-semibold text-xs">
diff --git a/components/lenses/renderers/JSONLensRenderer.vue b/components/lenses/renderers/JSONLensRenderer.vue
index d9064f225..a6cb92a80 100644
--- a/components/lenses/renderers/JSONLensRenderer.vue
+++ b/components/lenses/renderers/JSONLensRenderer.vue
@@ -9,6 +9,7 @@
         bg-primary
         items-center
         justify-between
+        border-b border-divider
       "
     >
       <label for="body" class="px-4 font-semibold text-xs">
diff --git a/components/lenses/renderers/RawLensRenderer.vue b/components/lenses/renderers/RawLensRenderer.vue
index f9b827b9d..b11b53ab7 100644
--- a/components/lenses/renderers/RawLensRenderer.vue
+++ b/components/lenses/renderers/RawLensRenderer.vue
@@ -9,6 +9,7 @@
         bg-primary
         items-center
         justify-between
+        border-b border-divider
       "
     >
       <label for="body" class="px-4 font-semibold text-xs">
diff --git a/components/lenses/renderers/XMLLensRenderer.vue b/components/lenses/renderers/XMLLensRenderer.vue
index 31df07012..d27a3d84c 100644
--- a/components/lenses/renderers/XMLLensRenderer.vue
+++ b/components/lenses/renderers/XMLLensRenderer.vue
@@ -9,6 +9,7 @@
         bg-primary
         items-center
         justify-between
+        border-b border-divider
       "
     >
       <label for="body" class="px-4 font-semibold text-xs">
diff --git a/components/smart/AceEditor.vue b/components/smart/AceEditor.vue
index 8736b0da5..ba4455ef6 100644
--- a/components/smart/AceEditor.vue
+++ b/components/smart/AceEditor.vue
@@ -1,31 +1,61 @@
 <template>
   <div class="show-if-initialized" :class="{ initialized }">
-    <div v-if="lang == 'json'" class="outline hide-scrollbar">
-      <div v-for="(p, index) in currPath" :key="index" class="block">
-        <div class="label" @click="onBlockClick(index)">
+    <pre ref="editor" :class="styles"></pre>
+    <div
+      v-if="lang == 'json'"
+      class="
+        sticky
+        bottom-0
+        z-10
+        flex flex-nowrap flex-1
+        overflow-auto
+        font-mono
+        shadow-lg
+        px-4
+        bg-primaryLight
+        border-t border-divider
+        hide-scrollbar
+      "
+    >
+      <div
+        v-for="(p, index) in currPath"
+        :key="index"
+        class="
+          inline-flex
+          items-center
+          flex-grow-0 flex-shrink-0
+          text-secondaryLight
+          hover:text-secondary
+          cursor-pointer
+          font-semibold
+          text-xs
+        "
+      >
+        <span @click="onBlockClick(index)">
           {{ p }}
-        </div>
-        <i v-if="index + 1 !== currPath.length" class="material-icons"
-          >chevron_right</i
-        >
-        <div
+        </span>
+        <i v-if="index + 1 !== currPath.length" class="material-icons mx-2">
+          chevron_right
+        </i>
+        <tippy
           v-if="sibDropDownIndex == index"
-          :ref="`sibling-${index}`"
-          class="siblings"
-          @mouseleave="clearSibList"
+          ref="options"
+          interactive
+          tabindex="-1"
+          trigger="click"
+          theme="popover"
+          arrow
         >
-          <div
+          <SmartItem
             v-for="(sib, i) in currSib"
             :key="i"
-            class="sib"
-            @click="goToSib(sib)"
-          >
-            {{ sib.key ? sib.key.value : i }}
-          </div>
-        </div>
+            class="font-mono"
+            :label="sib.key ? sib.key.value : i"
+            @click.native="goToSib(sib)"
+          />
+        </tippy>
       </div>
     </div>
-    <pre ref="editor" :class="styles"></pre>
   </div>
 </template>
 
@@ -149,7 +179,6 @@ export default {
           this.currPath = path.res
         }
       })
-      document.addEventListener("touchstart", this.onTouchStart)
     }
 
     // Disable linting, if lint prop is false
@@ -158,7 +187,6 @@ export default {
 
   destroyed() {
     this.editor.destroy()
-    document.removeEventListener("touchstart", this.onTouchStart)
   },
 
   methods: {
@@ -195,6 +223,7 @@ export default {
         }
       }
     }, 2000),
+
     onBlockClick(index) {
       if (this.sibDropDownIndex === index) {
         this.clearSibList()
@@ -230,23 +259,12 @@ export default {
         }
       }
     }),
-    onTouchStart(e) {
-      if (
-        this.sibDropDownIndex !== null &&
-        e.target.parentElement !==
-          this.$refs[`sibling-${this.sibDropDownIndex}`][0]
-      ) {
-        this.clearSibList()
-      }
-    },
   },
 }
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
 .show-if-initialized {
-  @apply opacity-0;
-
   &.initialized {
     @apply opacity-100;
   }
@@ -255,52 +273,4 @@ export default {
     @apply transition-none;
   }
 }
-
-.outline {
-  @apply flex flex-nowrap;
-  @apply flex-1;
-  @apply overflow-auto;
-  @apply font-mono;
-  @apply shadow-lg;
-  @apply px-4;
-
-  .block {
-    @apply inline-flex;
-    @apply items-center;
-    @apply flex-grow-0 flex-shrink-0;
-    @apply text-secondaryLight text-sm;
-
-    &:hover {
-      @apply text-secondary;
-      @apply cursor-pointer;
-    }
-
-    .label {
-      @apply p-2;
-    }
-
-    .siblings {
-      @apply absolute;
-      @apply z-50;
-      @apply top-9;
-      @apply bg-primary;
-      @apply max-h-60;
-      @apply overflow-auto;
-      @apply shadow-lg;
-      @apply text-secondaryLight;
-      @apply overscroll-none;
-
-      border-radius: 0 0 8px 8px;
-    }
-
-    .sib {
-      @apply px-4 py-1;
-
-      &:hover {
-        @apply text-secondary;
-        @apply bg-primaryLight;
-      }
-    }
-  }
-}
 </style>
diff --git a/components/smart/JsEditor.vue b/components/smart/JsEditor.vue
index 7009043ca..23c44efdf 100644
--- a/components/smart/JsEditor.vue
+++ b/components/smart/JsEditor.vue
@@ -262,10 +262,8 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
 .show-if-initialized {
-  @apply opacity-0;
-
   &.initialized {
     @apply opacity-100;
   }
diff --git a/pages/index.vue b/pages/index.vue
index a72ea65b7..1adaf4e8f 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -16,17 +16,7 @@
                 <HttpParameters />
               </SmartTab>
 
-              <SmartTab
-                :id="'bodyParams'"
-                :label="
-                  $t('body') +
-                  `${
-                    bodyParams.length !== 0
-                      ? ' \xA0 • \xA0 ' + bodyParams.length
-                      : ''
-                  }`
-                "
-              >
+              <SmartTab :id="'bodyParams'" :label="$t('body')" info="0">
                 <div class="flex flex-1 items-center justify-between py-2">
                   <tippy
                     interactive