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

Redux quiz project made by Yu, Joanna and Nora #112

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b70bce9
Initial setup
noraterbocs Apr 11, 2023
948081b
Restructured files to render them based on quizOver state
noraterbocs Apr 11, 2023
d5c78a2
Added logic for button click, restructured components and added progr…
noraterbocs Apr 12, 2023
8a3280a
Progress bar without props
Joanna-Philips Apr 12, 2023
a205af6
Created components for Summary page, added accordion for wrong answers
noraterbocs Apr 12, 2023
b7ea96a
Basic container
Joanna-Philips Apr 12, 2023
1dfd72d
Added icon to summary page
noraterbocs Apr 12, 2023
f61a3a3
Partly done start page
Joanna-Philips Apr 12, 2023
8e94a52
Added countdown for questions
noraterbocs Apr 12, 2023
b060fbb
Reusable button done
Joanna-Philips Apr 12, 2023
9f2096a
Reusable title, image and button done
Joanna-Philips Apr 12, 2023
c4b2d91
Merge pull request #1 from noraterbocs/start-page
Joanna-Philips Apr 12, 2023
69170e0
Merging summary branch and resolved conflicts
noraterbocs Apr 12, 2023
94e280a
Fixed typo
noraterbocs Apr 12, 2023
380e9e2
update my branch
Yu-Miao222 Apr 13, 2023
988e178
Merge branch 'master' into YU
Yu-Miao222 Apr 13, 2023
bfd8b11
Merge pull request #2 from noraterbocs/YU
Yu-Miao222 Apr 13, 2023
e806ca8
Fixed auto errors
Joanna-Philips Apr 13, 2023
25be880
Added some styling to align resuable components
noraterbocs Apr 13, 2023
2d1f64d
Attempting images in answer options
Joanna-Philips Apr 13, 2023
a8b3ccc
Updates to image options + but not fully done
Joanna-Philips Apr 13, 2023
690540e
Trying another way
Joanna-Philips Apr 13, 2023
690902f
Image options fixed
Joanna-Philips Apr 13, 2023
f43ca1d
Updated to summary page to display images for image option question
Joanna-Philips Apr 13, 2023
1ad0bde
Displays right answer in window alert
Joanna-Philips Apr 13, 2023
e1bec66
Merge pull request #3 from noraterbocs/image-options
Joanna-Philips Apr 13, 2023
567efbd
total time works now
Yu-Miao222 Apr 14, 2023
8832756
Merge branch 'master' into style/currentquestion
Yu-Miao222 Apr 14, 2023
636a3e4
Merge pull request #4 from noraterbocs/style/currentquestion
Yu-Miao222 Apr 14, 2023
3137de1
fix question images
Yu-Miao222 Apr 14, 2023
232c599
Merge pull request #5 from noraterbocs/button/test
Yu-Miao222 Apr 14, 2023
3065e7f
Changed styling for summary page
noraterbocs Apr 14, 2023
334277b
Added cursor: pointer to button component
noraterbocs Apr 14, 2023
c3f52d9
Added logic to disable buttons after answering to avoid multiple sele…
noraterbocs Apr 14, 2023
ebfa49c
Added logic to color button green in case of wrong answer
noraterbocs Apr 14, 2023
4045e66
Resized button and question title on mobile view
noraterbocs Apr 14, 2023
fa5a250
Changed font size for button
noraterbocs Apr 14, 2023
1265489
Added padding to current question container
noraterbocs Apr 14, 2023
01a03fb
Added min height: 100vh to summary container
noraterbocs Apr 14, 2023
f9f1884
Fixed height in summary page
noraterbocs Apr 14, 2023
2133006
Added Info section to start page + media queries
Joanna-Philips Apr 14, 2023
68cbf76
Added height to image
Joanna-Philips Apr 14, 2023
fe53803
Merge pull request #6 from noraterbocs/stylingStartAndButton
Joanna-Philips Apr 14, 2023
551c72b
Added question mark
Joanna-Philips Apr 14, 2023
0f4375f
Merge branch 'master' of https://github.com/noraterbocs/project-redux…
Joanna-Philips Apr 14, 2023
ff0e2a6
Update Button.js
Joanna-Philips Apr 14, 2023
fba4c05
Changed font size and no of questions
Joanna-Philips Apr 14, 2023
6154ec8
resized font to fit mobile screen
noraterbocs Apr 15, 2023
6ee83af
Added readme
noraterbocs Apr 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
"allowSingleLine": true
}
],
"linebreak-style":[
"off",
"unix"
],
"comma-dangle": [
"error",
"never"
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
# Redux quiz group project

Replace this readme with your own information about your project.
The task was to build a quiz game using React, Redux and styled components.

Start by briefly describing the assignment in a sentence or two. Keep it short and to the point.

## The problem

Describe how you approached to problem, and what tools and techniques you used to solve it. How did you plan? What technologies did you use? If you had more time, what would be next?
With the group we started planning how the application would look (pages, resuable styled components etc), visualized it with a sketch and planned the steps of the implementation.
We first used mob programming approach to create the basic logic using Redux, then worked on separate branches to style the pages and position the components.

## View it live

Every project should be deployed somewhere. Be sure to include the link to the deployed project so that the viewer can click around and see what it's all about.
Deployed link: https://food-quiz-by-yu-joanna-nora.netlify.app/

## Image credits
German Flag - Photo by <a href="https://unsplash.com/@enginakyurt?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">engin akyurt</a> on <a href="https://unsplash.com/photos/qQomkOCpkes?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Unsplash</a>

Paella - Photo by <a href="https://unsplash.com/ko/@dougglaslopez?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Douglas Lopez</a> on <a href="https://unsplash.com/photos/4B0cLMtJxWw?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Unsplash</a>

Loading