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

Backend #1060

Merged
merged 3 commits into from
Sep 26, 2023
Merged

Backend #1060

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
46486e1
[WebInterface] update cloud plan
GuillaumeDSM Sep 25, 2023
47d199b
[WebInterface] disable beta tentacles
GuillaumeDSM Sep 25, 2023
60eee17
[WebInterface] update OctoBot cloud info
GuillaumeDSM Sep 25, 2023
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
2 changes: 1 addition & 1 deletion Services/Interfaces/web_interface/advanced_templates/advanced_strategy_optimizer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ <h2>Strategy optimizer in progress</h2>
<a href="https://blog.octobot.online/strategy-designer-revamp" target="_blank" rel="noopener">
new strategy designer </a>
available on <a href="{{OCTOBOT_COMMUNITY_URL}}/" target="_blank" rel="noopener">
<i class="fa-brands fa-octopus-deploy"></i> octobot.cloud</a>.
<i class="fa-brands fa-octopus-deploy"></i> octobot.cloud pro plan</a>.
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Services/Interfaces/web_interface/flask_util/context_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ def get_enabled_tentacles(tentacles_info_by_name):
DEVELOPER_DOCS_URL=constants.DEVELOPER_DOCS_URL,
EXCHANGES_DOCS_URL=constants.EXCHANGES_DOCS_URL,
OCTOBOT_FEEDBACK_URL=constants.OCTOBOT_FEEDBACK,
OCTOBOT_CLOUD_URL=constants.OCTOBOT_CLOUD_URL,
OCTOBOT_COMMUNITY_URL=identifiers_provider.IdentifiersProvider.COMMUNITY_URL,
OCTOBOT_COMMUNITY_LANDING_URL=identifiers_provider.IdentifiersProvider.COMMUNITY_LANDING_URL,
OCTOBOT_COMMUNITY_RECOVER_PASSWORD_URL=identifiers_provider.IdentifiersProvider.FRONTEND_PASSWORD_RECOVER_URL,
CURRENT_BOT_VERSION=interfaces.AbstractInterface.project_version,
IS_DEMO=constants.IS_DEMO,
Expand Down
8 changes: 8 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 @@ -344,6 +344,14 @@ a.nav-link.active.primary-pill:hover{
min-height: 4rem;
}

.cloud-logo-2x {
max-height: 8rem;
}

.cloud-logo-4x {
max-height: 14rem;
}

/* elegant-color white-text */

/* Theme */
Expand Down
Binary file added Services/Interfaces/web_interface/static/img/community/cloud_dark.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 40 additions & 18 deletions Services/Interfaces/web_interface/templates/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,47 @@ <h2>Your OctoBot</h2>
<br>
<div class="card" id="hosting">
<div class="card-header">
<h2>Your OctoBot, always online and reachable</h2>
<h2>Get more from OctoBot using OctoBot cloud</h2>
</div>
<div class="card-body">
<div class="card-body py-0">
<div class="row">
<div class="col-12 col-md-2 col-lg-1 text-center">
<a target="_blank" rel="noopener" href="{{OCTOBOT_CLOUD_URL}}">
<img class="img-fluid cloud-logo"
src="{{url_for('static', filename='img/community/octobot-cloud.png')}}" alt="OctoBot Cloud">
</a>
<div class="col-12 col-md-2 col-xl-1 d-flex">
<div class="m-auto">
<a target="_blank" rel="noopener" href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=about_logo">
<img class="img-fluid cloud-logo-4x"
src="{{url_for('static', filename='img/community/octobot-cloud.png')}}" alt="OctoBot cloud">
</a>
</div>
</div>
<div class="col-12 col-md-10 col-lg-11">
<p>
Deploy your OctoBot on the OctoBot Cloud
and enjoy your OctoBot from anywhere. No more trouble installing the software on your computer and leaving it on.
</p>
<div class="col-12 col-md-10 col-lg-6 col-xl-7 pt-4">
With
<a href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=about" target="_blank" rel="noopener">
OctoBot cloud</a>, you can:
<ul>
<li>
Use trading strategies in the <strong>simplest way possible</strong>.
</li>
<li>
Apply as many trading strategies as you want <strong>for free</strong>
</li>
<li>
Easily find and use the best strategies made by the community <span class="badge badge-light">coming soon</span>
</li>
<li>
Deploy your OctoBot on the cloud and enjoy your OctoBot from anywhere while benefiting
from cloud exclusive features such as the <a href="https://blog.octobot.online/strategy-designer-revamp" target="_blank" rel="noopener">strategy designer</a>.
</li>
</ul>
<p>
Try Cloud OctoBots for free on <a target="_blank" rel="noopener" href="{{OCTOBOT_CLOUD_URL}}">OctoBot Cloud</a>.
Check out OctoBot cloud on <a target="_blank" rel="noopener" href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=about">octobot.cloud</a>.
</p>
</div>
<div class="d-none d-lg-flex col-lg-4">
<a class="mx-auto" target="_blank" rel="noopener" href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=about_illustration">
<img class="img-fluid cloud-logo-4x"
src="{{url_for('static', filename='img/community/cloud_dark.png')}}" alt="OctoBot cloud">
</a>
</div>
</div>
</div>
</div>
Expand All @@ -54,8 +76,7 @@ <h2>Help us to improve OctoBot</h2>
<div class="card-body">
<div class="mb-4">
Any question ?
Please Checkout the <a target="_blank" rel="noopener" href="{{OCTOBOT_WEBSITE_URL}}">OctoBot official website</a>
and have a look at our
Please have a look at our
<a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/usage/frequently-asked-questions-faq">
Frequently ask question (FAQ) section
</a>
Expand Down Expand Up @@ -87,7 +108,7 @@ <h2>Help us to improve OctoBot</h2>
<a update-url="{{ url_for('api.user_feedback') }}" href="" id=feedbackButton class="btn btn-primary waves-effect disabled" target="_blank" rel="noopener">
Tell us what you think about OctoBot
</a>
<a href="{{ OCTOBOT_FEEDBACK_URL }}" id=suggestButton class="btn btn-primary waves-effect" target="_blank" rel="noopener">
<a href="{{ OCTOBOT_FEEDBACK_URL }}/open-source" id=suggestButton class="btn btn-primary waves-effect" target="_blank" rel="noopener">
Suggest a feature for OctoBot
</a>
</div>
Expand All @@ -105,8 +126,9 @@ <h2>Support the OctoBot project</h2>
That's why we are making OctoBot open source.
</p>
<p>
If you wish to support the OctoBot project, please consider hosting your OctoBot for you on
<a target="_blank" rel="noopener" href="{{OCTOBOT_CLOUD_URL}}">OctoBot Cloud</a>.
If you wish to support the OctoBot project, please consider using
<a target="_blank" rel="noopener" href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=about_support_the_project">
OctoBot cloud</a>.
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Services/Interfaces/web_interface/templates/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<footer class="page-footer font-small fixed-bottom">

<div class="footer-copyright text-center py-sm-2 py-0">Follow the
<a href="{{OCTOBOT_WEBSITE_URL}}" target="_blank" rel="noopener"> OctoBot project</a> <span class="d-none d-md-inline">updates </span>on
<a href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=footer" target="_blank" rel="noopener"> OctoBot</a> <span class="d-none d-md-inline">updates </span>on
<a href="https://github.com/Drakkar-Software" target="_blank" rel="noopener"><i class="fab fa-github"></i><span class="d-none d-md-inline"> GitHub</span></a>
<a href="https://twitter.com/DrakkarsOctoBot" target="_blank" rel="noopener noreferrer"><i class="fab fa-twitter"></i><span class="d-none d-md-inline"> Twitter</span></a>
<a href="https://t.me/OctoBot_Project" target="_blank" rel="noopener noreferrer"><i class="fab fa-telegram"></i><span class="d-none d-md-inline"> Telegram</span></a>
Expand Down
69 changes: 50 additions & 19 deletions Services/Interfaces/web_interface/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,54 @@ <h5 class="d-none d-sm-inline"><span class="d-none d-md-inline"><i class="far fa
Use <a href="backtesting">Backesting</a> to quickly test trading strategies.
</div>
{% endif %}
<div class="card mt-2 mt-md-4 d-none d-md-block">
<div class="card-header">
<h4>
The new OctoBot cloud is now live !
</h4>
</div>
<div class="card-body row mx-0 py-0">
<div class="col-12 col-md-2 col-lg-1 py-3">
<a target="_blank" rel="noopener" href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=production_announcements&utm_content=dashboard_logo">
<img class="img-fluid cloud-logo"
src="{{url_for('static', filename='img/community/octobot-cloud.png')}}" alt="OctoBot cloud">
</a>
</div>
<div class="col-8 col-lg-7 col-xl-4 card-text py-3">
The updated <a href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=production_announcements&utm_content=dashboard" target="_blank" rel="noopener">octobot.cloud</a>
is much more than before ! Now with OctoBot cloud, you can:
<ul>
<li>
Use trading strategies in the <strong>simplest way possible</strong>.
</li>
<li>
Apply as many trading strategies as you want <strong>for free</strong>
</li>
<li>
Easily find and use the best strategies made by the community <span class="badge badge-light">coming soon</span>
</li>
</ul>
</div>
<div class="d-none d-xl-flex col-2">
<a class="mx-auto" target="_blank" rel="noopener" href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=production_announcements&utm_content=dashboard_illustration">
<img class="img-fluid cloud-logo-2x"
src="{{url_for('static', filename='img/community/cloud_dark.png')}}" alt="OctoBot cloud">
</a>
</div>
<div class="col-12 col-lg-4 col-xl-5 card-text py-3">
<p>
Find more information the recent changes and future plans on
<a href="https://blog.octobot.online/introducing-the-new-octobot-cloud" target="_blank" rel="noopener"> our blog</a>.
</p>
<p>
Please note that you will need to click "Forgot your password?" to set your password when first
logging in to
<a href="{{OCTOBOT_COMMUNITY_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=production_announcements&utm_content=dashboard" target="_blank" rel="noopener">
the new OctoBot cloud</a> using your current OctoBot account.
</p>
</div>
</div>
</div>
{% if is_in_stating_community_env() %}
<div class="card mt-2 mt-md-4">
<div class="card-header"><h2>
Expand All @@ -25,27 +73,10 @@ <h5 class="d-none d-sm-inline"><span class="d-none d-md-inline"><i class="far fa
<div class="card-body card-text">
<div class="alert alert-info">
When the beta environment is enabled, you will be connected to the "in development"
version of OctoBot cloud (<a href="{{OCTOBOT_COMMUNITY_URL}}">{{OCTOBOT_COMMUNITY_URL}})</a>. The beta OctoBot cloud has its own accounts and products.
version of OctoBot cloud (<a href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=beta_program&utm_content=dashboard">{{OCTOBOT_COMMUNITY_LANDING_URL}})</a>.
The beta OctoBot cloud has its own accounts and products.
Please login using your beta account.
</div>
<div>
<div>
Beta tentacles with early access features might be available.
</div>
<div>
<button class="btn btn-primary waves-effect" id="install-beta-tentacles"
update-url="{{url_for('advanced.install_official_tentacle_packages', use_beta_tentacles=True)}}">
Install / Update beta tentacles
</button>
<button class="btn btn-outline-primary waves-effect" id="install-regular-tentacles"
update-url="{{url_for('advanced.install_official_tentacle_packages', use_beta_tentacles=False)}}">
Reinstall regular tentacles
</button>
</div>
<div class='progress' id='packages_action_progess_bar' style='display: none;'>
<div class='progress-bar progress-bar-striped progress-bar-animated' role='progressbar' aria-valuenow='100' aria-valuemin='0' aria-valuemax='100' style='width: 100%;'></div>
</div>
</div>
</div>
<div class="card-footer">
You can disable the beta environment and go back to the regular one at anytime from the
Expand Down
Loading