From 7d64318e6e88f05acb3df8449ae42de0791e7a70 Mon Sep 17 00:00:00 2001 From: Alyssa Date: Thu, 28 Nov 2024 17:28:41 +0100 Subject: [PATCH 01/11] authentification --- .idea/dataSources.xml | 26 +---- assets/styles/css/login.css | 102 ++++++++++++-------- assets/styles/image/fond.png | Bin 0 -> 3486 bytes assets/styles/image/{2.png => password.png} | Bin assets/styles/image/{1.png => profile.png} | Bin templates/login/index.html.twig | 48 +++++---- 6 files changed, 92 insertions(+), 84 deletions(-) create mode 100644 assets/styles/image/fond.png rename assets/styles/image/{2.png => password.png} (100%) rename assets/styles/image/{1.png => profile.png} (100%) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 9156fa5..5b75a08 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,33 +1,11 @@ -<<<<<<< HEAD - + postgresql true org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/ - $ProjectFileDir$ - - - mariadb - true - org.mariadb.jdbc.Driver - jdbc:mariadb://127.0.0.1:3306/hegreconfort -======= - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj - $ProjectFileDir$ - - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj ->>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f + jdbc:postgresql://172.20.96.1:5432/HegreEtConfort $ProjectFileDir$ diff --git a/assets/styles/css/login.css b/assets/styles/css/login.css index 2b86d9d..c8fb87d 100644 --- a/assets/styles/css/login.css +++ b/assets/styles/css/login.css @@ -1,67 +1,87 @@ body { - width: 1500px; - height: 1000px; - - background: linear-gradient(#A0C2C8, #A6CD9E); + background: url("../image/fond.png") center center / cover no-repeat; } .logo { position: absolute; - margin: -3% 0 0 1%; - height: 30%; + margin: 0.5% 0 0 43.5%; + height: 25%; } -.titre { /*pas fini*/ - margin: 4% 10% 0 25%; - font-weight: 50; - font-size: 450%; -} -.background { +.titre { position: absolute; - width: 50%; - height: 50%; - left: 25%; - top: 25%; - - background: rgba(36, 60, 64, 0.7); + color: white; + margin: 15% 0 0 38%; } -.logoEmail { +.logoProfile { position: absolute; - margin: 6.5% 0 0 31%; - height: 12%; - background: #243C40; + border-radius: 10%; + margin: 20% 0 0 36%; + height: 10%; } -.email { - position: absolute; - margin: 7% 0 0 37.5%; - width: 30%; - height: 9.5%; - background-color: #f0f0f0; -} - .logoPassword { position: absolute; - margin: 16.5% 0 0 31%; - height: 12%; - background: #243C40; + border-radius: 10%; + margin: 27% 0 0 36%; + height: 10%; +} +.profile { + position: absolute; + border-radius: 2%; + margin: 20% 0 0 42%; + width: 22%; + height: 5%; } .password { position: absolute; - margin: 17% 0 0 37.5%; - width: 30%; - height: 9.5%; - background-color: #f0f0f0; + border-radius: 2%; + margin: 27% 0 0 42%; + width: 22%; + height: 5%; } -/*forgot password*/ + .forgot { position: absolute; - margin: 23.5% 0 0 42.5%; - font-size: 130%; - color: #f0f0f0; + font-style: italic; + margin: 30% 0 0 52%; + font-size: 100%; + color: white; +} +#remember { + position: absolute; + margin: 33% 0 0 38%; + font-size: 100%; + color: white; +} +.remember { + position: absolute; + margin: 32.7% 0 0 39.5%; + font-size: 100%; + color: white; +} +.login { + position: absolute; + margin: 37.5% 0 0 36.6%; + width: 27%; + background-color: #243C40; + color: white; } +.background { + position: absolute; + box-shadow: 0 0 30px 1px black; + border-radius: 10%; + opacity: 85%; + + margin: 7% 0 0 35%; + width: 30%; + height: 75%; + + + background: #243C40; +} \ No newline at end of file diff --git a/assets/styles/image/fond.png b/assets/styles/image/fond.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4e8381d62bc37c08722c3ee4888538258bc928 GIT binary patch literal 3486 zcmcgvU2NM_6u#*Kq#2tkA@KmJumH)R&2gMIZQ>AS z;V8cMp6{G{&iT%{%8QS6wQY0X;|2h1>u8V00B~G3#dSN{nVmoX68foD+Iuwswtr!Y z8wFW+5^af8?$Ugp~k6# zq6@NwnKs#koYuoQ?#6Pa8C_R}M8UeGd01;FZ9+UKXp-eMlJa=XYhhR@t4}k$W-hZ% zy5ZB-BD)d=%ag*Y8jO!BFpS5bCZ|;nS{6)D&Pa<2Ssn5bpVwDUP!!<{gvgR3)5j{H z)zCZm2+JkBY-7St1pW1mM17;*{GuS?8wd;ps039PNUR#lLe`qulR#GdKEJQQAEfH3 z#-KmoEqJyL*XqaRG&g9567dz(R`)F35NT#t6tYRN7P+hx5ZRPv6^qJZzf?R|D3g*_ zMT-JFM?w*%pro5cqH;yzIa(KV5w4bq5%sktLfoT8R!W9(gW%x+n-+CEq6sNQgqR3* z9jbzq#JF?*A5M5q+;++?EFZYBrO0Sd1!7am&COj;k5)d(Yw zY8s0%qR6Uz$kfZ9pa!tY@SjqRI<%1MH5V~hrKlN@8f}qSR^zfPMp{^Dn8hB7L5YVd zR3FB8nF~jmwjM(ed~M!+SXzT>cpuZ+FwjdFojMaDOHGu$b~X|;571;F3-bdl3KIx< z4C5-AFDsW9-v+>Sq$A42jiVPA-cLEH8YdGwx6EDd`62drtft=8@Xr0mzdQUnd+q0? zr74g(absZ|0Hy022i9C9{qujmwhNp(yZep|U~J0Nf&-f=0c3iYuHFSQ-FMT#=_(^9 zFKh>nN{8hDXNG5M!Lj69TbeV+?a9nebg{)zyG{Z(+^aV_^ZnGD037|GC^N-b%74!g zBfvGefl^-C{Jlkh!ym~_4iLD2N?A7hr3t?2$u%9?E_qS%%jRqGJ^)r$5X-9pb*Gcr z`t5UH_Z@ov^z7c-zM6RC!CycPRzViuK>6sYa99qsDZt{D9UEJpO#U5lfRixC7WgHa=NNHV^`TUIQ}sjU*!OZ)ri)=uBG*sONiEI zCp4_mFwPI(O!(4Y)nJCOL!|{3O?Eqqc}{K`Fl-{u+a+oL+^KOytD#r-qh>hpDI!ww z%v|rg?0mTOfLs8DzQ`A4UH<1QdZO>&&*yr;Os)B@UE8SxSB*_M_v6Gauw0ST2Y$MO n-s=6OFQx5)oqtX$0-kyK5S4i9voGh(e^4E*UD5Y;_aFQRA$zxr literal 0 HcmV?d00001 diff --git a/assets/styles/image/2.png b/assets/styles/image/password.png similarity index 100% rename from assets/styles/image/2.png rename to assets/styles/image/password.png diff --git a/assets/styles/image/1.png b/assets/styles/image/profile.png similarity index 100% rename from assets/styles/image/1.png rename to assets/styles/image/profile.png diff --git a/templates/login/index.html.twig b/templates/login/index.html.twig index 08c8f2d..86898e2 100644 --- a/templates/login/index.html.twig +++ b/templates/login/index.html.twig @@ -2,30 +2,40 @@ - {% block title %}Authentification{% endblock %} - - - + Authentification + + + + + + + {% block stylesheets %} {% endblock %} +
+
+
-
-
-

D'HEGRE ET CONFORT

+ +

D'Hegre Et Confort

+ + Logo Profil + Logo Password + + + + +

Mot de passe oublié ?

+
- -
-
- - - - - - -
- -

Mot de passe oublié ?

From 9b0a1966d10ecdbdf91ebb7e2182fe6590de6897 Mon Sep 17 00:00:00 2001 From: Alyssa Date: Thu, 28 Nov 2024 17:40:16 +0100 Subject: [PATCH 02/11] OK --- .idea/HegreEtConfort.iml | 1 + assets/styles/image/fond.png | Bin 0 -> 3486 bytes assets/styles/image/{2.png => password.png} | Bin assets/styles/image/{1.png => profile.png} | Bin 4 files changed, 1 insertion(+) create mode 100644 assets/styles/image/fond.png rename assets/styles/image/{2.png => password.png} (100%) rename assets/styles/image/{1.png => profile.png} (100%) diff --git a/.idea/HegreEtConfort.iml b/.idea/HegreEtConfort.iml index f4221e4..af6cce8 100644 --- a/.idea/HegreEtConfort.iml +++ b/.idea/HegreEtConfort.iml @@ -3,6 +3,7 @@ + diff --git a/assets/styles/image/fond.png b/assets/styles/image/fond.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4e8381d62bc37c08722c3ee4888538258bc928 GIT binary patch literal 3486 zcmcgvU2NM_6u#*Kq#2tkA@KmJumH)R&2gMIZQ>AS z;V8cMp6{G{&iT%{%8QS6wQY0X;|2h1>u8V00B~G3#dSN{nVmoX68foD+Iuwswtr!Y z8wFW+5^af8?$Ugp~k6# zq6@NwnKs#koYuoQ?#6Pa8C_R}M8UeGd01;FZ9+UKXp-eMlJa=XYhhR@t4}k$W-hZ% zy5ZB-BD)d=%ag*Y8jO!BFpS5bCZ|;nS{6)D&Pa<2Ssn5bpVwDUP!!<{gvgR3)5j{H z)zCZm2+JkBY-7St1pW1mM17;*{GuS?8wd;ps039PNUR#lLe`qulR#GdKEJQQAEfH3 z#-KmoEqJyL*XqaRG&g9567dz(R`)F35NT#t6tYRN7P+hx5ZRPv6^qJZzf?R|D3g*_ zMT-JFM?w*%pro5cqH;yzIa(KV5w4bq5%sktLfoT8R!W9(gW%x+n-+CEq6sNQgqR3* z9jbzq#JF?*A5M5q+;++?EFZYBrO0Sd1!7am&COj;k5)d(Yw zY8s0%qR6Uz$kfZ9pa!tY@SjqRI<%1MH5V~hrKlN@8f}qSR^zfPMp{^Dn8hB7L5YVd zR3FB8nF~jmwjM(ed~M!+SXzT>cpuZ+FwjdFojMaDOHGu$b~X|;571;F3-bdl3KIx< z4C5-AFDsW9-v+>Sq$A42jiVPA-cLEH8YdGwx6EDd`62drtft=8@Xr0mzdQUnd+q0? zr74g(absZ|0Hy022i9C9{qujmwhNp(yZep|U~J0Nf&-f=0c3iYuHFSQ-FMT#=_(^9 zFKh>nN{8hDXNG5M!Lj69TbeV+?a9nebg{)zyG{Z(+^aV_^ZnGD037|GC^N-b%74!g zBfvGefl^-C{Jlkh!ym~_4iLD2N?A7hr3t?2$u%9?E_qS%%jRqGJ^)r$5X-9pb*Gcr z`t5UH_Z@ov^z7c-zM6RC!CycPRzViuK>6sYa99qsDZt{D9UEJpO#U5lfRixC7WgHa=NNHV^`TUIQ}sjU*!OZ)ri)=uBG*sONiEI zCp4_mFwPI(O!(4Y)nJCOL!|{3O?Eqqc}{K`Fl-{u+a+oL+^KOytD#r-qh>hpDI!ww z%v|rg?0mTOfLs8DzQ`A4UH<1QdZO>&&*yr;Os)B@UE8SxSB*_M_v6Gauw0ST2Y$MO n-s=6OFQx5)oqtX$0-kyK5S4i9voGh(e^4E*UD5Y;_aFQRA$zxr literal 0 HcmV?d00001 diff --git a/assets/styles/image/2.png b/assets/styles/image/password.png similarity index 100% rename from assets/styles/image/2.png rename to assets/styles/image/password.png diff --git a/assets/styles/image/1.png b/assets/styles/image/profile.png similarity index 100% rename from assets/styles/image/1.png rename to assets/styles/image/profile.png From dbebdf8cde742b9876dad0c4a7d17551dfe8c57f Mon Sep 17 00:00:00 2001 From: Maxiser Date: Thu, 28 Nov 2024 17:52:44 +0100 Subject: [PATCH 03/11] pppf --- .idea/dataSources.xml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .idea/dataSources.xml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index 3f2ad85..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - mariadb - true - org.mariadb.jdbc.Driver - jdbc:mariadb://localhost:3306/HegreConfort - - - - $ProjectFileDir$ - - - \ No newline at end of file From 0e32d96bbee9ef976941f73c83f2a1cad1e489fa Mon Sep 17 00:00:00 2001 From: Maxiser Date: Thu, 28 Nov 2024 20:27:16 +0100 Subject: [PATCH 04/11] okk --- .idea/dataSources.xml | 47 +------------------------------------------ 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c17c05a..c1906c3 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,56 +1,11 @@ -<<<<<<< HEAD - + postgresql true org.postgresql.Driver jdbc:postgresql://172.20.96.1:5432/HegreEtConfort -======= -<<<<<<< HEAD -<<<<<<< HEAD - -======= -<<<<<<< HEAD - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/ - $ProjectFileDir$ - - - mariadb - true - org.mariadb.jdbc.Driver - jdbc:mariadb://127.0.0.1:3306/hegreconfort -======= - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj - $ProjectFileDir$ - - ->>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117 - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj ->>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f -======= - - mariadb - true - org.mariadb.jdbc.Driver - jdbc:mariadb://localhost:3306/HegreConfort - - - ->>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97 ->>>>>>> d7375d330251cab10a2296bbb292fcdb7cd6e847 $ProjectFileDir$ From 8f6fd20ec6a44c3f2e55007e1c025009b1f7b9de Mon Sep 17 00:00:00 2001 From: Alyssa Date: Thu, 5 Dec 2024 16:24:26 +0100 Subject: [PATCH 05/11] bien --- .idea/HegreEtConfort.iml | 1 - assets/styles/css/intervention.css | 36 ++++++++++++++++++++ assets/styles/css/login.css | 6 ++-- assets/styles/image/calendar.png | Bin 0 -> 19062 bytes src/Controller/AuthenticationController.php | 2 +- templates/intervention/add.html.twig | 30 ++++++++++++---- templates/login/index.html.twig | 27 +++++++++++---- 7 files changed, 83 insertions(+), 19 deletions(-) create mode 100644 assets/styles/image/calendar.png diff --git a/.idea/HegreEtConfort.iml b/.idea/HegreEtConfort.iml index af6cce8..f4221e4 100644 --- a/.idea/HegreEtConfort.iml +++ b/.idea/HegreEtConfort.iml @@ -3,7 +3,6 @@ - diff --git a/assets/styles/css/intervention.css b/assets/styles/css/intervention.css index e69de29..2121fcd 100644 --- a/assets/styles/css/intervention.css +++ b/assets/styles/css/intervention.css @@ -0,0 +1,36 @@ +body { + background: #A6CD9E !important; +} + +.background { + background-color: #7D9599; + position: absolute; + width: 100%; + height: 80%; +} +.background-intervention { + background-color: #A0C2C8; + position: absolute; + box-shadow: 0 0 30px 1px black; + border-radius: 5%; + + margin: 2% 0 0 20%; + width: 60%; + height: 70%; +} + +.logoCalendar { + position: absolute; + margin: 1% 0 0 5%; + width: 5%; +} + +h1 { + position: absolute; + margin: 5% 0 0 11%; +} + +.from { + position: absolute; + margin: 15% 15% 15% 15%; +} \ No newline at end of file diff --git a/assets/styles/css/login.css b/assets/styles/css/login.css index c8fb87d..3acf4b0 100644 --- a/assets/styles/css/login.css +++ b/assets/styles/css/login.css @@ -1,5 +1,5 @@ body { - background: url("../image/fond.png") center center / cover no-repeat; + background: url("../image/fond.png") center center / cover no-repeat !important; } .logo { @@ -28,14 +28,14 @@ body { margin: 27% 0 0 36%; height: 10%; } -.profile { +#profile { position: absolute; border-radius: 2%; margin: 20% 0 0 42%; width: 22%; height: 5%; } -.password { +#password { position: absolute; border-radius: 2%; margin: 27% 0 0 42%; diff --git a/assets/styles/image/calendar.png b/assets/styles/image/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..8dbf226d7644626e3ed169dbf45a860236369b1c GIT binary patch literal 19062 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 Q(>getLastUsername(); - return $this->render('authentication/index.html.twig', [ + return $this->render('login/index.html.twig', [ 'last_username' => $lastUsername, 'error' => $error, ]); diff --git a/templates/intervention/add.html.twig b/templates/intervention/add.html.twig index 72b0f43..75d67d8 100644 --- a/templates/intervention/add.html.twig +++ b/templates/intervention/add.html.twig @@ -1,10 +1,26 @@ -{# templates/user/add.html.twig #} -{% extends 'base.html.twig' %} + + + + + Créer Une Intervention + + + -{% block title %}Ajouter une intervention {% endblock %} + -{% block body %} -

Ajouter une intervention

+ {% block stylesheets %} + {% endblock %} + + +
+ Logo Calendrier +

Créer Une Intervention

- {{ form(form) }} -{% endblock %} +
+
{{ form(form) }}
+
+ + diff --git a/templates/login/index.html.twig b/templates/login/index.html.twig index 86898e2..46d3c81 100644 --- a/templates/login/index.html.twig +++ b/templates/login/index.html.twig @@ -11,7 +11,6 @@ - {% block stylesheets %} {% endblock %} @@ -25,12 +24,26 @@ Logo Profil Logo Password - +
+ {% if error %} +
{{ error.messageKey|trans(error.messageData, 'security') }}
+ {% endif %} + + {% if app.user %} +
+ Vous êtes connecté en tant que {{ app.user.userIdentifier }}, Déconnexion +
+ {% endif %} + +
From d4947dae80405cdc06939863a01d8ce1d3abf119 Mon Sep 17 00:00:00 2001 From: Maxiser Date: Sun, 8 Dec 2024 16:17:23 +0100 Subject: [PATCH 06/11] chiant --- .idea/HegreEtConfort.iml | 1 + .idea/dataSources.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.idea/HegreEtConfort.iml b/.idea/HegreEtConfort.iml index f4221e4..af6cce8 100644 --- a/.idea/HegreEtConfort.iml +++ b/.idea/HegreEtConfort.iml @@ -3,6 +3,7 @@ + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c1906c3..a45e6eb 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,11 +1,11 @@ - + postgresql true org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/HegreEtConfort + jdbc:postgresql://172.20.96.1:5432/ $ProjectFileDir$ From 8949365729a996849cf4718d7134f5d1937820c1 Mon Sep 17 00:00:00 2001 From: Maxiser Date: Sun, 8 Dec 2024 16:25:40 +0100 Subject: [PATCH 07/11] rien --- assets/styles/css/app.css | 2 +- assets/styles/css/login.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/styles/css/app.css b/assets/styles/css/app.css index dd6181a..de8f662 100644 --- a/assets/styles/css/app.css +++ b/assets/styles/css/app.css @@ -1,3 +1,3 @@ body { - background-color: skyblue; + background: url("../image/fond.png") center center / cover no-repeat !important; } diff --git a/assets/styles/css/login.css b/assets/styles/css/login.css index 3acf4b0..851c8d8 100644 --- a/assets/styles/css/login.css +++ b/assets/styles/css/login.css @@ -82,6 +82,5 @@ body { width: 30%; height: 75%; - background: #243C40; } \ No newline at end of file From 4a7805c77bdcf7b1356a3693f440a88454154e5b Mon Sep 17 00:00:00 2001 From: Maxiser Date: Sun, 8 Dec 2024 16:35:33 +0100 Subject: [PATCH 08/11] suppression de authentication --- templates/authentication/index.html.twig | 35 ------------------------ 1 file changed, 35 deletions(-) delete mode 100644 templates/authentication/index.html.twig diff --git a/templates/authentication/index.html.twig b/templates/authentication/index.html.twig deleted file mode 100644 index c40b41a..0000000 --- a/templates/authentication/index.html.twig +++ /dev/null @@ -1,35 +0,0 @@ - - -{% block title %}Log in!{% endblock %} - -{% block body %} -
- {% if error %} -
{{ error.messageKey|trans(error.messageData, 'security') }}
- {% endif %} - - {% if app.user %} -
- You are logged in as {{ app.user.userIdentifier }}, Logout -
- {% endif %} - -

Please sign in

- - - - - - - -
- - -
- - - -
-{% endblock %} \ No newline at end of file From 5da86748e4d58daef6f3365ec4d7a5fc4380e663 Mon Sep 17 00:00:00 2001 From: Maxiser Date: Thu, 12 Dec 2024 15:51:25 +0100 Subject: [PATCH 09/11] correction entity user --- .idea/dataSources.xml | 4 ++-- src/Entity/User.php | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index a45e6eb..ed6ab11 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,11 +1,11 @@ - + postgresql true org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/ + jdbc:postgresql://172.20.96.1:5432/HegreEtConfort $ProjectFileDir$ diff --git a/src/Entity/User.php b/src/Entity/User.php index 0be20f0..00e71eb 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -29,9 +29,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface #[ORM\Column(type: Types::DATE_MUTABLE)] private ?\DateTimeInterface $BirthDate = null; - #[ORM\Column(length: 255)] - private ?string $Email = null; - #[ORM\Column(length: 255)] private ?string $Phone = null; /** From cc217a1e79b2160bafc03d60c9883606e50e0540 Mon Sep 17 00:00:00 2001 From: Alyssa Date: Thu, 12 Dec 2024 16:28:23 +0100 Subject: [PATCH 10/11] user, intervention add --- .idea/dataSources.xml | 47 +------------------- assets/styles/css/intervention.css | 64 ++++++++++++++++++++++++---- migrations/Version20241114151456.php | 43 ------------------- migrations/Version20241128141518.php | 31 -------------- migrations/Version20241205162005.php | 50 ++++++++++++++++++++++ src/Entity/User.php | 5 +-- templates/intervention/add.html.twig | 15 ++++++- 7 files changed, 122 insertions(+), 133 deletions(-) delete mode 100644 migrations/Version20241114151456.php delete mode 100644 migrations/Version20241128141518.php create mode 100644 migrations/Version20241205162005.php diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c17c05a..c1906c3 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,56 +1,11 @@ -<<<<<<< HEAD - + postgresql true org.postgresql.Driver jdbc:postgresql://172.20.96.1:5432/HegreEtConfort -======= -<<<<<<< HEAD -<<<<<<< HEAD - -======= -<<<<<<< HEAD - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/ - $ProjectFileDir$ - - - mariadb - true - org.mariadb.jdbc.Driver - jdbc:mariadb://127.0.0.1:3306/hegreconfort -======= - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj - $ProjectFileDir$ - - ->>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117 - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj ->>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f -======= - - mariadb - true - org.mariadb.jdbc.Driver - jdbc:mariadb://localhost:3306/HegreConfort - - - ->>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97 ->>>>>>> d7375d330251cab10a2296bbb292fcdb7cd6e847 $ProjectFileDir$ diff --git a/assets/styles/css/intervention.css b/assets/styles/css/intervention.css index 2121fcd..07e7e76 100644 --- a/assets/styles/css/intervention.css +++ b/assets/styles/css/intervention.css @@ -6,16 +6,16 @@ body { background-color: #7D9599; position: absolute; width: 100%; - height: 80%; + height: 87%; } .background-intervention { background-color: #A0C2C8; position: absolute; - box-shadow: 0 0 30px 1px black; + box-shadow: 0 0 15px 0 black; border-radius: 5%; - margin: 2% 0 0 20%; - width: 60%; + margin: 7% 0 0 15%; + width: 70%; height: 70%; } @@ -24,13 +24,61 @@ body { margin: 1% 0 0 5%; width: 5%; } - -h1 { +.titre { position: absolute; - margin: 5% 0 0 11%; + margin: 2% 0 0 11%; + color: white; +} + +#nom { + position: absolute; + margin: 2% 0 0 5%; + width: 45%; +} +#echecs { + position: absolute; + margin: 6% 0 0 5%; +} +#employesCompetences { + position: absolute; + margin: 10% 0 0 5%; +} +#piece { + position: absolute; + margin: 14% 0 0 5%; +} + +#vehicule { + position: absolute; + margin: 18.5% 0 0 5%; +} +#vehicule1 { + position: absolute; + margin: 19% 0 0 21.5%; +} +#oui { + position: absolute; + margin: 18.5% 0 0 24%; +} +#vehicule2 { + position: absolute; + margin: 19% 0 0 30%; +} +#non { + position: absolute; + margin: 18.5% 0 0 33%; +} + +#date { + position: absolute; + margin: 2% 0 0 70%; +} +#calendar { + position: absolute; + margin: 18.5% 0 0 33%; } .from { position: absolute; - margin: 15% 15% 15% 15%; + margin: 65% 15% 15% 15%; } \ No newline at end of file diff --git a/migrations/Version20241114151456.php b/migrations/Version20241114151456.php deleted file mode 100644 index 34acab8..0000000 --- a/migrations/Version20241114151456.php +++ /dev/null @@ -1,43 +0,0 @@ -addSql('CREATE TABLE fault (id INT AUTO_INCREMENT NOT NULL, wording VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE intervention (id INT AUTO_INCREMENT NOT NULL, wording VARCHAR(255) NOT NULL, timestamp DATETIME NOT NULL, description VARCHAR(255) NOT NULL, address VARCHAR(255) NOT NULL, status VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE skill (id INT AUTO_INCREMENT NOT NULL, wording VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE stock (id INT AUTO_INCREMENT NOT NULL, wording VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL, quantity VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE `user` (id INT AUTO_INCREMENT NOT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, birth_date DATE NOT NULL, email VARCHAR(255) NOT NULL, phone VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE vehicle (id INT AUTO_INCREMENT NOT NULL, license_plate VARCHAR(255) NOT NULL, brand VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE messenger_messages (id BIGINT AUTO_INCREMENT NOT NULL, body LONGTEXT NOT NULL, headers LONGTEXT NOT NULL, queue_name VARCHAR(190) NOT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', available_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', delivered_at DATETIME DEFAULT NULL COMMENT \'(DC2Type:datetime_immutable)\', INDEX IDX_75EA56E0FB7336F0 (queue_name), INDEX IDX_75EA56E0E3BD61CE (available_at), INDEX IDX_75EA56E016BA31DB (delivered_at), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE fault'); - $this->addSql('DROP TABLE intervention'); - $this->addSql('DROP TABLE skill'); - $this->addSql('DROP TABLE stock'); - $this->addSql('DROP TABLE `user`'); - $this->addSql('DROP TABLE vehicle'); - $this->addSql('DROP TABLE messenger_messages'); - } -} diff --git a/migrations/Version20241128141518.php b/migrations/Version20241128141518.php deleted file mode 100644 index ffcd213..0000000 --- a/migrations/Version20241128141518.php +++ /dev/null @@ -1,31 +0,0 @@ -addSql('CREATE SCHEMA public'); - } -} diff --git a/migrations/Version20241205162005.php b/migrations/Version20241205162005.php new file mode 100644 index 0000000..9f8bff3 --- /dev/null +++ b/migrations/Version20241205162005.php @@ -0,0 +1,50 @@ +addSql('CREATE SEQUENCE fault_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE intervention_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE skill_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE stock_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE user_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE vehicle_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('ALTER TABLE "user" ADD roles JSON NOT NULL'); + $this->addSql('ALTER TABLE "user" ALTER email TYPE VARCHAR(180)'); + $this->addSql('ALTER TABLE "user" RENAME COLUMN type TO password'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_IDENTIFIER_EMAIL ON "user" (email)'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('CREATE SCHEMA public'); + $this->addSql('DROP SEQUENCE fault_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE intervention_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE skill_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE stock_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE user_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE vehicle_id_seq CASCADE'); + $this->addSql('DROP INDEX UNIQ_IDENTIFIER_EMAIL'); + $this->addSql('ALTER TABLE "user" DROP roles'); + $this->addSql('ALTER TABLE "user" ALTER email TYPE VARCHAR(255)'); + $this->addSql('ALTER TABLE "user" RENAME COLUMN password TO type'); + } +} diff --git a/src/Entity/User.php b/src/Entity/User.php index 0be20f0..3ebcbae 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -18,7 +18,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface private ?int $id = null; #[ORM\Column(length: 180)] - private ?string $email = null; + private string $email; #[ORM\Column(length: 255)] private ?string $FirstName = null; @@ -29,9 +29,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface #[ORM\Column(type: Types::DATE_MUTABLE)] private ?\DateTimeInterface $BirthDate = null; - #[ORM\Column(length: 255)] - private ?string $Email = null; - #[ORM\Column(length: 255)] private ?string $Phone = null; /** diff --git a/templates/intervention/add.html.twig b/templates/intervention/add.html.twig index 75d67d8..c80727d 100644 --- a/templates/intervention/add.html.twig +++ b/templates/intervention/add.html.twig @@ -17,9 +17,22 @@
Logo Calendrier -

Créer Une Intervention

+

Créer Une Intervention

+ + + + +

Véhicule nécessaire

+ + + + +

Jour de l'intervention

+ + +
{{ form(form) }}
From 05b64fc2b1e17491a87ea32353e6987b0e97bf50 Mon Sep 17 00:00:00 2001 From: Alyssa Date: Thu, 12 Dec 2024 16:40:05 +0100 Subject: [PATCH 11/11] new migration --- migrations/Version20241212153452.php | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 migrations/Version20241212153452.php diff --git a/migrations/Version20241212153452.php b/migrations/Version20241212153452.php new file mode 100644 index 0000000..13cf6d3 --- /dev/null +++ b/migrations/Version20241212153452.php @@ -0,0 +1,31 @@ +addSql('CREATE SCHEMA public'); + } +}