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.

Sign up for GitHub

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

Jump to bottom

Develop #1003

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Develop #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f5a6793
start
Sep 15, 2024
b87650b
start 2.0
Sep 15, 2024
490d08c
start1.0
Sep 15, 2024
e01ccb5
start 4.0
Sep 19, 2024
1275357
add start game
Sep 19, 2024
e9cd46c
make moves
Sep 19, 2024
1305244
make correct move
Sep 19, 2024
936d11c
a
Sep 19, 2024
f10753f
aa
Sep 19, 2024
ce7e41d
aaa
Sep 19, 2024
3dfe822
add merge property
Sep 20, 2024
07b785b
add corect movement cell
Sep 20, 2024
74a6675
try to impruve movement
Sep 21, 2024
1801579
make improve for movement
Sep 22, 2024
07d8a4b
add cell style
Sep 26, 2024
aa679b9
make improve move history
Sep 26, 2024
4286507
make improve move history
Sep 26, 2024
899bc20
try score
Sep 26, 2024
31bffe6
try to make animation
Sep 26, 2024
2d6a8f0
asd
Sep 27, 2024
b992226
change animation
Sep 28, 2024
445d5ba
add animation
Sep 30, 2024
3111c4c
make finish version
Oct 4, 2024
0204a27
problem with animation
Oct 5, 2024
d4c34d4
prepare code to test
Oct 5, 2024
27b8147
animation problem
Oct 6, 2024
43fe3ae
problem with animation 2.0
Oct 10, 2024
5eabedd
finaly add animaion
Oct 20, 2024
7c793f7
finish
Oct 23, 2024
939bf26
add correct work lose trecker
Oct 24, 2024
83a0d44
add favicon
Oct 27, 2024
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
29 changes: 29 additions & 0 deletions .github/workflows/test.yml-template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Test

on:
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm start & sleep 5 && npm test
- name: Upload tests report(cypress mochaawesome merged HTML report)
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: report
path: reports
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Okay, okay. Also, we have some rules:
7) When 2048 value is displayed in any cell, win message should be shown.
8) The `game over` message should be shown if there are no more available moves.
9) Hide start message when game starts.
10) Change the `Start` button to `Restart` after the first move.
10) Change the `Start` button to `Restart` after click on `Start` button.
11) `Restart` button should reset the game to the initial state.
12) Increase score with each move. The score should be increased by the sum of all merged cells.
13) The game consists of 2 main parts:
Expand All @@ -61,7 +61,7 @@ You can change the HTML/CSS layout if you need it.
## Deploy and Pull Request

1. Replace `<your_account>` with your Github username in the link
- [DEMO LINK](https://<your_account>.github.io/js_2048_game/)
- [DEMO LINK](https://Razsinxron.github.io/js_2048_game/)
2. Follow [this instructions](https://mate-academy.github.io/layout_task-guideline/)
- Run `npm run test` command to test your code;
- Run `npm run test:only -- -n` to run fast test ignoring linter;
Expand Down
9 changes: 5 additions & 4 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@mate-academy/eslint-config": "latest",
"@mate-academy/jest-mochawesome-reporter": "^1.0.0",
"@mate-academy/linthtml-config": "latest",
"@mate-academy/scripts": "^1.8.5",
"@mate-academy/scripts": "^1.9.12",
"@mate-academy/stylelint-config": "latest",
"@parcel/transformer-sass": "^2.12.0",
"cypress": "^13.13.0",
Expand Down
64 changes: 35 additions & 29 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
rel="stylesheet"
href="./styles/main.scss"
/>
<link rel="shortcut icon" href="https://www.2048.org/favicon.ico">
</head>
<body>
<div class="container">
Expand All @@ -25,37 +26,39 @@ <h1>2048</h1>
</div>
</div>

<table class="game-field">
<tbody>
<tr class="field-row">
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
</tr>
<div class="move-zone">
<table class="game-field">
<tbody>
<tr class="field-row">
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
</tr>

<tr class="field-row">
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
</tr>
<tr class="field-row">
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
</tr>

<tr class="field-row">
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
</tr>
<tr class="field-row">
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
</tr>

<tr class="field-row">
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
</tr>
</tbody>
</table>
<tr class="field-row">
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
<td class="field-cell"></td>
</tr>
</tbody>
</table>
</div>

<div class="message-container">
<p class="message message-lose hidden">You lose! Restart the game?</p>
Expand All @@ -65,6 +68,9 @@ <h1>2048</h1>
</p>
</div>
</div>
<script src="scripts/main.js"></script>
<script
type="module"
src="scripts/main.js"
></script>
</body>
</html>
Loading
Loading