Fix: small UI improvements; formatting consistancy, typo, npm deps (e…

…vcc-io#3763)
riker158 · Jul 3, 2022 · 398ddd6 · 398ddd6
1 parent 22c7db9
commit 398ddd6
Show file tree

Hide file tree

Showing 9 changed files with 3,438 additions and 5,750 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,5 +14,7 @@ module.exports = {
   rules: {
     "vue/require-default-prop": "off",
     "vue/attribute-hyphenation": "off",
+    "vue/multi-word-component-names": "off",
+    "vue/no-reserved-component-names": "off",
   },
 };
diff --git a/assets/css/app.css b/assets/css/app.css
@@ -107,6 +107,10 @@ h4 {
 	background-color: var(--evcc-dark-green) !important;
 }
 
+.text-primary {
+	color: var(--bs-primary) !important;
+}
+
 a {
 	color: var(--bs-primary);
 }

diff --git a/assets/js/components/TargetSoCSelect.vue b/assets/js/components/TargetSoCSelect.vue
@@ -11,7 +11,7 @@
 			</label>
 
 			<span v-if="estimatedTargetRange" class="extraValue d-block d-sm-inline text-nowrap">
-				&nbsp;{{ estimatedTargetRange }}km
+				&nbsp;{{ estimatedTargetRange }} km
 			</span>
 		</h3>
 	</LabelAndValue>
@@ -36,7 +36,7 @@ export default {
 				let text = `${soc}%`;
 				const range = this.estimatedRange(soc);
 				if (range) {
-					text += ` (${range}km)`;
+					text += ` (${range} km)`;
 				}
 				result.push({ soc, text });
 			}

diff --git a/assets/js/i18n/de.js b/assets/js/i18n/de.js
@@ -31,7 +31,7 @@ export default {
       percentSelf: "{self} kWh Sonne",
       percentGrid: "{grid} kWh Netz",
       priceTitle: "Energiepreis",
-      priceFeedIn: "{feedInPrice} Einpeisung",
+      priceFeedIn: "{feedInPrice} Einspeisung",
       priceGrid: "{gridPrice} Netz",
       savingsTitle: "Ersparnis",
       savingsComparedToGrid: "gegenüber Netzbezug",

diff --git a/dist/assets/index.8e4c81a1.css → dist/assets/index.1555a0f0.css b/dist/assets/index.8e4c81a1.css → dist/assets/index.1555a0f0.css
diff --git a/dist/assets/index.9cd7a559.js → dist/assets/index.33cb7319.js b/dist/assets/index.9cd7a559.js → dist/assets/index.33cb7319.js
diff --git a/dist/index.html b/dist/index.html
@@ -20,8 +20,8 @@
     <meta name="theme-color" content="#020318" />
 
     <title>evcc</title>
-    <script type="module" crossorigin src="./assets/index.9cd7a559.js"></script>
-    <link rel="stylesheet" href="./assets/index.8e4c81a1.css">
+    <script type="module" crossorigin src="./assets/index.33cb7319.js"></script>
+    <link rel="stylesheet" href="./assets/index.1555a0f0.css">
   </head>
   <body>
     <script>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,6 @@
     "@storybook/testing-library": "^0.0.13",
     "@storybook/vue3": "^6.5.9",
     "@vue/compiler-sfc": "^3.2.30",
-    "@vue/eslint-config-standard": "^6.1.0",
     "babel-loader": "^8.2.3",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
@@ -49,7 +48,7 @@
     "postcss-custom-media": "^8.0.2",
     "prettier": "^2.5.1",
     "vite": "^2.7.13",
-    "vue-loader": "^16.8.3"
+    "vue-loader": "^17.0.0"
   },
   "engines": {
     "npm": ">=8.0.0",