From abba8ee9ae988cdc9764fd8c46c6f68d2e8d6be2 Mon Sep 17 00:00:00 2001
From: Matias Mennecart <matias.mennecart.etu@univ-lille.fr>
Date: Thu, 21 Dec 2023 19:31:28 +0100
Subject: [PATCH] Ajouts de la page Conducteur et fix des liens vers la page de
reservation
---
conducteur.html | 43 +++++++---
contact.html | 4 +-
css/conducteur.css | 167 +++++++++++++++++++++++++++++++++++-
faq.html | 4 +-
forms/contact-result.html | 77 ++++++-----------
forms/login-result.html | 2 +-
forms/reserver-result.html | 2 +-
forms/reserver-result2.html | 2 +-
index.html | 2 +-
info.html | 4 +-
login.html | 2 +-
reserver.html | 2 +-
12 files changed, 232 insertions(+), 79 deletions(-)
diff --git a/conducteur.html b/conducteur.html
index 2953ef7..c834aeb 100644
--- a/conducteur.html
+++ b/conducteur.html
@@ -2,29 +2,46 @@
<html>
<head>
<meta charset='utf-8'>
- <title>Klaxit - Reserver</title>
- <link rel='stylesheet' href="./public/styles.css">
- <link rel='stylesheet' href="./public/conducteur.css">
- <link rel='stylesheet' href="./public/footer.css">
+ <title>Klaxit</title>
+ <link rel='stylesheet' href="./css/styles.css">
+ <link rel='stylesheet' href="./css/login.css">
+ <link rel='stylesheet' href="./css/footer.css">
</head>
<body>
<header>
<div class="nav-bar">
<nav>
- <a href="index.html">Accueil</a>
- <a href="reserver.html">Passager</a>
- <a href="login.html" class="login-button">Login</a>
+ <a class="img" href="index.html"><img src="./css/images/logoKlaxit_BBCD_Color.webp" alt="Logo Klaxit"></a>
+ <div>
+ <a href="conducteur.html">CONDUCTEUR</a>
+ <a href="reserver.html">PASSAGER</a>
+ </div>
</nav>
</div>
</header>
<main>
- <div class="conducteur-panel">
- <form action="./forms/conducteur-result.html" method="post">
+ <div class="connect-panel">
+
+ <div class="panel">
+ <div class="title">
+ <h1>Connectez-vous</h1>
+ </div>
+ <form action="./forms/login-result.html" method="post">
+ <div>
+ <label for="mail">Identifiant :</label>
+ <input type="email" id="mail"/>
+ <label for="paswd">Mot de passe :</label>
+ <input type="password" id="psswd">
+ <p class="NB">*Vous devez utiliser les identifiants informatique que vous utilisé sur les ordinateurs de l’entreprise</p>
+ </div>
+ <div class="button">
+ <button class="connect-button" type="submit">Connection</button>
+ </div>
- </form>
- </div>
+ </form>
+ </div>
</main>
@@ -37,7 +54,7 @@
</div>
<div class="s-column">
<a href="conducteur.html">Conducteur</a> <br />
- <a href="passager.html">Passager</a> <br />
+ <a href="reserver.html">Reserver</a> <br />
<a href="faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
@@ -49,4 +66,4 @@
</footer>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/contact.html b/contact.html
index 8d78551..6b2a30f 100644
--- a/contact.html
+++ b/contact.html
@@ -16,7 +16,7 @@
<div><li><a href= "passager.html">Passager</a></li></div> -->
<div><a href= "index.html">Acceuil</a></div>
<div><a href= "conducteur.html">Conducteur</a></div>
- <div><a href= "passager.html">Passager</a></div>
+ <div><a href= "reserver.html">Reserver</a></div>
</div>
</nav>
<div class="back"></div>
@@ -77,7 +77,7 @@
</div>
<div class="s-column">
<a href="conducteur.html">Conducteur</a> <br />
- <a href="passager.html">Passager</a> <br />
+ <a href="reserver.html">Reserver</a> <br />
<a href="faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/css/conducteur.css b/css/conducteur.css
index 6ae5491..8b24679 100644
--- a/css/conducteur.css
+++ b/css/conducteur.css
@@ -4,12 +4,171 @@
}
-header {
+ body {
+ margin: 0;
+}
+
+html {
+ background-color: #231543;
+ font-family: "Inter";
+}
+
+nav {
+ position: sticky;
+ top: 0px;
+ background-color: white;
+ padding: 10px;
+}
+
+h1{
+ font-size: 50px;
+ margin-top: 0;
+}
+
+h2{
+ margin: 0;
+}
+
+.back {
+ z-index: -1;
+ background: url(https://d2pgkmld22m7v7.cloudfront.net/assets/images/header-default.png) top right no-repeat;
+ background-size:contain;
+ position: absolute;
+ height:70%;
+ width: 100%;
+ left: 0;
+ top: 0;
+
+}
+.boxNav{
display: flex;
+ justify-content: space-evenly;
+ padding: 7px;
+}
+
+a{
+ text-decoration: none;
+ font-weight: bold;
+ color: #3f2875;
+ font-size: 20px;
+
+}
+
+header{
+ font-weight: bold;
+ color: white;
+ height: fit-content;
+}
+
+.textHeader{
+ display: flex;
+ align-items: center;
justify-content: center;
- margin-top: 2%;
+ height: 400px;
+
}
-main {
+
+.test {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+}
+
+.corp{
+ padding-bottom: 220px;
+ background-color: #ECEDFEFF;
+}
+
+.corpContainer{
+ height: fit-content;
+ width: 800px;
+ background-color:white;
+ border-radius: 50px;
+ margin-top: 30px;
+}
+
+.Container{
+ margin: 25px;
+ width: auto;
display: flex;
justify-content: center;
-}
\ No newline at end of file
+ height: fit-content;
+}
+
+
+
+
+
+
+div.connection-success {
+ background-color: #B0F2B6;
+ font-family: "Inter";
+ color: black;
+ text-align: center;
+
+}
+div.connection-success>a {
+ text-decoration: underline;
+ background-color: #B0F2B6;
+ color: black;
+}
+
+
+footer {
+ position: sticky;
+ bottom: 0px;
+}
+
+.connect-panel {
+ background-color: white;
+ border-radius: 45px;
+ box-shadow: 0px 100px 400px rgba(0,0,0,0.04), 0px 41.7776px 33.4221px rgba(0,0,0,0.0287542);
+ height : 400px;
+ margin-top: 5px;
+
+}
+
+.texte{
+ display: flex;
+ flex-direction: column;
+ padding-left: 50px;
+ padding-top: 60px;
+ font-size: 35px;
+}
+
+.panel{
+ text-align: center;
+}
+
+form>div>input {
+ width: 150%;
+ height: 23px;
+ background-color:#D9D9D9;
+ border: none;
+ margin-top: 2px;
+}
+
+div.button {
+ cursor: pointer;
+ width: 70%;
+ margin-left: 60%;
+ background: linear-gradient(201.97deg, #9968F7 12.27%, #3936CC 83.53%);
+ border-radius: 45px;
+ margin-top: 25%;
+}
+
+div>button {
+ cursor: pointer;
+ display: contents;
+ font-size: 45px;
+ font-family: "Inter";
+ font-style: oblique;
+ width: 100%;
+ color: white;
+}
+
+form {
+ font-family: "Inter";
+
+}
+
diff --git a/faq.html b/faq.html
index 01eb7eb..c906ad6 100644
--- a/faq.html
+++ b/faq.html
@@ -16,7 +16,7 @@
<div><li><a href= "passager.html">Passager</a></li></div> -->
<div><a href= "index.html">Acceuil</a></div>
<div><a href= "conducteur.html">Conducteur</a></div>
- <div><a href= "passager.html">Passager</a></div>
+ <div><a href= "reserver.html">Reserver</a></div>
</div>
</nav>
<div class="back"></div>
@@ -82,7 +82,7 @@
</div>
<div class="s-column">
<a href="conducteur.html">Conducteur</a> <br />
- <a href="passager.html">Passager</a> <br />
+ <a href="reserver.html">Reserver</a> <br />
<a href="faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/forms/contact-result.html b/forms/contact-result.html
index da2a711..e9063bc 100644
--- a/forms/contact-result.html
+++ b/forms/contact-result.html
@@ -2,9 +2,10 @@
<html lang="fr">
<head>
<meta charset="UTF-8">
-<title>Contact</title>
-<link rel="stylesheet" href="../css/contact.css" />
-<link rel="stylesheet" href="../css/footer.css" />
+<title>Conducteur</title>
+<link rel="stylesheet" href="./css/info.css" />
+<link rel="stylesheet" href="./css/footer.css" />
+<link rel="stylesheet" href="./css/conducteur.css" />
</head>
<body>
@@ -14,17 +15,17 @@
<!--<div><li><a href= "index.html">Acceuil</a></li></div>
<div><li><a href= "conducteur.html">Conducteur</a></li></div>
<div><li><a href= "passager.html">Passager</a></li></div> -->
- <div><a href= "../index.html">Acceuil</a></div>
- <div><a href= "../conducteur.html">Conducteur</a></div>
- <div><a href= "../passager.html">Passager</a></div>
+ <div><a href= "index.html">Acceuil</a></div>
+ <div><a href= "contact.html">Contact</a></div>
+ <div><a href= "passager.html">Passager</a></div>
</div>
</nav>
<div class="back"></div>
<div class="textHeader">
<div class="test">
- <h1>Contact</h1>
- <h2>Bienvenue sur notre formulaire de contact</h2>
- <p>Vous aller pouvoir nous envoyer une demande de message via le formulaire ci-dessous.</p>
+ <h1>Conducteur ?</h1>
+ <h2>Veuillez renseigner vos informations ci-dessous.</h2>
+ <p>Nous nous chargeons de vous trouvez des passager.</p>
</div>
</div>
@@ -32,48 +33,24 @@
</header>
<main>
<section class="corp">
- <div class="containerImg">
- <div class="fondImg">
- <img class="imgRect" src="../img/RectangleMixe.png" alt="rectangle" />
+ <div class="Container">
+ <div class="corpContainer">
+ <div class="connect-panel">
+ <div class="panel">
+ <form>
+ <div class="texte">
+ <label for="Départ">Votre point de départ :</label>
+ <input type="string" id="lieux"/>
+ <label for="Heure">Heure de départ :</label>
+ <input type="nombre" id="heure">
+ </div>
+ <div class="button">
+ <button class="confirm-button" type="submit">Confirmer</button>
+ </div>
+ </form>
+ </div>
</div>
</div>
-
-
-
- <div class="formContainer">
- <div class="corpImg">
- <div class="container-connection">
- <div class="connection-success">
- Vous avez bien envoyée votre requête ! <br>
- Nous vous répondrons dans les plus bref délais. <br>
- Vous pouvez desormais <a href="../index.html">retourner a l'accueil.</a>
- </div>
- </div>
-
- <form>
- <label class="titreForm">Formulaire de contact : <br><br></label>
- <div class="dispoForm">
- <label class="nomForm">
- <input name="submitted-name" autocomplete="nom" placeholder="Votre nom"/>
- </label>
- <label class="prenomForm">
- <input name="submitted-surname" autocomplete="prenom" placeholder="Votre prénom"/>
- </label><br><br>
- </div>
- <label id="email">
- <input type="email" name="email" id="emailform" placeholder="Votre adresse e-mail"/>
- </label>
- <label>
- <br><br>
- <textarea name="text" id="text" placeholder="Votre message"></textarea>
- </label>
- <label>
- <input class="btn-purple" type="submit" name="send" value="ENVOYER VOTRE MESSAGE">
- </label>
- </form>
- </div>
- </div>
-
</section>
</main>
@@ -87,7 +64,7 @@
</div>
<div class="s-column">
<a href="../conducteur.html">Conducteur</a> <br />
- <a href="../passager.html">Passager</a> <br />
+ <a href="../reserver.html">Reserver</a> <br />
<a href="../faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/forms/login-result.html b/forms/login-result.html
index fb8cb8a..b2824bd 100644
--- a/forms/login-result.html
+++ b/forms/login-result.html
@@ -58,7 +58,7 @@
</div>
<div class="s-column">
<a href="../conducteur.html">Conducteur</a> <br />
- <a href="../passager.html">Passager</a> <br />
+ <a href="../reserver.html">Reserver</a> <br />
<a href="../faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/forms/reserver-result.html b/forms/reserver-result.html
index 6a54d99..541f156 100644
--- a/forms/reserver-result.html
+++ b/forms/reserver-result.html
@@ -74,7 +74,7 @@
</div>
<div class="s-column">
<a href="../conducteur.html">Conducteur</a> <br />
- <a href="../passager.html">Passager</a> <br />
+ <a href="../reserver.html">Reserver</a> <br />
<a href="../faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/forms/reserver-result2.html b/forms/reserver-result2.html
index 6140a02..357af25 100644
--- a/forms/reserver-result2.html
+++ b/forms/reserver-result2.html
@@ -54,7 +54,7 @@
</div>
<div class="s-column">
<a href="../conducteur.html">Conducteur</a> <br />
- <a href="../passager.html">Passager</a> <br />
+ <a href="../reserver.html">Reserver</a> <br />
<a href="../faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/index.html b/index.html
index 78e197c..4f5c5b1 100644
--- a/index.html
+++ b/index.html
@@ -48,7 +48,7 @@
</div>
<div class="s-column">
<a href="conducteur.html">Conducteur</a> <br />
- <a href="passager.html">Passager</a> <br />
+ <a href="reserver.html">Reserver</a> <br />
<a href="faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/info.html b/info.html
index aae3509..63a294f 100644
--- a/info.html
+++ b/info.html
@@ -16,7 +16,7 @@
<div><li><a href= "passager.html">Passager</a></li></div> -->
<div><a href= "index.html">Acceuil</a></div>
<div><a href= "conducteur.html">Conducteur</a></div>
- <div><a href= "passager.html">Passager</a></div>
+ <div><a href= "reserver.html">Reserver</a></div>
</div>
</nav>
<div class="back"></div>
@@ -82,7 +82,7 @@
</div>
<div class="s-column">
<a href="conducteur.html">Conducteur</a> <br />
- <a href="passager.html">Passager</a> <br />
+ <a href="reserver.html">Reserver</a> <br />
<a href="faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/login.html b/login.html
index 8de442c..25ca7f7 100644
--- a/login.html
+++ b/login.html
@@ -54,7 +54,7 @@
</div>
<div class="s-column">
<a href="conducteur.html">Conducteur</a> <br />
- <a href="passager.html">Passager</a> <br />
+ <a href="reserver.html">Reserver</a> <br />
<a href="faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
diff --git a/reserver.html b/reserver.html
index 710b4dc..29c8118 100644
--- a/reserver.html
+++ b/reserver.html
@@ -57,7 +57,7 @@
</div>
<div class="s-column">
<a href="conducteur.html">Conducteur</a> <br />
- <a href="passager.html">Passager</a> <br />
+ <a href="reserver.html">Reserver</a> <br />
<a href="faq.html">FAQ</a> <br />
</div>
<div class="t-colum">
--
GitLab