Merge pull request #61 from AAVikings/master

Adding coss exchange
This commit is contained in:
benme authored and GitHub committed 2019-04-05 17:39:48 +02:00
commit 7414302fea
7 files changed
+30 -30

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
"version": "0.0.21",
"version": "0.0.29",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
"version": "0.0.28",
"version": "0.0.30",
"description": "Superalgos Operations client-side web app",
"main": "src/index.js",
"dependencies": {
+1 -1
View File
@@ -21,7 +21,7 @@ const OPERATIONS_LIST_CLONES = gql`
const OPERATIONS_HISTORY_CLONES = gql`
query Operations_HistoryClones{
operations_HistoryClones {
operations_HistoryClones(botType: "Trading") {
...clone
}
}
+1
View File
@@ -6,6 +6,7 @@ export const GET_ALL_KEYS = gql`
id
key
description
exchange
}
}
`
+1 -2
View File
@@ -55,8 +55,7 @@ const botTypes = {
const exchanges = {
Coss: "Coss",
Poloniex: "Poloniex",
Binance: "Binance"
Poloniex: "Poloniex"
}
export {
+23 -23
View File
@@ -160,6 +160,20 @@ class AddClone extends Component {
<FormHelperText>{this.state.selectedBot.kind}</FormHelperText>
</FormControl>
<TextField label="Exchange"
select
className={classNames(classes.margin, classes.textField, classes.form)}
value={this.state.exchangeName}
onChange={(e) => this.setState({ exchangeName: e.target.value })}
fullWidth
>
{Object.keys(exchanges).map((option, index) => (
<MenuItem key={index} value={option}>
{option}
</MenuItem>
))}
</TextField>
{this.state.selectedBot.kind === botTypes.Trading &&
<React.Fragment>
<Typography className={classes.typography} variant='subtitle1' align='justify'>
@@ -253,9 +267,9 @@ class AddClone extends Component {
);
if (error) return `Error! ${error.message}`;
const list = data.keyVault_AvailableKeys.map((key) => (
<MenuItem key={key.id} value={key.id}>
{key.key}
</MenuItem>
<MenuItem key={key.id} value={key.id}>
{key.key.substr(0, 32) + "..." + " - " + key.exchange}
</MenuItem>
));
return (
<TextField
@@ -375,8 +389,8 @@ class AddClone extends Component {
onChange={(e) => this.setState({ startYear: e.target.value })}
fullWidth
>
{getIndicatorYears().map((option, index) => (
<MenuItem key={option} value={index}>
{getIndicatorYears().map(option => (
<MenuItem key={option} value={option}>
{option}
</MenuItem>
))}
@@ -391,8 +405,8 @@ class AddClone extends Component {
onChange={(e) => this.setState({ endYear: e.target.value })}
fullWidth
>
{getIndicatorYears().map((option, index) => (
<MenuItem key={option} value={index}>
{getIndicatorYears().map(option => (
<MenuItem key={option} value={option}>
{option}
</MenuItem>
))}
@@ -411,8 +425,8 @@ class AddClone extends Component {
onChange={(e) => this.setState({ startYear: e.target.value })}
fullWidth
>
{getIndicatorYears().map((option, index) => (
<MenuItem key={index} value={option}>
{getIndicatorYears().map(option => (
<MenuItem key={option} value={option}>
{option}
</MenuItem>
))}
@@ -477,20 +491,6 @@ class AddClone extends Component {
</React.Fragment>
}
<TextField label="Exchange"
select
className={classNames(classes.margin, classes.textField, classes.form)}
value={this.state.exchangeName}
onChange={(e) => this.setState({ exchangeName: e.target.value })}
fullWidth
>
{Object.keys(exchanges).map((option, index) => (
<MenuItem key={index} value={option}>
{option}
</MenuItem>
))}
</TextField>
<Typography className={classes.typography} variant='subtitle1' align='justify'>
You will be able to see the clone information under Active Clones.
Whenever you decide to stop the clone you can delete it. On History Clones will find all deleted clones.
+2 -2
View File
@@ -24,7 +24,7 @@ describe('Admin clones Clones', function () {
var clones = activeCloneList("Coss")
try {
for (let clone of clones) {
await removeClone(clone.id, clone.botName)
await createClone(clone)
}
} catch (err) {
console.log('Error: ' + err)
@@ -38,7 +38,7 @@ describe('Admin clones Clones', function () {
var clones = activeCloneList("Poloniex")
try {
for (let clone of clones) {
await removeClone(clone.id, clone.botName)
await createClone(clone)
}
} catch (err) {
console.log('Error: ' + err)