Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge V0.1.4 to main #18

Merged
merged 2 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { BrowserRouter, Routes, Route, useNavigate } from 'react-router-dom';
import { CssBaseline } from '@mui/material';
import LanguageSelect from './components/LanguageSelect';
import Signup from './components/Signup';
import Login from './components/Login';
import Home from './components/Home';
import Upload from './components/Upload';
Expand Down Expand Up @@ -48,6 +49,7 @@ const App = () => {
<BrowserRouter>
<Routes>
<Route path="/" element={<LanguageSelect />} />
<Route path="/signup" element={<Signup />} />
{/* <Route path="/login" element={<Login />} /> */}
<Route path="/home" element={<PrivateRoute><Home /></PrivateRoute>} />
<Route path="/upload" element={<PrivateRoute><Upload /></PrivateRoute>} />
Expand Down
4 changes: 3 additions & 1 deletion src/components/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useState } from "react";
import { useLocation } from "react-router-dom";
import {
AppBar,
Toolbar,
Expand All @@ -12,6 +13,7 @@ import SlideMenu from "./SlideMenu";
const Header = () => {
// Define the state to store selected language
const [language, setLanguage] = useState("EN");
const shouldShowSlideMenu = location.pathname !== "/signup";

const handleLanguageChange = (event) => {
setLanguage(event.target.value);
Expand All @@ -26,7 +28,7 @@ const Header = () => {
>
<Toolbar>
{/* Menu */}
<SlideMenu/>
{shouldShowSlideMenu && <SlideMenu />}

{/* E-Wallet Title */}
<Typography
Expand Down
11 changes: 10 additions & 1 deletion src/components/LanguageSelect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,19 @@ const LanguageSelect = () => {
fullWidth
size="large"
onClick={handleLogin}
sx={{ borderRadius: 7 }}
sx={{ borderRadius: 7,fontFamily: "Poppins, sans-serif",bgcolor: "#121943" }}
>
Log In to E-Wallet
</Button>
<Button
variant="outlined"
fullWidth
size="large"
onClick={()=> navigate("/signup")}
sx={{ borderRadius: 7,bgcolor:'white',fontFamily: "Poppins, sans-serif",color:"#121943",mt:2,mb:5 }}
>
Register
</Button>
</Paper>
</Box>
);
Expand Down
266 changes: 266 additions & 0 deletions src/components/Signup.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
import React, { useState, useEffect } from "react";
import { useNavigate } from "react-router-dom";
import axios from "axios";
import {
Box,
Paper,
Typography,
AppBar,
Button,
TextField,
Toolbar,
IconButton,
Container,
FormHelperText,
} from "@mui/material";
import ArrowBackIcon from "@mui/icons-material/ArrowBack";
import { MuiOtpInput } from "mui-one-time-password-input";
import Header from "./Header";

const Signup = () => {
const navigate = useNavigate();
const [firstName, setFirstName] = useState("");
const [lastName, setLastName] = useState("");
const [phone, setPhone] = useState("");
const [otp, setOtp] = useState("");
const [timer, setTimer] = useState(0);
const [showOtpSection, setShowOtpSection] = useState(false);
const [error, setError] = useState({ phone: "", otp: "" });
const [tokens, setTokens] = useState(""); // Store the token received from the API
const apiURL= import.meta.env.VITE_APP_API_URL;

// Timer countdown logic
useEffect(() => {
if (timer === 0) return;

const interval = setInterval(() => {
setTimer((prevTime) => prevTime - 1);
}, 1000);

return () => clearInterval(interval);
}, [timer]);

const formatTime = (time) => {
const minutes = Math.floor(time / 60);
const seconds = time % 60;
return `${minutes < 10 ? `0${minutes}` : minutes}:${seconds < 10 ? `0${seconds}` : seconds}`;
};

const validatePhoneNumber = (phoneNumber) => {
const regex = /^\d{10}$/;
if (phoneNumber === "" || !regex.test(phoneNumber)) {
setError((prevState) => ({
...prevState,
phone: "Please enter a valid 10-digit phone number.",
}));
} else {
setError((prevState) => ({ ...prevState, phone: "" }));
}
};

const handlePhoneChange = (e) => {
const value = e.target.value;
setPhone(value);
validatePhoneNumber(value);
};

const handleOtpChange = (newOtp) => {
setOtp(newOtp);
if (newOtp.length !== 6) {
setError((prevState) => ({
...prevState,
otp: "OTP must be exactly 6 digits.",
}));
} else {
setError((prevState) => ({ ...prevState, otp: "" }));
}
};

const handleProceed = async () => {
if (!phone || error.phone) return;

try {
const response = await axios.post(`${apiURL}/otp/send_otp`, {
phone_number: `+91-${phone}`,
});

setTokens(response.data.data.token); // Save the token for OTP verification
setShowOtpSection(true);
setTimer(300); // Start 5-minute timer
} catch (err) {
setError((prevState) => ({
...prevState,
phone: err.response?.data?.message || "Failed to send OTP.",
}));
}
};

const handleResendOtp = async () => {
try {
const response = await axios.post(`${apiURL}/otp/send_otp`, {
phone_number: `+91-${phone}`,
});

setTokens(response.data.data.token); // Save the token again
setOtp("");
setTimer(300); // Reset timer
} catch (err) {
setError((prevState) => ({
...prevState,
phone: err.response?.data?.message || "Failed to resend OTP.",
}));
}
};

const handleSignUp = async () => {
if (!otp || error.otp) return;

try {
// First, verify the OTP
const otpResponse = await axios.post(`${apiURL}/otp/verify_otp`, {
phone_number: `+91-${phone}`,
otp: Number(otp),
token: tokens,
});

// If OTP is verified successfully, proceed to register the user
if (otpResponse?.data?.statusCode === 200) {
const registrationResponse = await axios.post(`${apiURL}/auth/register`, {
firstName: firstName,
lastName: lastName,
phoneNumber: phone,
});

// If registration is successful, navigate to the login page
if (registrationResponse?.data?.statusCode === 200) {
navigate("/");
} else {
// Handle registration failure (optional)
setError((prevState) => ({
...prevState,
otp: registrationResponse?.data?.message || "Registration failed. Please try again.",
}));
}
} else {
setError((prevState) => ({
...prevState,
otp: otpResponse?.data?.message || "Invalid OTP. Please try again.",
}));
}
} catch (err) {
// Handle any other errors (network issues, etc.)
setError((prevState) => ({
...prevState,
otp: err.response?.data?.message || "An error occurred. Please try again.",
}));
}
};

return (
<Box sx={{ minHeight: "100vh", bgcolor: "background.default" }}>
<AppBar position="static" color="transparent" elevation={0}>
<Header/>
<Toolbar>
<IconButton edge="start" onClick={() => navigate(-1)}>
<ArrowBackIcon />
</IconButton>
<Typography variant="h6" sx={{ ml: 2, fontFamily: "Poppins, sans-serif" }}>
Register
</Typography>
</Toolbar>
</AppBar>

<Container maxWidth="sm" sx={{ pt: 4 }}>
<Paper sx={{ p: 3, borderRadius: 2 }}>
<TextField
fullWidth
label="First Name"
value={firstName}
onChange={(e) => setFirstName(e.target.value)}
sx={{ mb: 2 }}
/>
<TextField
fullWidth
label="Last Name"
value={lastName}
onChange={(e) => setLastName(e.target.value)}
sx={{ mb: 2 }}
/>
<TextField
fullWidth
label="Mobile Number"
value={phone}
onChange={handlePhoneChange}
sx={{ mb: 2 }}
error={Boolean(error.phone)}
helperText={error.phone}
inputProps={{
maxLength: 10,
}}
/>

{!showOtpSection && (
<Button
variant="contained"
fullWidth
size="large"
sx={{ borderRadius: 7, fontFamily: "Poppins, sans-serif" }}
onClick={handleProceed}
disabled={!phone || Boolean(error.phone)}
>
Proceed
</Button>
)}

{showOtpSection && (
<>
<Typography variant="subtitle1" sx={{ fontFamily: "Poppins, sans-serif", mb: 2 }}>
Enter the 6-digit OTP sent via SMS
</Typography>
<MuiOtpInput
value={otp}
onChange={handleOtpChange}
length={6}
separator="-"
sx={{ mb: 3 }}
/>
{error.otp && (
<FormHelperText error sx={{ mb: 2 }}>
{error.otp}
</FormHelperText>
)}
<Typography variant="body2" color="text.secondary" sx={{ mb: 3, fontFamily: "Poppins, sans-serif" }}>
Resend OTP in {formatTime(timer)}
<Button onClick={handleResendOtp} sx={{ p: 0, ml: 1, fontFamily: "Poppins, sans-serif" }}>
Resend
</Button>
</Typography>
<Button
variant="contained"
fullWidth
size="large"
sx={{ borderRadius: 7 }}
onClick={handleSignUp}
disabled={Boolean(error.otp) || !otp || otp.length !== 6}
>
Sign Up
</Button>
</>
)}
</Paper>

<Typography variant="body2" align="center" sx={{ mt: 3, fontFamily: "Poppins, sans-serif" }}>
Already signed up?
<Button
onClick={() => navigate("/")}
sx={{ textTransform: "none", fontSize: "inherit" }}
>
Login
</Button>
</Typography>
</Container>
</Box>
);
};

export default Signup;