add onLogout function

diff --git a/front-end/src/component/nav-top/index.jsx b/front-end/src/component/nav-top/index.jsx
index a9843b28ce4c9879297995dc473144bc8e1c271d..11caa9fee4806286c312f08d991b19e4b7fd45e1 100644 (file)
--- a/front-end/src/component/nav-top/index.jsx
+++ b/front-end/src/component/nav-top/index.jsx
@@ -3,17 +3,27 @@ import {Link}     from 'react-router-dom';
 
 import './index.css';
 import slonik from 'image/slonik.png'
-
+import PGUtil    from 'util/util.jsx'
+const _util = new PGUtil();
+import User         from 'service/user-service.jsx'
+const _user = new User();
 
 class NavTop extends React.Component {
     constructor(props) {
         super(props);
-        this.state = {isLoggedIn: true}
+        this.state = {
+            username: _util.getStorage('userInfo').username || ''
+        }
     }
 
-    // log out
-    onLogout() {
-        //todo
+    // logout
+    onLogout(){
+        _user.logout().then(res => {
+            _util.removeStorage('userInfo');
+            window.location.href = '/login';
+        }, errMsg => {
+            _util.errorTips(errMsg);
+        });
     }
 
     render() {

diff --git a/web/apps/users/views.py b/web/apps/users/views.py
index 5125a5130c0bf3ad6d4196ba7e414a83d797c699..fc6795f9b0fc61dc227c0c13a0de6996d1a8f24b 100644 (file)
--- a/web/apps/users/views.py
+++ b/web/apps/users/views.py
@@ -27,7 +27,7 @@ class CustomBackend(ModelBackend):
 
 class UserMachinePermission(permissions.BasePermission):
     """
-    Global permission check for blacklisted IPs.
+    Machine permission check
     """
 
     def has_permission(self, request, view):