diff --git a/js/components/app-register.js b/js/components/app-register.js
index 823ffb0..7e937f1 100644
--- a/js/components/app-register.js
+++ b/js/components/app-register.js
@@ -15,12 +15,10 @@ const Register = {
@@ -44,16 +42,14 @@ const Register = {
data: () => ({
msg: "",
- username: "",
+ name: "",
email: "",
password: "",
confirmPassword: "",
- gender: null,
- age: "",
showPassword: false,
agreed: false,
- usernameRules: [
+ nameRules: [
v => !!v || "Username is required",
v => v.length >= 3 || "Username must have at least 3 characters"
],
@@ -69,13 +65,6 @@ const Register = {
v => !!v || "Confirm password is required",
v => true // default, updated in watcher
],
- ageRules: [
- v => !!v || "Age is required",
- v => v >= 12 || "You must be at least 12 years old"
- ],
- genderRules: [
- v => !!v || "Gender is required"
- ],
agreeRules: [
v => !!v || "You must agree to the terms and conditions"
]
@@ -99,11 +88,9 @@ const Register = {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
- username: this.username,
+ name: this.name,
email: this.email,
password: this.password,
- age: this.age,
- gender: this.gender,
}),
};
diff --git a/js/components/app-reset-password.js b/js/components/app-reset-password.js
index 43abc18..5d2c961 100644
--- a/js/components/app-reset-password.js
+++ b/js/components/app-reset-password.js
@@ -2,10 +2,8 @@ const Reset = {
inject: ["authState"],
data: () => ({
- email: "",
msg: "",
submitted: false,
- step: 1, // 1: email input, 2: password reset
password: "",
confirmPassword: "",
showPassword: false,
@@ -20,35 +18,6 @@ const Reset = {
}),
methods: {
- logout() {
- if (this.authState) {
- this.authState.isLoggedIn = false;
- this.authState.user = null;
- }
- },
-
- submitEmail() {
- this.msg = "";
- if (!this.email) {
- this.msg = "Please enter your email address.";
- return;
- }
-
- fetch("resources/api_user.php?getAllEmails=true")
- .then((res) => res.json())
- .then((emails) => {
- if (Array.isArray(emails) && emails.includes(this.email)) {
- this.step = 2;
- this.msg = "";
- } else {
- this.msg = "This email is not registered in our system.";
- }
- })
- .catch(() => {
- this.msg = "An error occurred. Please try again later.";
- });
- },
-
submitNewPassword() {
this.msg = "";
if (!this.password || !this.confirmPassword) {
@@ -61,33 +30,36 @@ const Reset = {
return;
}
- // Get user ID based on email, then update password
- fetch(`resources/api_user.php?email=${encodeURIComponent(this.email)}`)
+ const userId = this.authState.user?.id;
+ const token = this.authState.user?.token;
+
+ if (!this.authState.isLoggedIn || !userId || !token) {
+ this.msg = "You must be logged in to reset your password.";
+ return;
+ }
+
+ fetch(`resources/api_user.php/id/${userId}`, {
+ method: "PUT",
+ headers: {
+ "Content-Type": "application/json",
+ Authorization: `Bearer ${token}`,
+ },
+ body: JSON.stringify({ password: this.password }),
+ })
.then((res) => res.json())
- .then((user) => {
- if (!user?.id) {
- this.msg = "User not found.";
- return;
- }
+ .then((data) => {
+ this.submitted = true;
+ this.msg = data?.success
+ ? "Your password has been reset successfully."
+ : data?.error || "An error occurred while resetting your password.";
- fetch(`resources/api_user.php/id/${user.id}`, {
- method: "PUT",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify({ password: this.password }),
- })
- .then((res) => res.json())
- .then((data) => {
- this.submitted = true;
- this.msg = data?.success
- ? "Your password has been reset successfully. You can now log in with your new password."
- : data?.error || "An error occurred while resetting your password.";
- })
- .catch(() => {
- this.msg = "An error occurred while resetting your password.";
- });
+ if (data?.success) {
+ this.authState.isLoggedIn = false;
+ this.authState.user = null;
+ }
})
.catch(() => {
- this.msg = "An error occurred. Please try again later.";
+ this.msg = "An error occurred while resetting your password.";
});
},
@@ -114,29 +86,20 @@ const Reset = {
Password Reset
-
-
-
+
+
+ {{ msg }}
-
-
{{ msg }}
+
+ Back to Login
-
-
- Next
-
+
+
+
+ Please log in to reset your password.
-
+
-
+
Reset Password
-
-
- {{ msg }}
-
-
- Back to Home Page
-
-
@@ -197,4 +152,4 @@ const Reset = {
`,
-};
\ No newline at end of file
+};