Compare commits
No commits in common. "53b56f986f342cabe8e1f105d83b56d13f7155e4" and "05b64fc2b1e17491a87ea32353e6987b0e97bf50" have entirely different histories.
53b56f986f
...
05b64fc2b1
8
.idea/dataSources.xml
generated
8
.idea/dataSources.xml
generated
@ -1,13 +1,6 @@
|
|||||||
<?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="df0d05c3-5fc7-46c8-a0dc-7e45756a28ce">
|
|
||||||
<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
|
||||||
<data-source source="LOCAL" name="HegreEtConfort@172.20.96.1" uuid="7dfccb0e-433e-4f42-b6ce-6362f7e2187a">
|
<data-source source="LOCAL" name="HegreEtConfort@172.20.96.1" uuid="7dfccb0e-433e-4f42-b6ce-6362f7e2187a">
|
||||||
<driver-ref>postgresql</driver-ref>
|
<driver-ref>postgresql</driver-ref>
|
||||||
@ -58,7 +51,6 @@
|
|||||||
</jdbc-additional-properties>
|
</jdbc-additional-properties>
|
||||||
>>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97
|
>>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97
|
||||||
>>>>>>> d7375d330251cab10a2296bbb292fcdb7cd6e847
|
>>>>>>> d7375d330251cab10a2296bbb292fcdb7cd6e847
|
||||||
>>>>>>> 05b64fc2b1e17491a87ea32353e6987b0e97bf50
|
|
||||||
<working-dir>$ProjectFileDir$</working-dir>
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
</data-source>
|
</data-source>
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@ -1,81 +0,0 @@
|
|||||||
:root {
|
|
||||||
--sidebar-color: #93A8A8;
|
|
||||||
--main-bg-color: #C0D6CE;
|
|
||||||
--header-bg-color: #93A8A8;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
font-family: Arial, sans-serif;
|
|
||||||
display: flex;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar {
|
|
||||||
background-color: var(--sidebar-color);
|
|
||||||
width: 10%;
|
|
||||||
padding: 2%;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 1%;
|
|
||||||
font-size: 20px;
|
|
||||||
color: azure;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.main-content {
|
|
||||||
flex: 1;
|
|
||||||
background-color: var(--main-bg-color);
|
|
||||||
min-height: 100vh;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.calendar-header {
|
|
||||||
background-color: var(--header-bg-color);
|
|
||||||
padding: 1%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.day-header {
|
|
||||||
width: 9%;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-button {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
cursor: pointer;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.calendar-title {
|
|
||||||
font-size: clamp(24px, 5vw, 48px);
|
|
||||||
text-align: center;
|
|
||||||
margin-top: 10%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.logoEmail{
|
|
||||||
width: 50%;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
|
||||||
.sidebar {
|
|
||||||
width: 15%;
|
|
||||||
padding: 1%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.day-header {
|
|
||||||
font-size: 18px;
|
|
||||||
width: 12%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB |
@ -18,11 +18,7 @@ class AuthenticationController extends AbstractController
|
|||||||
// last username entered by the user
|
// last username entered by the user
|
||||||
$lastUsername = $authenticationUtils->getLastUsername();
|
$lastUsername = $authenticationUtils->getLastUsername();
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
return $this->render('calendrier/index.html.twig', [
|
|
||||||
=======
|
|
||||||
return $this->render('login/index.html.twig', [
|
return $this->render('login/index.html.twig', [
|
||||||
>>>>>>> 05b64fc2b1e17491a87ea32353e6987b0e97bf50
|
|
||||||
'last_username' => $lastUsername,
|
'last_username' => $lastUsername,
|
||||||
'error' => $error,
|
'error' => $error,
|
||||||
]);
|
]);
|
||||||
|
|||||||
@ -1,55 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="fr">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>{% block title %}Authentification{% endblock %}</title>
|
|
||||||
<link href="{{ asset('styles/css/calendrier.css') }}" rel="stylesheet">
|
|
||||||
{% block stylesheets %}
|
|
||||||
{% endblock %}
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="sidebar">
|
|
||||||
<div class="sidebar-button">
|
|
||||||
<img class="logoEmail" src="{{ asset('styles/image/6.png') }}">
|
|
||||||
</div>
|
|
||||||
<div class="sidebar-button">
|
|
||||||
<img class="logoEmail" src="{{ asset('styles/image/3.png') }}">
|
|
||||||
</div>
|
|
||||||
<span>Create Intervention</span>
|
|
||||||
<div class="sidebar-button">
|
|
||||||
<img class="logoEmail" src="{{ asset('styles/image/4.png') }}">
|
|
||||||
</div>
|
|
||||||
<span>Choose heating engineer</span>
|
|
||||||
<div class="sidebar-button">
|
|
||||||
<img class="logoEmail" src="{{ asset('styles/image/5.png') }}">
|
|
||||||
</div>
|
|
||||||
<span>Modify Intervention</span>
|
|
||||||
<div class="sidebar-button">
|
|
||||||
<img class="logoEmail" src="{{ asset('styles/image/7.png') }}">
|
|
||||||
</div>
|
|
||||||
<span>Surname Name</span>
|
|
||||||
|
|
||||||
<div class="sidebar-button">
|
|
||||||
<img class="logoEmail" src="{{ asset('styles/image/LogoHegreConfort_SansFond.png') }}">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="main-content">
|
|
||||||
<div class="calendar-header" style="gap: 50px">
|
|
||||||
<div class="day-header">Mo</div>
|
|
||||||
<div class="day-header">Tu</div>
|
|
||||||
<div class="day-header">We</div>
|
|
||||||
<div class="day-header">Th</div>
|
|
||||||
<div class="day-header">Fr</div>
|
|
||||||
<div class="day-header">Sa</div>
|
|
||||||
<div class="day-header">Su</div>
|
|
||||||
</div>
|
|
||||||
<div class="calendar-title">Calendar</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user