monitoring-jekyll-theme 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e48528e29eb01eca6279cfa0e027591ab5012a15cf078cb649da472abde9788d
-  data.tar.gz: 664854d71ae82ad631487547273aef3c68c18b2a0964456958d2a3ec51f88245
+  metadata.gz: 12dba1d99668139af46a318273d4d62f37e906db0546c43c55076c669e18e14c
+  data.tar.gz: 116f98141759cc7108a6b3dcc8205a79d61102417fdbed1fae26ece5e9ab9dfb
 SHA512:
-  metadata.gz: 2e2f5f1a7c1e28beb7ad7f78b8553fa2f73c4ab68c5d48a80df13d42a5f5a1a8efe62e2264be25e7df713f9539c1570bcd8b6666d34ab64f8b069f821c1427be
-  data.tar.gz: c9a6c2bc63c27a44565379511425e6096ed4dd03fe53e5c99e57f83d2e2df0c754406fa0e3bf71e4a8b457dfbcba760dc15c8add2a2882705f09a132c3967eaf
+  metadata.gz: 804d72c9b76c63714238c9e3fb1e43495a6d5f31160d731d24e865a3cace16d3bcf6e2f6cd27576784643ad285bb7c4d3d6ba5916d41bfd1b39d4ed4e96dab59
+  data.tar.gz: e4552248f8f083f0bc67f0733fd15b5b4dab1666ed97d3f163b33ccdd30bdfa01c4133a4d8c16e056e81c5139d17eb2a9480adc3b4a9548f557e4160ba8c52cf

data/README.md

@@ -1,34 +1,81 @@
 # Monitoring Tool for website
 
-## Reste à faire
+Voici, les ressource et actions concernant l’outils Lowtus. L'évolution de cet outil doit se faire sur des principes simples et économes.
+
+Ce fichier doit donc représenter l’état du projet. Ainsi, il liste : des actions à faire, des idées à tester, des ressources à étudier… des classements de sites.
+
+## Esprit de l’outil
+
+1.  Lisible par des "non techniciens"
+2.  Favorise l’action
+3.  Modulable
+4.  Semi-automatique // (action humaine fait partie du processus)
+5.  Global
+6.  Répicable
+
+## Reste à faire - (plugin TODO+ sur VSCode)
 
  ✔ Afficher une jauge pour les scores sur 100 @done(19-09-12 09:15)
  ✔ Ajouter l’écoindex @done(19-09-12 09:15)
  ✔ Ajouter la liste de corrections à appliquer => pour gagner des points @done(19-09-16 15:11)
- ☐ Lister les valeurs avec du potential saving et estimer le gain en point.
- ☐ Ne plus faire appel à Yellow lab tool :: trop lourd
- ☐ S’inspirer de l’écometer
- ☐ Micro format et schema detection
+ ✔ Ne plus faire appel à Yellow lab tool :: trop lourd @done(19-10-11 17:23)
+ ☐ Lister les valeurs avec du potential saving et estimer le gain en point. // Partiellement fait
+ ☐ S’inspirer de l’écometer (?)
+ ☐ Test des Micro formats et schema
+ ☐ curl -s -D- <https://example.com/> | grep -i Strict // ??
+ ☐ Automatiser la correction de JSON incorrects
+ ☐ Performance budget de Lighthouse
+ ☐ Multiplier le chargement des bytes de Javascript
+ ☐ <https://developer.mozilla.org/en-US/docs/Web/API/Long_Tasks_API>
+ ☐ Droits utilisateurs - sous thèmes - générer des sous pages de tests
 
-## A mettre en place
+## À mettre en place
+
+-   Création d’indicateurs
+-   HTML rewrite et service workers testing - <https://justmarkup.com/articles/2017-11-02-network-based-image-loading/> - <https://calendar.perfplanet.com/2019/prototyping-optimizations-with-cloudflare-workers-and-webpagetest/>
+
+### Test de la fabrication de plugins LightHouse
+
+-   <https://engineering.q42.nl/making-a-lighthouse-plugin-work-with-lighthouse-ci/>
+
+### Tests automatisés
 
--   <https://codepen.io/pbakaus/pen/OJLNNvm>
 -   <https://www.npmjs.com/package/google>
--   <https://raphaelfabeni.com/ui-interactions/>
--   <https://www.ekopedia.fr/wiki/H%C3%A9bergement_Internet>
+-   <https://webhint.io/>
+-   <https://www.ssllabs.com>
+
+### Test erreurs de sécurités
+
+-   <https://github.com/lirantal/is-website-vulnerable>
+-   <https://github.com/qazbnm456/awesome-web-security>
+
+### Coût du site
+
+-   <https://www.websitecarbon.com/>
+-   <https://whatdoesmysitecost.com/>
+
+### Afficher les couleurs sous un mode graphique
+
+-   <https://una.im/css-color-theming/> // Sass
+-   <https://css-tricks.com/a-handy-sass-powered-tool-for-making-balanced-color-palettes/> // Variables CSS
+-   <https://medium.com/@NateBaldwin/leonardo-an-open-source-contrast-based-color-generator-92d61b6521d2>
+
+### Test automatisés de contraste de boutons
+
 -   <https://www.aditus.io/button-contrast-checker/>
--   <https://github.com/sethblack/python-seo-analyzer>
 
-## Annuaires Immobilier
+### Animation de l’interface
 
--   <https://www.avendrealouer.fr/>
--   <http://www.ma-cabane.fr/>
--   <http://www.lecoute.com/>
--   <https://www.hannuaire.fr/>
+-   <https://raphaelfabeni.com/ui-interactions/>
+-   <https://codepen.io/pbakaus/pen/OJLNNvm>
+
+### Autres
+
+-   <https://developers.google.com/web/tools/chrome-devtools/network/reference> // has response header encoding
 
 ## Commandes
 
-### Caractères à remplacer
+### Caractères à remplacer de manière manuelle
 
 _Regular expression in all files_
 
@@ -49,6 +96,26 @@ replace \\/ => / seocli
 
 ## Ressources
 
+### Connexion utilisateur
+
+-   <https://www.stackbit.com/blog/open-authoring-netlifycms/>
+-   <https://www.zachleat.com/web/eleventy-contributors/>
+-   <https://www.smashingmagazine.com/2019/12/dynamic-async-functionality-jamsstack-websites/>
+-   <https://github.com/chromeos/static-site-scaffold>
+
+### Security
+
+-   <https://github.com/nico3333fr/CSP-useful>
+-   <https://sslmate.com/certspotter/api/>
+
+### Accessibilité
+
+-   <https://www.w3.org/WAI/test-evaluate/>
+
+### Performance
+
+-   <https://github.com/Pixboost/lighthouse-ci-docker>
+
 ### Statistiques
 
 -   <https://httparchive.org/reports/state-of-the-web>
@@ -58,7 +125,13 @@ replace \\/ => / seocli
 -   <https://github.com/bartveneman/constyble>
 -   <https://github.com/sethblack/python-seo-analyzer>
 
-### Articles
+### Curl & Grep & JSON
+
+-   <https://medium.com/@LiliSousa/web-scraping-with-bash-690e4ee7f98d>
+-   <https://css-tricks.com/query-json-documents-in-the-terminal-with-groq/>
+-   <https://github.com/KilledByAPixel/JSONCrush>
+
+### Articles & divers
 
 -   <https://www.smashingmagazine.com/2019/01/front-end-performance-checklist-2019-pdf-pages/>
 -   <https://css-tricks.com/in-search-of-a-stack-that-monitors-the-quality-and-complexity-of-css/>
@@ -74,7 +147,40 @@ replace \\/ => / seocli
 -   <http://www.ecoindex.fr/>
 -   <https://snapboard.io>
 -   <https://v8.dev/blog/cost-of-javascript-2019>
-
-### Curl & Grep
-
--   <https://medium.com/@LiliSousa/web-scraping-with-bash-690e4ee7f98d>
+-   <https://openclassrooms.com/fr/courses/6227476-appliquez-les-principes-du-green-it-dans-votre-entreprise/6699431-decouvrez-limpact-du-numerique-sur-lenvironnement>
+-   <https://www.ekopedia.fr/wiki/H%C3%A9bergement_Internet>
+-   <https://dev.to/addyosmani/loading-web-pages-fast-on-a-20-feature-phone-8h6>
+-   <https://www.smashingmagazine.com/2020/01/front-end-performance-checklist-2020-pdf-pages/>
+-   <https://calendar.perfplanet.com/2019/prototyping-optimizations-with-cloudflare-workers-and-webpagetest/>
+-   <https://dev.to/addyosmani/monitoring-performance-with-the-pagespeed-insights-api-33k7>
+-   <https://www.udacity.com/course/offline-web-applications--ud899>
+-   <https://dev.to/devteam/instant-webpages-and-terabytes-of-data-savings-through-the-magic-of-service-workers-1mkc>
+-   <https://snyk.io/blog/77-percent-of-sites-use-vulnerable-js-libraries/>
+-   <https://24ways.org/2019/twelve-days-of-front-end-testing/?mc_cid=4596c5b43a&mc_eid=971aa7dfa4>
+-   <https://ux-speed-calculator.netlify.com/>
+
+### Videos
+
+-   <https://www.youtube.com/watch?v=cXLOIIJ1UaE>
+-   <https://www.youtube.com/watch?v=JvJ0v5OohNg>
+
+## Note d’interntion
+
+### Evolutions possibles
+
+1.  Remonter des indicateurs plus diverses (sécurité, SEO, RGPD (?)…)
+2.  Construire des composants plus parlants : couleurs, comparatif entre page clefs.
+3.  Axer le tableau sur des scores forts et pertinents: énergie, coût, sécurité…
+4.  Modulariser le fonctionnement
+5.  Rendre le code réplicable
+
+### R&D technique
+
+1.  Porter le site sous Eleventy (pour plus de performance sur les gros volumes)
+2.  Construire des plugins LightHouse
+3.  Tester des librairies pour remonter des scores plus variés
+4.  Rendre l’outil déployable (contexte d’intégration continue)
+5.  Création d’un bookmarklet pour lancer un audit à la main.
+6.  Coder une API pour le calcul des scores forts
+7.  Lancer des tests depuis des pays spécifiques.
+8.  Permettre la génération multi-rapports par instance (et pas un seul rapport par instance)

data/_includes/accessibility.html

@@ -1,10 +1,16 @@
-{% for website in site.pagestested  %}
+{% for website in pagestested  %}
+
+  {% if site.data %}
+  {% assign axe = site.data.[website].axe[datelastcrawl] %}
+  {% else %}
+  {% assign axe = [website].axe[datelastcrawl] %}
+  {% endif %}
 
   <h3 class="js-expandmore mb0 mt0" data-hideshow-prefix-class="animated">{{ website }} - Impact : Critical</h3>
   <div class="js-to_expand">
 
     <div class="axe flex-list">
-    {% for a11y in site.data.[website].axe[datelastcrawl] limit: 1 %}
+    {% for a11y in axe limit: 1 %}
 
     {% for a11ylist in a11y %}
     {% for a11yvalue in a11ylist %}

data/_includes/actions/energy.html

@@ -1,6 +1,12 @@
 <div class="list-actions list-actions-table">
-  {% for website in site.pagestested limit: 1 %}
+  {% for website in pagestested limit: 1 %}
+
+  {% if site.data %}
   {% assign lighthouse = site.data.[website].lighthouse[datelastcrawl] %}
+  {% else %}
+  {% assign lighthouse = [website].lighthouse[datelastcrawl] %}
+  {% endif %}
+
   {% assign total = 0 %}
   {% assign networkrequests = lighthouse.audits.["network-requests"].details.items %}
   {% if networkrequests.resourceType != 'Document' %}{% if networkrequests.resourceType != 'Other' %}
@@ -18,21 +24,26 @@
 
 <h3 class="js-expandmore mb0 mt0" data-hideshow-prefix-class="animated" id="diagnostic-energy">Points energie</h3>
 <div class="js-to_expand">
-{% for website in site.pagestested limit: 1 %}
+{% for website in pagestested limit: 1 %}
+
+  {% if site.data %}
   {% assign lighthouse = site.data.[website].lighthouse[datelastcrawl] %}
+  {% else %}
+  {% assign lighthouse = [website].lighthouse[datelastcrawl] %}
+  {% endif %}
 
-    {% assign networkrequests = lighthouse.audits.["network-requests"].details.items | group_by: "resourceType" %}
-      {% for items in networkrequests %}
-      {% if items.items %}
-      {% if items.items %}<h3>{{ items.name }}</h3>{% endif %}
-      <ul>
-      {% assign requests = items.items | sort: 'transferSize'%}
-      {% for request in requests reversed %}
-        <li><a href="{{ request.url }}" title="{{ request.url }}">{{ request.url | slice: 0, 100 }}</a><b>{{ request.transferSize | filesize }}</b><b class="pointseco">{{ request.transferSize | times: 1.00 | times: 5 | divided_by: 6 | times: 100 | divided_by: ecoworth | round: 0 }}</b></li>
-      {% endfor %}
-      </ul>
-      {% endif %}
+  {% assign networkrequests = lighthouse.audits.["network-requests"].details.items | group_by: "resourceType" %}
+  {% for items in networkrequests %}
+    {% if items.items %}
+    {% if items.items %}<h3>{{ items.name }}</h3>{% endif %}
+    <ul>
+    {% assign requests = items.items | sort: 'transferSize'%}
+    {% for request in requests reversed %}
+      <li><a href="{{ request.url }}" title="{{ request.url }}">{{ request.url | slice: 0, 100 }}</a><b>{{ request.transferSize}}</b><b class="pointseco">{{ request.transferSize | times: 1.00 | times: 5 | divided_by: 6 | times: 100 | divided_by: ecoworth | round: 0 }}</b></li>
     {% endfor %}
+    </ul>
+    {% endif %}
+  {% endfor %}
 {% endfor %}
 </div>
 </div>

data/_includes/actions/quality.html

@@ -1,9 +1,15 @@
 <div class="list-actions list-actions-title">
-  {% for website in site.pagestested limit: 1 %}
+  {% for website in pagestested limit: 1 %}
   <h3 class="js-expandmore mb0 mt0" data-hideshow-prefix-class="animated" id="diagnostic-quality">Points de conformite</h3>
   <div class="js-to_expand">
   <ul>
+
+    {% if site.data %}
     {% assign lighthouse = site.data.[website].lighthouse[datelastcrawl] %}
+    {% else %}
+    {% assign lighthouse = [website].lighthouse[datelastcrawl] %}
+    {% endif %}
+
     {% assign categories = lighthouse.categories %}
     {% for audit in lighthouse.audits %}
       {% for value in audit %}

data/_includes/competitors.html

@@ -1,17 +1,24 @@
-{% for website in site.pagestested limit:1 %}
-{% assign serpstat = site.data.[website].serpstat[datelastcrawl] %}
-{% if serpstat %}
-<h3>Concurrents</h3>
-<div class="list-actions list-actions-grid">
-<ol>
-  {% for value in serpstat %}
-  <li><a href="{{ value.domain }}">{{ value.domain }}</a> {% if value.FBshare %}<b>{{ value.FBshare }} {% include svg/facebook.svg %}</b>{% endif %}</li>
-  {% endfor %}
-</ol>
-</div>
-<h3>Graphique de similarité</h3>
-<div class="center">
-{% include competitorsgraph.html %}
-</div>
-{% endif %}
+{% for website in pagestested limit:1 %}
+
+
+  {% if site.data %}
+  {% assign serpstat = site.data.[website].serpstat[datelastcrawl] %}
+  {% else %}
+  {% assign serpstat = [website].serpstat[datelastcrawl] %}
+  {% endif %}
+
+  {% if serpstat %}
+  <h3>Concurrents</h3>
+  <div class="list-actions list-actions-grid">
+  <ol>
+    {% for value in serpstat %}
+    <li><a href="{{ value.domain }}">{{ value.domain }}</a> {% if value.FBshare %}<b>{{ value.FBshare }} {% include svg/facebook.svg %}</b>{% endif %}</li>
+    {% endfor %}
+  </ol>
+  </div>
+  <h3>Graphique de similarité</h3>
+  <div class="center">
+  {% include competitorsgraph.html %}
+  </div>
+  {% endif %}
 {% endfor %}

data/_includes/index/badge.html

@@ -7,9 +7,9 @@
   </div>
   <div>
       <ul>
-        {% if site.data.[website].greenweb[datelastcrawl] %}
-        <li>  
-            <svg width="48" viewBox="0 0 512 512" fill="{% if site.data.[website].greenweb[datelastcrawl].green == false %}#22961e{% else %}#b00202{% endif %}">
+        {% if greenweb %}
+        <li>
+            <svg width="48" viewBox="0 0 512 512" fill="{% if greenweb.green == false %}#22961e{% else %}#b00202{% endif %}">
               <path d="M298.667 443.733h-85.333a8.536 8.536 0 00-8.533 8.533 8.536 8.536 0 008.533 8.533h85.333a8.536 8.536 0 008.533-8.533 8.536 8.536 0 00-8.533-8.533zM98.133 17.067H42.667C19.14 17.067 0 36.207 0 59.733V435.2c0 23.526 19.14 42.667 42.667 42.667h51.2c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533h-51.2c-14.114 0-25.6-11.486-25.6-25.6V59.733c0-14.114 11.486-25.6 25.6-25.6h55.467a8.536 8.536 0 008.533-8.533c0-4.71-3.823-8.533-8.534-8.533zM298.667 409.6h-85.333c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533h85.333c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533zM349.867 238.933H162.133c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533h187.733c4.71 0 8.533-3.823 8.533-8.533s-3.822-8.533-8.532-8.533zM264.789 213.333a8.53 8.53 0 00-8.533-8.533h-.085c-4.71 0-8.491 3.823-8.491 8.533 0 4.71 3.866 8.533 8.576 8.533a8.53 8.53 0 008.533-8.533zM273.067 358.4c0-9.412-7.654-17.067-17.067-17.067-9.412 0-17.067 7.654-17.067 17.067s7.654 17.067 17.067 17.067c9.412 0 17.067-7.655 17.067-17.067z"/>
               <path d="M94.123 68.267h-.085c-4.71 0-8.491 3.823-8.491 8.533s3.866 8.533 8.576 8.533c4.719 0 8.533-3.823 8.533-8.533s-3.814-8.533-8.533-8.533zM93.867 409.6H76.8c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533h17.067c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533zM94.123 136.533h-.085c-4.71 0-8.491 3.823-8.491 8.533 0 4.71 3.866 8.533 8.576 8.533a8.53 8.53 0 008.533-8.533 8.53 8.53 0 00-8.533-8.533zM93.867 375.467H76.8c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533h17.067c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533zM93.867 238.933h-51.2c-4.71 0-8.533 3.823-8.533 8.533S37.956 256 42.667 256h51.2c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.534-8.533-8.534zM42.667 187.733h51.2c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533h-51.2c-4.71 0-8.533 3.823-8.533 8.533s3.822 8.533 8.533 8.533zM94.123 204.8h-.085c-4.71 0-8.491 3.823-8.491 8.533 0 4.71 3.866 8.533 8.576 8.533a8.53 8.53 0 008.533-8.533 8.53 8.53 0 00-8.533-8.533zM42.667 119.467h51.2c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533h-51.2c-4.71 0-8.533 3.823-8.533 8.533s3.822 8.533 8.533 8.533zM349.867 0H162.133c-23.526 0-42.667 19.14-42.667 42.667v426.667c0 23.526 19.14 42.667 42.667 42.667h187.733c23.526 0 42.667-19.14 42.667-42.667V42.667C392.533 19.14 373.393 0 349.867 0zm25.6 469.333c0 14.114-11.486 25.6-25.6 25.6H162.133c-14.114 0-25.6-11.486-25.6-25.6V42.667c0-14.114 11.486-25.6 25.6-25.6h187.733c14.114 0 25.6 11.486 25.6 25.6v426.666zM418.133 187.733h51.2c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533h-51.2c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533zM418.304 136.533c-4.71 0-8.491 3.823-8.491 8.533 0 4.71 3.866 8.533 8.576 8.533a8.53 8.53 0 008.533-8.533 8.53 8.53 0 00-8.533-8.533h-.085zM418.304 204.8c-4.71 0-8.491 3.823-8.491 8.533 0 4.71 3.866 8.533 8.576 8.533a8.53 8.53 0 008.533-8.533 8.53 8.53 0 00-8.533-8.533h-.085zM418.389 85.333c4.719 0 8.533-3.823 8.533-8.533s-3.814-8.533-8.533-8.533h-.085c-4.71 0-8.491 3.823-8.491 8.533s3.866 8.533 8.576 8.533zM418.133 256h51.2c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533h-51.2c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533zM418.133 426.667H435.2c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533h-17.067c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533zM418.133 392.533H435.2c4.71 0 8.533-3.823 8.533-8.533s-3.823-8.533-8.533-8.533h-17.067c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533z"/>
               <path d="M469.333 17.067h-55.467a8.536 8.536 0 00-8.533 8.533 8.536 8.536 0 008.533 8.533h55.467c14.114 0 25.6 11.486 25.6 25.6V435.2c0 14.114-11.486 25.6-25.6 25.6h-51.2c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533h51.2c23.526 0 42.667-19.14 42.667-42.667V59.733c0-23.526-19.14-42.666-42.667-42.666zM264.789 76.8a8.53 8.53 0 00-8.533-8.533h-.085c-4.71 0-8.491 3.823-8.491 8.533s3.866 8.533 8.576 8.533a8.53 8.53 0 008.533-8.533zM349.867 102.4H162.133c-4.71 0-8.533 3.823-8.533 8.533s3.823 8.533 8.533 8.533h187.733c4.71 0 8.533-3.823 8.533-8.533s-3.822-8.533-8.532-8.533zM264.789 145.067a8.53 8.53 0 00-8.533-8.533h-.085c-4.71 0-8.491 3.823-8.491 8.533 0 4.71 3.866 8.533 8.576 8.533a8.53 8.53 0 008.533-8.533z"/>
@@ -19,20 +19,20 @@
           Green Hosting
         </li>
         {% endif %}
-        {% if site.data.[website].pa11y[datelastcrawl] %}
+        {% if pa11y %}
         <li>
-          {% if site.data.[website].pa11y[datelastcrawl].errors > 20 %}
+          {% if pa11y.errors > 20 %}
           <svg xmlns="http://www.w3.org/2000/svg" width="48" viewBox="0 0 24 24" fill="none" stroke="#b00202" stroke-width="3.5" stroke-linecap="square" stroke-linejoin="bevel"><polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12" y2="16"></line></svg>
           {% else %}
           <svg xmlns="http://www.w3.org/2000/svg" width="48" viewBox="0 0 24 24" fill="none" stroke="#22961e" stroke-width="3.5" stroke-linecap="square" stroke-linejoin="bevel"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"></path><polyline points="22 4 12 14.01 9 11.01"></polyline></svg>
           {% endif %}
           <br><br>
-          {{ site.data.[website].pa11y[datelastcrawl].errors }} A11y erreurs
+          {{ pa11y.errors }} A11y erreurs
         </li>
         {% endif %}
-        {% if site.data.[website].observatory[datelastcrawl] %}
+        {% if observatory %}
         <li>
-            {% if site.data.[website].observatory[datelastcrawl].content-security-policy %}
+            {% if observatory.content-security-policy %}
             <svg xmlns="http://www.w3.org/2000/svg" width="48" viewBox="0 0 24 24" fill="none" stroke="#b00202" stroke-width="3.5" stroke-linecap="square" stroke-linejoin="bevel"><polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12" y2="16"></line></svg>
             {% else %}
             <svg xmlns="http://www.w3.org/2000/svg" width="48" viewBox="0 0 24 24" fill="none" stroke="#22961e" stroke-width="3.5" stroke-linecap="square" stroke-linejoin="bevel"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"></path><polyline points="22 4 12 14.01 9 11.01"></polyline></svg>
@@ -44,4 +44,4 @@
       </ul>
   </div>
 </div>
-{% endif %}
+{% endif %}

data/_includes/index/energy.html

@@ -10,13 +10,13 @@
       <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: {{ ecoaverageposition }}%;">Moyenne grands sites</div>
-        <div class="progress-bar-tooltip" style="left: {{ ecoposition }}%;z-index:2">{{ website }}</div>
+        <div class="progress-bar-tooltip" style="left: {{ ecoposition }}%;z-index:2">{{ pages.name }}</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: {{ ecoaverageposition }}%;">{{ ecoaverage }}</div>
-        <div class="progress-bar-score" style="left: {{ ecoposition }}%;z-index:2">{{ eco  }}</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/index/loading.html

@@ -13,7 +13,7 @@
         <b>{{ lighthouse.audits["dom-size"].details.items[0].value | replace: ",","" }}</b><br>
         Elements DOM
       </li>
-      <li><b>{{ lighthouse.audits.diagnostics.details.items[0].totalByteWeight | times: 1 | filesize }}</b><br>Poids
+      <li><b>{{ lighthouse.audits.diagnostics.details.items[0].totalByteWeight | times: 1 | filesizeconvert }}</b><br>Poids
         de la page</li>
     </ul>
   </div>

data/_includes/index/position.html

@@ -3,7 +3,14 @@
   <div><h4>Position</h4></div>
   <div>
   <ul>
-    {% for authority in site.data.[website].moz[datelastcrawl] %}
+
+    {% if site.data %}
+    {% assign moz = site.data.[website].moz[datelastcrawl] %}
+    {% else %}
+    {% assign moz = [website].moz[datelastcrawl] %}
+    {% endif %}
+
+    {% for authority in moz %}
     {% for element in authority limit: 2 %}
       {% assign score = element[1] | times: 1 %}
       <li data-name="{{ element[0] }}" data-percent="{{ score }}">

data/_includes/index/score.html

@@ -1,13 +1,13 @@
 <div class="js-tabs" data-existing-hx="h2" data-tabs-prefix-class="tabs">
   <ul class="js-tablist">
-    {% for website in site.pagestested %}
+    {% for website in pagestested %}
     <li class="js-tablist__item">
       <a href="#id_{{ forloop.index }}" class="js-tablist__link">{{ website }}</a>
     </li>
     {% endfor %}
   </ul>
 
-  {% for website in site.pagestested %}
+  {% for website in pagestested %}
 
   {% assign labels = "" | split: ',' %}
   {% assign ttfb = "" | split: ',' %}
@@ -18,7 +18,7 @@
   {% if site.data.[website].gpagespeed[data] %}
       {% assign date = data | date: "%d/%m/%y" | prepend: "'" | append: "'" %}
       {% assign labels = labels | push: date  %}
-      {% assign interactive = site.data.[website].lighthouse[data].audits.metrics.details.items[0].observedLastVisualChange | round: 0 %}
+      {% assign interactive = site.data.[website].lighthouse[data].audits.metrics.details.items[0].observedLoad | round: 0 %}
       {% assign tti = tti | push: interactive %}
       {% assign score = score | push: site.data.[website].gpagespeed[data].ruleGroups.SPEED.score %}
   {% endif %}
@@ -82,9 +82,15 @@
 
       {% for data in file %}
 
+      {% if site.data %}
       {% assign gpagespeed = site.data.[website].gpagespeed[data] %}
       {% assign yellowlabtools = site.data.[website].yellowlabtools[data] %}
       {% assign lighthouse = site.data.[website].lighthouse[data] %}
+      {% else %}
+      {% assign gpagespeed = [website].gpagespeed[data] %}
+      {% assign yellowlabtools = [website].yellowlabtools[data] %}
+      {% assign lighthouse = [website].lighthouse[data] %}
+      {% endif %}
 
       {% if gpagespeed %}