From 0e32d96bbee9ef976941f73c83f2a1cad1e489fa Mon Sep 17 00:00:00 2001 From: Maxiser Date: Thu, 28 Nov 2024 20:27:16 +0100 Subject: [PATCH 1/5] 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 d4947dae80405cdc06939863a01d8ce1d3abf119 Mon Sep 17 00:00:00 2001 From: Maxiser Date: Sun, 8 Dec 2024 16:17:23 +0100 Subject: [PATCH 2/5] 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 3/5] 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 4/5] 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 5/5] 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; /**