From 2923e6fca634231533cca11e43a9091344ff4ba5 Mon Sep 17 00:00:00 2001 From: Debulois Date: Sun, 10 Apr 2022 21:25:00 +0200 Subject: Ajout d'un système de notification pour alerter les pro et finition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Template/Include/en/message.php | 94 +++++++++++++-------------- Template/Include/en/table.php | 2 +- Template/Include/en/text.php | 31 +++++---- Template/Include/en/title.php | 4 +- Template/Include/fr/message.php | 88 ++++++++++++------------- Template/Include/fr/table.php | 4 +- Template/Include/fr/text.php | 45 +++++++------ Template/Include/fr/title.php | 2 +- Template/Include/incl_form_mission.php | 13 ++-- Template/Include/incl_form_register.php | 5 +- Template/Include/incl_global_message.php | 3 +- Template/Include/incl_global_notification.php | 23 +++++++ Template/Include/incl_table_myMission.php | 4 +- 13 files changed, 177 insertions(+), 141 deletions(-) create mode 100644 Template/Include/incl_global_notification.php (limited to 'Template/Include') diff --git a/Template/Include/en/message.php b/Template/Include/en/message.php index 503fd98..8419b88 100644 --- a/Template/Include/en/message.php +++ b/Template/Include/en/message.php @@ -14,8 +14,8 @@ $messageText = [ "infosUpdate" => [ "success" => [ "success" => true, - "title" => "Update user information.", - "info" => "User informations updated !", + "title" => "Update user informations", + "info" => "Your informations have been updated!", "timer" => true, "toSrc" => true ] @@ -24,15 +24,15 @@ $messageText = [ "login" => [ "success" => [ "success" => true, - "title" => "Login.", - "info" => "Successfully logged in!", + "title" => "Sign-in", + "info" => "You are now successfully logged in!", "timer" => true, "toSrc" => false ], "fail" => [ "success" => false, - "title" => "Login.", - "info" => "Error bad credentials.", + "title" => "Sign-in", + "info" => "You have entered bad credentials.", "timer" => true, "toSrc" => true ] @@ -48,8 +48,8 @@ $messageText = [ ], "fail" => [ "success" => false, - "title" => "Login cookie.", - "info" => "Error with the cookie auto-login.", + "title" => "Auto-login", + "info" => "Something wrong happened.", "timer" => true, "toSrc" => false ] @@ -58,8 +58,8 @@ $messageText = [ "logout" => [ "success" => [ "success" => true, - "title" => "Log out.", - "info" => "Successefuly logged out!", + "title" => "Sign-out", + "info" => "You are now logged out.", "timer" => true, "toSrc" => false ] @@ -68,22 +68,22 @@ $messageText = [ "missionRegister" => [ "success" => [ "success" => true, - "title" => "Register a mission.", - "info" => "Mission registered !", + "title" => "Mandate a mission", + "info" => "Mission successfully mandated.", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Mandate a mission.", - "info" => "Error, please sign-in before.", + "title" => "Mandate a mission", + "info" => "The mission has not been mandated.", "timer" => true, "toSrc" => true ], "notConnected" => [ "success" => false, - "title" => "Mandate infos.", - "info" => "Error, you must be connected, and connected as client.", + "title" => "Mandate a mission", + "info" => "You must sign-in as client first.", "timer" => true, "toSrc" => false ] @@ -92,15 +92,15 @@ $messageText = [ "missionAccepted" => [ "success" => [ "success" => true, - "title" => "Mission info.", - "info" => "Mission accepted !", + "title" => "Pending mission", + "info" => "You have accepted the mission!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Mandate infos.", - "info" => "Error, mission not accepted.", + "title" => "Pending mission", + "info" => "The mission has not been accepted.", "timer" => true, "toSrc" => true ] @@ -109,15 +109,15 @@ $messageText = [ "missionValidated" => [ "success" => [ "success" => true, - "title" => "Mission info.", - "info" => "Mission completed!", + "title" => "Mission update", + "info" => "The mission is now marked as completed!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Mandate info.", - "info" => "Error, mission not marked as completed.", + "title" => "Mandate update", + "info" => "The mission has not been marked as completed.", "timer" => true, "toSrc" => true ] @@ -126,14 +126,14 @@ $messageText = [ "missionReview" => [ "success" => [ "success" => true, - "title" => "Mission review.", - "info" => "Your review has been registered!", + "title" => "Mission review", + "info" => "Your review has been sucessfully registered!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Mission review.", + "title" => "Mission review", "info" => "Error, your review has not been resgistered.", "timer" => true, "toSrc" => true @@ -143,15 +143,15 @@ $messageText = [ "userAdd" => [ "success" => [ "success" => true, - "title" => "Register an user.", - "info" => "User successfully registered !", + "title" => "Sign-up", + "info" => "Your account has been successfully created, you can now sign-in with.", "timer" => true, "toSrc" => false ], "fail" => [ "success" => false, - "title" => "Register an user.", - "info" => "Error, user not registered.", + "title" => "Sign-up", + "info" => "We can't create an account with the given informations.", "timer" => true, "toSrc" => true ] @@ -160,15 +160,15 @@ $messageText = [ "adminDelUser" => [ "success" => [ "success" => true, - "title" => "Delete an user.", - "info" => "User deleted !", + "title" => "Deletion of an account", + "info" => "The account is successfully delated.", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Delete an user.", - "info" => "No user was deleted.", + "title" => "Deletion of an account", + "info" => "The account is not delated.", "timer" => true, "toSrc" => true ] @@ -177,15 +177,15 @@ $messageText = [ "adminAddJob" => [ "success" => [ "success" => true, - "title" => "Add a job category.", - "info" => "Category added !", + "title" => "Add a job category", + "info" => "The job category is successfully added!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Add a job category.", - "info" => "Category not added.", + "title" => "Add a job category", + "info" => "The job category is not added.", "timer" => true, "toSrc" => true ] @@ -194,15 +194,15 @@ $messageText = [ "adminDelJob" => [ "success" => [ "success" => true, - "title" => "Deletion of a job category.", - "info" => "Category deleted !", + "title" => "Deletion of a job category", + "info" => "The job category is successfully deleted!", "timer" => true, "toSrc" => true ], "delete" => [ "success" => false, - "title" => "Deletion of a job category.", - "info" => "Category not deleted !", + "title" => "Deletion of a job category", + "info" => "The job category is not deleted.", "timer" => true, "toSrc" => true ] @@ -211,15 +211,15 @@ $messageText = [ "adminDelMission" => [ "success" => [ "success" => true, - "title" => "Deletion of a mission.", - "info" => "Mission deleted !", + "title" => "Deletion of a mission", + "info" => "The mission is successfully deleted!", "timer" => true, "toSrc" => true ], "delete" => [ "success" => false, - "title" => "Deletion of a mission.", - "info" => "Mission not deleted !", + "title" => "Deletion of a mission", + "info" => "The mission is not deleted.", "timer" => true, "toSrc" => true ] diff --git a/Template/Include/en/table.php b/Template/Include/en/table.php index 8aef67f..2feb5dc 100644 --- a/Template/Include/en/table.php +++ b/Template/Include/en/table.php @@ -62,7 +62,7 @@ $header = [ ], // En-tête des colonnes du tableau mes missions. "ongoingMissions" => [ - "Accpeted by pro date", + "Accepted by pro date", "Pro name", "Job", "Subject", diff --git a/Template/Include/en/text.php b/Template/Include/en/text.php index b6f81e0..417a1d9 100644 --- a/Template/Include/en/text.php +++ b/Template/Include/en/text.php @@ -7,6 +7,10 @@ // ############################################################################ $text = [ + "incl_global_notification" => [ + "header" => "Notification", + "info" => "You have a new mission!", + ], "incl_form_admin" => [ "btManageJob" => "Manage job categories", "btManageUser" => "Manage users", @@ -39,9 +43,9 @@ $text = [ "submit" => "Modify" ], "incl_form_login" => [ - "h2" => "Login", - "email" => "Email", - "password" => "Password", + "h2" => "Sign-in", + "email" => "Your email", + "password" => "Your password", "rememberMe" => "Remember me", "submit" => "Sign-in" ], @@ -49,7 +53,6 @@ $text = [ "h2" => "Form to register a mission", "subject" => "Subject", "review" => "Review", - "proId" => "Pro ID", "submit" => "Register", "jobsSel" => "Jobs" ], @@ -66,20 +69,20 @@ $text = [ "incl_global_navbar" => [ "h2" => "AlphaJob", "btnSearch" => "Search", - "btnInfos" => "Modif. infos", - "btnMission" => "Register mission", + "btnInfos" => "My infos", "btnMyMission" => "My missions", "btnAdmin" => "Administration", "btnLogin" => "Sign-in", - "btnLogout" => "Loggout", + "btnLogout" => "Sign-out", "btnRegister" => "Sign-up", "lang" => "Language", - "btnLang" => "Select" + "btnLang" => "Choose" ], "incl_form_register" => [ - "h2" => "Form to sign-up", - "email" => "Email", - "password" => "Password", + "h2" => "Sign-up", + "email" => "Your email", + "mailNotice" => "The email is valid.", + "password" => "Your password", "passNotice" => "The password must have at least:", "passLength" => "8 characters,", "passUpper" => "one uppercase,", @@ -102,9 +105,9 @@ $text = [ "mandate" => "Mandate" ], "incl_index_slideshow" => [ - "slide1" => "Find the right proffessional for you.

For all your needs.

AlphaJob", - "slide2" => "Only the bests proffessionals can register!

Quality of work guarantee!

AlphaJob", - "slide3" => "Find the bests offers for your website today.

Discover our ready to use solutions.

AlphaJob" + "slide1" => "Find the right professional for you.

For all your needs.

AlphaJob", + "slide2" => "Only the bests professionals register here!

Quality of work guarantee!

AlphaJob", + "slide3" => "Find the best offers for your new website today.

Check our ready to use solutions.

AlphaJob" ] ]; diff --git a/Template/Include/en/title.php b/Template/Include/en/title.php index c4fbeca..da773d6 100644 --- a/Template/Include/en/title.php +++ b/Template/Include/en/title.php @@ -8,11 +8,11 @@ $title = [ "index" => "AlphaJob - Index", - "login" => "AlphaJob - Login", + "login" => "AlphaJob - Sign-in", "message" => "AlphaJob - Message", "mission" => "AlphaJob - Manage a mission", "myMission" => "AlphaJob - My missions", - "register" => "AlphaJob - Register", + "register" => "AlphaJob - Sign-up", "userInfo" => "AlphaJob - My user informations", "admin" => "AlphaJob - Administration" ]; diff --git a/Template/Include/fr/message.php b/Template/Include/fr/message.php index ef86420..9046d07 100644 --- a/Template/Include/fr/message.php +++ b/Template/Include/fr/message.php @@ -14,8 +14,8 @@ $messageText = [ "infosUpdate" => [ "success" => [ "success" => true, - "title" => "Mise à jour des informations.", - "info" => "Informations mise à jour!", + "title" => "Mise à jour de vos informations", + "info" => "Vos Informations ont bien été mise à jour!", "timer" => true, "toSrc" => true ] @@ -24,15 +24,15 @@ $messageText = [ "login" => [ "success" => [ "success" => true, - "title" => "Connection.", - "info" => "Connection réussie!", + "title" => "Connexion", + "info" => "Vous êtes maintenant connecté!", "timer" => true, "toSrc" => false ], "fail" => [ "success" => false, - "title" => "Connection.", - "info" => "Erreur, connection échouée.", + "title" => "Connection", + "info" => "La connexion a échoué.", "timer" => true, "toSrc" => true ] @@ -48,8 +48,8 @@ $messageText = [ ], "fail" => [ "success" => false, - "title" => "Connection avec auto-connection.", - "info" => "Erreur, connection échouée.", + "title" => "Connexion auto.", + "info" => "La connexion a échoué.", "timer" => true, "toSrc" => false ] @@ -58,8 +58,8 @@ $messageText = [ "logout" => [ "success" => [ "success" => true, - "title" => "Déconnection.", - "info" => "Vous êtes déconnecté!", + "title" => "Déconnexion", + "info" => "Vous êtes maintenant déconnecté!", "timer" => true, "toSrc" => false ] @@ -68,22 +68,22 @@ $messageText = [ "missionRegister" => [ "success" => [ "success" => true, - "title" => "Requête de mission.", - "info" => "La requete a été émise!", + "title" => "Requête de mission", + "info" => "La requete a bien été émise!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Requête de mission.", - "info" => "Erreur lors de la requête.", + "title" => "Requête de mission", + "info" => "Erreur lors l'émission de la requête.", "timer" => true, "toSrc" => true ], "notConnected" => [ "success" => false, - "title" => "Requête de mission.", - "info" => "Erreur, vous devez être connecté, et connecté en tant que client.", + "title" => "Requête de mission", + "info" => "Vous devez d'abord être connecté en tant que client!", "timer" => true, "toSrc" => false ] @@ -92,15 +92,15 @@ $messageText = [ "missionAccepted" => [ "success" => [ "success" => true, - "title" => "Mission info.", - "info" => "Mission acceptée!", + "title" => "Mission info", + "info" => "La mission a été acceptée!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Mission info.", - "info" => "Erreur, mission non acceptée.", + "title" => "Mission info", + "info" => "La mission n'est pas acceptée.", "timer" => true, "toSrc" => true ] @@ -109,15 +109,15 @@ $messageText = [ "missionValidated" => [ "success" => [ "success" => true, - "title" => "Mission info.", - "info" => "Mission completée!", + "title" => "Mission info", + "info" => "La mission est signalée comme terminée!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Mandate info.", - "info" => "Erreur, mission non enregistrée comme completée.", + "title" => "Mandate info", + "info" => "La mission n'a pas pu être validée.", "timer" => true, "toSrc" => true ] @@ -126,15 +126,15 @@ $messageText = [ "missionReview" => [ "success" => [ "success" => true, - "title" => "Avis sur la mission.", + "title" => "Votre avis sur la mission", "info" => "Votre avis a bien été enregistré!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Avis sur la mission.", - "info" => "Erreur, votre avis n'a pas été enregistré.", + "title" => "Votre avis sur la mission.", + "info" => "Votre avis n'a pas pu être enregistré.", "timer" => true, "toSrc" => true ] @@ -143,15 +143,15 @@ $messageText = [ "userAdd" => [ "success" => [ "success" => true, - "title" => "Enregistrement d'un utilisateur.", - "info" => "Utilisateur enregistré!", + "title" => "Inscription", + "info" => "Votre inscription a bien été validé, vous pouvez maintenant vous connecter.", "timer" => true, "toSrc" => false ], "fail" => [ "success" => false, - "title" => "Enregistrement d'un utilisateur.", - "info" => "Erreur, l'utilisateur n'a pas été enregistré.", + "title" => "Inscription", + "info" => "Inscription impossible.", "timer" => true, "toSrc" => true ] @@ -160,15 +160,15 @@ $messageText = [ "adminDelUser" => [ "success" => [ "success" => true, - "title" => "Suppression d'un utilisateur.", - "info" => "Utilisateur supprimé!", + "title" => "Suppression d'un utilisateur", + "info" => "L'utilisateur a été supprimé!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Suppression d'un utilisateur.", - "info" => "Erreur, l'utilisateur n'a pas été supprimé.", + "title" => "Suppression d'un utilisateur", + "info" => "L'utilisateur n'a pas été supprimé.", "timer" => true, "toSrc" => true ] @@ -177,15 +177,15 @@ $messageText = [ "adminAddJob" => [ "success" => [ "success" => true, - "title" => "Ajout d'une catégorie d'emploi.", + "title" => "Ajout d'une catégorie d'emploi", "info" => "La catégorie a bien été ajoutée!", "timer" => true, "toSrc" => true ], "fail" => [ "success" => false, - "title" => "Ajout d'une catégorie d'emploi.", - "info" => "Erreur, la catégorie n'a pas été ajoutée.", + "title" => "Ajout d'une catégorie d'emploi", + "info" => "La catégorie n'a pas été ajoutée.", "timer" => true, "toSrc" => true ] @@ -194,15 +194,15 @@ $messageText = [ "adminDelJob" => [ "success" => [ "success" => true, - "title" => "Suppression d'une catégorie.", + "title" => "Suppression d'une catégorie", "info" => "Categorie supprimée!", "timer" => true, "toSrc" => true ], "delete" => [ "success" => false, - "title" => "Suppression d'une catégorie.", - "info" => "Erreur, la catégorie n'a pas été supprimée.", + "title" => "Suppression d'une catégorie", + "info" => "La catégorie n'a pas été supprimée.", "timer" => true, "toSrc" => true ] @@ -211,15 +211,15 @@ $messageText = [ "adminDelMission" => [ "success" => [ "success" => true, - "title" => "Suppression d'une mission.", + "title" => "Suppression d'une mission", "info" => "Mission supprimée!", "timer" => true, "toSrc" => true ], "delete" => [ "success" => false, - "title" => "Suppression d'une mission.", - "info" => "Erreur, la mission n'a pas été supprimée.", + "title" => "Suppression d'une mission", + "info" => "La mission n'a pas été supprimée.", "timer" => true, "toSrc" => true ] diff --git a/Template/Include/fr/table.php b/Template/Include/fr/table.php index 342b5e5..619bb32 100644 --- a/Template/Include/fr/table.php +++ b/Template/Include/fr/table.php @@ -12,9 +12,9 @@ $header = [ "ID utilisateur", "Email", "Mot de passe chiffré", - "Jeton d'auto-connection", + "Jeton d'auto-connexion", "Date d'inscription", - "Status de l'utilisateur" + "Statut de l'utilisateur" ], // En-tête des colonnes du tableau des missions de l'admin. "adminMissions" => [ diff --git a/Template/Include/fr/text.php b/Template/Include/fr/text.php index bff6489..3622669 100644 --- a/Template/Include/fr/text.php +++ b/Template/Include/fr/text.php @@ -7,6 +7,10 @@ // ############################################################################ $text = [ + "incl_global_notification" => [ + "header" => "Notification!", + "info" => "Vous avez une nouvelle mission!", + ], "incl_form_admin" => [ "btManageJob" => "Gestion des emplois", "btManageUser" => "Gestion des utilisateurs", @@ -30,28 +34,27 @@ $text = [ "adress" => "Adresse", "zipCode" => "Code postal", "city" => "Ville", - "myJobs" => "Mes emplois:", "jobsSel" => "Emplois", "jobsAdd" => "Ajouter", + "myJobs" => "Mes emplois:", "degree" => "Diplômes", "capability" => "Capacités", "description" => "Description", "submit" => "Modifier" ], "incl_form_login" => [ - "h2" => "Identification", - "email" => "Email", - "password" => "Mot de passe", + "h2" => "Connexion", + "email" => "Votre email", + "password" => "Votre mot de passe", "rememberMe" => "Se souvenir de moi", - "submit" => "Connection" + "submit" => "Connexion" ], "incl_form_mission" => [ - "h2" => "Formulaire pour enregistrer une mission", - "subject" => "Sujet", + "h2" => "Votre mission", + "subject" => "Sujet de la mission", + "jobsSel" => "Emploi", "review" => "Commentaire", - "proId" => "ID du pro", - "submit" => "Enregistrer", - "jobsSel" => "Emplois" + "submit" => "Enregistrer" ], "incl_table_myMission" => [ "pendingMission" => "Missions en attente", @@ -66,20 +69,20 @@ $text = [ "incl_global_navbar" => [ "h2" => "AlphaJob", "btnSearch" => "Rechercher", - "btnInfos" => "Modif. infos", - "btnMission" => "Enreg. mission", + "btnInfos" => "Mes infos", "btnMyMission" => "Mes missions", "btnAdmin" => "Administration", - "btnLogin" => "Connection", - "btnLogout" => "Déconnection", + "btnLogin" => "Connexion", + "btnLogout" => "Déconnexion", "btnRegister" => "Inscription", "lang" => "Langue", - "btnLang" => "Sélectionner" + "btnLang" => "Choisir" ], "incl_form_register" => [ - "h2" => "Formulaire d'inscription", - "email" => "Email", - "password" => "Mot de passe", + "h2" => "Vous inscrire", + "email" => "Votre email", + "mailNotice" => "L'email est valide.", + "password" => "Votre mot de passe", "passNotice" => "Le mot de passe doit au moins avoir:", "passLength" => "8 caractères,", "passUpper" => "une majuscule,", @@ -102,9 +105,9 @@ $text = [ "mandate" => "Mandater" ], "incl_index_slideshow" => [ - "slide1" => "Trouvez le proffessionel idéal proche de chez vous.

Pour tous vos besoins.

AlphaJob", - "slide2" => "Seuls les meilleurs professionnels sont acceptés.

Qualité guarantie.

AlphaJob", - "slide3" => "Les meilleurs offres pour créer votre site Web.

Découvrez nos solutions clefs en main.

AlphaJob" + "slide1" => "Trouvez le professionel idéal proche de chez vous.

Pour tous vos besoins.

AlphaJob", + "slide2" => "Seul les meilleurs professionnels sont acceptés.

Qualité guarantie.

AlphaJob", + "slide3" => "Les meilleures offres pour créer votre site Web.

Découvrez nos solutions clefs en main.

AlphaJob" ] ]; diff --git a/Template/Include/fr/title.php b/Template/Include/fr/title.php index 49285a2..c2681d2 100644 --- a/Template/Include/fr/title.php +++ b/Template/Include/fr/title.php @@ -8,7 +8,7 @@ $title = [ "index" => "AlphaJob - Index", - "login" => "AlphaJob - Connection", + "login" => "AlphaJob - Connexion", "message" => "AlphaJob - Message", "mission" => "AlphaJob - Gestion d'une mission", "myMission" => "AlphaJob - Mes missions", diff --git a/Template/Include/incl_form_mission.php b/Template/Include/incl_form_mission.php index b95c396..03d4254 100644 --- a/Template/Include/incl_form_mission.php +++ b/Template/Include/incl_form_mission.php @@ -27,15 +27,18 @@ if (isset($_SESSION["missionInitiate"]) - + '.PHP_EOL); // On loop à traves les emplois du pro et on récupère l'id et le nom pour peupler le select for ($i = 0; $i < count($_SESSION["missionInitiate"]["proJobs"]); $i++) { $categoryName = $_SESSION["missionInitiate"]["proJobs"][$i]["jobCategoryName".ucwords($_SESSION["lang"])]; $value = $_SESSION["missionInitiate"]["proJobs"][$i]["jobCategoryId"]; echo(' '.PHP_EOL); } - echo(' + echo(' + @@ -59,9 +62,9 @@ if (isset($_SESSION["missionInitiate"])

'.$text[basename(__FILE__, ".php")]["h2"].'

-
-'); + +'); // **************************************************************************** // RECUPERATION DE LA PAGE VERS LAQUELLE REDIRIGER SI CE N'EST PAS L'INDEX diff --git a/Template/Include/incl_global_notification.php b/Template/Include/incl_global_notification.php new file mode 100644 index 0000000..2c0f25b --- /dev/null +++ b/Template/Include/incl_global_notification.php @@ -0,0 +1,23 @@ + +'); + +?> \ No newline at end of file diff --git a/Template/Include/incl_table_myMission.php b/Template/Include/incl_table_myMission.php index d97e32d..e55346d 100644 --- a/Template/Include/incl_table_myMission.php +++ b/Template/Include/incl_table_myMission.php @@ -74,7 +74,7 @@ echo('
// **************************************************************************** // TABLEAU DES MISSIONS EN ATTENTE // **************************************************************************** -echo('
'); +echo('
'); if ($missionStatus["pending"]) { echo(' @@ -109,7 +109,7 @@ echo(''); // **************************************************************************** // TABLEAU DES MISSIONS EN COURS // **************************************************************************** -echo('
'); +echo('
'); if ($missionStatus["ongoing"]) { echo('
-- cgit v1.2.3