Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature alliance #1

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
57e1ced
feat: alliance page
zzcwoshizz Jun 16, 2021
054a823
propose kick out
zzcwoshizz Jun 16, 2021
1824797
remove blacklist multi select website
zzcwoshizz Jun 16, 2021
3e6c378
elevate to fellow
zzcwoshizz Jun 16, 2021
1f27967
set rule disable
zzcwoshizz Jun 16, 2021
50958ca
alliance button condition
zzcwoshizz Jun 16, 2021
cbdbfd8
cid empty condition
zzcwoshizz Jun 16, 2021
96f0134
add filter for sending account
zzcwoshizz Jun 16, 2021
77615fe
1. blacklist summary
zzcwoshizz Jun 16, 2021
ca37611
candiate propose modal
zzcwoshizz Jun 16, 2021
28c0167
propose modal title and action button
zzcwoshizz Jun 16, 2021
ae161ee
列表增加deposit ,删除favorite
freepoi Jun 16, 2021
5bbc226
Merge branch 'feature-alliance' of https://github.com/patractlabs/app…
freepoi Jun 16, 2021
5289b22
fix: cid encode throw error
zzcwoshizz Jun 16, 2021
8f418c8
up
freepoi Jun 16, 2021
c36fee7
Merge branch 'feature-alliance' of https://github.com/patractlabs/app…
freepoi Jun 16, 2021
3310430
feat: alliance website
zzcwoshizz Jun 16, 2021
6a3197b
feat(alliance): cid input status
zzcwoshizz Jun 16, 2021
4b8dcee
feat: ui style change
zzcwoshizz Jun 16, 2021
070a650
up
freepoi Jun 17, 2021
b8f2b86
up
freepoi Jun 17, 2021
09011d9
feat: ui style change
freepoi Jun 18, 2021
3906525
feat: ui change
freepoi Jun 18, 2021
04414c9
feat: ui change
freepoi Jun 18, 2021
ca71fda
feat: ui change
freepoi Jun 18, 2021
776d695
fix: announcements duplicate bugs
zzcwoshizz Jun 21, 2021
fe08b50
feat: dock update
freepoi Jun 21, 2021
f80b332
Merge branch 'feature-alliance' of https://github.com/patractlabs/app…
freepoi Jun 21, 2021
4ed71fc
Merge branch 'master' into feature-alliance
zzcwoshizz Jun 21, 2021
3160e0e
lock page-alliance package
zzcwoshizz Jun 21, 2021
34d722a
feat: ui change
freepoi Jun 21, 2021
b164623
Merge branch 'feature-alliance' of https://github.com/patractlabs/app…
freepoi Jun 21, 2021
6868492
feat: ui change
freepoi Jun 21, 2021
851ebe0
add identity search
zzcwoshizz Jun 21, 2021
314f079
feat: ui change
freepoi Jun 21, 2021
06fbb02
add ipfs hash preview
zzcwoshizz Jun 23, 2021
4f75f99
ipfs link style
zzcwoshizz Jun 23, 2021
bd8e254
UI style change
zzcwoshizz Jun 23, 2021
002010a
delay: 15s -> 10s
zzcwoshizz Jun 23, 2021
fd8b73e
Some ui change
zzcwoshizz Jun 24, 2021
6eec119
change some text
zzcwoshizz Jun 28, 2021
26afe7b
modify text
zzcwoshizz Jun 29, 2021
8b636b1
do not fetch data when has not rule
zzcwoshizz Jul 2, 2021
9acd2b0
add cid component for react-param
zzcwoshizz Jul 5, 2021
9949a6c
use Static component show cid
zzcwoshizz Jul 5, 2021
0faf2ea
feat: update markdown ui
freepoi Aug 3, 2021
7dfa031
Merge branch 'master' into feature-alliance
zzcwoshizz Sep 22, 2021
f6a3d24
fix ui component bug
zzcwoshizz Sep 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"@polkadot/wasm-crypto": "^4.2.1",
"babel-core": "^7.0.0-bridge.0",
"styled-components": "^5.2.0",
"typescript": "^4.4.3"
"typescript": "^4.4.3",
"multihashes": "^4.0.2"
},
"scripts": {
"analyze": "yarn clean && BUILD_ANALYZE=1 yarn run build:code && yarn source-map-explorer packages/apps/build/main.*.js",
Expand Down
23 changes: 23 additions & 0 deletions packages/apps-routing/src/alliance.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2017-2021 @polkadot/apps-routing authors & contributors
// SPDX-License-Identifier: Apache-2.0

import type { TFunction } from 'i18next';
import type { Route } from './types';

import Component, { useCounter } from '@polkadot/app-alliance';

export default function create (t: TFunction): Route {
return {
Component,
display: {
needsApi: []
},
group: 'governance',
icon: 'atom',
name: 'alliance',
text: t('nav.alliance', 'Alliance', {
ns: 'apps-routing'
}),
useCounter
};
}
2 changes: 2 additions & 0 deletions packages/apps-routing/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type { Routes } from './types';

import accounts from './accounts';
import addresses from './addresses';
import alliance from './alliance';
import assets from './assets';
import bounties from './bounties';
import calendar from './calendar';
Expand Down Expand Up @@ -46,6 +47,7 @@ export default function create (t: TFunction): Routes {
council(t),
treasury(t),
bounties(t),
alliance(t),
techcomm(t),
membership(t),
parachains(t),
Expand Down
100 changes: 100 additions & 0 deletions packages/apps/public/locales/en/app-alliance.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"Acceptance proposal": "Acceptance proposal",
"Account blacklist empty": "Account blacklist empty",
"Accounts": "Accounts",
"Add blacklist": "Add blacklist",
"Add item": "Add item",
"Alliance rule": "Alliance rule",
"Allies": "Allies",
"Announcements": "Announcements",
"Announcements ({{count}})": "Announcements ({{count}})",
"Aye {{count}}": "Aye {{count}}",
"Blacklist ({{count}})": "Blacklist ({{count}})",
"Candidates": "Candidates",
"Candidates ({{count}})": "Candidates ({{count}})",
"Close": "Close",
"Close proposal": "Close proposal",
"Deposit": "Deposit",
"Elevate to fellow": "Elevate to fellow",
"Fellows": "Fellows",
"Founders": "Founders",
"IPFS Hash": "IPFS Hash",
"IPFS hash": "IPFS hash",
"Ipfs Hash": "Ipfs Hash",
"Ipfs hash": "Ipfs hash",
"Members ({{count}})": "Members ({{count}})",
"Motions": "Motions",
"Nay {{count}}": "Nay {{count}}",
"No allies": "No allies",
"No announcements": "No announcements",
"No blacklist.": "No blacklist.",
"No candidates": "No candidates",
"No fellows": "No fellows",
"No founders": "No founders",
"No motions": "No motions",
"No rule": "No rule",
"Nominate account": "Nominate account",
"Nominate candidacy": "Nominate candidacy",
"Nominator": "Nominator",
"Propose": "Propose",
"Propose Announcement": "Propose Announcement",
"Propose an alliance motion": "Propose an alliance motion",
"Propose an nominate candidacy": "Propose an nominate candidacy",
"Propose blacklist": "Propose blacklist",
"Propose elevate to fellow": "Propose elevate to fellow",
"Propose kicking out": "Propose kicking out",
"Propose setting rule": "Propose setting rule",
"Rejection proposal": "Rejection proposal",
"Remove blacklist": "Remove blacklist",
"Remove item": "Remove item",
"Retire": "Retire",
"Select the account you wish close the proposal with.": "Select the account you wish close the proposal with.",
"Select the account you wish to submit the proposal from.": "Select the account you wish to submit the proposal from.",
"Select type": "Select type",
"Set Rule": "Set Rule",
"Set rule": "Set rule",
"Submit": "Submit",
"Submit candidacy": "Submit candidacy",
"Submit kicking proposal": "Submit kicking proposal",
"Submit proposal": "Submit proposal",
"The account will be kick out.": "The account will be kick out.",
"The account will elevate to fellow.": "The account will elevate to fellow.",
"The alliance member account for this vote. The selection is filtered by the current members.": "The alliance member account for this vote. The selection is filtered by the current members.",
"The alliance member account that will apply the close for the current round.": "The alliance member account that will apply the close for the current round.",
"The bond that is reserved": "The bond that is reserved",
"The bond will be reserved for the duration of your candidacy and membership.": "The bond will be reserved for the duration of your candidacy and membership.",
"The proposal that is being voted on. It will pass when the threshold is reached.": "The proposal that is being voted on. It will pass when the threshold is reached.",
"The proposal that will be affected. Once closed for the current voting round, it would need to be re-submitted to alliance for a subsequent voting round.": "The proposal that will be affected. Once closed for the current voting round, it would need to be re-submitted to alliance for a subsequent voting round.",
"The type of alliance proposal to submit.": "The type of alliance proposal to submit.",
"The vote will be recorded for the selected account.": "The vote will be recorded for the selected account.",
"This account will be use to nominate candidacy.": "This account will be use to nominate candidacy.",
"This account will be use to propose announce.": "This account will be use to propose announce.",
"This account will be use to propose candidacy.": "This account will be use to propose candidacy.",
"This account will be use to propose set rule.": "This account will be use to propose set rule.",
"This account will be use to submit candidacy.": "This account will be use to submit candidacy.",
"This account will make the proposal and be responsible for the bond.": "This account will make the proposal and be responsible for the bond.",
"Vote": "Vote",
"Vote Aye": "Vote Aye",
"Vote Nay": "Vote Nay",
"Vote on proposal": "Vote on proposal",
"Website": "Website",
"Website blacklist empty": "Website blacklist empty",
"Websites": "Websites",
"account blacklist": "account blacklist",
"address {{index}}": "address {{index}}",
"alliance proposal type": "alliance proposal type",
"candidacy bond": "candidacy bond",
"filter by address or identity": "filter by address or identity",
"filter by website or index": "filter by website or index",
"motions": "motions",
"propose account": "propose account",
"selected": "selected",
"sending account": "sending account",
"submit account": "submit account",
"submit with account": "submit with account",
"threshold": "threshold",
"voting end": "voting end",
"website blacklist": "website blacklist",
"website {{index}}": "website {{index}}",
"xxx": "xxx"
}
1 change: 1 addition & 0 deletions packages/apps/public/locales/en/apps-routing.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"nav.accounts": "Accounts",
"nav.addresses": "Address book",
"nav.alliance": "Alliance",
"nav.assets": "Assets",
"nav.bounties": "Bounties",
"nav.calendar": "Event calendar",
Expand Down
1 change: 1 addition & 0 deletions packages/apps/public/locales/en/index.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
"app-accounts.json",
"app-addresses.json",
"app-alliance.json",
"app-assets.json",
"app-bounties.json",
"app-calendar.json",
Expand Down
1 change: 1 addition & 0 deletions packages/apps/public/locales/en/react-components.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"everything": "everything",
"extrinsic hash": "extrinsic hash",
"filter by name, address, or account index": "filter by name, address, or account index",
"filter by name, text, or text index": "filter by name, text, or text index",
"lifetime": "lifetime",
"lock expired": "lock expired",
"locked": "locked",
Expand Down
14 changes: 13 additions & 1 deletion packages/apps/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"After a bounty was proposed the council decides whether to fund it or not.": "",
"All stashes": "",
"All voters may alter their votes any number of times prior to the close of the poll.": "",
"Allies": "",
"An account that is to receive the rewards": "",
"Announcements": "",
"Announcements ({{count}})": "",
"Any combination of the four options may be approved of by the voter. There is no need to select only one option!": "",
"Approving of all or none of the options is equivalent and will not affect the outcome of the poll.": "",
"Authorize transaction": "",
Expand All @@ -27,6 +30,8 @@
"Cancel all": "",
"Cancel selected": "",
"Candidate": "",
"Candidates": "",
"Candidates ({{count}})": "",
"Change democracy delegation": "",
"Change this account's password": "",
"Claim": "",
Expand Down Expand Up @@ -54,9 +59,11 @@
"Evaluated {{count}} keys in {{elapsed}}s ({{avg}} keys/s)": "",
"Execute": "",
"Extensions": "",
"Fellows": "",
"For approvals outstanding approvers will be shown, for hashes that should be cancelled the first approver is required.": "",
"For final approvals, the actual full call data is required to execute the transaction": "",
"Forget this account": "",
"Founders": "",
"Full Legal Name": "",
"Governance": "",
"Identity": "",
Expand All @@ -78,6 +85,7 @@
"Network": "",
"Never execute JS snippets from untrusted sources.": "",
"Next session": "",
"No blacklist.": "",
"No change": "",
"No change from the original 2017 sale definitions; will mean a total of 10 million DOT from genesis.": "",
"No discretionary lock-voting is in place; all DOT used to vote counts the same.": "",
Expand All @@ -96,12 +104,15 @@
"Please read these terms and conditions carefully. By submitting this statement, you are deemed to have accepted these Terms and Conditions. If you do not agree to these terms, please refrain from accessing or proceeding. You can also find them at:": "",
"Prior locked voting": "",
"Produced blocks": "",
"Propose elevate to fellow": "",
"Propose kicking out": "",
"Proposer": "",
"Recovery": "",
"Retrieving data": "",
"Retrieving nominators": "",
"Retrieving validators": "",
"Save": "",
"Set Rule": "",
"Set on-chain identity": "",
"Set on-chain sub-identities": "",
"Settings": "",
Expand Down Expand Up @@ -181,6 +192,7 @@
"Voting costs nothing other than the transaction fee and can be done from all accounts with a non-zero spendable balance.": "",
"Voting is made on a per-account basis; a single account must all vote the same way and cannot split its vote.": "",
"Warning: we did not find any attest statement for {{chain}}": "",
"Website": "",
"With the keep-alive option set, the account is protected against removal due to low balances.": "",
"Yes, allow nominations": "",
"You need to sign an attestation for the following account:": "",
Expand Down Expand Up @@ -335,4 +347,4 @@
"{{count}} key/value pairs encoded for submission": "",
"{{days}} days": "",
"{{percentage}}% turnout": ""
}
}
Empty file.
Empty file.
Loading