From a651a210fb6f311f4d35db913a637b306c97b888 Mon Sep 17 00:00:00 2001
From: Hongyuan Ma <CS_MaleicAcid@163.com>
Date: Fri, 6 Jul 2018 22:26:09 +0800
Subject: [PATCH] remove branch col in table;debug login function

---
 front-end/src/component/nav-top/index.css |  3 ++-
 front-end/src/component/nav-top/index.jsx | 10 +++-------
 front-end/src/page/login/index.jsx        |  7 +++++--
 front-end/src/service/user-service.jsx    |  2 +-
 front-end/src/util/basic-table/index.jsx  | 11 +++++++----
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/front-end/src/component/nav-top/index.css b/front-end/src/component/nav-top/index.css
index 945baed..4676edc 100644
--- a/front-end/src/component/nav-top/index.css
+++ b/front-end/src/component/nav-top/index.css
@@ -105,7 +105,7 @@
 
 .navbar-right {
     margin-right: 0px!important;
-    line-height:61px;
+    /*line-height:61px;*/
 }
 
 .panel-title {
@@ -122,6 +122,7 @@
 .navbar-right .loggedin{
     margin-right: 0px!important;
     padding-right: 10px!important;
+    line-height: 60px;
 }
 
 .loggedin > a {
diff --git a/front-end/src/component/nav-top/index.jsx b/front-end/src/component/nav-top/index.jsx
index 11caa9f..69157fc 100644
--- a/front-end/src/component/nav-top/index.jsx
+++ b/front-end/src/component/nav-top/index.jsx
@@ -12,7 +12,8 @@ class NavTop extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
-            username: _util.getStorage('userInfo').username || ''
+            username: _util.getStorage('userInfo').username || '',
+            isLoggedIn: true
         }
     }
 
@@ -65,12 +66,7 @@ class NavTop extends React.Component {
         return (
             <div className="navbar navbar-default top-navbar" role="navigation">
                 <div className="navbar-header">
-                    {/*<button type="button" className="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">*/}
-                    {/*<span className="sr-only">Toggle navigation</span>*/}
-                    {/*<span className="icon-bar"></span>*/}
-                    {/*<span className="icon-bar"></span>*/}
-                    {/*<span className="icon-bar"></span>*/}
-                    {/*</button>*/}
+
                     <a className="navbar-brand" href="index.html"><img src={require('image/slonik.png')}/><b>PG Perf
                         Farm</b></a>
                 </div>
diff --git a/front-end/src/page/login/index.jsx b/front-end/src/page/login/index.jsx
index 5e29a7c..c2de98a 100644
--- a/front-end/src/page/login/index.jsx
+++ b/front-end/src/page/login/index.jsx
@@ -45,7 +45,8 @@ class Login extends React.Component {
                 _util.setStorage('userInfo', res);
                 this.props.history.push(this.state.redirect);
             }, (errMsg) => {
-                _util.errorTips(errMsg);
+                console.log(errMsg)
+                // _util.errorTips(errMsg);
             });
         }
         // check failure
@@ -74,15 +75,17 @@ class Login extends React.Component {
                                                 {/*<label className="control-label" for="inputLogin"> login input</label>*/}
                                                 <input type="text" className="form-control" id="inputLogin"
                                                        placeholder="Username or email"
+                                                       name="username"
                                                        onKeyUp={e => this.onInputKeyUp(e)}
                                                        onChange={e => this.onInputChange(e)}/>
                                             </div>
                                             <div className="form-group">
                                                 <input type="text" className="form-control" id="inputPwd"
+                                                       name="password"
                                                        placeholder="password" onKeyUp={e => this.onInputKeyUp(e)}
                                                        onChange={e => this.onInputChange(e)}/>
                                             </div>
-                                            <button type="submit" className="btn btn-primary"  onClick={e => {this.onSubmit(e)}}>Button</button>
+                                            <button type="button" className="btn btn-primary"  onClick={e => {this.onSubmit(e)}}>Button</button>
                                         </form>
                                     </div>
                                     {/*<!-- /.col-lg-6 (nested) -->*/}
diff --git a/front-end/src/service/user-service.jsx b/front-end/src/service/user-service.jsx
index 9668a5f..9f0c7c0 100644
--- a/front-end/src/service/user-service.jsx
+++ b/front-end/src/service/user-service.jsx
@@ -4,7 +4,7 @@ const _util       = new PGUtil();
 
 class User{
     login(loginInfo){
-        let url = PGConstant.base_url + '/login';
+        let url = PGConstant.base_url + '/login/';
         return _util.request({
             type: 'post',
             url: url,
diff --git a/front-end/src/util/basic-table/index.jsx b/front-end/src/util/basic-table/index.jsx
index 21f2474..c5677db 100644
--- a/front-end/src/util/basic-table/index.jsx
+++ b/front-end/src/util/basic-table/index.jsx
@@ -74,7 +74,7 @@ class BasicTable extends React.Component {
     }
 
     render() {
-
+        let branch = record.pg_info.pg_branch;
         let _list = this.props.list
         let style = {
             display: 'show'
@@ -83,7 +83,7 @@ class BasicTable extends React.Component {
             let machine = record.machine_info[0];
             let system = machine.os_name + ' ' + machine.os_version + ' ' + machine.comp_name + ' ' + machine.comp_version;
             let alias = machine.alias;
-            let branch = record.pg_info.pg_branch;
+
 
             let trend = record.trend
             let improvedIconClassName = trend.improved > 0 ? 'improved' : 'anonymous'
@@ -99,7 +99,7 @@ class BasicTable extends React.Component {
                     <Table.Cell><a href="#">{system}</a></Table.Cell>
 
                     {/*branch*/}
-                    <Table.Cell>{branch}</Table.Cell>
+                    {/*<Table.Cell>{branch}</Table.Cell>*/}
 
                     {/*trending-data*/}
 
@@ -134,10 +134,13 @@ class BasicTable extends React.Component {
         return (
             <Table celled structured compact textAlign='center'>
                 <Table.Header>
+                    <Table.Row>
+                        <Table.HeaderCell rowSpan='9'>Branch: 10_STABLE</Table.HeaderCell>
+                    </Table.Row>
                     <Table.Row>
                         <Table.HeaderCell rowSpan='2'>Alias</Table.HeaderCell>
                         <Table.HeaderCell rowSpan='2'>System</Table.HeaderCell>
-                        <Table.HeaderCell rowSpan='2'>Branch</Table.HeaderCell>
+                        {/*<Table.HeaderCell rowSpan='2'>Branch</Table.HeaderCell>*/}
                         <Table.HeaderCell colSpan='3'>Trending</Table.HeaderCell>
                         <Table.HeaderCell rowSpan='2'>Detail</Table.HeaderCell>
                         <Table.HeaderCell rowSpan='2'>Date</Table.HeaderCell>
-- 
2.39.5