diff --git a/src/pages/index.js b/src/pages/index.js index 18dd801..606bef0 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -101,3 +101,7 @@ const placeButtonElt = document.getElementById("color-place-button"); placeButtonElt.addEventListener("click", () => { placePixelButton(); }); + +export { + room +} diff --git a/src/rooms/canvas/index.js b/src/rooms/canvas/index.js index d3fe575..644a73b 100644 --- a/src/rooms/canvas/index.js +++ b/src/rooms/canvas/index.js @@ -89,7 +89,7 @@ async function getPixelInfo(room, posX, posY) { const response = await authedAPIRequest( "/rooms/" + room + "/canvas/pixels", { - method: "POST", + method: "GET", headers: { "Content-Type": "application/json", }, diff --git a/src/rooms/canvas/utils.js b/src/rooms/canvas/utils.js index c6feb9e..ba7fef5 100644 --- a/src/rooms/canvas/utils.js +++ b/src/rooms/canvas/utils.js @@ -6,6 +6,8 @@ // - toggleTooltip (toggle the tooltip and display the pixel's information) import $ from "jquery"; +import { getPixelInfo } from "./index"; +import { room } from "../../pages/index"; const canvasContainer = $("#canvas-container")?.[0]; const canvas = $("#canvas")?.[0]; @@ -60,6 +62,10 @@ export const toggleTooltip = async (state = false) => { if (state) { // FIXME: You should implement or call a function to get the pixel's information // and display it. Make use of target.x and target.y to get the pixel's position. + const response = await getPixelInfo(room, target.x, target.y); + if (!response) { + return; + } } }; diff --git a/src/rooms/index.js b/src/rooms/index.js index 0364732..1e53671 100644 --- a/src/rooms/index.js +++ b/src/rooms/index.js @@ -1,6 +1,7 @@ import { authedAPIRequest } from "../utils/auth"; import { subscribe } from "../utils/streams"; import { resetValues } from "./canvas/utils"; +import { room } from "../pages/index" // FIXME: This file should handle the rooms API // Functions may include: // - fetchRoomConfig (get the configuration of a room) @@ -19,7 +20,7 @@ function setCurrentRoomConfig(cfg) { } async function getCurrentRoomConfig() { if (!roomConfig) { - await fetchRoomConfig(); + await fetchRoomConfig(room); } return roomConfig; diff --git a/src/students/index.js b/src/students/index.js index b7fab1e..5c84a45 100644 --- a/src/students/index.js +++ b/src/students/index.js @@ -13,7 +13,7 @@ async function getStudent(login) { if (!response || !response.ok) { console.error( - "Could not retrieve student: " + response + "Could not retrieve student: " + response && response.statusText ? response.statusText : " no status text", );