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

Go back #209

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 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
df39426
Add API reset
smirrebinx Apr 30, 2023
8cceba5
Update font
smirrebinx Apr 30, 2023
73b026d
Update games.js
smirrebinx Apr 30, 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
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# 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 was focused on delving deeper into Redux. The project includes Redux-related topics, such as using thunks for async actions, working with APIs, and using Redux Toolkit. We worked in a pair and gained a more understanding of working with APIs with Redux, using thunks, and structuring our Redux store to best suit our data. We also learned about creating reusable components and sending JSON in the body of a request.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good readme with proper information.
:)


## 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
}
],

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also do this in all projects due to working with a Windows-computer = timesaver :D

"linebreak-style":[
"off",
"unix"
],
"comma-dangle": [
"error",
Expand Down
Loading