From cb397b7cd3267ce8349d43411b61787cab9ba8ec Mon Sep 17 00:00:00 2001 From: Daniel Svitan Date: Sat, 7 Jun 2025 09:21:57 +0200 Subject: [PATCH] :hammer: Updates routes to new version --- admin/main.go | 14 +++++++------- peripheral/main.py | 2 +- web/pages/index.vue | 16 ++++++++-------- web/pages/token.vue | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/admin/main.go b/admin/main.go index 349acc9..d0cc472 100644 --- a/admin/main.go +++ b/admin/main.go @@ -64,7 +64,7 @@ func makeGetReq(url string) ([]byte, error) { if err != nil { return nil, err } - defer func() { res.Body.Close() }() + defer func() { _ = res.Body.Close() }() if res.StatusCode != 200 { fmt.Printf("<-- %d\n", res.StatusCode) @@ -195,13 +195,13 @@ func test(context.Context, *cli.Command) error { return nil } -func getOpened(ctx context.Context, cmd *cli.Command) error { +func getOpened(_ context.Context, cmd *cli.Command) error { err := load() if err != nil { return err } - opened, err := makeGetReq(fmt.Sprintf("%s/open", server)) + opened, err := makeGetReq(fmt.Sprintf("%s/opened", server)) if err != nil { return err } @@ -225,7 +225,7 @@ func getLocked(context.Context, *cli.Command) error { return err } - locked, err := makeGetReq(fmt.Sprintf("%s/lock", server)) + locked, err := makeGetReq(fmt.Sprintf("%s/locked", server)) if err != nil { return err } @@ -245,7 +245,7 @@ func getAlert(context.Context, *cli.Command) error { return err } - alert, err := makeGetReq(fmt.Sprintf("%s/alert", server)) + alert, err := makeGetReq(fmt.Sprintf("%s/alerts", server)) if err != nil { return err } @@ -269,7 +269,7 @@ func createManageLock(locked bool) func(context.Context, *cli.Command) error { var data ChangeLockReq data.Locked = locked - _, err = makePostReq(fmt.Sprintf("%s/lock", server), data) + _, err = makePostReq(fmt.Sprintf("%s/locked", server), data) if err != nil { return err } @@ -306,7 +306,7 @@ func createManageAlert(alert bool) func(context.Context, *cli.Command) error { data.For = secs } - _, err = makePostReq(fmt.Sprintf("%s/alert", server), data) + _, err = makePostReq(fmt.Sprintf("%s/alerts", server), data) if err != nil { return err } diff --git a/peripheral/main.py b/peripheral/main.py index 06e4ebb..b8ddb1a 100644 --- a/peripheral/main.py +++ b/peripheral/main.py @@ -97,7 +97,7 @@ class App: try: r = urequests.post( - f"{self.server}/open", + f"{self.server}/opened", headers={"Authorization": self.token, "Content-Type": "application/json"}, data=raw ) diff --git a/web/pages/index.vue b/web/pages/index.vue index 3819ca9..31cdaff 100644 --- a/web/pages/index.vue +++ b/web/pages/index.vue @@ -100,7 +100,7 @@ async function toggleLock() { const desired = !locked.value axios .post( - useAPI("/lock"), + useAPI("/locked"), { locked: desired, }, @@ -122,7 +122,7 @@ async function toggleLock() { async function toggleAlert() { const desired = !alert.value axios - .post(useAPI("/alert"), { alert: desired }, { headers: useHeaders() }) + .post(useAPI("/alerts"), { alert: desired }, { headers: useHeaders() }) .then((res) => { handleResponse(res, () => { toast.add({ @@ -140,23 +140,23 @@ onMounted(() => { } axios - .get(useAPI("/lock"), { + .get(useAPI("/locked"), { headers: useHeaders(), }) .then((res) => { - handleResponse(res, (response) => { - locked.value = response.data + handleResponse(res, (res) => { + locked.value = res.data }) }) .catch(handleRequestError) axios - .get(useAPI("/alert"), { + .get(useAPI("/alerts"), { headers: useHeaders(), }) .then((res) => { - handleResponse(res, (response) => { - alert.value = response.data + handleResponse(res, (res) => { + alert.value = res.data }) }) .catch(handleRequestError) diff --git a/web/pages/token.vue b/web/pages/token.vue index 8ee0b8b..d5ef298 100644 --- a/web/pages/token.vue +++ b/web/pages/token.vue @@ -39,7 +39,7 @@ const toast = useToast() function onSubmit(event: FormSubmitEvent) { const received = event.data.token axios - .get(useAPI("/open"), { + .get(useAPI("/opened"), { headers: useHeaders(received), }) .then((res) => {