Home landing page (#4178)
* Home entry point (basics) * WIP store for web * Add DappUrlInput component * Updated tests * WIP store update * Adjust styling * Add home tab * Collapse first/last without extra divs * Navigation actually navigates * styling * Encoding of ethlink.io URLs * encodedUrl setup * base58 encoded URLs * Added decoding, updated tests to Parity-compliant * Base32 (synced with Rust implementation via tests) * Split URL into 63 character chunks * Fix store test * Cleanups * s/ethlink/dapplink/ * Display app navigation & histroy * Start on /accounts (for now, until expanded fully) * Update tests * ethlink.io -> web3.site * Basic list layout * Store history on navigation * Show Accounts & Dapps * Add skeleton for DappIcon (WIP) * DappIcon WIP * DappIcon in place * Split into maneable sub-components * WIP * Tests for views/Home * Swap default entry-point to /home * Expose registry.get via lookupMeta * Add getEntry interface, fix instance retrieval (with tests) * Add news display component * Add tests for added contracts/registry methods * Fix GHH test refactoring * render news via SectionList * News items store directly * Images * News & Urls has new layout * Convert remainder * First run-through of MVP for SectionList * Update tests * Deploycontract should not override global p styles * Allow styles overrides for head & body * Adjust layout styling * revert Container>flex * Adjust sizes of history items * Cleanups * HistoryStore for tracking relevant routes * Default route is still /accounts * Fix tests * Update 2015-2017 * Add lookupMeta & tests * Add getEntry & tests * Split Dapp icon into ui/DappIcon * Update copyright dates * Encoding for *.web3.site urls * Dapp history retrieval * Grow to only 40% on hover * Update description * Add DappUrlInput component * Update Web views with store * Update spec description * Update spec description * edited url does not allow in-place store edits * Use /web/<hash> urls for iframe * Removed (now) unused _list.css * Mistamtched merge fixed * Tab split (WIP) * Split Tab component * Update tests after merge * typo * Remove background !important * Set item width to parent * Set width, remove overflow-x: hidden * Align hover overlays * Container defaults to some opacity * Display history from listRecentDapps * Override styles for a tags * Open URLs in new window when extension is available * Fix tests after update * AccountCard width 100% * Re-add opening correct url in tab * Cleanup link rendering * Remove hardcoded news URL * pre-merge * Extra padding at Home bottom (Pr grumble) * Match js-vaults stretch * s/Web Apps via URL/Web Apps/ (PR grumble) * Store recent wallets (PR grumble) * Simplify inline style matching (PR comment) * Add store for new retrieval * Add missing observer * Auto-link based on account type * Fix UI overlaps * Extra spacing * Only show account when accountInfo is available * Align timestamp line-heights * Fix tests * Update tests * Really fix failing test (check for Connect(Account))
This commit is contained in:
Jaco Greeff
GitHub
@@ -1,17 +0,0 @@
|
||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity 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 General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default from './urlButton';
|
||||
@@ -1,20 +0,0 @@
|
||||
/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||
/* This file is part of Parity.
|
||||
/*
|
||||
/* Parity is free software: you can redistribute it and/or modify
|
||||
/* it under the terms of the GNU General Public License as published by
|
||||
/* the Free Software Foundation, either version 3 of the License, or
|
||||
/* (at your option) any later version.
|
||||
/*
|
||||
/* Parity 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 General Public License for more details.
|
||||
/*
|
||||
/* You should have received a copy of the GNU General Public License
|
||||
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
.button {
|
||||
vertical-align: middle;
|
||||
}
|
||||
@@ -1,99 +0,0 @@
|
||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity 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 General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
import { withRouter } from 'react-router';
|
||||
|
||||
import Button from '~/ui/Button';
|
||||
import { LinkIcon } from '~/ui/Icons';
|
||||
import Input from '~/ui/Form/Input';
|
||||
|
||||
import styles from './urlButton.css';
|
||||
|
||||
const INPUT_STYLE = { display: 'inline-block', width: '20em' };
|
||||
|
||||
class UrlButton extends Component {
|
||||
static propTypes = {
|
||||
router: PropTypes.object.isRequired // injected by withRouter
|
||||
};
|
||||
|
||||
state = {
|
||||
inputShown: false
|
||||
};
|
||||
|
||||
render () {
|
||||
const { inputShown } = this.state;
|
||||
|
||||
return (
|
||||
<div>
|
||||
{ inputShown ? this.renderInput() : null }
|
||||
<Button
|
||||
className={ styles.button }
|
||||
icon={ <LinkIcon /> }
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='dapps.button.url.label'
|
||||
defaultMessage='URL'
|
||||
/>
|
||||
}
|
||||
onClick={ this.toggleInput }
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
renderInput () {
|
||||
return (
|
||||
<Input
|
||||
hint={
|
||||
<FormattedMessage
|
||||
id='dapps.button.url.input'
|
||||
defaultMessage='https://mkr.market'
|
||||
/>
|
||||
}
|
||||
onBlur={ this.hideInput }
|
||||
onFocus={ this.showInput }
|
||||
onSubmit={ this.inputOnSubmit }
|
||||
style={ INPUT_STYLE }
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
toggleInput = () => {
|
||||
const { inputShown } = this.state;
|
||||
|
||||
this.setState({
|
||||
inputShown: !inputShown
|
||||
});
|
||||
}
|
||||
|
||||
hideInput = () => {
|
||||
this.setState({ inputShown: false });
|
||||
}
|
||||
|
||||
showInput = () => {
|
||||
this.setState({ inputShown: true });
|
||||
}
|
||||
|
||||
inputOnSubmit = (url) => {
|
||||
const { router } = this.props;
|
||||
|
||||
router.push(`/web/${encodeURIComponent(url)}`);
|
||||
}
|
||||
}
|
||||
|
||||
export default withRouter(UrlButton);
|
||||
@@ -19,18 +19,20 @@
|
||||
flex-wrap: wrap;
|
||||
margin: -0.125em;
|
||||
position: relative;
|
||||
|
||||
.item {
|
||||
box-sizing: border-box;
|
||||
flex: 0 1 50%;
|
||||
opacity: 0.85;
|
||||
padding: 0.125em;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.list+.list {
|
||||
margin-top: -0.25em;
|
||||
}
|
||||
|
||||
.item {
|
||||
padding: 0.125em;
|
||||
flex: 0 1 50%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.overlay {
|
||||
background: rgba(0, 0, 0, 0.85);
|
||||
bottom: 0.5em;
|
||||
|
||||
@@ -26,7 +26,6 @@ import PermissionStore from '~/modals/DappPermissions/store';
|
||||
import { Actionbar, Button, DappCard, Page } from '~/ui';
|
||||
import { LockedIcon, VisibleIcon } from '~/ui/Icons';
|
||||
|
||||
import UrlButton from './UrlButton';
|
||||
import DappsStore from './dappsStore';
|
||||
|
||||
import styles from './dapps.css';
|
||||
@@ -92,7 +91,6 @@ class Dapps extends Component {
|
||||
/>
|
||||
}
|
||||
buttons={ [
|
||||
<UrlButton key='url' />,
|
||||
<Button
|
||||
icon={ <VisibleIcon /> }
|
||||
key='edit'
|
||||
|
||||
Reference in New Issue
Block a user