antd layout

Author: lsaint

umi/config/config.js

@@ -6,7 +6,7 @@ export default {
     [
       'umi-plugin-react',
       {
-        antd: false,
+        antd: true,
         dva: true,
         dynamicImport: false,
         title: 'umi',

umi/package.json

@@ -4,22 +4,15 @@
     "start": "umi dev",
     "build": "umi build",
     "test": "umi test",
-    
     "lint": "eslint --ext .js src mock tests",
-    
-    
     "precommit": "lint-staged"
   },
   "dependencies": {
-    
     "dva": "^2.5.0-beta.2",
-    
-    
     "react": "^16.7.0",
     "react-dom": "^16.7.0"
   },
   "devDependencies": {
-    
     "babel-eslint": "^9.0.0",
     "eslint": "^5.4.0",
     "eslint-config-umi": "^1.4.0",
@@ -30,14 +23,14 @@
     "husky": "^0.14.3",
     "lint-staged": "^7.2.2",
     "react-test-renderer": "^16.7.0",
-    
     "umi": "^2.6.3",
     "umi-plugin-react": "^1.6.0"
-    
-    },
+  },
   "lint-staged": {
-    
-    "*.{js,jsx}": ["eslint --fix", "git add"]
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "git add"
+    ]
   },
   "engines": {
     "node": ">=8.0.0"

umi/src/layouts/index.js

@@ -1,20 +1,28 @@
-import styles from './index.css';
+import { Menu, Icon } from 'antd';
+import Link from 'umi/link';
+import withRouter from 'umi/withRouter';
 
-function BasicLayout(props) {
+function layout({ children, location }) {
   return (
-    <div className={styles.normal}>
-      <h1 className={styles.title}>Another day, Another dollor.</h1>
-      <ul className={styles.nav}>
-        <li>
-          <a href="/"> index</a>
-        </li>
-        <li>
-          <a href="/todos"> Todos</a>
-        </li>
-      </ul>
-      {props.children}
+    <div>
+      <Menu selectedKeys={[location.pathname]} mode="horizontal" theme="dark">
+        <Menu.Item key="/">
+          <Link to="/">
+            <Icon type="home" />
+            Home
+          </Link>
+        </Menu.Item>
+
+        <Menu.Item key="/todos">
+          <Link to="/todos">
+            <Icon type="bars" />
+            Todos
+          </Link>
+        </Menu.Item>
+      </Menu>
+      {children}
     </div>
   );
 }
 
-export default BasicLayout;
+export default withRouter(layout);

umi/src/pages/todos/index.css

@@ -26,7 +26,9 @@
 .todoClose {
   float: right;
   border-radius: 50%;
-  margin-left: 1rem;
+  font-size: 1px;
+  border: none;
+  background-color: grey;
 }
 
 .todoInsert {