diff --git a/client/src/App.jsx b/client/src/App.jsx index b08651d..317cf64 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -2,7 +2,7 @@ import { BrowserRouter, Routes, Route } from "react-router-dom"; import "./App.css"; import axios from "axios"; -axios.defaults.baseURL = 'http://localhost:4000/api'; +axios.defaults.baseURL = 'https://ignite-mm4z.onrender.com/api/'; import Register from "./pages/auth/Register"; import Login from "./pages/auth/Login"; diff --git a/client/src/components/newsletter/SinglePost.jsx b/client/src/components/newsletter/SinglePost.jsx index d1d2f42..6d181ba 100644 --- a/client/src/components/newsletter/SinglePost.jsx +++ b/client/src/components/newsletter/SinglePost.jsx @@ -21,8 +21,8 @@ function SinglePost({ data, email, mainId, date }) { {/*

{data.title}

*/}
{ - const token = Cookies.get('token'); - if (token){ - nav('/'); + const token = Cookies.get("token"); + if (token) { + nav("/"); return; } - },[]); + }, []); axios.defaults.withCredentials = true; - const handleSubmit = async (e) => { e.preventDefault(); - const tLoader = toast.loading('Authenticating'); + const tLoader = toast.loading("Authenticating"); try { - const result = await axios.post('auth/login', {email, password}); - console.log(result.data); - toast.dismiss(tLoader); - toast.success('Login Successful'); - - nav('/'); + const result = await axios.post("/auth/login", { email, password }); + if (result) { + toast.dismiss(tLoader); + toast.success("Login Successful"); + Cookies.set("token", result.data.token); + nav("/"); + } } catch (error) { console.log(error); toast.dismiss(tLoader); toast.error(error.response.data); console.error(error.response.data); } - } + }; - return ( -
-
-
- -
-

Sign In

-
- setEmail(e.target.value)} /> - setPassword(e.target.value)} /> - - -
Don't have an account? Sign Up
-
- -
- -
-
+ return ( +
+
+
+
+

Sign In

+
+ setEmail(e.target.value)} + /> + setPassword(e.target.value)} + /> + + +
+ Don't have an account?{" "} + + + Sign Up + + +
+ +
- ); +
+
+ ); } -export default Login \ No newline at end of file +export default Login; diff --git a/client/src/pages/auth/Register.jsx b/client/src/pages/auth/Register.jsx index 6197994..c85219d 100644 --- a/client/src/pages/auth/Register.jsx +++ b/client/src/pages/auth/Register.jsx @@ -26,7 +26,7 @@ function Register() { e.preventDefault(); const tLoader = toast.loading('Creating User...') try{ - const result = await axios.post('auth/register', {name,email,password}); + const result = await axios.post('/auth/register', {name,email,password}); console.log(result); toast.dismiss(tLoader); toast.success('Registration successful...'); diff --git a/server/controllers/Authentication.js b/server/controllers/Authentication.js index 5bc3231..ee9b681 100644 --- a/server/controllers/Authentication.js +++ b/server/controllers/Authentication.js @@ -31,8 +31,7 @@ const login = async (req, res) => { department }, key, { expiresIn: "1d", }); - - res.status(200).cookie("token", token).send("Login Successful"); + res.status(200).send({token: token}); } else { res.status(500).send("The Password is incorrect"); } @@ -44,7 +43,7 @@ const login = async (req, res) => { } }; -const loginVerify = async (req, res, next) => { +const loginVerify = async (req, res) => { const token = req.headers["x-access-token"]; if (!token) { return res.status(401).send("Unauthorized: Token not provided"); diff --git a/server/routes/Auth.js b/server/routes/Auth.js index 01b9d7a..4404bf5 100644 --- a/server/routes/Auth.js +++ b/server/routes/Auth.js @@ -11,7 +11,7 @@ router.post('/register', register); router.post('/login',login); //auth-login-verify -router.get('/login', verifyUser,loginVerify); +router.get('/login', verifyUser, loginVerify); module.exports = router; \ No newline at end of file diff --git a/server/server.js b/server/server.js index d20692f..4345df5 100644 --- a/server/server.js +++ b/server/server.js @@ -21,7 +21,7 @@ const app = express(); app.use(express.json()); app.use( cors({ - origin: "http://localhost:5173", + origin: "https://dynamic-newsletter-platform.onrender.com", methods: ["GET", "POST", "PATCH"], credentials: true, })