From 891fb62a77b9a86f2bc71cc02a82089412982b2f Mon Sep 17 00:00:00 2001 From: notoraptor Date: Thu, 1 Aug 2019 15:53:23 -0400 Subject: Refactored SVG map into a React component - Create link to diplomacy map folder into web/src/diplomacy/maps - Remove old web/src/gui/map folder. - [web] Handle click only on current map. - [web/game] Remove useless `wait` state. - Remove unused nodejs modules. - [web] Use queue to handle game notifications in sequential order. - Make all calls to setState() asynchronous in Page and ContentGame components. - Make sure notifications are handled in the order in which they come. --- .../src/gui/wizards/gameCreation/gameCreationWizard.js | 16 ++++++++++++++++ diplomacy/web/src/gui/wizards/gameCreation/mapList.js | 16 ++++++++++++++++ .../web/src/gui/wizards/gameCreation/panelChooseMap.js | 18 +++++++++++++++++- .../src/gui/wizards/gameCreation/panelChoosePlayers.js | 16 ++++++++++++++++ .../src/gui/wizards/gameCreation/panelChoosePower.js | 16 ++++++++++++++++ .../gui/wizards/gameCreation/panelChooseSettings.js | 16 ++++++++++++++++ .../web/src/gui/wizards/gameCreation/panelList.js | 16 ++++++++++++++++ 7 files changed, 113 insertions(+), 1 deletion(-) (limited to 'diplomacy/web/src/gui/wizards') diff --git a/diplomacy/web/src/gui/wizards/gameCreation/gameCreationWizard.js b/diplomacy/web/src/gui/wizards/gameCreation/gameCreationWizard.js index daaa461..e6477d2 100644 --- a/diplomacy/web/src/gui/wizards/gameCreation/gameCreationWizard.js +++ b/diplomacy/web/src/gui/wizards/gameCreation/gameCreationWizard.js @@ -1,3 +1,19 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see . +// ============================================================================== import React from 'react'; import PropTypes from 'prop-types'; import {Panels} from "./panelList"; diff --git a/diplomacy/web/src/gui/wizards/gameCreation/mapList.js b/diplomacy/web/src/gui/wizards/gameCreation/mapList.js index 5d2c00a..388066f 100644 --- a/diplomacy/web/src/gui/wizards/gameCreation/mapList.js +++ b/diplomacy/web/src/gui/wizards/gameCreation/mapList.js @@ -1,3 +1,19 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see . +// ============================================================================== class VariantInfo { constructor(variantName, variantTitle) { this.name = variantName; diff --git a/diplomacy/web/src/gui/wizards/gameCreation/panelChooseMap.js b/diplomacy/web/src/gui/wizards/gameCreation/panelChooseMap.js index 5c40f1c..432d1a8 100644 --- a/diplomacy/web/src/gui/wizards/gameCreation/panelChooseMap.js +++ b/diplomacy/web/src/gui/wizards/gameCreation/panelChooseMap.js @@ -1,3 +1,19 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see . +// ============================================================================== import React from "react"; import {Maps} from "./mapList"; import {FancyBox} from "../../components/fancyBox"; @@ -5,7 +21,7 @@ import PropTypes from "prop-types"; export class PanelChooseMap extends React.Component { render() { - const mapImg = require(`../../../maps/svg/${this.props.params.map.svgName()}.svg`); + const mapImg = require(`../../../diplomacy/maps/svg/${this.props.params.map.svgName()}.svg`); const mapEntries = []; let count = 0; for (let mapInfo of Maps) { diff --git a/diplomacy/web/src/gui/wizards/gameCreation/panelChoosePlayers.js b/diplomacy/web/src/gui/wizards/gameCreation/panelChoosePlayers.js index 84a47a0..53ddd64 100644 --- a/diplomacy/web/src/gui/wizards/gameCreation/panelChoosePlayers.js +++ b/diplomacy/web/src/gui/wizards/gameCreation/panelChoosePlayers.js @@ -1,3 +1,19 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see . +// ============================================================================== import React from "react"; import {FancyBox} from "../../components/fancyBox"; import PropTypes from "prop-types"; diff --git a/diplomacy/web/src/gui/wizards/gameCreation/panelChoosePower.js b/diplomacy/web/src/gui/wizards/gameCreation/panelChoosePower.js index 05154e6..1463805 100644 --- a/diplomacy/web/src/gui/wizards/gameCreation/panelChoosePower.js +++ b/diplomacy/web/src/gui/wizards/gameCreation/panelChoosePower.js @@ -1,3 +1,19 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see . +// ============================================================================== import React from "react"; import {FancyBox} from "../../components/fancyBox"; import PropTypes from "prop-types"; diff --git a/diplomacy/web/src/gui/wizards/gameCreation/panelChooseSettings.js b/diplomacy/web/src/gui/wizards/gameCreation/panelChooseSettings.js index e509158..a34a1d1 100644 --- a/diplomacy/web/src/gui/wizards/gameCreation/panelChooseSettings.js +++ b/diplomacy/web/src/gui/wizards/gameCreation/panelChooseSettings.js @@ -1,3 +1,19 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see . +// ============================================================================== import React from "react"; import {FancyBox} from "../../components/fancyBox"; import PropTypes from "prop-types"; diff --git a/diplomacy/web/src/gui/wizards/gameCreation/panelList.js b/diplomacy/web/src/gui/wizards/gameCreation/panelList.js index 0b6100c..d48749d 100644 --- a/diplomacy/web/src/gui/wizards/gameCreation/panelList.js +++ b/diplomacy/web/src/gui/wizards/gameCreation/panelList.js @@ -1,3 +1,19 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see . +// ============================================================================== export const Panels = { CHOOSE_MAP: 0, CHOOSE_PLAYERS: 1, -- cgit v1.2.3