diff --git a/css/menu.css b/css/menu.css index 8d0c51d..eeae68f 100644 --- a/css/menu.css +++ b/css/menu.css @@ -1,8 +1,14 @@ +#blockMenu +{ + float: right; + width: 95%; +} + #lineMenu { list-style-type: none; overflow: hidden; - background-color: #0064b5; + background-color: #0073be; height: 49px; margin: 0px; padding: 0px; @@ -15,42 +21,31 @@ padding: 14px 20px; background-color: transparent; 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; } .animationButtonMenu:hover { - background-color: #0073be; + background-color: #197abb; font-size: 19px; padding: 13px 17px; } -aMenu +.aMenu { color: white; text-decoration: none; } - -#lineSign -{ - list-style-type: none; - overflow: hidden; - background-color: #0073be; - height: 35px; - margin: 0px; - padding: 0px; -} - .colonneSign { float: right; - font-size: 15px; - padding: 10px 8px; + font-size: 17px; + padding: 14px 20px; background-color: transparent; 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; } @@ -69,3 +64,24 @@ aMenu { width: 100%; } + + +#blockLogo +{ + float: left; + width: 5%; +} + +#logo +{ + width: 100%; + height: 110px; +} + +#blockDeco +{ + width: 95%; + height: 10px; + float: right; + background-color: #5496c2; +} diff --git a/img/logo.jpg b/img/logo.jpg new file mode 100644 index 0000000..52745c0 Binary files /dev/null and b/img/logo.jpg differ diff --git a/img/logoV2.jpg b/img/logoV2.jpg new file mode 100644 index 0000000..5bd23ab Binary files /dev/null and b/img/logoV2.jpg differ diff --git a/menu.html b/menu.html index 5744fbf..46972a1 100644 --- a/menu.html +++ b/menu.html @@ -5,33 +5,33 @@ + - -
- + +
\ No newline at end of file diff --git a/php/Pollution.php b/php/Pollution.php index 0c38aa5..3f5f3b2 100644 --- a/php/Pollution.php +++ b/php/Pollution.php @@ -6,4 +6,10 @@ class Pollution private int $id; private int $niveauPollution; private string $description; + + function __contruct(int $id,int $niveauPollution,string $description){ + $this->id = $id; + $this->niveauPollution = $niveauPollution; + $this->description = $description; + } } \ No newline at end of file diff --git a/php/Produits.php b/php/Produits.php index f236321..0d00976 100644 --- a/php/Produits.php +++ b/php/Produits.php @@ -13,4 +13,18 @@ class Produits private bool $estEngrais; private bool $estPeinture; 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; + } } \ No newline at end of file diff --git a/php/Spot.php b/php/Spot.php index 1653f8f..221cf40 100644 --- a/php/Spot.php +++ b/php/Spot.php @@ -8,4 +8,12 @@ class Spot private Ville $ville; private MeteoSpot $meteo; 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; + } } \ No newline at end of file diff --git a/php/Utilisateur.php b/php/Utilisateur.php index 388aa62..2bd737e 100644 --- a/php/Utilisateur.php +++ b/php/Utilisateur.php @@ -10,4 +10,12 @@ class Utilisateur private string $mail; 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; + } } \ No newline at end of file diff --git a/php/Ville.php b/php/Ville.php index a441a24..e7a1b2d 100644 --- a/php/Ville.php +++ b/php/Ville.php @@ -8,4 +8,12 @@ class Ville private string $codePostal; private int $temperature; 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; + } } \ No newline at end of file