Skip to content

Commit b18e67f

Browse files
author
daria-z
committed
add wrapper in all games
1 parent b81d4a0 commit b18e67f

File tree

10 files changed

+57
-57
lines changed

10 files changed

+57
-57
lines changed

src/cli.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import userGreeting from './games/userGreeting.js';
2-
import evenChecking from './games/evenChecking.js';
2+
import even from './games/brain-even.js';
33
import calculator from './games/brain-calculator.js';
4-
import gcd from './games/gcd.js';
4+
import gcd from './games/brain-gcd.js';
55
import progression from './games/brain-progression.js';
66
import prime from './games/brain-prime.js';
77

8-
export { userGreeting, evenChecking, calculator, gcd, progression, prime };
8+
export {
9+
userGreeting, even, calculator, gcd, progression, prime,
10+
};

src/games/brain-calculator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import gamesWrapper from "./utils/gamesWrapper.js";
2-
import { rule, innerlogic } from "./gamesLogic/calculator.js";
2+
import { rule, logic } from "./gamesLogic/calculator.js";
33

44
export default () => {
5-
gamesWrapper(rule, innerlogic);
5+
gamesWrapper(rule, logic);
66
};
77

src/games/brain-even.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import gamesWrapper from "./utils/gamesWrapper.js";
2+
import { rule, logic } from "./gamesLogic/even.js";
3+
4+
export default () => {
5+
gamesWrapper(rule, logic);
6+
};

src/games/brain-gcd.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import gamesWrapper from "./utils/gamesWrapper.js";
2+
import { rule, logic } from "./gamesLogic/gcd.js";
3+
4+
export default () => {
5+
gamesWrapper(rule, logic);
6+
};

src/games/evenChecking.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/games/gamesLogic/calculator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import generateOperator from "../utils/generateOperator.js";
33

44
export const rule = 'What is the result of the expression?';
55

6-
export const innerlogic = () => {
6+
export const logic = () => {
77
const number1 = generateRandomNumber(1, 10);
88
const number2 = generateRandomNumber(1, 10);
99
const symbol = generateOperator();

src/games/gamesLogic/even.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import generateRandomNumber from "../utils/generateRandomNumber.js";
2+
3+
export const rule = '\'yes\' is wrong answer ;(. Correct answer was \'no\'.';
4+
5+
export const logic = () => {
6+
const questionNumber = Math.floor(Math.random() * 50);
7+
const correctAnswer = questionNumber % 2 === 0 ? 'yes' : 'no';
8+
9+
return [questionNumber, correctAnswer];
10+
}
11+

src/games/gamesLogic/gcd.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import generateRandomNumber from "../utils/generateRandomNumber.js";
2+
3+
export const rule = 'Find the greatest common divisor of given numbers.';
4+
5+
export const logic = () => {
6+
const number1 = generateRandomNumber(1, 20);
7+
const number2 = generateRandomNumber(1, 20);
8+
9+
const nod = (a, b) => {
10+
while (a !== b) {
11+
if (a > b) {
12+
a = a - b;
13+
} else {
14+
b = b - a;
15+
}
16+
}
17+
return a;
18+
}
19+
const question = `${number1} ${number2}`;
20+
const answer = nod(number1, number2);
21+
22+
return [question, answer];
23+
}
24+
25+

src/games/gamesLogic/prime.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import generateRandomNumber from "../utils/generateRandomNumber.js";
22

3-
export const rule = 'Answer "yes" if given number is prime. Otherwise answer "no".';
3+
export const rule = 'Answer \'yes\' if given number is prime. Otherwise answer \'no\'.';
44

55
export const logic = () => {
66
const number = generateRandomNumber(1, 10);

src/games/gcd.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)