Skip to content

Commit e6622b7

Browse files
author
daria-z
committed
add games wrapper
1 parent 4a36842 commit e6622b7

File tree

2 files changed

+48
-11
lines changed

2 files changed

+48
-11
lines changed

src/games/calculator.js

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,42 @@ import greeting from "./utils/greeting.js";
33
import askUser from "./utils/askUser.js";
44
import generateOperator from "./utils/generateOperator.js";
55

6+
import gamesWrapper from "./utils/gamesWrapper.js";
67

7-
export default () => {
8-
const userName = greeting();
9-
10-
console.log('What is the result of the expression?');
118

12-
for (let i = 1; i <= 3; i += 1) {
9+
export default () => {
10+
const rule = 'What is the result of the expression?';
11+
const logic = (name) => {
1312
const number1 = generateRandomNumber(1, 10);
1413
const number2 = generateRandomNumber(1, 10);
1514
const symbol = generateOperator();
1615
const question = `${number1} ${symbol} ${number2}`;
17-
const answer = eval(question).toSring();
16+
const answer = eval(question);
1817

19-
if (askUser(userName, question, answer) === false) {
18+
if (askUser(name, question, answer) === false) {
2019
return;
2120
}
22-
23-
console.log('Correct!');
24-
}
25-
console.log(`Congratulations, ${userName}!`);
21+
};
22+
gamesWrapper(rule, logic);
2623
};
24+
25+
// export default () => {
26+
// const userName = greeting();
27+
28+
// console.log('What is the result of the expression?');
29+
30+
// for (let i = 1; i <= 3; i += 1) {
31+
// const number1 = generateRandomNumber(1, 10);
32+
// const number2 = generateRandomNumber(1, 10);
33+
// const symbol = generateOperator();
34+
// const question = `${number1} ${symbol} ${number2}`;
35+
// const answer = eval(question).toSring();
36+
37+
// if (askUser(userName, question, answer) === false) {
38+
// return;
39+
// }
40+
41+
// console.log('Correct!');
42+
// }
43+
// console.log(`Congratulations, ${userName}!`);
44+
// };

src/games/utils/gamesWrapper.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import readlineSync from 'readline-sync';
2+
3+
export default (rules, gameLogic) => {
4+
console.log('Welcome to the Brain Games!');
5+
6+
const name = readlineSync.question('May I have your name? ');
7+
8+
console.log(`Hello, ${name}!`);
9+
10+
console.log(rules);
11+
12+
for (let i = 1; i <= 3; i += 1) {
13+
14+
gameLogic(name);
15+
16+
console.log('Correct!');
17+
}
18+
console.log(`Congratulations, ${name}!`);
19+
};

0 commit comments

Comments
 (0)