From 644059ac5b8712189354e5b68e22fa7aac5fb101 Mon Sep 17 00:00:00 2001 From: AleksandraCyp <73715885+AleksandraCyp@users.noreply.github.com> Date: Sat, 16 Jan 2021 13:56:05 +0100 Subject: [PATCH] Change bottom of the main page button on hover, change some font styles, move tests to the test folder --- styles/App.css | 9 ++++++++- {src/service => test}/GameHandler.spec.js | 2 +- {src/service => test}/QuestionGenerator.spec.js | 4 ++-- {src/service => test}/QuestionService.spec.js | 4 ++-- {src/service => test}/randomNumberInRange.test.js | 2 +- {src/service => test}/shuffleAnswers.test.js | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) rename {src/service => test}/GameHandler.spec.js (94%) rename {src/service => test}/QuestionGenerator.spec.js (86%) rename {src/service => test}/QuestionService.spec.js (95%) rename {src/service => test}/randomNumberInRange.test.js (98%) rename {src/service => test}/shuffleAnswers.test.js (97%) diff --git a/styles/App.css b/styles/App.css index 2290694..083d744 100644 --- a/styles/App.css +++ b/styles/App.css @@ -86,7 +86,7 @@ body { #enterYourName { padding-bottom: 5%; - font-family: 'Ranchers', cursive; + font-family: 'Ranchers', Arial, sans-serif; font-size: 5.5vh; } @@ -104,6 +104,8 @@ body { border-bottom: black solid 1px; padding: 2% 5%; background-color: transparent; + font-size: 3vh; + color: black; } /* div buttonPlay */ @@ -139,6 +141,11 @@ ul.bottomOfThePageOptions li { line-height: 8.5vh; font-weight: 900; cursor: pointer; + transition: 0.1s; +} + +ul.bottomOfThePageOptions li:hover { + background-color: #6da2ff; } ul.bottomOfThePageOptions li img{ diff --git a/src/service/GameHandler.spec.js b/test/GameHandler.spec.js similarity index 94% rename from src/service/GameHandler.spec.js rename to test/GameHandler.spec.js index 1910cd3..abb807e 100644 --- a/src/service/GameHandler.spec.js +++ b/test/GameHandler.spec.js @@ -1,4 +1,4 @@ -import{GameHandler} from "./GameHandler" +import{GameHandler} from "../src/service/GameHandler" describe('Store user choosen and statistic during game', () => { it('Should update game statistic', () => { diff --git a/src/service/QuestionGenerator.spec.js b/test/QuestionGenerator.spec.js similarity index 86% rename from src/service/QuestionGenerator.spec.js rename to test/QuestionGenerator.spec.js index cb0210b..971de60 100644 --- a/src/service/QuestionGenerator.spec.js +++ b/test/QuestionGenerator.spec.js @@ -1,5 +1,5 @@ -import { QuestionGenerator } from './QuestionGenerator'; -import { WHO_IS_THAT_POKEMON } from "./modes"; +import { QuestionGenerator } from '../src/service/QuestionGenerator'; +import { WHO_IS_THAT_POKEMON } from "../src/service/modes"; const generatedQuestion = new QuestionGenerator(WHO_IS_THAT_POKEMON); diff --git a/src/service/QuestionService.spec.js b/test/QuestionService.spec.js similarity index 95% rename from src/service/QuestionService.spec.js rename to test/QuestionService.spec.js index 870a7b8..f45f6c3 100644 --- a/src/service/QuestionService.spec.js +++ b/test/QuestionService.spec.js @@ -1,7 +1,7 @@ -import { WHO_IS_THAT_POKEMON } from "./modes"; +import { WHO_IS_THAT_POKEMON } from "../src/service/modes"; import { QuestionService -} from "./QuestionService.js"; +} from "../src/service/QuestionService.js"; const quizQuestion = new QuestionService(); diff --git a/src/service/randomNumberInRange.test.js b/test/randomNumberInRange.test.js similarity index 98% rename from src/service/randomNumberInRange.test.js rename to test/randomNumberInRange.test.js index b556847..c6d7847 100644 --- a/src/service/randomNumberInRange.test.js +++ b/test/randomNumberInRange.test.js @@ -1,4 +1,4 @@ -import { randomNumberInRange } from './randomNumberInRange' +import { randomNumberInRange } from '../src/service/randomNumberInRange' describe('Test randomNumberInRange function', () => { diff --git a/src/service/shuffleAnswers.test.js b/test/shuffleAnswers.test.js similarity index 97% rename from src/service/shuffleAnswers.test.js rename to test/shuffleAnswers.test.js index ebef9c4..d5e2e73 100644 --- a/src/service/shuffleAnswers.test.js +++ b/test/shuffleAnswers.test.js @@ -1,4 +1,4 @@ -import { shuffleAnswers } from "./shuffleAnswers"; +import { shuffleAnswers } from "../src/service/shuffleAnswers"; describe('Test shuffeAnswers function', () => {