From f8aeb42da57c95b1f8a61b633b3c4e4f5a69f3f4 Mon Sep 17 00:00:00 2001
From: nivedin <nivedinp@gmail.com>
Date: Thu, 9 Nov 2023 14:07:56 +0530
Subject: [PATCH] chore: improve UI flow and add i18n

---
 .../assets/themes/base-themes.scss            |  1 +
 packages/hoppscotch-common/locales/en.json    |  2 +
 .../src/components/collections/Properties.vue | 58 +++++++++++--------
 .../src/components/http/Authorization.vue     |  6 ++
 .../src/components/http/Headers.vue           | 12 +++-
 .../src/assets/scss/histoire.scss             |  1 +
 .../src/components/smart/Modal.vue            |  4 +-
 7 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/packages/hoppscotch-common/assets/themes/base-themes.scss b/packages/hoppscotch-common/assets/themes/base-themes.scss
index d8258a347..73a228cb7 100644
--- a/packages/hoppscotch-common/assets/themes/base-themes.scss
+++ b/packages/hoppscotch-common/assets/themes/base-themes.scss
@@ -17,6 +17,7 @@
   --lower-tertiary-sticky-fold: 7.125rem;
   --lower-fourth-sticky-fold: 9.188rem;
   --sidebar-primary-sticky-fold: 2rem;
+  --properties-primary-sticky-fold: 2.05rem;
 }
 
 @mixin light-theme {
diff --git a/packages/hoppscotch-common/locales/en.json b/packages/hoppscotch-common/locales/en.json
index abb77d8e3..032309d39 100644
--- a/packages/hoppscotch-common/locales/en.json
+++ b/packages/hoppscotch-common/locales/en.json
@@ -356,6 +356,8 @@
     "offline_short": "You're using Hoppscotch offline.",
     "post_request_tests": "Test scripts are written in JavaScript, and are run after the response is received.",
     "pre_request_script": "Pre-request scripts are written in JavaScript, and are run before the request is sent.",
+    "collection_properties_authorization": " This authorization will be set for every request in this collection.",
+    "collection_properties_header": "This header will be set for every request in this collection.",
     "script_fail": "It seems there is a glitch in the pre-request script. Check the error below and fix the script accordingly.",
     "test_script_fail": "There seems to be an error with test script. Please fix the errors and run tests again",
     "tests": "Write a test script to automate debugging."
diff --git a/packages/hoppscotch-common/src/components/collections/Properties.vue b/packages/hoppscotch-common/src/components/collections/Properties.vue
index 23ab50260..8d1279b21 100644
--- a/packages/hoppscotch-common/src/components/collections/Properties.vue
+++ b/packages/hoppscotch-common/src/components/collections/Properties.vue
@@ -3,19 +3,44 @@
     v-if="show"
     dialog
     :title="t('collection.properties')"
+    :full-width-body="true"
     @close="hideModal"
   >
     <template #body>
       <HoppSmartTabs
         v-model="selectedOptionTab"
-        styles="sticky overflow-x-auto flex-shrink-0 bg-primary  z-10"
+        styles="sticky overflow-x-auto flex-shrink-0 bg-primary top-0 z-10 !-py-4"
         render-inactive-tabs
       >
         <HoppSmartTab :id="'headers'" :label="`${t('tab.headers')}`">
           <HttpHeaders
             v-model="editableCollection"
+            :is-collection-property="true"
             @change-tab="changeOptionTab"
           />
+          <AppBanner
+            :banner="{
+              type: 'info',
+              alternateText: 'This is an alternate text',
+            }"
+            class="sticky bottom-0 z-10"
+          >
+            <span>
+              {{ t("helpers.collection_properties_header") }}
+              <a href="hopp.sh" target="_blank" class="underline">{{
+                t("action.learn_more")
+              }}</a>
+            </span>
+          </AppBanner>
+        </HoppSmartTab>
+        <HoppSmartTab
+          :id="'authorization'"
+          :label="`${t('tab.authorization')}`"
+        >
+          <HttpAuthorization
+            v-model="editableCollection.auth"
+            :is-collection-property="true"
+          />
           <AppBanner
             :banner="{
               type: 'info',
@@ -23,26 +48,10 @@
             }"
           >
             <span>
-              This header will be set for every request in this collection.
-              <a href="hopp.sh" class="underline">Learn More</a>
-            </span>
-          </AppBanner>
-        </HoppSmartTab>
-        <HoppSmartTab
-          :id="'authorization'"
-          :label="`${t('tab.authorization')}`"
-        >
-          <HttpAuthorization v-model="editableCollection.auth" />
-          <AppBanner
-            :banner="{
-              type: 'info',
-              alternateText: 'This is an alternate text',
-            }"
-          >
-            <span>
-              This authorization will be set for every request in this
-              collection.
-              <a href="hopp.sh" class="underline">Learn More</a>
+              {{ t("helpers.collection_properties_authorization") }}
+              <a href="hopp.sh" target="_blank" class="underline">{{
+                t("action.learn_more")
+              }}</a>
             </span>
           </AppBanner>
         </HoppSmartTab>
@@ -72,6 +81,7 @@ import { watch, ref } from "vue"
 import { useI18n } from "@composables/i18n"
 import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data"
 import { TeamCollection } from "~/helpers/backend/graphql"
+import { RESTOptionTabs } from "../http/RequestOptions.vue"
 
 const t = useI18n()
 
@@ -103,13 +113,11 @@ const editableCollection = ref({
     authType: "none",
     authActive: false,
   },
-})
-
-type Tab = "headers" | "authorization"
+}) as any
 
 const selectedOptionTab = ref("headers")
 
-const changeOptionTab = (tab: Tab) => {
+const changeOptionTab = (tab: RESTOptionTabs) => {
   selectedOptionTab.value = tab
 }
 
diff --git a/packages/hoppscotch-common/src/components/http/Authorization.vue b/packages/hoppscotch-common/src/components/http/Authorization.vue
index ae970b513..ffae0025c 100644
--- a/packages/hoppscotch-common/src/components/http/Authorization.vue
+++ b/packages/hoppscotch-common/src/components/http/Authorization.vue
@@ -2,6 +2,11 @@
   <div class="flex flex-1 flex-col">
     <div
       class="sticky z-10 flex flex-shrink-0 items-center justify-between overflow-x-auto border-b border-dividerLight bg-primary pl-4"
+      :class="{
+        'top-upperMobileSecondaryStickyFold sm:top-upperSecondaryStickyFold':
+          !isCollectionProperty,
+        'top-propertiesPrimaryStickyFold': isCollectionProperty,
+      }"
     >
       <span class="flex items-center">
         <label class="truncate font-semibold text-secondaryLight">
@@ -188,6 +193,7 @@ const colorMode = useColorMode()
 
 const props = defineProps<{
   modelValue: HoppRESTAuth
+  isCollectionProperty?: boolean
 }>()
 
 const emit = defineEmits<{
diff --git a/packages/hoppscotch-common/src/components/http/Headers.vue b/packages/hoppscotch-common/src/components/http/Headers.vue
index fe1693df4..969f800b2 100644
--- a/packages/hoppscotch-common/src/components/http/Headers.vue
+++ b/packages/hoppscotch-common/src/components/http/Headers.vue
@@ -2,6 +2,11 @@
   <div class="flex flex-1 flex-col">
     <div
       class="sticky z-10 flex flex-shrink-0 items-center justify-between overflow-x-auto border-b border-dividerLight bg-primary pl-4"
+      :class="{
+        'top-upperMobileSecondaryStickyFold sm:top-upperSecondaryStickyFold':
+          !isCollectionProperty,
+        'top-propertiesPrimaryStickyFold': isCollectionProperty,
+      }"
     >
       <label class="truncate font-semibold text-secondaryLight">
         {{ t("request.header_list") }}
@@ -288,9 +293,10 @@ const linewrapEnabled = ref(true)
 const deletionToast = ref<{ goAway: (delay: number) => void } | null>(null)
 
 // v-model integration with props and emit
-const props = defineProps<{ modelValue: HoppRESTRequest }>()
-
-console.log(props.modelValue)
+const props = defineProps<{
+  modelValue: HoppRESTRequest
+  isCollectionProperty?: boolean
+}>()
 
 const emit = defineEmits<{
   (e: "change-tab", value: RESTOptionTabs): void
diff --git a/packages/hoppscotch-ui/src/assets/scss/histoire.scss b/packages/hoppscotch-ui/src/assets/scss/histoire.scss
index 44c17e9e3..64a197c84 100644
--- a/packages/hoppscotch-ui/src/assets/scss/histoire.scss
+++ b/packages/hoppscotch-ui/src/assets/scss/histoire.scss
@@ -22,6 +22,7 @@
   --lower-tertiary-sticky-fold: 7.125rem;
   --lower-fourth-sticky-fold: 9.188rem;
   --sidebar-primary-sticky-fold: 2rem;
+  --properties-primary-sticky-fold: 2.05rem;
 }
 
 @mixin dark-theme {
diff --git a/packages/hoppscotch-ui/src/components/smart/Modal.vue b/packages/hoppscotch-ui/src/components/smart/Modal.vue
index 412c9a9c4..0f47410c2 100644
--- a/packages/hoppscotch-ui/src/components/smart/Modal.vue
+++ b/packages/hoppscotch-ui/src/components/smart/Modal.vue
@@ -59,7 +59,7 @@
             </div>
             <div
               class="flex flex-col overflow-y-auto max-h-[55vh]"
-              :class="{ 'p-4': !fullWidth }"
+              :class="{ 'p-4': !fullWidth && !fullWidthBody }"
             >
               <slot name="body"></slot>
             </div>
@@ -117,6 +117,7 @@ withDefaults(
     dimissible: boolean
     placement: string
     fullWidth: boolean
+    fullWidthBody: boolean
     styles: string
     closeText: string | null
   }>(),
@@ -126,6 +127,7 @@ withDefaults(
     dimissible: true,
     placement: "top",
     fullWidth: false,
+    fullWidthBody: false,
     styles: "sm:max-w-lg",
     closeText: null,
   }