diff --git a/server-api/api.js b/server-api/api.js index e90b4fd..a936c54 100644 --- a/server-api/api.js +++ b/server-api/api.js @@ -165,8 +165,8 @@ app.put('/User/Update/:id', (req, res) => { //Api pour les contacts de la page repertoire -app.get('/Contact/All', (req, res) => { - let sql = 'SELECT * FROM contacts ORDER BY idcontact'; +app.get('/Contact/AllWithCustomerName', (req, res) => { + let sql = 'SELECT c.*, cu.name FROM contacts c, customers cu WHERE cu.idCustomer = c.idCustomer ORDER BY idcontact'; db.query(sql, (err, result) => { if (err) throw err; console.log(result); diff --git a/src/pages/Repertoire.js b/src/pages/Repertoire.js index 5a20010..c32adf3 100644 --- a/src/pages/Repertoire.js +++ b/src/pages/Repertoire.js @@ -21,9 +21,10 @@ function Repertoire() { const [SearchTerm, setSearchTerm] = useState(""); const [SearchResults, setSearchResults] = useState([]); const [customers, setCustomers] = useState([]); + useEffect(() => { - api.get('/Contact/All').then((response) => { + api.get('/Contact/AllWithCustomerName').then((response) => { setContacts(response.data); setSearchTerm(response.data[0].idcontact); }); @@ -70,7 +71,7 @@ function Repertoire() { Photo Nom Prénom - + Entreprise @@ -79,6 +80,7 @@ function Repertoire() { {contact.lastname} {contact.firstname} + {contact.name} ))} diff --git a/src/styles/components/_analyse.scss b/src/styles/components/_analyse.scss index 54cc0d0..166e983 100644 --- a/src/styles/components/_analyse.scss +++ b/src/styles/components/_analyse.scss @@ -1,7 +1,4 @@ -.dark{ - background-color: $xiketic; - color: white; -} + body { diff --git a/src/styles/components/_calendrier.scss b/src/styles/components/_calendrier.scss index b836b73..a0fe08e 100644 --- a/src/styles/components/_calendrier.scss +++ b/src/styles/components/_calendrier.scss @@ -1,7 +1,4 @@ -.dark{ - background-color: $xiketic; - color: white; -} + body { diff --git a/src/styles/components/_compte.scss b/src/styles/components/_compte.scss index 20dbbd2..98039f9 100644 --- a/src/styles/components/_compte.scss +++ b/src/styles/components/_compte.scss @@ -1,7 +1,4 @@ -.dark{ - background-color: $xiketic; - color: white; -} + body { diff --git a/src/styles/components/_connexion.scss b/src/styles/components/_connexion.scss index bc1ff41..cd111d7 100644 --- a/src/styles/components/_connexion.scss +++ b/src/styles/components/_connexion.scss @@ -1,7 +1,3 @@ -.dark{ - background-color: $xiketic; - color: white; -} body { .page_connexion { diff --git a/src/styles/components/_dashboard.scss b/src/styles/components/_dashboard.scss index 870974b..15c6f35 100644 --- a/src/styles/components/_dashboard.scss +++ b/src/styles/components/_dashboard.scss @@ -1,7 +1,4 @@ -.dark{ - background-color: $xiketic; - color: white; -} + body { .page_dashboard { diff --git a/src/styles/components/_parametre.scss b/src/styles/components/_parametre.scss index bc57fd5..56dc3b2 100644 --- a/src/styles/components/_parametre.scss +++ b/src/styles/components/_parametre.scss @@ -1,8 +1,3 @@ -.dark{ - background-color: $xiketic; - color: white; -} - body { background-color: $alice-blue; color: black; diff --git a/src/styles/settings.scss b/src/styles/settings.scss index 1bfe1c4..01c4180 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss @@ -14,19 +14,7 @@ $rufous: #9b2915ff; $xiketic: #020114ff; $beau-blue: #b1c5d2; -/* SCSS HSL */ -$alice-blue: hsla(204, 28%, 93%, 1); -$blue-munsell: hsla(190, 100%, 32%, 1); -$malachite: hsla(142, 80%, 55%, 1); -$rufous: hsla(9, 76%, 35%, 1); -$xiketic: hsla(243, 90%, 4%, 1); - -/* SCSS RGB */ -$alice-blue: rgba(232, 238, 242, 1); -$blue-munsell: rgba(0, 136, 163, 1); -$malachite: rgba(50, 232, 117, 1); -$rufous: rgba(155, 41, 21, 1); -$xiketic: rgb(21, 18, 75); + /* SCSS Gradient */ $gradient-top: linear-gradient(0deg, #e8eef2ff, #0088a3ff, #32e875ff, #9b2915ff, #020114ff); @@ -59,4 +47,9 @@ body { li { list-style-type: none; +} + +.dark{ + background-color: $xiketic; + color: white; } \ No newline at end of file