This commit is contained in:
Alyssa 2024-11-28 17:45:24 +01:00
commit b2d4754b3a
3 changed files with 98 additions and 60 deletions

View File

@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true"> <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<<<<<<< HEAD
<data-source source="LOCAL" name="HegreEtConfort@172.20.96.1" uuid="7dfccb0e-433e-4f42-b6ce-6362f7e2187a">
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://172.20.96.1:5432/HegreEtConfort</jdbc-url>
=======
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="633df7e7-7b9a-4298-8a3c-3075313a1153"> <data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="633df7e7-7b9a-4298-8a3c-3075313a1153">
@ -43,6 +50,7 @@
<property name="database.introspection.mysql.dbe5060" value="true" /> <property name="database.introspection.mysql.dbe5060" value="true" />
</jdbc-additional-properties> </jdbc-additional-properties>
>>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97 >>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97
>>>>>>> d7375d330251cab10a2296bbb292fcdb7cd6e847
<working-dir>$ProjectFileDir$</working-dir> <working-dir>$ProjectFileDir$</working-dir>
</data-source> </data-source>
</component> </component>

View File

@ -1,67 +1,87 @@
body { body {
width: 1500px; background: url("../image/fond.png") center center / cover no-repeat;
height: 1000px;
background: linear-gradient(#A0C2C8, #A6CD9E);
} }
.logo { .logo {
position: absolute; position: absolute;
margin: -3% 0 0 1%; margin: 0.5% 0 0 43.5%;
height: 30%; height: 25%;
} }
.titre { /*pas fini*/
margin: 4% 10% 0 25%;
font-weight: 50;
font-size: 450%;
}
.background { .titre {
position: absolute; position: absolute;
width: 50%; color: white;
height: 50%; margin: 15% 0 0 38%;
left: 25%;
top: 25%;
background: rgba(36, 60, 64, 0.7);
} }
.logoEmail { .logoProfile {
position: absolute; position: absolute;
margin: 6.5% 0 0 31%; border-radius: 10%;
height: 12%; margin: 20% 0 0 36%;
background: #243C40; height: 10%;
} }
.email {
position: absolute;
margin: 7% 0 0 37.5%;
width: 30%;
height: 9.5%;
background-color: #f0f0f0;
}
.logoPassword { .logoPassword {
position: absolute; position: absolute;
margin: 16.5% 0 0 31%; border-radius: 10%;
height: 12%; margin: 27% 0 0 36%;
background: #243C40; height: 10%;
}
.profile {
position: absolute;
border-radius: 2%;
margin: 20% 0 0 42%;
width: 22%;
height: 5%;
} }
.password { .password {
position: absolute; position: absolute;
margin: 17% 0 0 37.5%; border-radius: 2%;
width: 30%; margin: 27% 0 0 42%;
height: 9.5%; width: 22%;
background-color: #f0f0f0; height: 5%;
} }
/*forgot password*/
.forgot { .forgot {
position: absolute; position: absolute;
margin: 23.5% 0 0 42.5%; font-style: italic;
font-size: 130%; margin: 30% 0 0 52%;
color: #f0f0f0; 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;
}

View File

@ -2,30 +2,40 @@
<html lang="fr, en"> <html lang="fr, en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>{% block title %}Authentification{% endblock %}</title> <title>Authentification</title>
<link href="{{ asset('styles/css/authentification.css') }}" rel='stylesheet'> <link href="{{ asset('styles/css/login.css') }}" rel='stylesheet'>
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text><text y=%221.3em%22 x=%220.2em%22 font-size=%2276%22 fill=%22%23fff%22>sf</text></svg>"> <link rel="icon"
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous"> href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text><text y=%221.3em%22 x=%220.2em%22 font-size=%2276%22 fill=%22%23fff%22>sf</text></svg>">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<meta name="viewport" content="width=device-width, initial-scale=1">
{% block stylesheets %} {% block stylesheets %}
{% endblock %} {% endblock %}
</head> </head>
<body> <body>
<div class="col">
<section>
<div class="background"></div>
<div class="row" id="xxx"> <img class="logo" src="{{ asset('styles/image/LogoHegreConfort_SansFond.png') }}" alt="Logo Hegre et Confort">
<div class="col-2"><img class="logo" src="{{ asset('styles/image/LogoHegreConfort_SansFond.png') }}" alt="Logo Hegre et Confort"></div> <h1 class="titre">D'Hegre Et Confort</h1>
<div class="col-10"><h1 class="titre">D'HEGRE ET CONFORT</h1></div>
<img class="logoProfile" src="{{ asset('styles/image/profile.png') }}" alt="Logo Profil">
<img class="logoPassword" src="{{ asset('styles/image/password.png') }}" alt="Logo Password">
<label>
<input class="profile" type="email" placeholder="Adresse mail">
<input class="password" type="password" placeholder="Mot de passe">
<input type="checkbox" id="remember">
<label class="remember" for="remember">Se souvenir de moi</label>
</label>
<button class="login"> Connexion </button>
<p class="forgot"> Mot de passe oublié ?</p>
</section>
</div> </div>
<section>
<div class="background"></div>
<img class="logoEmail" src="{{ asset('styles/image/1.png') }}">
<input class="email" type="email" placeholder="Adresse mail">
<img class="logoPassword" src="{{ asset('styles/image/2.png') }}">
<input class="password" type="password" placeholder="Mot de passe">
</section>
<p class="forgot"> Mot de passe oublié ?</p>
</body> </body>
</html> </html>