+ {getRows()}
+
+}
+
+type matrixProps = {
+ numbers: number[][],
+ cellSize: number
+}
diff --git a/src/components/Row.tsx b/src/components/Row.tsx
new file mode 100644
index 0000000..6c60b4a
--- /dev/null
+++ b/src/components/Row.tsx
@@ -0,0 +1,26 @@
+import React from 'react'
+
+export default function Row(props: rowProps) {
+ function getStyle(number: number) {
+ return {
+ "backgroundColor": number === 1 ? "lime" : "black",
+ // "border": "solid 1px gray",
+ "width": props.cellSize,
+ "height": props.cellSize
+ };
+ }
+
+ function getGrids() {
+ let j = 0;
+ return props.row.map(number => )
+ }
+
+ return
@@ -11,7 +11,4 @@ ReactDOM.render(
document.getElementById('root')
);
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();
+
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
new file mode 100644
index 0000000..6431bc5
--- /dev/null
+++ b/src/react-app-env.d.ts
@@ -0,0 +1 @@
+///
- ,
document.getElementById('root')
);
From 9e77b3b8f3cfbd0672c0f4090cf4229df6b19d5e Mon Sep 17 00:00:00 2001
From: Urazof <2778665@gmail.com>
Date: Wed, 3 Mar 2021 15:45:22 +0200
Subject: [PATCH 06/10] changed buttons
---
public/index.html | 5 +++++
src/App.tsx | 15 +++++++++------
src/config/config.ts | 4 ++--
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/public/index.html b/public/index.html
index 0e76f08..4bdab8a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,6 +5,11 @@
+
+
+
+
+
React Game
diff --git a/src/App.tsx b/src/App.tsx
index 38ec060..281f421 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -22,11 +22,14 @@ export default function App() {
const [start, setStart] = useState(false);
return (
- <>
-
-
- {start ? res : ''}
-
-
+
+ {getGrids()}
+
;
+}
+
+type rowProps = {
+ row: number[],
+ cellSize: number,
+}
\ No newline at end of file
diff --git a/src/config/config.ts b/src/config/config.ts
new file mode 100644
index 0000000..2da6372
--- /dev/null
+++ b/src/config/config.ts
@@ -0,0 +1,3 @@
+export const N_COLUMNS = 80;
+export const N_ROWS = 80;
+export const INTERVAL = 1000;
\ No newline at end of file
diff --git a/src/index.css b/src/index.css
index 996400a..f18f360 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,11 +1,11 @@
body {
- margin: auto;
+ margin: 0;
+ position: absolute;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- flex-direction: column;
}
code {
diff --git a/src/index.tsx b/src/index.tsx
index f5185c1..5f45de6 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
-import * as serviceWorker from './serviceWorker';
+
ReactDOM.render(
- {/**/}
-
- {/**/}
- {/**/}
-
);
+
+function handleClick() {
+ return (
+
+
+ {/**/}
+ {/**/}
+ {/**/}
+
+ );
+ console.log('The link was clicked.');
+}
+
+const res = handleClick()
+
+export default function App() {
+ const [start, setStart] = useState(false);
+
+ return (
+ <>
+
+
+ {start ? res : ''}
+
+
+ )
}
\ No newline at end of file
diff --git a/src/index.css b/src/index.css
index f18f360..742f962 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,6 +1,9 @@
+
+
body {
- margin: 0;
- position: absolute;
+ width: 1024px;
+ margin:0 auto;
+ /*position: absolute;*/
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
diff --git a/src/index.tsx b/src/index.tsx
index 5f45de6..1148ade 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -6,7 +6,7 @@ import App from './App';
ReactDOM.render(
+
)
}
\ No newline at end of file
diff --git a/src/config/config.ts b/src/config/config.ts
index 2da6372..436e0bf 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -1,3 +1,3 @@
-export const N_COLUMNS = 80;
-export const N_ROWS = 80;
+export const N_COLUMNS = 100;
+export const N_ROWS = 100;
export const INTERVAL = 1000;
\ No newline at end of file
From 76f93254292b97567b0c322bdcad72a277870635 Mon Sep 17 00:00:00 2001
From: Urazof <2778665@gmail.com>
Date: Wed, 3 Mar 2021 18:08:55 +0200
Subject: [PATCH 07/10] changed view of start screen
---
src/App.tsx | 81 ++++++++++++++++++++++++++++++-----------
src/components/Game.tsx | 5 ++-
src/components/Row.tsx | 4 +-
src/config/config.ts | 4 +-
src/index.css | 8 ++--
5 files changed, 71 insertions(+), 31 deletions(-)
diff --git a/src/App.tsx b/src/App.tsx
index 281f421..5b63fe2 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,35 +1,72 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
import './App.css';
import {INTERVAL, N_COLUMNS, N_ROWS} from "./config/config";
import Game from "./components/Game";
+import {throws} from "assert";
-function handleClick() {
- return (
-
+
+
+
+
+ {start ? res : ''}
+
+
-
- {/**/}
- {/**/}
- {/**/}
-
- );
- console.log('The link was clicked.');
-}
-
-const res = handleClick()
-
export default function App() {
const [start, setStart] = useState(false);
+ const [row, setRow] = useState(N_ROWS)
+ const [interval, setInterval] = useState(INTERVAL)
+
return (
-
-
-
-
;
}
diff --git a/src/components/Row.tsx b/src/components/Row.tsx
index 6c60b4a..c3b1bc4 100644
--- a/src/components/Row.tsx
+++ b/src/components/Row.tsx
@@ -3,8 +3,8 @@ import React from 'react'
export default function Row(props: rowProps) {
function getStyle(number: number) {
return {
- "backgroundColor": number === 1 ? "lime" : "black",
- // "border": "solid 1px gray",
+ "backgroundColor": number === 1 ? "black" : "lime",
+ "border": "solid 1px gray",
"width": props.cellSize,
"height": props.cellSize
};
diff --git a/src/config/config.ts b/src/config/config.ts
index 436e0bf..94bfb87 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -1,3 +1,3 @@
-export const N_COLUMNS = 100;
-export const N_ROWS = 100;
+export const N_COLUMNS = 50;
+export let N_ROWS = 50;
export const INTERVAL = 1000;
\ No newline at end of file
diff --git a/src/index.css b/src/index.css
index 742f962..3dc674a 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,8 +1,10 @@
-
+header{
+ text-align: center;
+}
body {
- width: 1024px;
- margin:0 auto;
+ /*width: 1024px;*/
+ /*margin:0 auto;*/
/*position: absolute;*/
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
From 0ec9b2628add45fd577759ae10e806ff535d3002 Mon Sep 17 00:00:00 2001
From: Urazof <2778665@gmail.com>
Date: Wed, 3 Mar 2021 19:52:22 +0200
Subject: [PATCH 08/10] added footer
---
README.md | 4 +-
src/App.tsx | 93 +++++++++++++++++++++--------------------
src/components/Game.tsx | 3 +-
src/index.css | 34 ++++++++++-----
4 files changed, 75 insertions(+), 59 deletions(-)
diff --git a/README.md b/README.md
index 53ff504..1c996d4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-#А что это вообще такое?
+# А что это вообще такое?
Игру «Жизнь» изобрел математик Джон Хортон Конуэй в 1970 году.
Она пользовалась популярностью не только среди его коллег.
Об увлекательности игры «Жизнь» свидетельствуют результаты множества интересных исследований
@@ -12,7 +12,7 @@
Конвей попытался упростить идеи, предложенные Нейманом, и в конце концов ему удалось создать правила,
которые стали правилами игры «Жизнь».
-#Правила игры «Жизнь»
+# Правила игры «Жизнь»
«Жизнь» разыгрывается на бесконечном клеточном поле.
У каждой клетки 8 соседних клеток.
В каждой клетке может жить существо.
diff --git a/src/App.tsx b/src/App.tsx
index 5b63fe2..176e869 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -12,60 +12,61 @@ export default function App() {
return (
+ <>
+
-
-
- {start ? res : ''}
-
+
+
+
+
+
+
)
}
\ No newline at end of file
diff --git a/src/components/Game.tsx b/src/components/Game.tsx
index 46b324d..e40e422 100644
--- a/src/components/Game.tsx
+++ b/src/components/Game.tsx
@@ -8,6 +8,7 @@ import {N_COLUMNS} from "../config/config";
export default function Game(props: gameProps){
//matrix as a state and effect
const [numbers, setNumbers] = React.useState(getRandomMatrix(props.rows || 50, props.columns || 50));
+
React.useEffect(() => {
const intervalId = setInterval(() => setNumbers(num => transformField(num)), props.interval || 1000);
return () => clearInterval(intervalId);
@@ -21,11 +22,11 @@ export default function Game(props: gameProps){
}, []);
function calculateCellSize(){
- return Math.min(window.innerHeight * 0.85, window.innerWidth)/N_COLUMNS - 1;
+ return Math.min(window.innerHeight * 0.75, window.innerWidth*0.75)/N_COLUMNS - 1;
}
return
+ {/*
*/}
+ {/*
*/}
+
+ {/**/}
+
*/}
+ {/*Game of Live
+Please choose size of field
+ + +Please choose interval
+ + + + setStart(true)}>StartGame + setStart(false)}>StopGame + {/**/}
+ {/*
*/}
*/}
+ {/*
*/}
+ {/**/}
+
+ {start &&
*/}
+ {/*
+ */}
+ {/**/}
+ {/**/}
+
}
+ {/*{props.name}
+ {/*{props.name}
*/}
+
+
{/*
+ ;
}
diff --git a/src/index.css b/src/index.css
index 3dc674a..b681e8f 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,19 +1,33 @@
-header{
- text-align: center;
-}
body {
- /*width: 1024px;*/
- /*margin:0 auto;*/
- /*position: absolute;*/
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+ height: 100vh;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
}
code {
- font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+ font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}
+
+
+.footer {
+ font-size: 1.3em;
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ color: black;
+ text-align: left;
+}
+.footer2 {
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ color: black;
+ text-align: right;
+}
\ No newline at end of file
From 0798a92dc85ce436cfe442c9019d6b1030def33f Mon Sep 17 00:00:00 2001
From: Urazof <2778665@gmail.com>
Date: Wed, 3 Mar 2021 20:43:56 +0200
Subject: [PATCH 09/10] beta version
---
README.md | 22 ++-
package-lock.json | 450 ++++++++++++++++++++++++++++++++++++++++++++++
package.json | 4 +
3 files changed, 471 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 1c996d4..d55d2cd 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,22 @@
Джону фон Нейману удалось создать математическую модель такой машины с очень сложными правилами.
Конвей попытался упростить идеи, предложенные Нейманом, и в конце концов ему удалось создать правила,
которые стали правилами игры «Жизнь».
-
# Правила игры «Жизнь»
«Жизнь» разыгрывается на бесконечном клеточном поле.
-У каждой клетки 8 соседних клеток.
-В каждой клетке может жить существо.
-Существо с двумя или тремя соседями выживает в следующем поколении, иначе погибает от одиночества или перенаселённости.
-В пустой клетке с тремя соседями в следующем поколении рождается существо.
\ No newline at end of file
+Место действия этой игры — «вселенная» — это размеченная на клетки поверхность или плоскость — безграничная,
+ограниченная, или замкнутая (в пределе — бесконечная плоскость).
+Каждая клетка на этой поверхности может находиться в двух состояниях: быть «живой» (заполненной) или быть «мёртвой» (пустой). Клетка имеет восемь соседей, окружающих её.
+Распределение живых клеток в начале игры называется первым поколением. Каждое следующее поколение рассчитывается на основе предыдущего по таким правилам:
+в пустой (мёртвой) клетке, рядом с которой ровно три живые клетки, зарождается жизнь;
+если у живой клетки есть две или три живые соседки, то эта клетка продолжает жить; в противном случае, если соседей меньше двух или больше трёх, клетка умирает («от одиночества» или «от перенаселённости»)
+Игра прекращается, если
+на поле не останется ни одной «живой» клетки
+конфигурация на очередном шаге в точности (без сдвигов и поворотов) повторит себя же на одном из более ранних шагов (складывается периодическая конфигурация)
+при очередном шаге ни одна из клеток не меняет своего состояния (складывается стабильная конфигурация; предыдущее правило, вырожденное до одного шага назад)
+[Wikipedia link](https://en.wikipedia.org/wiki/The_Game_of_Life)
+# Как играть?
+Все просто - игрок выбирает размер поля и интервал обновления состояния игры. Размер поля, по понятным причинам, фиксируется на старте. Интервал же можно менять в процессе изменения состояния игры.
+в крайних точках интервал принимает дефолтные значения
+**_Приятного погружения в познавательный процесс наблюдения за клеточным автоматом_**)
+
+
diff --git a/package-lock.json b/package-lock.json
index b0a80e0..7627a0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,11 @@
"react-dom": "^17.0.1",
"react-scripts": "4.0.3",
"typescript": "^4.2.2",
+ "use-sound": "^2.0.1",
"web-vitals": "^1.1.0"
+ },
+ "devDependencies": {
+ "gh-pages": "^3.1.0"
}
},
"node_modules/@babel/code-frame": {
@@ -6062,6 +6066,12 @@
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
},
+ "node_modules/email-addresses": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz",
+ "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==",
+ "dev": true
+ },
"node_modules/emittery": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
@@ -7503,6 +7513,42 @@
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"optional": true
},
+ "node_modules/filename-reserved-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
+ "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/filenamify": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
+ "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
+ "dev": true,
+ "dependencies": {
+ "filename-reserved-regex": "^1.0.0",
+ "strip-outer": "^1.0.0",
+ "trim-repeated": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/filenamify-url": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/filenamify-url/-/filenamify-url-1.0.0.tgz",
+ "integrity": "sha1-syvYExnvWGO3MHi+1Q9GpPeXX1A=",
+ "dev": true,
+ "dependencies": {
+ "filenamify": "^1.0.0",
+ "humanize-url": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/filesize": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
@@ -8015,6 +8061,156 @@
"assert-plus": "^1.0.0"
}
},
+ "node_modules/gh-pages": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.1.0.tgz",
+ "integrity": "sha512-3b1rly9kuf3/dXsT8+ZxP0UhNLOo1CItj+3e31yUVcaph/yDsJ9RzD7JOw5o5zpBTJVQLlJAASNkUfepi9fe2w==",
+ "dev": true,
+ "dependencies": {
+ "async": "^2.6.1",
+ "commander": "^2.18.0",
+ "email-addresses": "^3.0.1",
+ "filenamify-url": "^1.0.0",
+ "find-cache-dir": "^3.3.1",
+ "fs-extra": "^8.1.0",
+ "globby": "^6.1.0"
+ },
+ "bin": {
+ "gh-pages": "bin/gh-pages.js",
+ "gh-pages-clean": "bin/gh-pages-clean.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/gh-pages/node_modules/array-union": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+ "dev": true,
+ "dependencies": {
+ "array-uniq": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/gh-pages/node_modules/commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+ "dev": true
+ },
+ "node_modules/gh-pages/node_modules/find-cache-dir": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+ "dev": true,
+ "dependencies": {
+ "commondir": "^1.0.1",
+ "make-dir": "^3.0.2",
+ "pkg-dir": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+ }
+ },
+ "node_modules/gh-pages/node_modules/fs-extra": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+ "dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=6 <7 || >=8"
+ }
+ },
+ "node_modules/gh-pages/node_modules/globby": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+ "dev": true,
+ "dependencies": {
+ "array-union": "^1.0.1",
+ "glob": "^7.0.3",
+ "object-assign": "^4.0.1",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/gh-pages/node_modules/jsonfile": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+ "dev": true,
+ "optionalDependencies": {
+ "graceful-fs": "^4.1.6"
+ }
+ },
+ "node_modules/gh-pages/node_modules/make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "dependencies": {
+ "semver": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/gh-pages/node_modules/pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/gh-pages/node_modules/pkg-dir": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+ "dev": true,
+ "dependencies": {
+ "find-up": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/gh-pages/node_modules/semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/gh-pages/node_modules/universalify": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4.0.0"
+ }
+ },
"node_modules/glob": {
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -8296,6 +8492,11 @@
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
"integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
},
+ "node_modules/howler": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/howler/-/howler-2.2.1.tgz",
+ "integrity": "sha512-0iIXvuBO/81CcrQ/HSSweYmbT50fT2mIc9XMFb+kxIfk2pW/iKzDbX1n3fZmDXMEIpYvyyfrB+gXwPYSDqUxIQ=="
+ },
"node_modules/hpack.js": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
@@ -8652,6 +8853,19 @@
"node": ">=8.12.0"
}
},
+ "node_modules/humanize-url": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/humanize-url/-/humanize-url-1.0.1.tgz",
+ "integrity": "sha1-9KuZ4NKIF0yk4eUEB8VfuuRk7/8=",
+ "dev": true,
+ "dependencies": {
+ "normalize-url": "^1.0.0",
+ "strip-url-auth": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -16854,6 +17068,27 @@
"node": ">=8"
}
},
+ "node_modules/strip-outer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+ "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+ "dev": true,
+ "dependencies": {
+ "escape-string-regexp": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/strip-url-auth": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/strip-url-auth/-/strip-url-auth-1.0.1.tgz",
+ "integrity": "sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/style-loader": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
@@ -17400,6 +17635,18 @@
"node": ">=8"
}
},
+ "node_modules/trim-repeated": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+ "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+ "dev": true,
+ "dependencies": {
+ "escape-string-regexp": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/tryer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
@@ -17791,6 +18038,17 @@
"node": ">=0.10.0"
}
},
+ "node_modules/use-sound": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/use-sound/-/use-sound-2.0.1.tgz",
+ "integrity": "sha512-wNwnyIOe8QPDQgWRZd3PqVEJ9BpLO+VJX+EpQSb6EvvjblHhnYMD7WIOTQ4hgloC2jC7Az6FhclHilC441De7A==",
+ "dependencies": {
+ "howler": "^2.1.3"
+ },
+ "peerDependencies": {
+ "react": ">=16.8"
+ }
+ },
"node_modules/util": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
@@ -25004,6 +25262,12 @@
}
}
},
+ "email-addresses": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz",
+ "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==",
+ "dev": true
+ },
"emittery": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
@@ -26185,6 +26449,33 @@
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"optional": true
},
+ "filename-reserved-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
+ "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=",
+ "dev": true
+ },
+ "filenamify": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
+ "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
+ "dev": true,
+ "requires": {
+ "filename-reserved-regex": "^1.0.0",
+ "strip-outer": "^1.0.0",
+ "trim-repeated": "^1.0.0"
+ }
+ },
+ "filenamify-url": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/filenamify-url/-/filenamify-url-1.0.0.tgz",
+ "integrity": "sha1-syvYExnvWGO3MHi+1Q9GpPeXX1A=",
+ "dev": true,
+ "requires": {
+ "filenamify": "^1.0.0",
+ "humanize-url": "^1.0.0"
+ }
+ },
"filesize": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
@@ -26616,6 +26907,118 @@
"assert-plus": "^1.0.0"
}
},
+ "gh-pages": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.1.0.tgz",
+ "integrity": "sha512-3b1rly9kuf3/dXsT8+ZxP0UhNLOo1CItj+3e31yUVcaph/yDsJ9RzD7JOw5o5zpBTJVQLlJAASNkUfepi9fe2w==",
+ "dev": true,
+ "requires": {
+ "async": "^2.6.1",
+ "commander": "^2.18.0",
+ "email-addresses": "^3.0.1",
+ "filenamify-url": "^1.0.0",
+ "find-cache-dir": "^3.3.1",
+ "fs-extra": "^8.1.0",
+ "globby": "^6.1.0"
+ },
+ "dependencies": {
+ "array-union": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+ "dev": true,
+ "requires": {
+ "array-uniq": "^1.0.1"
+ }
+ },
+ "commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+ "dev": true
+ },
+ "find-cache-dir": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+ "dev": true,
+ "requires": {
+ "commondir": "^1.0.1",
+ "make-dir": "^3.0.2",
+ "pkg-dir": "^4.1.0"
+ }
+ },
+ "fs-extra": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
+ }
+ },
+ "globby": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+ "dev": true,
+ "requires": {
+ "array-union": "^1.0.1",
+ "glob": "^7.0.3",
+ "object-assign": "^4.0.1",
+ "pify": "^2.0.0",
+ "pinkie-promise": "^2.0.0"
+ }
+ },
+ "jsonfile": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.6"
+ }
+ },
+ "make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "requires": {
+ "semver": "^6.0.0"
+ }
+ },
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true
+ },
+ "pkg-dir": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+ "dev": true,
+ "requires": {
+ "find-up": "^4.0.0"
+ }
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ },
+ "universalify": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+ "dev": true
+ }
+ }
+ },
"glob": {
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -26843,6 +27246,11 @@
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
"integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
},
+ "howler": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/howler/-/howler-2.2.1.tgz",
+ "integrity": "sha512-0iIXvuBO/81CcrQ/HSSweYmbT50fT2mIc9XMFb+kxIfk2pW/iKzDbX1n3fZmDXMEIpYvyyfrB+gXwPYSDqUxIQ=="
+ },
"hpack.js": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
@@ -27157,6 +27565,16 @@
"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
},
+ "humanize-url": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/humanize-url/-/humanize-url-1.0.1.tgz",
+ "integrity": "sha1-9KuZ4NKIF0yk4eUEB8VfuuRk7/8=",
+ "dev": true,
+ "requires": {
+ "normalize-url": "^1.0.0",
+ "strip-url-auth": "^1.0.0"
+ }
+ },
"iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -33866,6 +34284,21 @@
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
},
+ "strip-outer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+ "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+ "dev": true,
+ "requires": {
+ "escape-string-regexp": "^1.0.2"
+ }
+ },
+ "strip-url-auth": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/strip-url-auth/-/strip-url-auth-1.0.1.tgz",
+ "integrity": "sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=",
+ "dev": true
+ },
"style-loader": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
@@ -34306,6 +34739,15 @@
"punycode": "^2.1.1"
}
},
+ "trim-repeated": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+ "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+ "dev": true,
+ "requires": {
+ "escape-string-regexp": "^1.0.2"
+ }
+ },
"tryer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
@@ -34624,6 +35066,14 @@
"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
},
+ "use-sound": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/use-sound/-/use-sound-2.0.1.tgz",
+ "integrity": "sha512-wNwnyIOe8QPDQgWRZd3PqVEJ9BpLO+VJX+EpQSb6EvvjblHhnYMD7WIOTQ4hgloC2jC7Az6FhclHilC441De7A==",
+ "requires": {
+ "howler": "^2.1.3"
+ }
+ },
"util": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
diff --git a/package.json b/package.json
index 8f65da9..677d4a9 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"react-dom": "^17.0.1",
"react-scripts": "4.0.3",
"typescript": "^4.2.2",
+ "use-sound": "^2.0.1",
"web-vitals": "^1.1.0"
},
"scripts": {
@@ -39,5 +40,8 @@
"last 1 firefox version",
"last 1 safari version"
]
+ },
+ "devDependencies": {
+ "gh-pages": "^3.1.0"
}
}
From 89a09b8f9c1a63611f8690fee5e91ec850569b29 Mon Sep 17 00:00:00 2001
From: Urazof <2778665@gmail.com>
Date: Wed, 3 Mar 2021 20:48:14 +0200
Subject: [PATCH 10/10] ready ti deploy
---
package.json | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package.json b/package.json
index 677d4a9..3022458 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
{
+ "homepage": "https://urazof.github.io/react-game",
"name": "game",
"version": "0.1.0",
"private": true,
@@ -18,6 +19,8 @@
"web-vitals": "^1.1.0"
},
"scripts": {
+ "predeploy": "npm run build",
+ "deploy": "gh-pages -d build",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
+ {/*
+
)
diff --git a/src/components/Game.tsx b/src/components/Game.tsx
index e40e422..b69df2e 100644
--- a/src/components/Game.tsx
+++ b/src/components/Game.tsx
@@ -27,7 +27,8 @@ export default function Game(props: gameProps){
return */}
+
*/}
+ Game of Live
+Please choose size of field
+ -
-
*/}
- {/*
- {/*
*/}
- {/**/}
- {/*
*/}
+ {start && */}
-
*/}
- {/*Game of Live
-Please choose size of field
- +Please choose interval
+ -Please choose interval
- + setStart(true)}>StartGame + setStart(false)}>StopGame - setStart(true)}>StartGame - setStart(false)}>StopGame - {/*
+ */}
+ {/**/}
+ {/**/}
+
}
- {/**/}
- {/*
- {start && */}
- {/*
+ */}
+
+
- */}
- {/**/}
- {/**/}
-
}
- {/*
+ github 2021
+
+
+ 
-