some simplifications

2024-07-04 12:05:45 +02:00 · 2021-01-18 14:28:13 +01:00 · 2021-01-18 14:28:13 +01:00 · 78598192e0
commit 78598192e0
parent 5be2aa619a
10 changed files with 103 additions and 46 deletions
--- a/.eleventy.js
+++ b/.eleventy.js
@ -1,25 +1,14 @@
-const csvParse = require("csv-parse/lib/sync");
 const fs = require("fs");

 (function updateWebsiteMetadata() {
-  const records = csvParse(fs.readFileSync("sites.csv", "utf8"));
-  fs.writeFileSync(
-    "_data/results/meta.json",
-    JSON.stringify(
-      records.map((record) => ({
-        url: record[0],
-        name: record[1],
-        twitter: record[2],
-      }))
-    )
-  );
+  fs.copyFileSync('sites.json', '_data/results/meta.json');
 })();

 module.exports = function (eleventyConfig) {
  eleventyConfig.addPassthroughCopy("assets");
  eleventyConfig.addPassthroughCopy("images");

-  eleventyConfig.addNunjucksFilter("color", function (value) {
+  eleventyConfig.addFilter("color", (value) => {
    if (value < 50) {
      return "#c60c0c45";
    }
@ -28,7 +17,7 @@ module.exports = function (eleventyConfig) {
    return "inherit";
  });

-  eleventyConfig.addFilter("urlEncode", function (value) {
+  eleventyConfig.addFilter("urlEncode", (value) => {
    return encodeURIComponent(value);
  });
 };
--- a/.github/workflows/crawl_and_build.yml
+++ b/.github/workflows/crawl_and_build.yml
@ -1,3 +1,5 @@
+name: crawl_and_build
+
 on:
  schedule:
    - cron: "0 0 * * *"
@ -16,13 +18,13 @@ jobs:
    steps:
      - uses: actions/checkout@v2

+      - name: Crawl information about public sites
+        run: $GITHUB_WORKSPACE/crawl.sh
+
      - uses: actions/setup-node@v2
        with:
          node-version: "12"

-      - name: Crawl information about public sites
-        run: $GITHUB_WORKSPACE/crawl.sh
-
      - name: Install dependencies & build
        run: |
          npm ci
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 Una iniciativa de [PucelaBits](https://pucelabits.org/). Analizamos y mostramos [seguridad HTTPS de sitios web públicos](https://websegura.pucelabits.org), como medida para visualizar aquellos que pueden suponer un riesgo para sus usuarios.

-Si quieres incluir algún sitio público, sólo tienes que editar el fichero [`sites.csv`](https://github.com/PucelaBits/websegura/blob/main/sites.csv).
+Si quieres incluir algún sitio público, sólo tienes que editar el fichero [`sites.json`](https://github.com/PucelaBits/websegura/blob/main/sites.csv).


 [![Join the chat at https://gitter.im/PucelaBits/websegura](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/PucelaBits/websegura?utm_source=badge&utm_medium=badge&utm_content=badge)
--- a/_data/results/meta.json
+++ b/_data/results/meta.json
@ -1 +1,42 @@
-[{"url":"www.auvasa.es","name":"AUVASA","twitter":"AuvasaVLL"},{"url":"www.casadelaindia.org","name":"Casa de la India","twitter":"CasaIndiaVLL"},{"url":"www.centroculturalmigueldelibes.com","name":"Centro Cultural Miguel Delibes","twitter":""},{"url":"feriavalladolid.com","name":"Feria de Valladolid","twitter":"feriavalladolid"},{"url":"www.fmdva.org","name":"Fundación Municipal de Deportes","twitter":""},{"url":"www.museocienciavalladolid.es","name":"Museo de la Ciencia","twitter":""},{"url":"www.uva.es","name":"Universidad de Valladolid","twitter":"UVa_es"},{"url":"www.valladolid.es","name":"Ayuntamiento de Valladolid","twitter":"AyuntamientoVLL"}]
+[
+    {
+        "url": "www.auvasa.es",
+        "name": "AUVASA",
+        "twitter": "AuvasaVLL"
+    },
+    {
+        "url": "www.casadelaindia.org",
+        "name": "Casa de la India",
+        "twitter": "CasaIndiaVLL"
+    },
+    {
+        "url": "www.centroculturalmigueldelibes.com",
+        "name": "Centro Cultural Miguel Delibes",
+        "twitter": ""
+    },
+    {
+        "url": "feriavalladolid.com",
+        "name": "Feria de Valladolid",
+        "twitter": "feriavalladolid"
+    },
+    {
+        "url": "www.fmdva.org",
+        "name": "Fundación Municipal de Deportes",
+        "twitter": ""
+    },
+    {
+        "url": "www.museocienciavalladolid.es",
+        "name": "Museo de la Ciencia",
+        "twitter": ""
+    },
+    {
+        "url": "www.uva.es",
+        "name": "Universidad de Valladolid",
+        "twitter": "UVa_es"
+    },
+    {
+        "url": "www.valladolid.es",
+        "name": "Ayuntamiento de Valladolid",
+        "twitter": "AyuntamientoVLL"
+    }
+]
--- a/_includes/base.njk
+++ b/_includes/base.njk
@ -51,15 +51,15 @@
            <ul class="icons">
              <li>
                <a href="https://twitter.com/PucelaBits" class="icon brands style2 fa-twitter">
-                  <span class="label">Twitter</span></a >
+                  <span class="label">Twitter</span></a>
              </li>
              <li>
                <a href="https://github.com/PucelaBits" class="icon brands style2 fa-github">
-                  <span class="label">GitHub</span></a >
+                  <span class="label">GitHub</span></a>
              </li>
              <li>
                <a href="https://t.me/pucelabits" class="icon brands style2 fa-telegram">
-                  <span class="label">500px</span></a >
+                  <span class="label">500px</span></a>
              </li>
            </ul>
          </section>
--- a/crawl.sh
+++ b/crawl.sh
@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-SITES=`cat sites.csv | cut -d ',' -f 1`
+SITES=`cat sites.json | jq -r .[].url`
 for site in $SITES; do
  # see https://github.com/mozilla/http-observatory/blob/master/httpobs/docs/api.md
  echo "Scanning $site using Mozilla HTTP Observatory API"
--- a/index.njk
+++ b/index.njk
@ -14,15 +14,14 @@ layout: base
      </thead>
      <tbody>
        {% for web in results.meta %}
-          {% set security = results[web.url | replace(".", "!")]%}
+          {% set security = results[web.url | replace(".", "!")] %}
          <tr style="background-color: {{ security.score | color }}">
            <td>{{ security.grade }}</td>
            <td>
-              {{ web.url | replace("www.", "") }}
-              <i style="font-size: small">(<a href="https://observatory.mozilla.org/analyze/{{ web.url }}" target="_blank">ver más detalles</a>)</i>
+              <a href="https://observatory.mozilla.org/analyze/{{ web.url }}" target="_blank" alt="Detalles técnicos" title="Detalles técnicos">{{ web.url | replace("www.", "") }}</a>
            </td>
            <td>
-              {% if web.twitter%}
+              {% if web.twitter %}
                <a class="twitter-share-button" href="https://twitter.com/intent/tweet/?text={{ 'Hola @' + web.twitter + '

 🔒 La seguridad de vuestra web y usuarios puede ser comprometida si no actualizáis vuestras conexiones seguras (HTTPS).
@ -31,8 +30,8 @@ layout: base
 websegura.pucelabits.org

 #websegura /vía @PucelaBits' | urlEncode }}" target="_blank" rel="noopener" aria-label="Twitter">
-                  <svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 24 24"><path d="M23.44 4.83c-.8.37-1.5.38-2.22.02.93-.56.98-.96 1.32-2.02-.88.52-1.86.9-2.9 1.1-.82-.88-2-1.43-3.3-1.43-2.5 0-4.55 2.04-4.55 4.54 0 .36.03.7.1 1.04-3.77-.2-7.12-2-9.36-4.75-.4.67-.6 1.45-.6 2.3 0 1.56.8 2.95 2 3.77-.74-.03-1.44-.23-2.05-.57v.06c0 2.2 1.56 4.03 3.64 4.44-.67.2-1.37.2-2.06.08.58 1.8 2.26 3.12 4.25 3.16C5.78 18.1 3.37 18.74 1 18.46c2 1.3 4.4 2.04 6.97 2.04 8.35 0 12.92-6.92 12.92-12.93 0-.2 0-.4-.02-.6.9-.63 1.96-1.22 2.56-2.14z"/></svg>
-                  <span>&nbsp;Twitter</span>
+                  <span class="icon brands fa-twitter">
+                  <span>Twitter</span>
                </a>
              {% endif %}
            </td>
@ -42,11 +41,3 @@ websegura.pucelabits.org
    </table>
  </div>
 </section>
-
-<!-- Twitter share button styles -->
-<style>
-  .twitter-share-button svg {
-    fill: #55acee;
-    height: 1em;
-  }
-</style>
--- a/sites.csv
+++ b/sites.csv
@ -1,8 +0,0 @@
-www.auvasa.es,AUVASA,AuvasaVLL
-www.casadelaindia.org,Casa de la India,CasaIndiaVLL
-www.centroculturalmigueldelibes.com,Centro Cultural Miguel Delibes,
-feriavalladolid.com,Feria de Valladolid,feriavalladolid
-www.fmdva.org,Fundación Municipal de Deportes,
-www.museocienciavalladolid.es,Museo de la Ciencia,
-www.uva.es,Universidad de Valladolid,UVa_es
-www.valladolid.es,Ayuntamiento de Valladolid,AyuntamientoVLL
--- a/sites.json
+++ b/sites.json
@ -0,0 +1,42 @@
+[
+    {
+        "url": "www.auvasa.es",
+        "name": "AUVASA",
+        "twitter": "AuvasaVLL"
+    },
+    {
+        "url": "www.casadelaindia.org",
+        "name": "Casa de la India",
+        "twitter": "CasaIndiaVLL"
+    },
+    {
+        "url": "www.centroculturalmigueldelibes.com",
+        "name": "Centro Cultural Miguel Delibes",
+        "twitter": ""
+    },
+    {
+        "url": "feriavalladolid.com",
+        "name": "Feria de Valladolid",
+        "twitter": "feriavalladolid"
+    },
+    {
+        "url": "www.fmdva.org",
+        "name": "Fundación Municipal de Deportes",
+        "twitter": ""
+    },
+    {
+        "url": "www.museocienciavalladolid.es",
+        "name": "Museo de la Ciencia",
+        "twitter": ""
+    },
+    {
+        "url": "www.uva.es",
+        "name": "Universidad de Valladolid",
+        "twitter": "UVa_es"
+    },
+    {
+        "url": "www.valladolid.es",
+        "name": "Ayuntamiento de Valladolid",
+        "twitter": "AyuntamientoVLL"
+    }
+]
--- a/web.njk
+++ b/web.njk
@ -8,5 +8,5 @@ permalink: "web/{{ web.url }}/index.html"
 ---

 <pre>
-{{ web | dump | safe}}
+{{ web | dump | safe }}
 </pre>