From b3f3fc0de9963b0d137bea0c4b8f13691536383d Mon Sep 17 00:00:00 2001
From: Sandra Vilder <sandra.vilder@gmail.com>
Date: Fri, 14 Jun 2019 11:56:02 +0200
Subject: [PATCH 1/2] rewards is actually working now

---
 .../components/_card_role_model.scss          |  2 +-
 app/views/pages/dashboard.html.erb            | 69 ++++++++++++-------
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/app/assets/stylesheets/components/_card_role_model.scss b/app/assets/stylesheets/components/_card_role_model.scss
index 10bf487..f8d8bdd 100644
--- a/app/assets/stylesheets/components/_card_role_model.scss
+++ b/app/assets/stylesheets/components/_card_role_model.scss
@@ -25,7 +25,7 @@
     text-decoration: none;
   }
   p {
-    font-size: 15px;
+    font-size: 12px;
   }
 }
 
diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb
index d7a8f5a..109860b 100644
--- a/app/views/pages/dashboard.html.erb
+++ b/app/views/pages/dashboard.html.erb
@@ -7,44 +7,63 @@
     </div>
 
     <div class="rewards">
+      <% if @counter[:dailyactivities] >= 3 && @counter[:futureme] >= 3 && @counter[:interactions] >= 3 && @counter[:curiosity] >= 3  %>
+        <div class="reward">
+          <%= image_tag('medailles/dragon_3_all.png', size: "100") %> <!-- bébé dragon -->
+
+        </div>
+      <% elsif @counter[:dailyactivities] >= 2 && @counter[:futureme] >= 2 && @counter[:interactions] >= 2 && @counter[:curiosity] >= 2  %>
+        <div class="reward">
+          <%= image_tag('medailles/dragon_2_all.png', size: "100") %> <!-- petit dragon -->
+
+        </div>
+      <% elsif @counter[:dailyactivities] >= 1 && @counter[:futureme] >= 1 && @counter[:interactions] >= 1 && @counter[:curiosity] >= 1  %>
+        <div class="reward">
+          <%= image_tag('medailles/dragon_1_all.png', size: "100") %> <!-- grand dragon -->
+        </div>
+      <% end %>
       <% @counter.each do |key, value| %>
         <% if value >= 3 %>
           <div class="reward">
             <div class="reward-content">
               <% if key == :futureme %>
-                <%= image_tag('medailles/dragon_3_future_me.png', size: "100") %> <!-- dragon couleur cat -->
-                <!-- <i class=" <%= key %> fas fa-medal fa-lg"></i> -->
+                <%= image_tag('medailles/dragon_3_future_me.png', size: "100") %>
               <% elsif key == :dailyactivities %>
-                <%= image_tag('medailles/dragon_3_daily_activities.png', size: "100") %> <!-- dragon couleur cat -->
-                <!--  <i class=" <%= key %> fas fa-medal fa-lg"></i> -->
+                <%= image_tag('medailles/dragon_3_daily_activities.png', size: "100") %>
               <% elsif key == :interactions %>
-                <%= image_tag('medailles/dragon_3_interactions.png', size: "100") %> <!-- dragon couleur cat -->
-                <!-- <i class=" <%= key %> fas fa-medal fa-lg"></i> -->
+                <%= image_tag('medailles/dragon_3_interactions.png', size: "100") %>
               <% elsif key == :curiosity %>
-                <%= image_tag('medailles/dragon_3_curiosity.png', size: "100") %> <!-- dragon couleur cat -->
-                <!-- <i class=" <%= key %> fas fa-medal fa-lg"></i> -->
+                <%= image_tag('medailles/dragon_3_curiosity.png', size: "100") %>
               <% end %>
             </div>
           </div>
-        <% end %>
-      <% end %>
-      <% if @counter[:dailyactivities] == @counter[:futureme] && @counter[:futureme] == @counter[:interactions] && @counter[:interactions] == @counter[:curiosity] %>
-        <% if @counter[:dailyactivities] >= 1 %>
-          <div class="reward">
-            <%= image_tag('medailles/dragon_1_all.png', size: "100") %> <!-- bébé dragon -->
-            <!-- <i class="bronze fas fa-trophy fa-lg"></i> -->
-          </div>
-        <% end %>
-        <% if @counter[:dailyactivities] >= 2 %>
+        <% elsif value >= 2 %>
           <div class="reward">
-            <%= image_tag('medailles/dragon_2_all.png', size: "100") %> <!-- petit dragon -->
-            <!-- <i class="silver fas fa-trophy fa-lg"></i> -->
+            <div class="reward-content">
+              <% if key == :futureme %>
+                <%= image_tag('medailles/dragon_2_future_me.png', size: "100") %>
+              <% elsif key == :dailyactivities %>
+                <%= image_tag('medailles/dragon_2_daily_activities.png', size: "100") %>
+              <% elsif key == :interactions %>
+                <%= image_tag('medailles/dragon_2_interactions.png', size: "100") %>
+              <% elsif key == :curiosity %>
+                <%= image_tag('medailles/dragon_2_curiosity.png', size: "100") %>
+              <% end %>
+            </div>
           </div>
-        <% end %>
-        <% if @counter[:dailyactivities] >= 3 %>
+        <% elsif value >= 1 %>
           <div class="reward">
-            <%= image_tag('medailles/dragon_3_all.png', size: "100") %> <!-- grand dragon -->
-            <!-- <i class="gold fas fa-trophy fa-lg"></i> -->
+            <div class="reward-content">
+              <% if key == :futureme %>
+                <%= image_tag('medailles/dragon_1_future_me.png', size: "100") %>
+              <% elsif key == :dailyactivities %>
+                <%= image_tag('medailles/dragon_1_daily_activities.png', size: "100") %>
+              <% elsif key == :interactions %>
+                <%= image_tag('medailles/dragon_1_interactions.png', size: "100") %>
+              <% elsif key == :curiosity %>
+                <%= image_tag('medailles/dragon_1_curiosity.png', size: "100") %>
+              <% end %>
+            </div>
           </div>
         <% end %>
       <% end %>
@@ -97,7 +116,7 @@
             <%= f.input :feedback, as: :text, label: 'Description', error: 'Put a feedback !', placeholder: 'Really great challenge...' %>
             <div class="d-flex justify-content-around">
               <%= f.input :appreciation, collection: (1..5).to_a, label: content_tag(:i, "" , class: "fas fa-heart") + "  LIKE", input_html: {class: "modal-rating"} %>
-              <%= f.input :difficulty, collection: (1..5).to_a, label: image_tag('dragon_logo.png', size: "20") + "  DIFFICULTY", input_html: {class: "modal-rating"} %>
+              <%= f.input :difficulty, collection: (1..5).to_a, label: content_tag(:i, "" , class: "fas fa-dragon") + "  DIFFICULTY", input_html: {class: "modal-rating"} %>
             </div>
 
             <div class="d-flex justify-content-left. align-items-center">

From 10426929099278877a5b2227d321382095c8837d Mon Sep 17 00:00:00 2001
From: Sandra Vilder <sandra.vilder@gmail.com>
Date: Fri, 14 Jun 2019 12:03:43 +0200
Subject: [PATCH 2/2] =?UTF-8?q?modal=20centr=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pages/dashboard.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb
index 109860b..c45951d 100644
--- a/app/views/pages/dashboard.html.erb
+++ b/app/views/pages/dashboard.html.erb
@@ -103,7 +103,7 @@
 <!-- Modal -->
 <% @participations.each do |participation| %>
   <div class="modal fade" id="exampleModal<%= participation.id %>" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" data-participation="<%= participation.id %>" >
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-dialog-centered" role="document">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title" id="exampleModalLabel">Give your feedback</h5>