refactor(ui): better remove, delete icons, and select components

2021-08-18 13:30:01 +05:30
parent 4f5de51104
commit b9c233cdf9
37 changed files with 130 additions and 121 deletions
--- a/components/app/Header.vue
+++ b/components/app/Header.vue
@@ -5,7 +5,7 @@
    >
      <div class="space-x-2 group inline-flex items-center">
        <ButtonSecondary
-          class="tracking-wide !font-bold"
+          class="tracking-wide !font-bold !text-secondaryDark"
          label="HOPPSCOTCH"
          to="/"
        />
--- a/components/app/Sidenav.vue
+++ b/components/app/Sidenav.vue
@@ -6,6 +6,7 @@
        :key="`navigation-${index}`"
        :to="localePath(navigation.target)"
        class="nav-link"
+        tabindex="0"
      >
        <i v-if="navigation.icon" class="material-icons">
          {{ navigation.icon }}
--- a/components/collections/graphql/Collection.vue
+++ b/components/collections/graphql/Collection.vue
@@ -77,9 +77,9 @@
              "
            />
            <SmartItem
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/collections/graphql/Folder.vue
+++ b/components/collections/graphql/Folder.vue
@@ -73,9 +73,9 @@
              "
            />
            <SmartItem
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/collections/graphql/Request.vue
+++ b/components/collections/graphql/Request.vue
@@ -75,9 +75,9 @@
              "
            />
            <SmartItem
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/collections/my/Collection.vue
+++ b/components/collections/my/Collection.vue
@@ -43,7 +43,7 @@
        <ButtonSecondary
          v-if="doc && selected"
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('delete')"
+          :title="$t('action.remove')"
          icon="check_circle_outline"
          color="green"
          @click.native="$emit('unselect-collection')"
@@ -96,9 +96,9 @@
              "
            />
            <SmartItem
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/collections/my/Folder.vue
+++ b/components/collections/my/Folder.vue
@@ -78,9 +78,9 @@
              "
            />
            <SmartItem
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/collections/my/Request.vue
+++ b/components/collections/my/Request.vue
@@ -86,9 +86,9 @@
              "
            />
            <SmartItem
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/collections/teams/Collection.vue
+++ b/components/collections/teams/Collection.vue
@@ -35,7 +35,7 @@
        <ButtonSecondary
          v-if="doc && selected"
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('delete')"
+          :title="$t('action.remove')"
          icon="check_circle_outline"
          color="green"
          @click.native="$emit('unselect-collection')"
@@ -92,9 +92,9 @@
            />
            <SmartItem
              v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'"
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/collections/teams/Folder.vue
+++ b/components/collections/teams/Folder.vue
@@ -75,9 +75,9 @@
            />
            <SmartItem
              v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'"
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/collections/teams/Request.vue
+++ b/components/collections/teams/Request.vue
@@ -79,9 +79,9 @@
              "
            />
            <SmartItem
-              icon="remove_circle_outline"
+              icon="delete"
              color="red"
-              :label="$t('delete')"
+              :label="$t('action.delete')"
              @click.native="
                confirmRemove = true
                $refs.options.tippy().hide()
--- a/components/environments/Edit.vue
+++ b/components/environments/Edit.vue
@@ -24,7 +24,7 @@
          <div class="flex">
            <ButtonSecondary
              v-tippy="{ theme: 'tooltip' }"
-              :title="$t('clear')"
+              :title="$t('action.clear_all')"
              :icon="clearIcon"
              class="rounded"
              @click.native="clearContent()"
@@ -60,7 +60,7 @@
              <ButtonSecondary
                id="variable"
                v-tippy="{ theme: 'tooltip' }"
-                :title="$t('delete')"
+                :title="$t('action.remove')"
                icon="remove_circle_outline"
                color="red"
                @click.native="removeEnvironmentVariable(index)"
--- a/components/environments/Environment.vue
+++ b/components/environments/Environment.vue
@@ -41,9 +41,9 @@
        />
        <SmartItem
          v-if="!(environmentIndex === 'Global')"
-          icon="remove_circle_outline"
+          icon="delete"
          color="red"
-          :label="$t('delete')"
+          :label="$t('action.delete')"
          @click.native="
            confirmRemove = true
            $refs.options.tippy().hide()
--- a/components/environments/index.vue
+++ b/components/environments/index.vue
@@ -10,33 +10,46 @@
        sticky
      "
    >
-      <div class="select-wrapper">
-        <select
-          v-model="selectedEnvironmentIndex"
-          :disabled="environments.length == 0"
-          class="
-            bg-primaryLight
-            border-b border-dividerLight
-            flex
-            w-full
-            py-2
-            px-4
-            appearance-none
-          "
-        >
-          <option :value="-1">{{ $t("environment.no_environment") }}</option>
-          <option v-if="environments.length === 0" value="0">
-            {{ $t("environment.create_new") }}
-          </option>
-          <option
-            v-for="(environment, index) in environments"
-            :key="`environment-${index}`"
-            :value="index"
+      <tippy ref="options" interactive trigger="click" theme="popover" arrow>
+        <template #trigger>
+          <span
+            v-tippy="{ theme: 'tooltip' }"
+            :title="$t('environment.select')"
+            class="border-b border-dividerLight flex-1 select-wrapper"
          >
-            {{ environment.name }}
-          </option>
-        </select>
-      </div>
+            <ButtonSecondary
+              v-if="selectedEnvironmentIndex !== -1"
+              :label="environments[selectedEnvironmentIndex].name"
+              class="rounded-none flex-1 pr-8"
+            />
+            <ButtonSecondary
+              v-else
+              :label="$t('environment.no_environment')"
+              class="rounded-none flex-1 pr-8"
+            />
+          </span>
+        </template>
+        <SmartItem
+          :label="$t('environment.no_environment')"
+          :info-icon="selectedEnvironmentIndex === -1 ? 'done' : ''"
+          :active-info-icon="selectedEnvironmentIndex === -1"
+          @click.native="
+            selectedEnvironmentIndex = -1
+            $refs.options.tippy().hide()
+          "
+        />
+        <SmartItem
+          v-for="(gen, index) in environments"
+          :key="`gen-${index}`"
+          :label="gen.name"
+          :info-icon="index === selectedEnvironmentIndex ? 'done' : ''"
+          :active-info-icon="index === selectedEnvironmentIndex"
+          @click.native="
+            selectedEnvironmentIndex = index
+            $refs.options.tippy().hide()
+          "
+        />
+      </tippy>
      <div class="border-b border-dividerLight flex flex-1 justify-between">
        <ButtonSecondary
          icon="add"
--- a/components/firebase/Login.vue
+++ b/components/firebase/Login.vue
@@ -7,18 +7,18 @@
  >
    <template #body>
      <div v-if="mode === 'sign-in'" class="flex flex-col space-y-2 px-2">
-        <SmartItem
-          :loading="signingInWithGoogle"
-          svg="google"
-          :label="$t('auth.continue_with_google')"
-          @click.native="signInWithGoogle"
-        />
        <SmartItem
          :loading="signingInWithGitHub"
          svg="github"
          :label="$t('auth.continue_with_github')"
          @click.native="signInWithGithub"
        />
+        <SmartItem
+          :loading="signingInWithGoogle"
+          svg="google"
+          :label="$t('auth.continue_with_google')"
+          @click.native="signInWithGoogle"
+        />
        <SmartItem
          icon="mail"
          :label="$t('auth.continue_with_email')"
--- a/components/graphql/RequestOptions.vue
+++ b/components/graphql/RequestOptions.vue
@@ -132,7 +132,7 @@
            <div class="flex">
              <ButtonSecondary
                v-tippy="{ theme: 'tooltip' }"
-                :title="$t('clear')"
+                :title="$t('action.clear_all')"
                icon="clear_all"
                @click.native="headers = []"
              />
@@ -220,7 +220,7 @@
            <span>
              <ButtonSecondary
                v-tippy="{ theme: 'tooltip' }"
-                :title="$t('delete')"
+                :title="$t('action.remove')"
                icon="remove_circle_outline"
                color="red"
                @click.native="removeRequestHeader(index)"
--- a/components/history/graphql/Card.vue
+++ b/components/history/graphql/Card.vue
@@ -23,7 +23,7 @@
        v-tippy="{ theme: 'tooltip' }"
        icon="remove_circle_outline"
        color="red"
-        :title="$t('delete')"
+        :title="$t('action.remove')"
        class="hidden group-hover:inline-flex"
        data-testid="delete_history_entry"
        @click.native="$emit('delete-entry')"
--- a/components/history/index.vue
+++ b/components/history/index.vue
@@ -31,7 +31,7 @@
          data-testid="clear_history"
          :disabled="history.length === 0"
          icon="clear_all"
-          :title="$t('clear_all')"
+          :title="$t('action.clear_all')"
          @click.native="confirmRemove = true"
        />
      </div>
--- a/components/history/rest/Card.vue
+++ b/components/history/rest/Card.vue
@@ -31,7 +31,7 @@
      v-tippy="{ theme: 'tooltip' }"
      icon="remove_circle_outline"
      color="red"
-      :title="$t('delete')"
+      :title="$t('action.remove')"
      class="group-hover:inline-flex hidden"
      data-testid="delete_history_entry"
      @click.native="$emit('delete-entry')"
--- a/components/http/Authorization.vue
+++ b/components/http/Authorization.vue
@@ -75,7 +75,7 @@
        />
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('clear')"
+          :title="$t('action.clear')"
          icon="clear_all"
          @click.native="clearContent"
        />
--- a/components/http/BodyParameters.vue
+++ b/components/http/BodyParameters.vue
@@ -26,7 +26,7 @@
        />
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('clear')"
+          :title="$t('action.clear_all')"
          icon="clear_all"
          @click.native="clearContent"
        />
@@ -175,7 +175,7 @@
      <span>
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('delete')"
+          :title="$t('action.remove')"
          icon="remove_circle_outline"
          color="red"
          @click.native="deleteBodyParam(index)"
--- a/components/http/CodegenModal.vue
+++ b/components/http/CodegenModal.vue
@@ -9,36 +9,28 @@
        <label for="requestType" class="px-4 pb-4">
          {{ $t("request.choose_language") }}
        </label>
-        <div class="flex">
-          <tippy
-            ref="options"
-            interactive
-            trigger="click"
-            theme="popover"
-            arrow
-          >
-            <template #trigger>
-              <span class="select-wrapper">
-                <ButtonSecondary
-                  :label="codegens.find((x) => x.id === codegenType).name"
-                  outline
-                  class="pr-8"
-                />
-              </span>
-            </template>
-            <SmartItem
-              v-for="(gen, index) in codegens"
-              :key="`gen-${index}`"
-              :label="gen.name"
-              :info-icon="gen.id === codegenType ? 'done' : ''"
-              :active-info-icon="gen.id === codegenType"
-              @click.native="
-                codegenType = gen.id
-                $refs.options.tippy().hide()
-              "
-            />
-          </tippy>
-        </div>
+        <tippy ref="options" interactive trigger="click" theme="popover" arrow>
+          <template #trigger>
+            <span class="select-wrapper">
+              <ButtonSecondary
+                :label="codegens.find((x) => x.id === codegenType).name"
+                outline
+                class="flex-1 pr-8"
+              />
+            </span>
+          </template>
+          <SmartItem
+            v-for="(gen, index) in codegens"
+            :key="`gen-${index}`"
+            :label="gen.name"
+            :info-icon="gen.id === codegenType ? 'done' : ''"
+            :active-info-icon="gen.id === codegenType"
+            @click.native="
+              codegenType = gen.id
+              $refs.options.tippy().hide()
+            "
+          />
+        </tippy>
        <div class="flex flex-1 justify-between">
          <label for="generatedCode" class="px-4 pt-4 pb-4">
            {{ $t("request.generated_code") }}
--- a/components/http/Headers.vue
+++ b/components/http/Headers.vue
@@ -26,7 +26,7 @@
        />
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('clear')"
+          :title="$t('action.clear_all')"
          icon="clear_all"
          @click.native="clearContent"
        />
@@ -129,7 +129,7 @@
      <span>
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('delete')"
+          :title="$t('action.remove')"
          icon="remove_circle_outline"
          color="red"
          @click.native="deleteHeader(index)"
--- a/components/http/Parameters.vue
+++ b/components/http/Parameters.vue
@@ -26,7 +26,7 @@
        />
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('clear_all')"
+          :title="$t('action.clear_all')"
          icon="clear_all"
          @click.native="clearContent"
        />
@@ -140,7 +140,7 @@
      <span>
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('delete')"
+          :title="$t('action.remove')"
          icon="remove_circle_outline"
          color="red"
          @click.native="deleteParam(index)"
--- a/components/http/PreRequestScript.vue
+++ b/components/http/PreRequestScript.vue
@@ -26,7 +26,7 @@
        />
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('clear')"
+          :title="$t('action.clear')"
          icon="clear_all"
          @click.native="clearContent"
        />
--- a/components/http/RawBody.vue
+++ b/components/http/RawBody.vue
@@ -26,7 +26,7 @@
        />
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('clear')"
+          :title="$t('action.clear')"
          icon="clear_all"
          @click.native="clearContent('rawParams', $event)"
        />
--- a/components/http/Request.vue
+++ b/components/http/Request.vue
@@ -121,7 +121,7 @@
          />
          <SmartItem
            ref="clearAll"
-            :label="$t('clear_all')"
+            :label="$t('action.clear_all')"
            icon="clear_all"
            @click.native="
              clearContent()
--- a/components/http/TestResult.vue
+++ b/components/http/TestResult.vue
@@ -24,7 +24,7 @@
        </label>
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('clear')"
+          :title="$t('action.clear')"
          icon="clear_all"
          @click.native="clearContent()"
        />
--- a/components/http/Tests.vue
+++ b/components/http/Tests.vue
@@ -26,7 +26,7 @@
        />
        <ButtonSecondary
          v-tippy="{ theme: 'tooltip' }"
-          :title="$t('clear')"
+          :title="$t('action.clear')"
          icon="clear_all"
          @click.native="clearContent"
        />
--- a/components/http/TokenList.vue
+++ b/components/http/TokenList.vue
@@ -6,7 +6,7 @@
        <div v-if="tokens.length != 0">
          <ButtonSecondary
            v-tippy="{ theme: 'tooltip' }"
-            :title="$t('clear')"
+            :title="$t('action.clear_all')"
            icon="clear_all"
            @click.native="clearContent('tokens', $event)"
          />
@@ -41,7 +41,7 @@
          <li>
            <ButtonSecondary
              v-tippy="{ theme: 'tooltip' }"
-              :title="$t('delete')"
+              :title="$t('action.remove')"
              icon="remove_circle_outline"
              color="red"
              @click.native="removeOAuthToken(index)"
--- a/components/realtime/Socketio.vue
+++ b/components/realtime/Socketio.vue
@@ -117,7 +117,7 @@
              <ButtonSecondary
                v-if="index + 1 !== communication.inputs.length"
                v-tippy="{ theme: 'tooltip' }"
-                :title="$t('delete')"
+                :title="$t('action.remove')"
                icon="remove_circle_outline"
                class="rounded-l-none"
                color="red"
--- a/components/realtime/Websocket.vue
+++ b/components/realtime/Websocket.vue
@@ -56,7 +56,7 @@
              <div class="flex">
                <ButtonSecondary
                  v-tippy="{ theme: 'tooltip' }"
-                  :title="$t('clear_all')"
+                  :title="$t('action.clear_all')"
                  icon="clear_all"
                  @click.native="clearContent"
                />
@@ -112,7 +112,7 @@
              <span>
                <ButtonSecondary
                  v-tippy="{ theme: 'tooltip' }"
-                  :title="$t('delete')"
+                  :title="$t('action.remove')"
                  icon="remove_circle_outline"
                  color="red"
                  @click.native="deleteProtocol({ index })"
--- a/components/teams/Edit.vue
+++ b/components/teams/Edit.vue
@@ -82,7 +82,7 @@
              <ButtonSecondary
                id="member"
                v-tippy="{ theme: 'tooltip' }"
-                :title="$t('delete')"
+                :title="$t('action.remove')"
                icon="remove_circle_outline"
                color="red"
                @click.native="removeExistingTeamMember(member.user.uid)"
@@ -142,7 +142,7 @@
              <ButtonSecondary
                id="member"
                v-tippy="{ theme: 'tooltip' }"
-                :title="$t('delete')"
+                :title="$t('action.remove')"
                icon="remove_circle_outline"
                color="red"
                @click.native="removeTeamMember(index)"
--- a/components/teams/Team.vue
+++ b/components/teams/Team.vue
@@ -39,9 +39,9 @@
        />
        <SmartItem
          v-if="team.myRole === 'OWNER'"
-          icon="remove_circle_outline"
+          icon="delete"
          color="red"
-          :label="$t('delete')"
+          :label="$t('action.delete')"
          @click.native="
            deleteTeam()
            $refs.options.tippy().hide()