diff --git a/src/backend/main.py b/src/backend/main.py index bab18fb..3830f3e 100644 --- a/src/backend/main.py +++ b/src/backend/main.py @@ -1,6 +1,6 @@ import json from io import BytesIO -from typing import Annotated +from typing import Annotated, Union import requests from dotenv import dotenv_values, find_dotenv @@ -92,11 +92,13 @@ async def components(module: str = "datastamp", encode: bool = False): @app.post("/process") async def process_image( - image: Annotated[UploadFile, Form()], data: Annotated[str, Form()] + data: Annotated[str, Form()] = None, + image: Annotated[Union[None, UploadFile], Form()] = None, ): """Process the image with the defined options""" data = json.loads(data) - img_bytes = BytesIO(await image.read()) + if image is not None: + img_bytes = BytesIO(await image.read()) # PIL.Image.open(img_bytes) to open as pillow image match data["module"]: @@ -109,8 +111,8 @@ async def process_image( case "steg": pass - return Response(img_bytes.read(), media_type="image/png") return "Text example" + return Response(img_bytes.read(), media_type="image/png") # Make sure this is always at the bottom diff --git a/src/frontend/app.html b/src/frontend/app.html index b09ffb6..7b12254 100644 --- a/src/frontend/app.html +++ b/src/frontend/app.html @@ -39,7 +39,7 @@

Emerging Exceptions

-
+
diff --git a/src/frontend/app.js b/src/frontend/app.js index 0d4cd78..cb6d80c 100644 --- a/src/frontend/app.js +++ b/src/frontend/app.js @@ -102,16 +102,17 @@ for (let i = 0; i < nav_items.length; i++) { // get_inputs() // }) + steg_btn.addEventListener("click", e => { // Only needs input - output_panel.hidden = false + input_panel.hidden = false module = "steg" get_inputs() }) datastamp_btn.addEventListener("click", e => { // Only needs input - output_panel.hidden = true + input_panel.hidden = true module = "datastamp" get_inputs() }) @@ -184,7 +185,7 @@ const submit_btn = document.getElementById("submit") submit_btn.addEventListener("click", e => { let data = new FormData() - data.append("image", file) + if (file != null) {data.append("image", file)} data.append("data", JSON.stringify({ "module": module, "is_encode": encode,