diff --git a/admin/index.php b/admin/index.php
index 2c6f0a4..07fc710 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -5,7 +5,7 @@ $relativePath = "../";
ADMIN
Bienvenue sur la page d'administration
-
+
Sur cette page, tu vas pouvoir animer le site en changeant les scores, le planning ou les informations de la
carte.
diff --git a/ajax/admin/.htaccess b/ajax/admin/.htaccess
deleted file mode 100644
index 756a688..0000000
--- a/ajax/admin/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-AuthName "MDP ?"
-AuthType Basic
-AuthUserFile /home_clubs/accueil_insa/public_html/includes/pass/.htpass_gda
-require valid-user
-
diff --git a/ajax/admin/admin/.htaccess b/ajax/admin/admin/.htaccess
deleted file mode 100644
index f4d9753..0000000
--- a/ajax/admin/admin/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-AuthName "MDP ?"
-AuthType Basic
-AuthUserFile /home_clubs/accueil_insa/public_html/includes/pass/.htpass_admin
-require valid-user
-
diff --git a/ajax/admin/webmaster/.htaccess b/ajax/admin/webmaster/.htaccess
deleted file mode 100644
index a370781..0000000
--- a/ajax/admin/webmaster/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-AuthName "MDP ?"
-AuthType Basic
-AuthUserFile /home_clubs/accueil_insa/public_html/includes/pass/.htpass_webmaster
-require valid-user
-
diff --git a/ajax/read/index.php b/ajax/read/index.php
index adaf548..0c27dbf 100644
--- a/ajax/read/index.php
+++ b/ajax/read/index.php
@@ -115,7 +115,23 @@ function get_enigma_code() {
echo json_encode($data, JSON_FORCE_OBJECT);
break;
-
+ case 'PEETA' :
+ $data["name"] = "enigme-2";
+ $score_data["text"] = 'Énigme 2';
+ $score_data["points"] = 500;
+
+ if($_GET['date'] < 1628361000 ) {
+ $data["info"] = "
Énigme 2 Code trouvé, reviens demain pour avoir la suite ;)";
+ } else {
+ $data["info"] = "
Énigme 2 Dès l'aube, un oiseau aux sifflements merveilleux fit son apparition sur l'arène de l'INSA";
+ if(isFirstTeamToSolve($score_data)) {
+ $dao = new Dao();
+ $dao->add_score($score_data);
+ }
+ }
+ echo json_encode($data, JSON_FORCE_OBJECT);
+ break;
+
default:
$data["name"] = null;
$points_data["points"] = 0;
diff --git a/assets/css/enigma.css b/assets/css/enigma.css
index 95a95d5..90905d7 100644
--- a/assets/css/enigma.css
+++ b/assets/css/enigma.css
@@ -1,6 +1,6 @@
body {
- color: #1a1a1a;
+ color: #b5b5b5;
}
.inner {
@@ -9,75 +9,46 @@ body {
}
-#poemeRimbaud, #citationGary{
- font-family: manuscrit, cursive;
- font-size: 3rem;
+
+
+.team-button {
+ border-radius: 0.2rem;
+ font-size: 2.5rem;
+ font-family: Harry-P, fantasy;
+ cursor: pointer;
+ padding: 15px 20px;
+ margin: 10px;
+ transition: 0.2s;
+ border: none;
}
-
-/* 2020 */
-#finNormalEnigme{
- font-size: 1.1rem;
- text-align: right;
- margin-right: 20px;
- font-style: italic;
+#title_boo {
+ color: #7cd43f;
}
-#petiteFinCitationGary{
- text-align: right;
- font-size: 0.8rem;
- margin-right: 20px;
+#title_pek {
+ color: #9a89fd;
}
-#codeAda{
- font-family:'Cutive Mono', monospace;
- font-size: 1.8rem;
- text-align: left;
+.team-button#buttonBoo {
+ color: #7cd43f;
+ background-color: #35621e;
}
-#pekHint {
- text-align: center;
+.team-button#buttonPek {
+ color: #9a89fd;
+ background-color: #402559;
}
-#creditBg{
- text-align: right;
- font-size: 10px;
- margin-right: 8px;
+.team-button#buttonBoo:hover {
+ color: #35821e;
+ background-color: #7cf43f;
+ box-shadow: 0 0 10px #7c843f;
}
-#hideb {
- color: #C3A67A;
+.team-button#buttonPek:hover {
+ color: #402559;
+ background-color: #aaa9fd;
+ box-shadow: 0 0 10px #9a89dd;
}
-@media screen and (max-width: 768px) {
- #poemeRimbaud, #citationGary{
- font-family: manuscrit, cursive;
- font-size: 2rem;
- }
-
- #codeAda{
- font-size: 1.5rem;
- }
-}
-
-@media screen and (max-width: 576px) {
- #poemeRimbaud, #citationGary{
- font-family: manuscrit, cursive;
- font-size: 1.3rem;
- }
-
- #codeAda{
- font-size: 1.2rem;
- }
-
- /* 2020 */
- #finNormalEnigme{
- font-size: 0.9rem;
- }
-
- #petiteFinCitationGary{
- text-align: right;
- font-size: 0.6rem;
- margin-right: 20px;
- }
-}
diff --git a/assets/images/map3D.glb b/assets/images/map3D.glb
index 042e5b4..3a32258 100644
Binary files a/assets/images/map3D.glb and b/assets/images/map3D.glb differ
diff --git a/classes/dao.php b/classes/dao.php
index 96a4ed5..40c6247 100755
--- a/classes/dao.php
+++ b/classes/dao.php
@@ -34,11 +34,17 @@ class Dao
return $cursor->fetchAll(PDO::FETCH_ASSOC);
}
+ public function add_score($score_data) {
+ $sql = 'INSERT INTO scores (text, points, team) VALUES (?, ?, ?)';
+ $cursor = $this->conn->prepare($sql);
+ $cursor->execute([$score_data['text'], $score_data['points'], $score_data['team']]);
+ }
public function save_scores($scores_json, $team)
{
$sql = 'DELETE FROM scores WHERE team = ?';
$cursor = $this->conn->prepare($sql);
$cursor->execute([$team]);
+
foreach ($scores_json as $value) {
$sql = 'INSERT INTO scores (text, points, team) VALUES (?, ?, ?)';
$cursor = $this->conn->prepare($sql);
diff --git a/downloads.php b/downloads.php
index d73660f..541fb4e 100755
--- a/downloads.php
+++ b/downloads.php
@@ -20,11 +20,7 @@ ob_start(); // Start reading html
La charte de droit à l'image (
or here ,
o aquí )
-
+
diff --git a/enigma.php b/enigma.php
index 686611b..cce798d 100644
--- a/enigma.php
+++ b/enigma.php
@@ -1,10 +1,23 @@
ob_start(); // Start reading html
?>
-
+
Enigma
+
Pour résoudre les énigmes, un ordinateur est conseillé.
+
Petit tuto pour lire un code source (HTML) :
+
+ Ouvrir l'inspecteur d'élements, avec le clique droit ou dans le menu outils du navigateur (ou CTRL+Shift+I pour les intimes
+ Parce qu'on a la flemme de lire l'entièreté du code, il faut utiliser le petit outil magique.
+ Cet outil magique est le sélectionneur d'élements, petite icône rectangle + curseur sur le haut à droite de la fenêtre fraichement ouverte. (ou CTRL+Shift+C)
+ Trouver beaucoup d'éléments pour l'énigme
+
+
Choisis ton équipe !
+
+ Boomiflore
+ Peksureau
+
@@ -17,13 +30,55 @@ Test résultats : -->