diff --git a/client/src/App.js b/client/src/App.js
index a62279e..d7b381f 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -1,27 +1,24 @@
-import React, { createContext, useReducer } from "react";
+import React from "react";
import { BrowserRouter as Router, Route } from "react-router-dom";
import "bootstrap/dist/css/bootstrap.min.css";
import "./App.css";
-import StudentSigin from "./components/Screens/Signin/StudentSignin";
+import StudentSignin from "./components/Screens/Signin/StudentSignin";
import AdminSignin from "./components/Screens/Signin/AdminSigin";
import StudentSignup from "./components/Screens/Signup/StudentSignup";
import AdminSignup from "./components/Screens/Signup/AdminSignup";
+import AdminOTP from "./components/Screens/AdminOTP/AdminOtp";
import Footer from "../src/components/footer";
import Header from "../src/components/header";
-import HomePage from "../src/components/Screens/HomeScreen/HomePage";
+import HomePage from "../src/components/Screens/HomeScreen/HomePage";
+import StudentOTP from "./components/Screens/StudentOTP/StudentOTP";
import home from "./components/home";
import about from "./components/about";
import contact from "./components/contact";
import myshelf from "./components/myshelf";
-import { initialState, reducer } from "./reducer/UseReducer";
-
-// crete context
-export const userContext = createContext();
-
const sections = [
{ title: "Technology", url: "#" },
{ title: "Design", url: "#" },
@@ -36,24 +33,24 @@ const sections = [
];
function App() {
- const [state, dispatch] = useReducer(reducer, initialState);
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
}
diff --git a/client/src/components/Screens/AdminOTP/AdminOtp.js b/client/src/components/Screens/AdminOTP/AdminOtp.js
new file mode 100644
index 0000000..3b82e40
--- /dev/null
+++ b/client/src/components/Screens/AdminOTP/AdminOtp.js
@@ -0,0 +1,222 @@
+import React, { useState, useEffect } from "react";
+import { useHistory } from "react-router-dom";
+import Avatar from "@material-ui/core/Avatar";
+import Button from "@material-ui/core/Button";
+import CssBaseline from "@material-ui/core/CssBaseline";
+import TextField from "@material-ui/core/TextField";
+import Link from "@material-ui/core/Link";
+import Paper from "@material-ui/core/Paper";
+import Box from "@material-ui/core/Box";
+import Grid from "@material-ui/core/Grid";
+import LockOutlinedIcon from "@material-ui/icons/LockOutlined";
+import Typography from "@material-ui/core/Typography";
+import { makeStyles } from "@material-ui/core/styles";
+import { toast } from "react-toastify";
+import "react-toastify/dist/ReactToastify.css";
+require('dotenv').config()
+
+
+const jwt = require("jsonwebtoken");
+// import LoadingScreen from "../LoadingScreen/LoadingScreen";
+toast.configure();
+
+function sleep(time) {
+ return new Promise((resolve) => setTimeout(resolve, time));
+}
+function Copyright() {
+ return (
+
+ {"Copyright © "}
+
+ Library
+ {" "}
+ {new Date().getFullYear()}
+ {"."}
+
+ );
+}
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ height: "100vh",
+ },
+ image: {
+ backgroundImage: "url(/images/img.jpg)",
+ backgroundRepeat: "no-repeat",
+ backgroundColor:
+ theme.palette.type === "light"
+ ? theme.palette.grey[50]
+ : theme.palette.grey[900],
+ backgroundSize: "cover",
+ backgroundPosition: "center",
+ },
+ paper: {
+ margin: theme.spacing(8, 4),
+ display: "flex",
+ flexDirection: "column",
+ alignItems: "center",
+ },
+ avatar: {
+ margin: theme.spacing(1),
+ backgroundColor: theme.palette.secondary.main,
+ },
+ form: {
+ width: "100%", // Fix IE 11 issue.
+ marginTop: theme.spacing(1),
+ },
+ submit: {
+ margin: theme.spacing(3, 0, 2),
+ },
+}));
+
+export default function AdminOTP() {
+ const classes = useStyles();
+ const [otp, setOtp] = useState("");
+ const [id, setid] = useState("");
+ const history = useHistory();
+
+ const [loading, setLoading] = useState(true);
+ useEffect(() => {
+ try {
+ setLoading(true);
+ // toast.success("uieuri");
+ // const token=localStorage.getItem("Studenttoken");
+ // toast.success(token);
+ const decoded_token = jwt.verify(
+ localStorage.getItem("Admintoken"),
+ process.env.REACT_APP_JWT_SECRET
+ );
+ toast.error(decoded_token._id);
+ setid(decoded_token._id);
+ // toast.success(id);
+ fetch("http://localhost:3001/api/admin/verifyadmin", {
+ method: "post",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ id: decoded_token._id,
+ }),
+ })
+ .then((res) => res.json())
+ .then((result) => {
+ setLoading(false);
+ if (result.isverified) {
+
+ history.push("/");
+ }
+ });
+ } catch (err) {
+ toast.error("error");
+ setLoading(false);
+ // history.push("/signin");
+ }
+ }, []);
+
+ const submitHandler = () => {
+
+ if (otp === "") {
+ console.log("Please enter otp");
+ } else {
+ fetch("http://localhost:3001/api/admin/adminotp", {
+ method: "post",
+ headers: {
+ "Content-Type": "application/json",
+ authorization: "Bearer " + localStorage.getItem("jwt"),
+ },
+ body: JSON.stringify({
+ otp: otp,
+ timestamp: Date.now(),
+ id: id,
+ }),
+ })
+ .then((res) => res.json())
+ .then((result) => {
+
+ if (result.message === "Valid OTP...Admin Authenticated") {
+ toast.success("Sweet !", {
+ position: toast.POSITION.TOP_CENTER,
+ autoClose: 1500,
+ });
+ sleep(2000).then(() => {
+ history.push("/");
+ window.location.reload(false);
+ });
+ } else {
+ toast.warning(result.message, {
+ position: toast.POSITION.TOP_CENTER,
+ autoClose: 2000,
+ });
+ }
+ });
+ }
+ };
+ return (
+ <>
+ {}
+
+ { (
+
+
+
+
+
+
+
+
+
+ Student OTP
+
+
+
+
+
+
+
+ Student OTP
+
+
+
Welcome to Online Library...
+ You are just one step away from verifying your email.
+ Your OTP is: ${OTP}
.
Just Enter this OTP on the email verification screen`,
+ });
+
+ const updateOtp = await Admin.findOneAndUpdate(
+ { _id: admin._id },
+ { otp: { otpCode: OTP, timeStamp: Date.now() } },
+ function (err, res) {
+ if (err) {
+ console.log(err);
+ } else {
+ console.log(
+ req.body.email + " OTP updation success with OTP: " + OTP
+ );
+ }
+ }
+ );
}
- else
- {
- console.log("Invalid Password");
- res.send({
- message: "Invalid email or password",
-
- });
- // window.location.reload();
- }
- } else {
- console.log("Invalid Email");
+ const token = jwt.sign({ _id: admin._id }, process.env.JWT_SECRET, {
+ expiresIn: "28d",
+ });
+ return res.send({
+ _id: admin._id,
+ firstName: admin.firstName,
+ lastName: admin.lastName,
+ email:admin.email,
+ message: "Success",
+ isAuthenticated:admin.isAuthenticated,
+ token: token,
+ });
+ } else {
+ console.log("Invalid Password");
res.send({
- message: "Invalid email or password",
+ message: "Invalid email or password",
});
// window.location.reload();
+ }
+ } else {
+ console.log("Invalid Email");
+ res.send({
+ message: "Invalid email or password",
+ });
+ // window.location.reload();
}
+ })
+);
-}));
+adminRoute.post("/alladmins", (req, res) => {
+ Admin.find({}).exec((err, admins) => {
+ if (err) {
+ return res.status(422).json({ error: err });
+ }
+ return res.json({ admins });
+ });
+});
-adminRoute.post("/signup",
-expressAsynchandler(async(req,res)=>{
- console.log(req.body.email + " admin requested to register");
+adminRoute.post(
+ "/signup",
+ expressAsynchandler(async (req, res) => {
+ console.log(req.body.email + " requested to register");
const admin = await Admin.findOne({ email: req.body.email });
- if(admin)
- {
- console.log(req.body.email+" admin already registered ");
- res.send({
- message:"Email Already Registered"
- });
+ if (admin) {
+ console.log(req.body.email + " already registered ");
+ res.send({
+ message: "Email Already Registered",
+ });
+ } else {
+ var digits = "0123456789";
+ let OTP = "";
+ for (let i = 0; i < 6; i++) {
+ OTP += digits[Math.floor(Math.random() * 10)];
+ }
+
+ const transporter = nodemailer.createTransport(
+ sendgridTransport({
+ auth: {
+ api_key: process.env.SEND_GRID,
+ },
+ })
+ );
+
+ transporter.sendMail({
+ to: req.body.email,
+ from: process.env.COMPANY_EMAIL,
+ subject: "VERIFY OTP",
+ html: `Welcome to Online Library...
You are just one step away from verifying your email.
+ // Your OTP is ${OTP}. Just Enter this OTP on the email verification screen`,
+ });
+ // var digits = "0123456789";
+ // let OTP = "";
+ // for (let i = 0; i < 6; i++) {
+ // OTP += digits[Math.floor(Math.random() * 10)];
+ // }
+
+ // const transporter=nodemailer.createTransport(
+ // sendgridTransport({
+ // auth:
+ // })
+ // )
+
+ const user = new Admin({
+ firstName: req.body.firstName,
+ lastName: req.body.lastName,
+ email: req.body.email,
+ password: bcrypt.hashSync(req.body.password, 8),
+ contactNo: req.body.contactNo,
+ otp: { otpCode: OTP, timeStamp: Date.now() },
+ isAuthenticated: false,
+ });
+
+ console.log(user.firstName);
+ console.log(user.email);
+ console.log(user.lastName);
+ console.log(user.password);
+ console.log(user.contactNo);
+ console.log(user.otp.OTP);
+
+ const creatstudent = await user.save();
+
+ console.log(req.body.email + " admin created");
+
+ res.status(200).send({
+ firstName: user.firstName,
+ lastName: user.lastName,
+ email: user.email,
+ contactNo: user.contactNo,
+ message: "Success",
+ });
}
- else{
-
- // var digits = "0123456789";
- // let OTP = "";
- // for (let i = 0; i < 6; i++) {
- // OTP += digits[Math.floor(Math.random() * 10)];
- // }
-
- // const transporter=nodemailer.createTransport(
- // sendgridTransport({
- // auth:
- // })
- // )
-
-
- const user=new Admin({
- firstName:req.body.firstName,
- lastName:req.body.lastName,
- email:req.body.email,
- password: bcrypt.hashSync(req.body.password, 8),
- contactNo:req.body.contactNo
+ })
+);
+
+adminRoute.post(
+ "/verifyadmin",
+ expressAsynchandler(async (req, res) => {
+
+ console.log(req.body.id);
+ const admin = await Admin.findById(req.body.id);
+ return res.status(200).send({ isverified:admin.isAuthenticated});
+ })
+);
+
+adminRoute.post(
+ "/adminotp",
+ expressAsynchandler(async (req, res) => {
+ console.log(req.body.otp);
+ const admin = await Admin.findById(req.body.id);
+ if ((req.body.timestamp - admin.otp.timeStamp) / (1000 * 60) > 5) {
+ res.status(401).send({ message: "OTP Expired" });
+ } else {
+ if (req.body.otp === admin.otp.otpCode) {
+ await Admin.findByIdAndUpdate(req.body.id, {
+ isAuthenticated: true,
});
-
- console.log(user.firstName);
- console.log(user.email);
- console.log(user.lastName);
- console.log(user.password);
- console.log(user.contactNo);
-
- const creatstudent=await user.save();
-
- console.log(req.body.email + " admin created");
-
res.status(200).send({
- firstName:user.firstName,
- lastName:user.lastName,
- email:user.email,
- contactNo:user.contactNo,
- message:"Success"
+ message: "Valid OTP...User Authenticated",
+ token: admin.token,
});
+ } else {
+ res.status(401).send({ message: "Invalid OTP" });
+ }
}
-}));
+ })
+);
-module.exports = adminRoute;
\ No newline at end of file
+module.exports = adminRoute;
diff --git a/server/router/StudentRoute.js b/server/router/StudentRoute.js
index 4d592a1..7bdf3e6 100644
--- a/server/router/StudentRoute.js
+++ b/server/router/StudentRoute.js
@@ -1,16 +1,15 @@
const express = require("express");
const expressAsynchandler = require("express-async-handler");
+const jwt = require("jsonwebtoken");
+const nodemailer = require("nodemailer");
+const sendgridTransport = require("nodemailer-sendgrid-transport");
const bcrypt = require("bcryptjs");
const Student = require("../model/database/Student");
-const jwt = require("jsonwebtoken");
+const middleware = require("../middleware/middleware");
const studentRoute = express.Router();
-
-
-
studentRoute.post(
"/signin",
expressAsynchandler(async (req, res) => {
- let token;
console.log(req.body.email);
if (!req.body.email) {
return res.send({ message: "Please Enter email id" });
@@ -26,17 +25,58 @@ studentRoute.post(
console.log(req.body.email + " signin found in database");
if (bcrypt.compareSync(req.body.password, student.password)) {
- // generating token for student
- token = await student.generateAuthToken();
- res.cookie("jwtoken", token, {
- expires:new Date(Date.now() + 25892000000),
- httpOnly:true
- });
+
+ if (!student.isAuthenticated) {
+ console.log(req.body.email + " password valid");
+ //GENERATING A 6 DIGIT OTP
+ var digits = "0123456789";
+ let OTP = "";
+ for (let i = 0; i <6; i++) {
+ OTP += digits[Math.floor(Math.random() * 10)];
+ }
+
+ const transporter = nodemailer.createTransport(
+ sendgridTransport({
+ auth: {
+ api_key: process.env.SEND_GRID,
+ },
+ })
+ );
+
+ transporter.sendMail({
+ to: req.body.email,
+ from: process.env.COMPANY_EMAIL,
+ subject: "VERIFY ONLINE LIBRARY OTP",
+ html: `Welcome to Online Library...
+ You are just one step away from verifying your email.
+ Your OTP is: ${OTP}
.
Just Enter this OTP on the email verification screen`,
+ });
+
+ const updateOtp = await Student.findOneAndUpdate(
+ { _id: student._id },
+ { otp: { otpCode: OTP, timeStamp: Date.now() } },
+ function (err, res) {
+ if (err) {
+ console.log(err);
+ } else {
+ console.log(
+ req.body.email + " OTP updation success with OTP: " + OTP
+ );
+ }
+ }
+ );
+ }
+ const token = jwt.sign({ _id: student._id }, process.env.JWT_SECRET, {
+ expiresIn: "28d",
+ });
return res.send({
+ _id: student._id,
firstName: student.firstName,
lastName: student.lastName,
email: student.email,
message: "Success",
+ isAuthenticated: student.isAuthenticated,
+ token: token,
});
} else {
console.log("Invalid Password");
@@ -55,6 +95,15 @@ studentRoute.post(
})
);
+studentRoute.post("/allstudents", (req, res) => {
+ Student.find({}).exec((err, students) => {
+ if (err) {
+ return res.status(422).json({ error: err });
+ }
+ return res.json({ students });
+ });
+});
+
studentRoute.post(
"/signup",
@@ -69,6 +118,27 @@ studentRoute.post(
message: "Email Already Registered",
});
} else {
+ var digits = "0123456789";
+ let OTP = "";
+ for (let i = 0; i < 6; i++) {
+ OTP += digits[Math.floor(Math.random() * 10)];
+ }
+
+ const transporter = nodemailer.createTransport(
+ sendgridTransport({
+ auth: {
+ api_key: process.env.SEND_GRID,
+ },
+ })
+ );
+
+ transporter.sendMail({
+ to: req.body.email,
+ from: process.env.COMPANY_EMAIL,
+ subject: "VERIFY OTP",
+ html: `Welcome to Online Library...
You are just one step away from verifying your email.
+ // Your OTP is ${OTP}. Just Enter this OTP on the email verification screen`,
+ });
// var digits = "0123456789";
// let OTP = "";
// for (let i = 0; i < 6; i++) {
@@ -87,6 +157,8 @@ studentRoute.post(
email: req.body.email,
password: bcrypt.hashSync(req.body.password, 8),
contactNo: req.body.contactNo,
+ otp: { otpCode: OTP, timeStamp: Date.now() },
+ isAuthenticated: false,
});
console.log(user.firstName);
@@ -94,6 +166,7 @@ studentRoute.post(
console.log(user.lastName);
console.log(user.password);
console.log(user.contactNo);
+ console.log(user.otp.OTP);
const creatstudent = await user.save();
@@ -110,10 +183,37 @@ studentRoute.post(
})
);
-studentRoute.get('/logout',(req, res)=>{
+studentRoute.post(
+ "/verifystudent",
+ expressAsynchandler(async (req, res) => {
+
+ console.log(req.body.id);
+ const student = await Student.findById(req.body.id);
+ return res.status(200).send({ isverified:student.isAuthenticated});
+ })
+);
- res.clearCookie('jwtoken', { path : "/"});
- res.status(200).send("user logout");
-})
+studentRoute.post(
+ "/studentotp",
+ expressAsynchandler(async (req, res) => {
+ console.log(req.body.otp);
+ const student = await Student.findById(req.body.id);
+ if ((req.body.timestamp - student.otp.timeStamp) / (1000 * 60) > 5) {
+ res.status(401).send({ message: "OTP Expired" });
+ } else {
+ if (req.body.otp === student.otp.otpCode) {
+ await Student.findByIdAndUpdate(req.body.id, {
+ isAuthenticated: true,
+ });
+ res.status(200).send({
+ message: "Valid OTP...User Authenticated",
+ token: student.token,
+ });
+ } else {
+ res.status(401).send({ message: "Invalid OTP" });
+ }
+ }
+ })
+);
module.exports = studentRoute;