From a070bed7c9b55ad6f0438421cb2f2bd8b2348a68 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Thu, 8 Jul 2021 13:36:37 +0530
Subject: [PATCH] feat: revamp environments ui

---
 assets/scss/themes.scss                 |   4 +-
 components/button/Secondary.vue         |   2 +-
 components/environments/Environment.vue | 102 ++++++++++++++---------
 components/environments/index.vue       | 104 ++++++++++++------------
 components/history/rest/Card.vue        |   4 +-
 5 files changed, 121 insertions(+), 95 deletions(-)

diff --git a/assets/scss/themes.scss b/assets/scss/themes.scss
index 0537952e6..9cee6d2eb 100644
--- a/assets/scss/themes.scss
+++ b/assets/scss/themes.scss
@@ -39,11 +39,11 @@
   // Dark Background color
   --primary-dark-color: theme("colors.gray.100");
   // Text color
-  --secondary-color: theme("colors.gray.600");
+  --secondary-color: theme("colors.gray.500");
   // Light Text color
   --secondary-light-color: theme("colors.gray.400");
   // Dark Text color
-  --secondary-dark-color: theme("colors.gray.700");
+  --secondary-dark-color: theme("colors.gray.600");
   // Border color
   --divider-color: theme("colors.gray.200");
   // Light Border color
diff --git a/components/button/Secondary.vue b/components/button/Secondary.vue
index 82e6a47d4..6d6cc2e69 100644
--- a/components/button/Secondary.vue
+++ b/components/button/Secondary.vue
@@ -15,7 +15,7 @@
     :class="[
       color
         ? `text-${color}-400 hover:text-${color}-600 focus:text-${color}-600`
-        : 'text-secondaryLight hover:text-secondary focus:text-secondary',
+        : 'text-secondary hover:text-secondaryDark focus:text-secondaryDark',
       label ? 'px-3 rounded-lg' : 'px-2 rounded-full',
       rounded ? 'rounded-full' : 'rounded-lg',
       { 'opacity-50 cursor-not-allowed': disabled },
diff --git a/components/environments/Environment.vue b/components/environments/Environment.vue
index 8ea2dd585..72434c831 100644
--- a/components/environments/Environment.vue
+++ b/components/environments/Environment.vue
@@ -1,46 +1,68 @@
 <template>
-  <div>
-    <div class="flex flex-1">
-      <div>
+  <div class="flex items-center group">
+    <span
+      class="
+        flex
+        justify-center
+        items-center
+        text-xs
+        w-10
+        truncate
+        cursor-pointer
+      "
+      @click="$emit('edit-environment')"
+    >
+      <i class="material-icons">layers</i>
+    </span>
+    <span
+      class="
+        py-3
+        cursor-pointer
+        pr-3
+        flex flex-1
+        min-w-0
+        text-xs
+        group-hover:text-secondaryDark
+        transition
+      "
+      @click="$emit('edit-environment')"
+    >
+      <span class="truncate">
+        {{ environment.name }}
+      </span>
+    </span>
+    <tippy
+      ref="options"
+      interactive
+      tabindex="-1"
+      trigger="click"
+      theme="popover"
+      arrow
+    >
+      <template #trigger>
         <ButtonSecondary
-          icon="layers"
-          :label="environment.name"
-          @click.native="$emit('edit-environment')"
+          v-tippy="{ theme: 'tooltip' }"
+          :title="$t('more')"
+          icon="more_vert"
         />
-      </div>
-      <tippy
-        ref="options"
-        interactive
-        tabindex="-1"
-        trigger="click"
-        theme="popover"
-        arrow
-      >
-        <template #trigger>
-          <TabPrimary
-            v-tippy="{ theme: 'tooltip' }"
-            :title="$t('more')"
-            icon="more_vert"
-          />
-        </template>
-        <SmartItem
-          icon="create"
-          :label="$t('edit')"
-          @click.native="
-            $emit('edit-environment')
-            $refs.options.tippy().hide()
-          "
-        />
-        <SmartItem
-          icon="delete"
-          :label="$t('delete')"
-          @click.native="
-            confirmRemove = true
-            $refs.options.tippy().hide()
-          "
-        />
-      </tippy>
-    </div>
+      </template>
+      <SmartItem
+        icon="create"
+        :label="$t('edit')"
+        @click.native="
+          $emit('edit-environment')
+          $refs.options.tippy().hide()
+        "
+      />
+      <SmartItem
+        icon="delete"
+        :label="$t('delete')"
+        @click.native="
+          confirmRemove = true
+          $refs.options.tippy().hide()
+        "
+      />
+    </tippy>
     <SmartConfirmModal
       :show="confirmRemove"
       :title="$t('are_you_sure_remove_environment')"
diff --git a/components/environments/index.vue b/components/environments/index.vue
index 8e510db90..d0b49f148 100644
--- a/components/environments/index.vue
+++ b/components/environments/index.vue
@@ -1,26 +1,30 @@
 <template>
   <AppSection label="environments">
-    <div class="flex">
-      <span class="select-wrapper">
-        <select
-          v-model="selectedEnvironmentIndex"
-          :disabled="environments.length == 0"
-          class="select rounded-t-lg"
-        >
-          <option :value="-1">No environment</option>
-          <option v-if="environments.length === 0" value="0">
-            {{ $t("create_new_environment") }}
-          </option>
-          <option
-            v-for="(environment, index) in environments"
-            :key="index"
-            :value="index"
-          >
-            {{ environment.name }}
-          </option>
-        </select>
-      </span>
-    </div>
+    <select
+      v-model="selectedEnvironmentIndex"
+      :disabled="environments.length == 0"
+      class="
+        flex
+        w-full
+        px-4
+        text-xs
+        py-2
+        focus:outline-none
+        border-b border-dividerLight
+      "
+    >
+      <option :value="-1">No environment</option>
+      <option v-if="environments.length === 0" value="0">
+        {{ $t("create_new_environment") }}
+      </option>
+      <option
+        v-for="(environment, index) in environments"
+        :key="index"
+        :value="index"
+      >
+        {{ environment.name }}
+      </option>
+    </select>
     <EnvironmentsAdd
       :show="showModalAdd"
       @hide-modal="displayModalAdd(false)"
@@ -35,36 +39,36 @@
       :show="showModalImportExport"
       @hide-modal="displayModalImportExport(false)"
     />
-    <div class="border-b flex flex-1 border-divider">
-      <div>
-        <ButtonSecondary
-          icon="add"
-          :label="$t('new')"
-          @click.native="displayModalAdd(true)"
-        />
-      </div>
-      <div>
-        <ButtonSecondary @click.native="displayModalImportExport(true)" />
-        {{ $t("import_export") }}
-      </div>
+    <div class="border-b flex justify-between flex-1 border-dividerLight">
+      <ButtonSecondary
+        icon="add"
+        :label="$t('new')"
+        @click.native="displayModalAdd(true)"
+      />
+      <ButtonSecondary
+        v-tippy="{ theme: 'tooltip' }"
+        icon="import_export"
+        :title="$t('import_export')"
+        @click.native="displayModalImportExport(true)"
+      />
     </div>
-    <p v-if="environments.length === 0">
-      <i class="material-icons">help_outline</i>
-      {{ $t("create_new_environment") }}
-    </p>
-    <div class="overflow-auto">
-      <ul class="flex-col">
-        <li
-          v-for="(environment, index) in environments"
-          :key="environment.name"
-        >
-          <EnvironmentsEnvironment
-            :environment-index="index"
-            :environment="environment"
-            @edit-environment="editEnvironment(environment, index)"
-          />
-        </li>
-      </ul>
+    <div
+      v-if="environments.length === 0"
+      class="flex items-center text-secondaryLight flex-col p-4 justify-center"
+    >
+      <i class="material-icons opacity-50 pb-2">library_add</i>
+      <span class="text-xs">
+        {{ $t("create_new_environment") }}
+      </span>
+    </div>
+    <div class="flex flex-col">
+      <EnvironmentsEnvironment
+        v-for="(environment, index) in environments"
+        :key="environment.name"
+        :environment-index="index"
+        :environment="environment"
+        @edit-environment="editEnvironment(environment, index)"
+      />
     </div>
   </AppSection>
 </template>
diff --git a/components/history/rest/Card.vue b/components/history/rest/Card.vue
index ef7ce9fdb..8034f544f 100644
--- a/components/history/rest/Card.vue
+++ b/components/history/rest/Card.vue
@@ -24,8 +24,8 @@
         pr-3
         flex flex-1
         min-w-0
-        text-secondaryLight text-xs
-        group-hover:text-secondary
+        text-xs
+        group-hover:text-secondaryDark
         transition
       "
       @click="$emit('use-entry')"