From 71d39047faa9bf9ff84fe80b3d138cf35909392e Mon Sep 17 00:00:00 2001 From: Theo DUPIN Date: Wed, 19 Oct 2022 08:11:24 +0200 Subject: [PATCH 1/2] =?UTF-8?q?modif=20Th=C3=A9o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 56 +++++++++++++++++++++++++++++++ package.json | 1 + src/App.js | 8 +++-- src/pages/Admin.js | 24 ++++++++++--- src/pages/Admin_modif.js | 54 +++++++++++++++++++++++++++++ src/pages/Admin_supp.js | 42 +++++++++++++++++++++++ src/styles/components/_admin.scss | 40 ++++++++++++++++------ 7 files changed, 208 insertions(+), 17 deletions(-) create mode 100644 src/pages/Admin_modif.js create mode 100644 src/pages/Admin_supp.js diff --git a/package-lock.json b/package-lock.json index 151a531..c899e10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "axios": "^1.1.3", "crypto-js": "^4.1.1", "pg": "^8.8.0", "react": "^18.2.0", @@ -4968,6 +4969,29 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz", + "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -13852,6 +13876,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -20471,6 +20500,28 @@ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz", "integrity": "sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==" }, + "axios": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz", + "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==", + "requires": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + }, + "dependencies": { + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } + } + }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -26725,6 +26776,11 @@ } } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", diff --git a/package.json b/package.json index 3b89dde..7523385 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "axios": "^1.1.3", "crypto-js": "^4.1.1", "pg": "^8.8.0", "react": "^18.2.0", diff --git a/src/App.js b/src/App.js index 286ca1a..db1bed3 100644 --- a/src/App.js +++ b/src/App.js @@ -1,7 +1,9 @@ import React from 'react'; import { BrowserRouter, Routes, Route } from 'react-router-dom'; -import Connexion from './pages/Connexion'; -// import Admin from './pages/Admin.js'; +//import Connexion from './pages/Connexion'; +import Admin from './pages/Admin.js'; +import Admin_supp from './pages/Admin_supp.js'; +import Admin_modif from './pages/Admin_modif.js'; const App = () => { return ( @@ -11,7 +13,7 @@ const App = () => { // // - + ); } diff --git a/src/pages/Admin.js b/src/pages/Admin.js index a178b25..ddfdb78 100644 --- a/src/pages/Admin.js +++ b/src/pages/Admin.js @@ -8,17 +8,17 @@ const Admin = () => {
- +
- +
- +
+

Admin

-

Admin

@@ -52,4 +52,20 @@ const Admin = () => { ); }; +function Create_user() { + document.getElementById("user").onclick = function() {Create_user()}; + document.location.href = "http://localhost:3000/"; +} + +function Modify_user(){ + document.getElementById("user").onclick = function() {Modify_user()}; + document.location.href = "http://localhost:3000/"; +} + +function Delete_user(){ + //document.getElementById("user").onclick = function() {Delete_user()}; + document.location = './pages/Admin_supp'; + console.log(document.location); +} + export default Admin; \ No newline at end of file diff --git a/src/pages/Admin_modif.js b/src/pages/Admin_modif.js new file mode 100644 index 0000000..02a6ecc --- /dev/null +++ b/src/pages/Admin_modif.js @@ -0,0 +1,54 @@ +import React from 'react'; + +const Admin_modif = () => { + return ( +
+ {/* Create a page to delete an user in the admin page*/} +
+ +
+ +
+
+ +
+
+ +
+
+
+

Admin

+ +
+ +

Nom :

+ + + +

Prénom :

+ + + +

Rôle dans l'entreprise :

+ + + +

Identifiant :

+ + + +

Mot de passe (par défaut) :

+ + + + + + +
+
+
+ + ); +}; + +export default Admin_modif; \ No newline at end of file diff --git a/src/pages/Admin_supp.js b/src/pages/Admin_supp.js new file mode 100644 index 0000000..bbedf63 --- /dev/null +++ b/src/pages/Admin_supp.js @@ -0,0 +1,42 @@ +import React from 'react'; + +const Admin_supp = () => { + return ( +
+ {/* Create a page to delete an user in the admin page*/} +
+ +
+ +
+
+ +
+
+ +
+
+

Admin

+
+ + + + + + + +
+
+
+ ); +}; + +/*function tab(){ + var tab = new Array(); + if(Create_user()){ + tab.push(nom, prenom); + } + console.log(tab); +}*/ + +export default Admin_supp; \ No newline at end of file diff --git a/src/styles/components/_admin.scss b/src/styles/components/_admin.scss index f135faf..e4abb1b 100644 --- a/src/styles/components/_admin.scss +++ b/src/styles/components/_admin.scss @@ -94,23 +94,34 @@ } } - .Titre{ - display: flex; - font-weight: bold; - font-size: 80px; - margin: 20px; - } + /*.form{ + align-self: center; + font-size: 30px; + }*/ + .Formulaire{ display: flex; flex-direction: column; + align-items: center; width: 100%; } - .form{ - align-self: center; + .formulaire{ + display: flex; + flex-direction: column; + margin: 100px; + padding: 30px; + align-items: center; + } + + + .Titre{ + display: flex; flex-direction: row; - font-size: 30px; + font-weight: bold; + font-size: 80px; + margin: 20px; } .texte{ @@ -145,4 +156,13 @@ background-color:rgba(68, 68, 68, 0.972); } } -} \ No newline at end of file + + .texte_barre{ + display: flex; + width: 400px; + } +} + + + + \ No newline at end of file From 88890c6480cdfe0c4da746bb37663c76a61f9572 Mon Sep 17 00:00:00 2001 From: Theo DUPIN Date: Wed, 19 Oct 2022 08:16:39 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Page=20App.js=20modifi=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index 286ca1a..8709486 100644 --- a/src/App.js +++ b/src/App.js @@ -1,6 +1,7 @@ import React from 'react'; import { BrowserRouter, Routes, Route } from 'react-router-dom'; -import Connexion from './pages/Connexion'; +import Compte from './pages/Compte'; +//import Connexion from './pages/Connexion'; // import Admin from './pages/Admin.js'; const App = () => { @@ -11,7 +12,7 @@ const App = () => { // // - + ); }