Skip to content

Commit

Permalink
Merge pull request #95 from sparrowapp-dev/fix/fixes-ui-login-issue
Browse files Browse the repository at this point in the history
Fix; fixes UI login issue
  • Loading branch information
Astitva877 authored Dec 18, 2024
2 parents 01926c0 + 9d8885f commit 7f7c4d4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@

<div style="height: 100vh; top:0; left:0;
right:0; z-index:-100 !important" class="w-100 position-fixed">
<img src={SparrowBackgroundV2} alt="" style="height:100%; width:100%; opacity: 0.7">
<img src={SparrowBackgroundV2} alt="" style="height:100%; width:100%;">
</div>
4 changes: 2 additions & 2 deletions src/lib/utils/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ export const entrySchema = yup.object().shape({
.string()
.email()
.matches(
emailRegex,'Please enter a valid Email ID'
emailRegex,'Please enter a valid email address'
)
.required('Please enter a valid Email ID')
.required('Please enter a valid email address')
,
});

Expand Down
3 changes: 1 addition & 2 deletions src/pages/Auth/oauth-redirect/OauthRedirect.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
let data = JSON.parse(window.atob(accessToken?.split('.')[1]));
redirectRules.title = `Welcome ${data.name}`;
redirectRules.description = `Redirecting you to desktop app...`;
redirectRules.message = `If the application does not open automatically,
please click below.`;
redirectRules.message = `the token if you are facing any issue in redirecting to the login page`;
redirectRules.loadingMessage = '';
redirectRules.isSpinner = false;
Expand Down
8 changes: 4 additions & 4 deletions src/pages/Auth/verify-magic-code/VerifyMagicCode.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
let verifyLength: string = '';
let isRegistered = false;
let redirectRules = {
title: 'Welcome to Sparrow!',
title: 'Welcome to Sparrow',
description: 'Bridging Frontend and Backend Development.',
message: `the token if you are facing any issue in redirecting to the login page`,
isSpinner: true,
Expand Down Expand Up @@ -131,7 +131,7 @@
const response = await sendMagicCodeEmail({ email: id });
if (response.isSuccessful) {
showResendSuccess = true;
notifications.success('Verification code sent successfully');
notifications.success('Magic code is sent to your email ID.');
localStorage.setItem(`timer-verify-magic-code-${id}`, new Date().getTime());
startTimer();
verificationCode1 = '';
Expand All @@ -142,7 +142,7 @@
verificationCode6 = '';
onCodeInput();
} else {
if (response.message === 'Cooldown Active') {
if (response.message === 'Cooldown Active') {
navigate('/cool-down-active');
} else {
notifications.error(response.message);
Expand Down Expand Up @@ -265,7 +265,7 @@
>
Welcome!
</p>
<p class="" style="color: lightGray; font-size:14px;">Let’s get you onboard</p>
<p class="" style="color: lightGray; font-size:14px;">Just one more step</p>
</div>

<div class="login-form text-lightGray ps-1 pe-1 gap-16">
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Auth/verify-magic-code/verify-magic-code.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { errorMessageTextMagicCode } from '$lib/store/auth.store';
import type { verifyMagicCodePostBody } from '$lib/utils/dto';
import { writable } from 'svelte/store';

export const isSuccessfulResponseMagicCode = writable(false);
export const isSuccessfulResponseMagicCode = writable(false);

export const handleVerifyUserEmail = async (verifyCodeCredential: verifyMagicCodePostBody) => {

Expand All @@ -18,7 +18,7 @@ export const handleVerifyUserEmail = async (verifyCodeCredential: verifyMagicCod
}

if (response.message === 'Wrong Code') {
errorMessageTextMagicCode.set('Wrong verification code');
errorMessageTextMagicCode.set('Please check the code again');
}
}
return response;
Expand Down

0 comments on commit 7f7c4d4

Please sign in to comment.