Skip to content

Новожилова Екатерина #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pavuuk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Новожилова Екатерина #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions client/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,23 @@ document.querySelector("#start").addEventListener("submit", e => {
document.querySelector(".container").classList.add("ready");
});

const receivedOnField = (message) => {
const result = JSON.parse(message?.['data'])

if (result['type'] === 'place')
drawer.putArray(result['payload']['place']);
}

const main = apiKey => {
const ws = connect(apiKey);
ws.addEventListener("message", console.log);
ws.addEventListener("message", receivedOnField);

timeout.next = new Date();
drawer.onClick = (x, y) => {
drawer.put(x, y, picker.color);
ws.send(JSON.stringify({
type: "click",
payload: {x, y, color: picker.color}
}));
};
};

Expand Down
14 changes: 2 additions & 12 deletions client/picker.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ const setAttributes = (element, object) => {
};

const drawPalette = async () => {
const colors = hardcodedColors;
const reply = await fetch("/api/getColors");
const colors = await reply.json();
pickedColor = colors[0];
const palette = document.querySelector("#palette");
const fragment = document.createDocumentFragment();
Expand Down Expand Up @@ -37,17 +38,6 @@ const drawPalette = async () => {
palette.appendChild(fragment);
};

const hardcodedColors = [
"#140c1c",
"#30346d",
"#854c30",
"#d04648",
"#597dce",
"#8595a1",
"#d2aa99",
"#dad45e",
];

let pickedColor = null;

drawPalette().catch(console.error);
Expand Down
Loading