Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Adjust the location of the signer snippet #4155

Merged
merged 10 commits into from
Jan 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions js/src/ui/Icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ import DashboardIcon from 'material-ui/svg-icons/action/dashboard';
import DeleteIcon from 'material-ui/svg-icons/action/delete';
import DoneIcon from 'material-ui/svg-icons/action/done-all';
import EditIcon from 'material-ui/svg-icons/content/create';
import FingerprintIcon from 'material-ui/svg-icons/action/fingerprint';
import LinkIcon from 'material-ui/svg-icons/content/link';
import LockedIcon from 'material-ui/svg-icons/action/lock';
import MoveIcon from 'material-ui/svg-icons/action/open-with';
import NextIcon from 'material-ui/svg-icons/navigation/arrow-forward';
import PrevIcon from 'material-ui/svg-icons/navigation/arrow-back';
import SaveIcon from 'material-ui/svg-icons/content/save';
Expand All @@ -48,8 +50,10 @@ export {
DeleteIcon,
DoneIcon,
EditIcon,
FingerprintIcon,
LinkIcon,
LockedIcon,
MoveIcon,
NextIcon,
PrevIcon,
SaveIcon,
Expand Down
13 changes: 11 additions & 2 deletions js/src/ui/ParityBackground/parityBackground.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ class ParityBackground extends Component {
backgroundSeed: PropTypes.string,
children: PropTypes.node,
className: PropTypes.string,
onClick: PropTypes.func
onClick: PropTypes.func,
style: PropTypes.object
};

static defaultProps = {
style: {}
};

state = {
Expand Down Expand Up @@ -65,7 +70,11 @@ class ParityBackground extends Component {

render () {
const { children, className, onClick } = this.props;
const { style } = this.state;

const style = {
...this.state.style,
...this.props.style
};

return (
<div
Expand Down
1 change: 1 addition & 0 deletions js/src/views/Dapps/builtin.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"description": "A Javascript development console complete with web3 and parity objects.",
"version": "0.3",
"author": "Gav Wood <[email protected]>",
"position": "top-right",
"visible": true,
"secure": true,
"skipBuild": true
Expand Down
25 changes: 16 additions & 9 deletions js/src/views/Dapps/dappsStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import EventEmitter from 'eventemitter3';
import { action, computed, observable, transaction } from 'mobx';
import store from 'store';

Expand All @@ -30,7 +31,7 @@ const BUILTIN_APPS_KEY = 'BUILTIN_APPS_KEY';

let instance = null;

export default class DappsStore {
export default class DappsStore extends EventEmitter {
@observable apps = [];
@observable displayApps = {};
@observable modalOpen = false;
Expand All @@ -44,13 +45,23 @@ export default class DappsStore {
_registryAppsIds = null;

constructor (api) {
super();

this._api = api;

this.readDisplayApps();
this.loadExternalOverlay();
this.subscribeToChanges();
}

static get (api) {
if (!instance) {
instance = new DappsStore(api);
}

return instance;
}

/**
* Try to find the app from the local (local or builtin)
* apps, else fetch from the node
Expand All @@ -68,6 +79,10 @@ export default class DappsStore {
}

return this.fetchRegistryApp(dappReg, id, true);
})
.then((app) => {
this.emit('loaded', app);
return app;
});
}

Expand All @@ -90,14 +105,6 @@ export default class DappsStore {
.then(this.writeDisplayApps);
}

static get (api) {
if (!instance) {
instance = new DappsStore(api);
}

return instance;
}

subscribeToChanges () {
const { dappReg } = Contracts.get();

Expand Down
135 changes: 94 additions & 41 deletions js/src/views/ParityBar/parityBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/

.bar, .expanded {
position: fixed;
bottom: 0;
right: 0;
font-size: 16px;
font-family: 'Roboto', sans-serif;
z-index: 10001;
}

.overlay {
position: fixed;
top: 0;
Expand All @@ -32,42 +23,73 @@
left: 0;
background: rgba(255, 255, 255, 0.5);
z-index: 10000;
user-select: none;
}

.bar, .expanded {
position: fixed;
font-size: 16px;
font-family: 'Roboto', sans-serif;
z-index: 10001;
user-select: none;
}

.bar {
vertical-align: middle;
display: flex;
flex-wrap: wrap;
width: 100%;
top: 0;
left: 0;

&.moving {
bottom: 0;
right: 0;

&:hover {
cursor: move;
}
}
}

.parityBg {
position: fixed;

transition-property: left, top, right, bottom;
transition-duration: 0.25s;
transition-timing-function: ease;

&.moving {
transition-duration: 0.05s;
transition-timing-function: ease-in-out;
}
}

.expanded {
right: 1em;
border-radius: 4px 4px 0 0;
display: flex;
flex-direction: column;
max-height: 50vh;
}

.expanded .content {
flex: 1;
overflow-y: auto;
overflow-x: hidden;
display: flex;
background: rgba(0, 0, 0, 0.8);
min-height: 16em;
.content {
flex: 1;
overflow-y: auto;
overflow-x: hidden;
display: flex;
background: rgba(0, 0, 0, 0.8);
min-height: 16em;
}
}

.corner {
position: absolute;
bottom: 0;
right: 1em;
border-radius: 4px 4px 0 0;
}

.cornercolor {
background: rgba(0, 0, 0, 0.5);
padding: 0.5em 1em;
display: flex;
align-items: center;
}

.link {
Expand All @@ -76,12 +98,12 @@
outline: none !important;
color: white !important;
display: inline-block;
}

.link img, .link svg {
height: 24px !important;
width: 24px !important;
margin: 2px 0.5em 0 0;
img, svg {
height: 24px !important;
width: 24px !important;
margin: 2px 0.5em 0 0;
}
}

.link+.link {
Expand Down Expand Up @@ -123,20 +145,20 @@
padding: 0.5em 1em;
background: rgba(0, 0, 0, 0.25);
margin-bottom: 0;
}

.header:after {
clear: both;
&:after {
clear: both;
}
}

.header button,
.corner button {
color: white !important;
}
.header, .corner {
button {
color: white !important;
}

.header svg,
.coner svg {
fill: white !important;
svg {
fill: white !important;
}
}

.body {
Expand All @@ -150,12 +172,12 @@
.actions {
float: right;
margin-top: -2px;
}

.actions div {
margin-left: 1em;
display: inline-block;
cursor: pointer;
div {
margin-left: 1em;
display: inline-block;
cursor: pointer;
}
}

.parityIcon, .signerIcon {
Expand All @@ -164,3 +186,34 @@
vertical-align: middle;
margin-left: 12px;
}

.moveIcon {
display: flex;
align-items: center;

&:hover {
cursor: move;
}
}

.dragButton {
width: 1em;
height: 1em;
margin-left: 0.5em;

background-color: white;
opacity: 0.25;
border-radius: 50%;

transition-property: opacity;
transition-duration: 0.1s;
transition-timing-function: ease-in-out;

&:hover {
opacity: 0.5;
}

&.moving {
opacity: 0.75;
}
}
Loading