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

Eva S & Joanna P - Labyrinth Game #195

Open
wants to merge 87 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
5849ed5
Installed Packages
Joanna-Philips Apr 24, 2023
79fd1a7
Create Loader.js
Joanna-Philips Apr 24, 2023
648ae3f
added packages
EvaSjoholm Apr 25, 2023
70faa84
Merge branch 'master' of https://github.com/Joanna-Philips/project-la…
EvaSjoholm Apr 25, 2023
7ded37d
added some styles component
EvaSjoholm Apr 25, 2023
fd157e6
added component userInput
EvaSjoholm Apr 25, 2023
7b165bd
Co-authored-by: Joanna Philips <[email protected]>
EvaSjoholm Apr 25, 2023
a8923a0
added to setLoading to labyrinth.js
EvaSjoholm Apr 25, 2023
541ebca
globalStyles to game and app.js
EvaSjoholm Apr 25, 2023
4f9d770
added styling btn etc
EvaSjoholm Apr 25, 2023
7717fcc
cleaned up code
EvaSjoholm Apr 25, 2023
fc1510e
created folders and destructured, added dot ani
EvaSjoholm Apr 25, 2023
5f12fd3
currentStep not populating
Joanna-Philips Apr 25, 2023
afccf53
add code to labyrinth for fetch direction line 71
EvaSjoholm Apr 26, 2023
96c2543
Game works!
Joanna-Philips Apr 26, 2023
8e9ae67
Merge pull request #1 from Joanna-Philips/working-game
Joanna-Philips Apr 26, 2023
ae84d3a
Testing bug fix
Joanna-Philips Apr 26, 2023
9c52df7
Cleaned up some comments
Joanna-Philips Apr 26, 2023
38fd546
Implemented Main and fixed loading page to show
Joanna-Philips Apr 26, 2023
0569d42
Cleaned up redundant code
Joanna-Philips Apr 26, 2023
cd88dfb
dots
EvaSjoholm Apr 26, 2023
8008aff
erased dots
EvaSjoholm Apr 26, 2023
6569b6b
added typeit animation and styling to gamePage
EvaSjoholm Apr 26, 2023
19abbff
fixed startScreen and added typeIt to startpage
EvaSjoholm Apr 26, 2023
f703de8
added font
EvaSjoholm Apr 26, 2023
79238fe
font change again
EvaSjoholm Apr 26, 2023
0752c6a
fixed design, added assets and color change
EvaSjoholm Apr 26, 2023
bcda052
added mobile media query
EvaSjoholm Apr 26, 2023
9e85c64
corrected media query name and fixes to mobile
EvaSjoholm Apr 26, 2023
2fdb774
styling to loading and media in gameScreen
EvaSjoholm Apr 26, 2023
e64de9f
changed styling to starter page
EvaSjoholm Apr 26, 2023
7cd93f5
clean up code
EvaSjoholm Apr 26, 2023
1164cf8
clean up
EvaSjoholm Apr 26, 2023
a6f4cff
clean up
EvaSjoholm Apr 26, 2023
b0ddd35
Merge pull request #2 from Joanna-Philips/styling
Joanna-Philips Apr 26, 2023
299983f
restart has bugs
Joanna-Philips Apr 26, 2023
998abae
Added error handling for fetch
Joanna-Philips Apr 26, 2023
09df9e5
Added var to fetch url
Joanna-Philips Apr 26, 2023
c411fc6
fixed spelling and css
EvaSjoholm Apr 26, 2023
b7ef441
Fixed key prop warning on game screen + trial for restart
Joanna-Philips Apr 26, 2023
f2d383a
Update GameScreen.js
Joanna-Philips Apr 26, 2023
40d2c23
Update GameScreen.js
Joanna-Philips Apr 26, 2023
39da82b
Merge pull request #3 from Joanna-Philips/restartBtn
Joanna-Philips Apr 26, 2023
8ba427a
added style to game section
EvaSjoholm Apr 27, 2023
1494b3c
stylings to game
EvaSjoholm Apr 27, 2023
a5eb58c
fit content in direction css
EvaSjoholm Apr 27, 2023
4916530
media query fix
EvaSjoholm Apr 27, 2023
8c10d40
Changed to more appropriate name
Joanna-Philips Apr 27, 2023
0c9f7e3
Merge pull request #4 from Joanna-Philips/restartBtn
Joanna-Philips Apr 27, 2023
395fea9
styling buttons
EvaSjoholm Apr 27, 2023
8cf57fa
Merge branch 'master' into gameStyles
Joanna-Philips Apr 27, 2023
5d717c1
Merge pull request #5 from Joanna-Philips/gameStyles
Joanna-Philips Apr 27, 2023
6c8075d
Update GameScreen.js
Joanna-Philips Apr 27, 2023
338f969
functioning restart button
EvaSjoholm Apr 27, 2023
f301cc5
Fixed styling and alignment of action box
Joanna-Philips Apr 27, 2023
8a71fdc
Merge pull request #6 from Joanna-Philips/stylingActionBox
Joanna-Philips Apr 27, 2023
1cb5400
Merge pull request #7 from Joanna-Philips/restartButton
Joanna-Philips Apr 27, 2023
a489d4c
Removed blinking cursor
Joanna-Philips Apr 27, 2023
8bc5f3f
Merge pull request #8 from Joanna-Philips/stylingActionBox
Joanna-Philips Apr 27, 2023
4f59ff1
added lotti animation and styling
EvaSjoholm Apr 27, 2023
3de9e2e
cleaned up code
EvaSjoholm Apr 27, 2023
c637e36
styled Restart buttton
EvaSjoholm Apr 27, 2023
8cdbc19
styled start button with padding
EvaSjoholm Apr 27, 2023
6369e98
animation to game screen fade-in
EvaSjoholm Apr 27, 2023
a4d2ff8
design fix
EvaSjoholm Apr 27, 2023
fb1cc0e
added gradient fix
EvaSjoholm Apr 27, 2023
506a64d
Merge pull request #9 from Joanna-Philips/loadingPage
Joanna-Philips Apr 27, 2023
cb92190
Minor changes
Joanna-Philips Apr 27, 2023
877dc16
Merge branch 'master' of https://github.com/Joanna-Philips/project-la…
Joanna-Philips Apr 27, 2023
f8ef48d
Added end gif
Joanna-Philips Apr 27, 2023
6b76194
Added macro to globalstyles
Joanna-Philips Apr 27, 2023
919712e
Added backgrounds to game screen
Joanna-Philips Apr 27, 2023
419f12d
Changed an image
Joanna-Philips Apr 27, 2023
76b1a97
Minor eslint change
Joanna-Philips Apr 27, 2023
7d1a1cd
Update index.html
Joanna-Philips Apr 27, 2023
85e48e8
Added favicon
Joanna-Philips Apr 27, 2023
328445d
animation change and img
EvaSjoholm Apr 27, 2023
237ac7f
Merge pull request #10 from Joanna-Philips/ani-design
Joanna-Philips Apr 28, 2023
ee93f3d
Added player history to display moves
Joanna-Philips Apr 28, 2023
4c4c47e
Merge pull request #11 from Joanna-Philips/history
Joanna-Philips Apr 28, 2023
634b367
Cleaned up gamescreen
Joanna-Philips Apr 28, 2023
4973b07
removed blinking cursor
Joanna-Philips Apr 28, 2023
27cbd47
Update README.md
Joanna-Philips Apr 28, 2023
56775e0
image credits
Joanna-Philips Apr 28, 2023
13cc33b
Added visual map to track player position
Joanna-Philips Apr 29, 2023
6010dde
Update README.md
Joanna-Philips Apr 29, 2023
6d6b64b
Minor name change
Joanna-Philips May 2, 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
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# 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 week's project is all about tying together the skills learnt to build an app that retrieves a list of actions from the backend and presents them to the user as interactable items.
We used redux to store the current state of the game and thunks to wrap the API calls.

## 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?
First we laid out our design on figma - which included the goals, the components needed and some preliminary design ideas. The we worked on setting up the redux store with reducers and thunks together. We then split up to work on functionality and design. We drew help from other team mates, stackoverflow and google in general. If we had more time, we would create a blinking red dot on the map and store player moves to local storage.

## View it live
https://the-labyrinth-es-jp.netlify.app/


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.
## Image credits
"https://www.flaticon.com/free-icons/maze" Maze icons created by Freepik - Flaticon
https://www.artstation.com/artwork/nYB6y6
4 changes: 4 additions & 0 deletions code/.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
Loading