diff --git a/src/components/App/App.css b/src/components/App/App.css index 20e0a45..197dad6 100644 --- a/src/components/App/App.css +++ b/src/components/App/App.css @@ -1,3 +1,10 @@ +/* + * @file Класс + * @version 2022.2.6 + * @author Verevkin S.A. + * @copyright Verevkin S.A. + */ + .App { text-align: center; } @@ -6,10 +13,12 @@ color: red; font-weight: bold; } + .game { width: 100%; max-width: 500px; } + h1 { color: gold; } @@ -21,9 +30,11 @@ h1 { .witch-row.state2 { border: 1px solid darkred; } + .witch-row.state0 { border: 0; } + .witch-row.state1 { border: 1px solid darkgreen; } @@ -31,12 +42,15 @@ h1 { .small { font-size: 0.5em; } + .witch { width: 100px; } + .witch img { width: 100px; } + .witch:hover { opacity: 0.5; animation: App-logo-spin infinite 10s linear; diff --git a/src/components/GamePage/GamePage.css b/src/components/GamePage/GamePage.css index e69de29..a8e0e27 100644 --- a/src/components/GamePage/GamePage.css +++ b/src/components/GamePage/GamePage.css @@ -0,0 +1,7 @@ +/* + * @file Класс + * @version 2022.2.6 + * @author Verevkin S.A. + * @copyright Verevkin S.A. + */ + diff --git a/src/components/IntroPage/IntroPage.css b/src/components/IntroPage/IntroPage.css index e69de29..a8e0e27 100644 --- a/src/components/IntroPage/IntroPage.css +++ b/src/components/IntroPage/IntroPage.css @@ -0,0 +1,7 @@ +/* + * @file Класс + * @version 2022.2.6 + * @author Verevkin S.A. + * @copyright Verevkin S.A. + */ + diff --git a/src/index.css b/src/index.css index ec2585e..0d2c250 100644 --- a/src/index.css +++ b/src/index.css @@ -1,13 +1,20 @@ +/* + * @file Класс + * @version 2022.2.6 + * @author Verevkin S.A. + * @copyright Verevkin S.A. + */ + body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } code { font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; + monospace; } diff --git a/src/index.tsx b/src/index.tsx index 651819c..79de7e1 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,3 +1,10 @@ +/* + * @file Корневой элемент + * @version 2022.2.6 + * @author Verevkin S.A. + * @copyright Verevkin S.A. + */ + import React from 'react'; import ReactDOM from 'react-dom'; import './index.css'; @@ -6,7 +13,7 @@ import reportWebVitals from './reportWebVitals'; ReactDOM.render( - + , document.getElementById('root') ); diff --git a/src/model/Game.ts b/src/model/Game.ts index c26bc8f..05e89ad 100644 --- a/src/model/Game.ts +++ b/src/model/Game.ts @@ -1,5 +1,5 @@ /* - * @file Класс + * @file Класс игры * @version 2022.2.6 * @author Verevkin S.A. * @copyright Verevkin S.A. diff --git a/src/model/GameDto.ts b/src/model/GameDto.ts index 94aad09..85e7e82 100644 --- a/src/model/GameDto.ts +++ b/src/model/GameDto.ts @@ -1,5 +1,5 @@ /* - * @file Класс + * @file Класс dto игры * @version 2022.2.6 * @author Verevkin S.A. * @copyright Verevkin S.A. diff --git a/src/model/WitchDto.ts b/src/model/WitchDto.ts index 6e939d4..f637a0c 100644 --- a/src/model/WitchDto.ts +++ b/src/model/WitchDto.ts @@ -1,10 +1,8 @@ /* - * * - * * @file Класс - * * @version {2022}.{2}.{6} - * * @author Verevkin S.A. - * * @copyright Verevkin S.A. - * + * @file Класс dto ведьмы + * @version 2022.2.6 + * @author Verevkin S.A. + * @copyright Verevkin S.A. */ export interface IWitchDto { diff --git a/src/reportWebVitals.js b/src/reportWebVitals.js index 5253d3a..b0320f3 100644 --- a/src/reportWebVitals.js +++ b/src/reportWebVitals.js @@ -1,6 +1,6 @@ const reportWebVitals = onPerfEntry => { if (onPerfEntry && onPerfEntry instanceof Function) { - import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { + import('web-vitals').then(({getCLS, getFID, getFCP, getLCP, getTTFB}) => { getCLS(onPerfEntry); getFID(onPerfEntry); getFCP(onPerfEntry); diff --git a/src/resources/witch.svg b/src/resources/witch.svg index a8817f7..a2b5eba 100644 --- a/src/resources/witch.svg +++ b/src/resources/witch.svg @@ -1,17 +1,24 @@ + + + "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> - -Created by potrace 1.15, written by Peter Selinger 2001-2017 - - - + + Created by potrace 1.15, written by Peter Selinger 2001-2017 + + + - - + diff --git a/src/store/apiStore/apiStore.service.ts b/src/store/apiStore/apiStore.service.ts index 5ce6a4c..997ce11 100644 --- a/src/store/apiStore/apiStore.service.ts +++ b/src/store/apiStore/apiStore.service.ts @@ -1,5 +1,5 @@ /* - * @file Класс + * @file Сервис взаимодействия * @version 2022.2.6 * @author Verevkin S.A. * @copyright Verevkin S.A. @@ -12,7 +12,7 @@ import { Mapper } from '../mapper'; const service = { // region Публичные функции async getGame(): Promise { - const resultPromise = tool.get('/game', {}); + const resultPromise = tool.get('/game', []); return resultPromise.then((response: IGameDto | undefined): (Game | undefined) => { if (!response) return; return Mapper.fromGame(response); @@ -20,9 +20,10 @@ const service = { }, async gameTurn(gameGuid: string, witchGuid: string): Promise { - const resultPromise = tool.get('/turn', { - gameGuid, witchGuid - }); + const resultPromise = tool.get('/turn', [ + {name: "gameGuid", value: gameGuid}, + {name: "witchGuid", value: witchGuid}, + ]); return resultPromise.then((response: IGameDto | undefined): (Game | undefined) => { if (!response) return; return Mapper.fromGame(response); @@ -30,7 +31,7 @@ const service = { }, async getVersion(): Promise { - return tool.get('/version', {}); + return tool.get('/version', []); } // endregion };