-
Notifications
You must be signed in to change notification settings - Fork 322
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
smirrebinx
wants to merge
42
commits into
Technigo:master
Choose a base branch
from
smirrebinx:GoBack
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Go back #209
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 12cd596
Add font suggestions
smirrebinx 94c08de
Add GameQuestions
smirrebinx 553e753
Add setPreviousMove, remove action
smirrebinx d8a42fe
Change names
smirrebinx 1adb3d1
Add styling branch and new components
smirrebinx a88697e
new Input component
cecavi 3a6df3a
merge
smirrebinx a35420d
Add Header component in Player input
smirrebinx d47d2ba
Add fonts and styled components
smirrebinx 772cf41
Add button styling
smirrebinx a168551
Fix font size buttons
smirrebinx 9f00b55
Fix responsivity
smirrebinx 3cb38ba
Fix margin h1
smirrebinx 286753c
Fix margins
smirrebinx 526668b
Add background image
smirrebinx 6b829b4
Add background image and text background
smirrebinx 9f10790
Fix margins
smirrebinx 3133e6f
Fix width
smirrebinx 953f250
Add lottie animation
smirrebinx 8421dc9
Delete maze.json
smirrebinx ccd98e8
Add styling for placeholder
smirrebinx 4b7d9cb
Add button styling
smirrebinx e12012f
Fix box shadow on reset button
smirrebinx 2017658
Change font size and hover effect
smirrebinx e16ab11
Add font awesome icons
smirrebinx 02f1c47
Fix outer wrapper mobile
smirrebinx c8f6b5d
Add background images
smirrebinx b81122c
Add timestamp to make the username unique
smirrebinx 35ea0e8
Add comments and readme
smirrebinx b434d93
commit after pull-nothing changed from master
cecavi c5c82b8
added loading lottie
cecavi 3765678
added stuff
cecavi 848c21e
added animations
cecavi c83b035
added styling to GameQuestions
cecavi b4ae184
more styling
cecavi 1359af3
fix
cecavi 2fe9d68
after pull
cecavi c51b56a
Update README.md
smirrebinx df39426
Add API reset
smirrebinx 8cceba5
Update font
smirrebinx 73b026d
Update games.js
smirrebinx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. | ||
|
||
## 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/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,6 +41,10 @@ | |
{ | ||
"allowSingleLine": true | ||
} | ||
], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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", | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
:)