- add usage docs

- add exchange tips to web
- fix docker https

README.md

@@ -6,6 +6,8 @@
 
 You can install samaritan from **installation package** or **docker**.
 
+The default username and password are `admin`, please modify them immediately after login!
+
 ### From installation package
 
 1. Download the samaritan installation package on [this page](https://github.com/miaolz123/samaritan/releases)
@@ -46,6 +48,26 @@ Then, samaritan is running at `http://localhost:19876`.
 | okcoin.future | `BTC.WEEK/USD`, `BTC.WEEK2/USD`, `BTC.MONTH3/USD`, `LTC.WEEK/USD`, ... |
 | oanda.v20 | coming soon ...... |
 
+## Usage
+
+### Add an Exchange
+
+![](http://samaritan.stockdb.org/_media/add-exchange.png)
+
+### Add an Algorithm
+
+![](http://samaritan.stockdb.org/_media/add-algorithm.png)
+
+![](http://samaritan.stockdb.org/_media/edit-algorithm.png)
+
+### Deploy an Algorithm
+
+![](http://samaritan.stockdb.org/_media/add-trader.png)
+
+### Run a Trader
+
+![](http://samaritan.stockdb.org/_media/run-trader.png)
+
 ## Algorithm Reference
 
 [Read Documentation](http://samaritan.stockdb.org/#/#algorithm-reference)

docker/Dockerfile

@@ -12,7 +12,7 @@ cd /usr/src/samaritan_linux_amd64/\n\
     chmod +x /usr/src/samaritan_linux_amd64/samaritan && \
     chmod +x /usr/src/samaritan_linux_amd64/cmd.sh && \
     rm -f samaritan_linux_amd64.tar.gz && \
-    apt-get purge -y --auto-remove ca-certificates wget
+    apt-get purge -y --auto-remove wget
 
 EXPOSE 9876
 

docker/alpine/Dockerfile

@@ -17,7 +17,9 @@ cd /usr/src/samaritan_linux_amd64/\n\
     chmod +x /usr/src/samaritan_linux_amd64/samaritan && \
     chmod +x /usr/src/samaritan_linux_amd64/cmd.sh && \
     rm -f samaritan_linux_amd64.tar.gz glibc-2.23-r3.apk /root/.gnupg && \
-    apk del .build-deps
+    apk del .build-deps && \
+    apk add --no-cache --virtual ca-certificates && \
+    update-ca-certificates
 
 EXPOSE 9876
 

docs/README.md

@@ -4,6 +4,8 @@
 
 You can install samaritan from **installation package** or **docker**.
 
+The default username and password are `admin`, please modify them immediately after login!
+
 ### From installation package
 
 1. Download the samaritan installation package on [this page](https://github.com/miaolz123/samaritan/releases)
@@ -44,6 +46,26 @@ Then, samaritan is running at `http://localhost:19876`.
 | okcoin.future | `BTC.WEEK/USD`, `BTC.WEEK2/USD`, `BTC.MONTH3/USD`, `LTC.WEEK/USD`, ... |
 | oanda.v20 | coming soon ...... |
 
+## Usage
+
+### Add an Exchange
+
+![](http://samaritan.stockdb.org/_media/add-exchange.png)
+
+### Add an Algorithm
+
+![](http://samaritan.stockdb.org/_media/add-algorithm.png)
+
+![](http://samaritan.stockdb.org/_media/edit-algorithm.png)
+
+### Deploy an Algorithm
+
+![](http://samaritan.stockdb.org/_media/add-trader.png)
+
+### Run a Trader
+
+![](http://samaritan.stockdb.org/_media/run-trader.png)
+
 # Algorithm Reference
 
 ## Protocols

web/src/containers/Algorithm.js

@@ -4,7 +4,7 @@ import { ExchangeList } from '../actions/exchange';
 import { TraderList, TraderPut, TraderDelete, TraderSwitch, TraderCache } from '../actions/trader';
 import React from 'react';
 import { connect } from 'react-redux';
-import { browserHistory } from 'react-router';
+import { Link, browserHistory } from 'react-router';
 import { Badge, Button, Dropdown, Form, Input, Menu, Modal, Select, Table, Tag, Tooltip, notification } from 'antd';
 
 const FormItem = Form.Item;
@@ -223,6 +223,16 @@ function main() {
       }
 
       const { traderInfo } = this.state;
+
+      if (!traderInfo.exchanges || traderInfo.exchanges.length < 1) {
+        notification['error']({
+          key: 'algorithmError',
+          message: 'Error',
+          description: 'Please add at least one Exchange!',
+        });
+        return;
+      }
+
       const { dispatch } = this.props;
       const info = {
         id: traderInfo.id,
@@ -389,7 +399,7 @@ function main() {
             >
               <Select
                 onSelect={this.handleExchangeChange}
-                notFoundContent="Please add an exchange at first"
+                notFoundContent={<Link to="/exchange">Please add an Exchange at first!</Link>}
               >
                 {exchange.list.map((e, i) => <Option key={String(i)} value={String(i)}>{e.name}</Option>)}
               </Select>

web/src/containers/App.js

@@ -62,9 +62,6 @@ class App extends Component {
       case 'user':
         browserHistory.push('/user');
         break;
-      case 'docs':
-        window.location.href = 'http://samaritan.stockdb.org';
-        break;
       case 'logout':
         Modal.confirm({
           title: 'Are you sure to logout ?',
@@ -109,7 +106,9 @@ class App extends Component {
                 <Icon name="id-card-o" fixedWidth size={collapse ? '2x' : undefined} /><span className="nav-text">User</span>
               </Menu.Item>
               <Menu.Item key="docs">
-                <Icon name="book" fixedWidth size={collapse ? '2x' : undefined} /><span className="nav-text">Docs</span>
+                <a href="http://samaritan.stockdb.org" target='_blank'>
+                  <Icon name="book" fixedWidth size={collapse ? '2x' : undefined} /><span className="nav-text">Docs</span>
+                </a>
               </Menu.Item>
               <Menu.Item key="logout">
                 <Icon name="power-off" fixedWidth size={collapse ? '2x' : undefined} /><span className="nav-text">Logout</span>

web/src/containers/Login.js

@@ -4,7 +4,6 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { browserHistory } from 'react-router';
 import { Button, Form, Input, Icon, Tooltip, notification } from 'antd';
-import { trimEnd } from 'lodash';
 
 class Login extends React.Component {
   constructor(props) {
@@ -77,7 +76,7 @@ class Login extends React.Component {
     const formItemLayout = {
       wrapperCol: { offset: 9, span: 6 },
     };
-    const cluster = localStorage.getItem('cluster') || trimEnd(document.URL, '/login');
+    const cluster = localStorage.getItem('cluster') || document.URL.slice(0, -6);
 
     return (
       <div style={{ paddingTop: windowHeight > 600 ? (windowHeight - 500) / 2 : windowHeight > 400 ? (windowHeight - 350) / 2 : 25 }}>