From f14c2a0a7119bd16209eb9f54a50d3249da0c035 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 5 May 2017 16:30:18 +0100 Subject: [PATCH 1/3] Implement PasswordNagBar This will tell the user that they need to set a password to return to their account. --- src/component-index.js | 6 +-- .../views/globals/PasswordNagBar.js | 47 +++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 src/components/views/globals/PasswordNagBar.js diff --git a/src/component-index.js b/src/component-index.js index 4bf0b0f984..c92437edd9 100644 --- a/src/component-index.js +++ b/src/component-index.js @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 2017 Vector Creations Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +20,6 @@ limitations under the License. * You can edit it you like, but your changes will be overwritten, * so you'd just be trying to swim upstream like a salmon. * You are not a salmon. - * - * To update it, run: - * ./reskindex.js -h header */ module.exports.components = require('matrix-react-sdk/lib/component-index').components; @@ -66,6 +64,8 @@ import views$globals$MatrixToolbar from './components/views/globals/MatrixToolba views$globals$MatrixToolbar && (module.exports.components['views.globals.MatrixToolbar'] = views$globals$MatrixToolbar); import views$globals$NewVersionBar from './components/views/globals/NewVersionBar'; views$globals$NewVersionBar && (module.exports.components['views.globals.NewVersionBar'] = views$globals$NewVersionBar); +import views$globals$PasswordNagBar from './components/views/globals/PasswordNagBar'; +views$globals$PasswordNagBar && (module.exports.components['views.globals.PasswordNagBar'] = views$globals$PasswordNagBar); import views$login$VectorCustomServerDialog from './components/views/login/VectorCustomServerDialog'; views$login$VectorCustomServerDialog && (module.exports.components['views.login.VectorCustomServerDialog'] = views$login$VectorCustomServerDialog); import views$login$VectorLoginFooter from './components/views/login/VectorLoginFooter'; diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js new file mode 100644 index 0000000000..03a95566df --- /dev/null +++ b/src/components/views/globals/PasswordNagBar.js @@ -0,0 +1,47 @@ +/* +Copyright 2017 Vector Creations Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +'use strict'; + +import React from 'react'; +import sdk from 'matrix-react-sdk'; +import Modal from 'matrix-react-sdk/lib/Modal'; + +export default React.createClass({ + onUpdateClicked: function() { + // TODO: Implement dialog to set password + // const SetPasswordDialog = sdk.getComponent('dialogs.SetPasswordDialog'); + // Modal.createDialog(SetPasswordDialog, { + // onFinished: () => { + // } + // }); + }, + + render: function() { + const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); + return ( +
+ /!\ +
+ To be able to return to your account, you need to set a password. +
+ +
+ ); + } +}); From c783f701ddc25897ab123406105a50daee0ac665 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 8 May 2017 10:01:18 +0100 Subject: [PATCH 2/3] reskindex --- src/component-index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/component-index.js b/src/component-index.js index c92437edd9..cdab24a40e 100644 --- a/src/component-index.js +++ b/src/component-index.js @@ -1,6 +1,5 @@ /* Copyright 2015, 2016 OpenMarket Ltd -Copyright 2017 Vector Creations Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +19,9 @@ limitations under the License. * You can edit it you like, but your changes will be overwritten, * so you'd just be trying to swim upstream like a salmon. * You are not a salmon. + * + * To update it, run: + * ./reskindex.js -h header */ module.exports.components = require('matrix-react-sdk/lib/component-index').components; From 5766a6e93d2c7525e36dfafde6ddd712835195ca Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 8 May 2017 10:02:05 +0100 Subject: [PATCH 3/3] Give warning icon better alt --- src/components/views/globals/PasswordNagBar.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js index 03a95566df..11168403dc 100644 --- a/src/components/views/globals/PasswordNagBar.js +++ b/src/components/views/globals/PasswordNagBar.js @@ -34,7 +34,12 @@ export default React.createClass({ const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); return (
- /!\ + Warning
To be able to return to your account, you need to set a password.