Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Technigo/project-labyrinth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Frivridna/project-labyrinth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Apr 26, 2021

  1. test

    Frivridna committed Apr 26, 2021
    Copy the full SHA
    55f0bf0 View commit details
  2. create components folder

    Frivridna committed Apr 26, 2021
    Copy the full SHA
    420a758 View commit details
  3. added a p tag in app

    Anna Lindgren authored and Anna Lindgren committed Apr 26, 2021
    Copy the full SHA
    37b3960 View commit details
  4. added reducer and configured store

    Anna Lindgren authored and Anna Lindgren committed Apr 26, 2021
    Copy the full SHA
    89f3037 View commit details
  5. added startscreen for input name

    Anna Lindgren authored and Anna Lindgren committed Apr 26, 2021
    Copy the full SHA
    e3efaf7 View commit details
  6. write reducers: setUserName, setDescription and write CreateNewPlayer…

    … fetch post request of username, finish onFormSubmit in StartScreen
    Frivridna committed Apr 26, 2021
    Copy the full SHA
    f24ac25 View commit details
  7. fix call to fetch

    Frivridna committed Apr 26, 2021
    Copy the full SHA
    e2f0480 View commit details

Commits on Apr 27, 2021

  1. Copy the full SHA
    1547f2a View commit details
  2. added map method to render game action

    Anna Lindgren authored and Anna Lindgren committed Apr 27, 2021
    Copy the full SHA
    3dddb5b View commit details
  3. contine with second fetch post request in reducer, try to get directi…

    …on button to work in GameScreen
    Frivridna committed Apr 27, 2021
    Copy the full SHA
    4359323 View commit details
  4. changed our 2nd fetch continuing later

    Anna Lindgren authored and Anna Lindgren committed Apr 27, 2021
    Copy the full SHA
    410bebd View commit details
  5. Copy the full SHA
    a001edb View commit details
  6. move GameScreen to App for the moment because it was mounted inside <…

    …form> tag and 2nd fetch executed all the time
    Frivridna committed Apr 27, 2021
    Copy the full SHA
    18c5d5b View commit details
  7. Copy the full SHA
    1ed165c View commit details
  8. Copy the full SHA
    eec0436 View commit details

Commits on Apr 28, 2021

  1. fixed our 2nd fetch to work

    Anna Lindgren authored and Anna Lindgren committed Apr 28, 2021
    Copy the full SHA
    843278d View commit details
  2. make Games component, add saveGame history, error and loading to redu…

    …cers and in Redux thunks, make Back button in GameScreen
    Frivridna committed Apr 28, 2021
    Copy the full SHA
    1ca9112 View commit details

Commits on Apr 29, 2021

  1. Copy the full SHA
    9bf2050 View commit details
  2. change initialstate

    Frivridna committed Apr 29, 2021
    Copy the full SHA
    dc717a0 View commit details
  3. Copy the full SHA
    253b95f View commit details
  4. Copy the full SHA
    64294bb View commit details
  5. add loading spinner

    Frivridna committed Apr 29, 2021
    Copy the full SHA
    2270ac8 View commit details
  6. add container to loader

    Frivridna committed Apr 29, 2021
    Copy the full SHA
    8e8411a View commit details
  7. removed unused imports

    Anna Lindgren authored and Anna Lindgren committed Apr 29, 2021
    Copy the full SHA
    e8433a8 View commit details
  8. started with styling of startscreen

    Anna Lindgren authored and Anna Lindgren committed Apr 29, 2021
    Copy the full SHA
    b3d119e View commit details
  9. Copy the full SHA
    196fa2e View commit details
  10. Copy the full SHA
    21bbf76 View commit details
  11. Copy the full SHA
    a7c19a0 View commit details
  12. Copy the full SHA
    a584108 View commit details
  13. Copy the full SHA
    ef53468 View commit details
  14. import styled-loaders-react

    Frivridna committed Apr 29, 2021
    Copy the full SHA
    2b02757 View commit details
  15. added nes.css and started styling of startscreen

    Anna Lindgren authored and Anna Lindgren committed Apr 29, 2021
    Copy the full SHA
    4f57112 View commit details
  16. Copy the full SHA
    290e87c View commit details
  17. Copy the full SHA
    cfdc218 View commit details
  18. Copy the full SHA
    caf510e View commit details
  19. Copy the full SHA
    2a37508 View commit details
  20. change color loader2

    Frivridna committed Apr 29, 2021
    Copy the full SHA
    8676361 View commit details
  21. Copy the full SHA
    da51d16 View commit details
  22. remove unused import

    Frivridna committed Apr 29, 2021
    Copy the full SHA
    2560ff4 View commit details

Commits on Apr 30, 2021

  1. Copy the full SHA
    b9ec467 View commit details
  2. added some styling

    Anna Lindgren authored and Anna Lindgren committed Apr 30, 2021
    Copy the full SHA
    44540ba View commit details
  3. finnish header component styling

    Anna Lindgren authored and Anna Lindgren committed Apr 30, 2021
    Copy the full SHA
    949d792 View commit details
  4. added global styled components

    Anna Lindgren authored and Anna Lindgren committed Apr 30, 2021
    Copy the full SHA
    a622f74 View commit details
  5. more styled components to startscreen

    Anna Lindgren authored and Anna Lindgren committed Apr 30, 2021
    Copy the full SHA
    9cca064 View commit details
  6. Copy the full SHA
    06f3093 View commit details
  7. remove import

    Frivridna committed Apr 30, 2021
    Copy the full SHA
    a3b4535 View commit details
  8. continue with styling

    Anna Lindgren authored and Anna Lindgren committed Apr 30, 2021
    Copy the full SHA
    69797b4 View commit details
  9. Copy the full SHA
    585093a View commit details
  10. removed outputs and comments

    Anna Lindgren authored and Anna Lindgren committed Apr 30, 2021
    Copy the full SHA
    75ac18a View commit details
  11. added last styling

    Anna Lindgren authored and Anna Lindgren committed Apr 30, 2021
    Copy the full SHA
    c986b74 View commit details
30 changes: 24 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
# Project Labyrinth
A pair programming project by Anna Lindgren and Caroline Byström. A text-based adventure inspired by early command-line games.

Replace this readme with your own information about your project.
The app has been generated using create-react-app. And uses the following npm packages that are not included in the create-react-app:
- styled-components
- react-redux
- reduxjs/toolkit
- nes.css
- styled-loaders-react

Start by briefly describing the assignment in a sentence or two. Keep it short and to the point.
The focus of this week was to learn:
- How to make API calls around Redux using thunks
- How to structure the redux store to suit the data
- To send JSON in the body of a request

## The problem
## Reflections
We enjoyed the thematics of this week figuring out a proper design for the project whilst learning more about asynchronous Redux and keeping the history of previous data in Redux store.

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 started out by building the logic, then moved onto implementing saving data in Redux store and making a loading state to display a spinner. After we had all the data in place, being able to map it out we wanted to implement a end screen to show weather the game was finnished or not.

## View it live
When we where happy with the results we started with the styling. We decided to go with nes.css package and it was quite simple to style. Even though at sometimes we felt a little bit locked in with little room to change minor details of nes.css buttons etc.

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.
We styled both with regular css file and with styled components for the elements that where not nes.css styling.

The collaboration was mostly programming together, but we also tried out making separate branches after we had established a common ground to be able to work on different components at the same time. This saved us time to focus on additional features to add to our game. At the same time it was important to us that both of us was onboard and understood everything we where doing. We where both very good at having mini stand-ups when we worked on seperate branches.

If we had more time it would be great to inform a first time player that their username of choice must be unique by recieving some kind of message from the backend. We would also persist redux store to localStorage, so the app data remains upon reloading the page. If more time it would also be interesting to dive in to nes.css package for styled components. It felt a little bit messy to combine regular css and styled components.

## Play it here 😊

https://labyrinth-by-caroline-anna.netlify.app/
Loading