Merge pull request #35 from sparrowapp-dev/fix/bugs-from-excel

Fix/bugs from excel
sparrowapp-dev · May 23, 2024 · 0d55781 · 0d55781
2 parents 04d1e37 + 7f51d8e
commit 0d55781
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/src/pages/Auth/entry-point/EntryPoint.svelte b/src/pages/Auth/entry-point/EntryPoint.svelte
@@ -93,7 +93,7 @@
 	>
 		<p class="card-subtitle sparrow-fs-20 sparrow-fw-500 mb-3">Sign In or Create an Account</p>
 		<div class="mb-3">
-			<label for="exampleInputEmail1" class="form-label text-lightGray sparrow-fs-14">Email</label>
+			<label for="exampleInputEmail1" class="form-label text-lightGray sparrow-fs-14 d-flex">Email<p class="ms-1 mb-0 sparrow-fw-600 text-dangerColor">*</p></label>
 			<!-- <img src={starIcon} alt="" class="mb-3" style="width: 7px;" /> -->
 			<input
 				type="email"

diff --git a/src/pages/Auth/forgot-password/ForgotPassword.svelte b/src/pages/Auth/forgot-password/ForgotPassword.svelte
@@ -34,6 +34,7 @@
 			if(!validationErrors?.email){
 				const response  = await handleForgotPassword(forgotPasswordCredential);
 				if (response?.isSuccessful) {
+					localStorage.setItem(`timer-${forgotPasswordCredential.email}`, new Date().getTime());
 					navigate(`/update/password/${forgotPasswordCredential.email}`);
 				} else {
 					if(response.message === "Bad Request"){
@@ -48,9 +49,12 @@
 	>
 		<div class="d-flex flex-column align-items-left justify-content-center mb-2">
 			<div class="d-flex align-items-center justify-content-start mb-3 gap-2">
-				<button class="border-0 bg-transparent font-monospace" style="transform: rotate(-90deg);">
+				<a 
+					class="border-0 bg-transparent font-monospace" style="transform: rotate(-90deg);" 
+					href={`/init`}
+				>
 					<AngleUp color="var(--sparrow-text-color)" height={20} width={20} />
-				</button>
+				</a>
 				<p class="text-whiteColor sparrow-fs-14 sparrow-fw-500 mb-0">Change Password</p>
 			</div>
 			<p class="text-lightGray sparrow-fs-14">

diff --git a/src/pages/Auth/login-page/LoginPage.svelte b/src/pages/Auth/login-page/LoginPage.svelte
@@ -121,7 +121,7 @@
 	>
 		<p class="card-subtitle sparrow-fs-20 sparrow-fw-500 mb-3">Sign In</p>
 		<div class="mb-3">
-			<label for="exampleInputEmail1" class="form-label text-lightGray sparrow-fs-14">Email</label>
+			<label for="exampleInputEmail1" class="form-label text-lightGray sparrow-fs-14 d-flex">Email<p class="ms-1 mb-0 sparrow-fw-600 text-dangerColor">*</p></label>
 			<!-- <img src={starIcon} alt="" class="mb-3" style="width: 7px;" /> -->
 			<input
 				type="email"
@@ -155,7 +155,7 @@
 		</div>
 
 		<div class="mb-4">
-			<label for="exampleInputPassword1" class="form-label text-lightGray sparrow-fs-14">Password</label>
+			<label for="exampleInputPassword1" class="form-label text-lightGray sparrow-fs-14">Password<p class="ms-1 mb-0 sparrow-fw-600 text-dangerColor">*</p></label>
 			<!-- <img src={starIcon} alt="" class="mb-3" style="width: 7px;" /> -->
 			<div class="d-flex position-relative">
 				<input

diff --git a/src/pages/Auth/reset-password/ResetPassword.svelte b/src/pages/Auth/reset-password/ResetPassword.svelte
@@ -74,9 +74,13 @@
 		Welcome to Sparrow!
 	</p>
 	<div class="d-flex align-items-center justify-content-start self-left mb-3 me-auto gap-2">
-		<button class="border-0 bg-transparent font-monospace" style="transform: rotate(-90deg);">
+		<a 
+			class="border-0 bg-transparent font-monospace" 
+			style="transform: rotate(-90deg);"
+			href="/forgot/password"
+		>
 			<AngleUp color="var(--sparrow-text-color)" height={20} width={20} />
-		</button>
+		</a>
 		<p class="text-whiteColor sparrow-fs-14 sparrow-fw-500 mb-0">Reset Password & Sign In</p>
 	</div>
 	<form

diff --git a/src/pages/Auth/update-password/UpdatePassword.svelte b/src/pages/Auth/update-password/UpdatePassword.svelte
@@ -15,7 +15,7 @@
 	import BgContainer from '$lib/components/bgContainer/BgContainer.svelte';
 	export let id: string;
 
-	let seconds = 0;
+	let seconds = 60;
 	const verifyString = writable('');
 	let verifyLength: string = '';
 
@@ -200,9 +200,13 @@
 	<div class="login-form text-lightGray ps-1 pe-1 gap-16">
 		<div class="d-flex flex-column align-items-left mb-2">
 			<div class="d-flex align-items-center justify-content-start mb-3 gap-2">
-				<button class="border-0 bg-transparent font-monospace" style="transform: rotate(-90deg);">
+				<a 
+					class="border-0 bg-transparent font-monospace" 
+					style="transform: rotate(-90deg);"
+					href="/forgot/password"
+				>
 					<AngleUp color="var(--sparrow-text-color)" height={20} width={20} />
-				</button>
+				</a>
 				<p class="text-whiteColor sparrow-fs-14 sparrow-fw-500 mb-0">Change Password</p>
 			</div>