Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c0991de
Add components, add reducer
smirrebinx Apr 25, 2023
12cd596
Add font suggestions
smirrebinx Apr 25, 2023
94c08de
Add GameQuestions
smirrebinx Apr 25, 2023
553e753
Add setPreviousMove, remove action
smirrebinx Apr 25, 2023
d8a42fe
Change names
smirrebinx Apr 25, 2023
1adb3d1
Add styling branch and new components
smirrebinx Apr 26, 2023
a88697e
new Input component
cecavi Apr 26, 2023
3a6df3a
merge
smirrebinx Apr 26, 2023
a35420d
Add Header component in Player input
smirrebinx Apr 26, 2023
d47d2ba
Add fonts and styled components
smirrebinx Apr 27, 2023
772cf41
Add button styling
smirrebinx Apr 27, 2023
a168551
Fix font size buttons
smirrebinx Apr 27, 2023
9f00b55
Fix responsivity
smirrebinx Apr 27, 2023
3cb38ba
Fix margin h1
smirrebinx Apr 27, 2023
286753c
Fix margins
smirrebinx Apr 27, 2023
526668b
Add background image
smirrebinx Apr 27, 2023
6b829b4
Add background image and text background
smirrebinx Apr 27, 2023
9f10790
Fix margins
smirrebinx Apr 27, 2023
3133e6f
Fix width
smirrebinx Apr 27, 2023
953f250
Add lottie animation
smirrebinx Apr 27, 2023
8421dc9
Delete maze.json
smirrebinx Apr 27, 2023
ccd98e8
Add styling for placeholder
smirrebinx Apr 27, 2023
4b7d9cb
Add button styling
smirrebinx Apr 27, 2023
e12012f
Fix box shadow on reset button
smirrebinx Apr 27, 2023
2017658
Change font size and hover effect
smirrebinx Apr 27, 2023
e16ab11
Add font awesome icons
smirrebinx Apr 27, 2023
02f1c47
Fix outer wrapper mobile
smirrebinx Apr 27, 2023
c8f6b5d
Add background images
smirrebinx Apr 27, 2023
b81122c
Add timestamp to make the username unique
smirrebinx Apr 28, 2023
35ea0e8
Add comments and readme
smirrebinx Apr 28, 2023
b434d93
commit after pull-nothing changed from master
cecavi Apr 29, 2023
c5c82b8
added loading lottie
cecavi Apr 29, 2023
3765678
added stuff
cecavi Apr 29, 2023
848c21e
added animations
cecavi Apr 29, 2023
c83b035
added styling to GameQuestions
cecavi Apr 29, 2023
b4ae184
more styling
cecavi Apr 29, 2023
1359af3
fix
cecavi Apr 30, 2023
2fe9d68
after pull
cecavi Apr 30, 2023
c51b56a
Update README.md
smirrebinx Apr 30, 2023
6bff5f5
Add API reset (for go back button)
smirrebinx Apr 30, 2023
4d8324a
Update games.js
smirrebinx May 1, 2023
86e191a
Update README.md
smirrebinx May 1, 2023
91e013c
Update README.md
smirrebinx May 1, 2023
dd200e8
Change font
smirrebinx May 1, 2023
74aa494
Add game image
smirrebinx May 1, 2023
5568146
Remove background image
smirrebinx May 1, 2023
d0b2c67
Remove components
smirrebinx May 1, 2023
d634653
Update Loading background
smirrebinx May 1, 2023
e5dd55d
Add end background image
smirrebinx May 1, 2023
3a22771
Add typeit (not merged)
smirrebinx May 2, 2023
58cb730
Remove typeit
smirrebinx May 3, 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
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Project Labyrinth

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.
This React project includes Redux-related topics, such as using thunks for async actions, working with APIs, and using Redux Toolkit. The project was pair-programmed.
The project uses APIs with Redux, using thunks and reusable components and sends JSON in the body of a request.

## 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 planned which components and animations to use in a Trello board. We started out pair-programming in the Master branch. We then branched out in different branches. We met up and did a merge on each branch, and then we branched out again. We merged and pair-programmed again and attempted to make some changes regarding the background images. If we hade more time, we would have had one backround image for the startpage, another for the game questions and a third background image for the end page. We consuled ChatGPT with various results.

## 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://cecilia-michelle-project-labyrinth.netlify.app/

4 changes: 4 additions & 0 deletions code/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
{
"allowSingleLine": true
}
],
"linebreak-style":[
"off",
"unix"
],
"comma-dangle": [
"error",
Expand Down
Loading