diff --git a/frontend/src/Components/Navbar/Navbar.js b/frontend/src/Components/Navbar/Navbar.js index 2e4f1e99bd3de62a6b8c8a3ba26305ee1ab7f0e3..12c0865e4026897a324a6133eee1db6865984235 100644 --- a/frontend/src/Components/Navbar/Navbar.js +++ b/frontend/src/Components/Navbar/Navbar.js @@ -1,5 +1,6 @@ import React, {useContext} from 'react'; import '../../Css/Navbar.css' +import axios from 'axios'; import { useNavigate } from 'react-router-dom'; // Import useNavigate hook import { GlobalContext } from '../../Context/GlobalContext'; @@ -12,13 +13,34 @@ function TopNavBar({}) { const {serverAddress, serverPort, loggedInStatus, setLoggedInStatus} = useContext(GlobalContext); console.log(loggedInStatus); - const handleSignOut = () => { + const handleSignOut = async (e) => { + + + try { + const response = await axios.post(serverAddress + ':' + serverPort + '/api/logout', { + headers: { + 'Content-Type': 'application/json', + }, + }); + + if (response.data.success) { + + console.log("loginggg oiyt") + } else { + console.log("No success logout") + } + + } catch (error) { + console.log(e); + } + + setLoggedInStatus(false); navigate("/"); }; return ( - <div class="border-wrap"> + <div className="border-wrap"> <div className="top-nav"> <button className='nav-button' onClick={handleSignOut} >Sign Out</button> diff --git a/frontend/src/Components/Search/SearchComponent.jsx b/frontend/src/Components/Search/SearchComponent.jsx index 121775f64612ff2fe384b5e659674e84e2159245..e20d96149313b018db6c8ded544ee29ae134931d 100644 --- a/frontend/src/Components/Search/SearchComponent.jsx +++ b/frontend/src/Components/Search/SearchComponent.jsx @@ -1,5 +1,6 @@ import React, { useState, useEffect, useMemo } from 'react'; -import * as MUI from '@mui/material'; +import Autocomplete from '@mui/material/Autocomplete'; +import TextField from '@mui/material/TextField'; import MultiSelectText from './MultiSelectText'; import "../../Css/Search.css"; import * as externalSelections from './Selections'; // Import selections from external file @@ -95,8 +96,6 @@ const handleComponentSelection = () => { } } - - setComponents( <div> {Object.values(selected).map((selection, index) => ( @@ -111,7 +110,7 @@ const handleComponentSelection = () => { return ( <div> - <MUI.Autocomplete + <Autocomplete disablePortal id="combo-box-demo" options={provinceOptions} @@ -149,7 +148,7 @@ return ( } }} renderInput={(params) => ( - <MUI.TextField + <TextField {...params} label="County" InputLabelProps={{ diff --git a/frontend/src/Pages/SignupSigninForms/SignInForm.jsx b/frontend/src/Pages/SignupSigninForms/SignInForm.jsx index 2ee6123da9e37659195e925a1dd3c97330077845..76ed433d25ab9861e41a92976c63c2d8fb5172fa 100644 --- a/frontend/src/Pages/SignupSigninForms/SignInForm.jsx +++ b/frontend/src/Pages/SignupSigninForms/SignInForm.jsx @@ -36,7 +36,7 @@ export const SignInForm = ({ onRegisterClick }) => { }; try { - const response = await axios.post(serverAddress + ':' + serverPort + '/login', loginData, { + const response = await axios.post(serverAddress + ':' + serverPort + '/api/login', loginData, { headers: { 'Content-Type': 'application/json', }, diff --git a/frontend/src/Pages/SignupSigninForms/SignUpForm.jsx b/frontend/src/Pages/SignupSigninForms/SignUpForm.jsx index 51a57bfc6997527614efd6b13483e66926254a33..37b2de23bda204b52423a710a5566888b0ecb4aa 100644 --- a/frontend/src/Pages/SignupSigninForms/SignUpForm.jsx +++ b/frontend/src/Pages/SignupSigninForms/SignUpForm.jsx @@ -59,7 +59,7 @@ export const SignUpForm = ({ onLoginClick }) => { } const emailRegex = /^\S+@+\S+$/; - if (emailRegex.test(email.toLowerCase()) == false){ + if (emailRegex.test(email.toLowerCase()) === false){ errors.push("Please enter a valid email address."); } @@ -83,7 +83,7 @@ export const SignUpForm = ({ onLoginClick }) => { }; try { - const response = await axios.post(serverAddress + ':' + serverPort + '/', registrationData, { + const response = await axios.post(serverAddress + ':' + serverPort + '/api/register', registrationData, { headers: { 'Content-Type': 'application/json', }, @@ -134,7 +134,7 @@ export const SignUpForm = ({ onLoginClick }) => { <FaLock className='icon'/> </div> <div className="register-link"> - <p>Already have an account? <a href="#" onClick={handleLoginClick}>Log in</a></p> + <p>Already have an account? <a href="/" onClick={handleLoginClick}>Log in</a></p> </div> <button style={{marginTop: 20 }} type='submit'>Register</button>