diff --git a/server-api/1 b/server-api/1 deleted file mode 100644 index 0a1c474..0000000 --- a/server-api/1 +++ /dev/null @@ -1 +0,0 @@ -703 diff --git a/server-api/api.js b/server-api/api.js index 8217b8a..d565404 100644 --- a/server-api/api.js +++ b/server-api/api.js @@ -312,9 +312,9 @@ app.post('/Contact/Add', (req, res) => { let form = req.body; - console.log(form); + console.log("on est dans le form",form); - const sql = `INSERT INTO contact(name, firstname, mail, phone, idUser, idCustomer) VALUES ('${form.name}', '${form.firstname}', '${form.mail}', '${form.phone}' , '${form.idrole}', '${form.idUser}', '${form.idCustomer}' )`; + const sql = `INSERT INTO contacts(firstname,lastname, mail, phone, iduser, idcustomer) VALUES ('${form.firstname}', '${form.lastname}', '${form.mail}', '${form.phone}', '${form.iduser}', '${form.idcustomer}' )`; db.query(sql , (err, result) => { if (err) throw err; console.log(result); @@ -338,7 +338,7 @@ app.post('/Event/Add', (req, res) => { let form = req.body; - console.log(form); + console.log("on est dans le form d'un event ",form); const sql = `INSERT INTO events(date,starttime,endtime,comment,idusersend,iduserreceive,idcontact) VALUES ('${form.date}', '${form.starttime}', '${form.endtime}', '${form.comment}', '${form.idusersend}', '${form.iduserreceive}', '${form.idcontact}')`; db.query(sql , (err, result) => { diff --git a/server-api/kill b/server-api/kill deleted file mode 100644 index 0a1c474..0000000 --- a/server-api/kill +++ /dev/null @@ -1 +0,0 @@ -703 diff --git a/src/components/Contact/AddContact.js b/src/components/Contact/AddContact.js index 1a2d794..8bf59aa 100644 --- a/src/components/Contact/AddContact.js +++ b/src/components/Contact/AddContact.js @@ -7,6 +7,7 @@ import MenuItem from '@mui/material/MenuItem'; import { NavLink } from 'react-router-dom'; import { useNavigate } from "react-router-dom"; import { Button } from '@mui/material'; +import Session from 'react-session-api'; // HERE ABOVE useHistory IS REPLACED WITH useNavigate const api = axios.create({ @@ -18,6 +19,7 @@ function AddContact() { const [loginError, setLoginError] = useState(false); const [entreprises, setEntreprises] = useState([]); const [selectedIdEntreprise, setSelectedIdEntreprise] = useState(1); + const [newContact, setNewContact] = useState([]); const navigate=useNavigate(); @@ -39,21 +41,24 @@ function AddContact() { const formData = new FormData(event.currentTarget); const values = Object.fromEntries(formData.entries()); - console.log(values.name); - api.get('/Contact/Exist/'+ values.idcontact).then((response) => { + setNewContact(values); + setNewContact(newContact => [...newContact, Session.get('idUser')]); + console.log("c'est le new contact " ,newContact); + api.get('/Contact/Exist/'+ values.phone).then((response) => { const login = response.data; if (login.length > 0){ setLoginError(true); } else { setLoginError(false); - - api.post('/Contact/Add', values).then (function(response) { + const newContact = [firstname:values.firstname, lastname:values.lastname, phone:values.phone, mail:values.email, iduser:Session.get('idUser'), idcustomer:values.selectedIdEntreprise]; + api.post('/Contact/Add', newContact).then (function(response) { console.log(response.data); }); + console.log("c'est le new contact " ,newContact); - navigate("/Repertoire"); } + navigate("/Repertoire"); }); }; @@ -73,8 +78,8 @@ function AddContact() { - - + + diff --git a/src/components/Menu.js b/src/components/Menu.js deleted file mode 100644 index 7c04e13..0000000 --- a/src/components/Menu.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; - -const Menu = () => { - return ( -
- -
- ); -}; - -export default Menu; \ No newline at end of file diff --git a/src/pages/Calendrier.js b/src/pages/Calendrier.js index bef41d7..39ad63c 100644 --- a/src/pages/Calendrier.js +++ b/src/pages/Calendrier.js @@ -39,6 +39,7 @@ useEffect(() =>{ const apiString = '/Contact/' + Session.get("idUser"); api.get(apiString).then((response) => { setContacts(response.data); + console.log("response.data",response.data); setSelectedContact(response.data[0].idcontact) }); diff --git a/src/pages/Repertoire.js b/src/pages/Repertoire.js index 6e235a4..8d34aab 100644 --- a/src/pages/Repertoire.js +++ b/src/pages/Repertoire.js @@ -6,6 +6,7 @@ import { TableContainer, Table, TableHead, TableBody, TableRow, TableCell } from import { Paper } from '@mui/material'; import { NavLink } from 'react-router-dom'; import { useNavigate } from 'react-router-dom'; +import Session from 'react-session-api'; const api = axios.create({ baseURL: 'http://localhost:8080' @@ -23,10 +24,12 @@ function Repertoire() { const [SearchResults, setSearchResults] = useState([]); const [customers, setCustomers] = useState([]); - useEffect(() => { - api.get('/Contact/AllWithCustomerName').then((response) => { + const apiString = '/Contact/' + Session.get("idUser"); + api.get(apiString).then((response) => { + setContacts(response.data); + console.log("response.data", response.data); setSearchTerm(response.data[0].idcontact); }); }, []); diff --git a/src/styles/components/_repertoire.scss b/src/styles/components/_repertoire.scss index 6d4110f..0cc9050 100644 --- a/src/styles/components/_repertoire.scss +++ b/src/styles/components/_repertoire.scss @@ -171,24 +171,19 @@ body { width: 100%; justify-content: space-between; + + .boutonAddContact { display: flex; justify-content: center; align-items: center; - width: 100%; - justify-content: space-between; - - .boutonAddContact { - display: flex; - justify-content: center; - align-items: center; - height: 40px; - min-width: 150px; - margin: 30px 30px; - border-radius: 25px; - box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); - text-decoration-line: none; - } + height: 40px; + min-width: 150px; + margin: 30px 30px; + border-radius: 25px; + box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); + text-decoration-line: none; + } .input_box { display: flex;