From 72e34198453eea4c60a476e290f3bccad80400f8 Mon Sep 17 00:00:00 2001 From: Achim Friedland Date: Mon, 15 Apr 2024 03:49:02 +0200 Subject: [PATCH] Serve i18n.json and package.json via dev server --- html/css/chargy.css | 81 +++------------------------------ html/css/chargy.css.map | 2 +- html/css/chargy.scss | 2 +- i18n.json => html/i18n.json | 0 src/ts/chargyApp.ts | 91 ++++++++++++++++++++++--------------- webpack.config.cjs | 8 ++++ 6 files changed, 71 insertions(+), 113 deletions(-) rename i18n.json => html/i18n.json (100%) diff --git a/html/css/chargy.css b/html/css/chargy.css index ed4582c..63d68aa 100644 --- a/html/css/chargy.css +++ b/html/css/chargy.css @@ -1405,28 +1405,25 @@ body .fullScreen { body #app { background-color: #ffffff; } +body #app #headline #logo { + background-image: url("../images/chargeIT-logo.jpg"); +} body #app #headline #windowButtons button:hover { color: #b7b7b7; } body #app #verifyframe #leftbar #input { - background-color: #e2e2e2; + background-color: #f1f1f1; } body #app #verifyframe #leftbar #input #inputInfos #buttonsDiv button { color: #3a1d27; - background-color: #d6e5e1; + background: radial-gradient(farthest-corner at 39px 40px, #fbd789 0%, #ed9828 35%, #CC0B12 70%); } body #app #verifyframe #leftbar #input #inputInfos #buttonsDiv button i { font-size: 120%; } body #app #verifyframe #leftbar #input #inputInfos #buttonsDiv button:hover { color: #ffffff; - background-color: #5b9787; -} -body #app #verifyframe #leftbar #input #chargingSessionScreen #chargingSessions .chargingSession { - background-color: #e9e9e9; -} -body #app #verifyframe #leftbar #input #chargingSessionScreen #chargingSessions .activated { - background-color: #d6e5e1; + background: radial-gradient(farthest-corner at 39px 40px, #f9e8c2 0%, #ebad5c 40%, #ed4f54 80%); } body #app #verifyframe #leftbar #input #chargingSessionReport #chargingSessions .chargingSessions { background-color: #dbdbdb; @@ -1434,81 +1431,17 @@ body #app #verifyframe #leftbar #input #chargingSessionReport #chargingSessions body #app #verifyframe #leftbar #input #chargingSessionReport #chargingSessions .activated { background-color: #c4c4c4; } -body #app #verifyframe #leftbar #input #inputButtons #backButton { - color: #888888; -} -body #app #verifyframe #leftbar #input #inputButtons #backButton:hover { - color: #000000; -} -body #app #verifyframe #leftbar #input #inputButtons #exportButtonDiv #exportButton { - color: #aaaaaa; -} -body #app #verifyframe #leftbar #input #inputButtons #exportButtonDiv #exportButton:hover { - color: #000000; -} -body #app #verifyframe #leftbar #input #aboutScreen .linkButton { - background-color: #e2e2e2; - font-weight: bold; -} -body #app #verifyframe #leftbar #input #aboutScreen .linkButton:hover { - color: #777777; - background-color: #e9e9e9; -} -body #app #verifyframe #leftbar #input #aboutScreen #TOSP a { - color: #444444; -} body #app #verifyframe #rightbar { - background-color: #e2e2e2; -} -body #app #verifyframe #rightbar #detailedInfos { - color: #000000; -} -body #app #verifyframe #rightbar #detailedInfos .headline { - color: #000000; -} -body #app #verifyframe #rightbar #detailedInfos .energyMeterInfos .meterManufacturer .meterManufacturerValue a { - color: #444444; -} -body #app #verifyframe #rightbar #detailedInfos .energyMeterInfos .meterModel .meterModelValue a { - color: #444444; -} -body #app #verifyframe #rightbar #detailedInfos .measurementValues .measurementValue:hover { - background-color: #aaaaaa; + background-color: #f1f1f1; } body #app #verifyframe #rightbar #feedback { - display: none; color: #34668a; } body #app #verifyframe #rightbar #feedback #feedbackMethods button:hover, body #app #verifyframe #rightbar #feedback #feedbackMethods a:hover { color: #c40546; } -body #app #overlay #overlayText { - background-color: #e2e2e2; - border: 20px solid #e2e2e2; -} -body #app #overlay #overlayText .infoblock .description { - background-color: #e2e2e2; - font-weight: bold; -} -body #app #overlay #overlayText .infoblock .value { - background-color: #d0d0d0; -} -body #app #overlay #overlayText .footer #overlayLeftButton { - color: #888888; -} -body #app #overlay #overlayText .footer #overlayLeftButton:hover { - color: #000000; -} body #app #issueTracker { display: none; } -.fa-check-circle { - color: #85b4a9; -} - -.leaflet-container a { - color: #444444; -} - /*# sourceMappingURL=chargy.css.map */ diff --git a/html/css/chargy.css.map b/html/css/chargy.css.map index f64e492..57fc204 100644 --- a/html/css/chargy.css.map +++ b/html/css/chargy.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["chargy.scss","_custom_Lichtblick.scss"],"names":[],"mappings":";AAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBD;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAGJ;EACI;;AAOZ;EAEI;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAKR;EACI;EACA;;AAGJ;EACI;;AAKR;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAShB;EAEI;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;;AAEA;EACI;;AAEJ;EACI;;AAKR;EAEI;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAOZ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;;AAEA;EAGI;;AAOZ;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAKR;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;;AAKR;EAEI;EACA;;AAEA;EACI;;AAWpB;EACI;;AAIJ;EAEI;EACA;EACA;EACA;;AAEA;EAEI;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;;AAGJ;EACI;;AAKR;EACI;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;;AAOJ;EAEI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAKR;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAOZ;EACI;EACA;;AAGJ;EAEI;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAQZ;EACI;EACA;;AAGJ;EAEI;;AAEA;EAEI;EACA;;AAEA;EAEI;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAmBpC;EACI;;AAIJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EAEI;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EAEI;EACA;;AAII;EAEI;EACA;;AAEA;EACI;;AAGJ;EACI;;AAaxB;EAEI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAOZ;EACI;;AAGJ;EACI;;AAKR;EACI;;AAKR;EAEI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;;AAGJ;EACI;;AAapB;EAEI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAKR;EACI;;AAShB;EACI;;AAGJ;EACI;;AAKR;EACI;;AAGJ;EAEI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;;AAEA;EACI;;AAGJ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AACA;EACI;EACA;;AAMZ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AACA;EACI;EACA;;AAMZ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAOZ;EAEI;;AAEA;EACI;EACA;;AAGJ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AACA;EACI;EACA;;AAMZ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AACA;EACI;EACA;;AAMZ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AASR;EACI;EACA;;AAGJ;EAEI;;AAEA;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAShB;EAEI;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAOZ;EACI;;AAIA;EACI;;AAQhB;EACI;;AAGJ;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAIA;EACI;EACA;;AAKJ;EACI;EACA;EACA;;AAUpB;EACI;;AAKR;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAII;EACI;;AAGJ;EAEI;EACA;;AAEA;EACI;;AASR;EAEI;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;;AAOZ;EACI;;AAGJ;EACI;;AAKR;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAKR;EAEI;;AAEA;EACI;;AAGJ;EACI;;AASA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EAEI;;AAEA;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAYR;EACI;;AAIR;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAShB;EACI;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;;AAKR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAOZ;EACI;;AAKR;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EAEI;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAIA;EACI;EACA;;AAMZ;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;AAAA;EAEI;EACA;;AAaR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAOZ;EACI;;AAOZ;EACI;EACA;EACA;;;AAKR;EACI;EACA;EACA;EACA;;;AAIJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;ACz4DH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAmBG;EAEI;;AAWQ;EACI;;AASJ;EAEI;;AAKQ;EAEI;EAEA;;AAEA;EACI;;AAKR;EACI;EAEA;;AASJ;EACI;;AAGJ;EACI;;AASJ;EACI;;AAGJ;EACI;;AAQR;EACI;;AAGJ;EACI;;AAKA;EACI;;AAGJ;EACI;;AASR;EACI;EACA;;AAGJ;EACI;EACA;;AAIA;EACI;;AASpB;EAEI;;AAKA;EAEI;;AAEA;EACI;;AAOQ;EACI;;AAOJ;EACI;;AAQZ;EACI;;AAMZ;EAEI;EACA;;AAGI;EACI;;AAWhB;EAEI;EACA;;AAII;EACI;EACA;;AAGJ;EACI;;AAOJ;EACI;;AAGJ;EACI;;AAQhB;EACI;;;AAOZ;EACI;;;AAGJ;EACI","file":"chargy.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["chargy.scss","_custom.scss"],"names":[],"mappings":";AAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBD;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAGJ;EACI;;AAOZ;EAEI;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAKR;EACI;EACA;;AAGJ;EACI;;AAKR;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAShB;EAEI;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;;AAEA;EACI;;AAEJ;EACI;;AAKR;EAEI;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAOZ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;;AAEA;EAGI;;AAOZ;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAKR;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;;AAKR;EAEI;EACA;;AAEA;EACI;;AAWpB;EACI;;AAIJ;EAEI;EACA;EACA;EACA;;AAEA;EAEI;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;;AAGJ;EACI;;AAKR;EACI;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;;AAOJ;EAEI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAKR;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAOZ;EACI;EACA;;AAGJ;EAEI;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAQZ;EACI;EACA;;AAGJ;EAEI;;AAEA;EAEI;EACA;;AAEA;EAEI;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAmBpC;EACI;;AAIJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EAEI;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EAEI;EACA;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EAEI;EACA;;AAII;EAEI;EACA;;AAEA;EACI;;AAGJ;EACI;;AAaxB;EAEI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAOZ;EACI;;AAGJ;EACI;;AAKR;EACI;;AAKR;EAEI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;;AAGJ;EACI;;AAapB;EAEI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EAEI;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAKR;EACI;;AAShB;EACI;;AAGJ;EACI;;AAKR;EACI;;AAGJ;EAEI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EAEI;;AAEA;EACI;;AAGJ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AACA;EACI;EACA;;AAMZ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AACA;EACI;EACA;;AAMZ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAOZ;EAEI;;AAEA;EACI;EACA;;AAGJ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AACA;EACI;EACA;;AAMZ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AACA;EACI;EACA;;AAMZ;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAKR;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AASR;EACI;EACA;;AAGJ;EAEI;;AAEA;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAShB;EAEI;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAOZ;EACI;;AAIA;EACI;;AAQhB;EACI;;AAGJ;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAIA;EACI;EACA;;AAKJ;EACI;EACA;EACA;;AAUpB;EACI;;AAKR;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAII;EACI;;AAGJ;EAEI;EACA;;AAEA;EACI;;AASR;EAEI;EACA;;AAEA;EAEI;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;;AAOZ;EACI;;AAGJ;EACI;;AAKR;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAKR;EAEI;;AAEA;EACI;;AAGJ;EACI;;AASA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EAEI;;AAEA;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAYR;EACI;;AAIR;EACI;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAShB;EACI;EACA;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EAEI;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;;AAKR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAOZ;EACI;;AAKR;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EAEI;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAIA;EACI;EACA;;AAMZ;EAEI;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;AAAA;EAEI;EACA;;AAaR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAOZ;EACI;;AAOZ;EACI;EACA;EACA;;;AAKR;EACI;EACA;EACA;EACA;;;AAIJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;ACz4DH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAmBG;EAEI;;AAII;EAEI;;AAKA;EACI;;AASJ;EAEI;;AAKQ;EAEI;EACA;;AAEA;EACI;;AAKR;EACI;EACA;;AASJ;EACI;;AAGJ;EACI;;AASpB;EAEI;;AAKA;EAEI;;AAGI;EACI;;AAUpB;EACI","file":"chargy.css"} \ No newline at end of file diff --git a/html/css/chargy.scss b/html/css/chargy.scss index 470bb79..437929a 100644 --- a/html/css/chargy.scss +++ b/html/css/chargy.scss @@ -1930,4 +1930,4 @@ body { color: #c38029; } -@import 'custom_Lichtblick'; +@import 'custom'; diff --git a/i18n.json b/html/i18n.json similarity index 100% rename from i18n.json rename to html/i18n.json diff --git a/src/ts/chargyApp.ts b/src/ts/chargyApp.ts index 756aa3a..67e4328 100644 --- a/src/ts/chargyApp.ts +++ b/src/ts/chargyApp.ts @@ -178,6 +178,7 @@ export class ChargyApp { this.defaultFeedbackHotline = feedbackHotline != undefined ? feedbackHotline : ["+491728930852", "+49 172 8930852"]; this.loadI18n(); + this.loadPackageJSON(); this.elliptic = require('elliptic'); this.moment = require('moment'); @@ -203,43 +204,6 @@ export class ChargyApp { //#endregion - //#region Set infos of the about section - - (this.softwareInfosDiv. querySelector("#appEdition") as HTMLSpanElement).innerHTML = this.appEdition; - (this.softwareInfosDiv. querySelector("#appVersion") as HTMLSpanElement).innerHTML = this.appVersion; - (this.softwareInfosDiv. querySelector("#copyright") as HTMLSpanElement).innerHTML = this.copyright; - - (this.openSourceLibsDiv.querySelector("#chargyVersion") as HTMLSpanElement).innerHTML = this.appVersion; - - if (this.packageJson.devDependencies) - { - (this.openSourceLibsDiv.querySelector("#electronBuilder") as HTMLSpanElement).innerHTML = this.packageJson.devDependencies["electron-builder"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#electronLocalShortcut") as HTMLSpanElement).innerHTML = this.packageJson.devDependencies["electron-localshortcut"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#SASS") as HTMLSpanElement).innerHTML = this.packageJson.devDependencies["sass"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#typeScript") as HTMLSpanElement).innerHTML = this.packageJson.devDependencies["typescript"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#webpack") as HTMLSpanElement).innerHTML = this.packageJson.devDependencies["webpack"]?. replace(/[^0-9\.]/g, ""); - } - - if (this.packageJson.dependencies) - { - (this.openSourceLibsDiv.querySelector("#elliptic") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["elliptic"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#momentJS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["moment"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#pdfjsdist") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["pdfjs-dist"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#decompress") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["decompress"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#decompressBZIP2") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["decompress-bzip2"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#decompressGZ") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["decompress-gz"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#fileType") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["file-type"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#asn1JS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["asn1.js"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#base32Decode") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["base32-decode"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#safeStableStringify") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["safe-stable-stringify"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#leafletJS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["leaflet"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#leafletAwesomeMarkers") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["leaflet.awesome-markers"]?.replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#chartJS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["chart.js"]?. replace(/[^0-9\.]/g, ""); - (this.openSourceLibsDiv.querySelector("#decimalJS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["decimal.js"]?. replace(/[^0-9\.]/g, ""); - } - - //#endregion - //#region Set infos of the feedback section this.UpdateFeedbackSection(); @@ -649,6 +613,59 @@ export class ChargyApp { } } + private async loadPackageJSON() { + try { + + const response = await fetch('package.json'); + + if (!response.ok) + throw new Error('Network response was not ok'); + + const data = await response.json(); + Object.assign(this.packageJson, data); + + //#region Set infos of the about section + + (this.softwareInfosDiv. querySelector("#appEdition") as HTMLSpanElement).innerHTML = this.appEdition; + (this.softwareInfosDiv. querySelector("#appVersion") as HTMLSpanElement).innerHTML = this.appVersion; + (this.softwareInfosDiv. querySelector("#copyright") as HTMLSpanElement).innerHTML = this.copyright; + + (this.openSourceLibsDiv.querySelector("#chargyVersion") as HTMLSpanElement).innerHTML = this.appVersion; + + if (this.packageJson.devDependencies) + { + (this.openSourceLibsDiv.querySelector("#SASS") as HTMLSpanElement).innerHTML = this.packageJson.devDependencies["sass"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#typeScript") as HTMLSpanElement).innerHTML = this.packageJson.devDependencies["typescript"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#webpack") as HTMLSpanElement).innerHTML = this.packageJson.devDependencies["webpack"]?. replace(/[^0-9\.]/g, ""); + } + + if (this.packageJson.dependencies) + { + (this.openSourceLibsDiv.querySelector("#elliptic") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["elliptic"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#momentJS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["moment"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#pdfjsdist") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["pdfjs-dist"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#decompress") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["decompress"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#decompressBZIP2") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["decompress-bzip2"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#decompressGZ") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["decompress-gz"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#fileType") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["file-type"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#asn1JS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["asn1.js"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#base32Decode") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["base32-decode"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#safeStableStringify") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["safe-stable-stringify"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#leafletJS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["leaflet"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#leafletAwesomeMarkers") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["leaflet.awesome-markers"]?.replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#chartJS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["chart.js"]?. replace(/[^0-9\.]/g, ""); + (this.openSourceLibsDiv.querySelector("#decimalJS") as HTMLSpanElement).innerHTML = this.packageJson.dependencies ["decimal.js"]?. replace(/[^0-9\.]/g, ""); + } + + //#endregion + + + + } catch (error) { + console.error('There has been a problem with fetching "package.json":', error); + } + } + //#region UpdateFeedbackSection() diff --git a/webpack.config.cjs b/webpack.config.cjs index 88e7af3..3454a07 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -59,6 +59,14 @@ module.exports = { { from: path.resolve(__dirname, 'html/webfonts'), to: path.resolve(__dirname, 'build/webfonts') + }, + { + from: path.resolve(__dirname, 'html/i18n.json'), + to: path.resolve(__dirname, 'build/i18n.json') + }, + { + from: path.resolve(__dirname, 'package.json'), + to: path.resolve(__dirname, 'build/package.json') } ] })