Merge pull request #80 from sparrowapp-dev/development

Release Version 2.12.0 [Merging development into prod]
sparrowapp-dev · Nov 22, 2024 · 8b89e27 · 8b89e27
2 parents bd88209 + 7cc415e
commit 8b89e27
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/src/pages/Auth/login-page/LoginPage.svelte b/src/pages/Auth/login-page/LoginPage.svelte
@@ -217,7 +217,7 @@
 						on:click={togglePasswordVisibility}
 						class="border-0 position-absolute eye-icon d-flex align-items-center"
 					>
-						{#if !isPasswordVisible}
+						{#if isPasswordVisible}
 							<img src={eyeShow} alt="eye-show" />
 						{:else}
 							<img src={eyeHide} alt="eye-hie" />

diff --git a/src/pages/Auth/oauth-redirect/OauthRedirect.svelte b/src/pages/Auth/oauth-redirect/OauthRedirect.svelte
@@ -1,16 +1,17 @@
-<script>
+<script lang="ts">
 	import { onMount } from 'svelte';
 	import { navigate } from 'svelte-navigator';
 	import Redirect from '../redirect/Redirect.svelte';
 	import constants from '$lib/utils/constants';
 
 	let userFromDesktop = localStorage.getItem('isUserFromDesktop');
 
-
+	let accessToken = "";
+	let refreshToken = "";
 	onMount(() => {
 		const urlParams = new URLSearchParams(window.location.search);
-		const accessToken = urlParams.get('accessToken');
-		const refreshToken = urlParams.get('refreshToken'); 
+		accessToken = urlParams.get('accessToken') as string;
+		refreshToken = urlParams.get('refreshToken') as string; 
 		const source = urlParams.get('source');
 		const sparrowRedirect = `sparrow://?accessToken=${accessToken}&refreshToken=${refreshToken}&event=${source}&method=google`;
 		const sparrowWebRedirect = constants.SPARROW_WEB_URL +`?accessToken=${accessToken}&refreshToken=${refreshToken}&event=${source}&method=google`;
@@ -36,6 +37,14 @@
 				navigate(sparrowWebRedirect)
 			}
 		}
+		else{
+			if(userFromDesktop === "true"){
+				navigate("/init")
+			}
+			else{
+				navigate("/init?source=web")
+			}			
+		}
 	});
 	let redirectRules = {
 		title: 'Welcome to Sparrow!',
@@ -48,12 +57,14 @@
 	};
 </script>
 
-<Redirect
-	title={redirectRules.title}
-	description={redirectRules.description}
-	message={redirectRules.message}
-	isSpinner={redirectRules.isSpinner}
-	buttonText={redirectRules.buttonText}
-	buttonClick={redirectRules.buttonClick}
-	loadingMessage={redirectRules.loadingMessage}
-/>
+{#if accessToken && refreshToken}
+	<Redirect
+		title={redirectRules.title}
+		description={redirectRules.description}
+		message={redirectRules.message}
+		isSpinner={redirectRules.isSpinner}
+		buttonText={redirectRules.buttonText}
+		buttonClick={redirectRules.buttonClick}
+		loadingMessage={redirectRules.loadingMessage}
+	/>
+{/if}
diff --git a/src/pages/Auth/register-page/RegisterPage.svelte b/src/pages/Auth/register-page/RegisterPage.svelte
@@ -301,7 +301,7 @@
 						on:click={togglePasswordVisibility}
 						class=" border-0 position-absolute eye-icon d-flex align-items-center"
 					>
-						{#if !isPasswordVisible}
+						{#if isPasswordVisible}
 							<img src={eyeShow} alt="eye-show" />
 						{:else}
 							<img src={eyeHide} alt="eye-hie" />
@@ -365,10 +365,10 @@
 				</div>
 			</div>
 
-			<div class="form-group mt-3 d-flex align-item-center" data-tauri-drag-region>
+			<div class="form-group mt-3 d-flex align-items-center" data-tauri-drag-region>
 				<input
 					type="checkbox"
-					class="form-check-input"
+					class="form-check-input mt-0"
 					id="tnsCheckbox"
 					bind:checked={userData.tnsCheckbox}
 					on:input={async () => {

diff --git a/src/pages/Auth/reset-password/ResetPassword.svelte b/src/pages/Auth/reset-password/ResetPassword.svelte
@@ -147,7 +147,7 @@
 					on:click={togglePasswordVisibility}
 					class=" border-0 position-absolute eye-icon d-flex align-items-center"
 				>
-					{#if !isPasswordVisible}
+					{#if isPasswordVisible}
 						<img src={eyeShow} alt="eye-show" />
 					{:else}
 						<img src={eyeHide} alt="eye-hie" />

diff --git a/src/pages/Auth/update-password/UpdatePassword.svelte b/src/pages/Auth/update-password/UpdatePassword.svelte
@@ -220,7 +220,9 @@
 			<div class="sparrow-fs-14 sparrow-fs-300">
 				<p>
 					Please enter the verification code you have received on
-					<span class="sparrow-fw-700 text-whiteColor cursor-pointer">{emailText}</span>
+					<span class="sparrow-fw-700 text-whiteColor cursor-pointer " style="	overflow:hidden;  display: inline-block;
+    word-break: break-all; "> {emailText.slice(0, 100)}
+    {emailText.length > 100 ? '...' : ''}</span>
 				</p>
 				{#if seconds > 0}
 				<div class="d-flex flex-column">