diff --git a/src/Components/Forgot_password/ForgotPassword.js b/src/Components/Forgot_password/ForgotPassword.js
index 461ac0d..b88f882 100644
--- a/src/Components/Forgot_password/ForgotPassword.js
+++ b/src/Components/Forgot_password/ForgotPassword.js
@@ -1,5 +1,7 @@
import React, { useState } from "react";
import { useNavigate } from "react-router-dom";
+import { toast } from "react-toastify";
+import { sendPasswordResetEmail } from "firebase/auth";
import {
NewContainer,
FormContainer,
@@ -14,35 +16,49 @@ import {
} from "./ForgotPasswordelements";
import ForgotImg from "../../images/Forgotpassword.webp";
import Footer from "../Footer";
+import { auth } from "../../firebase-config"; // Import your Firebase authentication instance
const GetMail = () => {
const navigate = useNavigate();
const [email, setEmail] = useState();
- const handleContinue = () => {
- if (!email) alert("enter email");
- else navigate("/signin/otpverification");
+
+ const handleContinue = async () => {
+ try {
+ if (!email) {
+ // alert("Please enter your email.");
+ let errorMessage = "Please enter your email";
+ toast.error(errorMessage, {
+ position: "top-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ });
+ return;
+ }
+
+ // Send a password reset email
+ await sendPasswordResetEmail(auth, email);
+
+ // After sending the email, navigate to the OTP verification page
+ navigate("/signin/otpverification");
+ } catch (error) {
+ let errorMessage = "Error sending password reset email. Please try again.";
+ // console.error("Error sending password reset email", error);
+ // alert("Error sending password reset email. Please try again.");
+ toast.error(errorMessage, {
+ position: "top-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ });
+ }
};
+
return (
- // <>
- //
- //
- //
- //
- //
- //
- // >
<>
@@ -50,7 +66,7 @@ const GetMail = () => {
Forgot Password?
- Don't worry, Enter your email to receive the OTP for verification
+ Don't worry, enter your email to receive the OTP for verification
and regain access to your account.
- OTP Verification
- Enter the code sent to your registered E-mail ID
-
+ Check Your Inbox
+ We have sent you a mail for resetting your password.
+ {/*
{Otp.map((data, index) => (
Resend OTP in 00 : {counter}
Resend OTP?
-
+ */}
diff --git a/src/Components/Navbar/index.js b/src/Components/Navbar/index.js
index 631661d..32c7323 100644
--- a/src/Components/Navbar/index.js
+++ b/src/Components/Navbar/index.js
@@ -1,13 +1,7 @@
import React, { useEffect, useState } from "react";
+import { auth } from "../../firebase-config";
import {
- FaAcquisitionsIncorporated,
FaBars,
- FaBox,
- FaClosedCaptioning,
- FaCross,
- FaCrow,
- FaExclamationTriangle,
- FaMicrophoneSlash,
FaRegWindowClose,
} from "react-icons/fa";
import DarkMode from "../DarkMode/DarkMode";
@@ -40,7 +34,17 @@ const glassStyle = {
const Navbar = ({ toggle }) => {
const [isOpen, setIsOpen] = useState(false);
const [navbarBg, setNavbarBg] = useState(glassStyle);
+ const [user, setUser] = useState(null);
+ useEffect(() => {
+ // Add an observer to check for user authentication state changes
+ const unsubscribe = auth.onAuthStateChanged((user) => {
+ setUser(user);
+ });
+
+ // Clean up the observer on component unmount
+ return () => unsubscribe();
+ }, []);
useEffect(() => {
const handleScroll = () => {
const scrolled = window.scrollY;
@@ -147,19 +151,21 @@ const Navbar = ({ toggle }) => {
-
- Sign In
-
- Sign Up
+ Register
- Sign In
- Sign Up
-
-
+ {user ? (
+ // Display user profile/account button when authenticated
+ Account
+ ) : (
+ // Display register button when not authenticated
+ Register
+ )}
+
+
);
diff --git a/src/Components/Signin/SigninElements.js b/src/Components/Signin/SigninElements.js
index 02d2eb0..7853bd4 100644
--- a/src/Components/Signin/SigninElements.js
+++ b/src/Components/Signin/SigninElements.js
@@ -134,7 +134,7 @@ export const Text = styled.span`
//////////////////////// NEW UI ELEMENTS ///////////////////////
export const NewContainer = styled.div`
- width: 100%;
+ /* width: 100%;
height: fit-content;
display: flex;
flex-direction: column;
@@ -146,22 +146,21 @@ export const NewContainer = styled.div`
top: 0;
z-index: 0;
overflow: hidden;
- background: var(--bg-clr);
+ background: var(--bg-clr); */
`;
export const FormContainer = styled.div`
- background-color: #fff;
- box-shadow: 0 0 20px #01bf71;
+ background-color: #fff;
position: relative;
overflow: hidden;
- width: 900px;
+ width: 100%;
max-width: 100%;
- min-height: 550px;
- margin: 3rem auto;
+ height:88vh;
display: flex;
- @media only screen and (max-width:550px){
+ @media only screen and (max-width: 550px) {
flex-direction: column;
margin: 0;
+
}
`;
diff --git a/src/Components/Signin/index.js b/src/Components/Signin/index.js
index ed1b0e0..bfae36e 100644
--- a/src/Components/Signin/index.js
+++ b/src/Components/Signin/index.js
@@ -3,126 +3,18 @@
import React from "react";
import { useNavigate } from "react-router-dom";
// import DarkMode from '../DarkMode/DarkMode';
-import { signInWithPopup } from "firebase/auth";
+import { signInWithRedirect} from "firebase/auth";
import { useState } from "react";
import { NavLink } from "react-router-dom";
import { auth, provider } from "../../firebase-config";
+import { toast } from "react-toastify";
+import {signInWithEmailAndPassword} from 'firebase/auth';
import SignInImg from "../../images/SignIn.webp";
import {
CheckBox,
ForgotPassword,
FormContainer,
- Image
- // Icons,
- // FormButton,
- // FormContent,
- // Form,
- // FormH1,
- // SignInInput,
- // FormLabel,
- // FormWrap,
- // Text,
- ,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Image,
NewContainer,
PasswordContainer,
RememberMe,
@@ -143,6 +35,7 @@ const SignIn = () => {
let authorizationToken;
const [passwordType, setPasswordType] = useState("password");
const [data, setData] = useState({});
+ const [msg, setMsg] = useState("");
const [invalid, setInvalid] = useState(false);
const handleclick = (e) => {
e.preventDefault();
@@ -155,7 +48,7 @@ const SignIn = () => {
const navigateToProfile = () => {
// 👇️ navigate to /contacts
- navigate("/profile");
+ navigate("/");
};
const sendPostRequest = async (e) => {
@@ -164,26 +57,40 @@ const SignIn = () => {
}
console.log("sendPostRequest is called!!!");
e.preventDefault();
- const response = await fetch("https://umatter.onrender.com/SignIn", {
- method: "POST",
- body: JSON.stringify(data),
- headers: {
- "Content-Type": "application/json",
- },
- });
- if (response.status !== 200) {
- setInvalid(true);
+ try {
+ // Sign in with Firebase Authentication
+ await signInWithEmailAndPassword(auth, data.email, data.password);
+ navigateToProfile();
+ // Replace "/" with the actual path of your home page
+ }
+ catch (error) {
+ toast.error(getErrorMessage(error), {
+ position: "top-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ });
}
- const result = await response.json();
- sessionStorage.removeItem("authorizationToken");
- sessionStorage.removeItem("username");
- const { jwtToken, username } = result;
- authorizationToken = "Bearer ".concat(jwtToken.toString());
- sessionStorage.setItem("authorizationToken", authorizationToken);
- sessionStorage.setItem("username", username);
- navigateToProfile();
};
+ const getErrorMessage = (error) => {
+ switch (error.code) {
+ case "auth/invalid-email":
+ return "Invalid email address.";
+ case "auth/user-disabled":
+ return "Your account has been disabled.";
+ case "auth/user-not-found":
+ case "auth/wrong-password":
+ return "Invalid email or password.";
+ default:
+ return "An error occurred while signing in. Please try again.";
+ }
+ };
+
+
const setBack = () => {
setInvalid(false);
return;
@@ -196,7 +103,7 @@ const SignIn = () => {
const showInvalid = () => {
return (
- Invalid Email or Password!
+ {msg}
);
};
@@ -204,110 +111,14 @@ const SignIn = () => {
// Firebase google authentication
const handleGoogleLogin = async () => {
try {
- const user = await signInWithPopup(auth, provider);
- localStorage.setItem("authorizationToken", user.user.accessToken);
- localStorage.setItem("username", user.user.email);
+ await signInWithRedirect(auth, provider);
+ navigateToProfile();
} catch (err) {
console.log(err.message);
}
}
return (
- // <>
- // {/* */}
- //
- // {/* */}
- //
- // {/* */}
- //
- //
- //
-
- //
- //
- //
- // >
-
diff --git a/src/Components/Signup/SignupElements.js b/src/Components/Signup/SignupElements.js
index d2e8c43..b3fa508 100644
--- a/src/Components/Signup/SignupElements.js
+++ b/src/Components/Signup/SignupElements.js
@@ -1,198 +1,12 @@
import styled from "styled-components";
-// import { Link } from "react-router-dom";
-
-////////////// OLD UI ELEMENTS /////////////////////////
-
-// export const Container = styled.div`
-
-// bottom: 0;
-// left: 0;
-// right: 0;
-// top: 0;
-// z-index: 0;
-// overflow: hidden;
-// background:var(--bg-clr);
-// `;
-
-// export const FormWrap = styled.div`
-// min-height: 100vh;
-// display: flex;
-// flex-direction: column;
-// justify-content: center;
-// margin:50px 0;
-
-// @media screen and (max-width: 400px) {
-// height: 100%; /* Change to a percentage-based height */
-// }
-// `;
-
-// export const Icons = styled(Link)`
-// margin-left: 35px;
-// margin-top: 32px;
-// text-decoration: none;
-// color: #fff;
-// font-weight: 700;
-// font-size: 60px;
-
-// @media screen and (max-width: 480px) {
-// margin-left: 16px;
-// margin-top: 8px;
-// }
-// `;
-
-// export const FormContent = styled.div`
-// height: 100%;
-// display:flex;
-// flex-direction: column;
-// justify-content: center;
-
-// @media screen and (max-width: 480px) {
-// padding: 10px;
-// }
-// `;
-// export const FormLabel = styled.label`
-// margin-bottom: 8px;
-// color: #fff;
-// font-size: 1.1rem;
-// font-weight: 600;
-// cursor:pointer;
-// `;
-// export const Form = styled.form`
-// background: linear-gradient(45deg, black, rgb(1, 147, 86) , rgb(10, 201, 122));
-// text-align:center;
-// max-height:680px;
-// max-width: 500px;
-// height: 100%; /* Change to 100% to fill the available height */
-// width: 100%;
-// z-index: 4;
-// margin:auto;
-// margin-top:40px;
-// border-radius: 10px;
-// padding:20px;
-// box-shadow: 1px 2px 10px rgba(0, 0, 0, 0.9);
-
-// @media only screen and (max-width:550px){
-// width:85%;
-// }
-// `;
-
-// export const FormH1 = styled.label`
-// margin-bottom: 10px;
-// color: #fff;
-// font-family:'League Spartan';
-// font-size: 50px;
-// font-weight: 400;
-// text-align: center;
-
-// @media only screen and (max-width:550px){
-// font-size:40px;
-// }
-// @media only screen and (max-width:440px){
-// font-size:30px;
-// }
-
-// `;
-
-// export const FormInput = styled.input`
-
-// font-family: 'Poppins';
-// margin-bottom: 10px; /* Increase margin-bottom for spacing */
-// padding: 10px;
-// border: none;
-// border-radius: 10px;
-// font-size: 18px;
-// border: none;
-// outline: none;
-// width: 100%; /* Add width property to make the input box fill the available width */
-
-// &:nth-of-type(4){
-// width:20%;
-// float:left;
-// }
-// &:nth-of-type(5){
-// width:75%;
-// float:right;
-// }
-
-// @media only screen and (max-width:440px){
-// &:nth-of-type(4){
-// font-size:14px;
-// }
-// }
-// @media only screen and (max-width:400px){
-// font-size:15px;
-// }
-
-// `;
-
-// export const FormButton = styled.button`
-// margin-top: 40px; /* Increase the margin-top value for spacing */
-// background: #01bf71;
-// padding: 16px 0;
-// border: none;
-// border-radius: 12px;
-// color: #fff;
-// font-size: 20px;
-// cursor: pointer;
-// display: flex;
-// justify-content: center; /* Center the button horizontally */
-// align-items: center; /* Center the button vertically */
-// width: 100%; /* Make the button fill the available width */
-// box-sizing: border-box; /* Include padding within the button's width */
-// &:hover {
-// opacity: 0.8;
-// transition: 0.25s ease;
-// }
-
-// font-family:'Poppins';
-// margin-bottom: 0px;
-// padding: 10px;
-// border: none;
-// border-radius: 10px;
-// font-size:18px;
-// border:none;
-// outline:none;
-
-// `;
-
-// export const Text = styled.span`
-// text-align: center;
-
-// margin-top: 15px;
-
-// margin-top: 50px;
-
-// color: #fff;
-// font-size: 14px;
-// `;
-
-///////////////////////////// NEW UI ELEMENTS ////////////////////
-
-export const Container = styled.div`
- width: 100%;
- height: fit-content;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- bottom: 0;
- left: 0;
- right: 0;
- top: 0;
- z-index: 0;
- overflow: hidden;
- background: var(--bg-clr);
-`;
export const FormContainer = styled.div`
background-color: #fff;
- box-shadow: 0 0 20px #01bf71;
position: relative;
overflow: hidden;
- width: 900px;
+ width: 100%;
max-width: 100%;
- min-height: 550px;
- margin: 3rem auto;
+ height:88vh;
display: flex;
@media only screen and (max-width: 550px) {
flex-direction: column;
@@ -220,7 +34,7 @@ export const LeftContainer = styled.div`
justify-content: center;
align-items: center;
background: linear-gradient(147.84deg, #01bf71 8.1%, #00492b 95.42%);
- min-height: 100%;
+ /* min-height: 100%; */
@media only screen and (max-width: 550px) {
width: 100%;
@@ -234,6 +48,7 @@ export const LeftHeading = styled.h1`
font-size: 2rem;
line-height: 3rem;
color: #ffffff;
+ margin-top:20px;
`;
export const LeftPara = styled.p`
diff --git a/src/Components/Signup/index.js b/src/Components/Signup/index.js
index ff6e7e8..f8449b8 100644
--- a/src/Components/Signup/index.js
+++ b/src/Components/Signup/index.js
@@ -1,15 +1,14 @@
/** @format */
import React from "react";
-import { FaUser, FaPhoneAlt } from "react-icons/fa";
+import { FaUser } from "react-icons/fa";
import { MdEmail, MdPassword } from "react-icons/md";
import { BiSolidShow, BiSolidHide } from "react-icons/bi";
-import PhoneInput, {
- formatPhoneNumberIntl,
- isPossiblePhoneNumber,
-} from "react-phone-number-input";
+import { auth } from "../../firebase-config";
+import { createUserWithEmailAndPassword } from "firebase/auth";
+import { toast } from "react-toastify";
import "./PhoneInput.css";
+import { useNavigate } from "react-router-dom";
import {
- Container,
FormContainer,
LeftContainer,
SignUpContainer,
@@ -27,8 +26,6 @@ import {
import { useState } from "react";
import SignUpImg from "../../images/SignUp.webp";
import Captcha from "./Captcha";
-// import DarkMode from "../DarkMode/DarkMode";
-// import Navbar from "../Navbar";
import { NavLink } from "react-router-dom";
const SignUp = () => {
@@ -38,22 +35,7 @@ const SignUp = () => {
const [passwordConfirmType, setConfirmPasswordType] = useState("password");
const [data, setData] = useState({});
const [trackState, setTrackState] = useState(false);
-
-
-
- // Use for internation country code selector
- const [value, setValue] = useState();
-
- const handleOnChangePhoneNumber = (inputValue) => {
- setValue(inputValue);
- const countrySelect = document.querySelector(".PhoneInputCountrySelect");
- const selectedCountryCode = countrySelect.value;
- setData({
- ...data,
- countryCode: selectedCountryCode,
- contactNumber: formatPhoneNumberIntl(inputValue),
- });
- };
+ const navigate = useNavigate();
const handleclick = (e) => {
e.preventDefault();
@@ -72,7 +54,7 @@ const SignUp = () => {
}
};
const validateEmail = (email) => {
- const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+ const emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
return emailRegex.test(email);
};
@@ -92,17 +74,16 @@ const SignUp = () => {
const nameRegex = /[A-Za-z]{3}/;
return nameRegex.test(name);
};
- const validatecontactNumber = (contactNumber) => {
- // name should contains only alphabets
- return isPossiblePhoneNumber(contactNumber);
- };
+ const navigateToProfile = () => {
+ // 👇️ navigate to /contacts
+ navigate("/");
+ };
const handleSubmit = (e) => {
e.preventDefault();
// Validate form inputs
- const { email, username, name, contactNumber, password, confirmpassword } =
- data;
+ const { email, username, name, password, confirmpassword } = data;
if (!email || !validateEmail(email)) {
setMsg("Please enter a valid email address.");
@@ -122,12 +103,6 @@ const SignUp = () => {
return;
}
- if (!contactNumber || !validatecontactNumber(contactNumber)) {
- setMsg("Please enter a contact number/verify once");
- setInvalid(true);
- return;
- }
-
if (!password || !validatePassword(password)) {
setMsg(
"Please enter a password with at least 8 characters including one uppercase letter, one lowercase letter, and one digit."
@@ -153,354 +128,169 @@ const SignUp = () => {
setTimeout(setBack, 5000);
}
- const sendPostRequest = async (e) => {
- console.log("sendPostRequest exicuted!!!");
- const response = await fetch("https://umatter.onrender.com/SignUp", {
- mode: "cors",
- method: "POST",
- body: JSON.stringify(data),
- headers: {
- "Content-Type": "application/json",
- },
- });
- console.log(response);
- const result = await response.json();
- console.log(result);
+ const sendPostRequest = async () => {
+ console.log("sendPostRequest executed!!!");
+ try {
+ // Create user with Firebase Authentication
+ await createUserWithEmailAndPassword(auth, data.email, data.password);
+
+ navigateToProfile();
+ console.log("User created successfully!");
+ } catch (error) {
+ // Handle errors, e.g., email already in use, weak password, etc.
+ let errorMessage = "An error occurred during sign-up.";
+
+ if (error.code === "auth/email-already-in-use") {
+ errorMessage = "Email is already in use. Please use a different email.";
+ } else if (error.code === "auth/weak-password") {
+ errorMessage = "Weak password. Please use a stronger password.";
+ }
+
+ toast.error(errorMessage, {
+ position: "top-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ });
+ }
};
const showInvalid = () => {
return (
-
+
{msg}
);
};
return (
- // <>
- //
- //
- //
- //
- //
- //
- //
- // >
-
-
-
- Welcome!
-
- Sign up to be a part of the community, because UMatter.
-
-
-
-
-
- Create account
+
+
+ Welcome!
+
+ Sign up to be a part of the community, because UMatter.
+
+
+
+
+
+ Create account
+ setData({ ...data, name: e.target.value })}
+ id="FullNameInput"
+ type="text"
+ placeholder="Full Name"
+ aria-label="Full Name"
+ />
+
+
+ setData({ ...data, username: e.target.value })}
+ id="usernameInput"
+ type="text"
+ placeholder="Username"
+ aria-label="Username"
+ />
+
+
+ setData({ ...data, email: e.target.value })}
+ id="emailInput"
+ type="email"
+ placeholder="Email"
+ required
+ aria-label="Email"
+ />
+
+
+
setData({ ...data, name: e.target.value })}
- id="FullNameInput"
- type="text"
- placeholder="Full Name"
- aria-label="Full Name"
+ onChange={(e) => setData({ ...data, password: e.target.value })}
+ id="PasswordInput"
+ type={passwordType}
+ placeholder="Password"
+ aria-label="Password"
/>
-
- setData({ ...data, username: e.target.value })}
- id="usernameInput"
- type="text"
- placeholder="Username"
- aria-label="Username"
- />
-
+ {passwordType === "password" ? (
+
+ ) : (
+
+ )}
+
+
+
setData({ ...data, email: e.target.value })}
- id="emailInput"
- type="email"
- placeholder="Email"
- required
- aria-label="Email"
+ onChange={(e) =>
+ setData({ ...data, confirmpassword: e.target.value })
+ }
+ id="PasswordInput"
+ type={passwordConfirmType}
+ placeholder="Confirm Password"
+ aria-label="Confirm Password"
/>
-
-
-
-
-
- {/*
-
- setData({ ...data, countryCode: e.target.value })
- }
- id="CountryCode"
- type="text"
- placeholder="+XXX"
- >
-
- setData({ ...data, contactNumber: e.target.value })
- }
- id="ContactNumber"
- type="text"
- placeholder="Phone Number"
- maxLength={10}
- >
- */}
-
-
-
- setData({ ...data, password: e.target.value })}
- id="PasswordInput"
- type={passwordType}
- placeholder="Password"
- aria-label="Password"
+ {passwordConfirmType === "password" ? (
+
- {/* {passwordType === "password" ? (
-
- ) : (
-
- )} */}
- {passwordType === "password" ? (
-
- ) : (
-
- )}
-
-
-
-
-
- setData({ ...data, confirmpassword: e.target.value })
- }
- id="PasswordInput"
- type={passwordConfirmType}
- placeholder="Confirm Password"
- aria-label="Confirm Password"
+ ) : (
+
- {/* {passwordConfirmType === "password" ? (
-
- ) : (
-
- )} */}
- {passwordConfirmType === "password" ? (
-
- ) : (
-
- )}
-
-
-
-
-
- Sign Up
-
-
- {invalid && showInvalid()}
-
-
- Signin
-
-
-
-
-
-
+ )}
+
+
+
+
+
+ Sign Up
+
+
+ {invalid && showInvalid()}
+
+
+ Signin
+
+
+
+
);
};
diff --git a/src/firebase-config.js b/src/firebase-config.js
index 5b16943..b2a29a0 100644
--- a/src/firebase-config.js
+++ b/src/firebase-config.js
@@ -1,6 +1,6 @@
// Import the functions you need from the SDKs you need
import { initializeApp } from "firebase/app";
-import { getAuth, GoogleAuthProvider } from "firebase/auth";
+import { getAuth, GoogleAuthProvider} from "firebase/auth";
// TODO: Add SDKs for Firebase products that you want to use
// https://firebase.google.com/docs/web/setup#available-libraries
@@ -8,13 +8,12 @@ import { getAuth, GoogleAuthProvider } from "firebase/auth";
// Your web app's Firebase configuration
// For Firebase JS SDK v7.20.0 and later, measurementId is optional
const firebaseConfig = {
- apiKey: `${process.env.REACT_APP_APIKEYURL}`,
- authDomain: `${process.env.REACT_APP_AUTHDOMAIN}`,
- projectId: `${process.env.REACT_APP_PROJECTID}`,
- storageBucket: `${process.env.REACT_APP_STORAGEBUCKET}`,
- messagingSenderId: `${process.env.REACT_APP_MESSAGEINGSENDERID}`,
- appId: `${process.env.REACT_APP_APIID}`,
- measurementId: `${process.env.REACT_APP_MEASUREMENTID}`,
+ apiKey: `${process.env.apiKey}`,
+ authDomain: `${process.env.authDomain}`,
+ projectId: `${process.env.projectId}`,
+ storageBucket: `${process.env.storageBucket}`,
+ messagingSenderId: `${process.env.messagingSenderId}`,
+ appId: `${process.env.appId}`,
};
// Initialize Firebase
diff --git a/src/index.js b/src/index.js
index 9582f24..e40a2fc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,11 +2,14 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App';
import './index.css';
+import { ToastContainer } from "react-toastify";
+import "react-toastify/dist/ReactToastify.css";
import * as serviceWorkerRegistration from './serviceWorkerRegistration';
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
+
);
diff --git a/src/pages/ForgotPassword.js b/src/pages/ForgotPassword.js
index 4aacd91..0d1649b 100644
--- a/src/pages/ForgotPassword.js
+++ b/src/pages/ForgotPassword.js
@@ -1,12 +1,12 @@
import React from 'react'
-import Forgot_password from '../Components/Forgot_password/OTPVerfication';
+import Forgotpassword from '../Components/Forgot_password/OTPVerfication';
import Footer from '../Components/Footer';
const SigninPage = () => {
return (
-
-
+
+ {/* */}
);
diff --git a/src/pages/signin.js b/src/pages/signin.js
index d1c71da..20f2c7b 100644
--- a/src/pages/signin.js
+++ b/src/pages/signin.js
@@ -1,13 +1,11 @@
import React from 'react'
import SignIn from '../Components/Signin';
-import Footer from '../Components/Footer';
const SigninPage = () => {
return (
-
);
};
diff --git a/src/pages/signup.js b/src/pages/signup.js
index 7d494ef..4f496e9 100644
--- a/src/pages/signup.js
+++ b/src/pages/signup.js
@@ -1,12 +1,10 @@
import React from 'react'
import SignUp from '../Components/Signup';
-import Footer from '../Components/Footer';
const SignupPage = () => {
return (
-
);
};