Merge pull request #1771 from sparrowapp-dev/development

Release Version 2.9.0 [Merging development into prod]

package.json

@@ -3,7 +3,7 @@
   "private": true,
   "author": "Sparrow",
   "description": "The Sparrow App is your next go to API development buddy which can help you test, debug, distribute better APIs while collaborating with your colleagues and making you a better programmer.",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -60,6 +60,7 @@
     "socket.io-client": "^4.7.5",
     "svelte-agnostic-draggable": "^0.2.0",
     "svelte-file-dropzone": "^2.0.2",
+    "svelte-inview": "^4.0.2",
     "svelte-jsoneditor": "^0.18.9",
     "svelte-motion": "^0.11.5",
     "svelte-navigator": "^3.2.2",
@@ -125,19 +126,19 @@
           "assets": [
             {
               "path": "/Users/runner/work/sparrow-app/sparrow-app/src-tauri/target/debug/bundle/dmg/*.dmg",
-              "label": "Sparrow_2.8.0.dmg"
+              "label": "Sparrow_2.9.0.dmg"
             },
             {
               "path": "msi_files/*.exe",
-              "label": "Sparrow_2.8.0.exe"
+              "label": "Sparrow_2.9.0.exe"
             },
             {
               "path": "msi_files/*.msi",
-              "label": "Sparrow_2.8.0.msi"
+              "label": "Sparrow_2.9.0.msi"
             },
             {
               "path": "msi_files/*.zip",
-              "label": "Sparrow_2.8.0_x64_en-US.msi.zip"
+              "label": "Sparrow_2.9.0_x64_en-US.msi.zip"
             },
             {
               "path": "/Users/runner/work/sparrow-app/sparrow-app/src-tauri/target/debug/bundle/macos/Sparrow.app.tar.gz",

src-tauri/tauri.conf.json

@@ -39,11 +39,8 @@
     "targets": "all",
     "windows": {
       "wix": {
-        "fragmentPaths": [
-          "./assets/DeepLinkRegistryEntries.wxs",
-          "./assets/CleanupOnUninstall.wxs"
-        ],
-        "componentRefs": ["DeepLinkRegistryEntries", "CleanupAppFolder"]
+        "fragmentPaths": ["./assets/DeepLinkRegistryEntries.wxs"],
+        "componentRefs": ["DeepLinkRegistryEntries"]
       }
     },
     "macOS": {
@@ -86,5 +83,5 @@
     }
   },
   "productName": "Sparrow",
-  "version": "2.8.0"
+  "version": "2.9.0"
 }

src/packages/@app/components/App.svelte

@@ -24,7 +24,7 @@
   const doOnlineCheck = () => {
     if (!navigator.onLine && isActiveInternet) {
       isActiveInternet = false;
-      // notifications.error("The network connection has been lost.");
+      // notifications.error("The network connection has been lost. Please check your internet and try again. ");
     } else isActiveInternet = true;
   };
 

src/packages/@app/pages/Auth/entry-point/EntryPoint.svelte

@@ -22,6 +22,7 @@
   import MixpanelEvent from "$lib/utils/mixpanel/MixpanelEvent";
   import { Events } from "$lib/utils/enums/mixpanel-events.enum";
   import Button from "@library/ui/button/Button.svelte";
+  import { isUserFirstSignUp } from "@app/store/user.store";
   let isEntry = false;
 
   let isHover = false;
@@ -102,7 +103,7 @@
         style="border-radius: 2px;"
         on:click={async () => {
           await copyToClipBoard(externalSparrowLink);
-          notifications.success("Link copied to clipboard!");
+          notifications.success("Link copied to clipboard.");
         }}
       >
         <span class="mx-2">
@@ -154,6 +155,7 @@
           id="try_sparrow_edge"
           onClick={() => {
             skipLoginHandler();
+            // isUserFirstSignUp.set(true);
           }}
           title={"Try Sparrow Edge"}
           buttonClassProp={"btn mb-2"}
@@ -236,9 +238,7 @@
       <div class="divider-line my-4" />
 
       <div>
-        <p
-          class=" cursor-pointer text-center text-secondary-250 sparrow-fs-14 m-1"
-        >
+        <p class=" text-center text-secondary-250 sparrow-fs-14 m-1">
           Version {version}
         </p>
       </div>

src/packages/@app/pages/Auth/forgot-password/forgot-password.ts

@@ -8,7 +8,7 @@ export const handleForgotPassword = async (
   forgotPasswordCredential: EmailPostBody,
 ) => {
   await forgotPassword(forgotPasswordCredential);
-  notifications.success("Verification code sent to registered email ID");
+  notifications.success("Verification code sent to registered email ID.");
   navigate("/update/password");
 };
 

src/packages/@app/pages/Auth/login-page/login-page.ts

@@ -12,6 +12,7 @@ import MixpanelEvent from "$lib/utils/mixpanel/MixpanelEvent";
 import { Events } from "$lib/utils/enums/mixpanel-events.enum";
 import ActiveSideBarTabViewModel from "../../Dashboard/ActiveSideBarTab.ViewModel";
 import { GuideRepository } from "@app/repositories/guide.repository";
+import { isUserFirstSignUp } from "@app/store/user.store";
 
 //------------------------------MixPanel-------------------------------//
 
@@ -42,11 +43,11 @@ const handleLogin = async (loginCredentials: loginUserPostBody) => {
     const userDetails = jwtDecode(response.data?.data?.accessToken?.token);
     setUser(jwtDecode(response.data?.data?.accessToken?.token));
     sendUserDataToMixpanel(userDetails);
-    MixpanelEvent(Events.USER_LOGIN, {
-      Login_Method: "Email",
-      Success: response.isSuccessful,
-    });
-    notifications.success("Login successful!");
+    // MixpanelEvent(Events.USER_LOGIN, {
+    //   Login_Method: "Email",
+    //   Success: response.isSuccessful,
+    // });
+    notifications.success("You're logged in successfully.");
     navigate("/dashboard/workspaces");
     _activeSidebarTabViewModel.addActiveTab("workspaces");
     return response;
@@ -63,25 +64,31 @@ export async function handleLoginV2(url: string) {
   const accessToken = params.get("accessToken");
   const refreshToken = params.get("refreshToken");
   const event = params.get("event");
+  const method = params.get("method");
 
   if (accessToken && refreshToken) {
     const userDetails = jwtDecode(accessToken);
     setAuthJwt(constants.AUTH_TOKEN, accessToken);
     setAuthJwt(constants.REF_TOKEN, refreshToken);
     setUser(jwtDecode(accessToken));
     sendUserDataToMixpanel(userDetails);
-    MixpanelEvent(Events.USER_LOGIN, {
-      Login_Method: "Email",
-      Success: true,
-    });
-    notifications.success("Login successful!");
+
+    notifications.success("You're logged in successfully.");
     if (event === "register") {
       navigate("/app/collections?first=true");
+      isUserFirstSignUp.set(true);
+      MixpanelEvent(Events.USER_SIGNUP, {
+        method: method,
+        Success: true,
+      });
       _guideRepository.insert({ isActive: true, id: "environment-guide" });
       _guideRepository.insert({ isActive: true, id: "collection-guide" });
     } else {
       navigate("/app/collections?first=false");
-
+      MixpanelEvent(Events.USER_LOGIN, {
+        method: method,
+        Success: true,
+      });
       _guideRepository.insert({ isActive: false, id: "environment-guide" });
       _guideRepository.insert({ isActive: false, id: "collection-guide" });
     }

src/packages/@app/pages/Auth/redirect/Redirect.svelte

@@ -124,7 +124,7 @@
     </div>
     <div class="mt-5">
       <p
-        class="cursor-pointer text-center text-secondary-250 sparrow-fs-12 mt-3 mb-1"
+        class=" text-center text-secondary-250 sparrow-fs-12 mt-3 mb-1"
       >
         Version {version}
       </p>

src/packages/@app/pages/Auth/register-page/register-page.ts

@@ -18,7 +18,7 @@ const handleRegister = async (userData) => {
       Login_Method: "Email",
       Success: response.isSuccessful,
     });
-    notifications.success("Registration successful!");
+    notifications.success("You've registered successfully.");
     navigate("/welcome");
   } else {
     notifications.error(response.message);

src/packages/@app/pages/Auth/reset-password/reset-password.ts

@@ -11,11 +11,13 @@ export const handleResetPassword = async (
   const response = await resetPassword(resetPasswordCredential);
 
   if (response.isSuccessful) {
-    notifications.success("Password Updated");
+    notifications.success("Password updated successfully.");
     navigate("/login");
   } else {
     if (response.message === "Unauthorized Access") {
-      notifications.error("Old Password and New Password cannot be same");
+      notifications.error(
+        "Old and New Password cannot be same. Please enter a different password.",
+      );
     }
     throw "error login user: " + response.message;
   }

src/packages/@app/pages/Auth/update-password/update-password.ts

@@ -12,7 +12,7 @@ export const handleVerifyEmail = async (
 ) => {
   const response = await verifyEmail(verifyCodeCredential);
   if (response.isSuccessful) {
-    notifications.success("Email Verified Successfully");
+    notifications.success("Email verified successfully.");
     navigate("/reset/password");
   } else {
     isSuccessfulResponse.set(true);

src/packages/@app/pages/CollectionExplorerPage/CollectionExplorerPage.ViewModel.ts

@@ -94,9 +94,9 @@ class CollectionExplorerPage {
           response.data,
         );
         this.updateTab(this.tab.tabId, { name: newCollectionName });
-        notifications.success("Collection renamed successfully!");
+        // notifications.success("Collection renamed successfully!");
       } else {
-        notifications.error("Failed to rename collection!");
+        notifications.error("Failed to rename collection. Please try again.");
       }
       return;
     }
@@ -112,11 +112,11 @@ class CollectionExplorerPage {
           response.data.data,
         );
         this.updateTab(this.tab.tabId, { name: newCollectionName });
-        notifications.success("Collection renamed successfully!");
+        // notifications.success("Collection renamed successfully!");
       } else if (response.message === "Network Error") {
         notifications.error(response.message);
       } else {
-        notifications.error("Failed to rename collection!");
+        notifications.error("Failed to rename collection. Please try again.");
       }
     }
   };
@@ -222,7 +222,7 @@ class CollectionExplorerPage {
           collection.id,
           response.data.data.collection,
         );
-        notifications.success("Collection synced.");
+        notifications.success("Collection synced successfully.");
       } else {
         notifications.error("Failed to sync the collection. Please try again.");
       }
@@ -296,7 +296,7 @@ class CollectionExplorerPage {
           collection?.id,
           response.data.data.collection,
         );
-        notifications.success("Collection synced.");
+        notifications.success("Collection synced successfully.");
         return true;
       } else {
         notifications.error("Failed to sync the collection. Please try again.");
@@ -524,7 +524,7 @@ class CollectionExplorerPage {
           description: newDescription,
         },
       );
-      notifications.success("Description updated successfully!");
+      notifications.success("Description updated successfully.");
       return;
     }
     const response = await this.collectionService.updateCollectionData(
@@ -541,11 +541,11 @@ class CollectionExplorerPage {
         data: { description: newDescription },
       };
       await this.collectionRepository.updateCollection(collection.id, res.data);
-      notifications.success("Description updated successfully!");
+      notifications.success("Description updated successfully.");
     } else if (response.message === "Network Error") {
       notifications.error(response.message);
     } else {
-      notifications.error("Failed to update description!");
+      notifications.error("Failed to update description. Please try again.");
     }
   };