Merge pull request #153 from eugeniecln1/dragon-reward

dragons rewards logos done
eugeniecln1 · Jun 14, 2019 · 9fc5edc · 9fc5edc
2 parents e38ce06 + c6e17f2
commit 9fc5edc
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 7 deletions.
diff --git a/app/assets/images/medailles/dragon_1_all.png b/app/assets/images/medailles/dragon_1_all.png
diff --git a/app/assets/images/medailles/dragon_1_curiosity.png b/app/assets/images/medailles/dragon_1_curiosity.png
diff --git a/app/assets/images/medailles/dragon_1_daily_activities.png b/app/assets/images/medailles/dragon_1_daily_activities.png
diff --git a/app/assets/images/medailles/dragon_1_future_me.png b/app/assets/images/medailles/dragon_1_future_me.png
diff --git a/app/assets/images/medailles/dragon_1_interactions.png b/app/assets/images/medailles/dragon_1_interactions.png
diff --git a/app/assets/images/medailles/dragon_2_all.png b/app/assets/images/medailles/dragon_2_all.png
diff --git a/app/assets/images/medailles/dragon_2_curiosity.png b/app/assets/images/medailles/dragon_2_curiosity.png
diff --git a/app/assets/images/medailles/dragon_2_daily_activities.png b/app/assets/images/medailles/dragon_2_daily_activities.png
diff --git a/app/assets/images/medailles/dragon_2_future_me.png b/app/assets/images/medailles/dragon_2_future_me.png
diff --git a/app/assets/images/medailles/dragon_2_interactions.png b/app/assets/images/medailles/dragon_2_interactions.png
diff --git a/app/assets/images/medailles/dragon_3_all.png b/app/assets/images/medailles/dragon_3_all.png
diff --git a/app/assets/images/medailles/dragon_3_curiosity.png b/app/assets/images/medailles/dragon_3_curiosity.png
diff --git a/app/assets/images/medailles/dragon_3_daily_activities.png b/app/assets/images/medailles/dragon_3_daily_activities.png
diff --git a/app/assets/images/medailles/dragon_3_future_me.png b/app/assets/images/medailles/dragon_3_future_me.png
diff --git a/app/assets/images/medailles/dragon_3_interactions.png b/app/assets/images/medailles/dragon_3_interactions.png
diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb
@@ -12,16 +12,16 @@
           <div class="reward">
             <div class="reward-content">
               <% if key == :futureme %>
-                <%= image_tag('medal-test', size: "100") %> <!-- dragon couleur cat -->
+                <%= image_tag('medailles/dragon_3_future_me.png', size: "100") %> <!-- dragon couleur cat -->
                 <!-- <i class=" <%= key %> fas fa-medal fa-lg"></i> -->
               <% elsif key == :dailyactivities %>
-                <%= image_tag('medal-test', size: "100") %> <!-- dragon couleur cat -->
+                <%= image_tag('medailles/dragon_3_daily_activities.png', size: "100") %> <!-- dragon couleur cat -->
                 <!--  <i class=" <%= key %> fas fa-medal fa-lg"></i> -->
               <% elsif key == :interactions %>
-                <%= image_tag('medal-test', size: "100") %> <!-- dragon couleur cat -->
+                <%= image_tag('medailles/dragon_3_interactions.png', size: "100") %> <!-- dragon couleur cat -->
                 <!-- <i class=" <%= key %> fas fa-medal fa-lg"></i> -->
               <% elsif key == :curiosity %>
-                <%= image_tag('medal-test', size: "100") %> <!-- dragon couleur cat -->
+                <%= image_tag('medailles/dragon_3_curiosity.png', size: "100") %> <!-- dragon couleur cat -->
                 <!-- <i class=" <%= key %> fas fa-medal fa-lg"></i> -->
               <% end %>
             </div>
@@ -31,19 +31,19 @@
       <% if @counter[:dailyactivities] == @counter[:futureme] && @counter[:futureme] == @counter[:interactions] && @counter[:interactions] == @counter[:curiosity] %>
         <% if @counter[:dailyactivities] >= 1 %>
           <div class="reward">
-            <%= image_tag('medal-test', size: "100") %> <!-- bébé dragon -->
+            <%= 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 %>
           <div class="reward">
-            <%= image_tag('medal-test', size: "100") %> <!-- petit dragon -->
+            <%= image_tag('medailles/dragon_2_all.png', size: "100") %> <!-- petit dragon -->
             <!-- <i class="silver fas fa-trophy fa-lg"></i> -->
           </div>
         <% end %>
         <% if @counter[:dailyactivities] >= 3 %>
           <div class="reward">
-            <%= image_tag('medal-test', size: "100") %> <!-- grand dragon -->
+            <%= image_tag('medailles/dragon_3_all.png', size: "100") %> <!-- grand dragon -->
             <!-- <i class="gold fas fa-trophy fa-lg"></i> -->
           </div>
         <% end %>