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 diff --git a/sql/createSchema.sql b/sql/createSchema.sql index f84bdd0..8876167 100644 --- a/sql/createSchema.sql +++ b/sql/createSchema.sql @@ -1,89 +1,36 @@ --- Create a new database called 'bddsurf' --- Connect to the 'master' database to run this snippet -USE master -GO --- Create the new database if it does not exist already -IF NOT EXISTS ( - SELECT name - FROM sys.databases - WHERE name = N'bddsurf' -) CREATE DATABASE bddsurf -GO --- Create a new table called 'joueur' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.joueur', 'U') IS NOT NULL -DROP TABLE bddsurf.joueur -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.joueur +CREATE TABLE joueur ( - idJoueur INT NOT NULL PRIMARY KEY, -- primary key column + idJoueur INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column estVivant TINYINT, estImposteur TINYINT - -- specify more columns here ); -GO - --- Create a new table called 'UTILISATEUR' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.utilisateur', 'U') IS NOT NULL -DROP TABLE bddsurf.utilisateur -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.utilisateur +CREATE TABLE utilisateur ( - idUtilisateur INT NOT NULL PRIMARY KEY, -- primary key column - nomUtilisateur VARCHAR, - prenomUtilisateur VARCHAR, - mailUtilisateur VARCHAR, - pseudoUtilisateur VARCHAR, - passwordUtilisateur VARCHAR - -- specify more columns here + idUtilisateur INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column + nomUtilisateur VARCHAR(50), + prenomUtilisateur VARCHAR(50), + mailUtilisateur VARCHAR(50), + pseudoUtilisateur VARCHAR(50), + passwordUtilisateur VARCHAR(50) ); -GO - --- Create a new table called 'meteoville' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.meteoville', 'U') IS NOT NULL -DROP TABLE bddsurf.meteoville -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.meteoville +CREATE TABLE meteoville ( - IdMeteoVille INT NOT NULL PRIMARY KEY, -- primary key column + IdMeteoVille INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column temperatureMeteoVille INT, ventMeteoVille INT - -- specify more columns here ); -GO - --- Create a new table called 'meteoSpot' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.meteoSpot', 'U') IS NOT NULL -DROP TABLE bddsurf.meteoSpot -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.meteoSpot +CREATE TABLE meteoSpot ( - idMeteoSpot INT NOT NULL PRIMARY KEY, -- primary key column + idMeteoSpot INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column houleMeteoSpot INT, mareeMeteoSpot INT, ventMeteoSpot INT - -- specify more columns here ); -GO - --- Create a new table called 'produits' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.produits', 'U') IS NOT NULL -DROP TABLE bddsurf.produits -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.produits +CREATE TABLE produits ( - idProduits INT NOT NULL PRIMARY KEY, -- primary key column + idProduits INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column estCremeSolaire TINYINT, estParfum TINYINT, estCremeHydratante TINYINT, @@ -92,74 +39,72 @@ CREATE TABLE bddsurf.produits estCigarette TINYINT, estEngrais TINYINT, estPeinture TINYINT, - AutreProduit VARCHAR - -- specify more columns here + AutreProduit VARCHAR(50) ); -GO - --- Create a new table called 'ville' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.ville', 'U') IS NOT NULL -DROP TABLE bddsurf.ville -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.ville +CREATE TABLE pollution ( - idVille INT NOT NULL PRIMARY KEY, -- primary key column - nomVille VARCHAR, - cpVille VARCHAR, - meteoVille INT NOT NULL - -- specify more columns here -); -GO - --- Create a new table called 'historique' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.historique', 'U') IS NOT NULL -DROP TABLE bddsurf.historique -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.historique -( - idHistorique INT NOT NULL PRIMARY KEY, -- primary key column - utilisateur INT NOT NULL, - spot INT NOT NULL, - pointage INT NOT NULL - -- specify more columns here -); -GO - --- Create a new table called 'pollution' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.pollution', 'U') IS NOT NULL -DROP TABLE bddsurf.pollution -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.pollution -( - idPollution INT NOT NULL PRIMARY KEY, -- primary key column + idPollution INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column niveauPollution INT, - descriptionPollution VARCHAR - -- specify more columns here + descriptionPollution VARCHAR(50) ); -GO - --- Create a new table called 'spot' in schema 'bddsurf' --- Drop the table if it already exists -IF OBJECT_ID('bddsurf.spot', 'U') IS NOT NULL -DROP TABLE bddsurf.spot -GO --- Create the table in the specified schema -CREATE TABLE bddsurf.spot +CREATE TABLE ville ( - idSpot INT NOT NULL PRIMARY KEY, -- primary key column - nomSpot VARCHAR, + idVille INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column + nomVille VARCHAR(50), + cpVille VARCHAR(50), + meteoVille INT NOT NULL, + CONSTRAINT fk_meteoville + FOREIGN KEY (meteoVille) + REFERENCES meteoville(IdMeteoVille) +); +CREATE TABLE pointage +( + idPointage INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column + nbBaigneur INT, + nbPratiquant INT, + nbBateauPeche INT, + nbBateauLoisir INT, + nbBateauVoile INT, + produits INT NOT NULL, + niveauDechet INT, + CONSTRAINT fk_produitsPointage + FOREIGN KEY (produits) + REFERENCES produits(idProduits) +); +CREATE TABLE spot +( + idSpot INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column + nomSpot VARCHAR(50), villeSpot INT NOT NULL, meteoSpot INT NOT NULL, - pollutionSpot INT NOT NULL - -- specify more columns here + pollutionSpot INT NOT NULL, + CONSTRAINT fk_villeSpot + FOREIGN KEY (villeSpot) + REFERENCES ville(idVille), + CONSTRAINT fk_meteoSpot + FOREIGN KEY (meteoSpot) + REFERENCES meteoSpot(idMeteoSpot), + CONSTRAINT fk_pollutionSpot + FOREIGN KEY (pollutionSpot) + REFERENCES pollution(idPollution) +); +CREATE TABLE historique +( + idHistorique INT PRIMARY KEY NOT NULL AUTO_INCREMENT, -- primary key column + utilisateur INT NOT NULL, + spot INT NOT NULL, + pointage INT NOT NULL, + CONSTRAINT fk_user + FOREIGN KEY (utilisateur) + REFERENCES utilisateur(idUtilisateur), + CONSTRAINT fk_spot + FOREIGN KEY (spot) + REFERENCES spot(idSpot), + CONSTRAINT fk_pointage + FOREIGN KEY (pointage) + REFERENCES pointage(idPointage) ); -GO +