🛜 Simplify wifi services

runeharlyk · Sep 3, 2024 · b7799b4 · b7799b4
1 parent e69e485
commit b7799b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/src/routes/wifi/sta/Scan.svelte b/app/src/routes/wifi/sta/Scan.svelte
@@ -33,16 +33,16 @@
 
 	async function scanNetworks() {
 		scanActive = true;
-        await api.get('/api/scanNetworks');
 		if ((await pollingResults()) == false) {
 			pollingId = setInterval(() => pollingResults(), 1000);
 		}
 		return;
 	}
 
 	async function pollingResults() {
-        const result = await api.get<NetworkList>('/api/listNetworks');
         if (result.isErr()){
+        await api.get('/api/wifi/scan');
+        const result = await api.get<NetworkList>('/api/wifi/networks');
             console.error(`Error occurred while fetching: `, result.inner);
             return false
         }

diff --git a/app/src/routes/wifi/sta/Wifi.svelte b/app/src/routes/wifi/sta/Wifi.svelte
@@ -77,7 +77,6 @@
 	let formErrorhostname = false;
 
 	async function getWifiStatus() {
-		const result = await api.get<WifiStatus>('/api/wifiStatus');
 		if (result.isErr()) {
 			console.error(`Error occurred while fetching: `, result.inner);
 			return;
@@ -87,7 +86,6 @@
 	}
 
 	async function getWifiSettings() {
-		const result = await api.get<WifiSettings>('/api/wifiSettings');
 		if (result.isErr()) {
 			console.error(`Error occurred while fetching: `, result.inner);
 			return;
@@ -107,7 +105,6 @@
 	});
 
 	async function postWiFiSettings(data: WifiSettings) {
-		const result = await api.post<WifiSettings>('/api/wifiSettings', data);
 		if (result.isErr()) {
 			console.error(`Error occurred while fetching: `, result.inner);
 			notifications.error('User not authorized.', 3000);
@@ -285,6 +282,9 @@
 		dndNetworkList = reorder(dndNetworkList, from.index, to.index);
 		console.log(dndNetworkList);
 	}
+        const result = await api.get<WifiStatus>('/api/wifi/status');
+        const result = await api.get<WifiSettings>('/api/wifi/settings');
+        const result = await api.post<WifiSettings>('/api/wifi/settings', data);
 </script>
 
 <SettingsCard collapsible={false}>