Code

Button/test#106

Code

Open

Yu-Miao222 wants to merge 30 commits intoTechnigo:masterTechnigo/project-redux-quiz-old:masterfrom noraterbocs:button/testnoraterbocs/project-redux-quiz-group-project:button/testCopy head branch name to clipboard

+1,060-86

Commits

Commits on Apr 11, 2023

• Initial setup

  noraterbocs

  committed
  b70bce9

• Restructured files to render them based on quizOver state

  noraterbocs

  committed
  948081b

Commits on Apr 12, 2023

• Added logic for button click, restructured components and added progressbar

  noraterbocs

  committed
  d5c78a2

• Progress bar without props

  Joanna-Philips

  committed
  8a3280a

• Created components for Summary page, added accordion for wrong answers

  noraterbocs

  committed
  a205af6

• Basic container

  Joanna-Philips

  committed
  b7ea96a

• Added icon to summary page

  noraterbocs

  committed
  1dfd72d

• Partly done start page

  Joanna-Philips

  committed
  f61a3a3

• Added countdown for questions

  noraterbocs

  committed
  8e94a52

• Reusable button done

  Joanna-Philips

  committed
  b060fbb

• Reusable title, image and button done

  Joanna-Philips

  committed
  9f2096a

• Merge pull request #1 from noraterbocs/start-page

  Show description for c4b2d91
  Joanna-Philips

  authored
  c4b2d91

• Merging summary branch and resolved conflicts

  noraterbocs

  committed
  69170e0

• Fixed typo

  noraterbocs

  committed
  94e280a

Commits on Apr 13, 2023

• update my branch

  Yu-Miao222

  committed
  380e9e2

• Merge branch 'master' into YU

  Yu-Miao222

  authored
  988e178

• Merge pull request #2 from noraterbocs/YU

  Show description for bfd8b11
  Yu-Miao222

  authored
  bfd8b11

• Fixed auto errors

  Joanna-Philips

  committed
  e806ca8

• Added some styling to align resuable components

  noraterbocs

  committed
  25be880

• Attempting images in answer options

  Joanna-Philips

  committed
  2d1f64d

• Updates to image options + but not fully done

  Joanna-Philips

  committed
  a8b3ccc

• Trying another way

  Joanna-Philips

  committed
  690540e

• Image options fixed

  Joanna-Philips

  committed
  690902f

• Updated to summary page to display images for image option question

  Joanna-Philips

  committed
  f43ca1d

• Displays right answer in window alert

  Joanna-Philips

  committed
  1ad0bde

• Merge pull request #3 from noraterbocs/image-options

  Show description for e1bec66
  Joanna-Philips

  authored
  e1bec66

Commits on Apr 14, 2023

• total time works now

  Yu-Miao222

  committed
  567efbd

• Merge branch 'master' into style/currentquestion

  Yu-Miao222

  authored
  8832756

• Merge pull request #4 from noraterbocs/style/currentquestion

  Show description for 636a3e4
  Yu-Miao222

  authored
  636a3e4

• fix question images

  Yu-Miao222

  committed
  3137de1