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

Add login and account pages.

Browse Source
This commit is contained in:
Yang Luo 2021-02-13 01:33:06 +08:00
parent cdc1445883
commit 7304e62f95
7 changed files with 123 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
object/organization.go
View File

@ -26,7 +26,6 @@ type Organization struct {
DisplayName string `xorm:"varchar(100)" json:"displayName"`
WebsiteUrl string `xorm:"varchar(100)" json:"websiteUrl"`
Members []string `xorm:"varchar(100)" json:"members"`
}
func GetOrganizations(owner string) []*Organization {

16
web/src/App.js
View File

@ -28,6 +28,9 @@ import ProviderEditPage from "./ProviderEditPage";
import ApplicationListPage from "./ApplicationListPage";
import ApplicationEditPage from "./ApplicationEditPage";
import Face from "./Face";
import AccountPage from "./account/AccountPage";
import LoginPage from "./account/LoginPage";
import HomePage from "./HomePage";
const { Header, Footer } = Layout;
@ -175,9 +178,9 @@ class App extends Component {
renderMenu() {
let res = [];
// if (this.state.account === null || this.state.account === undefined) {
// return [];
// }
if (this.state.account === null || this.state.account === undefined) {
return [];
}
res.push(
<Menu.Item key="0">
@ -218,7 +221,7 @@ class App extends Component {
return res;
}
renderHomeIfLogined(component) {
renderHomeIfLoggedIn(component) {
if (this.state.account !== null && this.state.account !== undefined) {
return <Redirect to='/' />
} else {
@ -265,6 +268,9 @@ class App extends Component {
</Menu>
</Header>
<Switch>
<Route exact path="/login" render={(props) => this.renderHomeIfLoggedIn(<LoginPage onLoggedIn={this.onLoggedIn.bind(this)} {...props} />)}/>
<Route exact path="/" render={(props) => this.renderLoginIfNotLoggedIn(<HomePage onLoggedIn={this.onLoggedIn.bind(this)} {...props} />)}/>
<Route exact path="/account" render={(props) => this.renderLoginIfNotLoggedIn(<AccountPage account={this.state.account} {...props} />)}/>
<Route exact path="/organizations" render={(props) => this.renderLoginIfNotLoggedIn(<OrganizationListPage account={this.state.account} {...props} />)}/>
<Route exact path="/organizations/:organizationName" render={(props) => this.renderLoginIfNotLoggedIn(<OrganizationEditPage account={this.state.account} {...props} />)}/>
<Route exact path="/users" render={(props) => this.renderLoginIfNotLoggedIn(<UserListPage account={this.state.account} {...props} />)}/>
@ -303,7 +309,7 @@ class App extends Component {
if (this.isDoorPages()) {
return (
<Switch>
<Route exact path="/doors/:applicationName" component={Face}/>
<Route exact path="/doors/:applicationName" render={(props) => this.renderLoginIfNotLoggedIn(<Face account={this.state.account} onLoggedIn={this.onLoggedIn.bind(this)} {...props} />)}/>
</Switch>
)
}

4
web/src/ApplicationListPage.js
View File

@ -73,7 +73,7 @@ class ApplicationListPage extends React.Component {
title: 'Name',
dataIndex: 'name',
key: 'name',
width: '120px',
width: '150px',
sorter: (a, b) => a.name.localeCompare(b.name),
render: (text, record, index) => {
return (
@ -104,7 +104,7 @@ class ApplicationListPage extends React.Component {
title: 'Logo',
dataIndex: 'logo',
key: 'logo',
width: '100px',
width: '250px',
render: (text, record, index) => {
return (
<a target="_blank" href={text}>

2
web/src/Face.js
View File

@ -10,7 +10,7 @@ class Face extends React.Component {
super(props);
this.state = {
classes: props,
applicationName: props.match === undefined ? null : props.match.params.applicationName,
applicationName: props.applicationName !== undefined ? props.applicationName : (props.match === undefined ? null : props.match.params.applicationName),
application: null,
};
}

18
web/src/HomePage.js Normal file
View File

@ -0,0 +1,18 @@
import React from "react";
class HomePage extends React.Component {
constructor(props) {
super(props);
this.state = {
classes: props,
};
}
render() {
return (
"home"
)
}
}
export default HomePage;

77
web/src/account/AccountPage.js Normal file
View File

@ -0,0 +1,77 @@
import React from "react";
import {Col, Descriptions, Row} from 'antd';
import * as AccountBackend from "../backend/AccountBackend";
import * as Setting from "../Setting";
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() {
return (
<div>
<Row style={{width: "100%"}}>
<Col span={1}>
</Col>
<Col span={22}>
{
this.renderContent()
}
</Col>
<Col span={1}>
</Col>
</Row>
</div>
)
}
}
export default AccountPage;

12
web/src/account/LoginPage.js Normal file
View File

@ -0,0 +1,12 @@
import React from 'react';
import Face from "../Face";
class LoginPage extends React.Component {
render() {
return (
<Face applicationName={"app-built-in"} account={this.props.account} onLoggedIn={this.props.onLoggedIn.bind(this)} {...this.props} />
)
}
}
export default LoginPage;