From dd72eacd2171c0d9c651d0b51420b4fe4507eaa1 Mon Sep 17 00:00:00 2001
From: Anwarul Islam <anwaarulislaam@gmail.com>
Date: Tue, 4 Apr 2023 21:18:32 +0600
Subject: [PATCH 1/2] fix: no page rendering issue after navigating from rest
 page (#2962)

---
 .../src/components/collections/index.vue      |   2 +-
 .../hoppscotch-common/src/pages/index.vue     | 109 +++++++++---------
 2 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/packages/hoppscotch-common/src/components/collections/index.vue b/packages/hoppscotch-common/src/components/collections/index.vue
index 98ec377b7..79925d556 100644
--- a/packages/hoppscotch-common/src/components/collections/index.vue
+++ b/packages/hoppscotch-common/src/components/collections/index.vue
@@ -1185,7 +1185,7 @@ const onRemoveRequest = () => {
     })
 
     if (possibleTab) {
-      possibleTab.value.document.saveContext = undefined
+      possibleTab.value.document.saveContext = null
       possibleTab.value.document.isDirty = true
     }
   }
diff --git a/packages/hoppscotch-common/src/pages/index.vue b/packages/hoppscotch-common/src/pages/index.vue
index 71c40add7..b095878bc 100644
--- a/packages/hoppscotch-common/src/pages/index.vue
+++ b/packages/hoppscotch-common/src/pages/index.vue
@@ -1,59 +1,60 @@
 <template>
-  <AppPaneLayout layout-id="http">
-    <template #primary>
-      <HoppSmartWindows
-        v-if="currentTabID"
-        :id="'rest_windows'"
-        v-model="currentTabID"
-        @remove-tab="removeTab"
-        @add-tab="addNewTab"
-        @sort="sortTabs"
-      >
-        <HoppSmartWindow
-          v-for="tab in tabs"
-          :id="tab.id"
-          :key="tab.id"
-          :label="tab.document.request.name"
-          :is-removable="tabs.length > 1"
+  <div>
+    <AppPaneLayout layout-id="http">
+      <template #primary>
+        <HoppSmartWindows
+          v-if="currentTabID"
+          :id="'rest_windows'"
+          v-model="currentTabID"
+          @remove-tab="removeTab"
+          @add-tab="addNewTab"
+          @sort="sortTabs"
         >
-          <template #tabhead>
-            <span
-              class="font-semibold truncate text-tiny w-10"
-              :class="getMethodLabelColorClassOf(tab.document.request)"
-            >
-              {{ tab.document.request.method }}
-            </span>
-            <span class="text-green-600 mr-1" v-if="tab.document.isDirty">
-              •
-            </span>
-            <span class="truncate flex-1">
-              {{ tab.document.request.name }}
-            </span>
-          </template>
-
-          <HttpRequestTab
-            :model-value="tab"
-            @update:model-value="onTabUpdate"
-          />
-        </HoppSmartWindow>
-      </HoppSmartWindows>
-    </template>
-    <template #sidebar>
-      <HttpSidebar />
-    </template>
-  </AppPaneLayout>
-  <HoppSmartConfirmModal
-    :show="confirmingCloseForTabID !== null"
-    :confirm="t('modal.close_unsaved_tab')"
-    :title="t('confirm.save_unsaved_tab')"
-    @hide-modal="onCloseConfirmSaveTab"
-    @resolve="onResolveConfirmSaveTab"
-  />
-  <CollectionsSaveRequest
-    :show="savingRequest"
-    :mode="'rest'"
-    @hide-modal="onSaveModalClose"
-  />
+          <HoppSmartWindow
+            v-for="tab in tabs"
+            :id="tab.id"
+            :key="tab.id"
+            :label="tab.document.request.name"
+            :is-removable="tabs.length > 1"
+          >
+            <template #tabhead>
+              <span
+                class="font-semibold truncate text-tiny w-10"
+                :class="getMethodLabelColorClassOf(tab.document.request)"
+              >
+                {{ tab.document.request.method }}
+              </span>
+              <span class="text-green-600 mr-1" v-if="tab.document.isDirty">
+                •
+              </span>
+              <span class="truncate flex-1">
+                {{ tab.document.request.name }}
+              </span>
+            </template>
+            <HttpRequestTab
+              :model-value="tab"
+              @update:model-value="onTabUpdate"
+            />
+          </HoppSmartWindow>
+        </HoppSmartWindows>
+      </template>
+      <template #sidebar>
+        <HttpSidebar />
+      </template>
+    </AppPaneLayout>
+    <HoppSmartConfirmModal
+      :show="confirmingCloseForTabID !== null"
+      :confirm="t('modal.close_unsaved_tab')"
+      :title="t('confirm.save_unsaved_tab')"
+      @hide-modal="onCloseConfirmSaveTab"
+      @resolve="onResolveConfirmSaveTab"
+    />
+    <CollectionsSaveRequest
+      :show="savingRequest"
+      :mode="'rest'"
+      @hide-modal="onSaveModalClose"
+    />
+  </div>
 </template>
 
 <script lang="ts" setup>

From a24d724e2ba319154fe50ada10b06ac217aab17e Mon Sep 17 00:00:00 2001
From: Akash K <57758277+amk-dev@users.noreply.github.com>
Date: Tue, 4 Apr 2023 20:59:31 +0530
Subject: [PATCH 2/2] chore: load terms of service & privacy policy links from
 env variables (#2963)

---
 .env.example                                       |  4 ++++
 .../src/components/firebase/Login.vue              | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index 986790310..ec618a0d4 100644
--- a/.env.example
+++ b/.env.example
@@ -22,6 +22,10 @@ VITE_SHORTCODE_BASE_URL=https://hopp.sh
 VITE_BACKEND_GQL_URL=https://api.hoppscotch.io/graphql
 VITE_BACKEND_WS_URL=wss://api.hoppscotch.io/graphql
 
+# Terms Of Service And Privacy Policy Links (Optional)
+VITE_APP_TOS_LINK=https://docs.hoppscotch.io/terms
+VITE_APP_PRIVACY_POLICY_LINK=https://docs.hoppscotch.io/privacy
+
 # Sentry (Optional)
 # VITE_SENTRY_DSN: <Sentry DSN here>
 # VITE_SENTRY_ENVIRONMENT: <Sentry environment value here>
diff --git a/packages/hoppscotch-common/src/components/firebase/Login.vue b/packages/hoppscotch-common/src/components/firebase/Login.vue
index f37409e60..85e3638c9 100644
--- a/packages/hoppscotch-common/src/components/firebase/Login.vue
+++ b/packages/hoppscotch-common/src/components/firebase/Login.vue
@@ -76,18 +76,21 @@
       </div>
     </template>
     <template #footer>
-      <div v-if="mode === 'sign-in'" class="text-secondaryLight text-tiny">
+      <div
+        v-if="mode === 'sign-in' && tosLink && privacyPolicyLink"
+        class="text-secondaryLight text-tiny"
+      >
         By signing in, you are agreeing to our
         <HoppSmartAnchor
           class="link"
-          to="https://docs.hoppscotch.io/terms"
+          :to="tosLink"
           blank
           label="Terms of Service"
         />
         and
         <HoppSmartAnchor
           class="link"
-          to="https://docs.hoppscotch.io/privacy"
+          :to="privacyPolicyLink"
           blank
           label="Privacy Policy"
         />
@@ -141,6 +144,9 @@ export default defineComponent({
   setup() {
     const { subscribeToStream } = useStreamSubscriber()
 
+    const tosLink = import.meta.env.VITE_APP_TOS_LINK
+    const privacyPolicyLink = import.meta.env.VITE_APP_PRIVACY_POLICY_LINK
+
     return {
       subscribeToStream,
       t: useI18n(),
@@ -150,6 +156,8 @@ export default defineComponent({
       IconEmail,
       IconMicrosoft,
       IconArrowLeft,
+      tosLink,
+      privacyPolicyLink,
     }
   },
   data() {