Delete extra fonts

Reviewed-on: AstrolabeCAE/SiteWebAstrolabe_public#11

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "members-data"]
+	path = members-data
+	url = ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_private.git
+	branch = master

README.md

@@ -9,12 +9,15 @@ Requirements :
 
 ### Install
 
-1. Clone or fork this repo: `git clone ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_public.git`
-2. Clone or fork the private repo containing members data in the same folder that SiteWebAstrolabe_public : `git clone ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_private.git`
+1. Clone or fork this repo INCLUDING its submodule: `git clone --recurse-submodules ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_public.git`
 3. `cd` into the project directory (SiteWebAstrolabe_public) and run `npm install`
 4. Once all the dependencies are installed run `npm start`
 5. Open your browser at `http://localhost:8080` and away you go!
 
+If you don't have the members data (page /equipe), you may have done a simple (non-recursive) clone. In this case, populate with member data by running `git submodule update --init --recursive`. Also, check that you do have the rights for the https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_private repository.
+
+If you need to get the latest commits of the SiteWebAstrolabe_private repo, you can do a `git submodule update --remote`.
+
 ### Deploy
 
 1. Copy paste deploy.js file in two new files `deploy-preprod.js`and `deploy-prod.js`

package.json

@@ -8,17 +8,16 @@
     "@11ty/eleventy": "^3.0.0",
     "@11ty/eleventy-plugin-rss": "^2.0.2",
     "@11ty/eleventy-plugin-syntaxhighlight": "^2.0.3",
-    "@tbranyen/jsdom": "^13.0.0",
     "bootstrap": "^5.1.3",
     "concurrently": "^7.0.0",
-    "html-minifier": "^4.0.0",
+    "html-minifier-terser": "^7.2.0",
     "image-size": "^0.8.3",
+    "jsdom": "^24.0.0",
     "json-to-scss": "^1.3.1",
     "leaflet": "^1.7.1",
     "sass": "^1.26.3",
     "semver": "^6.3.0",
-    "slugify": "^1.4.0",
-    "stalfos": "github:hankchizljaw/stalfos#c8971d22726326cfc04089b2da4d51eeb1ebb0eb"
+    "slugify": "^1.4.0"
   },
   "devDependencies": {
     "@erquhart/rollup-plugin-node-builtins": "^2.1.5",
@@ -27,6 +26,7 @@
     "copyfiles": "^2.4.1",
     "cross-env": "^5.2.1",
     "ftp-deploy": "^2.3.7",
+    "go-webp": "^1.3.1",
     "make-dir-cli": "^3.0.0",
     "prettier": "^1.19.1",
     "rimraf": "^3.0.2",
@@ -45,21 +45,22 @@
     "vendor:css": "copyfiles node_modules/leaflet/dist/leaflet.css node_modules/bootstrap/dist/css/bootstrap.min.css -f dist/vendor/css",
     "vendor:js": "copyfiles node_modules/leaflet/dist/leaflet.js node_modules/bootstrap/dist/js/bootstrap.min.js -f dist/vendor/js",
     "vendor": "npm run clean && npm run vendor:css && npm run vendor:js",
+    "webp": "go-webp excludeFolders=\"src/fonts,members-data,src/images/profiles\" excludeFiles=\"images/*.svg,images/astrolabe/favicon.png\"",
     "start": "concurrently \"npm run vendor\" \"npm run sass:process -- --watch\" \"npm run serve\"",
     "serve": "cross-env ELEVENTY_ENV=development npx eleventy --serve",
-    "prod": "cross-env ELEVENTY_ENV=prod npm run vendor && npm run sass:process && npx eleventy",
+    "prod": "cross-env ELEVENTY_ENV=prod npm run vendor && npm run webp && npm run sass:process && npx eleventy",
     "deploy-preprod": "npm run prod && node deploy-preprod",
     "deploy-prod": "npm run prod && node deploy-prod"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe.git"
+    "url": "git+https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public.git"
   },
   "keywords": [],
   "author": "Yves Gatesoupe",
   "license": "MIT",
   "bugs": {
-    "url": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe/issues"
+    "url": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public/issues"
   },
-  "homepage": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe"
+  "homepage": "https://git.astrolabe.coop/AstrolabeCAE/SiteWebAstrolabe_public"
 }

src/.htaccess

@@ -12,5 +12,6 @@ ErrorDocument 404 /404.html
     RewriteEngine On
     RewriteCond %{HTTP:X-Forwarded-Proto} !https [OR]
     RewriteCond %{HTTP_HOST} ^astrolabe\.coop [NC]
+    RewriteCond %{HTTP_HOST} !^astrolabe\.test [NC]
     RewriteRule ^ https://www.astrolabe.coop%{REQUEST_URI} [L,NE,R=301]
 </IfModule>

src/_data/site.json

@@ -11,7 +11,6 @@
   "authorSocial": {
     "mastodon": "https://framapiaf.org/@AstrolabeCAE",
     "linkedin": "https://www.linkedin.com/company/astrolabe-cae/",
-    "facebook": "https://www.facebook.com/profile.php?id=61558600207926",
     "instagram": "https://www.instagram.com/cae_astrolabe/",
     "peertube" : "https://peertube.astrolabe.coop/c/astrolabe_cae/videos",
     "youtube" : "https://www.youtube.com/channel/UCdxBGpXwL_A5rOcGbN_Xiag",

src/_includes/layouts/base.njk

@@ -8,8 +8,8 @@
   <link rel="icon" href="{{ site.faviconPath }}" type="image/png" />
   {% include "partials/global/meta-info.njk" %}
   <script>document.documentElement.classList.remove('no-js');</script>
-  <link rel = "stylesheet" href="/vendor/css/leaflet.css"/>
-  <link rel = "stylesheet" href="/vendor/css/bootstrap.min.css"/>
+  <link rel = "stylesheet" href="/vendor/css/leaflet.css" media="print" onload="this.media='all'"/>
+  <link rel = "stylesheet" href="/vendor/css/bootstrap.min.css" media="print" onload="this.media='all'"/>
   <style>{% include "assets/css/global.css" %}</style>
   {% block head %}
   {% endblock %}

src/_includes/partials/global/site-foot.njk

@@ -19,7 +19,6 @@
         <p>{{site.authorAddress}}<br>{{site.authorCity}}</p>
         <div class="socials">
           <a href="{{site.authorSocial.mastodon}}" class="social" title="Mastodon"><svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M16.956 18.293c3.007-.36 5.625-2.212 5.954-3.905.519-2.667.476-6.508.476-6.508 0-5.207-3.411-6.733-3.411-6.733C18.255.357 15.302.025 12.233 0h-.075c-3.068.025-6.02.357-7.74 1.147 0 0-3.41 1.526-3.41 6.733 0 .315-.003.647-.004.993-.005.96-.01 2.024.018 3.136.123 5.091.933 10.11 5.64 11.355 2.171.575 4.035.695 5.535.613 2.722-.151 4.25-.972 4.25-.972l-.09-1.974s-1.945.613-4.13.538c-2.163-.074-4.448-.233-4.798-2.89a5.448 5.448 0 01-.048-.745s2.124.519 4.816.642c1.647.076 3.19-.096 4.759-.283zm2.406-3.705V8.283c0-1.288-.328-2.312-.987-3.07-.68-.757-1.57-1.145-2.674-1.145-1.278 0-2.246.491-2.885 1.474l-.623 1.043-.622-1.043c-.64-.983-1.608-1.474-2.886-1.474-1.104 0-1.994.388-2.674 1.146-.659.757-.987 1.781-.987 3.07v6.303h2.498V8.47c0-1.29.543-1.945 1.628-1.945 1.2 0 1.802.777 1.802 2.312v3.35h2.483v-3.35c0-1.535.601-2.312 1.801-2.312 1.086 0 1.629.655 1.629 1.945v6.119h2.497z" fill="#fff"/></svg></a>
-          <a href="{{site.authorSocial.facebook}}" class="social" title="Facebook"><svg fill="#FFFFFF" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="24px" height="24px"><path d="M24,4C12.972,4,4,12.972,4,24c0,10.006,7.394,18.295,17,19.75V29h-4c-0.552,0-1-0.447-1-1v-3c0-0.553,0.448-1,1-1h4v-3.632	C21,15.617,23.427,13,27.834,13c1.786,0,3.195,0.124,3.254,0.129C31.604,13.175,32,13.607,32,14.125V17.5c0,0.553-0.448,1-1,1h-2	c-1.103,0-2,0.897-2,2V24h4c0.287,0,0.56,0.123,0.75,0.338c0.19,0.216,0.278,0.502,0.243,0.786l-0.375,3	C31.555,28.624,31.129,29,30.625,29H27v14.75c9.606-1.455,17-9.744,17-19.75C44,12.972,35.028,4,24,4z"/></svg></a>
           <a href="{{site.authorSocial.linkedin}}" class="social" title="Linkedin"><svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4.98 2.5A2.49 2.49 0 012.5 5 2.49 2.49 0 01.02 2.5C.02 1.12 1.13 0 2.5 0a2.49 2.49 0 012.48 2.5zM5 7H0v16h5V7zm7.982 0H8.014v16h4.969v-8.399c0-4.67 6.029-5.052 6.029 0V23H24V12.869c0-7.88-8.922-7.593-11.018-3.714V7z" fill="#fff"/></svg></a>
           <a href="{{site.authorSocial.instagram}}" class="social" title="Instagram"><svg fill="#FFFFFF" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 50 50" width="24px" height="24px"><path d="M 16 3 C 8.83 3 3 8.83 3 16 L 3 34 C 3 41.17 8.83 47 16 47 L 34 47 C 41.17 47 47 41.17 47 34 L 47 16 C 47 8.83 41.17 3 34 3 L 16 3 z M 37 11 C 38.1 11 39 11.9 39 13 C 39 14.1 38.1 15 37 15 C 35.9 15 35 14.1 35 13 C 35 11.9 35.9 11 37 11 z M 25 14 C 31.07 14 36 18.93 36 25 C 36 31.07 31.07 36 25 36 C 18.93 36 14 31.07 14 25 C 14 18.93 18.93 14 25 14 z M 25 16 C 20.04 16 16 20.04 16 25 C 16 29.96 20.04 34 25 34 C 29.96 34 34 29.96 34 25 C 34 20.04 29.96 16 25 16 z"/></svg></a>
           <a href="{{site.authorSocial.peertube}}" class="social" title="Peertube"><svg fill="#FFFFFF" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 50 50" width="24px" height="24px"><path d="M8.83,4.5l16.89,9.75L42.6,24,25.72,33.75,8.83,43.5V24l8.36,4.83,8.42,4.87V14.27l-8.42,4.87L8.83,24V4.5Z"/></g></svg></a>

src/customers/biocoop-lacanopee.md

@@ -1,5 +1,5 @@
 ---
 name: 'Biocoop La Canopée'
-thumbnail: '/images/customers/logo-biocoop-lacanopee.png'
+thumbnail: '/images/customers/logo-biocoop-lacanopee.webp'
 url: 'https://www.biocoopbesancon.fr/'
 ---

src/customers/builddata.md

@@ -1,5 +1,5 @@
 ---
 name: 'Build Data'
-thumbnail: '/images/customers/logo-builddata.png'
+thumbnail: '/images/customers/logo-builddata.webp'
 url: 'https://www.build-data.fr/'
 ---

src/customers/deltadore.md

@@ -1,5 +1,5 @@
 ---
 name: 'Delta Dore'
-thumbnail: '/images/customers/logo-deltadore.png'
+thumbnail: '/images/customers/logo-deltadore.webp'
 url: 'https://www.deltadore.fr'
 ---

src/customers/epv.md

@@ -1,5 +1,5 @@
 ---
 name: 'Énergies citoyennes en Pays de Vilaine'
-thumbnail: '/images/customers/logo-epv.png'
+thumbnail: '/images/customers/logo-epv.webp'
 url: 'https://www.enr-citoyennes.fr/'
 ---

src/customers/smardtv.md

@@ -1,5 +1,5 @@
 ---
 name: 'SmarDTV'
-thumbnail: '/images/customers/logo-smardtv.png'
+thumbnail: '/images/customers/logo-smardtv.webp'
 url: 'https://www.smardtv.com/'
 ---

src/customers/vantiva.md

@@ -1,5 +1,5 @@
 ---
 name: 'Vantiva'
-thumbnail: '/images/customers/logo-vantiva.png'
+thumbnail: '/images/customers/logo-vantiva.webp'
 url: 'https://www.vantiva.com/'
 ---

src/customers/wiztivi.md

@@ -1,5 +1,5 @@
 ---
 name: 'WIZTIVI'
-thumbnail: '/images/customers/logo-wiztivi.png'
+thumbnail: '/images/customers/logo-wiztivi.webp'
 url: 'https://www.wiztivi.com/'
 ---

src/customers/workadventure.md

@@ -1,5 +1,5 @@
 ---
 name: 'Work Adventure'
-thumbnail: '/images/customers/logo-workadventure.png'
+thumbnail: '/images/customers/logo-workadventure.webp'
 url: 'https://workadventu.re/'
 ---