Move and merge UserSettings to react-sdk
This commit is contained in:
Kegan Dougal
parent
b89bd35cad
commit
e792ebb837
3 changed files with 2 additions and 126 deletions
|
|
@ -31,6 +31,7 @@ skin['rooms.RoomTile'] = require('../../components/views/rooms/RoomDNDView');
|
||||||
|
|
||||||
|
|
||||||
skin['structures.CreateRoom'] = require('matrix-react-sdk/lib/components/structures/CreateRoom');
|
skin['structures.CreateRoom'] = require('matrix-react-sdk/lib/components/structures/CreateRoom');
|
||||||
|
skin['structures.UserSettings'] = require('matrix-react-sdk/lib/components/structures/UserSettings');
|
||||||
|
|
||||||
// TODO: Fix this so matrix-react-sdk stuff is in react SDK skindex?
|
// TODO: Fix this so matrix-react-sdk stuff is in react SDK skindex?
|
||||||
skin['avatars.RoomAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/RoomAvatar');
|
skin['avatars.RoomAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/RoomAvatar');
|
||||||
|
|
@ -92,7 +93,6 @@ skin['organisms.RoomDirectory'] = require('./views/organisms/RoomDirectory');
|
||||||
skin['organisms.RoomList'] = require('./views/organisms/RoomList');
|
skin['organisms.RoomList'] = require('./views/organisms/RoomList');
|
||||||
skin['organisms.RoomSubList'] = require('./views/organisms/RoomSubList');
|
skin['organisms.RoomSubList'] = require('./views/organisms/RoomSubList');
|
||||||
skin['organisms.RoomView'] = require('./views/organisms/RoomView');
|
skin['organisms.RoomView'] = require('./views/organisms/RoomView');
|
||||||
skin['organisms.UserSettings'] = require('./views/organisms/UserSettings');
|
|
||||||
skin['organisms.ViewSource'] = require('./views/organisms/ViewSource');
|
skin['organisms.ViewSource'] = require('./views/organisms/ViewSource');
|
||||||
skin['pages.CompatibilityPage'] = require('./views/pages/CompatibilityPage');
|
skin['pages.CompatibilityPage'] = require('./views/pages/CompatibilityPage');
|
||||||
skin['pages.MatrixChat'] = require('./views/pages/MatrixChat');
|
skin['pages.MatrixChat'] = require('./views/pages/MatrixChat');
|
||||||
|
|
|
||||||
|
|
@ -1,124 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2015 OpenMarket 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';
|
|
||||||
|
|
||||||
var React = require('react');
|
|
||||||
var sdk = require('matrix-react-sdk')
|
|
||||||
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
|
|
||||||
|
|
||||||
var UserSettingsController = require('matrix-react-sdk/lib/controllers/organisms/UserSettings')
|
|
||||||
|
|
||||||
var Modal = require('matrix-react-sdk/lib/Modal');
|
|
||||||
|
|
||||||
module.exports = React.createClass({
|
|
||||||
displayName: 'UserSettings',
|
|
||||||
mixins: [UserSettingsController],
|
|
||||||
|
|
||||||
editAvatar: function() {
|
|
||||||
var url = MatrixClientPeg.get().mxcUrlToHttp(this.state.avatarUrl);
|
|
||||||
var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
|
|
||||||
var avatarDialog = (
|
|
||||||
<div>
|
|
||||||
<ChangeAvatar initialAvatarUrl={url} />
|
|
||||||
<div className="mx_Dialog_buttons">
|
|
||||||
<button onClick={this.onAvatarDialogCancel}>Cancel</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
this.avatarDialog = Modal.createDialogWithElement(avatarDialog);
|
|
||||||
},
|
|
||||||
|
|
||||||
addEmail: function() {
|
|
||||||
|
|
||||||
},
|
|
||||||
|
|
||||||
editDisplayName: function() {
|
|
||||||
this.refs.displayname.edit();
|
|
||||||
},
|
|
||||||
|
|
||||||
changePassword: function() {
|
|
||||||
var ChangePassword = sdk.getComponent('settings.ChangePassword');
|
|
||||||
Modal.createDialog(ChangePassword);
|
|
||||||
},
|
|
||||||
|
|
||||||
onLogoutClicked: function(ev) {
|
|
||||||
var LogoutPrompt = sdk.getComponent('dialogs.LogoutPrompt');
|
|
||||||
this.logoutModal = Modal.createDialog(LogoutPrompt, {onCancel: this.onLogoutPromptCancel});
|
|
||||||
},
|
|
||||||
|
|
||||||
onLogoutPromptCancel: function() {
|
|
||||||
this.logoutModal.closeDialog();
|
|
||||||
},
|
|
||||||
|
|
||||||
onAvatarDialogCancel: function() {
|
|
||||||
this.avatarDialog.close();
|
|
||||||
},
|
|
||||||
|
|
||||||
render: function() {
|
|
||||||
var Loader = sdk.getComponent("elements.Spinner");
|
|
||||||
switch (this.state.phase) {
|
|
||||||
case this.Phases.Loading:
|
|
||||||
return <Loader />
|
|
||||||
case this.Phases.Display:
|
|
||||||
var ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
|
|
||||||
var EnableNotificationsButton = sdk.getComponent('settings.EnableNotificationsButton');
|
|
||||||
return (
|
|
||||||
<div className="mx_UserSettings">
|
|
||||||
<div className="mx_UserSettings_User">
|
|
||||||
<h1>User Settings</h1>
|
|
||||||
<hr/>
|
|
||||||
<div className="mx_UserSettings_User_Inner">
|
|
||||||
<div className="mx_UserSettings_Avatar">
|
|
||||||
<div className="mx_UserSettings_Avatar_Text">Profile Photo</div>
|
|
||||||
<div className="mx_UserSettings_Avatar_Edit" onClick={this.editAvatar}>Edit</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="mx_UserSettings_DisplayName">
|
|
||||||
<ChangeDisplayName ref="displayname" />
|
|
||||||
<div className="mx_UserSettings_DisplayName_Edit" onClick={this.editDisplayName}>Edit</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="mx_UserSettings_3pids">
|
|
||||||
{this.state.threepids.map(function(val) {
|
|
||||||
return <div key={val.address}>{val.address}</div>;
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="mx_UserSettings_Add3pid" onClick={this.addEmail}>Add email</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="mx_UserSettings_Global">
|
|
||||||
<h1>Global Settings</h1>
|
|
||||||
<hr/>
|
|
||||||
<div className="mx_UserSettings_Global_Inner">
|
|
||||||
<div className="mx_UserSettings_ChangePassword" onClick={this.changePassword}>
|
|
||||||
Change Password
|
|
||||||
</div>
|
|
||||||
<div className="mx_UserSettings_ClientVersion">
|
|
||||||
Version {this.state.clientVersion}
|
|
||||||
</div>
|
|
||||||
<div className="mx_UserSettings_EnableNotifications">
|
|
||||||
<EnableNotificationsButton />
|
|
||||||
</div>
|
|
||||||
<div className="mx_UserSettings_Logout">
|
|
||||||
<button onClick={this.onLogoutClicked}>Sign Out</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
@ -129,7 +129,7 @@ module.exports = React.createClass({
|
||||||
var LeftPanel = sdk.getComponent('organisms.LeftPanel');
|
var LeftPanel = sdk.getComponent('organisms.LeftPanel');
|
||||||
var RoomView = sdk.getComponent('organisms.RoomView');
|
var RoomView = sdk.getComponent('organisms.RoomView');
|
||||||
var RightPanel = sdk.getComponent('organisms.RightPanel');
|
var RightPanel = sdk.getComponent('organisms.RightPanel');
|
||||||
var UserSettings = sdk.getComponent('organisms.UserSettings');
|
var UserSettings = sdk.getComponent('structures.UserSettings');
|
||||||
var CreateRoom = sdk.getComponent('structures.CreateRoom');
|
var CreateRoom = sdk.getComponent('structures.CreateRoom');
|
||||||
var RoomDirectory = sdk.getComponent('organisms.RoomDirectory');
|
var RoomDirectory = sdk.getComponent('organisms.RoomDirectory');
|
||||||
var MatrixToolbar = sdk.getComponent('molecules.MatrixToolbar');
|
var MatrixToolbar = sdk.getComponent('molecules.MatrixToolbar');
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue