Merge pull request #47 from eugene-serb/dev

Release 2.0.2
eugene-serb · Feb 17, 2024 · ba0b2df · ba0b2df
2 parents 04d5937 + 863f3c9
commit ba0b2df
Show file tree

Hide file tree

Showing 8 changed files with 451 additions and 357 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   printWidth: 100,
   tabWidth: 2,

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Use Aurora Game Engine **[[rep](https://github.com/eugene-serb/aurora-game-engin
 ## Commands:
 
 - npm run start — run with watcher
-- npm run serve — run dev server
+- npm run dev — run dev server
 - npm run build — build in production mode,
 - npm run build:dev — build in development mode,
 - npm run lint — run lint check,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "2048-game",
-  "version": "2.0.1",
-  "description": "This is a simple browser implementation of a game 2048.",
+  "version": "2.0.2",
+  "description": "Game 2048 with support for keyboard, gamepad and mouse. Let's play!",
   "keywords": [
     "2048-game",
     "2048",
@@ -24,33 +24,33 @@
   "private": "true",
   "scripts": {
     "start": "webpack --mode development --watch",
-    "serve": "webpack-dev-server --mode development --open",
+    "dev": "webpack-dev-server --mode development --open",
     "build": "webpack --mode production",
     "build:dev": "webpack --mode development",
-    "lint": "eslint src",
-    "lint:fix": "eslint --fix src",
-    "format": "npx prettier --check src",
-    "format:fix": "npx prettier --write --ignore-unknown src",
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix .",
+    "format": "npx prettier --check .",
+    "format:fix": "npx prettier --write --ignore-unknown .",
     "test": "jest tests"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.7",
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/preset-env": "^7.23.7",
+    "@babel/core": "^7.23.9",
+    "@babel/eslint-parser": "^7.23.10",
+    "@babel/preset-env": "^7.23.9",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.3",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.8.1",
+    "css-loader": "^6.10.0",
     "eslint": "^8.56.0",
     "eslint-cli": "^1.1.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-webpack-plugin": "^4.0.1",
     "html-webpack-plugin": "^5.6.0",
     "jest": "^29.7.0",
-    "prettier": "^3.1.1",
-    "style-loader": "^3.3.3",
-    "webpack": "^5.89.0",
+    "prettier": "^3.2.5",
+    "style-loader": "^3.3.4",
+    "webpack": "^5.90.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }

diff --git a/src/pages/index/index.html b/src/pages/index/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="en-us" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>Eugene Serb – 2048 Game</title>
+    <title>Eugene Serb — 2048 Game</title>
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -12,30 +12,36 @@
     <meta name="robots" content="all" />
 
     <meta name="author" content="Eugene Serb" />
-    <meta name="copyright" content="Eugene Serb, 2022" />
+    <meta name="copyright" content="Eugene Serb, 2024" />
     <meta name="publisher-email" content="eugene.serb@gmail.com" />
     <meta name="publisher-url" content="https://eugene-serb.github.io/" />
     <meta
       name="keywords"
       content="Eugene Serb, eugene-serb, eugene_serb, eugene.serb, Evgeniy Serb, Евгений Серб, Novorossiysk, Новороссийск, contacts, CV, resume, portfolio, repositories, services, coder, developer, software engineer, development, frontend, backend, fullstack, 2048 Game"
     />
-    <meta name="description" content="This is a simple browser 2048 game. Let's have fun!" />
+    <meta
+      name="description"
+      content="Game 2048 with support for keyboard, gamepad and mouse. Let's play!"
+    />
 
     <meta property="og:locale" content="en_US" />
     <meta property="og:type" content="website" />
-    <meta property="og:title" content="Eugene Serb – 2048 Game" />
+    <meta property="og:title" content="Eugene Serb — 2048 Game" />
     <meta property="og:site_name" content="Eugene Serb — Website" />
-    <meta property="og:description" content="This is a simple browser 2048 game. Let's have fun!" />
+    <meta
+      property="og:description"
+      content="Game 2048 with support for keyboard, gamepad and mouse. Let's play!"
+    />
     <meta property="og:url" content="https://eugene-serb.github.io/" />
     <meta property="og:image" content="./img/og.png" />
     <meta property="vk:image" content="./img/og.png" />
 
     <meta name="twitter:card" content="summary" />
     <meta name="twitter:creator" content="@eugene_serb" />
-    <meta name="twitter:title" content="Eugene Serb – 2048 Game" />
+    <meta name="twitter:title" content="Eugene Serb — 2048 Game" />
     <meta
       name="twitter:description"
-      content="This is a simple browser 2048 game. Let's have fun!"
+      content="Game 2048 with support for keyboard, gamepad and mouse. Let's play!"
     />
     <meta name="twitter:image" content="./img/og.png" />
 
@@ -44,13 +50,15 @@
     <meta name="msvalidate.01" content="6E1771734F083E5366205F06314C3577" />
     <meta name="wmail-verification" content="46d069b79f9c774ce0bbf55f46aef201" />
 
-    <link rel="canonical" href="https://eugene-serb.github.io/2048-game/" />
-    <link rel="shortcut icon" type="image/x-icon" href="./img/favicon.ico" />
-    <link rel="apple-touch-icon" sizes="180x180" href="./img/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="./img/favicon-32x32.png" />
+    <link rel="icon" type="image/x-icon" href="./img/favicon.ico" />
     <link rel="icon" type="image/png" sizes="16x16" href="./img/favicon-16x16.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="./img/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="192x192" href="./img/android-chrome-192x192.png" />
+    <link rel="icon" type="image/png" sizes="512x512" href="./img/android-chrome-512x512.png" />
+    <link rel="apple-touch-icon" sizes="180x180" href="./img/apple-touch-icon.png" />
     <link rel="manifest" href="./site.webmanifest" />
     <link rel="stylesheet" type="text/css" href="./css/index.css" />
+    <link rel="canonical" href="https://eugene-serb.github.io/2048-game/" />
 
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-4NB4LGNNLB"></script>
@@ -97,7 +105,7 @@
     </header>
 
     <main class="page container">
-      <h1 class="visually-hidden">Eugene Serb – 2048 Game</h1>
+      <h1 class="visually-hidden">Eugene Serb — 2048 Game</h1>
       <section class="post">
         <div class="game">
           <div id="map" class="game__map-wrapper"></div>
@@ -112,52 +120,52 @@ <h2 class="game__title">2048 Game</h2>
               <div class="game__controls">
                 <span>Up</span>
                 <div>
-                  <span>– </span>
+                  <span>— </span>
                   <kbd>W</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd>↑</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd style="background-color: grey; border-radius: 2ch; color: white">↑</kbd>
                 </div>
                 <span>Down</span>
                 <div>
-                  <span>– </span>
+                  <span>— </span>
                   <kbd>S</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd>↓</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd style="background-color: grey; border-radius: 2ch; color: white">↓</kbd>
                 </div>
                 <span>Left</span>
                 <div>
-                  <span>– </span>
+                  <span>— </span>
                   <kbd>A</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd>←</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd style="background-color: grey; border-radius: 2ch; color: white">←</kbd>
                 </div>
                 <span>Rigth</span>
                 <div>
-                  <span>– </span>
+                  <span>— </span>
                   <kbd>D</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd>→</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd style="background-color: grey; border-radius: 2ch; color: white">→</kbd>
                 </div>
                 <span>Restart</span>
                 <div>
-                  <span>– </span>
+                  <span>— </span>
                   <kbd>R</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd style="background-color: grey; border-radius: 2ch; color: white">START</kbd>
                 </div>
                 <span>Pause</span>
                 <div>
-                  <span>– </span>
+                  <span>— </span>
                   <kbd>P</kbd>
-                  <span>and </span>
+                  <span>or </span>
                   <kbd style="background-color: grey; border-radius: 2ch; color: white">BACK</kbd>
                 </div>
               </div>
@@ -187,7 +195,7 @@ <h3>Your records:</h3>
       <div class="footer-wrapper container">
         <div class="annotation">
           <span class="annotation__text">
-            © 2023
+            © 2024
             <a href="https://eugene-serb.github.io/" target="_blank" translate="no">Eugene Serb</a>.
             Content licensed under
           </span>