Update login system

Author: chachaxw

src/Page.tsx

@@ -15,6 +15,7 @@ const Page = ({ app }: any) => (
     <HashRouter>
         <Switch>
             <Route exact path="/" render={() => <Redirect to="/app/dashboard" push />} />
+            <Route exact path="/app" render={() => <Redirect to="/app/dashboard" push />} />
             <Route path="/login" component={Login} />
             <Route path="/app" render={(props: any) => <App app={app} {...props} />} />
             <Route path="/exception/403" component={NoPermission} />

src/components/Content/Content.tsx

@@ -6,13 +6,7 @@ interface InternalProps {
 }
 
 export default function Content(props: InternalProps) {
-  const styles = {
-    padding: '0 40px',
-  };
-
   return (
-    <Layout.Content style={styles} >
-      {props.children}
-    </Layout.Content>
+    <Layout.Content>{props.children}</Layout.Content>
   );
 }

src/components/Header/Header.tsx

@@ -1,29 +1,33 @@
 import { Avatar, Badge, Dropdown, Icon, Layout, Menu } from 'antd';
 import { connect } from 'dva';
 import Debounce from 'lodash-decorators/debounce';
-import React, { Component } from 'react';
+import React, { PureComponent } from 'react';
 
 import { UserInfo } from '../../models/global';
 import styles from './Header.module.scss';
 import NoticePane from './NoticePane';
 
 const { ItemGroup } = Menu;
 
-interface InternalProps {
+interface DvaProps {
+  logout: () => void;
+  loadMoreNotices: (params?: any) => void;
+}
+
+interface InternalProps extends DvaProps {
   notices: any[];
   userInfo: UserInfo;
   collapsed: boolean;
   hasMore: boolean;
   fetchingNotices: boolean;
-  loadMoreNotices: (params?: any) => void;
   onCollapse: (collapsed: boolean) => void;
 }
 
 interface InternalState {
   showNoticePane: boolean;
 }
 
-export class Header extends Component<InternalProps, InternalState> {
+export class Header extends PureComponent<InternalProps, InternalState> {
   private isFullScreen = false;
 
   private constructor(props: InternalProps) {
@@ -57,7 +61,7 @@ export class Header extends Component<InternalProps, InternalState> {
   }
 
   public signOut() {
-    // TODO: Need to finish sign out logic
+    this.props.logout();
   }
 
   public onVisibleChange(visible: boolean) {
@@ -139,6 +143,9 @@ const mapDispatchToProps = (dispatch: any) => {
         payload: collapsed,
       });
     },
+    logout: () => {
+      dispatch({type: 'global/logout'});
+    },
     loadMoreNotices: (params?: any) => {
       dispatch({
         type: 'global/fetchNotifications',

src/index.tsx

@@ -10,15 +10,20 @@ import { Global } from './models';
 import Page from './Page';
 import { errorHandle } from './utils/errorHandle';
 
-const logger = Env === EnvType.Development ? createLogger() : () => null;
+// Dva middleware
+const middleware = [];
+
+if (Env === EnvType.Development) {
+  middleware.push(createLogger());
+}
 
 const app: any = dva({
   onError(error: any) {
     // Catch redux action errors
     errorHandle(error, app._store.dispatch);
   },
 
-  onAction: [logger],
+  onAction: middleware,
 
   // 其他第三方 Reducer 配置
   extraReducers: {

src/models/global.ts

@@ -53,14 +53,15 @@ export default {
     *login(action: any, { call, put }: any) {
       try {
         const { payload } = action;
-        const res = yield call(GlobalService.auth, payload);
+        yield call(GlobalService.auth, payload);
         yield put({
           type: 'authorize',
           payload: {
             isAuthenticated: true,
             permissions: [],
           },
         });
+        yield put(routerRedux.push('/app'));
       } catch (error) {
         throw error;
       }

src/pages/Dashboard/Dashboard.module.scss

@@ -1,3 +1,3 @@
 .dashboard {
-
+  margin: 0 20px;
 }