diff --git a/src/controllers/auth.js b/src/controllers/auth.js
index 3527673..124c513 100644
--- a/src/controllers/auth.js
+++ b/src/controllers/auth.js
@@ -45,10 +45,10 @@ export function createAuthController() {
}
}
- async function insertPhone(data) {
+ async function insertEmail(data) {
try {
setLoading(true);
- const response = await authRepository.insertPhone(data, getToken);
+ const response = await authRepository.insertEmail(data, getToken);
setToken(response.token);
setUserData(jwtDecode(response.token));
return true;
@@ -61,10 +61,10 @@ export function createAuthController() {
}
}
- async function confirmPhone(data) {
+ async function confirmEmail(data) {
try {
setLoading(true);
- const response = await authRepository.confirmPhone(data, getToken);
+ const response = await authRepository.confirmEmail(data, getToken);
setToken(response.token);
setUserData(jwtDecode(response.token));
return true;
@@ -107,9 +107,9 @@ export function createAuthController() {
return {
login,
register,
- confirmPhone,
+ confirmEmail,
fetchUserData,
- insertPhone,
+ insertEmail,
resendCode,
loading
};
diff --git a/src/helpers/ProtectedRoute.jsx b/src/helpers/ProtectedRoute.jsx
index 4f195d0..b0c9509 100644
--- a/src/helpers/ProtectedRoute.jsx
+++ b/src/helpers/ProtectedRoute.jsx
@@ -13,7 +13,7 @@ export default function ProtectedRoute() {
const location = useLocation();
if (!token || !userData) return ;
- if (userData.fgPhoneVerified !== 3) return ;
+ if (userData.fgEmailVerified !== 3) return ;
const userTasks = userData.tasks || [];
const currentTaskId = userTasks[userTasks.length - 1];
diff --git a/src/helpers/Routes.jsx b/src/helpers/Routes.jsx
index c3374e5..3d72722 100644
--- a/src/helpers/Routes.jsx
+++ b/src/helpers/Routes.jsx
@@ -2,7 +2,7 @@ import {createBrowserRouter} from "react-router-dom";
import Frame from "@components/common/Frame";
import ProtectedRoute from "./ProtectedRoute";
-import {Home, Map, Wordle, Register, ConfirmPhone, Login, Phrase, Quiz, Memory} from "../pages";
+import {Home, Map, Wordle, Register, ConfirmEmail, Login, Phrase, Quiz, Memory} from "../pages";
const routes = createBrowserRouter([
{
@@ -12,7 +12,7 @@ const routes = createBrowserRouter([
{path: "/", element: },
{path: "/register", element: },
{path: "/login", element: },
- {path: "/confirm-phone", element: },
+ {path: "/confirm-email", element: },
{
element: ,
children: [
diff --git a/src/pages/Auth/ConfirmPhone/index.jsx b/src/pages/Auth/ConfirmPhone/index.jsx
index 0a502a1..cfa8c2a 100644
--- a/src/pages/Auth/ConfirmPhone/index.jsx
+++ b/src/pages/Auth/ConfirmPhone/index.jsx
@@ -7,16 +7,16 @@ import {useAuthStore} from "@stores/useAuth";
import Button from "@components/common/Button";
import {createAuthController} from "@controllers/auth";
import SoftExtendedLogo from "../../../assets/SoftExtendedLogo.png";
-import {formatPhone, unformatPhone, validatePhone} from "@components/common/Input/validTypes";
+import {formatPhone, unformatPhone, validateEmail, validatePhone} from "@components/common/Input/validTypes";
import styles from "../style.module.css";
-function ConfirmPhone() {
+function ConfirmEmail() {
const navigate = useNavigate();
- const {insertPhone, confirmPhone, resendCode} = createAuthController();
+ const {insertEmail, confirmEmail, resendCode} = createAuthController();
- const [step, setStep] = useState("phone");
- const [phone, setPhone] = useState("");
+ const [step, setStep] = useState("email");
+ const [email, setEmail] = useState("");
const [code, setCode] = useState("");
const [wasSubmitted, setWasSubmitted] = useState(false);
const [showError, setShowError] = useState(false);
@@ -26,15 +26,14 @@ function ConfirmPhone() {
const userData = useAuthStore((state) => state.userData);
- const handlePhoneChange = (e) => {
- const formattedPhone = formatPhone(e.target.value);
- setPhone(formattedPhone);
+ const handleEmailChange = (e) => {
+ setEmail(e);
};
- const handlePhoneSubmit = async () => {
- if (validatePhone(phone)) {
- const cleanPhone = unformatPhone(phone);
- const response = await insertPhone({phone: cleanPhone});
+ const handleEmailSubmit = async () => {
+ if (validateEmail(email)) {
+
+ const response = await insertEmail({email: email});
if (response) {
setStep("code");
@@ -52,7 +51,7 @@ function ConfirmPhone() {
const handleCodeSubmit = async () => {
setWasSubmitted(true);
- const response = await confirmPhone({code});
+ const response = await confirmEmail({code});
if (response) {
setIsCorrect(true);
setButtonLabel(":)");
@@ -79,9 +78,9 @@ function ConfirmPhone() {
}, [resendTimer]);
useEffect(() => {
- if (userData.fgPhoneVerified === 1) {
- setStep("phone");
- } else if (userData.fgPhoneVerified === 2) {
+ if (userData.fgEmailVerified === 1) {
+ setStep("email");
+ } else if (userData.fgEmailVerified === 2) {
setStep("code");
}
}, [userData]);
@@ -90,16 +89,16 @@ function ConfirmPhone() {