mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Add a PostRegistration component; hook it up to MatrixChat.
This commit is contained in:
parent
99ccff098c
commit
1edea2a62c
@ -173,31 +173,12 @@ module.exports = React.createClass({
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
// TODO:
|
|
||||||
// This should really be a different component which MatrixChat then
|
|
||||||
// instantiates rather than having it pollute registration logic. There is
|
|
||||||
// no reason to wedge them together here. This function is currently NOT CALLED.
|
|
||||||
_getPostRegisterJsx: function() {
|
|
||||||
var ChangeDisplayName = sdk.getComponent('molecules.ChangeDisplayName');
|
|
||||||
var ChangeAvatar = sdk.getComponent('molecules.ChangeAvatar');
|
|
||||||
return (
|
|
||||||
<div className="mx_Login_profile">
|
|
||||||
Set a display name:
|
|
||||||
<ChangeDisplayName />
|
|
||||||
Upload an avatar:
|
|
||||||
<ChangeAvatar
|
|
||||||
initialAvatarUrl={MatrixClientPeg.get().mxcUrlToHttp(this.state.avatarUrl)} />
|
|
||||||
<button onClick={this.onProfileContinueClicked}>Continue</button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
|
|
||||||
_getRegisterContentJsx: function() {
|
_getRegisterContentJsx: function() {
|
||||||
var currStep = this.registerLogic.getStep();
|
var currStep = this.registerLogic.getStep();
|
||||||
var registerStep;
|
var registerStep;
|
||||||
switch (currStep) {
|
switch (currStep) {
|
||||||
case "Register.COMPLETE":
|
case "Register.COMPLETE":
|
||||||
return; // this._getPostRegisterJsx();
|
break; // NOP
|
||||||
case "Register.START":
|
case "Register.START":
|
||||||
case "Register.STEP_m.login.dummy":
|
case "Register.STEP_m.login.dummy":
|
||||||
registerStep = (
|
registerStep = (
|
||||||
|
@ -27,6 +27,7 @@ var Matrix = require("matrix-js-sdk");
|
|||||||
var ContextualMenu = require("../../../../ContextualMenu");
|
var ContextualMenu = require("../../../../ContextualMenu");
|
||||||
var Login = require("../../../../components/login/Login");
|
var Login = require("../../../../components/login/Login");
|
||||||
var Registration = require("../../../../components/login/Registration");
|
var Registration = require("../../../../components/login/Registration");
|
||||||
|
var PostRegistration = require("../../../../components/login/PostRegistration");
|
||||||
var config = require("../../../../../config.json");
|
var config = require("../../../../../config.json");
|
||||||
|
|
||||||
module.exports = React.createClass({
|
module.exports = React.createClass({
|
||||||
@ -109,6 +110,17 @@ module.exports = React.createClass({
|
|||||||
this.showScreen("login");
|
this.showScreen("login");
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onRegistered: function(credentials) {
|
||||||
|
this.onLoggedIn(credentials);
|
||||||
|
// do post-registration stuff
|
||||||
|
this.showScreen("post_registration");
|
||||||
|
},
|
||||||
|
|
||||||
|
onFinishPostRegistration: function() {
|
||||||
|
console.log("onFinishPostRegistration");
|
||||||
|
this.showScreen("settings");
|
||||||
|
},
|
||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
var LeftPanel = sdk.getComponent('organisms.LeftPanel');
|
var LeftPanel = sdk.getComponent('organisms.LeftPanel');
|
||||||
var RoomView = sdk.getComponent('organisms.RoomView');
|
var RoomView = sdk.getComponent('organisms.RoomView');
|
||||||
@ -119,7 +131,14 @@ module.exports = React.createClass({
|
|||||||
var MatrixToolbar = sdk.getComponent('molecules.MatrixToolbar');
|
var MatrixToolbar = sdk.getComponent('molecules.MatrixToolbar');
|
||||||
var Notifier = sdk.getComponent('organisms.Notifier');
|
var Notifier = sdk.getComponent('organisms.Notifier');
|
||||||
|
|
||||||
if (this.state.logged_in && this.state.ready) {
|
// needs to be before normal PageTypes as you are logged in technically
|
||||||
|
if (this.state.screen == 'post_registration') {
|
||||||
|
return (
|
||||||
|
<PostRegistration
|
||||||
|
onComplete={this.onFinishPostRegistration} />
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else if (this.state.logged_in && this.state.ready) {
|
||||||
var page_element;
|
var page_element;
|
||||||
var right_panel = "";
|
var right_panel = "";
|
||||||
|
|
||||||
@ -185,7 +204,7 @@ module.exports = React.createClass({
|
|||||||
hsUrl={config.default_hs_url}
|
hsUrl={config.default_hs_url}
|
||||||
isUrl={config.default_is_url}
|
isUrl={config.default_is_url}
|
||||||
registrationUrl={this.props.registrationUrl}
|
registrationUrl={this.props.registrationUrl}
|
||||||
onLoggedIn={this.onLoggedIn}
|
onLoggedIn={this.onRegistered}
|
||||||
onLoginClick={this.onLoginClick} />
|
onLoginClick={this.onLoginClick} />
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user