From f6decde6b450e5271447de64d4ad44367240a254 Mon Sep 17 00:00:00 2001 From: MathieuRethers <71334121+MaretSoldier@users.noreply.github.com> Date: Fri, 4 Dec 2020 00:04:26 +0100 Subject: [PATCH 1/9] menu --- css/index.css | 9 ++++++ css/menu.css | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 39 ++++++++++++++++++++++++++ menu.html | 37 +++++++++++++++++++++++++ 4 files changed, 161 insertions(+) create mode 100644 menu.html diff --git a/css/index.css b/css/index.css index e69de29..a84a243 100644 --- a/css/index.css +++ b/css/index.css @@ -0,0 +1,9 @@ +body +{ + font-style: normal; + font-family: 'Montserrat', sans-serif; + width: 100%; + height: 100%; + margin: 0; + padding: 0; +} \ No newline at end of file diff --git a/css/menu.css b/css/menu.css index e69de29..7cd4bc5 100644 --- a/css/menu.css +++ b/css/menu.css @@ -0,0 +1,76 @@ +#lineMenu +{ + list-style-type: none; + overflow: hidden; + background-color: #0064b5; + height: 49px; + margin: 0px; + padding: 0px; +} + +.colonneMenu +{ + float: left; + 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; +} + +.animationButtonMenu:hover +{ + background-color: #0073be; + font-size: 19px; + padding: 13px 17px; +} + +a +{ + 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; + background-color: transparent; + color: white; + transition: 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 +{ + +} + +.underLineHover:hover:after +{ + width: 100%; +} diff --git a/index.html b/index.html index e69de29..3a1d7a4 100644 --- a/index.html +++ b/index.html @@ -0,0 +1,39 @@ + + + + + + + + + + + +
+ +
+ + + + + + \ No newline at end of file diff --git a/menu.html b/menu.html new file mode 100644 index 0000000..983da4b --- /dev/null +++ b/menu.html @@ -0,0 +1,37 @@ + + + + + + + + + + + +
+ +
+ + + + \ No newline at end of file From 1f91bd635d5ed026924618b62c450f121e963f38 Mon Sep 17 00:00:00 2001 From: MathieuRethers <71334121+MaretSoldier@users.noreply.github.com> Date: Fri, 4 Dec 2020 00:05:52 +0100 Subject: [PATCH 2/9] menu --- index.html | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/index.html b/index.html index 3a1d7a4..97ba0ac 100644 --- a/index.html +++ b/index.html @@ -8,32 +8,6 @@ - -
- -
- - - - + \ No newline at end of file From 37073d3ce5b2475cd96eac83647937ed65c3d72a Mon Sep 17 00:00:00 2001 From: JunkJumper Date: Thu, 3 Dec 2020 23:11:18 +0000 Subject: [PATCH 3/9] meme arbo minuit --- .gitignore | 1 + .gitkeep | 0 .idea/Nuit-De-L-Info-2020.iml | 8 ----- .idea/modules.xml | 8 ----- .idea/vcs.xml | 6 ---- .idea/workspace.xml | 59 ----------------------------------- img/.gitkeep | 0 js/.gitkeep | 0 php/.gitignore | 1 + php/.gitkeep | 0 sql/.gitkeep | 0 11 files changed, 2 insertions(+), 81 deletions(-) create mode 100644 .gitignore create mode 100644 .gitkeep delete mode 100644 .idea/Nuit-De-L-Info-2020.iml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml create mode 100644 img/.gitkeep create mode 100644 js/.gitkeep create mode 100644 php/.gitignore create mode 100644 php/.gitkeep create mode 100644 sql/.gitkeep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f1b7204 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea/* diff --git a/.gitkeep b/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.idea/Nuit-De-L-Info-2020.iml b/.idea/Nuit-De-L-Info-2020.iml deleted file mode 100644 index c956989..0000000 --- a/.idea/Nuit-De-L-Info-2020.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f84252e..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index dfef31d..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1607026953826 - - - - - - \ No newline at end of file diff --git a/img/.gitkeep b/img/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/js/.gitkeep b/js/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/php/.gitignore b/php/.gitignore new file mode 100644 index 0000000..24b6dda --- /dev/null +++ b/php/.gitignore @@ -0,0 +1 @@ +database.php diff --git a/php/.gitkeep b/php/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/sql/.gitkeep b/sql/.gitkeep new file mode 100644 index 0000000..e69de29 From 3f693d9c53fae9697f10c9878e360a4d998374a8 Mon Sep 17 00:00:00 2001 From: MathieuRethers <71334121+MaretSoldier@users.noreply.github.com> Date: Fri, 4 Dec 2020 00:17:21 +0100 Subject: [PATCH 4/9] menu --- css/menu.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/css/menu.css b/css/menu.css index 7cd4bc5..aaa4ca6 100644 --- a/css/menu.css +++ b/css/menu.css @@ -65,11 +65,6 @@ a transition: width 0.2s; } -.underLineHover:hover -{ - -} - .underLineHover:hover:after { width: 100%; From 10b3fd0bc180ebfe278bbce797f9a77cf2e13dfc Mon Sep 17 00:00:00 2001 From: MathieuRethers <71334121+MaretSoldier@users.noreply.github.com> Date: Fri, 4 Dec 2020 00:20:06 +0100 Subject: [PATCH 5/9] modif menu --- css/menu.css | 2 +- menu.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/menu.css b/css/menu.css index aaa4ca6..8d0c51d 100644 --- a/css/menu.css +++ b/css/menu.css @@ -26,7 +26,7 @@ padding: 13px 17px; } -a +aMenu { color: white; text-decoration: none; diff --git a/menu.html b/menu.html index 983da4b..5744fbf 100644 --- a/menu.html +++ b/menu.html @@ -12,10 +12,10 @@
@@ -23,13 +23,13 @@ From fdab241a5c55b1a271b9c107c14ad9ee1e9b0c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marro?= Date: Fri, 4 Dec 2020 00:35:47 +0100 Subject: [PATCH 6/9] update formulaire --- formulaire.html | 90 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 3 deletions(-) diff --git a/formulaire.html b/formulaire.html index 803b29d..2f4012c 100644 --- a/formulaire.html +++ b/formulaire.html @@ -8,13 +8,13 @@
Nom et Prénom - - + +
Lieu et période - @@ -36,10 +36,94 @@
Produits utilisés + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ Fréquentation + + + + + + + + + + + + + + +
+
+ Pollution + + + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file From 86506b11de5d6f6661a95616aec584845e5f0584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marro?= Date: Fri, 4 Dec 2020 01:14:51 +0100 Subject: [PATCH 7/9] update formulaire --- css/formulaire.css | 24 ++++++++++++++++++++++++ formulaire.html | 23 ++++++++++++++--------- 2 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 css/formulaire.css diff --git a/css/formulaire.css b/css/formulaire.css new file mode 100644 index 0000000..08bccea --- /dev/null +++ b/css/formulaire.css @@ -0,0 +1,24 @@ +h1 { + text-align: center; +} + +legend { + margin: 0 auto; + margin-top: 3%; +} + +fieldset{ + margin: 0 auto; + width: 70%; +} + +form { + text-align: center; +} + +input[type="submit"]{ + font-size: 15px; + padding: 5px; +} + + diff --git a/formulaire.html b/formulaire.html index 2f4012c..20c8347 100644 --- a/formulaire.html +++ b/formulaire.html @@ -2,17 +2,20 @@
+
+ +

Session de surf

-
+
Nom et Prénom
-
+
Lieu et période @@ -64,7 +67,7 @@
-
+
Fréquentation @@ -84,38 +87,39 @@
-
+
Pollution - - + - - + \ No newline at end of file From 293402a19174741fea05ec6b2a4d6aaf98e5e86a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 4 Dec 2020 01:22:13 +0100 Subject: [PATCH 8/9] Ajout classes PHP --- php/MeteoSpot.php | 10 ++++++++++ php/MeteoVille.php | 9 +++++++++ php/Spot.php | 11 +++++++++++ php/Utilisateur.php | 13 +++++++++++++ php/Ville.php | 11 +++++++++++ 5 files changed, 54 insertions(+) create mode 100644 php/MeteoSpot.php create mode 100644 php/MeteoVille.php create mode 100644 php/Spot.php create mode 100644 php/Utilisateur.php create mode 100644 php/Ville.php diff --git a/php/MeteoSpot.php b/php/MeteoSpot.php new file mode 100644 index 0000000..367015b --- /dev/null +++ b/php/MeteoSpot.php @@ -0,0 +1,10 @@ + Date: Fri, 4 Dec 2020 01:31:37 +0100 Subject: [PATCH 9/9] Ajout classes PHP --- php/Hystorique.php | 10 ++++++++++ php/Joueur.php | 9 +++++++++ php/Pointage.php | 14 ++++++++++++++ php/Pollution.php | 9 +++++++++ php/Produits.php | 16 ++++++++++++++++ php/Spot.php | 4 ++-- 6 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 php/Hystorique.php create mode 100644 php/Joueur.php create mode 100644 php/Pointage.php create mode 100644 php/Pollution.php create mode 100644 php/Produits.php diff --git a/php/Hystorique.php b/php/Hystorique.php new file mode 100644 index 0000000..d657622 --- /dev/null +++ b/php/Hystorique.php @@ -0,0 +1,10 @@ +