diff --git a/packages/app-collective/README.md b/packages/app-collective/README.md deleted file mode 100644 index 8bf4850104..0000000000 --- a/packages/app-collective/README.md +++ /dev/null @@ -1 +0,0 @@ -# @polkadot/app-collective diff --git a/packages/app-collective/src/Overview/index.tsx b/packages/app-collective/src/Overview/index.tsx deleted file mode 100644 index c601e25d3d..0000000000 --- a/packages/app-collective/src/Overview/index.tsx +++ /dev/null @@ -1,21 +0,0 @@ -// 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 React from 'react'; - -import Members from './Members'; -import Summary from './Summary'; - -interface Props {} - -export default class Overview extends React.PureComponent { - public render (): React.ReactNode { - return ( - <> - - - - ); - } -} diff --git a/packages/app-collective/src/Proposals/Summary.tsx b/packages/app-collective/src/Proposals/Summary.tsx deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/app-collective/LICENSE b/packages/app-council/LICENSE similarity index 100% rename from packages/app-collective/LICENSE rename to packages/app-council/LICENSE diff --git a/packages/app-council/README.md b/packages/app-council/README.md new file mode 100644 index 0000000000..42fd731d84 --- /dev/null +++ b/packages/app-council/README.md @@ -0,0 +1 @@ +# @polkadot/app-council diff --git a/packages/app-collective/package.json b/packages/app-council/package.json similarity index 83% rename from packages/app-collective/package.json rename to packages/app-council/package.json index 6ba8800257..7f32fa70e7 100644 --- a/packages/app-collective/package.json +++ b/packages/app-council/package.json @@ -1,7 +1,7 @@ { - "name": "@polkadot/app-collective", + "name": "@polkadot/app-council", "version": "0.34.0-beta.65", - "description": "Collective", + "description": "Council", "main": "index.js", "scripts": {}, "author": "Jaco Greeff ", diff --git a/packages/app-collective/src/Proposals/Proposal.tsx b/packages/app-council/src/Motions/Motion.tsx similarity index 92% rename from packages/app-collective/src/Proposals/Proposal.tsx rename to packages/app-council/src/Motions/Motion.tsx index 85b6551e69..049c0e52f9 100644 --- a/packages/app-collective/src/Proposals/Proposal.tsx +++ b/packages/app-council/src/Motions/Motion.tsx @@ -7,7 +7,6 @@ import { Option, Proposal as ProposalType, Votes } from '@polkadot/types'; import BN from 'bn.js'; import React from 'react'; -import styled from 'styled-components'; import { ActionItem, InputAddress, Labelled, Voting } from '@polkadot/ui-app'; import { withCalls, withMulti } from '@polkadot/ui-api'; @@ -26,7 +25,7 @@ interface State { votedAye: number; } -class Proposal extends React.PureComponent { +class Motion extends React.PureComponent { public state: State = { votedTotal: 0, votedAye: 0, @@ -64,7 +63,7 @@ class Proposal extends React.PureComponent { accessory={ @@ -140,15 +139,7 @@ class Proposal extends React.PureComponent { } export default withMulti( - styled(Proposal as React.ComponentClass)` - .democracy--Proposal-results { - margin-bottom: 1em; - - &.chart { - text-align: center; - } - } - `, + Motion, translate, withCalls( [ diff --git a/packages/app-collective/src/Proposals/Propose.tsx b/packages/app-council/src/Motions/Propose.tsx similarity index 89% rename from packages/app-collective/src/Proposals/Propose.tsx rename to packages/app-council/src/Motions/Propose.tsx index 9beeba587b..6be92d03c1 100644 --- a/packages/app-collective/src/Proposals/Propose.tsx +++ b/packages/app-council/src/Motions/Propose.tsx @@ -15,16 +15,16 @@ import { withApi, withCalls, withMulti } from '@polkadot/ui-api'; import translate from '../translate'; type Props = TxModalProps & ApiProps & { - memberCount: number; + memberCount: number }; -interface State extends TxModalState { - method: Method | null; - threshold: BN | null; -} +type State = TxModalState & { + method: Method | null, + threshold: BN | null +}; class Propose extends TxModal { - public constructor (props: Props) { + constructor (props: Props) { super(props); this.defaultState = { @@ -43,7 +43,7 @@ class Propose extends TxModal { return null; } - headerText = () => this.props.t('Make a collective proposal'); + headerText = () => this.props.t('Propose a council motion'); txMethod = () => 'collective.propose'; txParams = () => { @@ -72,7 +72,7 @@ class Propose extends TxModal {