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/components/action.jsx | 52 +++++++++ diplomacy/web/src/gui/components/button.jsx | 52 +++++++++ diplomacy/web/src/gui/components/delete_button.jsx | 43 ++++++++ diplomacy/web/src/gui/components/fancybox.jsx | 59 +++++++++++ diplomacy/web/src/gui/components/forms.jsx | 116 +++++++++++++++++++++ diplomacy/web/src/gui/components/help.jsx | 13 +++ diplomacy/web/src/gui/components/layouts.jsx | 55 ++++++++++ diplomacy/web/src/gui/components/message_view.jsx | 67 ++++++++++++ diplomacy/web/src/gui/components/navigation.jsx | 61 +++++++++++ diplomacy/web/src/gui/components/page_context.jsx | 3 + diplomacy/web/src/gui/components/power_orders.jsx | 77 ++++++++++++++ .../src/gui/components/power_orders_actions_bar.js | 26 +++++ diplomacy/web/src/gui/components/tab.jsx | 29 ++++++ diplomacy/web/src/gui/components/table.jsx | 112 ++++++++++++++++++++ diplomacy/web/src/gui/components/tabs.jsx | 69 ++++++++++++ 15 files changed, 834 insertions(+) create mode 100644 diplomacy/web/src/gui/components/action.jsx create mode 100644 diplomacy/web/src/gui/components/button.jsx create mode 100644 diplomacy/web/src/gui/components/delete_button.jsx create mode 100644 diplomacy/web/src/gui/components/fancybox.jsx create mode 100644 diplomacy/web/src/gui/components/forms.jsx create mode 100644 diplomacy/web/src/gui/components/help.jsx create mode 100644 diplomacy/web/src/gui/components/layouts.jsx create mode 100644 diplomacy/web/src/gui/components/message_view.jsx create mode 100644 diplomacy/web/src/gui/components/navigation.jsx create mode 100644 diplomacy/web/src/gui/components/page_context.jsx create mode 100644 diplomacy/web/src/gui/components/power_orders.jsx create mode 100644 diplomacy/web/src/gui/components/power_orders_actions_bar.js create mode 100644 diplomacy/web/src/gui/components/tab.jsx create mode 100644 diplomacy/web/src/gui/components/table.jsx create mode 100644 diplomacy/web/src/gui/components/tabs.jsx (limited to 'diplomacy/web/src/gui/components') diff --git a/diplomacy/web/src/gui/components/action.jsx b/diplomacy/web/src/gui/components/action.jsx new file mode 100644 index 0000000..73fe8cb --- /dev/null +++ b/diplomacy/web/src/gui/components/action.jsx @@ -0,0 +1,52 @@ +// ============================================================================== +// 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/components/button.jsx b/diplomacy/web/src/gui/components/button.jsx new file mode 100644 index 0000000..0d5dadd --- /dev/null +++ b/diplomacy/web/src/gui/components/button.jsx @@ -0,0 +1,52 @@ +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/components/delete_button.jsx b/diplomacy/web/src/gui/components/delete_button.jsx new file mode 100644 index 0000000..59141fd --- /dev/null +++ b/diplomacy/web/src/gui/components/delete_button.jsx @@ -0,0 +1,43 @@ +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 ( + +
+ {this.props.navigation.map((nav, index) => { + const navTitle = nav[0]; + const navAction = nav[1]; + return {navTitle}; + })} +
+ + )} + + + ); + } + return ( +
{this.props.title}
+ ); + } +} + +Navigation.propTypes = { + title: PropTypes.string.isRequired, + afterTitle: PropTypes.object, + navigation: PropTypes.array, + username: PropTypes.string, +}; diff --git a/diplomacy/web/src/gui/components/page_context.jsx b/diplomacy/web/src/gui/components/page_context.jsx new file mode 100644 index 0000000..cfb8252 --- /dev/null +++ b/diplomacy/web/src/gui/components/page_context.jsx @@ -0,0 +1,3 @@ +import React from "react"; + +export const PageContext = React.createContext(null); diff --git a/diplomacy/web/src/gui/components/power_orders.jsx b/diplomacy/web/src/gui/components/power_orders.jsx new file mode 100644 index 0000000..b702a9d --- /dev/null +++ b/diplomacy/web/src/gui/components/power_orders.jsx @@ -0,0 +1,77 @@ +// ============================================================================== +// 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 {Button} from "./button"; + +export class PowerOrders extends React.Component { + render() { + const orderEntries = this.props.orders ? Object.entries(this.props.orders) : null; + let display = null; + if (orderEntries) { + if (orderEntries.length) { + orderEntries.sort((a, b) => a[1].order.localeCompare(b[1].order)); + display = ( +
+ {orderEntries.map((entry, index) => ( +
+
+ {entry[1].order} + {entry[1].local ? '' : [S]} +
+
+
+
+ ))} +
+ ); + } else if (this.props.serverCount === 0) { + display = (
Empty orders set
); + } else { + display = (
Local empty orders set
); + } + } else { + if (this.props.serverCount < 0) { + display =
No orders!
; + } else { + display =
Asking to unset orders
; + } + } + return ( +
+
+ {this.props.name} + + {(this.props.wait ? ' ' : ' not') + ' waiting'} + +
+ {display} +
+ ); + } +} + +PowerOrders.propTypes = { + wait: PropTypes.bool, + name: PropTypes.string, + orders: PropTypes.object, + serverCount: PropTypes.number, + onRemove: PropTypes.func, +}; diff --git a/diplomacy/web/src/gui/components/power_orders_actions_bar.js b/diplomacy/web/src/gui/components/power_orders_actions_bar.js new file mode 100644 index 0000000..2e33a6e --- /dev/null +++ b/diplomacy/web/src/gui/components/power_orders_actions_bar.js @@ -0,0 +1,26 @@ +import React from 'react'; +import {Button} from "./button"; +import {Bar} from "./layouts"; +import PropTypes from 'prop-types'; + +export class PowerOrdersActionBar extends React.Component { + render() { + return ( + + Orders: +