Correction ortho

Reviewed-on: AstrolabeCAE/SiteWebAstrolabe_public#20

.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`
+1. Clone or fork this repo INCLUDING its submodule: `git clone --recurse-submodules 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`
 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",
+    "slugify": "^1.4.0"
-    "stalfos": "github:hankchizljaw/stalfos#c8971d22726326cfc04089b2da4d51eeb1ebb0eb"
   },
   "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/_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/leaflet.css" media="print" onload="this.media='all'"/>
-  <link rel = "stylesheet" href="/vendor/css/bootstrap.min.css"/>
+  <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/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/'
 ---

src/images/mouette.svg

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="152.44901"
+   height="129"
+   fill="none"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="mail-sent.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" />
+  <path
+     d="m 135.76213,23.646211 c -0.50547,-2.112315 -2.68372,-6.12706 -7.30767,-6.20023 l -4.88985,-0.07807 C 123.01972,7.534134 114.9818,-0.377289 105.02716,-0.535082 94.6131,-0.701223 86.00742,7.672352 85.84104,18.131135 L 85.4949,39.865432 14.44239,15.9604 a 2.76,2.76 0 0 0 -3.50492,1.741072 c -7.7278902,22.968885 3.18446,47.780926 24.52723,57.965518 6.54411,13.44488 19.30623,22.86183 33.85183,25.32443 l -0.41387,26.009 a 2.766,2.766 0 0 0 2.72248,2.81096 c 1.52756,0.0251 2.78716,-1.19312 2.81095,-2.72249 l 0.40593,-25.52426 c 0.44819,0.0195 0.89232,0.062 1.34433,0.0687 1.8829,0.0304 3.73697,-0.0682 5.5647,-0.25823 l -0.41101,25.82369 a 2.768,2.768 0 0 0 5.53343,0.0885 l 0.42766,-26.83495 c 20.15112,-4.65898 35.36557,-22.584269 35.7096,-44.175021 l 0.53052,-33.375168 4.82769,0.07685 c 1.44189,0.02297 1.95715,1.758864 2.01795,1.982708 a 2.77,2.77 0 0 0 3.32764,2.021877 2.77,2.77 0 0 0 2.04778,-3.336278 z M 76.27384,96.09998 C 63.16658,95.89187 51.01099,89.22945 43.63249,78.671312 a 47.148,47.148 0 0 0 11.41735,1.611885 C 69.30073,80.510002 83.31941,74.317608 92.63113,62.991576 A 2.768,2.768 0 0 0 88.35696,59.47739 C 77.36885,72.8425 58.96472,78.114438 42.56734,72.595976 21.52645,65.517144 9.7905798,43.279212 15.39769,22.121107 l 71.97643,24.215309 a 2.766,2.766 0 0 0 3.50492,-1.741072 2.73,2.73 0 0 0 0.10051,-1.307315 l 0.39869,-25.070102 c 0.11741,-7.40793 6.2028,-13.339766 13.56404,-13.222248 7.32868,0.117168 13.19571,6.180487 13.13536,13.537738 l -0.59918,37.656129 C 117.11913,78.551672 98.63741,96.456 76.27384,96.09998 Z"
+     fill="#111111"
+     id="path2" />
+  <path
+     d="m 108.16103,15.752166 c -1.10659,0.370917 -2.01832,1.16991 -2.53126,2.218249 -0.51928,1.042132 -0.5991,2.248936 -0.22159,3.350376 0.78025,2.296817 3.27218,3.528912 5.57095,2.754463 2.29619,-0.782552 3.5258,-3.275931 2.74884,-5.574013 -0.75618,-2.23261 -3.33167,-3.50166 -5.56694,-2.749075 z"
+     fill="#111111"
+     id="path4"
+     sodipodi:nodetypes="cccccc" />
+</svg>

src/images/nurse.svg

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="55.43399"
+   height="80.020157"
+   fill="none"
+   version="1.1"
+   id="svg52"
+   sodipodi:docname="crew.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs56" />
+  <sodipodi:namedview
+     id="namedview54"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" />
+  <path
+     d="m 19.245,40.263172 c -10.432,0 -19.245,10.175 -19.245,22.22 v 16.537 a 1,1 0 0 0 1,1 h 53.434 a 1,1 0 0 0 1,-1 v -16.545 c 0,-12.04 -8.811,-22.212 -19.239,-22.212 h -0.378 v -1.73 c 0.068,10e-4 0.138,0.004 0.205,0.004 7.823,0 11.665,-3.673 11.831,-3.836 a 0.998,0.998 0 0 0 -0.312,-1.635 c -3.48,-1.466 -5.009,-7.628 -5.024,-7.689 -0.004,-0.016 -0.016,-0.028 -0.021,-0.044 0.362,-1.316 0.563,-2.692 0.563,-4.107 0,-3.484 -1.199,-6.862 -3.364,-9.59 l 2.392,-7.6670003 a 1.003,1.003 0 0 0 -0.584,-1.227 c -15.156,-6.055 -28.237,-0.23 -28.786,0.02 a 1,1 0 0 0 -0.505,1.301 l 3.244,7.6240003 a 15.444,15.444 0 0 0 -3.324,9.54 c 0,1.426 0.205,2.814 0.573,4.14 l -0.005,0.01 c -0.016,0.062 -1.545,6.224 -5.025,7.69 a 1,1 0 0 0 -0.312,1.635 c 0.166,0.162 4.007,3.835 11.832,3.835 0.11,0 0.226,-0.005 0.338,-0.007 v 1.732 H 19.245 Z M 2,62.483172 c 0,-7.633 4.054,-14.582 9.681,-17.995 1.491,0.63 14.428,6.89 14.75,33.532 H 2 v -15.538 z m 51.434,-0.008 v 15.545 H 28.761 c 0.34,-27.925 14.67,-33.508 14.896,-33.59 5.676,3.39 9.777,10.371 9.777,18.045 z m -12.027,-19.175 c -3.401,1.914 -11.227,8.006 -13.81,24.291 -2.555,-16.106 -10.241,-22.246 -13.701,-24.23 1.701,-0.7 3.5,-1.098 5.349,-1.098 h 1.013 l 0.52,0.312 a 13.41,13.41 0 0 0 6.901,1.915 c 2.407,0 4.814,-0.65 6.959,-1.949 l 0.458,-0.277 h 1.098 c 1.8,0 3.552,0.372 5.213,1.036 z m -18.632,-7.389 c 0.119,0.037 2.028,0.621 4.798,0.621 1.433,0 3.096,-0.156 4.859,-0.625 0.475,-0.156 0.934,-0.34 1.385,-0.538 v 5.331 l -0.215,0.13 a 11.397,11.397 0 0 1 -11.796,0.03 l -0.271,-0.163 v -5.256 c 0.404,0.172 0.816,0.33 1.24,0.47 z m 22.583,-1.818 c -1.528,0.98 -4.697,2.462 -9.541,2.425 v -2.2 a 15.417,15.417 0 0 0 5.551,-6.05 c 0.735,1.857 2.012,4.34 3.99,5.825 z M 39.9,4.2671717 37.934,10.567172 C 33.78,9.2501717 30.085,8.7981717 26.971,8.7981717 c -4.819,0 -8.25,1.082 -9.84,1.7130003 L 14.454,4.2211717 c 3.088,-1.135 13.652,-4.31300004 25.446,0.046 z m -4.015,7.7830003 c -7.056,2.987 -13.563,1.185 -16.733,-0.107 2.96,-0.908 8.909,-2.0280003 16.733,0.107 z m -19.023,1.064 c 2.655,1.354 11.649,5.122 21.469,-0.002 a 13.453,13.453 0 0 1 2.729,8.113 c 0,5.823 -3.719,10.96 -9.197,12.765 -4.535,1.206 -8.454,0.023 -8.477,0.017 a 13.432,13.432 0 0 1 -9.253,-12.78 c 0,-2.93 0.964,-5.78 2.729,-8.113 z m -6.996,20.973 c 1.965,-1.479 3.238,-3.942 3.973,-5.794 a 15.417,15.417 0 0 0 5.695,6.118 v 2.107 c -4.899,0.057 -8.114,-1.443 -9.668,-2.43 z"
+     fill="#111111"
+     id="path8" />
+  <circle
+     cx="23.5"
+     cy="20.562172"
+     r="1.5"
+     fill="#111111"
+     id="circle10" />
+  <path
+     stroke="#111111"
+     stroke-width="2"
+     stroke-linecap="round"
+     d="m 31.728,20.849172 2.059,-0.515"
+     id="path12" />
+  <path
+     d="m 25,27.562172 c 2.525,1.423 3.832,1.34 6,0"
+     stroke="#111111"
+     stroke-width="1.8"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path14" />
+</svg>

src/images/pirate.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="54"
+   height="71.234001"
+   fill="none"
+   version="1.1"
+   id="svg52"
+   sodipodi:docname="crew.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs56" />
+  <sodipodi:namedview
+     id="namedview54"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" />
+  <path
+     d="m 54,6.894 v -1.15 h -3.447 c -3.804,0 -7.127,2.071 -8.922,5.14 C 39.461,4.562 33.473,0 26.426,0 17.556,0 10.34,7.215 10.34,16.085 v 8.043 c 0,1.547 0.622,2.948 1.62,3.982 a 3.44,3.44 0 0 0 -1.62,2.911 c 0,1.9 1.547,3.447 3.447,3.447 1.301,0 2.421,-0.732 3.008,-1.798 0.46,0.705 0.991,1.36 1.588,1.946 V 38.11 L 8.434,39.976 A 10.346,10.346 0 0 0 0,50.14 V 71.234 H 52.851 V 50.14 c 0,-4.972 -3.547,-9.247 -8.434,-10.164 L 34.468,38.11 v -3.494 a 11.515,11.515 0 0 0 2.938,-4.81 c 2.863,-0.32 5.105,-2.73 5.105,-5.678 V 22.57 a 10.32,10.32 0 0 0 8.042,3.855 H 54 V 25.277 C 54,21.275 51.71,17.803 48.375,16.085 51.71,14.367 54,10.895 54,6.894 Z M 34.99,29.737 a 17.529,17.529 0 0 1 -2.018,-3.129 4.467,4.467 0 0 0 -4.014,-2.48 c -0.917,0 -1.793,0.272 -2.532,0.78 a 4.464,4.464 0 0 0 -2.533,-0.78 c -1.709,0 -3.247,0.95 -4.014,2.481 a 17.532,17.532 0 0 1 -2.018,3.129 9.142,9.142 0 0 1 -0.627,-3.313 v -9.191 h 2 l 8.452,4.696 c 1.053,1.328 2.662,2.198 4.484,2.198 1.299,0 2.484,-0.45 3.447,-1.18 v 3.477 a 9.11,9.11 0 0 1 -0.627,3.312 z m -8.564,5.88 c -3.022,0 -5.7,-1.473 -7.377,-3.732 a 19.883,19.883 0 0 0 2.885,-4.249 2.18,2.18 0 0 1 1.959,-1.21 c 0.586,0 1.135,0.227 1.549,0.64 l 0.984,0.988 0.982,-0.986 a 2.176,2.176 0 0 1 1.55,-0.641 2.18,2.18 0 0 1 1.959,1.21 19.894,19.894 0 0 0 2.885,4.25 c -1.677,2.257 -4.355,3.73 -7.376,3.73 z M 13.085,12.638 h 26.681 c 0.193,0.745 0.334,1.51 0.4,2.298 H 12.685 c 0.066,-0.788 0.207,-1.553 0.4,-2.298 z M 37.607,8.043 c 0.517,0.717 0.964,1.486 1.337,2.297 H 13.907 c 0.373,-0.81 0.82,-1.58 1.337,-2.297 z m -11.181,9.191 v 1.149 c 0,0.08 0.02,0.153 0.023,0.23 l -2.484,-1.379 z m 5.744,4.596 a 3.451,3.451 0 0 1 -3.447,-3.447 v -1.149 h 6.894 v 1.149 A 3.45,3.45 0 0 1 32.17,21.83 Z m 5.745,-3.447 v -1.149 h 2.298 v 2.328 A 5.688,5.688 0 0 0 37.915,18.5 Z M 35.518,5.745 H 17.333 a 13.716,13.716 0 0 1 18.185,0 z M 14.936,17.234 v 1.265 a 5.71,5.71 0 0 0 -2.298,1.062 v -2.327 z m 0,3.658 v 5.533 c 0,0.322 0.022,0.638 0.048,0.953 -1.359,-0.462 -2.346,-1.737 -2.346,-3.25 0,-1.496 0.964,-2.76 2.298,-3.236 z M 13.787,32.17 a 1.15,1.15 0 0 1 -1.149,-1.149 1.15,1.15 0 0 1 1.149,-1.149 1.15,1.15 0 0 1 1.149,1.15 1.15,1.15 0 0 1 -1.149,1.148 z m 5.169,8.171 c 0.375,0.576 0.987,1.388 1.842,2.17 H 20.681 V 68.936 H 13.787 V 55.962 A 33.98,33.98 0 0 0 10.701,41.888 Z M 29.872,65.489 28.34,64.34 29.872,63.191 Z m -6.893,-10.34 1.532,1.149 -1.532,1.149 z m 0,8.042 1.532,1.149 -1.532,1.149 z m 0,-2.872 3.447,-2.586 3.446,2.585 v 0.001 l -3.446,2.585 z m 6.893,-2.872 -1.532,-1.15 1.532,-1.148 z m 0,-8.043 -1.532,-1.149 1.532,-1.149 z m 0,2.873 -3.446,2.586 -3.447,-2.585 v -10e-4 l 3.447,-2.585 z m -6.893,-2.873 v -2.298 l 1.532,1.15 z m 0,18.958 3.447,-2.585 3.446,2.585 v 0.574 h -6.893 z m 6.893,-24.128 -3.446,2.585 -3.447,-2.585 v -0.22 c 0.982,0.477 2.13,0.794 3.447,0.794 a 7.81,7.81 0 0 0 3.446,-0.793 z m -27.509,5.17 h 8.42 c 0.323,1.515 0.543,3.05 0.641,4.596 H 2.298 v -3.86 c 0,-0.25 0.042,-0.491 0.065,-0.736 z m 9.126,6.894 v 4.596 H 2.298 V 56.298 Z M 8.391,42.365 a 31.552,31.552 0 0 1 1.82,4.741 H 2.913 A 8.017,8.017 0 0 1 8.391,42.365 Z M 2.298,63.191 h 9.191 v 5.745 H 2.298 Z M 42.069,49.404 h 8.42 c 0.022,0.245 0.064,0.485 0.064,0.736 V 54 h -9.126 c 0.098,-1.545 0.318,-3.081 0.642,-4.596 z m -0.707,6.894 h 9.191 v 4.596 h -9.191 z m 0,12.638 v -5.745 h 9.191 v 5.745 z m 8.577,-21.83 H 42.64 a 31.602,31.602 0 0 1 1.82,-4.741 8.02,8.02 0 0 1 5.479,4.741 z M 42.15,41.888 A 33.98,33.98 0 0 0 39.064,55.962 V 68.936 H 32.17 V 42.511 h -0.117 a 11.536,11.536 0 0 0 1.842,-2.17 z m -9.98,-3.124 c -0.488,0.824 -2.453,3.747 -5.744,3.747 -3.292,0 -5.257,-2.923 -5.745,-3.747 V 36.36 a 11.405,11.405 0 0 0 5.745,1.555 c 2.093,0 4.052,-0.572 5.744,-1.555 z m 5.697,-11.386 c 0.026,-0.315 0.048,-0.63 0.048,-0.953 v -5.533 a 3.442,3.442 0 0 1 2.298,3.236 c 0,1.513 -0.987,2.788 -2.346,3.25 z m 13.754,-3.25 h -1.068 c -4.045,0 -7.401,-3.001 -7.961,-6.894 h 1.068 c 4.045,0 7.401,3.001 7.961,6.894 z M 43.66,14.936 h -1.068 c 0.559,-3.892 3.916,-6.893 7.961,-6.893 h 1.068 c -0.56,3.892 -3.916,6.893 -7.961,6.893 z"
+     fill="#111111"
+     id="path16" />
+  <path
+     d="m 20.681,21.83 a 1.15,1.15 0 1 0 0,-2.3 1.15,1.15 0 0 0 0,2.3 z m 5.745,9.192 A 2.3,2.3 0 0 1 24.128,28.724 H 21.83 a 4.6,4.6 0 0 0 4.596,4.595 4.6,4.6 0 0 0 4.595,-4.595 h -2.298 a 2.3,2.3 0 0 1 -2.297,2.297 z"
+     fill="#111111"
+     id="path18" />
+</svg>