diff --git a/Sources/public/assets/img/add.png b/Sources/public/assets/img/add.png
new file mode 100644
index 00000000..d0279fd4
Binary files /dev/null and b/Sources/public/assets/img/add.png differ
diff --git a/Sources/public/assets/img/bupload.png b/Sources/public/assets/img/bupload.png
new file mode 100644
index 00000000..63675602
Binary files /dev/null and b/Sources/public/assets/img/bupload.png differ
diff --git a/Sources/public/assets/img/upload.png b/Sources/public/assets/img/upload.png
new file mode 100644
index 00000000..63675602
Binary files /dev/null and b/Sources/public/assets/img/upload.png differ
diff --git a/Sources/public/assets/img/uploadW.png b/Sources/public/assets/img/uploadW.png
new file mode 100644
index 00000000..1553711e
--- /dev/null
+++ b/Sources/public/assets/img/uploadW.png
@@ -0,0 +1,948 @@
+
+image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Sources/public/assets/img/uploadW.svg b/Sources/public/assets/img/uploadW.svg
new file mode 100644
index 00000000..1553711e
--- /dev/null
+++ b/Sources/public/assets/img/uploadW.svg
@@ -0,0 +1,948 @@
+
+image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Sources/src/app/home.php b/Sources/src/app/home.php
index 2edd0e89..166a4b8e 100755
--- a/Sources/src/app/home.php
+++ b/Sources/src/app/home.php
@@ -11,21 +11,34 @@
"c" => array("date" => "23/11/18","type" => "Cyclisme", "bpm" => "126", "kmh" => "27.0","distance" => "30.0")
);
+
+
$listM= array (
"a" => array("lu" => "false","nom" => "Julien", "prenom" => "Clément", "message" => "Demande d'exercice"),
"b" => array("lu" => "true","nom" => "Ferdiloi", "prenom" => "Frédérique", "message" => "Coaching"),
"c" => array("lu" => "true","nom" => "Kuliqo", "prenom" => "Raphael", "message" => "Rendez-vous")
);
+
+ $listE= array (
+ "a" => array("date" => "20/10/23","type" => "Natation", "intensite" => "Fort", "status" => "Programmé"),
+ "b" => array("date" => "16/10/23","type" => "Boxe anglaise", "intensite" => "Moyen", "status" => "Fini"),
+ "c" => array("date" => "10/10/23","type" => "Cyclisme", "intensite" => "Moyen", "status" => "Fini")
+ );
+
+ $infoUser= array("img" => "test2", "nom"=>"Polika", "prenom" => "Amandine", "dateNaiss" => "24/05/1993", "favSport" => "Natation", "coach" => "M.Bastien", "description" => "Salut, c'est Frigiel");
$loader = new \Twig\Loader\FilesystemLoader(__DIR__.'/views/Templates');
$twig = new \Twig\Environment($loader);
- $template=$twig->load('./page/friend.html.twig');
+ $template=$twig->load('./page/import.html.twig');
$template->display([
'pp' => "test2",
'user' => "Amandine",
'friendship' => $listF,
'analyzes' => $listA,
- 'mails' => $listM
+ 'mails' => $listM,
+ 'users' => $listF,
+ 'infoUser' => $infoUser,
+ 'exos' => $listE
]);
?>
\ No newline at end of file
diff --git a/Sources/src/app/views/Templates/base.html.twig b/Sources/src/app/views/Templates/base.html.twig
index 0d7b2783..d80861c7 100755
--- a/Sources/src/app/views/Templates/base.html.twig
+++ b/Sources/src/app/views/Templates/base.html.twig
@@ -72,6 +72,11 @@
Messagerie
+
+
+
+ Importer
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/Sources/src/app/views/Templates/page/exercice.html.twig b/Sources/src/app/views/Templates/page/exercice.html.twig
index 98d183c6..665d8e8c 100755
--- a/Sources/src/app/views/Templates/page/exercice.html.twig
+++ b/Sources/src/app/views/Templates/page/exercice.html.twig
@@ -4,4 +4,46 @@
{% block title %}Exercices - HearthTrack{% endblock %}
-{% block user %}{{user}}{% endblock %}
\ No newline at end of file
+{% block user %}{{user}}{% endblock %}
+
+{% block body %}
+
+
Exercices
+
+ Accueil
+ Exercices
+
+
+
Ajouter un exercice
+
+
+
+
+
+ Date
+ Type
+ Intensité prévue
+ Status
+
+
+
+
+ {% for exo in exos %}
+
+ {{exo.date}}
+ {{exo.type}}
+ {{exo.intensite}}
+ {{exo.status}}
+
+
+
+
+ {% endfor %}
+
+
+
+
+
+
+
+{% 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 aed8e535..840a59c6 100755
--- a/Sources/src/app/views/Templates/page/friend.html.twig
+++ b/Sources/src/app/views/Templates/page/friend.html.twig
@@ -13,7 +13,7 @@
Accueil
Ami
-
+
Ajouter un ami
@@ -37,9 +37,9 @@
{{ami.prenom}}
{{ami.status}}
-
-
-
+
+
+
{% endfor %}
diff --git a/Sources/src/app/views/Templates/page/import.html.twig b/Sources/src/app/views/Templates/page/import.html.twig
new file mode 100644
index 00000000..c09df6cf
--- /dev/null
+++ b/Sources/src/app/views/Templates/page/import.html.twig
@@ -0,0 +1,38 @@
+{% extends "base.html.twig" %}
+
+{% block pp %}{{pp}}{% endblock %}
+
+{% block title %}Importer - HearthTrack{% endblock %}
+
+{% block user %}{{user}}{% endblock %}
+
+{% block body %}
+
+
Importer
+
+ Accueil
+ Importer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/Sources/src/app/views/Templates/page/profile.html.twig b/Sources/src/app/views/Templates/page/profile.html.twig
new file mode 100644
index 00000000..f8583216
--- /dev/null
+++ b/Sources/src/app/views/Templates/page/profile.html.twig
@@ -0,0 +1,64 @@
+{% extends "base.html.twig" %}
+
+{% block pp %}{{pp}}{% endblock %}
+
+{% block title %}Profile - HearthTrack{% endblock %}
+
+{% block user %}{{user}}{% endblock %}
+
+{% block body %}
+
+
Profile
+
+ Accueil
+ Profile
+
+
+
+
+
+
+
+
+
+
+
+ Nom : {{infoUser.nom}}
+
+
+ Prénom : {{infoUser.prenom}}
+
+
+ Date de naissance : {{infoUser.dateNaiss}}
+
+
+ Sport favori : {{infoUser.favSport}}
+
+
+ Coach : {{infoUser.coach}}
+
+
+
+
+
+
+
+
+
+
+ Description : {{infoUser.description}}
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/Sources/src/app/views/Templates/page/settings.html.twig b/Sources/src/app/views/Templates/page/settings.html.twig
new file mode 100644
index 00000000..915c80ff
--- /dev/null
+++ b/Sources/src/app/views/Templates/page/settings.html.twig
@@ -0,0 +1,62 @@
+{% extends "base.html.twig" %}
+
+{% block pp %}{{pp}}{% endblock %}
+
+{% block title %}Paramètres - HearthTrack{% endblock %}
+
+{% block user %}{{user}}{% endblock %}
+
+{% block body %}
+
+
Paramètres
+
+ Accueil
+ Paramètres
+
+
+
+
+
+
+
+
+
+
+
+ Nom : {{infoUser.nom}}
+
+
+ Prénom : {{infoUser.prenom}}
+
+
+ Date de naissance : {{infoUser.dateNaiss}}
+
+
+ Sport favori : {{infoUser.favSport}}
+
+
+ Coach : {{infoUser.coach}}
+
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/Sources/src/console/Console.php b/Sources/src/console/Console.php
index 3dd3075a..b1fe9886 100755
--- a/Sources/src/console/Console.php
+++ b/Sources/src/console/Console.php
@@ -91,7 +91,7 @@ function displaySettingsMenu() {
// Modifier le profil du athlète et coach
echo "2. Personnaliser le profil public\n";
echo "3. Configurer les alertes\n";
- echo "4. Supprimer mon compte"
+ echo "4. Supprimer mon compte";
echo "0. Retour au menu principal\n";
echo "Choisissez une option: ";
}