Commit b25af9d0 authored by Efe's avatar Efe Committed by Jonathan Porta
Browse files

implement steem proposal system

parent 66469e1b
......@@ -24,6 +24,7 @@ module.exports = {
'/market',
'/~witnesses',
'/submit.html',
'/steem_proposal_system',
].forEach(path => testHttpGet('localhost', 8080, path, browser));
},
};
......
......@@ -69,11 +69,11 @@
"auth_token": false
},
"upload_image": false,
"steemd_connection_client": "https://api.steemit.com",
"steemd_connection_server": "https://api.steemit.com",
"steemd_use_appbase": false,
"chain_id": "0000000000000000000000000000000000000000000000000000000000000000",
"address_prefix": "STM",
"steemd_connection_client": "ws://sps-blocktrades-testnet-api.blocktrades.info:8090",
"steemd_connection_server": "ws://sps-blocktrades-testnet-api.blocktrades.info:8090",
"steemd_use_appbase": true,
"chain_id": "18dcf0a285365fc58b71f18b3d3fec954aa0c141c44e4e5cb4cf777b9eab274e",
"address_prefix": "TST",
"conveyor_posting_wif": false,
"conveyor_username": false,
"social_url": "https://steemit.com"
......
......@@ -23,6 +23,7 @@
"author": "Steemit, Inc.",
"license": "MIT",
"dependencies": {
"@blocktradesdev/steem-js": "^0.7.5",
"@steem/crypto-session": "git+https://github.com/steemit/crypto-session.git#83a90b319ce5bc6a70362d52a15a815de7e729bb",
"@steemit/steem-js": "0.7.4",
"assert": "1.4.1",
......
......@@ -9,7 +9,7 @@ import Iso from 'iso';
import { clientRender } from 'shared/UniversalRender';
import ConsoleExports from './utils/ConsoleExports';
import { serverApiRecordEvent } from 'app/utils/ServerApiClient';
import * as steem from '@steemit/steem-js';
import * as steem from '@blocktradesdev/steem-js';
import { determineViewMode } from 'app/utils/Links';
import frontendLogger from 'app/utils/FrontendLogger';
......
......@@ -58,6 +58,9 @@ export default function resolveRoute(path) {
if (path === '/~witnesses') {
return { page: 'Witnesses' };
}
if (path === '/steem_proposal_system') {
return { page: 'SteemProposalSystem' };
}
match =
path.match(routeRegex.UserProfile1) ||
path.match(routeRegex.UserProfile2);
......
......@@ -33,6 +33,7 @@ describe('resolveRoute', () => {
['/recover_account_step_2', { page: 'RecoverAccountStep2' }],
['/market', { page: 'Market' }],
['/~witnesses', { page: 'Witnesses' }],
['/steem_proposal_system', { page: 'SteemProposalSystem' }],
['/@gdpr/nice345', { page: 'NotFound' }],
['/taggy/@gdpr/nice345', { page: 'NotFound' }],
];
......
......@@ -44,6 +44,8 @@ export default {
cb(null, [require('app/components/pages/RecoverAccountStep2')]);
} else if (route.page === 'Witnesses') {
cb(null, [require('app/components/pages/Witnesses')]);
} else if (route.page === 'SteemProposalSystem') {
cb(null, [require('app/components/pages/SteemProposalSystem')]);
} else if (route.page === 'UserProfile') {
cb(null, [require('app/components/pages/UserProfile')]);
} else if (route.page === 'Market') {
......
......@@ -13,7 +13,7 @@ import MiniHeader from 'app/components/modules/MiniHeader';
import tt from 'counterpart';
import PageViewsCounter from 'app/components/elements/PageViewsCounter';
import { serverApiRecordEvent } from 'app/utils/ServerApiClient';
import { key_utils } from '@steemit/steem-js/lib/auth/ecc';
import { key_utils } from '@blocktradesdev/steem-js/lib/auth/ecc';
import resolveRoute from 'app/ResolveRoute';
import { VIEW_MODE_WHISTLE } from 'shared/constants';
......
......@@ -25,6 +25,7 @@
@import "./elements/SanitizedLink/styles";
@import "./elements/HelpTip/styles";
@import "./elements/Dropdown";
@import "./elements/Pagination/styles";
// modules
@import "./modules/Header/styles";
......@@ -50,3 +51,4 @@
@import "./pages/Witnesses";
@import "./pages/About";
@import "./pages/WalletIndex";
@import "./pages/SteemProposalSystem";
......@@ -6,8 +6,8 @@ import {
PrivateKey,
PublicKey,
key_utils,
} from '@steemit/steem-js/lib/auth/ecc';
import { api } from '@steemit/steem-js';
} from '@blocktradesdev/steem-js/lib/auth/ecc';
import { api } from '@blocktradesdev/steem-js';
import * as transactionActions from 'app/redux/TransactionReducer';
import * as appActions from 'app/redux/AppReducer';
......
......@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import tt from 'counterpart';
import { APP_NAME } from 'app/client_config';
import { key_utils } from '@steemit/steem-js/lib/auth/ecc';
import { key_utils } from '@blocktradesdev/steem-js/lib/auth/ecc';
function allChecked(confirmCheckboxes) {
return confirmCheckboxes.box1 && confirmCheckboxes.box2;
......
......@@ -4,7 +4,7 @@ import LoadingIndicator from 'app/components/elements/LoadingIndicator';
import { reduxForm } from 'redux-form'; // @deprecated, instead use: app/utils/ReactForm.js
import { cleanReduxInput } from 'app/utils/ReduxForms';
import tt from 'counterpart';
import { PrivateKey, PublicKey } from '@steemit/steem-js/lib/auth/ecc';
import { PrivateKey, PublicKey } from '@blocktradesdev/steem-js/lib/auth/ecc';
class KeyEdit extends Component {
static propTypes = {
......
......@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';
import tt from 'counterpart';
import classnames from 'classnames';
import { memo } from '@steemit/steem-js';
import { memo } from '@blocktradesdev/steem-js';
import BadActorList from 'app/utils/BadActorList';
import { repLog10 } from 'app/utils/ParsersAndFormatters';
......
import React from 'react';
import Icon from 'app/components/elements/Icon';
class Pagination extends React.Component {
constructor(props) {
super(props);
this.onNextPage = this.onNextPage.bind(this);
this.onPreviousPage = this.onPreviousPage.bind(this);
}
onNextPage() {
this.props.onNextPage();
}
onPreviousPage() {
this.props.onPreviousPage();
}
render() {
const { previousAvailable, nextAvailable } = this.props;
return (
<div className="Pagination">
<button
disabled={!previousAvailable}
className="button-previous"
onClick={this.onPreviousPage}
>
<Icon name="chevron-left" size="1_5x" />
</button>
{/* implement page numbers */}
<button
disabled={!nextAvailable}
className="button-next"
onClick={this.onNextPage}
>
<Icon name="chevron-left" size="1_5x" />
</button>
</div>
);
}
}
export default Pagination;
export { default } from './Pagination';
.Pagination {
display: flex;
ul.pagination-list {
margin-left: 0;
margin-bottom: 0;
list-style: none;
display: inline-flex;
li {
width: 30px;
display: flex;
justify-content: center;
cursor: pointer;
font-size: 1.25em;
&.active {
color: $color-teal;
}
}
}
button {
cursor: pointer;
margin-right: 0 !important;
}
button:disabled,
button[disabled] {
opacity: 0.3;
pointer-events: none;
}
.button-next {
svg {
transform: rotate(180deg);
}
}
}
......@@ -8,7 +8,7 @@ import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';
import Icon from 'app/components/elements/Icon';
import tt from 'counterpart';
import { APP_NAME, APP_ICON } from 'app/client_config';
import { key_utils } from '@steemit/steem-js/lib/auth/ecc';
import { key_utils } from '@blocktradesdev/steem-js/lib/auth/ecc';
const { bool } = PropTypes;
export const steemitCannotRecoverPasswords = tt(
......
......@@ -40,7 +40,7 @@ export default class VerticalMenu extends React.Component {
{i.addon}
</Link>
) : (
<span>
<span onClick={i.onClick}>
{i.icon && <Icon name={i.icon} />}
{i.label ? i.label : i.value}
</span>
......
......@@ -81,6 +81,8 @@ class Header extends React.Component {
route.page == 'RecoverAccountStep2'
) {
page_title = tt('header_jsx.stolen_account_recovery');
} else if (route.page === 'SteemProposalSystem') {
page_title = tt('header_jsx.steem_proposal_system');
} else if (route.page === 'UserProfile') {
let user_name = route.params[0].slice(1);
const name = account_meta
......
......@@ -12,7 +12,7 @@ import reactForm from 'app/utils/ReactForm';
import { serverApiRecordEvent } from 'app/utils/ServerApiClient';
import tt from 'counterpart';
import { APP_URL } from 'app/client_config';
import { PrivateKey, PublicKey } from '@steemit/steem-js/lib/auth/ecc';
import { PrivateKey, PublicKey } from '@blocktradesdev/steem-js/lib/auth/ecc';
import { SIGNUP_URL } from 'shared/constants';
class LoginForm extends Component {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment