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

[WebInterface] improve inputs UI #1269

Merged
merged 1 commit into from
Jun 20, 2024
Merged

[WebInterface] improve inputs UI #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions Services/Interfaces/web_interface/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ a:hover {
background-color: var(--mdb-bg);
}

.dropdown.bootstrap-select, .datepicker, .select2-selection select2-selection--multiple {
border: solid black 1px;
border-radius: 4px;
}

.nav-tabs .nav-link {
--mdb-nav-tabs-link-active-color: var(--mdb-secondary);
--mdb-nav-tabs-link-active-border-color: var(--mdb-secondary);
Expand Down Expand Up @@ -413,6 +418,7 @@ footer.page-footer {
.btn.btn-sm.rounded-circle {
padding-left: 0.64rem;
padding-right: 0.64rem;
border-radius: 50%;
}

.font-size-90 {
Expand Down
25 changes: 14 additions & 11 deletions Services/Interfaces/web_interface/templates/backtesting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ <h2>Backtesting
</div>
<div class="card-body">
{% if data_files %}
<div class="text-center">
<a href="{{ url_for('data_collector') }}"
id="data-collector-link"
class="btn btn-outline-info waves-effect">
<i class="fa fa-cloud-download-alt"></i> Get historical data
</a>

</div>
<table class="table table-striped table-sm table-responsive-xs" id="dataFilesTable">
<caption>Select data file(s) to use</caption>
<thead>
Expand Down Expand Up @@ -60,14 +68,14 @@ <h2>Backtesting
</tbody>
</table>
{% if activated_trading_mode and activated_trading_mode.is_backtestable() %}
<div class="container-fluid row mx-0 mt-lg-4">
<div class="row mx-0 mt-0">
<div class="row col-12 col-md-3">
<div class="custom-control custom-switch mx-4 d-none my-auto" id="synchronized-data-only-div">
<input type="checkbox" class="custom-control-input" id="synchronized-data-only-checkbox" checked="">
<label class="custom-control-label" for="synchronized-data-only-checkbox">Run on synchronized history only</label>
</div>
</div>
<div class="row justify-content-center">
<div class="row">
<div class="offset-md-4 col-12 col-md-2 my-auto">
Start Date :
<input type="date" class="datepicker" id="startDate">
Expand All @@ -76,18 +84,13 @@ <h2>Backtesting
End Date :
<input type="date" class="datepicker" id="endDate">
</div>
<div class="col-12 col-md-4 my-auto text-center">
<a href="{{ url_for('data_collector') }}"
id="data-collector-link"
class="btn btn-outline-info waves-effect">
<i class="fa fa-cloud-download-alt"></i> Get historical data
</a>
</div>
</div>
<div class="row justify-content-center mt-2">
<div class="row justify-content-center mt-4">
<div class="my-auto text-center">
<button type="button" id="startBacktesting" class="btn btn-lg btn-primary waves-effect ml-auto"
start-url="/backtesting?action_type=start_backtesting&amp;source=backtesting">Start backtesting</button>
start-url="/backtesting?action_type=start_backtesting&amp;source=backtesting">
<i class="fa fa-play"></i> Start backtesting
</button>
</div>
</div>
</div>
Expand Down
69 changes: 33 additions & 36 deletions Services/Interfaces/web_interface/templates/data_collector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,33 @@
<div class="card-body px-0 px-md-3">
<div class="container-fluid row mx-0">
<div class="col-12 col-md-10 row">
<div class="col-12 col-md-5">
<div class="row">
<div class="col-6 col-md-3 my-auto">
Exchange :
</div>
<div class="col-6 col-md-9">
<select class="selectpicker mx-0"
data-live-search="true"
data-width="80%"
data-window-padding="25"
id="exchangeSelect">
<optgroup label="Full History">
{% for exchange in full_candle_history_ccxt_exchanges %}
<option value={{exchange}}
{% if exchange==current_exchange %} selected="selected" {% endif %}>
{{exchange}}
</option>
{% endfor %}
</optgroup>
<optgroup label="Other">
{% for exchange in other_ccxt_exchanges %}
<option value={{exchange}}
{% if exchange==current_exchange %} selected="selected" {% endif %}>
{{exchange}}
</option>
{% endfor %}
</optgroup>
</select>
</div>
<div class="col-12 col-md-5 row">
<div class="col-6 col-md-3 my-auto">
Exchange :
</div>
<div class="col-6 col-md-9 px-0">
<select class="selectpicker mx-0"
data-live-search="true"
data-width="75%"
data-window-padding="25"
id="exchangeSelect">
<optgroup label="Full History">
{% for exchange in full_candle_history_ccxt_exchanges %}
<option value={{exchange}}
{% if exchange==current_exchange %} selected="selected" {% endif %}>
{{exchange}}
</option>
{% endfor %}
</optgroup>
<optgroup label="Other">
{% for exchange in other_ccxt_exchanges %}
<option value={{exchange}}
{% if exchange==current_exchange %} selected="selected" {% endif %}>
{{exchange}}
</option>
{% endfor %}
</optgroup>
</select>
</div>
</div>
<div class="col-12 col-xl-7">
Expand Down Expand Up @@ -72,12 +70,12 @@
</div>
</div>
<div class="col-12 col-md-5 row">
<div class="col-6 col-md-4 my-auto">
<div class="col-6 col-md-3 my-auto">
Pair(s) :
</div>
<div class="col-6 col-md-8">
<div class="col-6 col-md-9 px-0">
<select data-live-search="true"
data-width="80%"
data-width="75%"
data-window-padding="25"
id="symbolsSelect"
update-url="{{ url_for('data_collector', action_type='symbol_list') }}"
Expand Down Expand Up @@ -125,9 +123,6 @@
</div>
</div>
</div>
<p class="mb-0 text-center mt-4">
Protip: you can use OctoBot while data are being collected.
</p>
</div>
<div id="collector_operation" class="p-1" style='display: none;'>
<div id="total_progress_bar_anim-container" class='progress'>
Expand Down Expand Up @@ -181,7 +176,9 @@
<td>{{", ".join(description.time_frames)}}</td>
<td>{{file}}</td>
<td class="text-center">
<a class="btn btn-outline-primary fa fa-trash-alt delete_data_file waves-effect" data-file={{file}} data-toggle="tooltip" data-placement="right" title="Delete data file"></a>
<a class="btn btn-outline-primary delete_data_file waves-effect" data-file={{file}} data-toggle="tooltip" data-placement="right" title="Delete data file">
<i class="fas fa-trash"></i>
</a>
</td>
</tr>
{% endfor %}
Expand Down