Skip to content

Commit

Permalink
Merge pull request #23 from Berlevog/sprint-01
Browse files Browse the repository at this point in the history
Sprint 01
  • Loading branch information
shoom1337 authored Oct 11, 2021
2 parents 42f7837 + ebd958c commit e66fdc1
Show file tree
Hide file tree
Showing 79 changed files with 2,658 additions and 121 deletions.
1 change: 1 addition & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"plugins": ["@babel/plugin-proposal-async-generator-functions", "@babel/plugin-transform-runtime"],
"presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"]
}
12 changes: 12 additions & 0 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: build-test
on: [pull_request, push]
jobs:
Testing:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
- run: npm install
- run: npm test
4 changes: 3 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"printWidth": 120
}
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# yandex.middlefrontend.mario

_Командный проект 5-7 спринта_
_Командный проект 5-9 спринта_

[![build-test](https://github.com/Berlevog/yandex.middlefrontend.mario/actions/workflows/actions.yml/badge.svg)](https://github.com/Berlevog/yandex.middlefrontend.mario/actions/workflows/actions.yml)
[![Heroku](https://heroku-badge.herokuapp.com/?app=super-mario-yandex&style=flat)](https://super-mario-yandex.herokuapp.com/)

Запуск проекта - `npm start`
Expand Down
178 changes: 173 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,18 @@
"dependencies": {
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"axios": "^0.21.4",
"eventemitter3": "^4.0.7",
"formik": "^2.2.9",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.3.0",
"recharts": "^2.1.2"
},
"devDependencies": {
"@babel/core": "^7.15.5",
"@babel/plugin-proposal-async-generator-functions": "^7.15.4",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.6",
"@babel/preset-react": "^7.14.5",
Expand All @@ -48,10 +53,11 @@
"@types/jest": "^26.0.24",
"@types/react": "^17.0.19",
"@types/react-dom": "^17.0.9",
"@types/react-input-mask": "^3.0.1",
"@types/react-router-dom": "^5.1.8",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
"@typescript-eslint/eslint-plugin": "^4.31.1",
"@typescript-eslint/parser": "^4.31.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
"autoprefixer": "^10.3.4",
"babel-loader": "^8.2.2",
"css-loader": "^6.2.0",
Expand All @@ -63,6 +69,7 @@
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-react": "^7.25.1",
"fs-extra": "^10.0.0",
"html-webpack-plugin": "^5.3.2",
"husky": "^7.0.2",
"jest": "^27.2.0",
Expand All @@ -71,6 +78,7 @@
"postcss": "^8.3.6",
"postcss-loader": "^6.1.1",
"prettier": "2.3.2",
"react-input-mask": "^2.0.4",
"style-loader": "^3.2.1",
"stylelint": "^13.13.1",
"stylelint-config-prettier": "^8.0.2",
Expand All @@ -81,7 +89,8 @@
"typescript-eslint": "0.0.1-alpha.0",
"webpack": "^5.52.1",
"webpack-cli": "^4.8.0",
"webpack-dev-server": "^4.2.0"
"webpack-dev-server": "^4.2.0",
"yup": "^0.32.9"
},
"browserslist": {
"production": [
Expand Down
Binary file added public/assets/mario-background.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/cloud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/default-avatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/error-mushroom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/frog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/game-end.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/game-start.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/luigi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/player.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/world.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e66fdc1

Please sign in to comment.