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.

Sign up for GitHub

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

Update dapp permissions #16

Merged
merged 15 commits into from
Mar 21, 2018
Merged

Update dapp permissions #16

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
01516f1
Local settings menu
floating Mar 18, 2018
170357c
Move signer minimize out of local state
floating Mar 18, 2018
83acbb1
Update settings icon
floating Mar 18, 2018
d6f8526
Initial Signer Indicator (#9)
dhuang919 Mar 18, 2018
4171c46
Update indicator, add signer settings menu
floating Mar 18, 2018
80c7a3f
Add local node settings
floating Mar 19, 2018
007e53c
Dapp permission requests
floating Mar 21, 2018
bd2f759
Add ability to toggle permissions
floating Mar 21, 2018
db304a9
Add functionality to test dapp (#14)
floating Mar 21, 2018
f6b9531
Toggle dapp permissions
floating Mar 21, 2018
2cbd80d
Apply style to local settings
floating Mar 21, 2018
393372a
Hide permissions when unselected, hide window on blur
floating Mar 21, 2018
b513206
Update dapp permissions
floating Mar 21, 2018
2ee2f4b
Merge master
floating Mar 21, 2018
e0428f0
Remove persist.clear()
floating Mar 21, 2018
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
Prev Previous commit
Next Next commit
Apply style to local settings
  • Loading branch information
@floating
floating committed Mar 21, 2018
commit 2cbd80df95dca3c69986b85cbba0d5c1c3dda77c
18 changes: 11 additions & 7 deletions app/App/Panel/Settings/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@ import Restore from 'react-restore'
class Settings extends React.Component {
render () {
return (
<div className='settings'>
<div className='settingsTitle'>{'Local Settings'}</div>
<div className='settingsItems'>
<div className='settingsItem' onClick={_ => this.store.runLocalNode()}>
{'Run local node: ' + this.store('local.node.run')}
<div className='signerSettings'>
<div className='signerSettingsTitle'>{'Local Settings'}</div>
<div className='signerPermission' onClick={_ => this.store.runLocalNode()}>
<div className='signerPermissionOrigin'>{'Run Local Node'}</div>
<div className={this.store('local.node.run') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'}>
<div className='signerPermissionToggleSwitch' />
</div>
<div className='settingsItem' onClick={_ => this.store.runOnStartup()}>
{'Run on startup: ' + this.store('local.startup')}
</div>
<div className='signerPermission' onClick={_ => this.store.runOnStartup()}>
<div className='signerPermissionOrigin'>{'Run on Startup'}</div>
<div className={this.store('local.startup') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'}>
<div className='signerPermissionToggleSwitch' />
</div>
</div>
</div>
Expand Down