Skip to content

Commit 09da5dd

Browse files
committed
Implement changes after review
1 parent 30962e3 commit 09da5dd

File tree

2 files changed

+32
-27
lines changed

2 files changed

+32
-27
lines changed

apps/frontend/src/app/login/page.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import {setToken} from '@/app/services/login-store'
1717
import { useRouter } from "next/navigation";
1818

1919
type InputFields = {
20-
email?: string
21-
password?: string
20+
email: string
21+
password: string
2222
}
2323

2424
export default function Home() {
@@ -35,11 +35,6 @@ export default function Home() {
3535
};
3636

3737
function submitDetails({email, password}: InputFields): void {
38-
if (!email || email === "" ||
39-
!password || password === ""
40-
) {
41-
return;
42-
}
4338
loginUser(email, password).then(jwt => {
4439
successMessage("Login successful")
4540
setToken(jwt);
@@ -65,12 +60,15 @@ export default function Home() {
6560
>
6661
<Form.Item<InputFields>
6762
name="email"
68-
rules={[{
63+
rules={[
64+
{
6965
required: true,
7066
message: "Please provide your email."
71-
}]}
67+
},
68+
]}
7269
>
7370
<Input
71+
type="email"
7472
placeholder="Email"
7573
/>
7674
</Form.Item>

apps/frontend/src/app/register/page.tsx

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import { createUser } from '@/app/services/user'
1616
import { useRouter } from "next/navigation";
1717

1818
type InputFields = {
19-
username?: string
20-
email?: string
21-
password?: string
22-
confirmPassword?: string
19+
username: string
20+
email: string
21+
password: string
22+
confirmPassword: string
2323
}
2424

2525
export default function Home() {
@@ -36,12 +36,6 @@ export default function Home() {
3636
};
3737

3838
function submitDetails({username, email, password}: InputFields): void {
39-
if (!username || username === "" ||
40-
!email || email === "" ||
41-
!password || password === ""
42-
) {
43-
return;
44-
}
4539
createUser(username, email, password)
4640
.then(() => {
4741
successMessage("Account successfully created")
@@ -68,10 +62,16 @@ export default function Home() {
6862

6963
<Form.Item<InputFields>
7064
name="username"
71-
rules={[{
72-
required: true,
73-
message: "You must provide a username."
74-
}]}
65+
rules={[
66+
{
67+
required: true,
68+
message: "You must provide a username."
69+
},
70+
{
71+
pattern: /^\S+$/,
72+
message: "Please provide a valid username."
73+
},
74+
]}
7575
>
7676
<Input
7777
placeholder="Username"
@@ -80,12 +80,19 @@ export default function Home() {
8080

8181
<Form.Item<InputFields>
8282
name="email"
83-
rules={[{
84-
required: true,
85-
message: "You must provide an email."
86-
}]}
83+
rules={[
84+
{
85+
required: true,
86+
message: "You must provide an email."
87+
},
88+
{
89+
type: "email",
90+
message: "Please provide a valid email address."
91+
},
92+
]}
8793
>
8894
<Input
95+
type="email"
8996
placeholder="Email"
9097
/>
9198
</Form.Item>

0 commit comments

Comments
 (0)