diff --git a/webapp/src/components/InverterTotalInfo.vue b/webapp/src/components/InverterTotalInfo.vue index 6369d601..c81c23dd 100644 --- a/webapp/src/components/InverterTotalInfo.vue +++ b/webapp/src/components/InverterTotalInfo.vue @@ -3,36 +3,30 @@
Total Yield Total
-
-

+

{{ formatNumber(totalData.YieldTotal.v, totalData.YieldTotal.d) }} {{ totalData.YieldTotal.u }}

-

Total Yield Day
-
-

+

{{ formatNumber(totalData.YieldDay.v, totalData.YieldDay.d) }} {{ totalData.YieldDay.u }}

-

Total Power
-
-

+

{{ formatNumber(totalData.Power.v, totalData.Power.d) }} {{ totalData.Power.u }}

-

diff --git a/webapp/src/emitter.d.ts b/webapp/src/emitter.d.ts index d083a75a..c3a28723 100644 --- a/webapp/src/emitter.d.ts +++ b/webapp/src/emitter.d.ts @@ -1,5 +1,3 @@ -import mitt from 'mitt'; - declare module '@vue/runtime-core' { interface ComponentCustomProperties { $emitter: Emitter; diff --git a/webapp/src/types/LiveDataStatus.ts b/webapp/src/types/LiveDataStatus.ts index 68d106a5..f8702810 100644 --- a/webapp/src/types/LiveDataStatus.ts +++ b/webapp/src/types/LiveDataStatus.ts @@ -2,7 +2,7 @@ export interface ValueObject { v: number; // value u: string; // unit d: number; // digits -}; +} export interface InverterStatistics { name: ValueObject, @@ -30,19 +30,19 @@ export interface Inverter { limit_absolute: number; events: number; [key: number]: InverterStatistics; -}; +} export interface Total { Power: ValueObject; YieldDay: ValueObject; YieldTotal: ValueObject; -}; +} export interface Hints { time_sync: boolean; default_password: boolean; radio_problem: boolean; -}; +} export interface LiveData { inverters: Inverter[]; diff --git a/webapp/src/utils/authentication.ts b/webapp/src/utils/authentication.ts index 53dda78f..c9937531 100644 --- a/webapp/src/utils/authentication.ts +++ b/webapp/src/utils/authentication.ts @@ -6,7 +6,9 @@ export function authHeader(): Headers { let user = null; try { user = JSON.parse(localStorage.getItem('user') || ""); - } catch { } + } catch { + // continue regardless of error + } const headers = new Headers(); headers.append('X-Requested-With', 'XMLHttpRequest'); @@ -20,7 +22,9 @@ export function authUrl(): string { let user = null; try { user = JSON.parse(localStorage.getItem('user') || ""); - } catch { } + } catch { + // continue regardless of error + } if (user && user.authdata) { return encodeURIComponent(atob(user.authdata)).replace("%3A", ":") + '@'; diff --git a/webapp/src/views/HomeView.vue b/webapp/src/views/HomeView.vue index a8b12b1b..457f4ad7 100644 --- a/webapp/src/views/HomeView.vue +++ b/webapp/src/views/HomeView.vue @@ -670,7 +670,7 @@ export default defineComponent({ ) }, calculateAbsoluteTime(lastTime: number): string { - const userLocale = globalThis.navigator.language; + const userLocale = navigator.language; const date = new Date(Date.now() - lastTime * 1000); return date.toLocaleString(userLocale) } diff --git a/webapp/src/views/LoginView.vue b/webapp/src/views/LoginView.vue index c5d43e09..faad63d1 100644 --- a/webapp/src/views/LoginView.vue +++ b/webapp/src/views/LoginView.vue @@ -59,7 +59,7 @@ export default defineComponent({ this.returnUrl = this.$route.query.returnUrl?.toString() || '/'; }, methods: { - handleSubmit(e: Event) { + handleSubmit() { this.submitted = true; const { username, password } = this;