From 931f59032a632cbc40daf28f6c7b0aff3f6489a1 Mon Sep 17 00:00:00 2001 From: build-pipeline <build-token> Date: Fri, 20 Oct 2023 12:40:13 +0000 Subject: [PATCH] publish: chore(options): remove weird padding generated from commit 17c694c1aa190682e3426fdff116811c3bb59946 --- ...dac8.js => ecolyo.41a3c918854f721cafd9.js} | 69 ++++++++++--------- ...a349.js => ecolyo.032d8ae6ec6ab5f5079f.js} | 2 +- index.html | 2 +- 3 files changed, 38 insertions(+), 35 deletions(-) rename 5/{ecolyo.e91ba98547f78b53dac8.js => ecolyo.41a3c918854f721cafd9.js} (98%) rename app/{ecolyo.ba12aad74d8c630da349.js => ecolyo.032d8ae6ec6ab5f5079f.js} (99%) diff --git a/5/ecolyo.e91ba98547f78b53dac8.js b/5/ecolyo.41a3c918854f721cafd9.js similarity index 98% rename from 5/ecolyo.e91ba98547f78b53dac8.js rename to 5/ecolyo.41a3c918854f721cafd9.js index 762781e92..5a255ead5 100644 --- a/5/ecolyo.e91ba98547f78b53dac8.js +++ b/5/ecolyo.41a3c918854f721cafd9.js @@ -583,7 +583,7 @@ var ExportData = function ExportData() { setIsExportStartModal(false); setIsExportLoadingModal(true); } - }), isExportLoadingModal && /*#__PURE__*/_react.default.createElement(_exportLoadingModal.default, { + }), /*#__PURE__*/_react.default.createElement(_exportLoadingModal.default, { open: isExportLoadingModal, handleCloseClick: function handleCloseClick() { setIsExportLoadingModal(false); @@ -692,7 +692,7 @@ var LegalNoticeLink = function LegalNoticeLink() { component: _reactRouterDom.Link, to: "/options/legalnotice" }, /*#__PURE__*/_react.default.createElement("div", { - className: "card optionCard", + className: "card", onClick: emitNavEvent }, /*#__PURE__*/_react.default.createElement("div", { className: "legal-notice-card" @@ -1319,7 +1319,7 @@ var GCULink = function GCULink() { component: _reactRouterDom.Link, to: "/options/gcu" }, /*#__PURE__*/_react.default.createElement("div", { - className: "card optionCard" + className: "card" }, /*#__PURE__*/_react.default.createElement("div", { className: "gcu-link-card" }, /*#__PURE__*/_react.default.createElement("div", { @@ -1752,7 +1752,7 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE exports = module.exports = __webpack_require__("JPst")(false); // Module -exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.gcu-link-root {\n display: flex;\n flex-direction: column;\n align-items: center;\n justify-content: center;\n color: #ffffff;\n padding: 0 1.5rem 0;\n margin-top: 0.5rem;\n}\n.gcu-link-root .gcu-link-header {\n margin-bottom: 1.25rem;\n}\n.gcu-link-root .gcu-link-content {\n width: 45.75rem;\n}\n.gcu-link-root .gcu-link-content p {\n color: #ffffff;\n}\n.gcu-link-root .gcu-link-content a {\n color: #ffffff;\n text-decoration: none;\n}\n.gcu-link-root .gcu-link-content li {\n margin: 1rem 0;\n}\n.gcu-link-root .gcu-link-content h2 {\n color: #ffffff;\n}\n.gcu-link-root .gcu-link-content h3 {\n color: #ffffff;\n margin: 2.5rem 0 1rem;\n}\n.gcu-link-root .gcu-link-content .ln-contact {\n color: #e3b82a;\n}\n@media only screen and (max-width : 768px) {\n .gcu-link-root .gcu-link-content {\n width: 100%;\n }\n}\n\n.optionCard {\n padding: 0.938rem 1rem;\n}\n\n.gcu-link-card-link {\n color: black;\n}\n\n.gcu-link-card {\n display: flex;\n flex-direction: row;\n margin: -0.75rem 0;\n width: 100%;\n}\n@media only screen and (max-width : 768px) {\n .gcu-link-card {\n width: 100%;\n }\n}\n.gcu-link-card .gcu-link-card-content {\n display: flex;\n flex-direction: row;\n}\n.gcu-link-card .gcu-link-card-content .gcu-link-card-content-icon {\n margin: 0.5rem 0;\n}\n.gcu-link-card .gcu-link-card-content .gcu-link-card-content-title {\n margin: 0 1rem;\n align-self: center;\n}", ""]); +exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.gcu-link-root {\n display: flex;\n flex-direction: column;\n align-items: center;\n justify-content: center;\n color: #ffffff;\n padding: 0 1.5rem 0;\n margin-top: 0.5rem;\n}\n.gcu-link-root .gcu-link-header {\n margin-bottom: 1.25rem;\n}\n.gcu-link-root .gcu-link-content {\n width: 45.75rem;\n}\n.gcu-link-root .gcu-link-content p {\n color: #ffffff;\n}\n.gcu-link-root .gcu-link-content a {\n color: #ffffff;\n text-decoration: none;\n}\n.gcu-link-root .gcu-link-content li {\n margin: 1rem 0;\n}\n.gcu-link-root .gcu-link-content h2 {\n color: #ffffff;\n}\n.gcu-link-root .gcu-link-content h3 {\n color: #ffffff;\n margin: 2.5rem 0 1rem;\n}\n.gcu-link-root .gcu-link-content .ln-contact {\n color: #e3b82a;\n}\n@media only screen and (max-width : 768px) {\n .gcu-link-root .gcu-link-content {\n width: 100%;\n }\n}\n\n.gcu-link-card-link {\n color: black;\n}\n\n.gcu-link-card {\n display: flex;\n flex-direction: row;\n margin: -0.75rem 0;\n width: 100%;\n}\n@media only screen and (max-width : 768px) {\n .gcu-link-card {\n width: 100%;\n }\n}\n.gcu-link-card .gcu-link-card-content {\n display: flex;\n flex-direction: row;\n}\n.gcu-link-card .gcu-link-card-content .gcu-link-card-content-icon {\n margin: 0.5rem 0;\n}\n.gcu-link-card .gcu-link-card-content .gcu-link-card-content-title {\n margin: 0 1rem;\n align-self: center;\n}", ""]); @@ -1779,28 +1779,30 @@ var _core = __webpack_require__("TTf+"); var _Dialog = _interopRequireDefault(__webpack_require__("HhgX")); -var _cozyClient = __webpack_require__("SH7X"); +var Sentry = _interopRequireWildcard(__webpack_require__("agHs")); -var _I18n = __webpack_require__("buk/"); +var _close = _interopRequireDefault(__webpack_require__("aodS")); -var _Icon = _interopRequireDefault(__webpack_require__("y6ex")); +var _Loader = _interopRequireDefault(__webpack_require__("Ra/y")); -var _fileSaver = _interopRequireDefault(__webpack_require__("Iab2")); +var _cozyClient = __webpack_require__("SH7X"); -var _react = _interopRequireWildcard(__webpack_require__("q1tI")); +var _I18n = __webpack_require__("buk/"); -var XLSX = _interopRequireWildcard(__webpack_require__("JcrP")); +var _Icon = _interopRequireDefault(__webpack_require__("y6ex")); -var _close = _interopRequireDefault(__webpack_require__("aodS")); +var _enums = __webpack_require__("gnxY"); -var _Loader = _interopRequireDefault(__webpack_require__("Ra/y")); +var _fileSaver = _interopRequireDefault(__webpack_require__("Iab2")); -var _enums = __webpack_require__("gnxY"); +var _react2 = _interopRequireWildcard(__webpack_require__("q1tI")); var _consumption = _interopRequireDefault(__webpack_require__("AVq/")); var _enedisMonthlyAnalysisData = _interopRequireDefault(__webpack_require__("GrKv")); +var XLSX = _interopRequireWildcard(__webpack_require__("JcrP")); + __webpack_require__("HYZs"); function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); } @@ -1855,7 +1857,7 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) { _fileSaver.default.saveAs(data, fileName + fileExtension); }; - var buildDataRow = (0, _react.useCallback)( /*#__PURE__*/function () { + var buildDataRow = (0, _react2.useCallback)( /*#__PURE__*/function () { var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(dataload, fluidType) { var dataRow, emas, maxPowerEntities, maxLoad; return _regenerator.default.wrap(function _callee$(_context) { @@ -1905,7 +1907,7 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) { return _ref2.apply(this, arguments); }; }(), [client, t]); - var getExportDataSheet = (0, _react.useCallback)( /*#__PURE__*/function () { + var getExportDataSheet = (0, _react2.useCallback)( /*#__PURE__*/function () { var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(fluidType) { var consumptionService, firstDataDate, lastDataDate, timePeriod, dataLoad, exportDataSheet, _iterator2, _step2, data, dataRow; @@ -2019,7 +2021,7 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) { return _ref3.apply(this, arguments); }; }(), [buildDataRow, client, t]); - (0, _react.useEffect)(function () { + (0, _react2.useEffect)(function () { var subscribed = true; var date = new Date(); @@ -2088,15 +2090,16 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) { handleDone(); } - _context3.next = 29; + _context3.next = 30; break; case 26: _context3.prev = 26; _context3.t1 = _context3["catch"](0); + Sentry.captureException(_context3.t1); handleDone(_context3.t1); - case 29: + case 30: case "end": return _context3.stop(); } @@ -2109,15 +2112,15 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) { }; }(); - if (subscribed) { + if (subscribed && open) { exportData(); } return function () { subscribed = false; }; - }, [getExportDataSheet, handleDone, selectedFluids]); - return /*#__PURE__*/_react.default.createElement(_Dialog.default, { + }, [getExportDataSheet, handleDone, open, selectedFluids]); + return /*#__PURE__*/_react2.default.createElement(_Dialog.default, { open: open, onClose: function onClose(_event, reason) { if (reason !== 'backdropClick' && reason !== 'escapeKeyDown') { @@ -2129,28 +2132,28 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) { root: 'modal-root', paper: 'modal-paper' } - }, /*#__PURE__*/_react.default.createElement("div", { + }, /*#__PURE__*/_react2.default.createElement("div", { id: "accessibility-title" - }, t('export.modal_loading.accessibility_title')), /*#__PURE__*/_react.default.createElement("div", { + }, t('export.modal_loading.accessibility_title')), /*#__PURE__*/_react2.default.createElement("div", { className: "modal-loading-root" - }, /*#__PURE__*/_react.default.createElement("div", { + }, /*#__PURE__*/_react2.default.createElement("div", { onClick: handleCloseClick - }, /*#__PURE__*/_react.default.createElement(_core.IconButton, { + }, /*#__PURE__*/_react2.default.createElement(_core.IconButton, { "aria-label": t('export.button_close'), className: "modal-paper-close-button", onClick: handleCloseClick - }, /*#__PURE__*/_react.default.createElement(_Icon.default, { + }, /*#__PURE__*/_react2.default.createElement(_Icon.default, { icon: _close.default, size: 18 - }))), /*#__PURE__*/_react.default.createElement("div", { + }))), /*#__PURE__*/_react2.default.createElement("div", { className: "content" - }, /*#__PURE__*/_react.default.createElement("div", { + }, /*#__PURE__*/_react2.default.createElement("div", { className: "icon-main" - }, /*#__PURE__*/_react.default.createElement(_Loader.default, { + }, /*#__PURE__*/_react2.default.createElement(_Loader.default, { color: "gold" - })), /*#__PURE__*/_react.default.createElement("div", { + })), /*#__PURE__*/_react2.default.createElement("div", { className: "text-16-bold subtitle" - }, t('export.modal_loading.text1')), /*#__PURE__*/_react.default.createElement("div", null, t('export.modal_loading.text2')), /*#__PURE__*/_react.default.createElement(_core.Button, { + }, t('export.modal_loading.text1')), /*#__PURE__*/_react2.default.createElement("div", null, t('export.modal_loading.text2')), /*#__PURE__*/_react2.default.createElement(_core.Button, { "aria-label": t('export.modal_loading.button_cancel'), onClick: handleCloseClick, className: "btnSecondary" @@ -2292,7 +2295,7 @@ var HelpLink = function HelpLink() { }, t('help.title_help')), /*#__PURE__*/_react.default.createElement(_Link.default, { className: "help-card-link" }, /*#__PURE__*/_react.default.createElement("div", { - className: "card optionCard" + className: "card" }, /*#__PURE__*/_react.default.createElement("div", { className: "help-card" }, /*#__PURE__*/_react.default.createElement("div", { @@ -2441,7 +2444,7 @@ var Accessibility = function Accessibility() { href: "https://ecolyo.com/accessibilite.html", target: "_blank" }, /*#__PURE__*/_react.default.createElement("div", { - className: "card optionCard" + className: "card" }, /*#__PURE__*/_react.default.createElement("div", { className: "gcu-link-card" }, /*#__PURE__*/_react.default.createElement("div", { diff --git a/app/ecolyo.ba12aad74d8c630da349.js b/app/ecolyo.032d8ae6ec6ab5f5079f.js similarity index 99% rename from app/ecolyo.ba12aad74d8c630da349.js rename to app/ecolyo.032d8ae6ec6ab5f5079f.js index 658774332..34d7df55a 100644 --- a/app/ecolyo.ba12aad74d8c630da349.js +++ b/app/ecolyo.032d8ae6ec6ab5f5079f.js @@ -64,7 +64,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"b2c357869bd91528093e","2":"62e5292a592368584bc8","4":"e44f681829f74b9ff80d","5":"e91ba98547f78b53dac8","6":"3ac0fa971654da221f7f","7":"9376e18b72a7a8ccfe8c","8":"083c460749da3b2bb728","9":"559d36d928c393428876","10":"2946952809565809b75b"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"b2c357869bd91528093e","2":"62e5292a592368584bc8","4":"e44f681829f74b9ff80d","5":"41a3c918854f721cafd9","6":"3ac0fa971654da221f7f","7":"9376e18b72a7a8ccfe8c","8":"083c460749da3b2bb728","9":"559d36d928c393428876","10":"2946952809565809b75b"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function diff --git a/index.html b/index.html index 951a2c622..82d3775f7 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.fbf1f65c47dc10085503.js"></script><script src="app/ecolyo.ba12aad74d8c630da349.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.fbf1f65c47dc10085503.js"></script><script src="app/ecolyo.032d8ae6ec6ab5f5079f.js"></script></div></body></html> \ No newline at end of file -- GitLab