Baipyrus/Matrix
1
0
Fork 0
mirror of https://gitlab1.ptb.de/waltem01/Matrix synced 2024-11-12 16:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

shared post redirect method

Browse Source
This commit is contained in:
waltem01 2024-03-08 10:21:40 +01:00
parent b1d514d147
commit d60800bc3f
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Webserver/src/lib/client/httpRequests.ts Normal file
View File

@ -0,0 +1,23 @@
import type { APIResponse } from '$lib/interfaces';
export async function redirectAPI({ form, fdata }: { form?: HTMLFormElement; fdata?: FormData }) {
if (!fdata && form) fdata = new FormData(form);
else if (!fdata) throw new Error('No formdata provided!');
// Get endpoint, prefer form, then formdata or empty
const endpoint = (form?.dataset.endpoint ?? fdata.get('endpoint')) ?? '';
// Append endpoint to formdata
if (!fdata?.has('endpoint'))
fdata.append('endpoint', endpoint);
// Send request to be redirected to given endpoint
const response = await fetch('/api/redirect', {
method: 'POST',
body: fdata!
});
// Await respose from webserver
const mdata = (await response.json()) as APIResponse;
// Basic error handling
if (!mdata.success) alert(`Error while processing '${endpoint}'!`);
}

16
Webserver/src/routes/admin/+page.svelte
View File

@ -8,6 +8,7 @@
import { rgbToHex, type Color, getContrastColor } from '$lib/client/color';
import { detectGamepad, gamepadButtonPress } from '$lib/client/gamepad';
import { initializeMatrix, type Matrix } from '$lib/client/matrix';
import { redirectAPI } from '$lib/client/httpRequests';
import { toRadians } from '$lib/client/miscellaneous';
import type { APIResponse } from '$lib/interfaces';
import { onMount } from 'svelte';
@ -56,17 +57,8 @@
// break;
}
// Append endpoint to formdata for redirection
fdata.append('endpoint', form.dataset.endpoint ?? '');
// Send request to be redirected to given endpoint
const response = await fetch('/api/redirect', {
method: 'POST',
body: fdata
});
// Await respose from webserver
const mdata = (await response.json()) as APIResponse;
// Basic error handling
if (!mdata.success) alert(`Error while processing '${form.dataset.endpoint}'!`);
// Redirect data over local endpoint
await redirectAPI({ form, fdata });
}
// function displayText(formData: FormData) {}
@ -253,7 +245,7 @@
<!-- Title -->
<h1 class="text-4xl font-bold m-5 text-center">Matrix Control Panel</h1>
<!-- Forms -->
<div class="grid grid-rows-7 p-1">
<div class="grid grid-rows-7 p-1 pt-0">
<!-- Update -->
<form class="grid grid-cols-2" method="GET" data-endpoint="update" on:submit|preventDefault={get}>
<label class="border-2 border-black border-r-0 border-b-0 pl-1" for="update">Update:</label>

12
Webserver/src/routes/image/+page.svelte
View File

@ -5,6 +5,7 @@
PUBLIC_LED_CHAIN,
PUBLIC_LED_PARALLEL
} from '$env/static/public';
import { redirectAPI } from '$lib/client/httpRequests';
import type { Matrix } from '$lib/client/matrix';
import type { APIResponse } from '$lib/interfaces';
import { onMount } from 'svelte';
@ -66,15 +67,7 @@
async function post(fdata: FormData, endpoint: string) {
// Append endpoint to formdata for redirection
fdata.append('endpoint', endpoint);
// Send request to be redirected to given endpoint
const response = await fetch('/api/redirect', {
method: 'POST',
body: fdata
});
// Await respose from webserver
const mdata = (await response.json()) as APIResponse;
// Basic error handling
if (!mdata.success) alert(`Error while processing '${endpoint}'!`);
redirectAPI({ fdata });
}
// Load and read file, encode as base64 data url
@ -192,6 +185,7 @@
});
</script>
<h1 class="text-4xl font-bold m-5 text-center">Matrix Image Upload</h1>
<form class="grid grid-rows-5 m-1" on:submit|preventDefault={handleSubmit}>
<div class="grid grid-cols-2">
<label class="border-2 border-black border-r-0 border-b-0 pl-1" for="x">Set X coordinate:</label