Skip to content

Commit de73f9c

Browse files
committed
Tiny changes
1 parent 0a866d5 commit de73f9c

3 files changed

Lines changed: 36 additions & 37 deletions

File tree

apps/frontend/src/containers/auth/ConfirmRegisteredPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const ConfirmRegisteredPage: React.FC = () => {
77
const navigate = useNavigate();
88

99
const handleSignIn = () => {
10-
navigate('/');
10+
navigate('/login');
1111
};
1212

1313
return (

apps/frontend/src/containers/auth/ConfirmSentEmailPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const ConfirmSentEmailPage: React.FC = () => {
77
const navigate = useNavigate();
88

99
const handleSignIn = () => {
10-
navigate('/');
10+
navigate('/login');
1111
};
1212

1313
return (

apps/frontend/src/containers/auth/LoginPage.tsx

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ export const LoginPage: React.FC = () => {
9393
e.preventDefault();
9494
setError('');
9595
setIsLoading(true);
96-
console.log('Form submitted');
9796

9897
try {
9998
if (authPage === AuthPage.Login) {
@@ -201,39 +200,41 @@ export const LoginPage: React.FC = () => {
201200
</span>
202201
</div>
203202

204-
<div>
205-
<Label
206-
htmlFor="password"
207-
className="font-semibold mb-1 text-[#404040]"
208-
>
209-
Password
210-
</Label>
211-
<InputGroup
212-
className={`w-full focus-within:border-[#007B64] focus-within:ring-[2.5px] focus-within:ring-[#007B64] py-5 ${
213-
showAuthFieldError
214-
? 'border-[#B4444D] ring-[2px] ring-[#B4444D]'
215-
: ''
216-
}`}
217-
>
218-
<InputGroupInput
219-
id="password"
220-
type={showPassword ? 'text' : 'password'}
221-
value={password}
222-
onChange={(e) => setPassword(e.target.value)}
223-
placeholder="Password"
224-
className={`focus:ring-[#007B64] ${
225-
showAuthFieldError ? 'bg-[#FFFAFA]' : ''
203+
{authPage !== AuthPage.ForgotPassword && (
204+
<div>
205+
<Label
206+
htmlFor="password"
207+
className="font-semibold mb-1 text-[#404040]"
208+
>
209+
Password
210+
</Label>
211+
<InputGroup
212+
className={`w-full focus-within:border-[#007B64] focus-within:ring-[2.5px] focus-within:ring-[#007B64] py-5 ${
213+
showAuthFieldError
214+
? 'border-[#B4444D] ring-[2px] ring-[#B4444D]'
215+
: ''
226216
}`}
227-
/>
228-
<InputGroupAddon
229-
align="inline-end"
230-
className="hover:cursor-pointer"
231-
onClick={() => setShowPassword(!showPassword)}
232217
>
233-
{showPassword ? <EyeIcon /> : <EyeOffIcon />}
234-
</InputGroupAddon>
235-
</InputGroup>
236-
</div>
218+
<InputGroupInput
219+
id="password"
220+
type={showPassword ? 'text' : 'password'}
221+
value={password}
222+
onChange={(e) => setPassword(e.target.value)}
223+
placeholder="Password"
224+
className={`focus:ring-[#007B64] ${
225+
showAuthFieldError ? 'bg-[#FFFAFA]' : ''
226+
}`}
227+
/>
228+
<InputGroupAddon
229+
align="inline-end"
230+
className="hover:cursor-pointer"
231+
onClick={() => setShowPassword(!showPassword)}
232+
>
233+
{showPassword ? <EyeIcon /> : <EyeOffIcon />}
234+
</InputGroupAddon>
235+
</InputGroup>
236+
</div>
237+
)}
237238

238239
{authPage === AuthPage.Signup && (
239240
<div>
@@ -342,9 +343,7 @@ export const LoginPage: React.FC = () => {
342343
: 'bg-[#007B64]'
343344
}`}
344345
disabled={!email || !allCriteriaMet}
345-
onClick={(e) => {
346-
e.preventDefault();
347-
}}
346+
onClick={handleSubmit}
348347
>
349348
Continue
350349
</Button>

0 commit comments

Comments
 (0)