Merge branch 'master' of https://gitlab.com/vainglorygame/minionlivesmatterHEADmaster

2 files changed, 63 insertions, 37 deletions

diff --git a/templates/assets/images/minioncandy.jpg b/templates/assets/images/minioncandy.jpg
new file mode 100644
index 0000000..0cb2594
--- /dev/null
+++ b/templates/assets/images/minioncandy.jpg
diff --git a/templates/index.html b/templates/index.html
index 8f20b0c..8c8a508 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -46,7 +46,7 @@
                     <div class="content">
                         <div class="filter filter-red"></div>
                         <h4 class="title title-modern">"Minions Lives Matter."</h4>
-                        <p class="description">Shutterfly@vaisocial</p>
+                        <p class="description">shutterfly@vainsocial</p>
                     </div>
                     
                     <div class="filter"></div>
@@ -55,8 +55,6 @@
         </div>
         
 
-
-<!-- Stormcaller started here -->
         <div class="masonry-container">
             
             <div class="card-box col-md-4 col-sm-6">      
@@ -68,7 +66,7 @@
                             <h6></h6>
                             <h4 id="minions-killed-now">0</h4>
                         </div>
-                        <p class="description">have died since you opened this page.</p>      
+                        <p class="description">have died since you opened this page</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
@@ -76,30 +74,45 @@
 
 
             <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/fountain.jpeg">
-                    <h4 class="title title-modern">Fountains</h4>
+                <div class="card text-center" data-background="image" data-src="assets/images/turrets.png">
+                    <h4 class="title title-modern">Turrets</h4>
                     
                     <div class="content">
                         <div class="price">
                             <h6></h6>
-                            <h4 id="minions-killed-now">{{ sql_val("SELECT COUNT((item_grants->>'*1045_Item_FountainOfRenewal*')::INT)-COUNT((item_uses->>'*1045_Item_FountainOfRenewal*')::INT) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL") }}</h4>
+                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM(turret_kills) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL") }}<b class="currency"><br/></b></h4>
                         </div>
-                        <p class="description">bought for the looks</p>      
+                        <p class="description">rebuilt by workers every day</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
             </div>
 
             <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/kraken.jpg">
+                <div class="card text-center" data-background="image" data-src="assets/images/minions-for-nothing.jpeg">
                     <h4 class="title title-modern">Minions</h4>
                     
                     <div class="content">
                         <div class="price">
                             <h6></h6>
-                            <h4 id="minions-killed-now">{{ sql_val("SELECT (SUM(match.duration)/60*5) / SUM(roster.kraken_captures) FROM match JOIN roster ON roster.match_api_id=match.api_id WHERE match.created_at > NOW() - '1 day'::INTERVAL") }}</h4>
+                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM(minion_kills) FROM participant WHERE NOT winner AND created_at > NOW() - '1 day'::INTERVAL") }} <b class="currency"><br/>out of {{ sql_val("SELECT SUM(minion_kills) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL") }}<br/></b></h4>
                         </div>
-                        <p class="description">are needed to unleash a Kraken</p>      
+                        <p class="description">died for nothing</p>      
+                    </div> 
+                    <div class="filter"></div>
+                </div> <!-- end card -->    
+            </div>
+
+            <div class="card-box col-md-4 col-sm-6">      
+                <div class="card text-center" data-background="image" data-src="assets/images/fountain.jpeg">
+                    <h4 class="title title-modern">Fountains</h4>
+                    
+                    <div class="content">
+                        <div class="price">
+                            <h6></h6>
+                            <h4 id="minions-killed-now">{{ sql_val("SELECT COUNT((item_grants->>'*1045_Item_FountainOfRenewal*')::INT)-COUNT((item_uses->>'*1045_Item_FountainOfRenewal*')::INT) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL") }}</h4>
+                        </div>
+                        <p class="description">bought for the looks</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
@@ -136,62 +149,61 @@
             </div>
 
             <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/infusions.jpg">
-                    <h4 class="title title-modern">Infusions</h4>
+                <div class="card text-center" data-background="image" data-src="assets/images/kraken.jpg">
+                    <h4 class="title title-modern">Minions</h4>
                     
                     <div class="content">
                         <div class="price">
-                            <h6>every</h6>
-                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM(match.duration)/60 / (SUM((participant.item_uses->>'*1052_Item_WeaponInfusion*')::INT) + SUM((participant.item_uses->>'*1053_Item_CrystalInfusion*')::INT)) FROM participant JOIN roster ON participant.roster_api_id=roster.api_id JOIN match ON roster.match_api_id=match.api_id WHERE participant.created_at > NOW() - '1 day'::INTERVAL") }}<b class="currency"><br/>minutes</b></h4>
+                            <h6></h6>
+                            <h4 id="minions-killed-now">{{ sql_val("SELECT (SUM(match.duration)/60*5) / SUM(roster.kraken_captures) FROM match JOIN roster ON roster.match_api_id=match.api_id WHERE match.created_at > NOW() - '1 day'::INTERVAL") }}</h4>
                         </div>
-                        <p class="description">hero gets high</p>      
+                        <p class="description">are needed to unleash a Kraken</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
             </div>
 
-
-            <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/scout-traps.jpeg">
-                    <h4 class="title title-modern">Scout Traps</h4>
+            <div class="card-box col-md-4 col-sm-6">
+                <div class="card text-center" data-background="image" data-src="assets/images/minioncandy.jpg">
+                    <h4 class="title title-modern">Minion Candies</h4>
                     
                     <div class="content">
                         <div class="price">
                             <h6></h6>
-                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM((item_uses->>'*1054_Item_ScoutTrap*')::INT) FROM participant WHERE participant.created_at > NOW() - '1 day'::INTERVAL") }}<b class="currency"><br/></b></h4>
+                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM((item_uses->>'*1041_Item_MinionCandy*')::INT) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL") }}</h4>
                         </div>
-                        <p class="description">making Fold a Dangerous Place</p>      
+                        <p class="description">Minion parties</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
             </div>
 
-
             <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/saw-turrets.jpeg">
-                    <h4 class="title title-modern">Turrets</h4>
+                <div class="card text-center" data-background="image" data-src="assets/images/infusions.jpg">
+                    <h4 class="title title-modern">Infusions</h4>
                     
                     <div class="content">
                         <div class="price">
-                            <h6></h6>
-                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM(turret_kills) FROM participant WHERE hero='*SAW*' AND created_at > NOW() - '1 day'::INTERVAL") }}<b class="currency"><br/></b></h4>
+                            <h6>every</h6>
+                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM(match.duration)/60 / (SUM((participant.item_uses->>'*1052_Item_WeaponInfusion*')::INT) + SUM((participant.item_uses->>'*1053_Item_CrystalInfusion*')::INT)) FROM participant JOIN roster ON participant.roster_api_id=roster.api_id JOIN match ON roster.match_api_id=match.api_id WHERE participant.created_at > NOW() - '1 day'::INTERVAL") }}<b class="currency"><br/>minutes</b></h4>
                         </div>
-                        <p class="description">pushed by SAW</p>      
+                        <p class="description">a hero gets high</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
             </div>
 
+
             <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/turrets.png">
-                    <h4 class="title title-modern">Turrets</h4>
+                <div class="card text-center" data-background="image" data-src="assets/images/scout-traps.jpeg">
+                    <h4 class="title title-modern">Scout Traps</h4>
                     
                     <div class="content">
                         <div class="price">
                             <h6></h6>
-                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM(turret_kills) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL") }}<b class="currency"><br/></b></h4>
+                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM((item_uses->>'*1054_Item_ScoutTrap*')::INT) FROM participant WHERE participant.created_at > NOW() - '1 day'::INTERVAL") }}<b class="currency"><br/></b></h4>
                         </div>
-                        <p class="description">rebuilt by workers every day</p>      
+                        <p class="description">made the Fold a Dangerous Place</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
@@ -199,20 +211,34 @@
 
 
             <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/minions-for-nothing.jpeg">
-                    <h4 class="title title-modern">Minions</h4>
+                <div class="card text-center" data-background="image" data-src="assets/images/saw-turrets.jpeg">
+                    <h4 class="title title-modern">Turrets</h4>
                     
                     <div class="content">
                         <div class="price">
                             <h6></h6>
-                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM(minion_kills) FROM participant WHERE NOT winner AND created_at > NOW() - '1 day'::INTERVAL") }} <b class="currency"><br/>out of {{ sql_val("SELECT SUM(minion_kills) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL") }}<br/></b></h4>
+                            <h4 id="minions-killed-now">{{ sql_val("SELECT SUM(turret_kills) FROM participant WHERE hero='*SAW*' AND created_at > NOW() - '1 day'::INTERVAL") }}<b class="currency"><br/></b></h4>
                         </div>
-                        <p class="description">died for nothing</p>      
+                        <p class="description">were pushed by SAW in the last 24h</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
             </div>
 
+                        
+            <div class="card-box col-md-4 col-sm-6">
+                <div class="card text-center">
+                    <h4 class="title title-modern">Data</h4>
+
+                    <div class="content">
+                        <p class="description">
+                            Based on Vainsocial users' data from the past 24 hours that by no means is representative to the whole player base of Vainglory. {{ sql_val("SELECT COUNT(*) FROM match WHERE created_at > NOW() - '1 day'::INTERVAL") }} matches are taken into account for the calculations.
+                        </p>
+                    </div>
+                    <div class="filter"></div>
+                </div>
+            </div>
+
 
 <!--             <div class="card-box col-md-4 col-sm-6">      
                 <div class="card text-center" data-background="image" data-src="">
@@ -278,4 +304,4 @@
         });
     </script>
     
-</html>
\ No newline at end of file
+</html>