From bbce1fb05f3b0a8c07e55fcfa66d20602278c4f4 Mon Sep 17 00:00:00 2001 From: omri Date: Sat, 13 Jul 2024 21:48:03 +0300 Subject: [PATCH] FINALLY --- backend/main.go | 2 +- backend/relay.go | 4 ++-- frontend/src/RelayForm.tsx | 27 +++++++++++++++++++++++---- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/backend/main.go b/backend/main.go index 5eeabc6..ca7fb12 100644 --- a/backend/main.go +++ b/backend/main.go @@ -41,7 +41,7 @@ func main() { return } - if len(req.Events) > 10 { + if len(req.Events) > 11 { c.JSON(http.StatusBadRequest, gin.H{ "error": "too many events", }) diff --git a/backend/relay.go b/backend/relay.go index 36005c5..85d6201 100644 --- a/backend/relay.go +++ b/backend/relay.go @@ -19,8 +19,8 @@ type PermWithTime struct { } type AssignmentWithTime struct { - Assignment Assignment - Time float64 + Assignment Assignment `json:"assignment"` + Time float64 `json:"time"` } type Config struct { diff --git a/frontend/src/RelayForm.tsx b/frontend/src/RelayForm.tsx index 207c5c1..229c7a8 100644 --- a/frontend/src/RelayForm.tsx +++ b/frontend/src/RelayForm.tsx @@ -4,7 +4,8 @@ import SolverForm from "./SolverForm"; import axios from "axios"; type Assignment = { - [solver: string]: string[]; + solver: string; + events: string[]; }; const backend = axios.create({ baseURL: "http://localhost:8080" }); @@ -66,8 +67,14 @@ const RelayForm: React.FC = () => { .post("/relay", data) .then((response) => { setRelayTime(response.data.response.time); - console.log("assi", response.data.response.assignment); - setAssignments(response.data.response.assignment); + setAssignments( + Object.entries(response.data.response.assignment).map( + ([solver, events]) => ({ + solver, + events: events as string[], + }), + ), + ); }) .catch((error) => { console.error(error); @@ -92,7 +99,19 @@ const RelayForm: React.FC = () => { - {Object.entries(assignments).toString()} + {assignments.map((assignment, index) => ( + +
+ {assignment.events.map((event, idx) => ( + {event} + ))} +
+
+ ))}
);