Merge branch 'master' of http://gogs.ioobot.com:6680/xy/online

src/components/app/App.jsx

@@ -161,6 +161,7 @@ class App extends Component {
                                         <GraphqlSidebar inlineCollapsed={this.state.inlineCollapsed}
                                                         sideBar={this.state.sideBar} switchMenu={this.switchMenu}
                                                         userID={this.state.userID} showModal={this.showModal}/>
+
                                     </Sider>
                                 );
                             case 'wechat-service':
@@ -190,12 +191,12 @@ class App extends Component {
                                                 position: 'fixed'
                                             }}
                                         >
-                                            <SubMenu key="trial-case"
-                                                     title={<span><Icon type="appstore" theme="twoTone"/><span>Trial Case</span></span>}>
-                                                <Menu.Item key="wechat"><Link
-                                                    to="/wechat-service/trial-case/wechat case">wechat
-                                                    case</Link></Menu.Item>
-                                            </SubMenu>
+                                            {/*<SubMenu key="trial-case"*/}
+                                                     {/*title={<span><Icon type="appstore" theme="twoTone"/><span>Trial Case</span></span>}>*/}
+                                                {/*<Menu.Item key="wechat"><Link*/}
+                                                    {/*to="/wechat-service/trial-case/wechat case">wechat*/}
+                                                    {/*case</Link></Menu.Item>*/}
+                                            {/*</SubMenu>*/}
 
                                             <SubMenu key="my-create"
                                                      title={<span><Icon type="user"
@@ -204,6 +205,13 @@ class App extends Component {
                                                     to="/wechat-service/my-create/my wechat">my
                                                     wechat</Link></Menu.Item>
                                             </SubMenu>
+
+                                            <Menu.Item key="instructions" >
+                                                <a href="https://ioobot-document.netlify.com/" title="instructions" target="instructions">
+                                                    <Icon type="file-text" theme="twoTone" />
+                                                    <span>Instructions</span>
+                                                </a>
+                                            </Menu.Item>
                                         </Menu>
                                     </Sider>
                                 );
@@ -235,17 +243,24 @@ class App extends Component {
                                             }}
                                         >
                                             <SubMenu key="trial-case"
-                                                     title={<span><Icon type="appstore" theme="twoTone"/><span>Trial Case</span></span>}>
+                                                     title={<span><Icon type="appstore" theme="twoTone"/><span>Case Show</span></span>}>
                                                 <Menu.Item key="quant-service"><Link to="/quant-service/">quant
                                                     case</Link></Menu.Item>
                                             </SubMenu>
 
-                                            <SubMenu key="my-create"
-                                                     title={<span><Icon type="user"
-                                                                        theme="outlined"/><span>My Create</span></span>}>
-                                                <Menu.Item key="my quant"><Link to="/quant-service/">my
-                                                    quant</Link></Menu.Item>
-                                            </SubMenu>
+                                            {/*<SubMenu key="my-create"*/}
+                                                     {/*title={<span><Icon type="user"*/}
+                                                                        {/*theme="outlined"/><span>My Create</span></span>}>*/}
+                                                {/*<Menu.Item key="my quant"><Link to="/quant-service/">my*/}
+                                                    {/*quant</Link></Menu.Item>*/}
+                                            {/*</SubMenu>*/}
+
+                                            <Menu.Item key="instructions" >
+                                                <a href="https://ioobot-document.netlify.com/" title="instructions" target="instructions">
+                                                    <Icon type="file-text" theme="twoTone" />
+                                                    <span>Instructions</span>
+                                                </a>
+                                            </Menu.Item>
                                         </Menu>
                                     </Sider>
                                 );
@@ -320,8 +335,6 @@ class App extends Component {
                             </Switch>
                         </Layout>
                     </LocaleProvider>
-
-                    
                 </Layout>
             </Router>
         );
@@ -369,7 +382,7 @@ class GraphqlSidebar extends Component {
                                     position: 'fixed'
                                 }}
                             >
-                                <SubMenu key="trial-case" title={<span><Icon type="appstore" theme="twoTone"/><span>Trial Case</span></span>}>
+                                <SubMenu key="trial-case" title={<span><Icon type="appstore" theme="twoTone"/><span>Case Show</span></span>}>
                                     {
                                         data.caseSchema.map((schema) =>
                                             <Menu.Item key={schema.schemaName}>
@@ -409,6 +422,14 @@ class GraphqlSidebar extends Component {
                                             </Menu.Item>)
                                     }
                                 </SubMenu>
+
+                                <Menu.Item key="instructions" >
+                                    <a href="https://ioobot-document.netlify.com/" title="instructions" target="instructions">
+                                        <Icon type="file-text" theme="twoTone" />
+                                        <span>Instructions</span>
+                                    </a>
+                                </Menu.Item>
+
                             </Menu>
 
                         )

src/components/common/caseMetabase/CaseMetabase.jsx

@@ -6,7 +6,7 @@ class CaseMetabase extends Component {
     render() {
         return (
             <div>
-                Case Metabase
+                Only members to use this website.
             </div>
         )
     }

src/components/quantService/QuantService.jsx

@@ -4,7 +4,7 @@ import {Layout, Menu} from 'antd';
 
 import QuantConfig from "./quantConfig/QuantConfig";
 import Deploy from "../common/deploy/Deploy";
-import QuantManage from "./quantManage/QuantManage";
+import QuantResult from "./quantResult/QuantResult";
 
 const { Content } = Layout;
 
@@ -35,7 +35,7 @@ class QuantService extends Component {
                 >
                     <Menu.Item key="quant-config">config settings</Menu.Item>
                     <Menu.Item key="quant-deploy">deploy settings</Menu.Item>
-                    <Menu.Item key="quant-manage">manage</Menu.Item>
+                    <Menu.Item key="quant-result">result</Menu.Item>
                 </Menu>
 
                 <Layout style={{ padding: '24px', zIndex: '0'}}>
@@ -46,8 +46,8 @@ class QuantService extends Component {
                                     return <QuantConfig />;
                                 case 'quant-deploy':
                                     return <Deploy />;
-                                case 'quant-manage':
-                                    return <QuantManage />;
+                                case 'quant-result':
+                                    return <QuantResult />;
                                 default:
                                     return <QuantConfig />
                             }

src/components/quantService/quantManage/QuantManage.jsx → src/components/quantService/quantResult/QuantResult.jsx

@@ -1,14 +1,14 @@
 import React, {Component} from 'react';
 
-class QuantManage extends Component {
+class QuantResult extends Component {
 
     render() {
         return (
             <div>
-                Quant Manage
+                Quant Result
             </div>
         )
     }
 }
 
-export default QuantManage;
+export default QuantResult;

src/components/trialCase/TrialCase.jsx

@@ -38,15 +38,15 @@ class TrialCase extends Component {
                 <Menu
                     mode="horizontal"
                     defaultSelectedKeys={['schema']}
-                    style={{padding: '0 24px', position: 'fixed', width: '100%', zIndex: '1',lineHeight:'50px',fontWeight:600}}
+                    style={{padding: '0 24px', position: 'fixed', width: '100%', zIndex: '5',lineHeight:'50px',fontWeight:600}}
                     onClick={(e) => this.switchMenu('menuLevel2', e)}
                     selectedKeys={[this.state.menuLevel2]}
                 >
                     <Menu.Item key="schema">schema</Menu.Item>
-                    <Menu.Item key="application">application</Menu.Item>
                     <Menu.Item key="deploy">deploy</Menu.Item>
-                    <Menu.Item key="graphql">graphql</Menu.Item>
                     <Menu.Item key="graphiql">graphql IDE</Menu.Item>
+                    <Menu.Item key="templeate">templeate</Menu.Item>
+                    <Menu.Item key="preview">preview</Menu.Item>
                     <Menu.Item key="metabase">metabase</Menu.Item>
                 </Menu>
 
@@ -58,18 +58,18 @@ class TrialCase extends Component {
                                 switch (this.state.menuLevel2) {
                                     case 'schema':
                                         return <Schema trialcase={true} userID={this.state.userID} schemaName={schemaName} schemaID={schemaID} history={this.props.history} location={this.props.location}/>;
-                                    case 'application':
-                                        return <Application location={this.props.location}/>;
                                     case 'deploy':
                                         return <Deploy userID={this.state.userID} schemaID={schemaID} schemaName={schemaName}/>;
-                                    case 'graphql':
-                                        return <GenerateJs schemaID={schemaID} schemaName={schemaName}/>;
                                     case 'graphiql':
                                         return <Graphql/>;
+                                    case 'templeate':
+                                        return <GenerateJs schemaID={schemaID} schemaName={schemaName}/>;
+                                    case 'preview':
+                                        return <Application location={this.props.location}/>;
                                     case 'metabase':
                                         return <CaseMetabase/>;
                                     default:
-                                        return <Graphql/>
+                                        return <Graphql/>;
                                 }
                             })()
                         }

src/components/userCreate/UserCreate.jsx

@@ -52,14 +52,14 @@ class UserCreate extends Component {
                 <Menu
                     mode="horizontal"
                     defaultSelectedKeys={['schema']}
-                    style={{padding: '0 24px', position: 'fixed', width: '100%', zIndex: '1',lineHeight:'50px',fontWeight:600}}
+                    style={{padding: '0 24px', position: 'fixed', width: '100%', zIndex: '5',lineHeight:'50px',fontWeight:600}}
                     onClick={(e) => this.switchMenu('menuLevel2', e)}
                     selectedKeys={[this.state.menuLevel2]}
                 >
                     <Menu.Item key="schema">schema</Menu.Item>
                     <Menu.Item key="deploy">deploy</Menu.Item>
-                    <Menu.Item key="graphql">graphql</Menu.Item>
                     <Menu.Item key="graphiql">graphql IDE</Menu.Item>
+                    <Menu.Item key="template">template</Menu.Item>
                     <Menu.Item key="metabase">metabase</Menu.Item>
                 </Menu>
 
@@ -73,14 +73,14 @@ class UserCreate extends Component {
                                         return <Schema userID={this.state.userID} schemaName={schemaName} schemaID={schemaID} history={this.props.history} location={this.props.location}/>;
                                     case 'deploy':
                                         return <Deploy userID={this.state.userID} schemaID={schemaID} schemaName={schemaName}/>;
-                                    case 'graphql':
-                                        return <GenerateJs/>;
                                     case 'graphiql':
                                         return <Graphql/>;
+                                    case 'template':
+                                        return <GenerateJs/>;
                                     case 'metabase':
                                         return <CaseMetabase/>;
                                     default:
-                                        return <Graphql/>
+                                        return <Graphql/>;
                                 }
                             })()
                         }

src/components/wechatService/WechatService.jsx

@@ -4,7 +4,7 @@ import {Layout, Menu} from 'antd';
 
 import WechatConfig from "./wechatConfig/WechatConfig";
 import Deploy from "../common/deploy/Deploy";
-import WechatManage from "./wechatManage/WechatManage";
+import WechatResult from './wechatResult/WechatResult';
 
 const { Content } = Layout;
 
@@ -35,7 +35,7 @@ class WechatService extends Component {
                 >
                     <Menu.Item key="wechat-config">config settings</Menu.Item>
                     <Menu.Item key="wechat-deploy">deploy settings</Menu.Item>
-                    <Menu.Item key="wechat-manage">manage</Menu.Item>
+                    <Menu.Item key="wechat-result">result</Menu.Item>
                 </Menu>
 
                 <Layout style={{ padding: '24px', zIndex: '0'}}>
@@ -46,8 +46,8 @@ class WechatService extends Component {
                                     return <WechatConfig />;
                                 case 'wechat-deploy':
                                     return <Deploy />;
-                                case 'wechat-manage':
-                                    return <WechatManage />;
+                                case 'wechat-result':
+                                    return <WechatResult />;
                                 default:
                                     return <WechatConfig />
                             }

src/components/wechatService/wechatManage/WechatManage.jsx → src/components/wechatService/wechatResult/WechatResult.jsx

@@ -1,14 +1,14 @@
 import React, {Component} from 'react';
 
-class WechatManage extends Component {
+class WechatResult extends Component {
 
     render() {
         return (
             <div>
-                Wechat Manage
+                Wechat result
             </div>
         )
     }
 }
 
-export default WechatManage;
+export default WechatResult;