From 4d12898e9fcb140ae392f33bb2c547a31e3da92d Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Wed, 29 Mar 2023 14:02:54 +0000
Subject: [PATCH] publish: Merge branch '373-accessibilite-new-tab' into 'dev'
generated from commit 35a4fb49b4c495c3a60ff32cbc1aa14a855026ea
---
...ca7c.js => ecolyo.39d7b1099221e57244fe.js} | 3 +-
...96d9.js => ecolyo.77240ee4cc943d0af94e.js} | 31 ++++++++++++-------
index.html | 2 +-
3 files changed, 22 insertions(+), 14 deletions(-)
rename 4/{ecolyo.fd60d6605197e95bca7c.js => ecolyo.39d7b1099221e57244fe.js} (99%)
rename app/{ecolyo.a25b00e57c432ecc96d9.js => ecolyo.77240ee4cc943d0af94e.js} (99%)
diff --git a/4/ecolyo.fd60d6605197e95bca7c.js b/4/ecolyo.39d7b1099221e57244fe.js
similarity index 99%
rename from 4/ecolyo.fd60d6605197e95bca7c.js
rename to 4/ecolyo.39d7b1099221e57244fe.js
index ed6a58f46..298415a09 100644
--- a/4/ecolyo.fd60d6605197e95bca7c.js
+++ b/4/ecolyo.39d7b1099221e57244fe.js
@@ -2468,7 +2468,8 @@ var Accessibility = function Accessibility() {
className: "gcu-link-content"
}, /*#__PURE__*/_react.default.createElement(_Link.default, {
className: "gcu-link-card-link",
- href: "https://ecolyo.com/accessibilite.html"
+ href: "https://ecolyo.com/accessibilite.html",
+ target: "_blank"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "card optionCard"
}, /*#__PURE__*/_react.default.createElement("div", {
diff --git a/app/ecolyo.a25b00e57c432ecc96d9.js b/app/ecolyo.77240ee4cc943d0af94e.js
similarity index 99%
rename from app/ecolyo.a25b00e57c432ecc96d9.js
rename to app/ecolyo.77240ee4cc943d0af94e.js
index c9f723d70..3a26db2ec 100644
--- a/app/ecolyo.a25b00e57c432ecc96d9.js
+++ b/app/ecolyo.77240ee4cc943d0af94e.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"673e8ddd696663d6ffcf","4":"fd60d6605197e95bca7c","5":"82bfea9d56ce3943d256","6":"68590aa155e034150cca","7":"d2a6fc631880361b47a0","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"673e8ddd696663d6ffcf","4":"39d7b1099221e57244fe","5":"82bfea9d56ce3943d256","6":"68590aa155e034150cca","7":"d2a6fc631880361b47a0","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -6045,7 +6045,7 @@ var _water = _interopRequireDefault(__webpack_require__("4S84"));
var _fluid = __webpack_require__("5Wkc");
/**
- * Return an icon corresponding to FuildType enum
+ * Return an icon corresponding to FluidType enum
* @param type FluidType
*/
function getPicto(type) {
@@ -6069,7 +6069,7 @@ function getPicto(type) {
}
}
/**
- * Return an icon corresponding to add FuildType enum
+ * Return an icon corresponding to add FluidType enum
* @param type FluidType
*/
@@ -6105,32 +6105,39 @@ function getParamPicto(type) {
return _elecParam.default;
}
}
+
+var getIcon = function getIcon(active, connected, activeIcon, inactiveIcon) {
+ if (connected) {
+ return active ? activeIcon : inactiveIcon;
+ } else {
+ return active ? _disconnected.default : _disconnectedGrey.default;
+ }
+};
/**
- * Return an icon corresponding to FuildType enum
- * @param type FluidType
+ * Returns the appropriate icon for a given fluid type and connection status
*/
-function getNavPicto(type, active, connected) {
- switch (type) {
+function getNavPicto(fluidType, active, connected) {
+ switch (fluidType) {
case _fluid.FluidType.ELECTRICITY:
- return connected ? active ? _elecSmall.default : _elecGrey.default : active ? _disconnected.default : _disconnectedGrey.default;
+ return getIcon(active, connected, _elecSmall.default, _elecGrey.default);
case _fluid.FluidType.WATER:
- return connected ? active ? _waterSmall.default : _waterGrey.default : active ? _disconnected.default : _disconnectedGrey.default;
+ return getIcon(active, connected, _waterSmall.default, _waterGrey.default);
case _fluid.FluidType.GAS:
- return connected ? active ? _gasSmall.default : _gasGrey.default : active ? _disconnected.default : _disconnectedGrey.default;
+ return getIcon(active, connected, _gasSmall.default, _gasGrey.default);
case _fluid.FluidType.MULTIFLUID:
- return connected ? active ? _multi.default : _multiGrey.default : active ? _disconnected.default : _disconnectedGrey.default;
+ return getIcon(active, connected, _multi.default, _multiGrey.default);
default:
return _elec.default;
}
}
/**
- * Return an partner icon corresponding to FuildType enum
+ * Return an partner icon corresponding to FluidType enum
* @param slug string
* @param blackLogo boolean - define the color of the logo (black or white)
*/
diff --git a/index.html b/index.html
index 088357db3..85f07a03e 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.d332a37d84cf028b68a7.js"></script><script src="app/ecolyo.a25b00e57c432ecc96d9.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.d332a37d84cf028b68a7.js"></script><script src="app/ecolyo.77240ee4cc943d0af94e.js"></script></div></body></html>
\ No newline at end of file
--
GitLab