From c074d4e825eb5d1b11bdd7ebd4c4043dd0813ff3 Mon Sep 17 00:00:00 2001 From: Antoine Pinagot Date: Mon, 20 Nov 2023 16:42:38 +0100 Subject: [PATCH] Finalisation page error (401,404,500) + Finalisation Analyses, Messagerie et Liste d'ami --- Documents/Brainstorming/Brainstorming 1.docx | Bin Documents/Brainstorming/Brainstorming 1.pdf | Bin Documents/ComparaisonGANTT.png | Bin Documents/CompraraisonGANTT.xlsx | Bin .../Couts Prévisionnels/Coût du projet.docx | Bin .../DiagrammeCasUtilisationFitWeb.drawio | 0 Documents/Diagramme/MLD.plantuml | 0 ...Gantt Antoine David Paul Kevin Antoine.mpp | Bin ...Gantt Antoine David Paul Kevin Antoine.pdf | Bin Documents/Gestion/PERT temps.xlsx | Bin Documents/Images/logo.png | Bin Documents/PERT1.png | Bin Documents/PERT2.png | Bin .../Partie prenantes/Parties prenantes.docx | Bin Documents/Persona/Elsa Justin.pdf | Bin Documents/Persona/Ethan Hulist.pdf | Bin Documents/Persona/Jules Gerdoli.pdf | Bin Documents/Questionnaire/Questionnaire 1.docx | Bin Documents/Questionnaire/Questionnaire.md | 0 README.md | 0 Sources/.dockerignore | 0 Sources/src/app/home.php | 2 +- .../app/views/Templates/error/500.html.twig | 7 +++ .../app/views/Templates/page/friend.html.twig | 52 +++++++++++++++++- .../app/views/Templates/page/mail.html.twig | 39 ++++++++++++- notifymail.sh | 0 26 files changed, 97 insertions(+), 3 deletions(-) mode change 100644 => 100755 Documents/Brainstorming/Brainstorming 1.docx mode change 100644 => 100755 Documents/Brainstorming/Brainstorming 1.pdf mode change 100644 => 100755 Documents/ComparaisonGANTT.png mode change 100644 => 100755 Documents/CompraraisonGANTT.xlsx mode change 100644 => 100755 Documents/Couts Prévisionnels/Coût du projet.docx mode change 100644 => 100755 Documents/Diagramme/DiagrammeCasUtilisationFitWeb.drawio mode change 100644 => 100755 Documents/Diagramme/MLD.plantuml mode change 100644 => 100755 Documents/Gantt Antoine David Paul Kevin Antoine.mpp mode change 100644 => 100755 Documents/Gantt Antoine David Paul Kevin Antoine.pdf mode change 100644 => 100755 Documents/Gestion/PERT temps.xlsx mode change 100644 => 100755 Documents/Images/logo.png mode change 100644 => 100755 Documents/PERT1.png mode change 100644 => 100755 Documents/PERT2.png mode change 100644 => 100755 Documents/Partie prenantes/Parties prenantes.docx mode change 100644 => 100755 Documents/Persona/Elsa Justin.pdf mode change 100644 => 100755 Documents/Persona/Ethan Hulist.pdf mode change 100644 => 100755 Documents/Persona/Jules Gerdoli.pdf mode change 100644 => 100755 Documents/Questionnaire/Questionnaire 1.docx mode change 100644 => 100755 Documents/Questionnaire/Questionnaire.md mode change 100644 => 100755 README.md mode change 100644 => 100755 Sources/.dockerignore create mode 100755 Sources/src/app/views/Templates/error/500.html.twig mode change 100644 => 100755 notifymail.sh diff --git a/Documents/Brainstorming/Brainstorming 1.docx b/Documents/Brainstorming/Brainstorming 1.docx old mode 100644 new mode 100755 diff --git a/Documents/Brainstorming/Brainstorming 1.pdf b/Documents/Brainstorming/Brainstorming 1.pdf old mode 100644 new mode 100755 diff --git a/Documents/ComparaisonGANTT.png b/Documents/ComparaisonGANTT.png old mode 100644 new mode 100755 diff --git a/Documents/CompraraisonGANTT.xlsx b/Documents/CompraraisonGANTT.xlsx old mode 100644 new mode 100755 diff --git a/Documents/Couts Prévisionnels/Coût du projet.docx b/Documents/Couts Prévisionnels/Coût du projet.docx old mode 100644 new mode 100755 diff --git a/Documents/Diagramme/DiagrammeCasUtilisationFitWeb.drawio b/Documents/Diagramme/DiagrammeCasUtilisationFitWeb.drawio old mode 100644 new mode 100755 diff --git a/Documents/Diagramme/MLD.plantuml b/Documents/Diagramme/MLD.plantuml old mode 100644 new mode 100755 diff --git a/Documents/Gantt Antoine David Paul Kevin Antoine.mpp b/Documents/Gantt Antoine David Paul Kevin Antoine.mpp old mode 100644 new mode 100755 diff --git a/Documents/Gantt Antoine David Paul Kevin Antoine.pdf b/Documents/Gantt Antoine David Paul Kevin Antoine.pdf old mode 100644 new mode 100755 diff --git a/Documents/Gestion/PERT temps.xlsx b/Documents/Gestion/PERT temps.xlsx old mode 100644 new mode 100755 diff --git a/Documents/Images/logo.png b/Documents/Images/logo.png old mode 100644 new mode 100755 diff --git a/Documents/PERT1.png b/Documents/PERT1.png old mode 100644 new mode 100755 diff --git a/Documents/PERT2.png b/Documents/PERT2.png old mode 100644 new mode 100755 diff --git a/Documents/Partie prenantes/Parties prenantes.docx b/Documents/Partie prenantes/Parties prenantes.docx old mode 100644 new mode 100755 diff --git a/Documents/Persona/Elsa Justin.pdf b/Documents/Persona/Elsa Justin.pdf old mode 100644 new mode 100755 diff --git a/Documents/Persona/Ethan Hulist.pdf b/Documents/Persona/Ethan Hulist.pdf old mode 100644 new mode 100755 diff --git a/Documents/Persona/Jules Gerdoli.pdf b/Documents/Persona/Jules Gerdoli.pdf old mode 100644 new mode 100755 diff --git a/Documents/Questionnaire/Questionnaire 1.docx b/Documents/Questionnaire/Questionnaire 1.docx old mode 100644 new mode 100755 diff --git a/Documents/Questionnaire/Questionnaire.md b/Documents/Questionnaire/Questionnaire.md old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Sources/.dockerignore b/Sources/.dockerignore old mode 100644 new mode 100755 diff --git a/Sources/src/app/home.php b/Sources/src/app/home.php index 9a89f88d..ac9048b7 100755 --- a/Sources/src/app/home.php +++ b/Sources/src/app/home.php @@ -4,6 +4,6 @@ $loader = new \Twig\Loader\FilesystemLoader(__DIR__.'/views/Templates'); $twig = new \Twig\Environment($loader); - $template=$twig->load('./page/analyze.html.twig'); + $template=$twig->load('./page/mail.html.twig'); $template->display(); ?> \ No newline at end of file diff --git a/Sources/src/app/views/Templates/error/500.html.twig b/Sources/src/app/views/Templates/error/500.html.twig new file mode 100755 index 00000000..b1304f23 --- /dev/null +++ b/Sources/src/app/views/Templates/error/500.html.twig @@ -0,0 +1,7 @@ +{% extends "errorbase.html.twig" %} + +{% block title %}500 ERROR{% endblock %} + +{% block nb %}

500

{% endblock %} +{% block name %}Server Error{% endblock %} +{% block descr %}Une erreur est survenue avec le serveur.{% endblock %} \ No newline at end of file diff --git a/Sources/src/app/views/Templates/page/friend.html.twig b/Sources/src/app/views/Templates/page/friend.html.twig index eaa03dfe..18cadc43 100755 --- a/Sources/src/app/views/Templates/page/friend.html.twig +++ b/Sources/src/app/views/Templates/page/friend.html.twig @@ -2,4 +2,54 @@ {% block title %}Amis - HearthTrack{% endblock %} -{% block user %}Abdul Admin{% endblock %} \ No newline at end of file +{% block user %}Abdul Admin{% endblock %} + +{% block body %} +
+

Liste d'ami

+
    +
  1. Accueil
    2. +
  2. Ami
    3. +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NomPrénomStatus
GautierThéophileEn ligne(Profil)(Message)(Supprimer)(Bloquer)
FrancisFrançoisEn ligne(Profil)(Message)(Supprimer)(Bloquer)
+ (??) -> Logo +
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/Sources/src/app/views/Templates/page/mail.html.twig b/Sources/src/app/views/Templates/page/mail.html.twig index 24ed5b4d..dd61ad38 100755 --- a/Sources/src/app/views/Templates/page/mail.html.twig +++ b/Sources/src/app/views/Templates/page/mail.html.twig @@ -2,4 +2,41 @@ {% block title %}Messagerie - HearthTrack{% endblock %} -{% block user %}Abdul Admin{% endblock %} \ No newline at end of file +{% block user %}Abdul Admin{% endblock %} + +{% block body %} +
+

Messagerie

+
    +
  1. Accueil
    2. +
  2. Messagerie
    3. +
+
+
+ + + + + + + + + + + + + + + + + + + +
LuDe:Description
FThéophileDemande d'exercices
TFrançoisPartage d'analyse
+ (??) -> Logo +
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/notifymail.sh b/notifymail.sh old mode 100644 new mode 100755