-
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
Add a help screen, style it (has to be polished, the scrollbar is not… #16
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… 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)
…correct spelling mistakes
lukaszdutka
approved these changes
Jan 5, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Formidable amount of work 😌 Looks marvelous 🤩
lukaszdutka
added a commit
that referenced
this pull request
Jan 5, 2021
* init 'dev' branch; add my name; * add parcel; cleanup files; remove 'starwars' dependencies, change to pokemon; * remove starwars static assets, we will use api; * remove StarWars local-json-server, we will use api; * MNG-5 Add my name to div swquiz-app * MNG-1 Add my name to div pokequiz-app (#3) * Add Aleksandra Cypko to the poekquiz-app div * MNG-8 Add "Zespół projektowy" section to Readme.md * Add github/real name to div swquiz-app * prepare case for rebasing problem; * Update App.css this is my change, it is cool. Margin should be 10 * Update App.css this MUST be 20, change on dev branch * cleanup after tutorial * Update App.css commit to dev * MNG-test change margin this is my super change; Paired with <somebody> * Mng 10 starting page html template (#7) * Add a starting page HTML template * change template HTML for the starting page into a js file * MNG-2 add my name to project * 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> * Kamil - Update index.html (#11) Kamil - Add my name * 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> * MNG-22 Update img and my name (#13) * Update img and my name * MNG-22 add IMG * MNG-22 Rename IMG * MNG-22 * Update img and my name * MNG-22 add IMG * MNG-22 Rename IMG * Add SVG icons * 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> * 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 * 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 Co-authored-by: Daria Dziubaltowska <daria305@gmail.com> Co-authored-by: Małgorzata Dziewit <74777578+memeraki@users.noreply.github.com> Co-authored-by: Aleksandra Cypko <olaaac25@gmail.com> Co-authored-by: Gosia Dziewit <gosia.dziewit@gmail.com> Co-authored-by: unknown <mariusz.smarz@gmail.com> Co-authored-by: AleksandraCyp <73715885+AleksandraCyp@users.noreply.github.com> Co-authored-by: AgataLudwiczynska <74932979+AgataLudwiczynska@users.noreply.github.com> Co-authored-by: Daria <44535712+daria305@users.noreply.github.com> Co-authored-by: Kamil Arendarczyk <kamilarendarczyk1@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mariusz-sm <74978639+mariusz-sm@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… 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)