reorder, add high res pixabay images, more stats

14 files changed, 67 insertions, 32 deletions

diff --git a/api.py b/api.py
index eda5592..08f95a9 100644
--- a/api.py
+++ b/api.py
@@ -34,11 +34,13 @@ def update_vals():
     data["flares_sold"] = sql_val("SELECT SUM((participant.item_sells->>'*1038_Item_Flare*')::INT) FROM participant WHERE participant.created_at > NOW() - '1 day'::INTERVAL")
     data["minions_per_kraken"] = 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")
     data["minion_candies"] = sql_val("SELECT SUM((item_uses->>'*1041_Item_MinionCandy*')::INT) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL")
-    data["infusions_min"] = 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")
+    data["infusions_secs"] = sql_val("SELECT (24*60*60) / (SUM((participant.item_uses->>'*1052_Item_WeaponInfusion*')::INT) + SUM((participant.item_uses->>'*1053_Item_CrystalInfusion*')::INT))::FLOAT 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")
     data["scout_traps"] = sql_val("SELECT SUM((item_uses->>'*1054_Item_ScoutTrap*')::INT) FROM participant WHERE participant.created_at > NOW() - '1 day'::INTERVAL")
     data["saw_turrets"] = sql_val("SELECT SUM(turret_kills) FROM participant WHERE hero='*SAW*' AND created_at > NOW() - '1 day'::INTERVAL")
     data["matches"] = sql_val("SELECT COUNT(*) FROM match WHERE created_at > NOW() - '1 day'::INTERVAL")
     data["minions_min"] = sql_val("SELECT SUM(minion_kills)/(24*60*60)::FLOAT FROM participant WHERE participant.created_at > NOW() - '1 day'::INTERVAL")
+    data["vox_minionkills"] = sql_val("SELECT SUM(minion_kills) FROM participant WHERE hero='*Vox*' AND created_at > NOW() - '1 day'::INTERVAL")
+    data["minionfeet"] = sql_val("SELECT SUM((item_grants->>'*1080_Item_MinionsFoot*')::INT) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL")
 
     c.close()
 
diff --git a/templates/assets/images/candle.jpg b/templates/assets/images/candle.jpg
new file mode 100644
index 0000000..3043419
--- /dev/null
+++ b/templates/assets/images/candle.jpg
diff --git a/templates/assets/images/candy.jpg b/templates/assets/images/candy.jpg
new file mode 100644
index 0000000..b721a2f
--- /dev/null
+++ b/templates/assets/images/candy.jpg
diff --git a/templates/assets/images/canon.jpg b/templates/assets/images/canon.jpg
new file mode 100644
index 0000000..ae22962
--- /dev/null
+++ b/templates/assets/images/canon.jpg
diff --git a/templates/assets/images/desperate.jpg b/templates/assets/images/desperate.jpg
new file mode 100644
index 0000000..aaf46e9
--- /dev/null
+++ b/templates/assets/images/desperate.jpg
diff --git a/templates/assets/images/flare.jpg b/templates/assets/images/flare.jpg
new file mode 100644
index 0000000..0e1e84c
--- /dev/null
+++ b/templates/assets/images/flare.jpg
diff --git a/templates/assets/images/fountain.jpg b/templates/assets/images/fountain.jpg
new file mode 100644
index 0000000..98a6ab4
--- /dev/null
+++ b/templates/assets/images/fountain.jpg
diff --git a/templates/assets/images/kraken.jpg b/templates/assets/images/kraken.jpg
index 5ce944f..0b27169 100644
--- a/templates/assets/images/kraken.jpg
+++ b/templates/assets/images/kraken.jpg
diff --git a/templates/assets/images/minefield.jpg b/templates/assets/images/minefield.jpg
new file mode 100644
index 0000000..b95ecac
--- /dev/null
+++ b/templates/assets/images/minefield.jpg
diff --git a/templates/assets/images/needle.jpg b/templates/assets/images/needle.jpg
new file mode 100644
index 0000000..46320ac
--- /dev/null
+++ b/templates/assets/images/needle.jpg
diff --git a/templates/assets/images/pulse.jpg b/templates/assets/images/pulse.jpg
new file mode 100644
index 0000000..03b65b5
--- /dev/null
+++ b/templates/assets/images/pulse.jpg
diff --git a/templates/assets/images/saw.jpg b/templates/assets/images/saw.jpg
new file mode 100644
index 0000000..5fc89e5
--- /dev/null
+++ b/templates/assets/images/saw.jpg
diff --git a/templates/assets/images/shoe.jpg b/templates/assets/images/shoe.jpg
new file mode 100644
index 0000000..9a213c8
--- /dev/null
+++ b/templates/assets/images/shoe.jpg
diff --git a/templates/index.html b/templates/index.html
index f40d425..93a5e1c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -59,8 +59,11 @@
                         <div class="filter"></div>
                         <h4 class="title title-modern"></h4>
                         <p class="description">
-                            Poor Minions! No one thinks about the Minions.
+                            Poor Minions!
+                        <br />
                             We are raising awareness about how ruthless NPCs are treated in Vainglory. The killing needs to stop!
+                        <br />
+                            This is data from the last day.
                         </p>
                     </div>
                     <div class="filter"></div>
@@ -72,7 +75,7 @@
         <div class="masonry-container">
             
             <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/minion-died.jpg">
+                <div class="card text-center" data-background="image" data-src="assets/images/candle.jpg">
                     <h4 class="title title-modern">Minions</h4>
                     
                     <div class="content">
@@ -88,7 +91,7 @@
 
 
             <div class="card-box col-md-4 col-sm-6">      
-                <div class="card text-center" data-background="image" data-src="assets/images/turrets.png">
+                <div class="card text-center" data-background="image" data-src="assets/images/canon.jpg">
                     <h4 class="title title-modern">Turrets</h4>
                     
                     <div class="content">
@@ -96,14 +99,14 @@
                             <h6></h6>
                             <h4>{{ data.turrets_rebuilt }}<b class="currency"><br/></b></h4>
                         </div>
-                        <p class="description">rebuilt by workers every day</p>      
+                        <p class="description">need to be rebuilt by Minion workers</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/minions-for-nothing.jpeg">
+                <div class="card text-center" data-background="image" data-src="assets/images/desperate.jpg">
                     <h4 class="title title-modern">Minions</h4>
                     
                     <div class="content">
@@ -111,14 +114,14 @@
                             <h6></h6>
                             <h4>{{ data.minions_for_nothing }} <b class="currency"><br/>out of {{ data.minions_total }}<br/></b></h4>
                         </div>
-                        <p class="description">died for nothing</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">
+                <div class="card text-center" data-background="image" data-src="assets/images/fountain.jpg">
                     <h4 class="title title-modern">Fountains</h4>
                     
                     <div class="content">
@@ -126,7 +129,22 @@
                             <h6></h6>
                             <h4>{{ data.fountains_wasted }}</h4>
                         </div>
-                        <p class="description">bought for the looks</p>      
+                        <p class="description">bought for the looks…</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/pulse.jpg">
+                    <h4 class="title title-modern">Minions</h4>
+                    
+                    <div class="content">
+                        <div class="price">
+                            <h6></h6>
+                            <h4>{{ data.vox_minionkills }}</h4>
+                        </div>
+                        <p class="description">couldn't endure Vox' tunes anymore.</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
@@ -141,14 +159,29 @@
                             <h6></h6>
                             <h4>{{ data.crystal_sentries }}</h4>
                         </div>
-                        <p class="description">slaughtered</p>      
+                        <p class="description">slaughtered.</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/shoe.jpg">
+                    <h4 class="title title-modern">Minions</h4>
+                    
+                    <div class="content">
+                        <div class="price">
+                            <h6></h6>
+                            <h4>{{ data.minionfeet }}</h4>
+                        </div>
+                        <p class="description">lost a foot in the Halcyon Fold.</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/flares.jpg">
+                <div class="card text-center" data-background="image" data-src="assets/images/flare.jpg">
                     <h4 class="title title-modern">Flares</h4>
                     
                     <div class="content">
@@ -156,7 +189,7 @@
                             <h6></h6>
                             <h4>{{ data.flares_sold }}</h4>
                         </div>
-                        <p class="description">thrown in trash</p>      
+                        <p class="description">thrown in trash.</p>      
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
@@ -171,14 +204,14 @@
                             <h6></h6>
                             <h4>{{ data.minions_per_kraken }}</h4>
                         </div>
-                        <p class="description">are needed to unleash a Kraken</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/minioncandy.jpg">
+                <div class="card text-center" data-background="image" data-src="assets/images/candy.jpg">
                     <h4 class="title title-modern">Minion Candies</h4>
                     
                     <div class="content">
@@ -186,38 +219,38 @@
                             <h6></h6>
                             <h4>{{ data.minion_candies }}</h4>
                         </div>
-                        <p class="description">Minion parties</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/infusions.jpg">
-                    <h4 class="title title-modern">Infusions</h4>
+            <div class="card-box col-md-4 col-sm-6">
+                <div class="card text-center" data-background="image" data-src="assets/images/saw.jpg">
+                    <h4 class="title title-modern">Turrets</h4>
                     
                     <div class="content">
                         <div class="price">
-                            <h6>every</h6>
-                            <h4>{{ data.infusions_min }}<b class="currency"><br/>minutes</b></h4>
+                            <h6></h6>
+                            <h4>{{ data.saw_turrets }}<b class="currency"><br/></b></h4>
                         </div>
-                        <p class="description">a hero gets high</p>      
+                        <p class="description">were pushed together with SAW.</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 text-center" data-background="image" data-src="assets/images/needle.jpg">
+                    <h4 class="title title-modern">Infusions</h4>
                     
                     <div class="content">
                         <div class="price">
-                            <h6></h6>
-                            <h4>{{ data.scout_traps }}<b class="currency"><br/></b></h4>
+                            <h6>every</h6>
+                            <h4>{{ data.infusions_secs | int }}<b class="currency"><br/>seconds</b></h4>
                         </div>
-                        <p class="description">made the Fold a Dangerous Place</p>      
+                        <p class="description">a hero gets high.</p>
                     </div> 
                     <div class="filter"></div>
                 </div> <!-- end card -->    
@@ -225,21 +258,21 @@
 
 
             <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/minefield.jpg">
+                    <h4 class="title title-modern">Scout Traps</h4>
                     
                     <div class="content">
                         <div class="price">
                             <h6></h6>
-                            <h4>{{ data.saw_turrets }}<b class="currency"><br/></b></h4>
+                            <h4>{{ data.scout_traps }}<b class="currency"><br/></b></h4>
                         </div>
-                        <p class="description">were pushed by SAW in the last 24h</p>      
+                        <p class="description">made the Fold a Dangerous Place</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>