Skip to content

Commit e31c189

Browse files
nikita-remeslovnikita-remeslov
committed
BSA-183: * code style
1 parent 9a525b5 commit e31c189

File tree

19 files changed

+396
-400
lines changed

19 files changed

+396
-400
lines changed

‎public/html/game.html‎

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,46 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<link rel="stylesheet" href="/styles/reset.css" />
7+
<link rel="stylesheet" href="/styles/common.css" />
8+
<link rel="stylesheet" href="/styles/rooms.css" />
9+
<link rel="stylesheet" href="/styles/game.css" />
10+
<link
11+
href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&display=swap"
12+
rel="stylesheet"
13+
/>
14+
<script src="/socket.io/socket.io.js"></script>
15+
<script defer type="module" src="/javascript/game.mjs"></script>
16+
<title>Typing Race</title>
17+
</head>
318

4-
<head>
5-
<meta charset="UTF-8">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link rel="stylesheet" href="/styles/reset.css">
8-
<link rel="stylesheet" href="/styles/common.css">
9-
<link rel="stylesheet" href="/styles/rooms.css">
10-
<link rel="stylesheet" href="/styles/game.css">
11-
<link
12-
href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&display=swap"
13-
rel="stylesheet">
14-
<script src="/socket.io/socket.io.js"></script>
15-
<script defer type="module" src="/javascript/game.mjs"></script>
16-
<title>Typing Race</title>
17-
</head>
18-
19-
<body>
20-
<div id="root">
21-
<div id="rooms-page" class="full-screen">
22-
<h1 class="title">Join Room Or Create New</h1>
23-
<button id="add-room-btn">Create Room</button>
24-
<div id="rooms-wrapper">
25-
</div>
26-
</div>
27-
<div id="game-page" class="flex full-screen display-none">
28-
<div>
29-
<h1 id="room-name">Room name</h1>
30-
<button id="quit-room-btn">Back to Rooms</button>
31-
<div id="users-wrapper"></div>
32-
</div>
33-
<div>
34-
<div id="game-container">
35-
<button id="ready-btn">READY</button>
36-
<div id="timer" class="display-none">5</div>
37-
<p id="text-container" class="display-none">Sample text</p>
38-
<div id="game-timer" class="display-none">
39-
<span id="game-timer-seconds">5</span>
40-
<span> seconds left</span>
41-
</div>
19+
<body>
20+
<div id="root">
21+
<div id="rooms-page" class="full-screen">
22+
<h1 class="title">Join Room Or Create New</h1>
23+
<button id="add-room-btn">Create Room</button>
24+
<div id="rooms-wrapper"></div>
25+
</div>
26+
<div id="game-page" class="flex full-screen display-none">
27+
<div>
28+
<h1 id="room-name">Room name</h1>
29+
<button id="quit-room-btn">Back to Rooms</button>
30+
<div id="users-wrapper"></div>
31+
</div>
32+
<div>
33+
<div id="game-container">
34+
<button id="ready-btn">READY</button>
35+
<div id="timer" class="display-none">5</div>
36+
<p id="text-container" class="display-none">Sample text</p>
37+
<div id="game-timer" class="display-none">
38+
<span id="game-timer-seconds">5</span>
39+
<span> seconds left</span>
40+
</div>
41+
</div>
42+
</div>
43+
</div>
4244
</div>
43-
</div>
44-
</div>
45-
</div>
46-
</body>
47-
48-
</html>
45+
</body>
46+
</html>

‎public/html/login.html‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<link rel="stylesheet" href="/styles/reset.css" />
7+
<link rel="stylesheet" href="/styles/common.css" />
8+
<link rel="stylesheet" href="/styles/login.css" />
9+
<link
10+
href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&display=swap"
11+
rel="stylesheet"
12+
/>
13+
<script defer type="module" src="/javascript/login.mjs"></script>
14+
<title>Login</title>
15+
</head>
316

4-
<head>
5-
<meta charset="UTF-8">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link rel="stylesheet" href="/styles/reset.css">
8-
<link rel="stylesheet" href="/styles/common.css">
9-
<link rel="stylesheet" href="/styles/login.css">
10-
<link
11-
href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&display=swap"
12-
rel="stylesheet">
13-
<script defer type="module" src="/javascript/login.mjs"></script>
14-
<title>Login</title>
15-
</head>
16-
17-
<body>
18-
<div id="root">
19-
<div id="login-page" class="full-screen flex-centered">
20-
<div class="flex">
21-
<div class="username-input-container">
22-
<input id="username-input" autofocus placeholder="username" type="text">
17+
<body>
18+
<div id="root">
19+
<div id="login-page" class="full-screen flex-centered">
20+
<div class="flex">
21+
<div class="username-input-container">
22+
<input id="username-input" autofocus placeholder="username" type="text" />
23+
</div>
24+
<button id="submit-button" class="no-select">submit</button>
25+
</div>
26+
</div>
2327
</div>
24-
<button id="submit-button" class="no-select">submit</button>
25-
</div>
26-
</div>
27-
</div>
28-
</body>
29-
30-
</html>
28+
</body>
29+
</html>

‎public/javascript/game.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const username = sessionStorage.getItem('username');
22

33
if (!username) {
4-
window.location.replace('/login');
4+
window.location.replace('/login');
55
}
66

77
const socket = io('', { query: { username } });

‎public/javascript/helpers/dom-helper.mjs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
export const createElement = ({ tagName, className, attributes = {}, innerElements = [] }) => {
2-
const element = document.createElement(tagName);
2+
const element = document.createElement(tagName);
33

4-
if (className) {
5-
addClass(element, className);
6-
}
4+
if (className) {
5+
addClass(element, className);
6+
}
77

8-
Object.keys(attributes).forEach(key => element.setAttribute(key, attributes[key]));
8+
Object.keys(attributes).forEach(key => element.setAttribute(key, attributes[key]));
99

10-
innerElements.forEach(innerElement => element.append(innerElement));
10+
innerElements.forEach(innerElement => element.append(innerElement));
1111

12-
return element;
12+
return element;
1313
};
1414

1515
export const addClass = (element, className) => {
16-
const classNames = formatClassNames(className);
17-
element.classList.add(...classNames);
16+
const classNames = formatClassNames(className);
17+
element.classList.add(...classNames);
1818
};
1919

2020
export const removeClass = (element, className) => {
21-
const classNames = formatClassNames(className);
22-
element.classList.remove(...classNames);
21+
const classNames = formatClassNames(className);
22+
element.classList.remove(...classNames);
2323
};
2424

2525
export const formatClassNames = className => className.split(' ').filter(Boolean);

‎public/javascript/login.mjs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const username = sessionStorage.getItem('username');
22

33
if (username) {
4-
window.location.replace('/game');
4+
window.location.replace('/game');
55
}
66

77
const submitButton = document.getElementById('submit-button');
@@ -10,19 +10,19 @@ const input = document.getElementById('username-input');
1010
const getInputValue = () => input.value;
1111

1212
const onClickSubmitButton = () => {
13-
const inputValue = getInputValue();
14-
if (!inputValue) {
15-
return;
16-
}
17-
sessionStorage.setItem('username', inputValue);
18-
window.location.replace('/game');
13+
const inputValue = getInputValue();
14+
if (!inputValue) {
15+
return;
16+
}
17+
sessionStorage.setItem('username', inputValue);
18+
window.location.replace('/game');
1919
};
2020

2121
const onKeyUp = ev => {
22-
const enterKeyCode = 13;
23-
if (ev.keyCode === enterKeyCode) {
24-
submitButton.click();
25-
}
22+
const enterKeyCode = 13;
23+
if (ev.keyCode === enterKeyCode) {
24+
submitButton.click();
25+
}
2626
};
2727

2828
submitButton.addEventListener('click', onClickSubmitButton);

0 commit comments

Comments
 (0)