diff --git a/assets/style.css b/assets/style.css
index bf10db5..3a2b5f9 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -1,80 +1,8 @@
-body {
- display: flex;
+:root {
+ --navbar-height: 32px;
}
-html, body {
- height: 100%;
- width: 100%;
- margin: 0;
-}
-
-#menu {
- list-style-type: none;
- margin: 0;
- padding: 0;
- width: 220px;
- background-color: #f1f1f1;
- height: 100%;
- overflow: auto;
- flex-grow: 0;
-}
-
-#menu a {
+#navbar-logo {
+ height: var(--navbar-height);
display: block;
- color: #000;
- padding: 10px 20px;
- text-decoration: none;
-}
-
-#menu a.active {
- background-color: #4CAF50;
- color: white;
-}
-
-#menu a:hover:not(.active) {
- background-color: #555;
- color: white;
-}
-
-#menu-logo img {
- width: calc(100% - 40px);
- margin: 40px auto;
- display: block;
-}
-
-#main-container {
- margin: 0;
- flex-grow: 1;
- height: 100%;
- overflow-y: scroll;
-}
-
-#main-content {
- padding-top: 100px;
- padding-bottom: 100px;
- margin: 0 auto;
- max-width: 1000px;
- text-align: justify;
-}
-
-@media only screen and (max-width: 700px) {
- body {
- flex-direction: column;
- height: auto;
- }
- #menu {
- height: auto;
- width: 100%;
- padding-bottom: 20px;
- }
- #menu-logo img {
- height: 70px;
- padding-left: 7px;
- }
- #menu a {
- text-align: center;
- }
- #main-content {
- padding: 100px 16px;
- }
-}
+}
\ No newline at end of file
diff --git a/server_files/config.php b/server_files/config.php
index e67905d..991967f 100644
--- a/server_files/config.php
+++ b/server_files/config.php
@@ -3,19 +3,19 @@
* Config options
*/
-$YEAR = $_ENV["TFJM_YEAR"];
-$URL_BASE = $_ENV["TFJM_URL_BASE"];
-$LOCAL_PATH = $_ENV["TFJM_LOCAL_PATH"];
-$MAIL_DOMAIN = $_ENV["TFJM_MAIL_DOMAIN"];
+$YEAR = getenv("TFJM_YEAR");
+$URL_BASE = getenv("TFJM_URL_BASE");
+$LOCAL_PATH = getenv("TFJM_LOCAL_PATH");
+$MAIL_DOMAIN = getenv("TFJM_MAIL_DOMAIN");
/**
* DB infos
*/
-$DB_HOST = $_ENV["TFJM_DB_HOST"];
-$DB_NAME = $_ENV["TFJM_DB_NAME"];
-$DB_USER = $_ENV["TFJM_DB_USER"];
-$DB_PASSWORD = $_ENV["TFJM_DB_PASSWORD"];
+$DB_HOST = getenv("TFJM_DB_HOST");
+$DB_NAME = getenv("TFJM_DB_NAME");
+$DB_USER = getenv("TFJM_DB_USER");
+$DB_PASSWORD = getenv("TFJM_DB_PASSWORD");
try {
$DB = new PDO("mysql:host=$DB_HOST;dbname=$DB_NAME;charset=utf8", "$DB_USER", "$DB_PASSWORD", array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
diff --git a/server_files/model.php b/server_files/model.php
index 0587714..d655971 100644
--- a/server_files/model.php
+++ b/server_files/model.php
@@ -185,7 +185,7 @@ function printDocuments($documents)
$first_name = $user->getFirstName();
$name = DocumentType::getTranslatedName($document->getType());
$version = $document->getVersion();
- echo "$name de $first_name $surname (version $version) : Télécharger
";
+ echo "$name de $first_name $surname (version $version) : Télécharger
";
}
}
diff --git a/server_files/views/connexion.php b/server_files/views/connexion.php
index bad0faf..c1ba1b2 100644
--- a/server_files/views/connexion.php
+++ b/server_files/views/connexion.php
@@ -1,100 +1,64 @@
Erreur : " . $error_message . "";
-else {
- if (isset($recuperate_account))
- echo "Le mail de récupération de mot de passe a bien été envoyé.
";
- elseif (isset($reset_password))
- echo "Le mot de passe a bien été changé. Vous pouvez désormais vous connecter.
";
- elseif (isset($_GET["confirmation-mail"]))
- echo "Le mail a bien été renvoyé.
";
- else if (isset($logging_in_user)) {
- echo "Connexion réussie !
";
- require_once "footer.php";
- } else if (isset($_SESSION["user_id"])) {
- echo "Vous êtes déjà connecté.
";
- require_once "footer.php";
- }
-}
-if (isset($_GET["mdp_oublie"])) { ?>
-
-user != null) { ?>
-
-
+if (isset($error_message) && $error_message === FALSE) {
+ if (isset($recuperate_account))
+ echo "Le mail de récupération de mot de passe a bien été envoyé.
";
+ else if (isset($reset_password))
+ echo "Le mot de passe a bien été changé. Vous pouvez désormais vous connecter.
";
+ else if (isset($_GET["confirmation-mail"]))
+ echo "Le mail a bien été renvoyé.
";
+ else if (isset($logging_in_user))
+ echo "Connexion réussie !
";
+} else if (isset($_SESSION["user_id"])) { ?>
+ Vous êtes déjà connecté !
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server_files/views/equipe.php b/server_files/views/equipe.php
index af1315c..623f3db 100644
--- a/server_files/views/equipe.php
+++ b/server_files/views/equipe.php
@@ -4,25 +4,25 @@
Nom de l'équipe : getName() ?>
Trigramme : getTrigram() ?>
- Tournoi : getName() ?>">getName() ?>
+ Tournoi : getName() ?>">getName() ?>
getEncadrants()[$i - 1] == NULL)
continue;
$encadrant = User::fromId($team->getEncadrants()[$i - 1]);
$id = $encadrant->getId();
- echo "Encadrant $i : getFirstName() . " " . $encadrant->getSurname() . "\">" . $encadrant->getFirstName() . " " . $encadrant->getSurname() . "
";
+ echo "Encadrant $i : getFirstName() . " " . $encadrant->getSurname() . "\">" . $encadrant->getFirstName() . " " . $encadrant->getSurname() . "
";
}
for ($i = 1; $i <= 6; ++$i) {
if ($team->getParticipants()[$i - 1] == NULL)
continue;
$participant = User::fromId($team->getParticipants()[$i - 1]);
$id = $participant->getId();
- echo "Participant $i : getFirstName() . " " . $participant->getSurname() . "\">" . $participant->getFirstName() . " " . $participant->getSurname() . "
";
+ echo "Participant $i : getFirstName() . " " . $participant->getSurname() . "\">" . $participant->getFirstName() . " " . $participant->getSurname() . "
";
}
if ($team->isSelectedForFinal()) {
$final_name = $FINAL->getName();
- echo "Équipe sélectionnée pour la finale nationale.";
+ echo "Équipe sélectionnée pour la finale nationale.";
}
?>
diff --git a/server_files/views/footer.php b/server_files/views/footer.php
index 078caa7..5181ba3 100644
--- a/server_files/views/footer.php
+++ b/server_files/views/footer.php
@@ -1,5 +1,3 @@
-
-