diff --git a/css/styles.css b/css/styles.css
index a78499c9c657668ef56051c14f181e47ea2a84b1..beb7b2a4521fcf4ff3f3ef14dcfbf749a44f3f81 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -15,6 +15,8 @@ iframe {
font-weight: bold;
}
+
+
.bold-btn{
position: absolute;
color: white;
@@ -249,6 +251,22 @@ iframe {
outline: none;
}
+.listeRepas{
+ height: 500px;
+ overflow-y: scroll;
+}
+
+.mealOutline {
+ border-radius: 25px;
+ background-color: #F2F2F2;
+ padding-left: 67px;
+ padding-top: 17px;
+ padding-bottom: 17px;
+ width: 895px;
+ height: 66px;
+ margin-left: 119px;
+}
+
.memberTab {
overflow: hidden;
border: none;
@@ -340,6 +358,15 @@ iframe {
outline: none;
}
+.selectedFridgeLabel{
+ width: 1035px;
+ height: 38px;
+ background-color: rgb(83, 189, 189);
+ color: #FFFFFF;
+ text-align: center;
+ margin-left: 83px;
+}
+
.signup-title{
font-family: Arial Bold, sans-serif;
font-weight: 700;
@@ -431,7 +458,6 @@ iframe {
}
.titleBar{
-
height: 28px;
padding: 12px;
text-align: center;
@@ -459,6 +485,10 @@ iframe {
position: relative;
}
+.underlined{
+ text-decoration: underline;
+}
+
.wrong-password {
width: 340px;
height: 4px;
@@ -528,8 +558,6 @@ iframe {
float: right;
}
-
-
/* Go from zero to full opacity */
@keyframes fadeEffect {
from {opacity: 0;}
diff --git a/html/chercherUnRepas.html b/html/chercherUnRepas.html
index 5b6fe3981a0dae6a6874f139d15971184227c23c..4a746f69c3f6d70ee68a86245e5b3fd6af9e829c 100644
--- a/html/chercherUnRepas.html
+++ b/html/chercherUnRepas.html
@@ -5,15 +5,17 @@
<meta charset="UTF-8">
<title>Chercher un repas</title>
</head>
-<body>
+
+<body id="listeRepas" onload="retrieveRepas()">
<br>
<p class="titleSection">Chercher un repas</p><br>
<form class="search-form" id="form">
<input type="text" class="search-textbox" placeholder="Écrire votre repas" name="textbox"><br><br>
<input type="submit" class="search-button"value="Rechercher">
</form>
-
</body>
+
+<script src="../scripts/readJson.js"></script>
<script>
var textbox = document.getElementById("form");
textbox.addEventListener("focus", onTextBoxFocus, true);
@@ -27,5 +29,27 @@
document.getElementsByName('textbox')[0].placeholder='Écrire votre repas';
}
+ function retrieveRepas(){
+ var index = sessionStorage.getItem('frigoIndex');
+ console.log(index)
+ if(index != null){
+ var obj = httpGetJson();
+ let builtUpHTML = '<br><p class="titleSection">Chercher un repas</p><br>' +
+ '<div class="selectedFridgeLabel">' +
+ '<span class="bold underlined">' + obj.array[index].nom + '</span><br>' +
+ '<span class="bold">' + obj.array[index].addresse + '</span>' +
+ '</div> <div class="listeRepas">'
+ for (let i = 0; i < obj.array[index].repas.length; i++){
+ builtUpHTML += '<div class="mealOutline">' +
+ '<span class="bold">' + obj.array[index].repas[i].nom + '</span><br>' +
+ obj.array[index].repas[i].type + '<br>' +
+ 'Quantité : ' + obj.array[index].repas[i].qt + ' disponibles<br>' +
+ '</div>';
+ }
+ builtUpHTML += '</div>';
+ document.getElementById('listeRepas').innerHTML = builtUpHTML;
+ }
+ }
+
</script>
</html>
\ No newline at end of file
diff --git a/html/listeFrigos.html b/html/listeFrigos.html
index 0418bbb54e41db1a76e3f9263d94ff9664bf1c52..983b02ed9ebd5a933bcf090c40f9cfa8cff678d9 100644
--- a/html/listeFrigos.html
+++ b/html/listeFrigos.html
@@ -9,7 +9,6 @@
<p class="titleSection">Mon profil</p>
</body>
<script src="../scripts/readJson.js"></script>
-<script src="../scripts/openTabsFromListeFrigos.js"></script>
<script>
function retrieveFrigos(){
var obj = httpGetJson();
diff --git a/html/membres.html b/html/membres.html
index f6076bb65a1a52351b68feaa46983770e2ee57ba..2ff52a1033264a73fae9dad0e0f3136ab33b4c35 100644
--- a/html/membres.html
+++ b/html/membres.html
@@ -6,7 +6,7 @@
<title>Membres</title>
</head>
<body>
- <div class = app>
+ <div class = "app">
<div class="top-content">
<div class = titleBar>Frigocommunautaire</div>
<div class="sign-up-btn">
@@ -39,10 +39,8 @@
- <div class="tealBackground">
- <div id="listeFrigos" class="tabcontent-members active">
- <iframe id="mbrcontent" src="listeFrigos.html" width="100%" height="800"></iframe>
- </div>
+ <div id="listeFrigos" class="tabcontent-members active tealBackground">
+ <iframe id="mbrcontent" src="listeFrigos.html" width="100%" height="800"></iframe>
</div>
</div>
</body>