monitoring-jekyll-theme 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8862eda219c200dff6618edb790d3d1f256d1ea3405be1322068705f7b6656
-  data.tar.gz: e2c99367f0d16e179831afad932fb7761cf2098529b1868d17512c7b90cc1de0
+  metadata.gz: f12d76a05f5b2bb3f801c794c3bf472902a30eca31a6e7b9ba6e631e874a1ce1
+  data.tar.gz: 5b85f519ffe170ef186f30be5ee5b7cd5eae0ea275d471159bec4924f5b489b1
 SHA512:
-  metadata.gz: 73cd1e52db2f3257ccf97c504c4fe121b1cd5e323ea2694124de9d1d10e8581327d70cdfc8d19315a093a8ac4b340de1c28439e68ecb90a55fce17887b1607ed
-  data.tar.gz: 679c9e980870658d33988b612e259d6d2cbb9b005f614febffa0a9c2c72ca63b0526591ef815129e6a5aeb8aab03e70117a513b6c506762527e453c0a14776ea
+  metadata.gz: 0f32c603aef5417f10116a63f7af5fc6772c7587f19c6e6233f615df417c8b94cfba7ff240e5c1b84b087bfeaa9f02ba3a7ad14dff18ec1a6121d0b699f9f5ea
+  data.tar.gz: 106f545bdb3b4debe5343d70d0562fa8fdeb0782fd1e7ca5e717b26f7b12d978d5550c25c77347a1067e8cdff531d1c00a2a0ff4d94f0b523d595c697c033c3a

data/_includes/index/energy.html

@@ -1,29 +1,3 @@
-{% assign indexes = "" | split: ',' %}
-{% assign indexesname = "Accessibilité,Bonnes pratiques,Performance,SEO,PWA,Speed Index" | split: ',' %}
-{% comment %}{% endcomment %}
-{% assign indexes = indexes | push: lighthouse.categories.accessibility.score | push: lighthouse.categories.best-practices.score | push: lighthouse.categories.performance.score | push: lighthouse.categories.seo.score | push: lighthouse.categories.pwa.score | push: lighthouse.audits.speed-index.score %}
-
-{% comment %}Calcul du score moyen à partir des données httparchive{% endcomment %}
-{% assign domaverage = 600 | times: 3 %}{% assign httpaverage = 74 | times: 2 %}
-{% assign ecoaverage = domaverage | plus: httpaverage | plus: 2000000 | times: 5 | divided_by: 6 %}
-
-{% comment %}Calcul du score le meilleur à partir du site bertrandkeller.info {% endcomment %}
-{% assign dombest = 150 | times: 3 %}{% assign httpbest = 15 | times: 2 %}
-{% assign ecobest = dombest | plus: httpbest | plus: 130000 | times: 5 | divided_by: 6 %}
-
-{% comment %}Calcul du score pour le site le pire{% endcomment %}
-{% assign domworth = 3000 | times: 3 %}{% assign httpworth = 120 | times: 2 %}
-{% assign ecoworth = domworth | plus: httpworth | plus: 5000000 | times: 5 | divided_by: 6 %}
-
-{% comment %}Calcul du score le meilleur{% endcomment %}
-{% assign ecobestscore = ecobest | times: 100 | divided_by: ecoworth %}
-
-{% comment %}Calcul de la valeur du site audité{% endcomment %}
-{% assign dom = lighthouse.audits["dom-size"].details.items[0].value | replace: ",","" | times: 3 %}{% assign http = lighthouse.audits.diagnostics.details.items[0].numRequests | times: 2 %}
-{% assign eco = dom | plus: http | plus: lighthouse.audits.diagnostics.details.items[0].totalByteWeight | times: 5 | divided_by: 6 %}
-
-{% assign ecodiviser = ecoworth | minus: ecobest %}
-
 {% if lighthouse %}
 <div class="progress progress-bar flex">
   <div><h4>Energie</h4></div>
@@ -31,14 +5,14 @@
   <div class="progress-bar-element">
     <div>
     <!-- <div class="progress-bar-tooltip" style="transform: translate(50%,-50%);background: rgba(34,150,30,1);">Max</div> -->
-    <div class="progress-bar-tooltip" style="left: {{ ecoaverage | minus: ecobest | times: 100 | divided_by: ecodiviser }}%;">Moyenne grands sites</div>
-    <div class="progress-bar-tooltip" style="left: {{ eco | minus: ecobest  | times: 100 | divided_by: ecodiviser }}%;;z-index:2">{{ site.title }}</div>
+    <div class="progress-bar-tooltip" style="left: {{ ecoaverageposition }}%;">Moyenne grands sites</div>
+    <div class="progress-bar-tooltip" style="left: {{ ecoposition }}%;z-index:2">{{ website }}</div>
     <!-- <div class="progress-bar-tooltip" style="background: rgba(176,2,2,1);">Min</div> -->
   </div>
   <div>
     <!-- <div class="progress-bar-score" style="transform: translate(50%,35%);color: rgba(34,150,30,1);">Good</div> -->
-    <div class="progress-bar-score" style="left: {{ ecoaverage | minus: ecobest  | times: 100 | divided_by: ecodiviser }}%;">{{ ecoaverage | minus: ecobest | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1 }}</div>
-    <div class="progress-bar-score" style="left: {{ eco | minus: ecobest | times: 100 | divided_by: ecodiviser }}%;z-index:2">{{ eco | minus: ecobest | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1 }}</div>
+    <div class="progress-bar-score" style="left: {{ ecoaverageposition }}%;">{{ ecoaverage }}</div>
+    <div class="progress-bar-score" style="left: {{ ecoposition }}%;z-index:2">{{ eco  }}</div>
     <!-- <div class="progress-bar-score" style="color: rgba(176,2,2,1);">Bad</div> -->
   </div>
   </div>

data/_includes/statistiques.html

@@ -13,12 +13,7 @@
 
 {% for website in site.pagestested limit: 1 %}
 
-  {% assign gpagespeed      = site.data.[website].gpagespeed[datelastcrawl] %}
-  {% assign yellowlabtools  = site.data.[website].yellowlabtools[datelastcrawl] %}
-  {% assign lighthouse      = site.data.[website].lighthouse[datelastcrawl] %}
-  {% assign moz             = site.data.[website].moz[datelastcrawl]%}
-  {% assign stylestats      = site.data.[website].stylestats[datelastcrawl] %}
-  {% assign observatory     = site.data.[website].observatory[datelastcrawl] %}
+  {% include value/loadingdata.html %}
 
   <h3 style="display: none;">Scores</h3>
 

data/_includes/value/loadingdata.html

@@ -0,0 +1,38 @@
+{% assign gpagespeed      = site.data.[website].gpagespeed[datelastcrawl] %}
+{% assign lighthouse      = site.data.[website].lighthouse[datelastcrawl] %}
+{% assign moz             = site.data.[website].moz[datelastcrawl]%}
+{% assign stylestats      = site.data.[website].stylestats[datelastcrawl] %}
+{% assign observatory     = site.data.[website].observatory[datelastcrawl] %}
+{% assign wallace         = site.data.[website].wallace[datelastcrawl] %}
+{% assign htmlvalidator   = site.data.[website].htmlvalidator[datelastcrawl] %}
+
+{% comment %}Calcul du score moyen à partir des données httparchive{% endcomment %}
+{% assign domaverage = 600 | times: 3 %}{% assign httpaverage = 74 | times: 2 %}
+{% assign ecoaverage = domaverage | plus: httpaverage | plus: 2000000 | times: 5 | divided_by: 6 %}
+
+{% comment %}Calcul du score le meilleur à partir du site bertrandkeller.info {% endcomment %}
+{% assign dombest = 150 | times: 3 %}{% assign httpbest = 15 | times: 2 %}
+{% assign ecobest = dombest | plus: httpbest | plus: 130000 | times: 5 | divided_by: 6 %}
+
+{% comment %}Calcul du score pour le site le pire{% endcomment %}
+{% assign domworth = 3000 | times: 3 %}{% assign httpworth = 120 | times: 2 %}
+{% assign ecoworth = domworth | plus: httpworth | plus: 5000000 | times: 5 | divided_by: 6 %}
+
+{% comment %}Calcul du score le meilleur{% endcomment %}
+{% assign ecobestscore = ecobest | times: 100 | divided_by: ecoworth %}
+
+{% comment %}Calcul de la valeur du site audité{% endcomment %}
+{% assign dom = lighthouse.audits["dom-size"].details.items[0].value | replace: ",","" | times: 3 %}{% assign http = lighthouse.audits.diagnostics.details.items[0].numRequests | times: 2 %}
+{% assign eco = dom | plus: http | plus: lighthouse.audits.diagnostics.details.items[0].totalByteWeight | times: 5 | divided_by: 6 %}
+
+{% assign ecodiviser = ecoworth | minus: ecobest %}
+
+{% assign indexes = "" | split: ',' %}
+{% assign indexesname = "Accessibilité,Bonnes pratiques,Performance,SEO,PWA,Speed Index" | split: ',' %}
+{% assign indexes = indexes | push: lighthouse.categories.accessibility.score | push: lighthouse.categories.best-practices.score | push: lighthouse.categories.performance.score | push: lighthouse.categories.seo.score | push: lighthouse.categories.pwa.score | push: lighthouse.audits.speed-index.score %}
+
+{% assign ecoaverageposition = ecoaverage | times: 100 | divided_by: ecodiviser %}
+{% assign ecoaverage = ecoaverage | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1%}
+{% assign ecoposition = eco | times: 100 | divided_by: ecodiviser %}
+{% assign eco = eco | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1%}
+{% if eco < 0 %}{% assign ecoposition = 105 %}{% endif %}

data/assets/css/styles.css

@@ -954,6 +954,7 @@ a {
   text-align: center;
   font-weight: bold;
   font-family: Optiker;
+  line-height: 1;
 }
 
 .progress.progress-number li b {
@@ -1016,7 +1017,7 @@ a {
   align-items: center;
   justify-content: center;
   width: 100%;
-  height: 100%;
+  height: 6.3rem;
   font-family: IBMPlexMono, optiker, sans-serif;
   font-size: 2.3em;
   text-align: center;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monitoring-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - bertrandkeller
@@ -78,6 +78,7 @@ files:
 - _includes/styles.html
 - _includes/svg/facebook.svg
 - _includes/value/lastfiledate.html
+- _includes/value/loadingdata.html
 - _layouts/default.html
 - _plugins/humanize.rb
 - assets/css/styles.css