Pauline/NDI-2020
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
JunkJumper 2020-12-04 05:20:08 +01:00
commit eb1a008503
14 changed files with 116 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/workspace.xml generated
View File

@ -61,7 +61,7 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1607026953826</updated>
<workItem from="1607026956145" duration="13623000" />
<workItem from="1607026956145" duration="16554000" />
</task>
<servers />
</component>

BIN
Documentation/ihm.bmpr Normal file
View File

Binary file not shown.

BIN
Documentation/ihm/IHMDevCoffee.pdf Normal file
View File

Binary file not shown.

5
Documentation/lientAPIpourSurf.txt Normal file
View File

@ -0,0 +1,5 @@
https://github.com/swrobel/meta-surf-forecast
https://fr.magicseaweed.com/developer/forecast-api
https://www.worldweatheronline.com/developer/api/docs/marine-weather-api.aspx

2
connexion.html
View File

@ -21,7 +21,7 @@
<!-- Login Form -->
<form>
<input type="text" id="login" class="fondu second" name="login" placeholder="Nom d'utilisateur">
<input type="text" id="password" class="fondu third" name="password" placeholder="Mot de passe">
<input type="password" id="password" class="fondu third" name="password" placeholder="Mot de passe">
<input type="submit" class="fondu fourth" value="Se connecter">
</form>

36
css/connexion.css
View File

@ -2,7 +2,7 @@
a {
color: #92badd;
color: #197abb;
display:inline-block;
text-decoration: none;
font-weight: 400;
@ -15,7 +15,7 @@ h2 {
text-transform: uppercase;
display:inline-block;
margin: 40px 8px 10px 8px;
color: #cccccc;
color: white;
}
@ -34,7 +34,7 @@ h2 {
#contenu {
background: #fff;
background: rgb(255, 255, 255);
padding: 30px;
width: 90%;
max-width: 450px;
@ -43,13 +43,22 @@ h2 {
-webkit-box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
text-align: center;
border-color: #0073be;
border-style: solid;
border-top-width: 3px;
border-bottom-width: 3px;
border-right-width: 5px;
border-left-width: 5px;
border-radius: 10px;
}
#pied {
background-color: #f6f6f6;
border-top: 1px solid #dce8f1;
border-top: 1px solid #197abb;
padding: 25px;
text-align: center;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
@ -62,7 +71,7 @@ h2.inactive {
h2.active {
color: #0d0d0d;
border-bottom: 2px solid #5fbae9;
border-bottom: 2px solid #197abb;
}
@ -70,7 +79,7 @@ h2.active {
/* FORM TYPOGRAPHY*/
input[type=button], input[type=submit], input[type=reset] {
background-color: #56baed;
background-color: #197abb;
border: none;
color: white;
padding: 15px 80px;
@ -86,11 +95,12 @@ input[type=button], input[type=submit], input[type=reset] {
-moz-transition: all 0.3s ease-in-out;
-ms-transition: all 0.3s ease-in-out;
-o-transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out, transform 0.2;
}
input[type=button]:hover, input[type=submit]:hover, input[type=reset]:hover {
background-color: #39ace7;
background-color: #197abb;
font-size: 18px;
}
input[type=button]:active, input[type=submit]:active, input[type=reset]:active {
@ -101,7 +111,7 @@ input[type=button]:active, input[type=submit]:active, input[type=reset]:active
transform: scale(0.95);
}
input[type=text] {
input[type=text], input[type=password] {
background-color: #f6f6f6;
border: none;
color: #0d0d0d;
@ -120,12 +130,12 @@ input[type=text] {
transition: all 0.5s ease-in-out;
}
input[type=text]:focus {
input[type=text]:focus, input[type=password]:focus {
background-color: #fff;
border-bottom: 2px solid #5fbae9;
border-bottom: 2px solid #197abb;
}
input[type=text]::placeholder {
input[type=text]::placeholder, input[type=password]::placeholder {
color: #cccccc;
}
@ -215,7 +225,7 @@ input[type=text]::placeholder {
bottom: -10px;
width: 0;
height: 2px;
background-color: #56baed;
background-color: #197abb;
content: "";
transition: width 0.2s;
}

5
css/index.css
View File

@ -1,3 +1,8 @@
html
{
background-color: #dbdbdbde;
}
body
{
font-style: normal;

28
css/inscription.css
View File

@ -1,7 +1,7 @@
/* BASIC */
a {
color: #92badd;
color: #197abb;
display:inline-block;
text-decoration: none;
font-weight: 400;
@ -41,6 +41,13 @@ h2 {
-webkit-box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
box-shadow: 0 30px 60px 0 rgba(0,0,0,0.3);
text-align: center;
border-color: #0073be;
border-style: solid;
border-top-width: 3px;
border-bottom-width: 3px;
border-right-width: 5px;
border-left-width: 5px;
border-radius: 10px;
}
#pied {
@ -60,7 +67,7 @@ h2.inactive {
h2.active {
color: #0d0d0d;
border-bottom: 2px solid #5fbae9;
border-bottom: 2px solid #0073be;
}
@ -68,7 +75,7 @@ h2.active {
/* FORM TYPOGRAPHY*/
input[type=button], input[type=submit], input[type=reset] {
background-color: #56baed;
background-color: #0073be;
border: none;
color: white;
padding: 15px 80px;
@ -84,11 +91,12 @@ input[type=button], input[type=submit], input[type=reset] {
-moz-transition: all 0.3s ease-in-out;
-ms-transition: all 0.3s ease-in-out;
-o-transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out, transform 0.2;
}
input[type=button]:hover, input[type=submit]:hover, input[type=reset]:hover {
background-color: #39ace7;
background-color: #197abb;
font-size: 18px;
}
input[type=button]:active, input[type=submit]:active, input[type=reset]:active {
@ -99,7 +107,7 @@ input[type=button]:active, input[type=submit]:active, input[type=reset]:active
transform: scale(0.95);
}
input[type=text] {
input[type=text], input[type=password]{
background-color: #f6f6f6;
border: none;
color: #0d0d0d;
@ -118,12 +126,12 @@ input[type=text] {
transition: all 0.5s ease-in-out;
}
input[type=text]:focus {
input[type=text]:focus, input[type=password]:focus {
background-color: #fff;
border-bottom: 2px solid #5fbae9;
border-bottom: 2px solid #197abb;
}
input[type=text]::placeholder {
input[type=text]::placeholder, input[type=password]::placeholder {
color: #cccccc;
}
@ -230,7 +238,7 @@ input[type=text]::placeholder {
bottom: -10px;
width: 0;
height: 2px;
background-color: #56baed;
background-color: #0073be;
content: "";
transition: width 0.2s;
}

9
css/menu.css
View File

@ -1,3 +1,10 @@
#Menu
{
width: 100%;
position: sticky;
top: 0;
}
#blockMenu
{
float: right;
@ -84,4 +91,4 @@
height: 10px;
float: right;
background-color: #5496c2;
}
}

30
formulaire.html
View File

@ -19,9 +19,29 @@
<legend> Lieu et période </legend>
<label for="spot">Spot</label>
<select name="spot" id="spot" required>
<option value="ville1">Ville 1</option>
<option value="ville2">Ville 2</option>
<option value="ville3">Ville 3</option>
<option value="nice">Nice</option>
<option value="roquebrune">Roquebrune Cap Martin</option>
<option value="monaco">Monaco</option>
<option value="cap_d_ail">Cap d'Ail</option>
<option value="beaulieu">Beaulieu</option>
<option value="eze">Eze</option>
<option value="stjeancapferrat">Saint-Jean-Cap-Ferrat</option>
<option value="villefranche">Villefranche sur Mer</option>
<option value="menton">Menton</option>
<option value="stlaurentduvar">Saint-Laurent-du-Var</option>
<option value="cagnessurmer">Cagnes sur Mer</option>
<option value="villeneuveloubet">Villeneuve-Loubet</option>
<option value="ingolstadt_germany">Ingolstadt</option>
<option value="juanlespins">Juan les Pins</option>
<option value="antibes">Antibes</option>
<option value="capantibes">Cap d'Antibes</option>
<option value="antibes">Antibes</option>
<option value="golfjuan">Golfe Juan</option>
<option value="cannes">Cannes</option>
<option value="canneslabocca">Cannes La Bocca</option>
<option value="mandelieu">Mandelieu</option>
<option value="theoule">Théoules sur Mer</option>
<option value="iles">Iles de Lérins</option>
</select>
<br />
<label>Date de début</label>
@ -33,11 +53,11 @@
<br />
<label>Heure début</label>
<input type="time" id="begin-time" name="begin-time" min="00:00" max=23:59 required>
<input type="time" id="begin-time" name="begin-time" min="00:00" max="23:59" required>
<br />
<label>Heure de fin</label>
<input type="time" id="bend-time" name="end-time" min="00:00" max=23:59 required>
<input type="time" id="bend-time" name="end-time" min="00:00" max="23:59" required>
</fieldset>

8
inscription.html
View File

@ -19,18 +19,12 @@
<!-- Login Form -->
<form>
<<<<<<< HEAD
<input type="text" id="login" class="fondu second" name="login" placeholder="Nom d'utilisateur">
<input type="text" id="password" class="fondu third" name="password" placeholder="Mot de passe">
<input type="submit" class="fondu fourth" value="S'inscrire">
=======
<input type="text" id="nom" class="fondu premier" name="nom" placeholder="Nom">
<input type="text" id="prenom" class="fondu deuxieme" name="prenom" placeholder="Prenom">
<input type="text" id="mail" class="fondu troisieme" name="mail" placeholder="E-mail">
<input type="text" id="login" class="fondu quatrieme" name="login" placeholder="Nom d'utilisateur">
<input type="text" id="password" class="fondu cinquieme" name="login" placeholder="Mot de passe">
<input type="password" id="password" class="fondu cinquieme" name="password" placeholder="Mot de passe">
<input type="submit" class="fondu sixieme" value="S'inscrire">
>>>>>>> b9bf5b2edb8e213d4bd18f03395ccc8c4d5450d2
</form>
<!-- Remind Passowrd -->

0
js/menu Normal file
View File

48
menu.html
View File

@ -9,29 +9,31 @@
</head>
<body>
<div id="blockLogo">
<img id="logo" src="img/logoV2.jpg">
<div id="Menu">
<div id="blockLogo">
<img id="logo" src="img/logoV2.jpg">
</div>
<!--Block de Menu-->
<nav id="blockMenu">
<ul id="lineMenu">
<li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu" href="#">Acceuil</a>
</li>
<li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu" href="#">Profil</a>
</li>
<li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu" href="#">Météo</a>
</li>
<li class="colonneSign animationButtonMenu underLineHover">
<a class="aMenu" href="connexion.html">Connexion</a>
</li>
<li class="colonneSign animationButtonMenu underLineHover">
<a class="aMenu" href="inscription.html">Inscription</a>
</li>
</ul>
</nav>
<div id="blockDeco"></div>
</div>
<!--Block de Menu-->
<nav id="blockMenu">
<ul id="lineMenu">
<li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu" href="#">Acceuil</a>
</li>
<li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu" href="#">Profil</a>
</li>
<li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu" href="#">Météo</a>
</li>
<li class="colonneSign animationButtonMenu underLineHover">
<a class="aMenu" href="connexion.html">Connexion</a>
</li>
<li class="colonneSign animationButtonMenu underLineHover">
<a class="aMenu" href="inscription.html">Inscription</a>
</li>
</ul>
</nav>
<div id="blockDeco"></div>
</body>
</html>

6
php/Script/traitementInscription.php
View File

@ -1,4 +1,6 @@
<?php
include Classe.Utilisateur::class;
include Classe.Utilisateur::class;
$utilisateur = new Utilisateur(NULL, NULL, NULL,$_POST['login'], NULL, $_POST['password']);
$unUtilisateur = new Utilisateur(NULL, $_POST['nom'], $_POST['prenom'],$_POST['login'], $_POST['mail'], $_POST['password']);
print("Votre inscription a bien été effectuée");