Fixed style

Author: LyricTian

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gin-admin-react",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "RBAC权限管理脚手架",
   "private": true,
   "scripts": {

src/layouts/AdminLayout.js

@@ -248,7 +248,7 @@ class AdminLayout extends React.PureComponent {
     const GlobalContext = GetGlobalContext();
 
     const menu = (
-      <Menu className={classNames('menu')} selectedKeys={[]} onClick={this.onMenuClick}>
+      <Menu className="menu" selectedKeys={[]} onClick={this.onMenuClick}>
         <Menu.Item key="updatepwd">
           <LockOutlined />
           修改密码
@@ -274,9 +274,9 @@ class AdminLayout extends React.PureComponent {
           breakpoint="lg"
           onCollapse={this.onCollapse}
           width={siderWidth}
-          className={classNames('sider')}
+          className="sider"
         >
-          <div className={classNames('logo')}>
+          <div className="logo">
             <Link to="/">
               <img src={logo} alt="logo" />
               <h1>{title}</h1>
@@ -294,7 +294,13 @@ class AdminLayout extends React.PureComponent {
           </Menu>
         </Sider>
         <Layout>
-          <Header className={classNames('header')}>
+          <Header
+            className={classNames('header')}
+            style={{
+              paddingLeft: 12,
+              paddingRight: 12,
+            }}
+          >
             <div className={classNames('foldout')} onClick={() => this.onCollapse()}>
               {collapsed ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />}
             </div>

src/layouts/AdminLayout.less

@@ -1,20 +1,18 @@
 @import '~antd/lib/style/themes/default.less';
 
 .header {
-  padding: 0 12px 0 0;
-  background: #002140;
-  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
   position: relative;
 }
 
 .logo {
   height: 64px;
   position: relative;
   line-height: 64px;
-  padding-left: (@menu-collapsed-width - 32px) / 2;
   transition: all 0.3s;
   background: #002140;
   overflow: hidden;
+  text-align: center;
   img {
     display: inline-block;
     vertical-align: middle;
@@ -38,7 +36,7 @@
   cursor: pointer;
   transition: all 0.3s;
   padding: 0 24px;
-  margin-left: -50px;
+  margin-left: -12px;
   &:hover {
     background: #072f53;
   }
@@ -86,19 +84,12 @@
   }
 }
 
-.menu {
-  :global(.anticon) {
-    margin-right: 8px;
-  }
-}
-
 .sider {
   position: relative;
   z-index: 10;
   min-height: 100vh;
-  box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
 }
 
 .content {
-  padding: 24px;
+  padding: 25px 10px;
 }

src/models/login.js

@@ -52,23 +52,34 @@ export default {
             type: 'saveStatus',
             payload: response.status >= 500 ? 'ERROR' : 'FAIL',
           }),
+          put({
+            type: 'changeSubmitting',
+            payload: false,
+          }),
+          put({
+            type: 'loadCaptcha',
+          }),
         ];
-        yield put({
-          type: 'changeSubmitting',
-          payload: false,
-        });
-        yield put({
-          type: 'loadCaptcha',
-        });
         return;
       }
 
       // 保存访问令牌
       store.setAccessToken(response);
-      yield put({
-        type: 'changeSubmitting',
-        payload: false,
-      });
+
+      yield [
+        put({
+          type: 'saveTip',
+          payload: '',
+        }),
+        put({
+          type: 'saveStatus',
+          payload: '',
+        }),
+        put({
+          type: 'changeSubmitting',
+          payload: false,
+        }),
+      ];
 
       const params = parse(window.location.href.split('?')[1]);
       const { redirect } = params;

src/pages/Dashboard/Home.js

@@ -69,7 +69,7 @@ class Home extends PureComponent {
       >
         <Card>
           <Alert
-            message="gin-admin 5.2.1 现已发布，欢迎使用 gin-admin-cli 启动体验。"
+            message="gin-admin 6.0.0 现已发布，欢迎使用 gin-admin-cli 启动体验。"
             type="success"
             showIcon
             banner
@@ -100,8 +100,8 @@ class Home extends PureComponent {
           </Typography.Text>
           <CodePreview>cd ~/go/src/gin-admin</CodePreview>
           <CodePreview>
-            go run cmd/server/main.go -c ./configs/config.toml -m ./configs/model.conf -swagger
-            ./docs/swagger -menu ./configs/menu.json
+            go run cmd/gin-admin/main.go web -c ./configs/config.toml -m ./configs/model.conf --menu
+            ./configs/menu.yaml
           </CodePreview>
           <Typography.Text
             strong