-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
Feedback branch for nowakprojects #68
base: feedback
Are you sure you want to change the base?
Commits on Dec 30, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 9c59cad - Browse repository at this point
Copy the full SHA 9c59cadView commit details
Commits on Dec 31, 2020
-
Configuration menu - View commit details
-
Copy full SHA for b6bb88b - Browse repository at this point
Copy the full SHA b6bb88bView commit details
Commits on Jan 1, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 323615c - Browse repository at this point
Copy the full SHA 323615cView commit details -
Configuration menu - View commit details
-
Copy full SHA for e73fcfb - Browse repository at this point
Copy the full SHA e73fcfbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4966957 - Browse repository at this point
Copy the full SHA 4966957View commit details
Commits on Jan 2, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 7534526 - Browse repository at this point
Copy the full SHA 7534526View commit details -
Configuration menu - View commit details
-
Copy full SHA for e10f137 - Browse repository at this point
Copy the full SHA e10f137View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8b409ed - Browse repository at this point
Copy the full SHA 8b409edView commit details -
Configuration menu - View commit details
-
Copy full SHA for 63fcd66 - Browse repository at this point
Copy the full SHA 63fcd66View commit details -
Configuration menu - View commit details
-
Copy full SHA for e7fe5ca - Browse repository at this point
Copy the full SHA e7fe5caView commit details -
Configuration menu - View commit details
-
Copy full SHA for dc411a7 - Browse repository at this point
Copy the full SHA dc411a7View commit details -
this is my super change; Paired with <somebody>
Configuration menu - View commit details
-
Copy full SHA for 21ca939 - Browse repository at this point
Copy the full SHA 21ca939View commit details -
Mng 10 starting page html template (#7)
* Add a starting page HTML template * change template HTML for the starting page into a js file
Configuration menu - View commit details
-
Copy full SHA for 6f9cf69 - Browse repository at this point
Copy the full SHA 6f9cf69View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9826724 - Browse repository at this point
Copy the full SHA 9826724View commit details
Commits on Jan 3, 2021
-
MNG-15 Add API urls, start tests and function for pokemons.js (#10)
* MNG-15 Add API urls, start tests and function for pokemons.js * Change url end Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com> * Make function async Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com> * Correct url end * MNG-15 Recreate test function for getPokemonById to follow the rule given, when, then * MNG-15 Write first version of getPokemonById * MNG-15 Fix test async function handling with beforeAll * MNG-15 Add test for get types by id * MNG-15 Create getTypeById function * Refactoring tests and getPokemonById to be more readable. Remove nested describe functions, not use destructuring with pokemon data Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 104faf8 - Browse repository at this point
Copy the full SHA 104faf8View commit details
Commits on Jan 4, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 704ea6a - Browse repository at this point
Copy the full SHA 704ea6aView commit details -
Bump node-notifier from 8.0.0 to 8.0.1 (#9)
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 8.0.0 to 8.0.1. - [Release notes](https://github.com/mikaelbr/node-notifier/releases) - [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md) - [Commits](mikaelbr/node-notifier@v8.0.0...v8.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 9fd84b8 - Browse repository at this point
Copy the full SHA 9fd84b8View commit details -
MNG-22 Update img and my name (#13)
* Update img and my name * MNG-22 add IMG * MNG-22 Rename IMG
Configuration menu - View commit details
-
Copy full SHA for d245841 - Browse repository at this point
Copy the full SHA d245841View commit details -
* Update img and my name * MNG-22 add IMG * MNG-22 Rename IMG * Add SVG icons
Configuration menu - View commit details
-
Copy full SHA for 763ca4e - Browse repository at this point
Copy the full SHA 763ca4eView commit details
Commits on Jan 5, 2021
-
MNG-12 style out starting page (initially) (#14)
* Good but for corrections * Now better * Responsiveness + little corrections * Centering some elements + correcting "Quiz" * Comments * Bolder question mark * Merge branch 'dev' into MNG-12-Style-out-StartingPage-(initially) * Correction Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 53f8e96 - Browse repository at this point
Copy the full SHA 53f8e96View commit details -
MNG-16 Add a help screen, style it (has to be polished, the scrollbar…
… is not… (#16) * Add a help screen, style it (has to be polished, the scrollbar is not styled). Add help screen HTML the the page, add an event listener for the help screen and a reusable function showAPopUpScreen (can be used to display hall of fame) * Remove event listener from the exit button every time it is clicked, correct spelling mistakes
Configuration menu - View commit details
-
Copy full SHA for e5d2ea6 - Browse repository at this point
Copy the full SHA e5d2ea6View commit details -
MNG-16 create pokemon service js (#12)
* Add randomPokemonId method * Add methods - answers and correctAnswer * Add getNextQuestion method * Add checkAnswer method * Remove App import * Add tests for randomPokemonId, answers and correctAnswer methods * Add test for getNextQuestion method * Change name of file and class to QuestionService * Modify questionService.js name * Fix for bug in correctAnswerId variable * Modify getNextQuestion to resolve promise from getPokemonById * Add promise.all but still sth is wrong * Add test for getNextQuestion method * Add object scheme to QuestionService * Add test for checkAnswer method * Add correctAnswerIndex to class QuestionService * Remove comments * Modify import in test file * Modify import in test file * Update test for checkAnswer method * Modify modes * Fix mode typo * Fix test typo * Add mode parameter to getNextQuestion method
Configuration menu - View commit details
-
Copy full SHA for a6cd262 - Browse repository at this point
Copy the full SHA a6cd262View commit details
Commits on Jan 6, 2021
-
MNG-25 make every button on main page clickable (#20)
* print the name of clicked button * no possibility to click on the button while a hel screen is active * Correction Co-authored-by: AgataLudwiczynska <74932979+AgataLudwiczynska@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 57e1640 - Browse repository at this point
Copy the full SHA 57e1640View commit details
Commits on Jan 7, 2021
-
MNG-26 MNG-38 MNG-39 MNG-40 Add a randomNumberInRange function and te…
…sts / font secure / add icon / change website title * Add a randomNumberInRange function and tests * Change page title, add an icon, change http to https * Change raundomNumberInRange.js, change the relative tests * change error messages, if statements, min>max logic, remove parenthesis
Configuration menu - View commit details
-
Copy full SHA for 62b34d4 - Browse repository at this point
Copy the full SHA 62b34d4View commit details -
* Add instructions * Update src/app/addHelpScreenTemplate.js Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 1eb8841 - Browse repository at this point
Copy the full SHA 1eb8841View commit details -
MNG-11 html quiz template (#19)
* MNG-11 Add quiz template to index.html and create js file to render this template * Update quiz template, add template for quiz answer * MNG-11 Create renderQuizPage and functions for question/mode-title updates Use templates provided in index.html to render the page. Use service question syntax for getting the question. * MNG-11 Update for quizPage, add question/answers items functions Still needed to correct error in template reading * MNG-11 Fiish rendering quiz questions * MNG-11 All finished before user selects the answer * Fix styles, to avoid cascading main page layout to the quizPage * Fix styles to avoid cascading main page styles with quizApp id - after rebase * MNG-11 Functions for selecting answers and checking the correctness * MNG-11 Questions are now changing, collect styles in appSettings * Update src/app/App.js change to arrow Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com> * Small fix for mode variable Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 1352a01 - Browse repository at this point
Copy the full SHA 1352a01View commit details
Commits on Jan 8, 2021
-
MNG-27_question_generator (#22)
* Initial commit * Rename getNextQuestion method * Add class QestionGenerator and test * Modify class QestionGenerator * Add test for askedQuestionsCount property * Remove correctAnswerIndex property * Use aksedQuestion array * Correct which ids can repeat
Configuration menu - View commit details
-
Copy full SHA for 9408f99 - Browse repository at this point
Copy the full SHA 9408f99View commit details -
* Add shuffleAnswers function and relative tests * Correct a spelling mistake * Import shuffleAnswers to questionService * Import shuffleAnswers to questionService - fix
Configuration menu - View commit details
-
Copy full SHA for a0a5e2a - Browse repository at this point
Copy the full SHA a0a5e2aView commit details -
MNG-46 Remove page templates form js, put them in HTML templates inde…
…x.html. Remove the script rendering help modal, put it in showStartingPage.js (#24)
Configuration menu - View commit details
-
Copy full SHA for 77265cc - Browse repository at this point
Copy the full SHA 77265ccView commit details
Commits on Jan 9, 2021
-
Configuration menu - View commit details
-
Copy full SHA for d345f47 - Browse repository at this point
Copy the full SHA d345f47View commit details -
* MNG-44 Add GameHandler to store user game results * Tests * Corrections Co-authored-by: Daria Dziubaltowska <daria305@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for a9fe237 - Browse repository at this point
Copy the full SHA a9fe237View commit details -
Configuration menu - View commit details
-
Copy full SHA for aad0552 - Browse repository at this point
Copy the full SHA aad0552View commit details -
MNG-13 style out quiz page (initially) (#27)
* First mode (only desktop) * Orientation: portrait
Configuration menu - View commit details
-
Copy full SHA for 65f2c88 - Browse repository at this point
Copy the full SHA 65f2c88View commit details
Commits on Jan 11, 2021
-
MNG-9 Replace Pikachu Image (#30)
Added pokelogo.svg to Assets. Changed pikachu stroke color from black to blue.
Configuration menu - View commit details
-
Copy full SHA for 09e2864 - Browse repository at this point
Copy the full SHA 09e2864View commit details -
MNG-33 MNG-37 Design and style results modal (#29)
* Design and style results modal * add responsiveness
Configuration menu - View commit details
-
Copy full SHA for 25df380 - Browse repository at this point
Copy the full SHA 25df380View commit details
Commits on Jan 13, 2021
-
MNG-50 add questions to game handler (#32)
* MNG-43 Connecting generator to quizPage. Extract total num of question to the appSettings. * MNG-50 Modify game handler to store also questions. * MNG-50 Corrections, move question to answers object * MNG-50 MNG-43 Corrections on passing on variables, comments, test
Configuration menu - View commit details
-
Copy full SHA for 7c0f0b0 - Browse repository at this point
Copy the full SHA 7c0f0b0View commit details
Commits on Jan 14, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 608d268 - Browse repository at this point
Copy the full SHA 608d268View commit details -
MNG-49 fill results modal (#34)
* Add fillResultsModal.js, add event listener to results modal button * Implement fillResultsModal * Works with both modes * Fix mode selection, time left, simplify if statements * Change the way the mode is chosen
Configuration menu - View commit details
-
Copy full SHA for b7d8530 - Browse repository at this point
Copy the full SHA b7d8530View commit details -
MNG-19 Create rankingService.js (#33)
* Create rankingService.js * MNG-19 Update rankingService.js some small changes and: - removed print to html function - created update from localStorage function
Configuration menu - View commit details
-
Copy full SHA for f9621a6 - Browse repository at this point
Copy the full SHA f9621a6View commit details
Commits on Jan 15, 2021
-
MNG-20-AddProgressBarAndTimer (#37)
* Add setupTimer function * Add initial timer styling * Run timer func * Add timerLabel * Add createTimer func * Use setupTimer at the end of renderQuizPage * Change durationTime condition in runningTime function * Modify startTimer function * Change 10 with duration time * Add argument to setupTimer function * Fix QUIZ_MAX_TIME
Configuration menu - View commit details
-
Copy full SHA for d239638 - Browse repository at this point
Copy the full SHA d239638View commit details -
MNG-54 Add background for all pages (#40)
background-size: cover for div with class = start-page or quiz-page Important! Need to fit answer on screen for all game modes
Configuration menu - View commit details
-
Copy full SHA for 76c2514 - Browse repository at this point
Copy the full SHA 76c2514View commit details -
MNG-52 Create fillLeaderboard.js and implement it in showStartingPage…
….js, im… (#36) * Create fillLeaderboard.js and implement it in showStartingPage.js, implement rankingService.js, fix rankingService * Change indentation * Create addLeaderboardTableResults function inside fillLeaderboard.js
Configuration menu - View commit details
-
Copy full SHA for b39ea76 - Browse repository at this point
Copy the full SHA b39ea76View commit details -
* Bugs fixed * Less code * delete wrong part of code
Configuration menu - View commit details
-
Copy full SHA for f14489d - Browse repository at this point
Copy the full SHA f14489dView commit details -
MNG-53 Autocompletion off + button "Play" (#38)
* Autocompletion off + button "Play" * Play button disabled by default
Configuration menu - View commit details
-
Copy full SHA for 46d82da - Browse repository at this point
Copy the full SHA 46d82daView commit details -
MNG-48-Style-out-QuizePage for What does that pokemon looks like (#43)
chenged grid to flex height for answer img some random font property for pokemon name (quiz-question class)
Configuration menu - View commit details
-
Copy full SHA for 99fb725 - Browse repository at this point
Copy the full SHA 99fb725View commit details
Commits on Jan 16, 2021
-
Configuration menu - View commit details
-
Copy full SHA for ded7e4a - Browse repository at this point
Copy the full SHA ded7e4aView commit details -
Now it display answers (img too) in one column for small width screens
Configuration menu - View commit details
-
Copy full SHA for bb1f254 - Browse repository at this point
Copy the full SHA bb1f254View commit details -
* Add initial styling to time bar * Add z-index * Add border-radius to quiz bar * Change time-bar color * Fix progress bar width * Add padding to timerLabel and question-counter * Add z-index to modal * Change progress bar width * Center question text * Fix width for timerLabel * Change slowly timer bar color to red
Configuration menu - View commit details
-
Copy full SHA for 2b90ff3 - Browse repository at this point
Copy the full SHA 2b90ff3View commit details -
MNG-57 Change bottom of the main page button on hover, change some fo…
…nt styles, move tests to the test folder (#47)
Configuration menu - View commit details
-
Copy full SHA for 143b625 - Browse repository at this point
Copy the full SHA 143b625View commit details -
MNG-35 style out quiz page mode1 (#48)
* MNG-35 styline quiz page, add img background under pokemon * MNG-35 Style out mode1 and 2, add background under the pokemon * MNG-35 Change the progress bar style
Configuration menu - View commit details
-
Copy full SHA for 7c9b0e1 - Browse repository at this point
Copy the full SHA 7c9b0e1View commit details -
Configuration menu - View commit details
-
Copy full SHA for ba4f133 - Browse repository at this point
Copy the full SHA ba4f133View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3893744 - Browse repository at this point
Copy the full SHA 3893744View commit details -
MNG-X-hardmode - Add Who's that pokemon (hard mode) (#42)
* MNG - Add 3rd Game Mode * MNG-58 and MNG-61 * update * Issue with style
Configuration menu - View commit details
-
Copy full SHA for 3c2a31c - Browse repository at this point
Copy the full SHA 3c2a31cView commit details
Commits on Jan 17, 2021
-
MNG-63 MNG-64 MNG-24 on hover buttons&console logs&finally style help…
… modal (#51) * Remove console-logs * Change color of buttonWithText on hover * Add margin to help modal
Configuration menu - View commit details
-
Copy full SHA for bbb2ff7 - Browse repository at this point
Copy the full SHA bbb2ff7View commit details -
MNG-34 MNG-67 style results modal&add cursor on dropdown (#52)
* Add pointer, change results modal, add custom scrollbars * Fix pointer
Configuration menu - View commit details
-
Copy full SHA for 750741a - Browse repository at this point
Copy the full SHA 750741aView commit details -
MNG-65 quiz page improvements (#53)
* MNG-65 Fix onclick event on quizPage * Add hover styles to the quiz Page
Configuration menu - View commit details
-
Copy full SHA for 1df77c5 - Browse repository at this point
Copy the full SHA 1df77c5View commit details -
changed: img tag to svg in html file added animation to svg
Configuration menu - View commit details
-
Copy full SHA for f0d5fdc - Browse repository at this point
Copy the full SHA f0d5fdcView commit details -
MNG-68-FixForFirstModeIndicator (#55)
* Style button for first mode * Style button for default mode * Add hover for mode buttons
Configuration menu - View commit details
-
Copy full SHA for 98485ef - Browse repository at this point
Copy the full SHA 98485efView commit details -
* MNG-69 Add total num of questions on the quiz page * MNG-69 Capitalize pokemon names * MNG-69 Move capitalize name feature from css to QuestionService * MNG-69 Change to map * MNG-69 Refactore capitalize * Refactor again
Configuration menu - View commit details
-
Copy full SHA for 13ec5ec - Browse repository at this point
Copy the full SHA 13ec5ecView commit details -
MNG-68 Update README.md file (#57)
* MNG-68 Update README.md file Updated project description and images * Typos
Configuration menu - View commit details
-
Copy full SHA for 8f07feb - Browse repository at this point
Copy the full SHA 8f07febView commit details -
MNG-66 image mode 1 and 3 (#58)
Co-authored-by: AgataLudwiczynska <74932979+AgataLudwiczynska@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 83c48e2 - Browse repository at this point
Copy the full SHA 83c48e2View commit details
Commits on Jan 18, 2021
-
Configuration menu - View commit details
-
Copy full SHA for a6e8bc7 - Browse repository at this point
Copy the full SHA a6e8bc7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 361dd2d - Browse repository at this point
Copy the full SHA 361dd2dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7530a03 - Browse repository at this point
Copy the full SHA 7530a03View commit details -
Configuration menu - View commit details
-
Copy full SHA for bf4365d - Browse repository at this point
Copy the full SHA bf4365dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 20f977e - Browse repository at this point
Copy the full SHA 20f977eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5ae6adb - Browse repository at this point
Copy the full SHA 5ae6adbView commit details -
Configuration menu - View commit details
-
Copy full SHA for bf479a3 - Browse repository at this point
Copy the full SHA bf479a3View commit details -
BUGFIX Fix randomNrInRange, fix leaderboard, change background into b…
…ackground-image (#66)
Configuration menu - View commit details
-
Copy full SHA for 99374ae - Browse repository at this point
Copy the full SHA 99374aeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4d6de37 - Browse repository at this point
Copy the full SHA 4d6de37View commit details