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 02:58:41 +01:00
commit a04a010222
9 changed files with 91 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
css/menu.css
View File

@ -1,8 +1,14 @@
#blockMenu
{
float: right;
width: 95%;
}
#lineMenu #lineMenu
{ {
list-style-type: none; list-style-type: none;
overflow: hidden; overflow: hidden;
background-color: #0064b5; background-color: #0073be;
height: 49px; height: 49px;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -15,42 +21,31 @@
padding: 14px 20px; padding: 14px 20px;
background-color: transparent; background-color: transparent;
color: white; color: white;
transition: background-color 0.2s, padding 0.2s, font-size 0.2s,transform 0.2s; transition: background-color 0.1s, padding 0.1s, font-size 0.1s,transform 0.2s;
cursor: pointer; cursor: pointer;
} }
.animationButtonMenu:hover .animationButtonMenu:hover
{ {
background-color: #0073be; background-color: #197abb;
font-size: 19px; font-size: 19px;
padding: 13px 17px; padding: 13px 17px;
} }
aMenu .aMenu
{ {
color: white; color: white;
text-decoration: none; text-decoration: none;
} }
#lineSign
{
list-style-type: none;
overflow: hidden;
background-color: #0073be;
height: 35px;
margin: 0px;
padding: 0px;
}
.colonneSign .colonneSign
{ {
float: right; float: right;
font-size: 15px; font-size: 17px;
padding: 10px 8px; padding: 14px 20px;
background-color: transparent; background-color: transparent;
color: white; color: white;
transition: font-size 0.2s,transform 0.2s; transition: background-color 0.2s, padding 0.2s, font-size 0.2s,transform 0.2s;
cursor: pointer; cursor: pointer;
} }
@ -69,3 +64,24 @@ aMenu
{ {
width: 100%; width: 100%;
} }
#blockLogo
{
float: left;
width: 5%;
}
#logo
{
width: 100%;
height: 110px;
}
#blockDeco
{
width: 95%;
height: 10px;
float: right;
background-color: #5496c2;
}

BIN
img/logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 95 KiB

BIN
img/logoV2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

26
menu.html
View File

@ -5,33 +5,33 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="css/index.css"> <link rel="stylesheet" href="css/index.css">
<link rel="stylesheet" href="css/menu.css"> <link rel="stylesheet" href="css/menu.css">
<title></title>
</head> </head>
<body> <body>
<!--Block de connexion et d'inscription--> <div id="blockLogo">
<div id="blockSign"> <img id="logo" src="img/logoV2.jpg">
<ul id="lineSign">
<li class="colonneSign">
<a class="aMenu underLineHover">Connexion</a>
</li>
<li class="colonneSign">
<a class="aMenu underLineHover">Inscription</a>
</li>
</ul>
</div> </div>
<!--Block de Menu--> <!--Block de Menu-->
<nav id="blockMenu"> <nav id="blockMenu">
<ul id="lineMenu"> <ul id="lineMenu">
<li class="colonneMenu animationButtonMenu underLineHover"> <li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu">Acceuil</a> <a class="aMenu" href="#">Acceuil</a>
</li> </li>
<li class="colonneMenu animationButtonMenu underLineHover"> <li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu">Profil</a> <a class="aMenu" href="#">Profil</a>
</li> </li>
<li class="colonneMenu animationButtonMenu underLineHover"> <li class="colonneMenu animationButtonMenu underLineHover">
<a class="aMenu">Météo</a> <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> </li>
</ul> </ul>
</nav> </nav>
<div id="blockDeco"></div>
</body> </body>
</html> </html>

6
php/Pollution.php
View File

@ -6,4 +6,10 @@ class Pollution
private int $id; private int $id;
private int $niveauPollution; private int $niveauPollution;
private string $description; private string $description;
function __contruct(int $id,int $niveauPollution,string $description){
$this->id = $id;
$this->niveauPollution = $niveauPollution;
$this->description = $description;
}
} }

14
php/Produits.php
View File

@ -13,4 +13,18 @@ class Produits
private bool $estEngrais; private bool $estEngrais;
private bool $estPeinture; private bool $estPeinture;
private string $autreProduit; private string $autreProduit;
function __contruct(int $id,bool $estCremeSolaire,bool $estCremeParfum,bool $estCremeHydratante,bool $estMaquillage,
bool $estEssence,bool $estCigarette,bool $estEngrais,bool $estPeinture,string $autreProduit){
$this->id = $id;
$this->estCremeSolaire = $estCremeSolaire;
$this->estCremeParfum = $estCremeParfum;
$this->estCremeHydratante = $estCremeHydratante;
$this->estMaquillage = $estMaquillage;
$this->estEssence = $estEssence;
$this->estCigarette = $estCigarette;
$this->estEngrais = $estEngrais;
$this->estPeinture = $estPeinture;
$this->autreProduit = $autreProduit;
}
} }

8
php/Spot.php
View File

@ -8,4 +8,12 @@ class Spot
private Ville $ville; private Ville $ville;
private MeteoSpot $meteo; private MeteoSpot $meteo;
private Pollution $pollution; private Pollution $pollution;
function __contruct(int $id,string $nom,Ville $ville,Pollution $pollution,MeteoSpot $meteo){
$this->id = $id;
$this->nom = $nom;
$this->ville = $ville;
$this->pollution = $pollution;
$this->meteo = $meteo;
}
} }

8
php/Utilisateur.php
View File

@ -10,4 +10,12 @@ class Utilisateur
private string $mail; private string $mail;
private string $password; private string $password;
function __contruct(int $id,string $nom,string $prenom,string $pseudo,string $mail,string $password){
$this->id = $id;
$this->nom = $nom;
$this->prenom = $prenom;
$this->pseudo = $pseudo;
$this->mail = $mail;
$this->password = $password;
}
} }

8
php/Ville.php
View File

@ -8,4 +8,12 @@ class Ville
private string $codePostal; private string $codePostal;
private int $temperature; private int $temperature;
private MeteoVille $meteo; private MeteoVille $meteo;
function __contruct(int $id,string $nom,string $codePostal,string $temperature,MeteoVille $meteo){
$this->id = $id;
$this->nom = $nom;
$this->codePostal = $codePostal;
$this->temperature = $temperature;
$this->meteo = $meteo;
}
} }