Update

joshuajoyreji · Mar 19, 2023 · a1cb185 · a1cb185
1 parent 625d3e1
commit a1cb185
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -17,7 +17,9 @@ function App() {
           <Route path='/' element={<Home />} />
           <Route path='/Details' element={<Details />} />
           <Route path='/Details2' element={<Details2 />} />
-          <Route path='/Login' element={<Login />} />
+          <Route path='/Login' element={
+            <Login/>
+          } />
           <Route path='/Signup' element={<Signup />} />
         </Routes>
         <Footer/>

diff --git a/frontend/src/Components/Navbar/Navbar.js b/frontend/src/Components/Navbar/Navbar.js
@@ -32,8 +32,8 @@ const Navbar = () => {
                         <span class="replies">Heart Disease</span>
                         <span class="comments"></span>
                     </a>
-                    <a href="/Login" target="_self" className='btn1'>
-                        <span class="replies">Login</span>
+                    <a  onClick={localStorage.removeItem('token')} target="_self" className='btn1'>
+                        <span class="replies">Logout</span>
                         <span class="comments"></span>
                     </a>
                 </div>

diff --git a/frontend/src/index.js b/frontend/src/index.js
@@ -1,15 +1,15 @@
 import React from 'react';
-import ReactDOM from 'react-dom/client';
+import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
-
-const root = ReactDOM.createRoot(document.getElementById('root'));
-root.render(
+ReactDOM.render(
   <React.StrictMode>
     <App />
-  </React.StrictMode>
-);
+  </React.StrictMode>,
+  document.getElementById('root')
+  );
+
 
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))

diff --git a/frontend/src/pages/Login/Login.js b/frontend/src/pages/Login/Login.js
@@ -1,17 +1,14 @@
-import React, { useState, Link } from 'react'
+import React, { useState} from 'react'
 import axios from "axios";
-import { Input } from 'reactstrap'
 import './Login.css'
-
-const baseURL = "https://localhost:4000/api"
-
 const Login = () => {
+
     const [logdata, setData] = useState({
         email: "",
         password: ""
     })
+    const baseURL = "https://localhost:4000/api"
     const addData = (e) => {
-        // console.log(e.target);
         const { name, value } = e.target;
         setData(() => {
             return {
@@ -21,17 +18,17 @@ const Login = () => {
 
         })
     }
+
     async function login() {
         await axios
-            .post(`${baseURL}/signin`, {
-                username: logdata.username,
+            .post(`${baseURL}/auth/signin`, {
+                email: logdata.email,
                 password: logdata.password
             })
             .then((response) => {
                 console.log(response.data);
                 localStorage.setItem("token", response.data.token);
                 localStorage.setItem("userId", response.data.data[0]._id)
-                window.location.href = "/";
             });
     }
 
@@ -42,29 +39,30 @@ const Login = () => {
                     <form name="my" class="form">
                         <h2>Log In</h2>
                         <div className="input-group">
-                            <input type="text" name="email" id="loginUser" onChange={addData} value={logdata.username} required />
+                            <input type="text" name="email" id="loginUser" value = {logdata.email} onChange={addData} required />
                             <label for="loginUser">E-mail</label>
                         </div>
                         <div className="input-group">
                             <input
                                 type="password"
                                 name="password"
                                 id="loginPassword"
-                                onChange={addData} value={logdata.password}
+                                value={logdata.password}
+                                onChange={addData}
                                 required
                             />
                             <label for="loginPassword">Password</label>
                         </div>
-                        <Input type="submit" value="Sign Up" class="submit-btn" onClick={(e) => {
+                        <input type="submit" value="Sign In" class="submit-btn" onClick={(e)=>{
                             e.preventDefault();
-                            console.log(logdata);
-                            signup()
-                        }} />
+                            login();
+                            window.location.href="/"
+                        }}/>
 
                     </form>
                     <br />
                     <p className='sig'>Do not have an account Click Here to Signup</p>
-                    <Link to="/Signup"><button classname='btn ' variant=" contained" >Click Here</button></Link>
+                    <a href="/signup" >Signup</a>
 
                 </div >
             </div >

diff --git a/frontend/src/pages/Signup/Signup.js b/frontend/src/pages/Signup/Signup.js
@@ -3,7 +3,7 @@ import axios from "axios";
 import { Input } from 'reactstrap'
 
 import './Signup.css'
-const baseURL = "https://localhost:4000/api"
+const baseURL = "http://localhost:4000/api"
 
 const Signup = () => {
     const [logdata, setData] = useState({
@@ -25,14 +25,14 @@ const Signup = () => {
 
     async function signup() {
         await axios
-            .post(`${baseURL}/signup`, {
+            .post(`${baseURL}/auth/signup`, {
                 name: logdata.name,
                 email: logdata.email,
                 password: logdata.password
             })
             .then((response) => {
                 console.log(response.data);
-                localStorage.setItem("token", response.data.token);
+                window.localStorage.setItem("token", "xxx");
                 window.location.href = "/";
             });
     }
@@ -62,7 +62,7 @@ const Signup = () => {
                         </div>
 
                         {
-                            <Input type="submit" value="Sign Up" class="submit-btn" onClick={(e) => {
+                            <Input type="submit" value="Sign up" class="submit-btn" onClick={(e) => {
                                 e.preventDefault();
                                 console.log(logdata);
                                 signup()