diff --git a/packages/app-democracy/src/Overview/Voting.tsx b/packages/app-democracy/src/Overview/Voting.tsx index 66b9eb9576d2..5712a0e4f8d0 100644 --- a/packages/app-democracy/src/Overview/Voting.tsx +++ b/packages/app-democracy/src/Overview/Voting.tsx @@ -8,6 +8,7 @@ import BN from 'bn.js'; import React, { useState } from 'react'; import { Button, Dropdown, InputAddress, Modal, TxButton } from '@polkadot/react-components'; import { useAccounts } from '@polkadot/react-hooks'; +import { isBoolean } from '@polkadot/util'; import translate from '../translate'; @@ -26,6 +27,7 @@ function Voting ({ referendumId, t }: Props): React.ReactElement | null { } const _toggleVoting = (): void => setIsVotingOpen(!isVotingOpen); + const _onChangeVote = (vote?: boolean): void => setVoteValue(isBoolean(vote) ? vote : true); return ( <> @@ -51,7 +53,7 @@ function Voting ({ referendumId, t }: Props): React.ReactElement | null { { text: t('Aye, I approve'), value: true }, { text: t('Nay, I do not approve'), value: false } ]} - onChange={setVoteValue} + onChange={_onChangeVote} value={voteValue} /> diff --git a/packages/app-tech-comm/LICENSE b/packages/app-tech-comm/LICENSE new file mode 100644 index 000000000000..0d381b2e97dc --- /dev/null +++ b/packages/app-tech-comm/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/app-tech-comm/README.md b/packages/app-tech-comm/README.md new file mode 100644 index 000000000000..42fd731d84d3 --- /dev/null +++ b/packages/app-tech-comm/README.md @@ -0,0 +1 @@ +# @polkadot/app-council diff --git a/packages/app-tech-comm/package.json b/packages/app-tech-comm/package.json new file mode 100644 index 000000000000..47f742ab4fd9 --- /dev/null +++ b/packages/app-tech-comm/package.json @@ -0,0 +1,17 @@ +{ + "name": "@polkadot/app-tech-comm", + "version": "0.38.0-beta.13", + "description": "Council", + "main": "index.js", + "scripts": {}, + "author": "Jaco Greeff ", + "maintainers": [ + "Jaco Greeff " + ], + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime": "^7.7.4", + "@polkadot/react-components": "^0.38.0-beta.13", + "@polkadot/react-query": "^0.38.0-beta.13" + } +} diff --git a/packages/app-tech-comm/src/Overview/Members.tsx b/packages/app-tech-comm/src/Overview/Members.tsx new file mode 100644 index 000000000000..fac9b583f203 --- /dev/null +++ b/packages/app-tech-comm/src/Overview/Members.tsx @@ -0,0 +1,41 @@ +// Copyright 2017-2019 @polkadot/app-tech-comm authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { AccountId } from '@polkadot/types/interfaces'; +import { I18nProps } from '@polkadot/react-components/types'; + +import React from 'react'; +import { AddressSmall, Table } from '@polkadot/react-components'; + +import translate from '../translate'; + +interface Props extends I18nProps { + members?: AccountId[]; + className?: string; +} + +function Members ({ className, members, t }: Props): React.ReactElement { + return ( +
+ {members?.length + ? ( + + + {members.map((accountId): React.ReactNode => ( + + + + ))} + +
+ +
+ ) + : t('No members found') + } +
+ ); +} + +export default translate(Members); diff --git a/packages/app-tech-comm/src/Overview/Summary.tsx b/packages/app-tech-comm/src/Overview/Summary.tsx new file mode 100644 index 000000000000..c75ed3f5726a --- /dev/null +++ b/packages/app-tech-comm/src/Overview/Summary.tsx @@ -0,0 +1,43 @@ +/* eslint-disable @typescript-eslint/camelcase */ +// Copyright 2017-2019 @polkadot/app-tech-comm authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { I18nProps } from '@polkadot/react-components/types'; +import { AccountId, Hash } from '@polkadot/types/interfaces'; + +import React from 'react'; +import { SummaryBox, CardSummary } from '@polkadot/react-components'; +import { useApi, trackStream } from '@polkadot/react-hooks'; +import { u32 } from '@polkadot/types'; +import { formatNumber } from '@polkadot/util'; + +import translate from '../translate'; + +interface Props extends I18nProps { + members?: AccountId[]; + proposals?: Hash[]; +} + +function Summary ({ className, members, proposals, t }: Props): React.ReactElement { + const { api } = useApi(); + const proposalCount = trackStream(api.query.technicalCommittee.proposalCount, []); + + return ( + + + {formatNumber(members?.length)} + +
+ + {formatNumber(proposals?.length)} + + + {formatNumber(proposalCount)} + +
+ + ); +} + +export default translate(Summary); diff --git a/packages/app-tech-comm/src/Overview/index.tsx b/packages/app-tech-comm/src/Overview/index.tsx new file mode 100644 index 000000000000..aa97c3a027b5 --- /dev/null +++ b/packages/app-tech-comm/src/Overview/index.tsx @@ -0,0 +1,33 @@ +// Copyright 2017-2019 @polkadot/app-tech-comm authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { AccountId, Hash } from '@polkadot/types/interfaces'; + +import React from 'react'; + +import Members from './Members'; +import Summary from './Summary'; + +interface Props { + className?: string; + members?: AccountId[]; + proposals?: Hash[]; +} + +export default function Overview ({ className, members, proposals }: Props): React.ReactElement { + return ( +
+ + {/* + + + + */} + +
+ ); +} diff --git a/packages/app-tech-comm/src/Overview/types.ts b/packages/app-tech-comm/src/Overview/types.ts new file mode 100644 index 000000000000..8e1d3534df36 --- /dev/null +++ b/packages/app-tech-comm/src/Overview/types.ts @@ -0,0 +1,17 @@ +// Copyright 2017-2019 @polkadot/app-democracy authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { SetIndex } from '@polkadot/types/interfaces'; +import { DerivedElectionsInfo } from '@polkadot/api-derive/types'; + +import BN from 'bn.js'; + +export interface ComponentProps { + electionsInfo: DerivedElectionsInfo; +} + +export interface VoterPosition { + setIndex: SetIndex; + globalIndex: BN; +} diff --git a/packages/app-tech-comm/src/Proposals/Proposal.tsx b/packages/app-tech-comm/src/Proposals/Proposal.tsx new file mode 100644 index 000000000000..0fd8dc63467c --- /dev/null +++ b/packages/app-tech-comm/src/Proposals/Proposal.tsx @@ -0,0 +1,86 @@ +// Copyright 2017-2019 @polkadot/app-tech-comm authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Proposal as ProposalType, Votes } from '@polkadot/types/interfaces'; +import { I18nProps } from '@polkadot/react-components/types'; + +import React from 'react'; +import { useApi, trackStream } from '@polkadot/react-hooks'; +import { Option } from '@polkadot/types'; + +import { ActionItem, InputAddress, Labelled, Voting } from '@polkadot/react-components'; + +import translate from '../translate'; + +interface Props extends I18nProps { + hash: string; +} + +function Proposal ({ className, hash, t }: Props): React.ReactElement | null { + const { api } = useApi(); + const proposal = trackStream(api.query.technicalCommittee.proposalOf, [hash]); + const votes = trackStream>(api.query.technicalCommittee.voting, [hash]); + + if (!proposal || !votes?.isSome) { + return null; + } + + const { ayes, index, nays, threshold } = votes.unwrap(); + + return ( + + } + expandNested + idNumber={index} + proposal={proposal} + > +
+

{t('ayes ({{ayes}}/{{threshold}} to approve)', { + replace: { + ayes: ayes.length, + threshold: threshold.toString() + } + })}

+ {ayes.map((address, index): React.ReactNode => ( + + + + ))} +

{t('nays ({{nays}})', { + replace: { + nays: nays.length + } + })}

+ {nays.map((address, index): React.ReactNode => ( + + + + ))} +
+ + ); +} + +export default translate(Proposal); diff --git a/packages/app-tech-comm/src/Proposals/Voting.tsx b/packages/app-tech-comm/src/Proposals/Voting.tsx new file mode 100644 index 000000000000..1ef08fd314a1 --- /dev/null +++ b/packages/app-tech-comm/src/Proposals/Voting.tsx @@ -0,0 +1,96 @@ +// Copyright 2017-2019 @polkadot/app-tech-comm authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { I18nProps } from '@polkadot/react-components/types'; + +import BN from 'bn.js'; +import React, { useState } from 'react'; +import { Button, Dropdown, InputAddress, Modal, TxButton } from '@polkadot/react-components'; +import { useAccounts } from '@polkadot/react-hooks'; +import { isBoolean } from '@polkadot/util'; + +import translate from '../translate'; + +interface Props extends I18nProps { + hash: string; + proposalId: BN | number; +} + +function Voting ({ hash, proposalId, t }: Props): React.ReactElement | null { + const { hasAccounts } = useAccounts(); + const [accountId, setAccountId] = useState(null); + const [isVotingOpen, setIsVotingOpen] = useState(false); + const [voteValue, setVoteValue] = useState(true); + + if (!hasAccounts) { + return null; + } + + const _toggleVoting = (): void => setIsVotingOpen(!isVotingOpen); + const _onChangeVote = (vote?: boolean): void => setVoteValue(isBoolean(vote) ? vote : true); + + return ( + <> + {isVotingOpen && ( + + {t('Vote on proposal')} + + + + + + +