llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use new account page.

Browse Source
This commit is contained in:
Yang Luo 2021-02-13 17:56:58 +08:00
parent e57590ab70
commit 34f87c78d8
2 changed files with 8 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/UserEditPage.js
View File

@ -26,8 +26,8 @@ class UserEditPage extends React.Component {
super(props); super(props);
this.state = { this.state = {
classes: props, classes: props,
organizationName: props.match.params.organizationName, organizationName: props.organizationName !== undefined ? props.organizationName : props.match.params.organizationName,
userName: props.match.params.userName, userName: props.userName !== undefined ? props.userName : props.match.params.userName,
user: null, user: null,
organizations: [], organizations: [],
}; };
@ -194,7 +194,10 @@ class UserEditPage extends React.Component {
organizationName: this.state.user.owner, organizationName: this.state.user.owner,
userName: this.state.user.name, userName: this.state.user.name,
}); });
if (this.props.history !== undefined) {
this.props.history.push(`/users/${this.state.user.owner}/${this.state.user.name}`); this.props.history.push(`/users/${this.state.user.owner}/${this.state.user.name}`);
}
} else { } else {
Setting.showMessage("error", `failed to save: server side failure`); Setting.showMessage("error", `failed to save: server side failure`);
this.updateUserField('owner', this.state.organizationName); this.updateUserField('owner', this.state.organizationName);

69
web/src/account/AccountPage.js
View File

@ -13,77 +13,12 @@
// limitations under the License. // limitations under the License.
import React from "react"; import React from "react";
import {Col, Descriptions, Row} from 'antd'; import UserEditPage from "../UserEditPage";
import * as AccountBackend from "../backend/AccountBackend";
import * as Setting from "../Setting";
class AccountPage extends React.Component { class AccountPage extends React.Component {
constructor(props) {
super(props);
this.state = {
classes: props,
username: props.match.params.username,
user: null,
};
}
componentWillMount() {
this.getUser();
}
getUser() {
if (this.state.username !== undefined) {
AccountBackend.getUser(this.state.username)
.then((user) => {
this.setState({
user: user,
});
});
}
}
renderValue(key) {
if (this.props.account === null || this.props.account === undefined) {
return <a href={"/login"}>Please sign in first</a>
} else if (this.state.user !== null) {
return this.state.user[key];
} else {
return this.props.account[key];
}
}
renderContent() {
return (
<div>
&nbsp;
<Descriptions title="My Account" bordered>
<Descriptions.Item label="Username">{this.renderValue("name")}</Descriptions.Item>
<Descriptions.Item label="Organization">{this.renderValue("owner")}</Descriptions.Item>
<Descriptions.Item label="Created At">{Setting.getFormattedDate(this.renderValue("createdTime"))}</Descriptions.Item>
<Descriptions.Item label="Password Type">{this.renderValue("passwordType")}</Descriptions.Item>
<Descriptions.Item label="Display Name">{this.renderValue("displayName")}</Descriptions.Item>
<Descriptions.Item label="E-mail">{this.renderValue("email")}</Descriptions.Item>
<Descriptions.Item label="Phone">{this.renderValue("phone")}</Descriptions.Item>
</Descriptions>
</div>
);
}
render() { render() {
return ( return (
<div> <UserEditPage organizationName={this.props.account.owner} userName={this.props.account.name} account={this.props.account} />
<Row style={{width: "100%"}}>
<Col span={1}>
</Col>
<Col span={22}>
{
this.renderContent()
}
</Col>
<Col span={1}>
</Col>
</Row>
</div>
) )
} }
} }