Skip to content
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

Open
wants to merge 70 commits into
base: feedback
Choose a base branch
from
Open

Feedback branch for nowakprojects #68

wants to merge 70 commits into from

Commits on Dec 30, 2020

  1. Configuration menu
    Copy the full SHA
    9c59cad View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2020

  1. Configuration menu
    Copy the full SHA
    b6bb88b View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2021

  1. Configuration menu
    Copy the full SHA
    323615c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e73fcfb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4966957 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2021

  1. Configuration menu
    Copy the full SHA
    7534526 View commit details
    Browse the repository at this point in the history
  2. Update App.css

    this is my change, it is cool. Margin should be 10
    lukaszdutka committed Jan 2, 2021
    Configuration menu
    Copy the full SHA
    e10f137 View commit details
    Browse the repository at this point in the history
  3. Update App.css

    this MUST be 20, change on dev branch
    lukaszdutka committed Jan 2, 2021
    Configuration menu
    Copy the full SHA
    8b409ed View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    63fcd66 View commit details
    Browse the repository at this point in the history
  5. cleanup after tutorial

    lukaszdutka committed Jan 2, 2021
    Configuration menu
    Copy the full SHA
    e7fe5ca View commit details
    Browse the repository at this point in the history
  6. Update App.css

    commit to dev
    lukaszdutka committed Jan 2, 2021
    Configuration menu
    Copy the full SHA
    dc411a7 View commit details
    Browse the repository at this point in the history
  7. MNG-test change margin

    this is my super change;
    
    Paired with <somebody>
    lukaszdutka authored Jan 2, 2021
    Configuration menu
    Copy the full SHA
    21ca939 View commit details
    Browse the repository at this point in the history
  8. Mng 10 starting page html template (#7)

    * Add a starting page HTML template
    
    * change template HTML for the starting page into a js file
    AleksandraCyp authored Jan 2, 2021
    Configuration menu
    Copy the full SHA
    6f9cf69 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9826724 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2021

  1. 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>
    daria305 and lukaszdutka authored Jan 3, 2021
    Configuration menu
    Copy the full SHA
    104faf8 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2021

  1. Kamil - Update index.html (#11)

    Kamil - Add my name
    arendarczyk authored Jan 4, 2021
    Configuration menu
    Copy the full SHA
    704ea6a View commit details
    Browse the repository at this point in the history
  2. 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>
    dependabot[bot] authored Jan 4, 2021
    Configuration menu
    Copy the full SHA
    9fd84b8 View commit details
    Browse the repository at this point in the history
  3. MNG-22 Update img and my name (#13)

    * Update img and my name
    
    * MNG-22 add IMG
    
    * MNG-22 Rename IMG
    arendarczyk authored Jan 4, 2021
    Configuration menu
    Copy the full SHA
    d245841 View commit details
    Browse the repository at this point in the history
  4. MNG-22

    * Update img and my name
    
    * MNG-22 add IMG
    
    * MNG-22 Rename IMG
    
    * Add SVG icons
    arendarczyk authored Jan 4, 2021
    Configuration menu
    Copy the full SHA
    763ca4e View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2021

  1. 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>
    AgataLudwiczynska and lukaszdutka authored Jan 5, 2021
    Configuration menu
    Copy the full SHA
    53f8e96 View commit details
    Browse the repository at this point in the history
  2. 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
    AleksandraCyp authored Jan 5, 2021
    Configuration menu
    Copy the full SHA
    e5d2ea6 View commit details
    Browse the repository at this point in the history
  3. 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
    mariusz-sm authored Jan 5, 2021
    Configuration menu
    Copy the full SHA
    a6cd262 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2021

  1. 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>
    lukaszdutka and AgataLudwiczynska authored Jan 6, 2021
    Configuration menu
    Copy the full SHA
    57e1640 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2021

  1. 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
    AleksandraCyp authored Jan 7, 2021
    Configuration menu
    Copy the full SHA
    62b34d4 View commit details
    Browse the repository at this point in the history
  2. MNG-28 Add instructions (#21)

    * Add instructions
    
    * Update src/app/addHelpScreenTemplate.js
    
    Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com>
    AleksandraCyp and lukaszdutka authored Jan 7, 2021
    Configuration menu
    Copy the full SHA
    1eb8841 View commit details
    Browse the repository at this point in the history
  3. 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>
    daria305 and lukaszdutka authored Jan 7, 2021
    Configuration menu
    Copy the full SHA
    1352a01 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. 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
    mariusz-sm authored Jan 8, 2021
    Configuration menu
    Copy the full SHA
    9408f99 View commit details
    Browse the repository at this point in the history
  2. MNG-41 shuffle answers (#23)

    * Add shuffleAnswers function and relative tests
    
    * Correct a spelling mistake
    
    * Import shuffleAnswers to questionService
    
    * Import shuffleAnswers to questionService - fix
    AleksandraCyp authored Jan 8, 2021
    Configuration menu
    Copy the full SHA
    a0a5e2a View commit details
    Browse the repository at this point in the history
  3. 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)
    AleksandraCyp authored Jan 8, 2021
    Configuration menu
    Copy the full SHA
    77265cc View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2021

  1. Configuration menu
    Copy the full SHA
    d345f47 View commit details
    Browse the repository at this point in the history
  2. MNG-44 game handler (#25)

    * MNG-44 Add GameHandler to store user game results
    
    * Tests
    
    * Corrections
    
    Co-authored-by: Daria Dziubaltowska <daria305@gmail.com>
    AgataLudwiczynska and daria305 authored Jan 9, 2021
    Configuration menu
    Copy the full SHA
    a9fe237 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    aad0552 View commit details
    Browse the repository at this point in the history
  4. MNG-13 style out quiz page (initially) (#27)

    * First mode (only desktop)
    
    * Orientation: portrait
    AgataLudwiczynska authored Jan 9, 2021
    Configuration menu
    Copy the full SHA
    65f2c88 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2021

  1. MNG-9 Replace Pikachu Image (#30)

    Added pokelogo.svg to Assets.
    Changed pikachu stroke color from black to blue.
    memeraki authored Jan 11, 2021
    Configuration menu
    Copy the full SHA
    09e2864 View commit details
    Browse the repository at this point in the history
  2. MNG-33 MNG-37 Design and style results modal (#29)

    * Design and style results modal
    
    * add responsiveness
    AleksandraCyp authored Jan 11, 2021
    Configuration menu
    Copy the full SHA
    25df380 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2021

  1. 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
    daria305 authored Jan 13, 2021
    Configuration menu
    Copy the full SHA
    7c0f0b0 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2021

  1. Configuration menu
    Copy the full SHA
    608d268 View commit details
    Browse the repository at this point in the history
  2. 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
    AleksandraCyp authored Jan 14, 2021
    Configuration menu
    Copy the full SHA
    b7d8530 View commit details
    Browse the repository at this point in the history
  3. 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
    memeraki authored Jan 14, 2021
    Configuration menu
    Copy the full SHA
    f9621a6 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2021

  1. 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
    mariusz-sm authored Jan 15, 2021
    Configuration menu
    Copy the full SHA
    d239638 View commit details
    Browse the repository at this point in the history
  2. 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
    memeraki authored Jan 15, 2021
    Configuration menu
    Copy the full SHA
    76c2514 View commit details
    Browse the repository at this point in the history
  3. 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
    AleksandraCyp authored Jan 15, 2021
    Configuration menu
    Copy the full SHA
    b39ea76 View commit details
    Browse the repository at this point in the history
  4. MNG-55 Bugs fixed (#39)

    * Bugs fixed
    
    * Less code
    
    * delete wrong part of code
    AgataLudwiczynska authored Jan 15, 2021
    Configuration menu
    Copy the full SHA
    f14489d View commit details
    Browse the repository at this point in the history
  5. MNG-53 Autocompletion off + button "Play" (#38)

    * Autocompletion off + button "Play"
    
    * Play button disabled by default
    AgataLudwiczynska authored Jan 15, 2021
    Configuration menu
    Copy the full SHA
    46d82da View commit details
    Browse the repository at this point in the history
  6. 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)
    memeraki authored Jan 15, 2021
    Configuration menu
    Copy the full SHA
    99fb725 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2021

  1. Configuration menu
    Copy the full SHA
    ded7e4a View commit details
    Browse the repository at this point in the history
  2. Little change (#45)

    Now it display answers (img too) in one column for small width screens
    memeraki authored Jan 16, 2021
    Configuration menu
    Copy the full SHA
    bb1f254 View commit details
    Browse the repository at this point in the history
  3. MNG-56-StyleTimer (#44)

    * 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
    mariusz-sm authored Jan 16, 2021
    Configuration menu
    Copy the full SHA
    2b90ff3 View commit details
    Browse the repository at this point in the history
  4. MNG-57 Change bottom of the main page button on hover, change some fo…

    …nt styles, move tests to the test folder (#47)
    AleksandraCyp authored Jan 16, 2021
    Configuration menu
    Copy the full SHA
    143b625 View commit details
    Browse the repository at this point in the history
  5. 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
    daria305 authored Jan 16, 2021
    Configuration menu
    Copy the full SHA
    7c9b0e1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ba4f133 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3893744 View commit details
    Browse the repository at this point in the history
  8. 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
    memeraki authored Jan 16, 2021
    Configuration menu
    Copy the full SHA
    3c2a31c View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2021

  1. 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
    AleksandraCyp authored Jan 17, 2021
    Configuration menu
    Copy the full SHA
    bbb2ff7 View commit details
    Browse the repository at this point in the history
  2. MNG-34 MNG-67 style results modal&add cursor on dropdown (#52)

    * Add pointer, change results modal, add custom scrollbars
    
    * Fix pointer
    AleksandraCyp authored Jan 17, 2021
    Configuration menu
    Copy the full SHA
    750741a View commit details
    Browse the repository at this point in the history
  3. MNG-65 quiz page improvements (#53)

    * MNG-65 Fix onclick event on quizPage
    
    * Add hover styles to the quiz Page
    daria305 authored Jan 17, 2021
    Configuration menu
    Copy the full SHA
    1df77c5 View commit details
    Browse the repository at this point in the history
  4. MNG-X Pikachu animation (#56)

    changed: img tag to svg in html file
    added animation to svg
    memeraki authored Jan 17, 2021
    Configuration menu
    Copy the full SHA
    f0d5fdc View commit details
    Browse the repository at this point in the history
  5. MNG-68-FixForFirstModeIndicator (#55)

    * Style button for first mode
    
    * Style button for default mode
    
    * Add hover for mode buttons
    mariusz-sm authored Jan 17, 2021
    Configuration menu
    Copy the full SHA
    98485ef View commit details
    Browse the repository at this point in the history
  6. MNG-69 additions (#54)

    * 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
    daria305 authored Jan 17, 2021
    Configuration menu
    Copy the full SHA
    13ec5ec View commit details
    Browse the repository at this point in the history
  7. MNG-68 Update README.md file (#57)

    * MNG-68 Update README.md file
    
    Updated project description and images
    
    * Typos
    memeraki authored Jan 17, 2021
    Configuration menu
    Copy the full SHA
    8f07feb View commit details
    Browse the repository at this point in the history
  8. MNG-66 image mode 1 and 3 (#58)

    Co-authored-by: AgataLudwiczynska <74932979+AgataLudwiczynska@users.noreply.github.com>
    lukaszdutka and AgataLudwiczynska authored Jan 17, 2021
    Configuration menu
    Copy the full SHA
    83c48e2 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2021

  1. Configuration menu
    Copy the full SHA
    a6e8bc7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    361dd2d View commit details
    Browse the repository at this point in the history
  3. Photos update (#60)

    memeraki authored Jan 18, 2021
    Configuration menu
    Copy the full SHA
    7530a03 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bf4365d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    20f977e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5ae6adb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bf479a3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    99374ae View commit details
    Browse the repository at this point in the history
  9. Re-update node.js.yml

    lukaszdutka authored Jan 18, 2021
    Configuration menu
    Copy the full SHA
    4d6de37 View commit details
    Browse the repository at this point in the history