Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New/feats #56

Open
wants to merge 3 commits into
base: release
Choose a base branch
from
Open

New/feats #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba54f08
Tool Tip modifications
horlorlahdeh Sep 25, 2020
8e7f66c
Logo mobile
horlorlahdeh Sep 25, 2020
5d5d117
Merge branch 'release' into new/feats
horlorlahdeh Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 126 additions & 18 deletions src/modals/market-maker/add-market.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ <h4>Add Market</h4>

<div class="form-group">
<label>
${'What token do you want the market maker to trade?' &
t}

${'Choose Token' & t}
<tooltip
text="What token do you want the market maker to trade?"
></tooltip>

</label>
<select class="form-control"
value.bind="selectedToken"
Expand All @@ -37,8 +41,12 @@ <h4>Add Market</h4>
<hr />
<div class="form-group">
<label>
${'What is your order strategy?' &
t}

${'Strategy' & t}
<tooltip
text="What is your order strategy?"
></tooltip>

</label>
<select class="form-control"
value.bind="selectedOrderStrategy">
Expand All @@ -50,8 +58,19 @@ <h4>Add Market</h4>
<a href="javascript:void(0)" click.delegate="upgradeAccount()" class="text-success">Upgrade</a> your account to select other strategies
</small>
</div>
<div class="form-group" show.bind="selectedOrderStrategy && selectedOrderStrategy._id == 2">
<label>${'Set the wall size threshold that determines where buy orders will be placed' & t}</label>

<div
class="form-group"
show.bind="selectedOrderStrategy && selectedOrderStrategy._id == 2"
>
<label
>${'Buy Order Threshold' & t}
<tooltip
text="Set the wall size threshold that determines where
buy orders will be placed"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -65,8 +84,19 @@ <h4>Add Market</h4>
</div>
</div>
</div>
<div class="form-group" show.bind="selectedOrderStrategy && selectedOrderStrategy._id == 2">
<label>${'Set the wall size threshold that determines where sell orders will be placed' & t}</label>

<div
class="form-group"
show.bind="selectedOrderStrategy && selectedOrderStrategy._id == 2"
>
<label
>${'Sell Order Threshold' & t}
<tooltip
text="Set the wall size threshold that determines where
sell orders will be placed"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -83,7 +113,15 @@ <h4>Add Market</h4>

<hr />
<div class="form-group">
<label>${'What is the maximum price you\'re willing to buy the token ' + selectedTokenSymbol + ' for?' & t}</label>

<label
>${'Maximum Price' & t}
<tooltip
text="What is the maximum price you're willing to
buy the token ${selectedTokenSymbol} for?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -98,7 +136,15 @@ <h4>Add Market</h4>
</div>
</div>
<div class="form-group">
<label>${'What is the minimum price you\'re willing to sell the token ' + selectedTokenSymbol + ' for?' & t}</label>

<label
>${'Minimum Price' & t}
<tooltip
text="What is the minimum price you're willing to
sell the token ${selectedTokenSymbol} for?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -113,7 +159,15 @@ <h4>Add Market</h4>
</div>
</div>
<div class="form-group">
<label>${'What is the maximum amount of ' + baseToken + ' you\'re willing to buy with in a single order?' & t}</label>

<label
>${'Maximum Buy' & t}
<tooltip
text="What is the maximum amount of ${baseToken}
you're willing to buy with in a single order?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -128,7 +182,15 @@ <h4>Add Market</h4>
</div>
</div>
<div class="form-group">
<label>${'What is the minimum amount of ' + baseToken + ' you\'re willing to buy with in a single order?' & t}</label>

<label
>${'Minimum Buy' & t}
<tooltip
text="What is the minimum amount of ${baseToken}
you're willing to buy with in a single order?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -143,7 +205,15 @@ <h4>Add Market</h4>
</div>
</div>
<div class="form-group">
<label>${'What is the maximum amount of ' + selectedTokenSymbol + ' tokens you\'re willing to sell in a single order?' & t}</label>

<label
>${'Maximum Sell' & t}
<tooltip
text="What is the maximum amount of ${selectedTokenSymbol}
you're willing to sell in a single order?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -158,7 +228,15 @@ <h4>Add Market</h4>
</div>
</div>
<div class="form-group">
<label>${'What is the minimum amount of ' + selectedTokenSymbol + ' tokens you\'re willing to sell in a single order?' & t}</label>

<label
>${'Minimum Sell' & t}
<tooltip
text="What is the minimum amount of ${selectedTokenSymbol}
you're willing to sell in a single order?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -173,7 +251,15 @@ <h4>Add Market</h4>
</div>
</div>
<div class="form-group">
<label>${'What is the minimum spread between bid and asks before the bot won\'t place orders any closer?' & t}</label>

<label
>${'Minimum Spread' & t}
<tooltip
text="What is the minimum spread between bid and asks
before the bot won't place orders any closer?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -188,7 +274,14 @@ <h4>Add Market</h4>
</div>
</div>
<div class="form-group">
<label>${'What is the amount you want to increase/decrease the price by when placing new orders?' & t}</label>

<label
>${'Price Increment/Decrement' & t}
<tooltip
text="What is the amount you want to increase/decrease the price by when placing new orders?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -205,7 +298,14 @@ <h4>Add Market</h4>
<hr />
<h4>Advanced settings</h4>
<div class="form-group">
<label>${'What is the maximum allowed price difference between top-of-the-book price and the next level of order depth?' & t}</label>

<label
>${'Maximum Price Difference' & t}
<tooltip
text="What is the maximum allowed price difference between top-of-the-book price and the next level of order depth?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand All @@ -220,7 +320,15 @@ <h4>Advanced settings</h4>
</div>
</div>
<div class="form-group">
<label>${'Ignore orders with token quantity less than or equal to this size, for the purpose of determining where to place new orders.?' & t}</label>

<label
>${'IMinimum Order Quantity' & t}
<tooltip
text="Ignore orders with token quantity less than or equal to this size, for the purpose of
determining where to place new orders?"
></tooltip>
</label>

<div class="input-group">
<input class="form-control"
type="text"
Expand Down
57 changes: 44 additions & 13 deletions src/routes/market-maker/settings/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@ <h2>${'Initiate Market Maker' & t}</h2>

<div class="form-group">
<label
>${'What token do you want the market maker to
trade?' & t}</label
>

>${'Choose Token' & t}
<tooltip
text="What token do you want the market maker to
trade?"
></tooltip>
</label>

<select
class="form-control"
value.bind="token"
Expand Down Expand Up @@ -55,9 +60,14 @@ <h4>

<div class="form-group">
<label
>${'What is the maximum price you\'re
willing to buy the token for?' & t}</label
>

>${'Maximum Price' & t}
<tooltip
text="What is the maximum price you\'re
willing to buy the token for?"
></tooltip>
</label>

<div class="input-group">
<input
class="form-control"
Expand All @@ -76,8 +86,14 @@ <h4>
</div>
<div class="form-group">
<label
>${'What is the minimum price you\'re
willing to sell the token for?' & t}</label

>${'Minimum Price' & t}
<tooltip
text="What is the minimum price you\'re
willing to sell the token for?"
></tooltip>
</label

>
<div class="input-group">
<input
Expand All @@ -97,7 +113,11 @@ <h4>
</div>
<div class="form-group">
<label
>${'What is the maximum amount of HIVE

>${'Maximum Buy' & t}
<tooltip
text="What is the maximum amount of HIVE

you\'re willing to buy with in a single
order?' & t}</label
>
Expand All @@ -119,9 +139,16 @@ <h4>
</div>
<div class="form-group">
<label
>${'What is the maximum amount of tokens
you\'re willing to sell in a single order?'
& t}</label

>${'Maximum Sell'
& t}
<tooltip
text="What is the maximum amount of HIVE
you\'re willing to Sell with in a single
order?"
></tooltip>
</label

>
<div class="input-group">
<input
Expand All @@ -141,7 +168,11 @@ <h4>
</div>
<div class="form-group">
<label
>${'What is the minimum spread between bid

>${'Minimum Spread' & t}
<tooltip
text="What is the minimum spread between bid

and asks before the bot won\'t place orders
any closer?' & t}</label
>
Expand Down
Loading