X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=ui%2Fweb%2Fsrc%2Fviews%2FChargingStationsView.vue;h=db374401ff7d51164501da254c839c4b47fbbfe8;hb=57c0ba059e47d46ad545d9783920b53ee56c7184;hp=19b6dfe362109619ba04a2dddfaea76032842112;hpb=8137295e4885116eaf19dcc7b3980d1e5a0b13e3;p=e-mobility-charging-stations-simulator.git

diff --git a/ui/web/src/views/ChargingStationsView.vue b/ui/web/src/views/ChargingStationsView.vue
index 19b6dfe3..db374401 100644
--- a/ui/web/src/views/ChargingStationsView.vue
+++ b/ui/web/src/views/ChargingStationsView.vue
@@ -1,7 +1,10 @@
 <template>
   <Container id="charging-stations">
-    <Button id="simulator-button" @click="startSimulator()">Start Simulator</Button>
-    <Button id="simulator-button" @click="stopSimulator()">Stop Simulator</Button>
+    <Container id="buttons-container">
+      <Button id="simulator-button" @click="startSimulator()">Start Simulator</Button>
+      <Button id="simulator-button" @click="stopSimulator()">Stop Simulator</Button>
+      <ReloadButton id="reload-button" :loading="state.isLoading" @click="loadChargingStations()" />
+    </Container>
     <Container id="inputs-container">
       <input
         id="idtag-field"
@@ -10,87 +13,93 @@
         name="idtag-field"
         placeholder="RFID tag"
       />
-      <ReloadButton id="reload-button" :loading="state.isLoading" @click="load()" />
     </Container>
-    <CSTable :charging-stations="state.chargingStations" :id-tag="state.idTag" />
+    <CSTable
+      :charging-stations="
+        getCurrentInstance()?.appContext.config.globalProperties.$chargingStations
+      "
+      :id-tag="state.idTag"
+    />
   </Container>
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive } from 'vue';
-import CSTable from '@/components/charging-stations/CSTable.vue';
-import type { ChargingStationData } from '@/types';
-import Container from '@/components/Container.vue';
-import ReloadButton from '@/components/buttons/ReloadButton.vue';
-import { UIClient } from '@/composables/UIClient';
-
-const UIClientInstance = UIClient.getInstance();
-
-onMounted(() => {
-  UIClientInstance.registerWSonOpenListener(load);
-});
-
-type State = {
-  isLoading: boolean;
-  chargingStations: ChargingStationData[];
-  idTag: string;
-};
+import { getCurrentInstance, reactive } from 'vue'
+import CSTable from '@/components/charging-stations/CSTable.vue'
+import type { ResponsePayload } from '@/types'
+import Container from '@/components/Container.vue'
+import ReloadButton from '@/components/buttons/ReloadButton.vue'
+import Button from '@/components/buttons/Button.vue'
 
-const state: State = reactive({
+const state = reactive({
   isLoading: false,
-  chargingStations: [],
-  idTag: '',
-});
+  idTag: ''
+})
 
-async function load(): Promise<void> {
-  if (state.isLoading === true) return;
-  state.isLoading = true;
-  const listChargingStationsPayload = await UIClientInstance.listChargingStations();
-  state.chargingStations =
-    listChargingStationsPayload.chargingStations as unknown as ChargingStationData[];
-  state.isLoading = false;
+const app = getCurrentInstance()
+const uiClient = app?.appContext.config.globalProperties.$uiClient
+
+function loadChargingStations(): void {
+  if (state.isLoading === false) {
+    state.isLoading = true
+    uiClient
+      .listChargingStations()
+      .then((response: ResponsePayload) => {
+        if (app != null) {
+          app.appContext.config.globalProperties.$chargingStations = response.chargingStations
+        }
+      })
+      .catch((error: Error) => {
+        console.error('Error at fetching charging stations:', error)
+      })
+      .finally(() => {
+        state.isLoading = false
+      })
+  }
 }
 
 function startSimulator(): void {
-  UIClientInstance.startSimulator();
+  uiClient.startSimulator()
 }
 function stopSimulator(): void {
-  UIClientInstance.stopSimulator();
+  uiClient.stopSimulator()
 }
 </script>
 
 <style>
 #charging-stations {
-  height: 100%;
+  height: fit-content;
   width: 100%;
-  padding: 30px;
-  background-color: rgb(233, 227, 227);
   display: flex;
   flex-direction: column;
-  gap: 0.5%;
+}
+
+#buttons-container {
+  display: flex;
+  flex-direction: row;
 }
 
 #inputs-container {
   display: flex;
-  justify-content: space-between;
+  flex-direction: row;
 }
 
 #reload-button {
   flex: auto;
-  padding: 5px 15px;
-  background-color: rgb(25, 118, 210);
-  border-radius: 5px;
   color: white;
-  font-size: 35px;
+  background-color: blue;
+  font-size: 1.5rem;
   font-weight: bold;
+  align-items: center;
+  justify-content: center;
 }
 
 #reload-button:hover {
-  background-color: rgb(10, 113, 195);
+  background-color: rgb(0, 0, 225);
 }
 
 #reload-button:active {
-  background-color: rgb(255, 113, 195);
+  background-color: red;
 }
 
 #simulator-button {
@@ -99,5 +108,7 @@ function stopSimulator(): void {
 
 #idtag-field {
   flex: auto;
+  font-size: 1.5rem;
+  text-align: center;
 }
 </style>