Skip to content

Commit

Permalink
Merge pull request #55 from eugene-serb/dev
Browse files Browse the repository at this point in the history
Release 2.0.2
  • Loading branch information
eugene-serb authored Feb 17, 2024
2 parents 993119f + 692cb60 commit f693121
Show file tree
Hide file tree
Showing 8 changed files with 450 additions and 362 deletions.
2 changes: 2 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

module.exports = {
printWidth: 100,
tabWidth: 2,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
508 changes: 276 additions & 232 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "game-of-life",
"version": "2.0.1",
"description": "This is a cellular automaton that implements Conway's Game of Life. Contains a library of figurines and tools.",
"version": "2.0.2",
"description": "This is a cellular automaton that implements John Horton Conway's Game of Life. Contains a library of figures and tools.",
"keywords": [
"game-of-life",
"conway's game of life",
Expand All @@ -26,33 +26,33 @@
"main": "index.js",
"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"
}
Expand Down
70 changes: 36 additions & 34 deletions src/pages/index/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<html lang="en-us" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Eugene Serb Conway's Game of Life</title>
<title>Eugene Serb Conway's Game of Life</title>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand All @@ -12,7 +12,7 @@
<meta name="robots" content="all" />

<meta name="author" content="Eugene Serb" />
<meta name="copyright" content="Eugene Serb, 2023" />
<meta name="copyright" content="Eugene Serb, 2024" />
<meta name="publisher-email" content="[email protected]" />
<meta name="publisher-url" content="https://eugene-serb.github.io/" />
<meta
Expand All @@ -21,27 +21,27 @@
/>
<meta
name="description"
content="This is a cellular automaton that implements Conway's game of life on the surface of a torus."
content="This is a cellular automaton that implements John Horton Conway's Game of Life. Contains a library of figures and tools."
/>

<meta property="og:locale" content="en_US" />
<meta property="og:type" content="website" />
<meta property="og:title" content="Eugene Serb Conway's Game of Life" />
<meta property="og:site_name" content="Eugene Serb Website" />
<meta property="og:title" content="Eugene Serb Conway's Game of Life" />
<meta property="og:site_name" content="Eugene Serb Website" />
<meta
property="og:description"
content="This is a cellular automaton that implements Conway's game of life on the surface of a torus."
content="This is a cellular automaton that implements John Horton Conway's Game of Life. Contains a library of figures and tools."
/>
<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 Conway's Game of Life" />
<meta name="twitter:title" content="Eugene Serb Conway's Game of Life" />
<meta
name="twitter:description"
content="This is a cellular automaton that implements Conway's game of life on the surface of a torus."
content="This is a cellular automaton that implements John Horton Conway's Game of Life. Contains a library of figures and tools."
/>
<meta name="twitter:image" content="./img/og.png" />

Expand All @@ -50,13 +50,15 @@
<meta name="msvalidate.01" content="6E1771734F083E5366205F06314C3577" />
<meta name="wmail-verification" content="46d069b79f9c774ce0bbf55f46aef201" />

<link rel="canonical" href="https://eugene-serb.github.io/game-of-life/" />
<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/game-of-life/" />

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-4NB4LGNNLB"></script>
Expand Down Expand Up @@ -103,7 +105,7 @@
</header>

<main class="page container">
<h1 class="visually-hidden">Eugene Serb Conway's Game of Life</h1>
<h1 class="visually-hidden">Eugene Serb Conway's Game of Life</h1>
<div class="game">
<div id="map" class="game__map-wrapper"></div>
<div class="game__right-column">
Expand Down Expand Up @@ -183,20 +185,20 @@ <h2 class="game__title">Game of Life</h2>
<option value="3">HWSS</option>
</select>
<select class="game-of-life__oscillators-menu">
<option value="-1" selected="selected">— Oscillators period —</option>
<option value="0">Blinker 2</option>
<option value="1">Toad 2</option>
<option value="2">Beacon 2</option>
<option value="3">Clock 2</option>
<option value="4">Pulsar 3</option>
<option value="5">Penta-decathlon 15</option>
<option value="6">Star 3</option>
<option value="7">Cross 3</option>
<option value="8">French Kiss 3</option>
<option value="9">Clock 2 4</option>
<option value="10">Pinwheel 4</option>
<option value="11">Octagon 5</option>
<option value="12">Fumarole 5</option>
<option value="-1" selected="selected">— Oscillators period —</option>
<option value="0">Blinker 2</option>
<option value="1">Toad 2</option>
<option value="2">Beacon 2</option>
<option value="3">Clock 2</option>
<option value="4">Pulsar 3</option>
<option value="5">Penta-decathlon 15</option>
<option value="6">Star 3</option>
<option value="7">Cross 3</option>
<option value="8">French Kiss 3</option>
<option value="9">Clock 2 4</option>
<option value="10">Pinwheel 4</option>
<option value="11">Octagon 5</option>
<option value="12">Fumarole 5</option>
</select>
<select class="game-of-life__guns-menu">
<option value="-1" selected="selected">— Guns —</option>
Expand All @@ -207,7 +209,7 @@ <h2 class="game__title">Game of Life</h2>
<option value="0">Pentomino O</option>
<option value="1">Pentomino P</option>
<option value="2">Pentomino Q</option>
<option value="3">Pentomino R 1103</option>
<option value="3">Pentomino R 1103</option>
<option value="4">Pentomino S</option>
<option value="5">Pentomino T</option>
<option value="6">Pentomino U</option>
Expand All @@ -218,11 +220,11 @@ <h2 class="game__title">Game of Life</h2>
<option value="11">Pentomino Z</option>
</select>
<select class="game-of-life__mathusalem-menu">
<option value="-1" selected="selected">— Mathusalem age —</option>
<option value="0">Acorn 5206</option>
<option value="1">Rabbits 17332</option>
<option value="2">Toughie 130</option>
<option value="3">Rocket 194</option>
<option value="-1" selected="selected">— Mathusalem age —</option>
<option value="0">Acorn 5206</option>
<option value="1">Rabbits 17332</option>
<option value="2">Toughie 130</option>
<option value="3">Rocket 194</option>
</select>
<select class="game-of-life__interesting-menu">
<option value="-1" selected="selected">— Interesting —</option>
Expand All @@ -245,7 +247,7 @@ <h2 class="game__title">Game of Life</h2>
<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>
Expand Down
Loading

0 comments on commit f693121

Please sign in to comment.