Merge branch 'main' of https://github.com/DevDuCoffee/Nuit-De-L-Info-2020 into main

modid
Ajout de schèma de BDD
2020-12-04 06:12:23 +01:00 · 2020-12-04 06:12:15 +01:00 · 2020-12-04 06:00:55 +01:00 · 2020-12-04 05:57:03 +01:00 · 2020-12-04 05:53:04 +01:00 · 2020-12-04 05:52:59 +01:00
25 changed files with 570 additions and 145 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="5db01d37-ed98-4df0-8a3f-85093d5456ef" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/inscription.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/connexion.html" beforeDir="false" afterPath="$PROJECT_DIR$/connexion.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/connexion.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/connexion.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/creation.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/inscription.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/creation.html" beforeDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ComposerSettings">
-    <execution />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="HTML File" />
-        <option value="CSS File" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="1lA5FnXumkMauI2VLRUvRUzSLTD" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="list.type.of.created.stylesheet" value="CSS" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\Nuit-De-L-Info-2020" />
-    </key>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="5db01d37-ed98-4df0-8a3f-85093d5456ef" name="Default Changelist" comment="" />
-      <created>1607026953826</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1607026953826</updated>
-      <workItem from="1607026956145" duration="13623000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
--- a/Documentation/ihm.bmpr
+++ b/Documentation/ihm.bmpr
--- a/Documentation/ihm/IHMDevCoffee.pdf
+++ b/Documentation/ihm/IHMDevCoffee.pdf
--- a/Documentation/lientAPIpourSurf.txt
+++ b/Documentation/lientAPIpourSurf.txt
@ -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
--- a/Documentation/schèmaBDD/UMLBDD.png
+++ b/Documentation/schèmaBDD/UMLBDD.png
--- a/Documentation/schèmaBDD/schèmaRelationnel.png
+++ b/Documentation/schèmaBDD/schèmaRelationnel.png
--- a/README.md
+++ b/README.md
@ -1 +1,29 @@
-# Nuit-De-L-Info-2020
+# Projet Nuit De L'Info 2020 - Equipe DevDuCoffee
+
+## Dépendences
+
+Le projet necessite d'être lancé sous une machine disposant d'un serveur web (WAMP/LAMP/XAMP/MAMP...) et des services Apaches, php 7.4+.
+
+## Défis
+
+- Défi [Principal de la nuit](https://www.nuitdelinfo.com/inscription/defis/174)
+- Défi [Transcender la distance](https://www.nuitdelinfo.com/inscription/defis/284)
+- Défi [GridPocket Data Lake](https://www.nuitdelinfo.com/inscription/defis/285)
+- Défi [EMERGENCY MEETING!!](https://www.nuitdelinfo.com/inscription/defis/273)
+- Défi [Neurchi Illuminati](https://www.nuitdelinfo.com/inscription/defis/267)
+
+## L'équipe
+
+- [Alexandre](https://github.com/lemoinealexandre) : Étudiant en L3 MIAGE
+- [Hugo](https://github.com/lh-deux) : Étudiant en DUT informatique (2e Année)
+- [Lisa](https://github.com/LisaDes) : Étudiante en L3 MIAGE
+- [Manon](https://github.com/ThebaultManon) : Étudiante en L2 Info
+- [Mathieu](https://github.com/RethersMathieu) : Étudiant en L3 MIAGE
+- [Nicolas](https://github.com/Nicolas-Corbiere) : Étudiant en L3 MIAGE
+- [Pauline](https://github.com/JunkJumper) : Étudiantæ en DUT informatique (2e Année)
+- [Seb](https://github.com/NeBuBuLL) : Étudiant en Master 1 Info
+- [Yannick](https://github.com/AlcarazYannick) : Étudiant en L3 MIAGE
+
+## Licence
+
+Ce projet est disponible sous licence creative common Attribution 4.0 (voir [Licence.MD](https://github.com/DevDuCoffee/Nuit-De-L-Info-2020/blob/main/LICENSE.md))
--- a/connexion.html
+++ b/connexion.html
@ -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>

--- a/css/connexion.css
+++ b/css/connexion.css
@ -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;
 }
--- a/css/garde.css
+++ b/css/garde.css
@ -0,0 +1,16 @@
+#blockPrincipale
+{
+    margin-top: 60px;
+    margin-right: 15%;
+    margin-left: 15%;
+}
+
+.lineText
+{
+    color: white;
+}
+
+.blockText
+{
+    background-color: #0073be;
+}
--- a/css/historiqueformulaire.css
+++ b/css/historiqueformulaire.css
@ -0,0 +1,125 @@
+body{
+    background-image: url("photocss/background.jpg");
+    height: 100%;
+    background-repeat: no-repeat;
+    background-size:100%;
+}
+#blockBlock {
+    margin-right: 10%;
+    margin-left: 10%;
+    background: rgba(255, 255, 255,0.5);
+    padding-top: 10%;
+    padding-bottom: 0%;
+    -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;
+}
+td{
+    margin: auto;
+    border: black;
+    border-width: 2px;
+    border-style: solid;
+    border-radius: 5px;
+    padding: 5px;
+
+}
+table{
+    border-collapse: collapse;
+    margin-bottom: 40%;
+    margin-left: 33%;
+}
+
+#Menu
+{
+    width: 100%;
+    top: 0;
+}
+
+#blockMenu
+{
+    float: right;
+    width: 95%;
+}
+
+#lineMenu
+{
+    list-style-type: none;
+    overflow: hidden;
+    background-color: #0073be;
+    height: 49px;
+    margin: 0px;
+    padding: 0px;
+}
+
+.colonneMenu
+{
+    float: left;
+    font-size: 17px;
+    padding: 14px 20px;
+    background-color: transparent;
+    color: white;
+    transition: background-color 0.1s, padding 0.1s, font-size 0.1s,transform 0.2s;
+    cursor: pointer;
+}
+
+.animationButtonMenu:hover
+{
+    background-color: #197abb;
+    font-size: 19px;
+    padding: 13px 17px;
+}
+
+.aMenu
+{
+    color: white;
+    text-decoration: none;
+}
+
+.colonneSign
+{
+    float: right;
+    font-size: 17px;
+    padding: 14px 20px;
+    background-color: transparent;
+    color: white;
+    transition: background-color 0.2s, padding 0.2s, font-size 0.2s,transform 0.2s;
+    cursor: pointer;
+}
+
+.underLineHover:after
+{
+    display: block;
+    width: 0;
+    height: 2px;
+    background-color: white;
+    bottom: -10px;
+    content: "";
+    transition: width 0.2s;
+}
+
+.underLineHover:hover:after
+{
+    width: 100%;
+}
+
+
+#blockLogo
+{
+    float: left;
+    width: 5%;
+}
+
+#logo
+{
+    width: 100%;
+    height: 110px;
+}
+
+
--- a/css/index.css
+++ b/css/index.css
@ -1,3 +1,8 @@
+html
+{
+    background-color: #dbdbdbde;
+}
+
 body
 {
    font-style: normal;
--- a/css/inscription.css
+++ b/css/inscription.css
@ -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;
 }
--- a/css/menu.css
+++ b/css/menu.css
@ -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;
-}
+}
--- a/css/photocss/background.jpg
+++ b/css/photocss/background.jpg
--- a/formulaire.html
+++ b/formulaire.html
@ -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>

--- a/garde.html
+++ b/garde.html
@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="css/index.css">
+    <link rel="stylesheet" href="css/garde.css">
+</head>
+
+<body>
+    <div id="blockPrincipale">
+        <div class="blockText">
+            <p class="lineText">
+                Surfrider Foundation Europe est une association loi 1901 qui agit depuis 30 ans pour la préservation des
+                océans et de la santé de ses usagers.<br>
+                Nous travaillons sur 3 enjeux : les déchets, la qualité des eaux littorales et le changement climatique.
+            </p>
+        </div>
+        <div id="blockImg">
+            <img src="img/groupe.png" />
+        </div>
+        <div class="blockText">
+            <ul>
+                <li class="lineText">
+                    De ce fait ce site web a été réalisé pour répondre à 3 buts principaux :
+                </li>
+                <ul>
+                    <li class="lineText">
+                        Motiver les surfeur·euses·s à utiliser ce site lors de leurs sessions de surf
+                    </li>
+                    <li class="lineText">
+                        Fournir des données exhaustives pour l’association
+                    </li>
+                    <li class="lineText">
+                        Permettre de soutenir l’association dans sa lutte.
+                    </li>
+                </ul>
+                <li class="lineText">
+                    Pour relever ce défi nous avons constitué un groupe de 9 programmeurs issus d’IUT, de fac et de
+                    MIAGE.
+                </li>
+            </ul>
+        </div>
+    </div>
+</body>
+
+</html>
--- a/historiqueFormulaire.html
+++ b/historiqueFormulaire.html
@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="css/index.css">
+    <link rel="stylesheet" href="css/historiqueformulaire.css">
+    <title></title>
+</head>
+
+<body>
+<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>
+<div id="blockBlock">
+    <table id="table" summary="exemple de structure d'un tableau de données 2 lignes, 2 colonnes">
+
+
+        <tr>
+            <th>Mes anciens formulaires</th>
+
+        </tr>
+
+        <tr>
+            <td>Date 04/12/2020<br/>
+                Lieu: Nice        Spot:La villa<br/>
+            </td>
+            <td>Aucun problème lors de cette session</td>
+
+        </tr>
+
+        <tr>
+            <td>Date 01/05/1976<br/>
+                Lieu: ingolstadt_germany       Spot:Proof of a Conspiracy<br/>
+            </td>
+            <td>un triangle de billard flotte a la surface</td>
+
+        </tr>
+    </table>
+</div>
+</body>
+</html>
--- a/img/groupe.png
+++ b/img/groupe.png
--- a/inscription.html
+++ b/inscription.html
@ -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 -->
--- a/js/menu
+++ b/js/menu
--- a/menu.html
+++ b/menu.html
@ -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>
--- a/php/Script/traitementInscription.php
+++ b/php/Script/traitementInscription.php
@ -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");
--- a/sql/createData.sql
+++ b/sql/createData.sql
@ -0,0 +1,171 @@
+INSERT INTO joueur (nomJoueur, estVivant, estImposteur) VALUES
+    ("Alexandre", 0, 0),
+    ("Hugo", 0, 0),
+    ("Lisa", 0, 0),
+    ("Manon", 0, 0),
+    ("Mathieu", 0, 0),
+    ("Nicolas", 0, 0),
+    ("Pauline", 0, 1),
+    ("Seb", 0, 1),
+    ("Yannick", 0, 0),
+    ("Syska", 0 , 0);
+
+INSERT INTO meteoville (temperatureMeteoVille, ventMeteoVille) VALUES
+    (2,10),
+    (30,1),
+    (15,3),
+    (21,5),
+    (18,10),
+    (8,8);
+
+INSERT INTO meteoSpot (houleMeteoSpot, mareeMeteoSpot, ventMeteoSpot) VALUES
+    (51,12,23),
+    (77,22,53),
+    (37,24,73),
+    (69,86,12),
+    (49,00,27),
+    (86,53,16),
+    (86,81,48),
+    (90,32,51),
+    (61,11,59),
+    (44,89,08),
+    (65,46,65),
+    (37,72,83),
+    (62,79,42),
+    (30,49,12),
+    (24,69,97),
+    (61,93,41),
+    (53,18,79),
+    (54,86,57),
+    (24,28,68),
+    (48,48,74);
+
+INSERT INTO ville (nomVille, cpVille, meteoVille) VALUES
+    ("Paris",07887,1),
+    ("Marseille",78630,2),
+    ("Lyon",44555,3),
+    ("Toulouse",11684,4),
+    ("Nice",42113,5),
+    ("Nantes",54239,6),
+    ("Montpellier",61211,6),
+    ("Strasbourg",80180,5),
+    ("Bordeaux",02490,4),
+    ("Lille",12469,3),
+    ("Rennes",81504,2),
+    ("Reims",96409,1);
+
+INSERT INTO produits (estCremeSolaire, estParfum, estCremeHydratante, estMaquillage, estEssence, estCigarette, EstEngrais, EstPeinture) VALUES
+    (1,1,1,0,0,0,0,1),
+    (1,1,1,0,1,1,0,1),
+    (1,0,0,0,0,0,1,0),
+    (1,0,0,1,0,0,1,1),
+    (1,1,1,1,0,0,1,0),
+    (0,0,0,1,1,0,1,1),
+    (0,0,0,0,1,1,1,1),
+    (1,1,1,0,0,1,0,1),
+    (1,1,1,0,1,1,1,1),
+    (1,0,0,1,0,1,0,0),
+    (1,0,0,0,1,1,1,1),
+    (1,1,1,1,1,1,1,1),
+    (0,1,1,1,0,0,1,1),
+    (0,1,1,1,1,1,1,0),
+    (1,0,0,1,1,1,1,1),
+    (1,0,0,0,0,0,0,1),
+    (0,0,0,1,1,1,0,0),
+    (1,0,0,0,1,1,0,1),
+    (0,0,0,0,0,1,0,1),
+    (0,0,0,1,1,0,1,1);
+
+INSERT INTO pointage (nbBaigneur, nbPratiquant, nbBateauPeche, nbBateauLoisir, nbBateauVoile, produits) VALUES
+(09,59,44,18,97,1),
+(50,74,91,32,15,1),
+(49,50,30,69,73,9),
+(41,53,24,49,30,8),
+(94,13,02,31,79,4),
+(06,62,65,91,26,6),
+(45,83,57,25,60,1),
+(69,71,18,59,72,8),
+(52,44,36,89,49,5),
+(80,54,95,14,57,7),
+(89,86,52,75,23,0),
+(90,19,67,68,60,6),
+(46,17,00,95,95,5),
+(92,64,23,12,79,3),
+(48,40,72,21,78,0),
+(13,99,18,37,53,6),
+(72,13,93,71,82,0),
+(58,19,78,87,51,8),
+(08,32,82,41,90,1),
+(75,70,29,25,11,4);
+
+INSERT INTO pollution (niveauPollution, descriptionPollution) VALUES
+(0,"aucune pollution"),
+(1,"faible pollution"),
+(2,"pollution moyenne"),
+(3,"forte pollution");
+
+INSERT INTO spot (nomSpot, villeSpot, meteoSpot, pollutionSpot) VALUES
+("fe",1,0,2),
+("tesvoscij",6,0,7),
+("bul",4,0,0),
+("jirimoz",4,5,1),
+("ufomi",3,0,4),
+("ca",1,5,2),
+("gi",3,0,6),
+("emsebluf",6,1,1),
+("piwocav",8,3,5),
+("bifhovno",5,0,0),
+("to",7,7,1),
+("de",9,4,1),
+("ac",2,4,9),
+("ola",0,9,8),
+("me",5,5,4),
+("ro",3,2,6),
+("ko",8,2,1),
+("vofjo",9,8,8),
+("ocvagi",2,7,5),
+("papzo",6,8,7),
+("miih",4,1,0),
+("go",6,9,6),
+("ricuwjul",3,4,5),
+("depfaj",5,0,3),
+("fi",1,9,0),
+("fadbew",1,9,6),
+("catol",6,9,0),
+("ko",4,3,8),
+("vugi",2,8,1),
+("pi",6,6,4),
+("hu",3,4,8),
+("bab",7,2,6),
+("hot",6,3,6),
+("hopekmis",8,4,7),
+("linozam",5,3,7),
+("redfo",5,5,6),
+("cenisa",2,8,3),
+("rev",9,5,2),
+("haj",5,4,4),
+("verezi",8,3,6),
+("kehus",0,8,9),
+("owi",6,2,9),
+("adzaub",2,9,2),
+("tojtoepa",4,5,9),
+("buj",5,0,5),
+("ciwcowos",9,0,0),
+("obipezow",7,2,9),
+("lefocew",9,6,2),
+("pozukoeno",5,1,0),
+("ojlotvu",2,1,8);
+
+INSERT INTO utilisateur (nomUtilisateur, prenomUtilisateur, mailUtilisateur, pseudoUtilisateur , passwordUtilisateur) VALUES
+("Connor","Thomas","egidu@we.nl","go",MD5('4aeKHP8aaa')),
+("Richard","Garcia","es@hupegas.ng","tag",MD5('ZIELWa6avf')),
+("Warren","Byrd","genebcu@do.hu","senlez",MD5('Bi7EMaUaT')),
+("Maggie","Brooks","ehjiw@vokibonu.pm","wogiv",MD5('WaaOXWKyaU')),
+("Beatrice","Fox","zufuwren@cewrin.tj","go",MD5('Vna3ihflCQ')),
+("Billy","Maxwell","suz@pecak.by","kadef",MD5('CMsjeaRpWo')),
+("Essie","Olson","luglar@jik.az","ihe",MD5('tmtTTMQLGb')),
+("Madge","Dawson","wi@cogzer.qa","mirono",MD5('AaLkaac8kX')),
+("Johnny","Byrd","fodem@talpehge.mq","ecame",MD5('7Glkm7Py9a')),
+("Nettie","Burton","ukaropa@awo.st","ipuona",MD5('KaUqaYKOUU'));
+
+
--- a/sql/createSchema.sql
+++ b/sql/createSchema.sql
@ -1,6 +1,7 @@
 CREATE TABLE joueur
 (
    idJoueur INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column
+    nomJoueur VARCHAR(50),
    estVivant TINYINT,
    estImposteur TINYINT
 ) ENGINE=InnoDB;
Author	SHA1	Message	Date
MathieuRethers	05f2349862	Merge branch 'main' of https://github.com/DevDuCoffee/Nuit-De-L-Info-2020 into main	2020-12-04 06:12:23 +01:00
MathieuRethers	c9554bf8b6	modid	2020-12-04 06:12:15 +01:00
Nicolas-Corbiere	8101877e09	Ajout de schèma de BDD	2020-12-04 06:00:55 +01:00
JunkJumper	d6d1b15df0	Delete workspace.xml	2020-12-04 05:57:03 +01:00
JunkJumper	1b9a12876b	Merge remote-tracking branch 'origin/main' into main	2020-12-04 05:53:04 +01:00
JunkJumper	19e6c65f1f	readme fin NDI	2020-12-04 05:52:59 +01:00
lemoinealexandre	52d4347bd1	formulaire	2020-12-04 05:43:40 +01:00
lemoinealexandre	dc657f8e17	formulaire	2020-12-04 05:36:49 +01:00
JunkJumper	eb1a008503	Merge remote-tracking branch 'origin/main' into main	2020-12-04 05:20:08 +01:00
JunkJumper	3d0768398d	create dATA ok	2020-12-04 05:19:44 +01:00
Sébastien Marro	b530cfcf47	Merge branch 'main' of https://github.com/DevDuCoffee/Nuit-De-L-Info-2020 into main	2020-12-04 04:37:45 +01:00
Sébastien Marro	294d08e816	update formulaire	2020-12-04 04:37:23 +01:00
MathieuRethers	14227d0f30	Merge branch 'main' of https://github.com/DevDuCoffee/Nuit-De-L-Info-2020 into main	2020-12-04 04:34:21 +01:00
MathieuRethers	3ae2ce8554	modif	2020-12-04 04:34:10 +01:00
Alcaraz Yannick	75230122d2	modif des formulaires connexion et inscriptions	2020-12-04 04:18:43 +01:00
MathieuRethers	2dc4681e0e	modif html	2020-12-04 04:14:09 +01:00
Nicolas-Corbiere	c6be367c43	Ajout du projet bmpr	2020-12-04 04:13:30 +01:00
Nicolas-Corbiere	2e95cf867d	Ajout de l'ihm	2020-12-04 04:08:27 +01:00
MathieuRethers	adafc1be54	modif connexion.css	2020-12-04 04:05:10 +01:00
unknown	8239b2f8d3	Script	2020-12-04 03:57:41 +01:00
unknown	54a8ab2b06	Script	2020-12-04 03:56:42 +01:00
Alcaraz Yannick	1b2a823144	modif inscription.html	2020-12-04 03:54:09 +01:00
Alcaraz Yannick	900388b43c	modif des formulaires connexion et inscriptions	2020-12-04 03:52:10 +01:00
MathieuRethers	54dca3ae89	correction et modif de menu	2020-12-04 03:44:07 +01:00