diff options
Diffstat (limited to 'front-end/src')
| -rw-r--r-- | front-end/src/component/nav-top/index.jsx | 4 | ||||
| -rw-r--r-- | front-end/src/page/farmerApply/index.jsx | 4 | ||||
| -rw-r--r-- | front-end/src/page/home/index.jsx | 10 | ||||
| -rw-r--r-- | front-end/src/util/util.jsx | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/front-end/src/component/nav-top/index.jsx b/front-end/src/component/nav-top/index.jsx index 08a4e8d..f6a9bfb 100644 --- a/front-end/src/component/nav-top/index.jsx +++ b/front-end/src/component/nav-top/index.jsx @@ -69,7 +69,7 @@ class NavTop extends React.Component { } else { button = <li className="dropdown sign-in"> <Link to="/login" aria-expanded="false"> - Sign in + Log in </Link> </li>; } @@ -110,7 +110,7 @@ class NavTop extends React.Component { <li> <a href="#"> <div> - <i className="fa fa-tasks fa-fw"></i> Licence + <i className="fa fa-tasks fa-fw"></i> License {/*<span className="pull-right text-muted small">4 min</span>*/} </div> </a> diff --git a/front-end/src/page/farmerApply/index.jsx b/front-end/src/page/farmerApply/index.jsx index 43068e3..46a9a80 100644 --- a/front-end/src/page/farmerApply/index.jsx +++ b/front-end/src/page/farmerApply/index.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import {hashHistory} from 'React-router' +import {hashHistory} from 'react-router' import './index.css'; import {Link} from 'react-router-dom'; import UserInfoCard from 'component/userinfo-card/index.jsx' @@ -97,7 +97,7 @@ class FarmerApply extends React.Component { _user.farmerApply(machineInfo).then((res) => { // console.dir(res) alert('add machine success!') - hashHistory.push('/portal') + //hashHistory.push('/portal') // window.location.href = this.state.redirect; }, (err) => { // console.log(err) diff --git a/front-end/src/page/home/index.jsx b/front-end/src/page/home/index.jsx index 2bc2bd8..5022913 100644 --- a/front-end/src/page/home/index.jsx +++ b/front-end/src/page/home/index.jsx @@ -5,14 +5,12 @@ class Home extends React.Component{ render(){ return ( <div id="page-wrapper" className="jumbotron"> - <h1>Hello, world!</h1> + <h1>PostgreSQL Performance Farm</h1> <p> - The PostgreSQL Performance Farm project is a community project to collect performance data from tests as code changes are made to PostgreSQL. To support this effort, a database needs to be created for storing results, and a Web site developed to review results. - This project will focus on developing the Web site on top of the database. - The database will be using PostgreSQL in the back-end. Test results will come in the form of JSON and flat files. The Web application will be developed using the Django Web framework. + The PostgreSQL Performance Farm project is a community project to collect performance data from tests, as code changes are made to PostgreSQL. Test results come as JSON or flat files, and the server-side interface is deployed using the Django framework. </p> <p> - As an example, the PostgreSQL Build Farm site is a central repository for the results of testing source code changes for PostgreSQL as they occur, on a wide variety of platforms. + This website enables registered users to upload, browse and download test results for all machines. </p> {/*<button className="btn btn-warning">test</button>*/} @@ -21,4 +19,4 @@ class Home extends React.Component{ } } -export default Home;
\ No newline at end of file +export default Home; diff --git a/front-end/src/util/util.jsx b/front-end/src/util/util.jsx index 6a93479..fa4c504 100644 --- a/front-end/src/util/util.jsx +++ b/front-end/src/util/util.jsx @@ -11,7 +11,7 @@ class PGUtil { $.ajax({ type: param.type || 'get', url: param.url || '', - dataType: param.dataType || 'json', + dataType: param.dataType || 'jsonp', data: param.data || null, // headers: { // 'Authorization': 'Token ' + user.token |