Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
70921a5
Initial commit
YlvaKarlsson Apr 11, 2023
a7529bd
Commit with questions
YlvaKarlsson Apr 11, 2023
e91eae9
Last changes
YlvaKarlsson Apr 11, 2023
19eeb37
Next question + restart-button works
YlvaKarlsson Apr 12, 2023
c7d3e42
Add hero container and image
smirrebinx Apr 13, 2023
4a648e5
Add title and font-family
smirrebinx Apr 13, 2023
f056734
Installed Immer - if we'll need it
YlvaKarlsson Apr 13, 2023
f54fffc
Add answers and questions map
smirrebinx Apr 13, 2023
57c910a
Fix title
smirrebinx Apr 13, 2023
5642bf1
Add comments
smirrebinx Apr 13, 2023
de533a5
Add useDispatch, restartbutton and quiz
smirrebinx Apr 13, 2023
e8c5681
Update question
smirrebinx Apr 13, 2023
7e5909f
Update styling
smirrebinx Apr 13, 2023
e080b59
Constructing the start page
SandraMadeleine Apr 13, 2023
16dd54f
adding an mp3
SandraMadeleine Apr 13, 2023
5b4c124
trying a sound on click
SandraMadeleine Apr 13, 2023
a6f99ea
modifying start page
SandraMadeleine Apr 13, 2023
60fa280
Update to show results in summary
smirrebinx Apr 14, 2023
03e095f
Update question
smirrebinx Apr 14, 2023
993e3c4
Add styling answer container and button
smirrebinx Apr 14, 2023
996e94e
Updated with the code from Michelles branch
YlvaKarlsson Apr 14, 2023
f9d59c1
Fixed footer and some other things
YlvaKarlsson Apr 14, 2023
f4549f7
Add background form
smirrebinx Apr 14, 2023
32de3c2
Add component
smirrebinx Apr 14, 2023
7e5b4dc
Add count amount of right answers
smirrebinx Apr 15, 2023
c99545e
Add styled component for CorrectAnswer
smirrebinx Apr 15, 2023
617ff8d
Add container for correctAnswer
smirrebinx Apr 15, 2023
20f9b8b
Add balloons to SummaryTest.js
smirrebinx Apr 15, 2023
81695be
Remove AnswerContainer, fix styling SummaryTest
smirrebinx Apr 15, 2023
f900afc
Add media queries for balloons
smirrebinx Apr 15, 2023
6caf2cc
Add comments and part of the Readme.
smirrebinx Apr 15, 2023
39caac4
Change text color for button
smirrebinx Apr 15, 2023
103a9f3
Change from px to rem, fix margins and padding
smirrebinx Apr 15, 2023
029149f
Fix margins
smirrebinx Apr 15, 2023
1d5b29a
Add cred to baloon styler
smirrebinx Apr 15, 2023
24f303c
initial commit
Apr 16, 2023
b70c0bd
styling startpage
SandraMadeleine Apr 16, 2023
3718f38
styling works on desktop
SandraMadeleine Apr 16, 2023
6996ee2
styling works for all media queries
SandraMadeleine Apr 16, 2023
d87e568
modified q & a
SandraMadeleine Apr 16, 2023
e7c716a
Merge origin/summary
Apr 16, 2023
4a1e66a
Merge branch 'summary'
smirrebinx Apr 16, 2023
102d4fb
prep for merge
SandraMadeleine Apr 16, 2023
51c4ec0
merging
YlvaKarlsson Apr 16, 2023
1d21031
prep for merging
SandraMadeleine Apr 16, 2023
19c639a
mergebranch
SandraMadeleine Apr 16, 2023
05380ff
All styling made and fixed merging etc - great teamwork
YlvaKarlsson Apr 16, 2023
7c5a0d6
Updated readme with updated link to deployed site
YlvaKarlsson Apr 16, 2023
fbf1ee8
Update font-family. Change from p to h2
smirrebinx Apr 17, 2023
2ab4c26
Fixed font and shorted timer when clicking the answer from 2 sec till…
YlvaKarlsson Apr 17, 2023
d637b1d
fixed conflicts
YlvaKarlsson Apr 17, 2023
9881a8a
Shortened timer to next question after clicking the answerbutton from…
YlvaKarlsson Apr 17, 2023
255a52b
Another commit since one file wasn't saved...
YlvaKarlsson Apr 17, 2023
f25a083
Updated pagetitle in index.html
YlvaKarlsson Apr 17, 2023
872c191
added a favicon
YlvaKarlsson Apr 17, 2023
88e87b6
Added type to the favicon since it doesn't show yet and I saw this so…
YlvaKarlsson Apr 17, 2023
1e28453
Fixed startbutton to gold and tried a different solution for the favicon
YlvaKarlsson Apr 17, 2023
204a228
trying to fix the hover color on start button
Apr 17, 2023
a2c6689
button glow on hover
Apr 17, 2023
ae523fb
glow again
Apr 17, 2023
0f5263b
button styling bg on hover gets overridden
Apr 17, 2023
3e2a982
Fixed the hover-effect as Sandras version again
YlvaKarlsson Apr 20, 2023
94c2cfc
Merge branch 'master' of https://github.com/YlvaKarlsson/project-redu…
YlvaKarlsson Apr 20, 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
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Redux quiz group project

Replace this readme with your own information about your project.

Start by briefly describing the assignment in a sentence or two. Keep it short and to the point.
Five people collaborated on this project to develop a React and Redux-based multiple-choice quiz game. Users answer questions, and the game displays the current or remaining question count. Finally, a summary screen shows the number of correct and incorrect answers.

## 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?
We branched out and worked separately on different components during the week.
After that we mob-programmed and fixed merging and styling together before deploying the project.
If we had more time we would do more on the styling, and add more questions and functionality.


## 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.
https://w10-team-elephants-group2-redux-quiz.netlify.app/
Loading