From 9232aad184bf754ed838ad485e9cfa713b6795ed Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Thu, 14 Apr 2022 19:00:04 +0530
Subject: [PATCH] refactor: improve ui consistency

---
 .../components/collections/graphql/Collection.vue | 13 ++++++++++++-
 .../components/collections/graphql/Folder.vue     |  9 ++++++++-
 .../components/collections/my/Collection.vue      | 14 +++++++++++++-
 .../components/collections/my/Folder.vue          |  9 ++++++++-
 .../components/collections/teams/Collection.vue   | 15 ++++++++++++++-
 .../components/collections/teams/Folder.vue       | 10 +++++++++-
 .../hoppscotch-app/components/history/index.vue   |  2 +-
 7 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/packages/hoppscotch-app/components/collections/graphql/Collection.vue b/packages/hoppscotch-app/components/collections/graphql/Collection.vue
index 1a00ffd10..9746e1e95 100644
--- a/packages/hoppscotch-app/components/collections/graphql/Collection.vue
+++ b/packages/hoppscotch-app/components/collections/graphql/Collection.vue
@@ -29,6 +29,17 @@
         </span>
       </span>
       <div class="flex">
+        <ButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          svg="file-plus"
+          :title="$t('request.new')"
+          class="hidden group-hover:inline-flex"
+          @click.native="
+            $emit('add-request', {
+              path: `${collectionIndex}`,
+            })
+          "
+        />
         <ButtonSecondary
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
@@ -69,7 +80,7 @@
             >
               <SmartItem
                 ref="requestAction"
-                svg="plus"
+                svg="file-plus"
                 :label="`${$t('request.new')}`"
                 :shortcut="['R']"
                 @click.native="
diff --git a/packages/hoppscotch-app/components/collections/graphql/Folder.vue b/packages/hoppscotch-app/components/collections/graphql/Folder.vue
index f5bf2a531..ca297f83c 100644
--- a/packages/hoppscotch-app/components/collections/graphql/Folder.vue
+++ b/packages/hoppscotch-app/components/collections/graphql/Folder.vue
@@ -29,6 +29,13 @@
         </span>
       </span>
       <div class="flex">
+        <ButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          svg="file-plus"
+          :title="$t('request.new')"
+          class="hidden group-hover:inline-flex"
+          @click.native="$emit('add-request', { path: folderPath })"
+        />
         <ButtonSecondary
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
@@ -65,7 +72,7 @@
             >
               <SmartItem
                 ref="requestAction"
-                svg="plus"
+                svg="file-plus"
                 :label="`${$t('request.new')}`"
                 :shortcut="['R']"
                 @click.native="
diff --git a/packages/hoppscotch-app/components/collections/my/Collection.vue b/packages/hoppscotch-app/components/collections/my/Collection.vue
index ed03fc190..a8bf7510f 100644
--- a/packages/hoppscotch-app/components/collections/my/Collection.vue
+++ b/packages/hoppscotch-app/components/collections/my/Collection.vue
@@ -45,6 +45,18 @@
           color="green"
           @click.native="$emit('unselect-collection')"
         />
+        <ButtonSecondary
+          v-if="!doc"
+          v-tippy="{ theme: 'tooltip' }"
+          svg="file-plus"
+          :title="$t('request.new')"
+          class="hidden group-hover:inline-flex"
+          @click.native="
+            $emit('add-request', {
+              path: `${collectionIndex}`,
+            })
+          "
+        />
         <ButtonSecondary
           v-if="!doc"
           v-tippy="{ theme: 'tooltip' }"
@@ -88,7 +100,7 @@
             >
               <SmartItem
                 ref="requestAction"
-                svg="plus"
+                svg="file-plus"
                 :label="$t('request.new')"
                 :shortcut="['R']"
                 @click.native="
diff --git a/packages/hoppscotch-app/components/collections/my/Folder.vue b/packages/hoppscotch-app/components/collections/my/Folder.vue
index 1632f8fd3..f7e2e8ea1 100644
--- a/packages/hoppscotch-app/components/collections/my/Folder.vue
+++ b/packages/hoppscotch-app/components/collections/my/Folder.vue
@@ -29,6 +29,13 @@
         </span>
       </span>
       <div class="flex">
+        <ButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          svg="file-plus"
+          :title="t('request.new')"
+          class="hidden group-hover:inline-flex"
+          @click.native="$emit('add-request', { path: folderPath })"
+        />
         <ButtonSecondary
           v-tippy="{ theme: 'tooltip' }"
           svg="folder-plus"
@@ -66,7 +73,7 @@
             >
               <SmartItem
                 ref="requestAction"
-                svg="plus"
+                svg="file-plus"
                 :label="$t('request.new')"
                 :shortcut="['R']"
                 @click.native="
diff --git a/packages/hoppscotch-app/components/collections/teams/Collection.vue b/packages/hoppscotch-app/components/collections/teams/Collection.vue
index 644bd7f78..2e1228325 100644
--- a/packages/hoppscotch-app/components/collections/teams/Collection.vue
+++ b/packages/hoppscotch-app/components/collections/teams/Collection.vue
@@ -45,6 +45,19 @@
           color="green"
           @click.native="$emit('unselect-collection')"
         />
+        <ButtonSecondary
+          v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'"
+          v-tippy="{ theme: 'tooltip' }"
+          svg="file-plus"
+          :title="$t('request.new')"
+          class="hidden group-hover:inline-flex"
+          @click.native="
+            $emit('add-request', {
+              folder: collection,
+              path: `${collectionIndex}`,
+            })
+          "
+        />
         <ButtonSecondary
           v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'"
           v-tippy="{ theme: 'tooltip' }"
@@ -89,7 +102,7 @@
             >
               <SmartItem
                 ref="requestAction"
-                svg="plus"
+                svg="file-plus"
                 :label="t('request.new')"
                 :shortcut="['R']"
                 @click.native="
diff --git a/packages/hoppscotch-app/components/collections/teams/Folder.vue b/packages/hoppscotch-app/components/collections/teams/Folder.vue
index f68272582..61d2de453 100644
--- a/packages/hoppscotch-app/components/collections/teams/Folder.vue
+++ b/packages/hoppscotch-app/components/collections/teams/Folder.vue
@@ -29,6 +29,14 @@
         </span>
       </span>
       <div class="flex">
+        <ButtonSecondary
+          v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'"
+          v-tippy="{ theme: 'tooltip' }"
+          svg="file-plus"
+          :title="$t('request.new')"
+          class="hidden group-hover:inline-flex"
+          @click.native="$emit('add-request', { folder, path: folderPath })"
+        />
         <ButtonSecondary
           v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'"
           v-tippy="{ theme: 'tooltip' }"
@@ -68,7 +76,7 @@
             >
               <SmartItem
                 ref="requestAction"
-                svg="plus"
+                svg="file-plus"
                 :label="$t('request.new')"
                 :shortcut="['R']"
                 @click.native="
diff --git a/packages/hoppscotch-app/components/history/index.vue b/packages/hoppscotch-app/components/history/index.vue
index ce5480533..d14580f00 100644
--- a/packages/hoppscotch-app/components/history/index.vue
+++ b/packages/hoppscotch-app/components/history/index.vue
@@ -36,7 +36,7 @@
         open
       >
         <summary
-          class="flex items-center justify-between flex-1 min-w-0 transition cursor-pointer focus:outline-none text-secondaryLight text-tiny group"
+          class="flex items-center justify-between flex-1 min-w-0 cursor-pointer transition focus:outline-none text-secondaryLight text-tiny group"
         >
           <span
             class="px-4 py-2 truncate transition group-hover:text-secondary capitalize-first"