mirror of https://github.com/ekimekim/wubloader
Enable viewing and editing thumbnail templates
ElementalAlchemist
3 weeks ago
parent
1ad9f6f1a4
commit
375694875a
@ -0,0 +1,46 @@
|
|||||||
|
import { Component } from "solid-js";
|
||||||
|
|
||||||
|
export let googleUser: any = null;
|
||||||
|
declare var gapi: any; // This is a global we use from the Google Sign In script
|
||||||
|
|
||||||
|
function googleOnSignIn(googleUserData) {
|
||||||
|
googleUser = googleUserData;
|
||||||
|
|
||||||
|
const signInElem = document.getElementById("google-auth-sign-in");
|
||||||
|
if (signInElem) {
|
||||||
|
signInElem.classList.remove("hidden");
|
||||||
|
}
|
||||||
|
const signOutElem = document.getElementById("google-auth-sign-out");
|
||||||
|
if (signOutElem) {
|
||||||
|
signOutElem.classList.add("hidden");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function googleSignOut() {
|
||||||
|
if (googleUser) {
|
||||||
|
googleUser = null;
|
||||||
|
await gapi.auth2.getAuthInstance().signOut();
|
||||||
|
|
||||||
|
const signInElem = document.getElementById("google-auth-sign-in");
|
||||||
|
if (signInElem) {
|
||||||
|
signInElem.classList.add("hidden");
|
||||||
|
}
|
||||||
|
const signOutElem = document.getElementById("google-auth-sign-out");
|
||||||
|
if (signOutElem) {
|
||||||
|
signOutElem.classList.remove("hidden");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The googleOnSignIn amd googleSignOut functions need to be available to the global scope for Google code to invoke it
|
||||||
|
(window as any).googleOnSignIn = googleOnSignIn;
|
||||||
|
(window as any).googleSignOut = googleSignOut;
|
||||||
|
|
||||||
|
export const GoogleSignIn: Component = () => {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<div id="google-auth-sign-in" class="g-signin2" data-onsuccess="googleOnSignIn"></div>
|
||||||
|
<a href="javascript:googleSignOut" id="google-auth-sign-out" class="hidden">Sign Out of Google Account</a>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
.hidden {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
.templatesList {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: max-content max-content max-content max-content max-content max-content max-content;
|
||||||
|
gap: 0px;
|
||||||
|
border-left: 1px solid #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.templatesListHeader > div {
|
||||||
|
border-top: 1px solid #000;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.templatesListRow {
|
||||||
|
display: contents;
|
||||||
|
}
|
||||||
|
|
||||||
|
.templatesListRow > div {
|
||||||
|
border-right: 1px solid #000;
|
||||||
|
border-bottom: 1px solid #000;
|
||||||
|
padding: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.templateCoord {
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.templateImagePreview {
|
||||||
|
max-width: 480px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.templateUpdateErrors {
|
||||||
|
color: #c00;
|
||||||
|
}
|
||||||
@ -1,7 +1,262 @@
|
|||||||
import { Component } from "solid-js";
|
import { Accessor, Component, createSignal, For, Index, onMount, Show } from "solid-js";
|
||||||
|
import { GoogleSignIn, googleUser } from "../common/googleAuth";
|
||||||
|
import styles from "./ThumbnailManager.module.scss";
|
||||||
|
|
||||||
|
class Coordinate {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Template {
|
||||||
|
name: string;
|
||||||
|
description: string;
|
||||||
|
attribution: string;
|
||||||
|
cropStart: Coordinate;
|
||||||
|
cropEnd: Coordinate;
|
||||||
|
locationStart: Coordinate;
|
||||||
|
locationEnd: Coordinate;
|
||||||
|
}
|
||||||
|
|
||||||
const ThumbnailManager: Component = () => {
|
const ThumbnailManager: Component = () => {
|
||||||
return <></>;
|
const [templates, setTemplates] = createSignal<Template[]>([]);
|
||||||
|
|
||||||
|
onMount(async () => {
|
||||||
|
const templateDataResponse = await fetch("/thrimshim/templates");
|
||||||
|
if (!templateDataResponse.ok) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const templateData = await templateDataResponse.json();
|
||||||
|
const templateList: Template[] = [];
|
||||||
|
for (const template of templateData) {
|
||||||
|
const cropStart = { x: template.crop[0], y: template.crop[1] };
|
||||||
|
const cropEnd = { x: template.crop[2], y: template.crop[3] };
|
||||||
|
const locationStart = { x: template.location[0], y: template.location[1] };
|
||||||
|
const locationEnd = { x: template.location[2], y: template.location[3] };
|
||||||
|
|
||||||
|
templateList.push({
|
||||||
|
name: template.name,
|
||||||
|
description: template.description,
|
||||||
|
attribution: template.attribution,
|
||||||
|
cropStart: cropStart,
|
||||||
|
cropEnd: cropEnd,
|
||||||
|
locationStart: locationStart,
|
||||||
|
locationEnd: locationEnd
|
||||||
|
});
|
||||||
|
}
|
||||||
|
setTemplates(templateList);
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div class={styles.templatesList}>
|
||||||
|
<div class={`${styles.templatesListRow} ${styles.templatesListHeader}`}>
|
||||||
|
<div>Name</div>
|
||||||
|
<div>Description</div>
|
||||||
|
<div>Attribution</div>
|
||||||
|
<div>Crop Coordiates</div>
|
||||||
|
<div>Location Coordinates</div>
|
||||||
|
<div>Preview</div>
|
||||||
|
<div></div>
|
||||||
|
</div>
|
||||||
|
<Index each={templates()}>
|
||||||
|
{(template: Accessor<Template>, index: number) => {
|
||||||
|
const [formErrors, setFormErrors] = createSignal<string[]>([]);
|
||||||
|
const [displayImagePreview, setDisplayImagePreview] = createSignal(false);
|
||||||
|
const [editing, setEditing] = createSignal(false);
|
||||||
|
let imageEditField;
|
||||||
|
|
||||||
|
const formSubmit = async (event: SubmitEvent) => {
|
||||||
|
setFormErrors([]);
|
||||||
|
|
||||||
|
const form = event.currentTarget as HTMLFormElement;
|
||||||
|
const formData = new FormData(form);
|
||||||
|
|
||||||
|
const name = formData.get("name") as string;
|
||||||
|
const description = formData.get("description") as string;
|
||||||
|
const attribution = formData.get("attribution") as string;
|
||||||
|
|
||||||
|
const cropStartX = parseInt(formData.get("cropstartx") as string, 10);
|
||||||
|
const cropStartY = parseInt(formData.get("cropstarty") as string, 10);
|
||||||
|
const cropEndX = parseInt(formData.get("cropendx") as string, 10);
|
||||||
|
const cropEndY = parseInt(formData.get("cropendy") as string, 10);
|
||||||
|
|
||||||
|
const locStartX = parseInt(formData.get("locstartx") as string, 10);
|
||||||
|
const locStartY = parseInt(formData.get("locstarty") as string, 10);
|
||||||
|
const locEndX = parseInt(formData.get("locendx") as string, 10);
|
||||||
|
const locEndY = parseInt(formData.get("locendy") as string, 10);
|
||||||
|
|
||||||
|
if (isNaN(cropStartX) || isNaN(cropStartY) || isNaN(cropEndX) || isNaN(cropEndY) || isNaN(locStartX) || isNaN(locStartY) || isNaN(locEndX) || isNaN(locEndY)) {
|
||||||
|
setFormErrors((errors) => {
|
||||||
|
errors.push("All crop and location information must be entered.");
|
||||||
|
return errors;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const imageFile = formData.get("image") as Blob;
|
||||||
|
const fileReader = new FileReader();
|
||||||
|
const fileReaderCompletePromise = new Promise<void>((resolve, reject) => {
|
||||||
|
fileReader.addEventListener("loadend", (event) => resolve());
|
||||||
|
});
|
||||||
|
fileReader.readAsDataURL(imageFile);
|
||||||
|
|
||||||
|
await fileReaderCompletePromise;
|
||||||
|
|
||||||
|
const submitData = new Map();
|
||||||
|
submitData.set("name", name);
|
||||||
|
submitData.set("description", description);
|
||||||
|
submitData.set("attribution", attribution);
|
||||||
|
submitData.set("crop", [cropStartX, cropStartY, cropEndX, cropEndY]);
|
||||||
|
submitData.set("location", [locStartX, locStartY, locEndX, locEndY]);
|
||||||
|
|
||||||
|
const imageDataURL = fileReader.result as string;
|
||||||
|
if (imageDataURL.startsWith("data:image/png;base64,")) {
|
||||||
|
submitData.set("image", imageDataURL.substring(22));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (googleUser) {
|
||||||
|
submitData.set("token", googleUser.getAuthResponse().id_token);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (formErrors().length > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const origName = template().name;
|
||||||
|
const encodedName = encodeURIComponent(origName);
|
||||||
|
const submitDataJSON = JSON.stringify(Object.fromEntries(submitData));
|
||||||
|
const submitResponse = await fetch(`/thrimshim/update-template/${encodedName}`, {
|
||||||
|
method: "POST",
|
||||||
|
body: submitDataJSON,
|
||||||
|
headers: { "Content-Type": "application/json" }
|
||||||
|
});
|
||||||
|
if (!submitResponse.ok) {
|
||||||
|
const errorText = await submitResponse.text();
|
||||||
|
setFormErrors((errors) => {
|
||||||
|
errors.push(errorText);
|
||||||
|
return errors;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const newTemplate: Template = {
|
||||||
|
name: name,
|
||||||
|
description: description,
|
||||||
|
attribution: attribution,
|
||||||
|
cropStart: { x: cropStartX, y: cropStartY },
|
||||||
|
cropEnd: { x: cropEndX, y: cropEndY },
|
||||||
|
locationStart: { x: locStartX, y: locStartY },
|
||||||
|
locationEnd: { x: locEndX, y: locEndY }
|
||||||
|
};
|
||||||
|
setTemplates((templateList) => {
|
||||||
|
templateList[index] = newTemplate;
|
||||||
|
return templateList;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<form class={styles.templatesListRow} onSubmit={formSubmit}>
|
||||||
|
<Show
|
||||||
|
when={editing()}
|
||||||
|
fallback={
|
||||||
|
<>
|
||||||
|
<div>{template().name}</div>
|
||||||
|
<div>{template().description}</div>
|
||||||
|
<div>{template().attribution}</div>
|
||||||
|
<div>
|
||||||
|
({template().cropStart.x}, {template().cropStart.y})
|
||||||
|
to
|
||||||
|
({template().cropEnd.x}, {template().cropEnd.y})
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
({template().locationStart.x}, {template().locationStart.y})
|
||||||
|
to
|
||||||
|
({template().locationEnd.x}, {template().locationEnd.y})
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Show
|
||||||
|
when={displayImagePreview()}
|
||||||
|
fallback={
|
||||||
|
<a
|
||||||
|
href="#"
|
||||||
|
onClick={
|
||||||
|
(event) => setDisplayImagePreview(true)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
Preview
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<img class={styles.templateImagePreview} src={`/thrimshim/template/${encodeURIComponent(template().name)}.png`} />
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={
|
||||||
|
(event) => setEditing(true)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
Edit
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<>
|
||||||
|
<div>
|
||||||
|
<input type="text" name="name" value={template().name} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<textarea name="description">{template().description}</textarea>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="text" name="attribution" value={template().attribution} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
(
|
||||||
|
<input type="number" name="cropstartx" placeholder="X" min={0} step={1} class={styles.templateCoord} value={template().cropStart.x} />
|
||||||
|
,
|
||||||
|
<input type="number" name="cropstarty" placeholder="Y" min={0} step={1} class={styles.templateCoord} value={template().cropStart.y} />
|
||||||
|
)
|
||||||
|
<br />
|
||||||
|
(
|
||||||
|
<input type="number" name="cropendx" placeholder="X" min={0} step={1} class={styles.templateCoord} value={template().cropEnd.x} />
|
||||||
|
,
|
||||||
|
<input type="number" name="cropendy" placeholder="Y" min={0} step={1} class={styles.templateCoord} value={template().cropEnd.y} />
|
||||||
|
)
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
(
|
||||||
|
<input type="number" name="locstartx" placeholder="X" min={0} step={1} class={styles.templateCoord} value={template().locationStart.x} />
|
||||||
|
,
|
||||||
|
<input type="number" name="locstarty" placeholder="Y" min={0} step={1} class={styles.templateCoord} value={template().locationStart.y} />
|
||||||
|
)
|
||||||
|
<br />
|
||||||
|
(
|
||||||
|
<input type="number" name="locendx" placeholder="X" min={0} step={1} class={styles.templateCoord} value={template().locationEnd.x} />
|
||||||
|
,
|
||||||
|
<input type="number" name="locendy" placeholder="Y" min={0} step={1} class={styles.templateCoord} value={template().locationEnd.y} />
|
||||||
|
)
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="file" name="image" accept="image/png" ref={imageEditField} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<button type="submit">Submit</button>
|
||||||
|
<ul class={styles.templateUpdateErrors}>
|
||||||
|
<For each={formErrors()}>
|
||||||
|
{(error: string, index: Accessor<number>) => <li>{error}</li>}
|
||||||
|
</For>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
</Show>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</Index>
|
||||||
|
</div>
|
||||||
|
<GoogleSignIn />
|
||||||
|
</>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ThumbnailManager;
|
export default ThumbnailManager;
|
||||||
|
|||||||
Loading…
Reference in New Issue