From d88e777f80dd5d60b2b99cf3c080f7f2b540795a Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Mon, 18 Nov 2019 06:32:30 +0530
Subject: [PATCH] :zap: Minor UI updates

---
 components/collections/collection.vue    |  5 +---
 components/collections/folder.vue        |  2 --
 components/collections/request.vue       |  2 --
 components/collections/saveRequestAs.vue |  2 +-
 components/history.vue                   | 37 ++++++++++--------------
 store/postwoman.js                       |  2 +-
 6 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/components/collections/collection.vue b/components/collections/collection.vue
index 0a7efe21c..286409700 100644
--- a/components/collections/collection.vue
+++ b/components/collections/collection.vue
@@ -18,7 +18,6 @@
             <button
               class="icon"
               @click="$emit('add-folder')"
-              v-tooltip="'New Folder'"
               v-close-popover
             >
               <i class="material-icons">create_new_folder</i>
@@ -29,7 +28,6 @@
             <button
               class="icon"
               @click="$emit('edit-collection')"
-              v-tooltip="'Edit collection'"
               v-close-popover
             >
               <i class="material-icons">create</i>
@@ -40,7 +38,6 @@
             <button
               class="icon"
               @click="removeCollection"
-              v-tooltip="'Delete collection'"
               v-close-popover
             >
               <i class="material-icons">delete</i>
@@ -126,7 +123,7 @@ export default {
       this.showChildren = !this.showChildren;
     },
     removeCollection() {
-      if (!confirm("Are you sure you want to remove this collection?")) return;
+      if (!confirm("Are you sure you want to remove this Collection?")) return;
       this.$store.commit("postwoman/removeCollection", {
         collectionIndex: this.collectionIndex
       });
diff --git a/components/collections/folder.vue b/components/collections/folder.vue
index 0fd38c244..962fa2275 100644
--- a/components/collections/folder.vue
+++ b/components/collections/folder.vue
@@ -18,7 +18,6 @@
             <button
               class="icon"
               @click="editFolder"
-              v-tooltip="'Edit folder'"
               v-close-popover
             >
               <i class="material-icons">edit</i>
@@ -29,7 +28,6 @@
             <button
               class="icon"
               @click="removeFolder"
-              v-tooltip="'Delete folder'"
               v-close-popover
             >
               <i class="material-icons">delete</i>
diff --git a/components/collections/request.vue b/components/collections/request.vue
index f9103a537..a18c7db78 100644
--- a/components/collections/request.vue
+++ b/components/collections/request.vue
@@ -15,7 +15,6 @@
           <button
             class="icon"
             @click="$emit('edit-request')"
-            v-tooltip="'Edit request'"
             v-close-popover
           >
             <i class="material-icons">edit</i>
@@ -26,7 +25,6 @@
           <button
             class="icon"
             @click="removeRequest"
-            v-tooltip="'Delete request'"
             v-close-popover
           >
             <i class="material-icons">delete</i>
diff --git a/components/collections/saveRequestAs.vue b/components/collections/saveRequestAs.vue
index 5440f527e..e48f01631 100644
--- a/components/collections/saveRequestAs.vue
+++ b/components/collections/saveRequestAs.vue
@@ -103,7 +103,7 @@ export default {
   },
   data() {
     return {
-      defaultRequestName: "My New Request",
+      defaultRequestName: "My Request",
       requestData: {
         name: undefined,
         collectionIndex: undefined,
diff --git a/components/history.vue b/components/history.vue
index 39b07ae9b..0eb5da739 100644
--- a/components/history.vue
+++ b/components/history.vue
@@ -11,44 +11,44 @@
           />
         </li>
         <v-popover>
-            <button class="tooltip-target icon" v-tooltip="'More'">
-              <i class="material-icons">more_vert</i>
+            <button class="tooltip-target icon" v-tooltip="'Sort'">
+              <i class="material-icons">sort</i>
             </button>
           <template slot="popover">
             <div>
               <button class="icon" @click="sort_by_label()" v-close-popover>
-                <i class="material-icons">label</i>
-                <span>Sort by label</span>
+                <i class="material-icons">sort_by_alpha</i>
+                <span>Label</span>
               </button>
             </div>
             <div>
               <button class="icon" @click="sort_by_time()" v-close-popover>
                 <i class="material-icons">access_time</i>
-                <span>Sort by time</span>
+                <span>Time</span>
               </button>
             </div>
             <div>
               <button class="icon" @click="sort_by_status_code()" v-close-popover>
                 <i class="material-icons">assistant</i>
-                <span>Sort by status</span>
+                <span>Status</span>
               </button>
             </div>
             <div>
               <button class="icon" @click="sort_by_url()" v-close-popover>
                 <i class="material-icons">language</i>
-                <span>Sort by url</span>
+                <span>URL</span>
               </button>
             </div>
             <div>
               <button class="icon" @click="sort_by_path()" v-close-popover>
                 <i class="material-icons">timeline</i>
-                <span>Sort by path</span>
+                <span>Path</span>
               </button>
             </div>
             <div v-if="showMore">
               <button class="icon" @click="sort_by_duration()" v-close-popover>
                 <i class="material-icons">timer</i>
-                <span>Sort by duration</span>
+                <span>Duration</span>
               </button>
             </div>
             <div>
@@ -107,7 +107,7 @@
           </li>
 -->
           <v-popover>
-            <button class="tooltip-target icon" v-tooltip="'More'">
+            <button class="tooltip-target icon" v-tooltip="'Options'">
               <i class="material-icons">more_vert</i>
             </button>
             <template slot="popover">
@@ -119,8 +119,8 @@
                   aria-label="Edit"
                   v-close-popover
                 >
-                  <i class="material-icons">edit</i>
-                  <span>Use</span>
+                  <i class="material-icons">restore</i>
+                  <span>Restore</span>
                 </button>
               </div>
                <div>
@@ -241,15 +241,17 @@
               class="icon"
               id="confirm-clear-history-button"
               @click="clearHistory"
+               v-tooltip="'Yes'"
             >
-              Yes
+              <i class="material-icons">done</i>
             </button>
             <button
               class="icon"
               id="reject-clear-history-button"
               @click="disableHistoryClearing"
+               v-tooltip="'No'"
             >
-              No
+              <i class="material-icons">close</i>
             </button>
           </div>
         </div>
@@ -267,13 +269,6 @@
   }
 }
 
-label {
-  &:hover {
-    cursor: pointer;
-    color: var(--fg-color);
-  }
-}
-
 .smooth-enter-active,
 .smooth-leave-active {
   transition: all 0.2s;
diff --git a/store/postwoman.js b/store/postwoman.js
index ad3f1c885..df3b2aa35 100644
--- a/store/postwoman.js
+++ b/store/postwoman.js
@@ -62,7 +62,7 @@ export const SETTINGS_KEYS = [
 export const state = () => ({
   settings: {},
   collections: [{
-    name: 'My First Collection',
+    name: 'My Collection',
     folders: [],
     requests: [],
   }],