From 2701df1e3b03c7c605ccf212a02987d53fbd0609 Mon Sep 17 00:00:00 2001 From: notoraptor Date: Wed, 17 Jul 2019 15:16:43 -0400 Subject: [web] Make button "Delete all" remove only orders from current se… (#49) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Make button "Delete all" remove only orders from current selected power. - Reorganize code - [web] Remove bugged and useless function gameReloaded() from game page. - This function caused error `engine.getPhaseType is not a function` for games with deadlines. - Move function saveGameToDisk into its own file. - [web] Add documentation to methods involved in orders management to help understand what happens. - Move methods getServerOrders() from game GUI component to game engine object. - Rename method onSetNoOrders to onSetEmptyOrdersSet. - Rename property in PowerActionsForm: onNoOrders => onPass. - [web] Update sending orders to send request clearOrders when local orders list is null. - Renamed local file: - components/power_order => power_orders - forms/power_actions_form => power_order_creation_form - Move power orders buttons bar to a separate file: - components/power_orders_actions_bar - [web] Improve messages about local/server defined orders. --- diplomacy/web/src/gui/core/action.jsx | 52 ---- diplomacy/web/src/gui/core/button.jsx | 52 ---- diplomacy/web/src/gui/core/delete_button.jsx | 43 --- diplomacy/web/src/gui/core/fancybox.jsx | 59 ----- diplomacy/web/src/gui/core/forms.jsx | 116 --------- diplomacy/web/src/gui/core/layouts.jsx | 55 ---- diplomacy/web/src/gui/core/page.jsx | 375 --------------------------- diplomacy/web/src/gui/core/tab.jsx | 29 --- diplomacy/web/src/gui/core/table.jsx | 112 -------- diplomacy/web/src/gui/core/tabs.jsx | 69 ----- 10 files changed, 962 deletions(-) delete mode 100644 diplomacy/web/src/gui/core/action.jsx delete mode 100644 diplomacy/web/src/gui/core/button.jsx delete mode 100644 diplomacy/web/src/gui/core/delete_button.jsx delete mode 100644 diplomacy/web/src/gui/core/fancybox.jsx delete mode 100644 diplomacy/web/src/gui/core/forms.jsx delete mode 100644 diplomacy/web/src/gui/core/layouts.jsx delete mode 100644 diplomacy/web/src/gui/core/page.jsx delete mode 100644 diplomacy/web/src/gui/core/tab.jsx delete mode 100644 diplomacy/web/src/gui/core/table.jsx delete mode 100644 diplomacy/web/src/gui/core/tabs.jsx (limited to 'diplomacy/web/src/gui/core') diff --git a/diplomacy/web/src/gui/core/action.jsx b/diplomacy/web/src/gui/core/action.jsx deleted file mode 100644 index 73fe8cb..0000000 --- a/diplomacy/web/src/gui/core/action.jsx +++ /dev/null @@ -1,52 +0,0 @@ -// ============================================================================== -// 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'; - - -export class Action extends React.Component { - // title - // isActive - // onClick - // See Button parameters. - - render() { - return ( -
-
- {this.props.title} - {this.props.highlight !== null - && this.props.highlight !== undefined - && {this.props.highlight}} -
-
- ); - } -} - -Action.propTypes = { - title: PropTypes.string.isRequired, - onClick: PropTypes.func.isRequired, - highlight: PropTypes.any, - isActive: PropTypes.bool -}; - -Action.defaultProps = { - highlight: null, - isActive: false -}; diff --git a/diplomacy/web/src/gui/core/button.jsx b/diplomacy/web/src/gui/core/button.jsx deleted file mode 100644 index 0d5dadd..0000000 --- a/diplomacy/web/src/gui/core/button.jsx +++ /dev/null @@ -1,52 +0,0 @@ -import React from "react"; -import PropTypes from "prop-types"; - -export class Button extends React.Component { - /** Bootstrap button. - * Bootstrap classes: - * - btn - * - btn-primary - * - mx-1 (margin-left 1px, margin-right 1px) - * Props: title (str), onClick (function). - * **/ - // title - // onClick - // pickEvent = false - // large = false - // small = false - - constructor(props) { - super(props); - this.onClick = this.onClick.bind(this); - } - - onClick(event) { - if (this.props.onClick) - this.props.onClick(this.props.pickEvent ? event : null); - } - - render() { - return ( - - ); - } -} - -Button.propTypes = { - title: PropTypes.string.isRequired, - onClick: PropTypes.func.isRequired, - color: PropTypes.string, - large: PropTypes.bool, - small: PropTypes.bool, - pickEvent: PropTypes.bool, - disabled: PropTypes.bool -}; - -Button.defaultPropTypes = { - disabled: false -}; diff --git a/diplomacy/web/src/gui/core/delete_button.jsx b/diplomacy/web/src/gui/core/delete_button.jsx deleted file mode 100644 index 59141fd..0000000 --- a/diplomacy/web/src/gui/core/delete_button.jsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from "react"; -import {Button} from "./button"; -import PropTypes from "prop-types"; - -export class DeleteButton extends React.Component { - constructor(props) { - super(props); - this.state = {step: 0}; - this.onClick = this.onClick.bind(this); - } - - onClick() { - this.setState({step: this.state.step + 1}, () => { - if (this.state.step === 2) - this.props.onClick(); - }); - } - - render() { - let title = ''; - let color = ''; - if (this.state.step === 0) { - title = this.props.title; - color = 'secondary'; - } else if (this.state.step === 1) { - title = this.props.confirmTitle; - color = 'danger'; - } else if (this.state.step === 2) { - title = this.props.waitingTitle; - color = 'danger'; - } - return ( -