From eb5146013e2fb9550ea35959381b7a16826706e8 Mon Sep 17 00:00:00 2001
From: feixie-liam <xiefei0887@163.com>
Date: Fri, 14 Sep 2018 11:54:05 +0800
Subject: [PATCH 1/3] [Fei XIE/Yunzhi LIU][41]: optimize bootcamp layout style.

---
 .../bootcamp-background/my-design/bootcamp/index.js      | 9 +++++----
 src/style/common.css                                     | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/component/bootcamp-background/my-design/bootcamp/index.js b/src/component/bootcamp-background/my-design/bootcamp/index.js
index f835d12..cbd0dcd 100644
--- a/src/component/bootcamp-background/my-design/bootcamp/index.js
+++ b/src/component/bootcamp-background/my-design/bootcamp/index.js
@@ -5,20 +5,21 @@ import BootcampContent from './bootcamp-content'
 import BootcampFooter from './bootcamp-footer'
 
 import '../../../../style/bootcamp-background.css'
+import '../../../../style/common.css'
 
 const { Header, Content, Footer } = Layout
 
 export default class Index extends Component {
   render () {
     return (
-      <Layout>
-        <Header className={'bootcamp__header'}>
+      <Layout className='full-height'>
+        <Header className='bootcamp__header'>
           <BootcampHeader />
         </Header>
-        <Content className={'bootcamp__content'}>
+        <Content className='bootcamp__content'>
           <BootcampContent />
         </Content>
-        <Footer className={'bootcamp__footer'}>
+        <Footer className='bootcamp__footer'>
           <BootcampFooter />
         </Footer>
       </Layout>
diff --git a/src/style/common.css b/src/style/common.css
index c8a4682..216221a 100644
--- a/src/style/common.css
+++ b/src/style/common.css
@@ -1,3 +1,7 @@
 .margin--bottom {
     margin-bottom: 20px;
+}
+
+.full-height {
+    height: 100%;
 }
\ No newline at end of file
-- 
Gitee


From ff8b85a22cff83beca94b302ed346f3fa7e4f66f Mon Sep 17 00:00:00 2001
From: Yunzhi Liu <liu_yun_zhi@163.com>
Date: Fri, 14 Sep 2018 14:52:45 +0800
Subject: [PATCH 2/3] [Yunzhi LIU/Fei XIE][38\42]: Add cancel event.

---
 .../my-design/bootcamp/bootcamp-header.js          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/component/bootcamp-background/my-design/bootcamp/bootcamp-header.js b/src/component/bootcamp-background/my-design/bootcamp/bootcamp-header.js
index 6fe8dbc..12874f8 100644
--- a/src/component/bootcamp-background/my-design/bootcamp/bootcamp-header.js
+++ b/src/component/bootcamp-background/my-design/bootcamp/bootcamp-header.js
@@ -42,6 +42,12 @@ class BootcampHeader extends Component {
     })
   }
 
+  cancelAddCollaborator = () => {
+    this.setState({
+      isAddCollaborator: false
+    })
+  }
+
   changeEditable = (data) => {
     if (!data.editable) {
       data = Object.assign(data, { editable: !data.editable, replicable: true })
@@ -66,6 +72,12 @@ class BootcampHeader extends Component {
     })
   }
 
+  cancelAuthorization = () => {
+    this.setState({
+      isAuthorization: false
+    })
+  }
+
   render() {
     return (
       <Row>
@@ -82,6 +94,7 @@ class BootcampHeader extends Component {
           <Modal
             visible={this.state.isAddCollaborator}
             closable={false}
+            onCancel={this.cancelAddCollaborator}
             footer={[
               <Button key='submit' type='primary' onClick={this.handleAddCollaborator}>
                 邀请协作
@@ -95,6 +108,7 @@ class BootcampHeader extends Component {
             title='设置可见权限'
             visible={this.state.isAuthorization}
             closable={false}
+            onCancel={this.cancelAuthorization}
             footer={[
               <Button key='submit' type='primary' onClick={this.handleAuthorization}>
                 确定
-- 
Gitee


From 432104180f1a67854163dfb077ef454e340d0139 Mon Sep 17 00:00:00 2001
From: Yunzhi Liu <liu_yun_zhi@163.com>
Date: Fri, 14 Sep 2018 15:19:46 +0800
Subject: [PATCH 3/3] [Yunzhi LIU/Fei XIE]: Format style.

---
 package.json                                  |  6 +-
 .../my-design/bootcamp-card.js                |  1 -
 .../my-design/bootcamp-creator.js             |  4 +-
 .../my-design/bootcamp/bootcamp-content.js    | 19 +++---
 .../my-design/bootcamp/bootcamp-header.js     |  6 +-
 .../my-design/bootcamp/quiz-table.js          |  2 +-
 .../my-design/bootcamp/task-card.js           |  5 +-
 src/component/tws-layout/notification.js      | 68 +++++++++----------
 src/component/tws-layout/tws-bread-crumb.js   |  6 +-
 src/registerServiceWorker.js                  | 52 +++++++-------
 10 files changed, 85 insertions(+), 84 deletions(-)

diff --git a/package.json b/package.json
index b64709c..f16b8e2 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "remarkable": "^1.7.1"
   },
   "standard": {
+    "parser": "babel-eslint",
     "globals": [
       "describe",
       "it",
@@ -42,9 +43,12 @@
     "start": "react-app-rewired start",
     "build": "react-app-rewired build",
     "test": "react-app-rewired test --env=jsdom",
-    "eject": "react-app-rewired eject"
+    "eject": "react-app-rewired eject",
+    "standardCheck": "standard src/**/*.js",
+    "standardFix": "standard --fix src/**/*.js"
   },
   "devDependencies": {
+    "babel-eslint": "^9.0.0",
     "babel-plugin-import": "^1.6.0",
     "react-app-rewire-less": "^2.0.7",
     "react-app-rewired": "^1.3.1",
diff --git a/src/component/bootcamp-background/my-design/bootcamp-card.js b/src/component/bootcamp-background/my-design/bootcamp-card.js
index 1b361d1..ce87139 100644
--- a/src/component/bootcamp-background/my-design/bootcamp-card.js
+++ b/src/component/bootcamp-background/my-design/bootcamp-card.js
@@ -12,7 +12,6 @@ const menu = (
 )
 
 export default class BootcampCard extends Component {
-
   handleMenuClick = (e) => {
     message.info('Click on menu item.')
     console.log('click', e)
diff --git a/src/component/bootcamp-background/my-design/bootcamp-creator.js b/src/component/bootcamp-background/my-design/bootcamp-creator.js
index b3fb255..c2ee215 100644
--- a/src/component/bootcamp-background/my-design/bootcamp-creator.js
+++ b/src/component/bootcamp-background/my-design/bootcamp-creator.js
@@ -21,13 +21,13 @@ export default class BootcampCreator extends Component {
 
   handleOk = () => {
     this.setState({
-      visible: false,
+      visible: false
     })
   }
 
   handleCancel = () => {
     this.setState({
-      visible: false,
+      visible: false
     })
   }
 
diff --git a/src/component/bootcamp-background/my-design/bootcamp/bootcamp-content.js b/src/component/bootcamp-background/my-design/bootcamp/bootcamp-content.js
index ac4d74d..822bab9 100644
--- a/src/component/bootcamp-background/my-design/bootcamp/bootcamp-content.js
+++ b/src/component/bootcamp-background/my-design/bootcamp/bootcamp-content.js
@@ -3,8 +3,8 @@ import { Button, Modal } from 'antd'
 import TaskCardFrom from './task-card-form'
 import TaskCard from './task-card'
 
-class BootcampContent extends Component{
-  constructor(props) {
+class BootcampContent extends Component {
+  constructor (props) {
     super(props)
     this.state = { display: false, taskCardNumber: [] }
   }
@@ -15,32 +15,31 @@ class BootcampContent extends Component{
     })
   }
 
-
   handleButtonOk = () => {
     const taskCard = this.state.taskCardNumber
     taskCard.push(1)
     this.setState({
       display: false,
       taskCardNumber: taskCard
-    });
+    })
   }
 
   handleCancel = () => {
     this.setState({
-      display: false,
-    });
+      display: false
+    })
   }
 
   render () {
     return (
       <div>
         <div style={{marginTop: '20px', marginLeft: '30px'}}>
-          {this.state.taskCardNumber.map((taskCard) => {return <TaskCard/>})}
+          {this.state.taskCardNumber.map((taskCard) => { return <TaskCard /> })}
         </div>
-        <Button style={{marginTop: '20px', marginLeft: '30px'}} size="large" icon={'plus'}
-                onClick={this.showButtonModal}>新增任务卡</Button>
+        <Button style={{marginTop: '20px', marginLeft: '30px'}} size='large' icon={'plus'}
+          onClick={this.showButtonModal}>新增任务卡</Button>
         <Modal
-          title="新建任务卡"
+          title='新建任务卡'
           visible={this.state.display}
           onOk={this.handleButtonOk}
           onCancel={this.handleCancel}
diff --git a/src/component/bootcamp-background/my-design/bootcamp/bootcamp-header.js b/src/component/bootcamp-background/my-design/bootcamp/bootcamp-header.js
index 12874f8..1742822 100644
--- a/src/component/bootcamp-background/my-design/bootcamp/bootcamp-header.js
+++ b/src/component/bootcamp-background/my-design/bootcamp/bootcamp-header.js
@@ -4,7 +4,7 @@ import CollaboratorTabs from './collaborator-tabs'
 import data from '../../../../mock-data/authorization-data'
 
 class BootcampHeader extends Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
     this.state = { isAddCollaborator: false, isAuthorization: false, data: data }
     this.columns = [{
@@ -78,7 +78,7 @@ class BootcampHeader extends Component {
     })
   }
 
-  render() {
+  render () {
     return (
       <Row>
         <Col span={4}>
@@ -98,7 +98,7 @@ class BootcampHeader extends Component {
             footer={[
               <Button key='submit' type='primary' onClick={this.handleAddCollaborator}>
                 邀请协作
-              </Button>,
+              </Button>
             ]}
           >
             <CollaboratorTabs />
diff --git a/src/component/bootcamp-background/my-design/bootcamp/quiz-table.js b/src/component/bootcamp-background/my-design/bootcamp/quiz-table.js
index 6771fab..d51778b 100644
--- a/src/component/bootcamp-background/my-design/bootcamp/quiz-table.js
+++ b/src/component/bootcamp-background/my-design/bootcamp/quiz-table.js
@@ -58,7 +58,7 @@ const QuizTable = () => {
           <Search enterButton='搜索' />
         </Col>
       </Row>
-      <Table rowSelection={rowSelection} columns={columns} dataSource={data} bordered/>
+      <Table rowSelection={rowSelection} columns={columns} dataSource={data} bordered />
     </div>
   )
 }
diff --git a/src/component/bootcamp-background/my-design/bootcamp/task-card.js b/src/component/bootcamp-background/my-design/bootcamp/task-card.js
index 4a597ea..91dbfa4 100644
--- a/src/component/bootcamp-background/my-design/bootcamp/task-card.js
+++ b/src/component/bootcamp-background/my-design/bootcamp/task-card.js
@@ -1,13 +1,12 @@
 import React, { Component } from 'react'
 import { Row, Col, Card, Button, Icon, Input, Form, Select, Modal } from 'antd'
-
-import QuizTable from './quiz-table';
+import QuizTable from './quiz-table'
 
 const FormItem = Form.Item
 const Option = Select.Option
 
 export default class TaskCard extends Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
     this.state = { isShowNewQuiz: false, isShowQuizRecourse: false }
   }
diff --git a/src/component/tws-layout/notification.js b/src/component/tws-layout/notification.js
index a6cb257..399f46d 100644
--- a/src/component/tws-layout/notification.js
+++ b/src/component/tws-layout/notification.js
@@ -2,47 +2,47 @@ import React, {Component} from 'react'
 import {Badge, Icon, Popover} from 'antd'
 
 class Notification extends Component {
-    state = {
-        clicked: false,
-        hovered: false,
-    };
+  state = {
+    clicked: false,
+    hovered: false
+  };
 
-    handleHoverChange = (visible) => {
-        this.setState({
-            hovered: visible,
-            clicked: false,
-        });
-    }
+  handleHoverChange = (visible) => {
+    this.setState({
+      hovered: visible,
+      clicked: false
+    })
+  }
 
-    render() {
-        const hoverContent = (<div style={{width: '400px'}}>
-                {
-                    <p className= 'messageStyle'>
-                        <div>暂无最新消息</div>
-                    </p>
+  render () {
+    const hoverContent = (<div style={{width: '400px'}}>
+      {
+        <p className='messageStyle'>
+          <div>暂无最新消息</div>
+        </p>
                 }
-                <p className='moreStyle'>
-                    <a href='/href'>
+      <p className='moreStyle'>
+        <a href='/href'>
                         查看全部
                     </a>
-                </p>
-            </div>
+      </p>
+    </div>
         )
-        return (
-            <Popover
-                content={hoverContent}
-                title="最新消息"
-                trigger="hover"
-                placement="bottom"
-                visible={this.state.hovered}
-                onVisibleChange={this.handleHoverChange}
-                arrowPointAtCenter
+    return (
+      <Popover
+        content={hoverContent}
+        title='最新消息'
+        trigger='hover'
+        placement='bottom'
+        visible={this.state.hovered}
+        onVisibleChange={this.handleHoverChange}
+        arrowPointAtCenter
             >
-                <Badge count={0}>
-                    <Icon type="bell" className='popover-badge-icon'/>
-                </Badge>
-            </Popover>)
-    }
+        <Badge count={0}>
+          <Icon type='bell' className='popover-badge-icon' />
+        </Badge>
+      </Popover>)
+  }
 }
 
 export default Notification
diff --git a/src/component/tws-layout/tws-bread-crumb.js b/src/component/tws-layout/tws-bread-crumb.js
index dc3c05b..607b87e 100644
--- a/src/component/tws-layout/tws-bread-crumb.js
+++ b/src/component/tws-layout/tws-bread-crumb.js
@@ -2,13 +2,13 @@ import React, { Component } from 'react'
 import { Breadcrumb } from 'antd'
 import { withRouter } from 'react-router-dom'
 
-const defaultBreadCrumbs = ['训练营', '训练营后台', '我设计的训练营'];
+const defaultBreadCrumbs = ['训练营', '训练营后台', '我设计的训练营']
 
 class TwsBreadCrumb extends Component {
   state = {
     breadCrumbs: defaultBreadCrumbs
   };
-  render() {
+  render () {
     return (
       <Breadcrumb className='content-breadcrumb'>
         {
@@ -25,4 +25,4 @@ class TwsBreadCrumb extends Component {
   }
 }
 
-export default withRouter(TwsBreadCrumb)
\ No newline at end of file
+export default withRouter(TwsBreadCrumb)
diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js
index 4a3ccf0..693ac91 100644
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -16,39 +16,39 @@ const isLocalhost = Boolean(
     window.location.hostname.match(
       /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
     )
-);
+)
 
-export default function register() {
+export default function register () {
   if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
     // The URL constructor is available in all browsers that support SW.
-    const publicUrl = new URL(process.env.PUBLIC_URL, window.location);
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location)
     if (publicUrl.origin !== window.location.origin) {
       // Our service worker won't work if PUBLIC_URL is on a different origin
       // from what our page is served on. This might happen if a CDN is used to
       // serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374
-      return;
+      return
     }
 
     window.addEventListener('load', () => {
-      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`
 
       if (!isLocalhost) {
         // Is not local host. Just register service worker
-        registerValidSW(swUrl);
+        registerValidSW(swUrl)
       } else {
         // This is running on localhost. Lets check if a service worker still exists or not.
-        checkValidServiceWorker(swUrl);
+        checkValidServiceWorker(swUrl)
       }
-    });
+    })
   }
 }
 
-function registerValidSW(swUrl) {
+function registerValidSW (swUrl) {
   navigator.serviceWorker
     .register(swUrl)
     .then(registration => {
       registration.onupdatefound = () => {
-        const installingWorker = registration.installing;
+        const installingWorker = registration.installing
         installingWorker.onstatechange = () => {
           if (installingWorker.state === 'installed') {
             if (navigator.serviceWorker.controller) {
@@ -56,23 +56,23 @@ function registerValidSW(swUrl) {
               // the fresh content will have been added to the cache.
               // It's the perfect time to display a "New content is
               // available; please refresh." message in your web app.
-              console.log('New content is available; please refresh.');
+              console.log('New content is available; please refresh.')
             } else {
               // At this point, everything has been precached.
               // It's the perfect time to display a
               // "Content is cached for offline use." message.
-              console.log('Content is cached for offline use.');
+              console.log('Content is cached for offline use.')
             }
           }
-        };
-      };
+        }
+      }
     })
     .catch(error => {
-      console.error('Error during service worker registration:', error);
-    });
+      console.error('Error during service worker registration:', error)
+    })
 }
 
-function checkValidServiceWorker(swUrl) {
+function checkValidServiceWorker (swUrl) {
   // Check if the service worker can be found. If it can't reload the page.
   fetch(swUrl)
     .then(response => {
@@ -84,25 +84,25 @@ function checkValidServiceWorker(swUrl) {
         // No service worker found. Probably a different app. Reload the page.
         navigator.serviceWorker.ready.then(registration => {
           registration.unregister().then(() => {
-            window.location.reload();
-          });
-        });
+            window.location.reload()
+          })
+        })
       } else {
         // Service worker found. Proceed as normal.
-        registerValidSW(swUrl);
+        registerValidSW(swUrl)
       }
     })
     .catch(() => {
       console.log(
         'No internet connection found. App is running in offline mode.'
-      );
-    });
+      )
+    })
 }
 
-export function unregister() {
+export function unregister () {
   if ('serviceWorker' in navigator) {
     navigator.serviceWorker.ready.then(registration => {
-      registration.unregister();
-    });
+      registration.unregister()
+    })
   }
 }
-- 
Gitee