diff --git a/README.md b/README.md index 379fca9..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,10 +0,0 @@ -# E/Place - -> **Note** This is a school project, therefore it probably won't interest you if you are looking for something useful. - -## Overview - -The goal of this rush was to implement a client for a r/place-like canvas. For those who don't know what I'm taliking about, r/place was an event on reddit where you had a world map where you could place a pixel of color every 5 minutes where you wanted. -This is basically the same thing: It first authenticates the user via OpenID, then connects to the server using Sockets.IO and a REST API simultaneously. Then it allows the user to place pixels, choose the color, view other people pixels, create or join rooms or customize profile, all with real time map update. -We had approximately 2 days to implement the client. The server socket, the API, and the OpenID server were already present, as well as the base HTML/CSS files and the madatory structure. - diff --git a/src/pages/index.js b/src/pages/index.js index 4172042..fde38e0 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -20,7 +20,7 @@ await authenticate(); // let room = window.location.pathname.split("/")[1]; const update_waitlist = []; -let initialized = false; +const initialized = false; if (!room) { room = "epi-place"; @@ -53,7 +53,6 @@ socket.on("message", async (response) => { } initCanvas(await getCurrentRoomConfig(room), pixels); - initialized = true; while (update_waitlist.length > 0) { const obj = update_waitlist.pop(); @@ -82,6 +81,16 @@ socket.on("pixel-update", async (msg) => { color, } = msg.result.data.json; + const cfg = await getCurrentRoomConfig(room); + + if (!cfg || !cfg.settings || !cfg.settings.roomColors) { + console.error( + "Internal error: Cannot access config after retrieving it", + ); + console.debug(cfg); + return; + } + if (!initialized) { update_waitlist.push({ posX, posY, color }); return; diff --git a/src/rooms/canvas/index.js b/src/rooms/canvas/index.js index 9e1d0bf..c7343fe 100644 --- a/src/rooms/canvas/index.js +++ b/src/rooms/canvas/index.js @@ -15,15 +15,11 @@ async function fetchCanvas(room) { }); if (!response || !response.ok) { - // console.error( - // "Could not retrieve room canvas: " + response && response.statusText - // ? response.statusText - // : "no more informations", - // ); console.error( - "Could not retrieve room canvas: nique ta mère la moulinette", + "Could not retrieve room canvas: " + response && response.statusText + ? response.statusText + : "no more informations", ); - // console.debug(await response.text()); return null; } diff --git a/src/rooms/canvas/utils.js b/src/rooms/canvas/utils.js index 420688f..2e5ac33 100644 --- a/src/rooms/canvas/utils.js +++ b/src/rooms/canvas/utils.js @@ -7,7 +7,6 @@ import $ from "jquery"; import { getPixelInfo } from "./index"; -import { getStudent } from "../../students"; const canvasContainer = $("#canvas-container")?.[0]; const canvas = $("#canvas")?.[0]; @@ -69,13 +68,12 @@ export const toggleTooltip = async (state = false) => { } // Display - const date = new Date(response.timestamp); + const date = new Date(response.timestamp * 1000); document.getElementById("tooltip-date").innerText = - date.toLocaleDateString("fr-fr"); + date.toLocaleDateString(); document.getElementById("tooltip-time").innerText = - date.toLocaleTimeString("fr-fr"); - getStudent(response.placedByUid); + date.toLocaleTimeString(); } }; diff --git a/src/rooms/index.js b/src/rooms/index.js index ddc6e8d..784ddf4 100644 --- a/src/rooms/index.js +++ b/src/rooms/index.js @@ -103,10 +103,9 @@ async function fetchRoomConfig(room) { setCurrentRoomConfig(res); // Update HTML - document.getElementById("room-name").innerText = res.metadata.name; - document.getElementById("room-description").innerText = - res.metadata.description; - document.getElementById("room-description").style.display = "block"; + const roomNameElt = document.getElementById("room-name"); + + roomNameElt.innerText = res.metadata.name; } export { diff --git a/src/students/index.js b/src/students/index.js index 55a6b7d..5c84a45 100644 --- a/src/students/index.js +++ b/src/students/index.js @@ -1,5 +1,4 @@ import { authedAPIRequest } from "../utils/auth"; -import { displayStudentProfile } from "./utils"; //get a student from the API by its uid or login async function getStudent(login) { @@ -28,7 +27,8 @@ async function getStudent(login) { console.debug(res); // Update HTML - displayStudentProfile(res.avatarURL, res.login, res.guild, res.quote); + // const roomNameElt = document.getElementById("room-name"); + // roomNameElt.innerText = res.metadata.name } //// get the user's uid from the token in local storage diff --git a/src/students/utils.js b/src/students/utils.js index eb7d2b2..09bb32e 100644 --- a/src/students/utils.js +++ b/src/students/utils.js @@ -1,11 +1,5 @@ -// display the student's profile in the DOM -function displayStudentProfile(picture, login, guild, quote) { - document.getElementById("tooltip-info-avatar").src = picture; - document.getElementById("tooltip-info-login").innerText = login; - document.getElementById("tooltip-info-guild").innerText = guild; - document.getElementById("tooltip-info-quote").innerText = quote; -} -// add a form modal to the DOM -function showModal() {} - -export { displayStudentProfile, showModal }; +// FIXME: This file should handle the students DOM manipulation +// Link buttons to their respective functions +// Functions may include: +// - displayStudentProfile (display the student's profile in the DOM) +// - showModal (add a form modal to the DOM)