From 0abe0b530ccbc4aa0b7591277f1481a4f15760a6 Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Tue, 23 Apr 2024 21:50:50 +0200 Subject: [PATCH] Updates api path to /api --- app2/src/lib/components/UpdateIndicator.svelte | 2 +- app2/src/routes/+layout.svelte | 2 +- app2/src/routes/+layout.ts | 2 +- app2/src/routes/connections/mqtt/MQTT.svelte | 6 +++--- app2/src/routes/connections/mqtt/MQTTConfig.svelte | 4 ++-- app2/src/routes/connections/ntp/NTP.svelte | 6 +++--- app2/src/routes/login.svelte | 2 +- app2/src/routes/statusbar.svelte | 2 +- app2/src/routes/system/status/SystemStatus.svelte | 8 ++++---- .../src/routes/system/update/GithubFirmwareManager.svelte | 2 +- app2/src/routes/system/update/UploadFirmware.svelte | 2 +- app2/src/routes/user/+page.svelte | 6 +++--- app2/src/routes/wifi/ap/Accesspoint.svelte | 6 +++--- app2/src/routes/wifi/sta/Scan.svelte | 4 ++-- app2/src/routes/wifi/sta/Wifi.svelte | 6 +++--- app2/vite.config.ts | 5 +++-- esp32/lib/ESP32-sveltekit/APSettingsService.h | 2 +- esp32/lib/ESP32-sveltekit/APStatus.h | 2 +- esp32/lib/ESP32-sveltekit/AuthenticationService.h | 4 ++-- esp32/lib/ESP32-sveltekit/DownloadFirmwareService.h | 2 +- esp32/lib/ESP32-sveltekit/FactoryResetService.h | 2 +- esp32/lib/ESP32-sveltekit/FeaturesService.h | 2 +- esp32/lib/ESP32-sveltekit/MqttSettingsService.h | 2 +- esp32/lib/ESP32-sveltekit/MqttStatus.h | 2 +- esp32/lib/ESP32-sveltekit/NTPSettingsService.h | 4 ++-- esp32/lib/ESP32-sveltekit/NTPStatus.h | 2 +- esp32/lib/ESP32-sveltekit/RestartService.h | 2 +- esp32/lib/ESP32-sveltekit/SecuritySettingsService.h | 4 ++-- esp32/lib/ESP32-sveltekit/SleepService.h | 2 +- esp32/lib/ESP32-sveltekit/SystemStatus.h | 2 +- esp32/lib/ESP32-sveltekit/UploadFirmwareService.h | 2 +- esp32/lib/ESP32-sveltekit/WiFiScanner.h | 4 ++-- esp32/lib/ESP32-sveltekit/WiFiSettingsService.h | 2 +- esp32/lib/ESP32-sveltekit/WiFiStatus.h | 2 +- 34 files changed, 55 insertions(+), 54 deletions(-) diff --git a/app2/src/lib/components/UpdateIndicator.svelte b/app2/src/lib/components/UpdateIndicator.svelte index 898e8cc..30641be 100644 --- a/app2/src/lib/components/UpdateIndicator.svelte +++ b/app2/src/lib/components/UpdateIndicator.svelte @@ -59,7 +59,7 @@ async function postGithubDownload(url: string) { try { - const apiResponse = await fetch('/rest/downloadUpdate', { + const apiResponse = await fetch('/api/downloadUpdate', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', diff --git a/app2/src/routes/+layout.svelte b/app2/src/routes/+layout.svelte index 036512d..abf845b 100644 --- a/app2/src/routes/+layout.svelte +++ b/app2/src/routes/+layout.svelte @@ -66,7 +66,7 @@ async function validateUser(userdata: userProfile) { try { - const response = await fetch('/rest/verifyAuthorization', { + const response = await fetch('/api/verifyAuthorization', { method: 'GET', headers: { Authorization: 'Bearer ' + userdata.bearer_token, diff --git a/app2/src/routes/+layout.ts b/app2/src/routes/+layout.ts index 506e6a7..c3d9286 100644 --- a/app2/src/routes/+layout.ts +++ b/app2/src/routes/+layout.ts @@ -28,7 +28,7 @@ const loadModelFiles = async () => { export const load = async ({ fetch }) => { await registerFetchIntercept(); await loadModelFiles(); - const result = await fetch('/rest/features'); + const result = await fetch('/api/features'); const features = await result.json(); return { features, diff --git a/app2/src/routes/connections/mqtt/MQTT.svelte b/app2/src/routes/connections/mqtt/MQTT.svelte index 30b66ef..927a96b 100644 --- a/app2/src/routes/connections/mqtt/MQTT.svelte +++ b/app2/src/routes/connections/mqtt/MQTT.svelte @@ -36,7 +36,7 @@ async function getMQTTStatus() { try { - const response = await fetch('/rest/mqttStatus', { + const response = await fetch('/api/mqttStatus', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -52,7 +52,7 @@ async function getMQTTSettings() { try { - const response = await fetch('/rest/mqttSettings', { + const response = await fetch('/api/mqttSettings', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -87,7 +87,7 @@ async function postMQTTSettings(data: MQTTSettings) { try { - const response = await fetch('/rest/mqttSettings', { + const response = await fetch('/api/mqttSettings', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', diff --git a/app2/src/routes/connections/mqtt/MQTTConfig.svelte b/app2/src/routes/connections/mqtt/MQTTConfig.svelte index 82fa472..6fe56be 100644 --- a/app2/src/routes/connections/mqtt/MQTTConfig.svelte +++ b/app2/src/routes/connections/mqtt/MQTTConfig.svelte @@ -16,7 +16,7 @@ async function getBrokerSettings() { try { - const response = await fetch('/rest/brokerSettings', { + const response = await fetch('/api/brokerSettings', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -38,7 +38,7 @@ async function postBrokerSettings() { try { - const response = await fetch('/rest/brokerSettings', { + const response = await fetch('/api/brokerSettings', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', diff --git a/app2/src/routes/connections/ntp/NTP.svelte b/app2/src/routes/connections/ntp/NTP.svelte index 28314e9..d11d689 100644 --- a/app2/src/routes/connections/ntp/NTP.svelte +++ b/app2/src/routes/connections/ntp/NTP.svelte @@ -21,7 +21,7 @@ async function getNTPStatus() { try { - const response = await fetch('/rest/ntpStatus', { + const response = await fetch('/api/ntpStatus', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -37,7 +37,7 @@ async function getNTPSettings() { try { - const response = await fetch('/rest/ntpSettings', { + const response = await fetch('/api/ntpSettings', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -71,7 +71,7 @@ async function postNTPSettings(data: NTPSettings) { try { - const response = await fetch('/rest/ntpSettings', { + const response = await fetch('/api/ntpSettings', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', diff --git a/app2/src/routes/login.svelte b/app2/src/routes/login.svelte index a9d646d..7c2724a 100644 --- a/app2/src/routes/login.svelte +++ b/app2/src/routes/login.svelte @@ -20,7 +20,7 @@ async function signInUser(data: SignInData) { try { - const response = await fetch('/rest/signIn', { + const response = await fetch('/api/signIn', { method: 'POST', headers: { 'Content-Type': 'application/json' diff --git a/app2/src/routes/statusbar.svelte b/app2/src/routes/statusbar.svelte index d46fa0e..924f8d8 100644 --- a/app2/src/routes/statusbar.svelte +++ b/app2/src/routes/statusbar.svelte @@ -15,7 +15,7 @@ import MdiMoonAndStars from '~icons/mdi/moon-and-stars'; async function postSleep() { - const response = await fetch('/rest/sleep', { + const response = await fetch('/api/sleep', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic' diff --git a/app2/src/routes/system/status/SystemStatus.svelte b/app2/src/routes/system/status/SystemStatus.svelte index abe4b92..e8ec267 100644 --- a/app2/src/routes/system/status/SystemStatus.svelte +++ b/app2/src/routes/system/status/SystemStatus.svelte @@ -31,7 +31,7 @@ async function getSystemStatus() { try { - const response = await fetch('/rest/systemStatus', { + const response = await fetch('/api/systemStatus', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -53,7 +53,7 @@ (systemInformation = { ...systemInformation, ...data }); async function postRestart() { - const response = await fetch('/rest/restart', { + const response = await fetch('/api/restart', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic' @@ -77,7 +77,7 @@ } async function postFactoryReset() { - const response = await fetch('/rest/factoryReset', { + const response = await fetch('/api/factoryReset', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic' @@ -101,7 +101,7 @@ } async function postSleep() { - const response = await fetch('/rest/sleep', { + const response = await fetch('/api/sleep', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic' diff --git a/app2/src/routes/system/update/GithubFirmwareManager.svelte b/app2/src/routes/system/update/GithubFirmwareManager.svelte index aa5eadf..b47f71e 100644 --- a/app2/src/routes/system/update/GithubFirmwareManager.svelte +++ b/app2/src/routes/system/update/GithubFirmwareManager.svelte @@ -40,7 +40,7 @@ async function postGithubDownload(url: string) { try { - const apiResponse = await fetch('/rest/downloadUpdate', { + const apiResponse = await fetch('/api/downloadUpdate', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', diff --git a/app2/src/routes/system/update/UploadFirmware.svelte b/app2/src/routes/system/update/UploadFirmware.svelte index 1ee6def..64b1110 100644 --- a/app2/src/routes/system/update/UploadFirmware.svelte +++ b/app2/src/routes/system/update/UploadFirmware.svelte @@ -14,7 +14,7 @@ try { const formData = new FormData(); formData.append('file', files[0]); - const response = await fetch('/rest/uploadFirmware', { + const response = await fetch('/api/uploadFirmware', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic' diff --git a/app2/src/routes/user/+page.svelte b/app2/src/routes/user/+page.svelte index 222187c..f28903f 100644 --- a/app2/src/routes/user/+page.svelte +++ b/app2/src/routes/user/+page.svelte @@ -40,7 +40,7 @@ async function getSecuritySettings() { try { - const response = await fetch('/rest/securitySettings', { + const response = await fetch('/api/securitySettings', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -56,7 +56,7 @@ async function postSecuritySettings(data: SecuritySettings) { try { - const response = await fetch('/rest/securitySettings', { + const response = await fetch('/api/securitySettings', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -81,7 +81,7 @@ async function validateUser(userdata: userProfile) { try { - const response = await fetch('/rest/verifyAuthorization', { + const response = await fetch('/api/verifyAuthorization', { method: 'GET', headers: { Authorization: 'Bearer ' + userdata.bearer_token, diff --git a/app2/src/routes/wifi/ap/Accesspoint.svelte b/app2/src/routes/wifi/ap/Accesspoint.svelte index 1e27cf5..4bd8d32 100644 --- a/app2/src/routes/wifi/ap/Accesspoint.svelte +++ b/app2/src/routes/wifi/ap/Accesspoint.svelte @@ -22,7 +22,7 @@ async function getAPStatus() { try { - const response = await fetch('/rest/apStatus', { + const response = await fetch('/api/apStatus', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -38,7 +38,7 @@ async function getAPSettings() { try { - const response = await fetch('/rest/apSettings', { + const response = await fetch('/api/apSettings', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -96,7 +96,7 @@ async function postAPSettings(data: ApSettings) { try { - const response = await fetch('/rest/apSettings', { + const response = await fetch('/api/apSettings', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', diff --git a/app2/src/routes/wifi/sta/Scan.svelte b/app2/src/routes/wifi/sta/Scan.svelte index 469113f..82efc33 100644 --- a/app2/src/routes/wifi/sta/Scan.svelte +++ b/app2/src/routes/wifi/sta/Scan.svelte @@ -36,7 +36,7 @@ async function scanNetworks() { scanActive = true; - const scan = await fetch('/rest/scanNetworks', { + const scan = await fetch('/api/scanNetworks', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -50,7 +50,7 @@ } async function pollingResults() { - const response = await fetch('/rest/listNetworks', { + const response = await fetch('/api/listNetworks', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', diff --git a/app2/src/routes/wifi/sta/Wifi.svelte b/app2/src/routes/wifi/sta/Wifi.svelte index 8ec56f1..807bae5 100644 --- a/app2/src/routes/wifi/sta/Wifi.svelte +++ b/app2/src/routes/wifi/sta/Wifi.svelte @@ -71,7 +71,7 @@ async function getWifiStatus() { try { - const response = await fetch('/rest/wifiStatus', { + const response = await fetch('/api/wifiStatus', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -87,7 +87,7 @@ async function getWifiSettings() { try { - const response = await fetch('/rest/wifiSettings', { + const response = await fetch('/api/wifiSettings', { method: 'GET', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', @@ -113,7 +113,7 @@ async function postWiFiSettings(data: WifiSettings) { try { - const response = await fetch('/rest/wifiSettings', { + const response = await fetch('/api/wifiSettings', { method: 'POST', headers: { Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic', diff --git a/app2/vite.config.ts b/app2/vite.config.ts index 0dfbd5b..97f404b 100644 --- a/app2/vite.config.ts +++ b/app2/vite.config.ts @@ -16,9 +16,10 @@ export default defineConfig({ }, server: { proxy: { - '/rest': { + '/api': { target: 'http://192.168.0.172', - changeOrigin: true + changeOrigin: true, + ws: true }, '/ws': { target: 'ws://192.168.0.172', diff --git a/esp32/lib/ESP32-sveltekit/APSettingsService.h b/esp32/lib/ESP32-sveltekit/APSettingsService.h index 0e342d3..6d46c03 100644 --- a/esp32/lib/ESP32-sveltekit/APSettingsService.h +++ b/esp32/lib/ESP32-sveltekit/APSettingsService.h @@ -61,7 +61,7 @@ #endif #define AP_SETTINGS_FILE "/config/apSettings.json" -#define AP_SETTINGS_SERVICE_PATH "/rest/apSettings" +#define AP_SETTINGS_SERVICE_PATH "/api/apSettings" #define AP_MODE_ALWAYS 0 #define AP_MODE_DISCONNECTED 1 diff --git a/esp32/lib/ESP32-sveltekit/APStatus.h b/esp32/lib/ESP32-sveltekit/APStatus.h index 55b2357..4434eae 100644 --- a/esp32/lib/ESP32-sveltekit/APStatus.h +++ b/esp32/lib/ESP32-sveltekit/APStatus.h @@ -24,7 +24,7 @@ #include #define MAX_AP_STATUS_SIZE 1024 -#define AP_STATUS_SERVICE_PATH "/rest/apStatus" +#define AP_STATUS_SERVICE_PATH "/api/apStatus" class APStatus { diff --git a/esp32/lib/ESP32-sveltekit/AuthenticationService.h b/esp32/lib/ESP32-sveltekit/AuthenticationService.h index 1cc02ba..36f0301 100644 --- a/esp32/lib/ESP32-sveltekit/AuthenticationService.h +++ b/esp32/lib/ESP32-sveltekit/AuthenticationService.h @@ -19,8 +19,8 @@ #include #include -#define VERIFY_AUTHORIZATION_PATH "/rest/verifyAuthorization" -#define SIGN_IN_PATH "/rest/signIn" +#define VERIFY_AUTHORIZATION_PATH "/api/verifyAuthorization" +#define SIGN_IN_PATH "/api/signIn" #define MAX_AUTHENTICATION_SIZE 256 diff --git a/esp32/lib/ESP32-sveltekit/DownloadFirmwareService.h b/esp32/lib/ESP32-sveltekit/DownloadFirmwareService.h index e9b6869..b41f5cc 100644 --- a/esp32/lib/ESP32-sveltekit/DownloadFirmwareService.h +++ b/esp32/lib/ESP32-sveltekit/DownloadFirmwareService.h @@ -26,7 +26,7 @@ #include // #include -#define GITHUB_FIRMWARE_PATH "/rest/downloadUpdate" +#define GITHUB_FIRMWARE_PATH "/api/downloadUpdate" #define EVENT_DOWNLOAD_OTA "otastatus" #define OTA_TASK_STACK_SIZE 9216 diff --git a/esp32/lib/ESP32-sveltekit/FactoryResetService.h b/esp32/lib/ESP32-sveltekit/FactoryResetService.h index 9299cb6..4701241 100644 --- a/esp32/lib/ESP32-sveltekit/FactoryResetService.h +++ b/esp32/lib/ESP32-sveltekit/FactoryResetService.h @@ -23,7 +23,7 @@ #include #define FS_CONFIG_DIRECTORY "/config" -#define FACTORY_RESET_SERVICE_PATH "/rest/factoryReset" +#define FACTORY_RESET_SERVICE_PATH "/api/factoryReset" class FactoryResetService { diff --git a/esp32/lib/ESP32-sveltekit/FeaturesService.h b/esp32/lib/ESP32-sveltekit/FeaturesService.h index 7f524bd..954d034 100644 --- a/esp32/lib/ESP32-sveltekit/FeaturesService.h +++ b/esp32/lib/ESP32-sveltekit/FeaturesService.h @@ -23,7 +23,7 @@ #include #define MAX_FEATURES_SIZE 256 -#define FEATURES_SERVICE_PATH "/rest/features" +#define FEATURES_SERVICE_PATH "/api/features" typedef struct { diff --git a/esp32/lib/ESP32-sveltekit/MqttSettingsService.h b/esp32/lib/ESP32-sveltekit/MqttSettingsService.h index 8624b87..3f7325a 100644 --- a/esp32/lib/ESP32-sveltekit/MqttSettingsService.h +++ b/esp32/lib/ESP32-sveltekit/MqttSettingsService.h @@ -59,7 +59,7 @@ #endif #define MQTT_SETTINGS_FILE "/config/mqttSettings.json" -#define MQTT_SETTINGS_SERVICE_PATH "/rest/mqttSettings" +#define MQTT_SETTINGS_SERVICE_PATH "/api/mqttSettings" #define MQTT_RECONNECTION_DELAY 5000 diff --git a/esp32/lib/ESP32-sveltekit/MqttStatus.h b/esp32/lib/ESP32-sveltekit/MqttStatus.h index 4ec80fe..544da2b 100644 --- a/esp32/lib/ESP32-sveltekit/MqttStatus.h +++ b/esp32/lib/ESP32-sveltekit/MqttStatus.h @@ -23,7 +23,7 @@ #include #define MAX_MQTT_STATUS_SIZE 1024 -#define MQTT_STATUS_SERVICE_PATH "/rest/mqttStatus" +#define MQTT_STATUS_SERVICE_PATH "/api/mqttStatus" class MqttStatus { diff --git a/esp32/lib/ESP32-sveltekit/NTPSettingsService.h b/esp32/lib/ESP32-sveltekit/NTPSettingsService.h index 1b51150..c4a032e 100644 --- a/esp32/lib/ESP32-sveltekit/NTPSettingsService.h +++ b/esp32/lib/ESP32-sveltekit/NTPSettingsService.h @@ -39,10 +39,10 @@ #endif #define NTP_SETTINGS_FILE "/config/ntpSettings.json" -#define NTP_SETTINGS_SERVICE_PATH "/rest/ntpSettings" +#define NTP_SETTINGS_SERVICE_PATH "/api/ntpSettings" #define MAX_TIME_SIZE 256 -#define TIME_PATH "/rest/time" +#define TIME_PATH "/api/time" class NTPSettings { diff --git a/esp32/lib/ESP32-sveltekit/NTPStatus.h b/esp32/lib/ESP32-sveltekit/NTPStatus.h index f9baeef..7e77e32 100644 --- a/esp32/lib/ESP32-sveltekit/NTPStatus.h +++ b/esp32/lib/ESP32-sveltekit/NTPStatus.h @@ -24,7 +24,7 @@ #include #define MAX_NTP_STATUS_SIZE 1024 -#define NTP_STATUS_SERVICE_PATH "/rest/ntpStatus" +#define NTP_STATUS_SERVICE_PATH "/api/ntpStatus" class NTPStatus { diff --git a/esp32/lib/ESP32-sveltekit/RestartService.h b/esp32/lib/ESP32-sveltekit/RestartService.h index 56f1684..0effb69 100644 --- a/esp32/lib/ESP32-sveltekit/RestartService.h +++ b/esp32/lib/ESP32-sveltekit/RestartService.h @@ -20,7 +20,7 @@ #include #include -#define RESTART_SERVICE_PATH "/rest/restart" +#define RESTART_SERVICE_PATH "/api/restart" class RestartService { diff --git a/esp32/lib/ESP32-sveltekit/SecuritySettingsService.h b/esp32/lib/ESP32-sveltekit/SecuritySettingsService.h index ce6de70..6ce3f91 100644 --- a/esp32/lib/ESP32-sveltekit/SecuritySettingsService.h +++ b/esp32/lib/ESP32-sveltekit/SecuritySettingsService.h @@ -42,10 +42,10 @@ #endif #define SECURITY_SETTINGS_FILE "/config/securitySettings.json" -#define SECURITY_SETTINGS_PATH "/rest/securitySettings" +#define SECURITY_SETTINGS_PATH "/api/securitySettings" #define GENERATE_TOKEN_SIZE 512 -#define GENERATE_TOKEN_PATH "/rest/generateToken" +#define GENERATE_TOKEN_PATH "/api/generateToken" #if FT_ENABLED(FT_SECURITY) diff --git a/esp32/lib/ESP32-sveltekit/SleepService.h b/esp32/lib/ESP32-sveltekit/SleepService.h index 2524e2d..f9514ba 100644 --- a/esp32/lib/ESP32-sveltekit/SleepService.h +++ b/esp32/lib/ESP32-sveltekit/SleepService.h @@ -19,7 +19,7 @@ #include #include -#define SLEEP_SERVICE_PATH "/rest/sleep" +#define SLEEP_SERVICE_PATH "/api/sleep" #ifndef WAKEUP_PIN_NUMBER #define WAKEUP_PIN_NUMBER 0 diff --git a/esp32/lib/ESP32-sveltekit/SystemStatus.h b/esp32/lib/ESP32-sveltekit/SystemStatus.h index 139d6de..93fe615 100644 --- a/esp32/lib/ESP32-sveltekit/SystemStatus.h +++ b/esp32/lib/ESP32-sveltekit/SystemStatus.h @@ -23,7 +23,7 @@ #include #define MAX_ESP_STATUS_SIZE 1024 -#define SYSTEM_STATUS_SERVICE_PATH "/rest/systemStatus" +#define SYSTEM_STATUS_SERVICE_PATH "/api/systemStatus" class SystemStatus { diff --git a/esp32/lib/ESP32-sveltekit/UploadFirmwareService.h b/esp32/lib/ESP32-sveltekit/UploadFirmwareService.h index 1e9d434..f425e9b 100644 --- a/esp32/lib/ESP32-sveltekit/UploadFirmwareService.h +++ b/esp32/lib/ESP32-sveltekit/UploadFirmwareService.h @@ -24,7 +24,7 @@ #include #include -#define UPLOAD_FIRMWARE_PATH "/rest/uploadFirmware" +#define UPLOAD_FIRMWARE_PATH "/api/uploadFirmware" enum FileType { diff --git a/esp32/lib/ESP32-sveltekit/WiFiScanner.h b/esp32/lib/ESP32-sveltekit/WiFiScanner.h index e963b67..7815bb9 100644 --- a/esp32/lib/ESP32-sveltekit/WiFiScanner.h +++ b/esp32/lib/ESP32-sveltekit/WiFiScanner.h @@ -21,8 +21,8 @@ #include #include -#define SCAN_NETWORKS_SERVICE_PATH "/rest/scanNetworks" -#define LIST_NETWORKS_SERVICE_PATH "/rest/listNetworks" +#define SCAN_NETWORKS_SERVICE_PATH "/api/scanNetworks" +#define LIST_NETWORKS_SERVICE_PATH "/api/listNetworks" #define MAX_WIFI_SCANNER_SIZE 1024 diff --git a/esp32/lib/ESP32-sveltekit/WiFiSettingsService.h b/esp32/lib/ESP32-sveltekit/WiFiSettingsService.h index 8f82da3..92b5622 100644 --- a/esp32/lib/ESP32-sveltekit/WiFiSettingsService.h +++ b/esp32/lib/ESP32-sveltekit/WiFiSettingsService.h @@ -45,7 +45,7 @@ #endif #define WIFI_SETTINGS_FILE "/config/wifiSettings.json" -#define WIFI_SETTINGS_SERVICE_PATH "/rest/wifiSettings" +#define WIFI_SETTINGS_SERVICE_PATH "/api/wifiSettings" #define WIFI_RECONNECTION_DELAY 1000 * 30 #define RSSI_EVENT_DELAY 200 diff --git a/esp32/lib/ESP32-sveltekit/WiFiStatus.h b/esp32/lib/ESP32-sveltekit/WiFiStatus.h index 3b761c6..3af6d86 100644 --- a/esp32/lib/ESP32-sveltekit/WiFiStatus.h +++ b/esp32/lib/ESP32-sveltekit/WiFiStatus.h @@ -23,7 +23,7 @@ #include #define MAX_WIFI_STATUS_SIZE 1024 -#define WIFI_STATUS_SERVICE_PATH "/rest/wifiStatus" +#define WIFI_STATUS_SERVICE_PATH "/api/wifiStatus" class WiFiStatus {