Implemented lock (to be reviewed)
This commit is contained in:
Dario Chiappetta
@@ -219,7 +219,8 @@ Clipperz.PM.UI.Components.Cards.ViewClass = React.createClass({
|
||||
Clipperz.PM.UI.Components.Cards.TextArea({
|
||||
// React.DOM.textarea({
|
||||
'readOnly': true,
|
||||
'onClick': function(e) { e.target.select(); },
|
||||
// 'onMouseUp': function(e) { e.target.focus(); e.target.select(); e.stopPropagation(); e.preventDefault();},
|
||||
'onClick': function(e) { e.target.focus(); e.target.select(); e.target.selectionStart = 0; e.target.selectionEnd = e.target.value.length; e.stopPropagation(); e.preventDefault(); },
|
||||
'className':Clipperz.PM.UI.Components.classNames(cardFieldValueClasses),
|
||||
'value': aField['value'],
|
||||
'rows': 1
|
||||
|
||||
@@ -26,8 +26,6 @@ Clipperz.Base.module('Clipperz.PM.UI.Components.ExtraFeatures');
|
||||
|
||||
Clipperz.PM.UI.Components.ExtraFeatures.OTPClass = React.createClass({
|
||||
|
||||
// TODO: add print button!!!!
|
||||
|
||||
getInitialState: function() {
|
||||
return {
|
||||
// 'selectedOTPs': [],
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
/*
|
||||
|
||||
Copyright 2008-2015 Clipperz Srl
|
||||
|
||||
This file is part of Clipperz, the online password manager.
|
||||
For further information about its features and functionalities please
|
||||
refer to http://www.clipperz.com.
|
||||
|
||||
* Clipperz is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
* Clipperz 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 Affero General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
License along with Clipperz. If not, see http://www.gnu.org/licenses/.
|
||||
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
Clipperz.Base.module('Clipperz.PM.UI.Components.ExtraFeatures');
|
||||
|
||||
Clipperz.PM.UI.Components.ExtraFeatures.PreferencesClass = React.createClass({
|
||||
|
||||
getInitialState: function() {
|
||||
return {
|
||||
'preferenceBeingEdited': null,
|
||||
'preferenceValue': '',
|
||||
};
|
||||
},
|
||||
|
||||
propTypes: {
|
||||
},
|
||||
|
||||
//=========================================================================
|
||||
|
||||
setEditedPreference: function(aKey, aValue) {
|
||||
this.setState({
|
||||
'preferenceBeingEdited': aKey,
|
||||
'preferenceValue': aValue
|
||||
});
|
||||
},
|
||||
|
||||
handleChange: function(anEvent) {
|
||||
var newState = this.state;
|
||||
|
||||
newState['preferenceValue'] = anEvent.target.value;
|
||||
|
||||
this.setState(newState);
|
||||
},
|
||||
|
||||
handleSave: function() {
|
||||
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'setPreference', this.state['preferenceBeingEdited'], this.state['preferenceValue']);
|
||||
this.setEditedPreference(null, '');
|
||||
},
|
||||
|
||||
handleCancel: function() {
|
||||
this.setEditedPreference(null, '');
|
||||
},
|
||||
|
||||
handleKeyPressed: function(anEvent) {
|
||||
switch (anEvent.keyCode) {
|
||||
case 9: // tab
|
||||
this.handleSave();
|
||||
// TODO: edit next preference
|
||||
break;
|
||||
case 13: // enter
|
||||
this.handleSave();
|
||||
break;
|
||||
case 27: // escape
|
||||
this.handleCancel();
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
//=========================================================================
|
||||
|
||||
renderPreferenceValueElement: function(aKey) {
|
||||
var result;
|
||||
|
||||
var preferenceValue = this.props.userInfo.preferences.getValue(aKey);
|
||||
|
||||
if (this.state.preferenceBeingEdited == aKey) {
|
||||
result = React.DOM.input({
|
||||
'autoFocus': true,
|
||||
'key': aKey,
|
||||
'type': 'text',
|
||||
'value': this.state.preferenceValue,
|
||||
'onChange': this.handleChange,
|
||||
'onKeyDown': MochiKit.Base.method(this, 'handleKeyPressed'),
|
||||
});
|
||||
} else {
|
||||
result = React.DOM.p({
|
||||
'className': 'preferenceValue',
|
||||
'onClick': MochiKit.Base.method(this, 'setEditedPreference', aKey, preferenceValue)
|
||||
}, preferenceValue);
|
||||
}
|
||||
|
||||
return result;
|
||||
},
|
||||
|
||||
renderPreferences: function() {
|
||||
var result;
|
||||
|
||||
result = [
|
||||
React.DOM.li({'key': 'autoLockAfterMinutes'}, [
|
||||
React.DOM.p({'className': 'preferenceName'}, "Automatic lock (minutes) - m"),
|
||||
React.DOM.p({'className': 'preferenceDescription'}, "Automatically lock Clipperz after N minutes. (0 = auto lock disabled)"),
|
||||
this.renderPreferenceValueElement('lock.timeoutInMinutes')
|
||||
]),
|
||||
React.DOM.li({'key': 'shouldShowDonationPanel'}, [
|
||||
React.DOM.p({'className': 'preferenceName'}, "Donation Panel - m"),
|
||||
React.DOM.p({'className': 'preferenceDescription'}, "Select whether to display the donation panel or not"),
|
||||
this.renderPreferenceValueElement('shouldShowDonationPanel')
|
||||
])
|
||||
];
|
||||
|
||||
return result;
|
||||
},
|
||||
|
||||
render: function () {
|
||||
var result;
|
||||
|
||||
if (! this.props.userInfo.preferences) {
|
||||
result = React.DOM.p({}, "spinner...");
|
||||
} else {
|
||||
result = React.DOM.div({'className':'extraFeature preferences'}, [
|
||||
React.DOM.div({'className':'header'}, [
|
||||
React.DOM.h1({}, "Preferences"),
|
||||
React.DOM.div({'className':'description'}, [
|
||||
React.DOM.p({}, "Insert copy here..."),
|
||||
])
|
||||
]),
|
||||
React.DOM.div({'className':'content'}, [
|
||||
React.DOM.ul({'className':'preferenceList'}, this.renderPreferences()),
|
||||
])
|
||||
]);
|
||||
}
|
||||
|
||||
return result;
|
||||
},
|
||||
|
||||
//=========================================================================
|
||||
});
|
||||
|
||||
Clipperz.PM.UI.Components.ExtraFeatures.Preferences = React.createFactory(Clipperz.PM.UI.Components.ExtraFeatures.PreferencesClass);
|
||||
@@ -42,6 +42,7 @@ Clipperz.PM.UI.Components.Pages.MainPageClass = React.createClass({
|
||||
'userInfo': React.PropTypes.object.isRequired,
|
||||
'accountInfo': React.PropTypes.object.isRequired,
|
||||
'style': React.PropTypes.oneOf(Clipperz_PM_UI_availableStyles).isRequired,
|
||||
'locked': React.PropTypes.bool,
|
||||
// 'mediaQueryStyle': React.PropTypes.oneOf(['extra-short', 'narrow', 'wide', 'extra-wide']).isRequired,
|
||||
// 'cards': React.PropTypes.deferred.isRequired
|
||||
},
|
||||
@@ -55,17 +56,25 @@ Clipperz.PM.UI.Components.Pages.MainPageClass = React.createClass({
|
||||
//=========================================================================
|
||||
|
||||
render: function () {
|
||||
var classes = {
|
||||
'mainPage': true
|
||||
};
|
||||
classes[this.props['style']] = true;
|
||||
var result;
|
||||
|
||||
return React.DOM.div({'key':'mainPage', 'className':Clipperz.PM.UI.Components.classNames(classes)}, [
|
||||
this.props['style'] != 'extra-wide' ? Clipperz.PM.UI.Components.Panels.SelectionPanel(this.props) : null,
|
||||
Clipperz.PM.UI.Components.Panels.MainPanel(this.props),
|
||||
Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanel(this.props),
|
||||
this.props['ask'] ? Clipperz.PM.UI.Components.DialogBox(this.props['ask']) : null
|
||||
]);
|
||||
if (this.props['locked']) {
|
||||
result = null;
|
||||
} else {
|
||||
var classes = {
|
||||
'mainPage': true
|
||||
};
|
||||
classes[this.props['style']] = true;
|
||||
|
||||
result = React.DOM.div({'key':'mainPage', 'className':Clipperz.PM.UI.Components.classNames(classes)}, [
|
||||
this.props['style'] != 'extra-wide' ? Clipperz.PM.UI.Components.Panels.SelectionPanel(this.props) : null,
|
||||
Clipperz.PM.UI.Components.Panels.MainPanel(this.props),
|
||||
Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanel(this.props),
|
||||
this.props['ask'] ? Clipperz.PM.UI.Components.DialogBox(this.props['ask']) : null
|
||||
]);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
//=========================================================================
|
||||
|
||||
174
frontend/delta/js/Clipperz/PM/UI/Components/Pages/UnlockPage.js
Normal file
174
frontend/delta/js/Clipperz/PM/UI/Components/Pages/UnlockPage.js
Normal file
@@ -0,0 +1,174 @@
|
||||
/*
|
||||
|
||||
Copyright 2008-2015 Clipperz Srl
|
||||
|
||||
This file is part of Clipperz, the online password manager.
|
||||
For further information about its features and functionalities please
|
||||
refer to http://www.clipperz.com.
|
||||
|
||||
* Clipperz is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
* Clipperz 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 Affero General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
License along with Clipperz. If not, see http://www.gnu.org/licenses/.
|
||||
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
Clipperz.Base.module('Clipperz.PM.UI.Components.Pages');
|
||||
|
||||
Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({
|
||||
|
||||
propTypes: {
|
||||
mode: React.PropTypes.oneOf(['CREDENTIALS','PIN']).isRequired,
|
||||
// isNewUserRegistrationAvailable: React.PropTypes.bool.isRequired,
|
||||
disabled: React.PropTypes.bool.isRequired
|
||||
},
|
||||
/*
|
||||
getDefaultProps: function () {
|
||||
return {
|
||||
mode: 'CREDENTIALS',
|
||||
isNewUserRegistrationAvailable: false,
|
||||
disabled: false,
|
||||
// template: Clipperz.PM.UI.Components.PageTemplate
|
||||
}
|
||||
},
|
||||
*/
|
||||
getInitialState: function () {
|
||||
return {
|
||||
passphrase: '',
|
||||
pin: ''
|
||||
};
|
||||
},
|
||||
|
||||
//=========================================================================
|
||||
|
||||
handleChange: function (anEvent) {
|
||||
var newState = {};
|
||||
|
||||
newState['passphrase'] = anEvent.target.value;
|
||||
|
||||
this.setState(newState);
|
||||
},
|
||||
|
||||
// pollForChanges: function() {
|
||||
// if (this.props.mode == 'CREDENTIALS') {
|
||||
// var newState;
|
||||
|
||||
// var usernameValue = this.refs['username'].getDOMNode().value;
|
||||
// var passphraseValue = this.refs['passphrase'].getDOMNode().value;
|
||||
|
||||
// newState = {};
|
||||
|
||||
// newState['username'] = (usernameValue) ? usernameValue : "";
|
||||
// newState['passphrase'] = (passphraseValue) ? passphraseValue : "";
|
||||
|
||||
// this.setState(newState);
|
||||
// }
|
||||
// },
|
||||
|
||||
//=========================================================================
|
||||
|
||||
handlePassphraseSubmit: function (event) {
|
||||
event.preventDefault();
|
||||
|
||||
this.refs['passphrase'].getDOMNode().blur();
|
||||
|
||||
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'unlock', this.refs['passphrase'].getDOMNode().value);
|
||||
|
||||
|
||||
},
|
||||
|
||||
resetUnlockForm: function() {
|
||||
this.refs['passphrase'].getDOMNode().value = '';
|
||||
this.replaceState(this.getInitialState());
|
||||
},
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
shouldEnableUnlockButton: function () {
|
||||
var result;
|
||||
|
||||
return (
|
||||
(this.state['passphrase'] != '')
|
||||
||
|
||||
(this.state['pin'] != '')
|
||||
)
|
||||
&&
|
||||
!this.props['disabled'];
|
||||
},
|
||||
|
||||
unlockForm: function () {
|
||||
return React.DOM.form({'key':'form', 'className':'unlockForm credentials', 'autoComplete':'off', 'autoCorrect':'off', 'autoCapitalize':'off', 'onChange':this.handleChange, 'onSubmit':this.handlePassphraseSubmit}, [
|
||||
React.DOM.div({'key':'fields'},[
|
||||
React.DOM.label({'key':'passphrase-label', 'htmlFor' :'passphrase'}, "passphrase"),
|
||||
React.DOM.input({'key':'passphrase', 'type':'password', 'name':'passphrase', 'ref':'passphrase', 'placeholder':"passphrase"})
|
||||
]),
|
||||
React.DOM.button({'key':'button', 'type':'submit', 'disabled':!this.shouldEnableUnlockButton(), 'className':'button'}, "unlock")
|
||||
]);
|
||||
},
|
||||
|
||||
// handlePINSubmit: function (event) {
|
||||
// event.preventDefault();
|
||||
|
||||
// this.refs['pin'].getDOMNode().blur();
|
||||
|
||||
// var credentials = {
|
||||
// pin: this.refs['pin'].getDOMNode().value
|
||||
// }
|
||||
|
||||
// MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'doLogin', credentials);
|
||||
// },
|
||||
|
||||
// pinForm: function () {
|
||||
// return React.DOM.form({'className':'pinForm pin', 'autoComplete':'off', 'onChange':this.handleChange, 'onSubmit':this.handlePINSubmit}, [
|
||||
// React.DOM.div({'key':'pinFormDiv'},[
|
||||
// React.DOM.label({'for':'pin'}, "pin"),
|
||||
// React.DOM.input({'type':'text', 'name':'pin', 'ref':'pin', placeholder:"PIN", 'key':'pin', 'autocapitalize':'none'})
|
||||
// ]),
|
||||
// React.DOM.button({'key':'submitButton', 'type':'submit', 'disabled':this.props.disabled, 'className':'button'}, "login")
|
||||
// ]);
|
||||
// },
|
||||
|
||||
setInitialFocus: function () {
|
||||
if (this.props.mode == 'PIN') {
|
||||
this.refs['pin'].getDOMNode().select();
|
||||
} else {
|
||||
this.refs['passphrase'].getDOMNode().select();
|
||||
}
|
||||
},
|
||||
|
||||
// showUrl: function (anUrl) {
|
||||
// return function () {
|
||||
// window.open(anUrl, 'clipperz_about');
|
||||
// }
|
||||
// },
|
||||
|
||||
render: function() {
|
||||
//console.log("LOGIN PAGE", this.props);
|
||||
return React.DOM.div({'key':'unlockForm', 'className':'unlockForm ' + this.props['style']}, [
|
||||
Clipperz.PM.UI.Components.AccountStatus(MochiKit.Base.update(this.props['proxyInfo'])),
|
||||
React.DOM.header({'key':'header'}, [
|
||||
React.DOM.h3({}, 'Type your passphrase to unlock'),
|
||||
]),
|
||||
React.DOM.div({'key':'formWrapper', 'className':'form'}, [
|
||||
this.props.mode == 'PIN' ? this.pinForm() : this.unlockForm(),
|
||||
]),
|
||||
React.DOM.footer({'key':'footer'}, [
|
||||
React.DOM.div({'key':'applicationVersion', 'className':'applicationVersion'}, [
|
||||
React.DOM.span({'key':'applicationVersionLabel'}, "application version"),
|
||||
React.DOM.a({'key':'applicationVersionLink', 'href':'https://github.com/clipperz/password-manager/commit/' + Clipperz_version, 'target':'github'}, Clipperz_version)
|
||||
])
|
||||
])
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
Clipperz.PM.UI.Components.Pages.UnlockPage = React.createFactory(Clipperz.PM.UI.Components.Pages.UnlockPageClass);
|
||||
@@ -81,7 +81,7 @@ Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanelClass = React.createClass({
|
||||
},
|
||||
|
||||
lock: function () {
|
||||
console.log("LOCK");
|
||||
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'lock');
|
||||
},
|
||||
|
||||
logout: function () {
|
||||
@@ -121,6 +121,9 @@ console.log("LOCK");
|
||||
if (aComponentName == 'OTP') {
|
||||
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'updateOTPListAndDetails');
|
||||
}
|
||||
if (aComponentName == 'Preferences') {
|
||||
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'updatePreferences');
|
||||
}
|
||||
|
||||
this.setState({
|
||||
'isFullyOpen':true,
|
||||
@@ -150,6 +153,9 @@ console.log("LOCK");
|
||||
React.DOM.li({'key':'account', 'className':this.state['index']['account'] ? 'open' : 'closed'}, [
|
||||
React.DOM.h1({'key':'accountH1', 'onClick':this.toggleIndexState('account')}, "Account"),
|
||||
React.DOM.ul({'key':'accountUL'}, [
|
||||
React.DOM.li({'key':'account_preferences', 'onClick':this.toggleExtraFeatureComponent('Preferences'), 'className':(this.state['extraFeatureComponentName'] == 'Preferences') ? 'selected' : ''}, [
|
||||
React.DOM.h2({'key':'account_preferences_h2'}, "Preferences"),
|
||||
]),
|
||||
React.DOM.li({'key':'account_1', 'onClick':this.toggleExtraFeatureComponent('Passphrase'), 'className':(this.state['extraFeatureComponentName'] == 'Passphrase') ? 'selected' : ''}, [
|
||||
React.DOM.h2({'key':'account_1_h2'}, "Passphrase"),
|
||||
// React.DOM.div({'key':'account_1_div'}, [
|
||||
@@ -280,7 +286,7 @@ console.log("LOCK");
|
||||
])
|
||||
]),
|
||||
React.DOM.li({'key':'logout', 'className':'lock-logout'}, [
|
||||
// React.DOM.h2({'className':'lock', 'onClick':this.lock}, "Lock"),
|
||||
React.DOM.h2({'className':'lock', 'onClick':this.lock}, "Lock"),
|
||||
React.DOM.h2({'className':'logout', 'onClick':this.logout}, "Logout"),
|
||||
])
|
||||
])
|
||||
|
||||
Reference in New Issue
Block a user