Skip to content

Commit 3a6c478

Browse files
GuillaumeDSMGuillaumeDSM
authored
Merge pull request #1061 from Drakkar-Software/dev
Master merge
2 parents 75099b9 + fbeb082 commit 3a6c478

File tree

7 files changed

+101
-40
lines changed

7 files changed

+101
-40
lines changed

‎Services/Interfaces/web_interface/advanced_templates/advanced_strategy_optimizer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ <h2>Strategy optimizer in progress</h2>
121121
<a href="https://blog.octobot.online/strategy-designer-revamp" target="_blank" rel="noopener">
122122
new strategy designer </a>
123123
available on <a href="{{OCTOBOT_COMMUNITY_URL}}/" target="_blank" rel="noopener">
124-
<i class="fa-brands fa-octopus-deploy"></i> octobot.cloud</a>.
124+
<i class="fa-brands fa-octopus-deploy"></i> octobot.cloud pro plan</a>.
125125
</p>
126126
</div>
127127
</div>

‎Services/Interfaces/web_interface/flask_util/context_processor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ def get_enabled_tentacles(tentacles_info_by_name):
125125
DEVELOPER_DOCS_URL=constants.DEVELOPER_DOCS_URL,
126126
EXCHANGES_DOCS_URL=constants.EXCHANGES_DOCS_URL,
127127
OCTOBOT_FEEDBACK_URL=constants.OCTOBOT_FEEDBACK,
128-
OCTOBOT_CLOUD_URL=constants.OCTOBOT_CLOUD_URL,
129128
OCTOBOT_COMMUNITY_URL=identifiers_provider.IdentifiersProvider.COMMUNITY_URL,
129+
OCTOBOT_COMMUNITY_LANDING_URL=identifiers_provider.IdentifiersProvider.COMMUNITY_LANDING_URL,
130130
OCTOBOT_COMMUNITY_RECOVER_PASSWORD_URL=identifiers_provider.IdentifiersProvider.FRONTEND_PASSWORD_RECOVER_URL,
131131
CURRENT_BOT_VERSION=interfaces.AbstractInterface.project_version,
132132
IS_DEMO=constants.IS_DEMO,

‎Services/Interfaces/web_interface/static/css/style.css

+8
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,14 @@ a.nav-link.active.primary-pill:hover{
344344
min-height: 4rem;
345345
}
346346

347+
.cloud-logo-2x {
348+
max-height: 8rem;
349+
}
350+
351+
.cloud-logo-4x {
352+
max-height: 14rem;
353+
}
354+
347355
/* elegant-color white-text */
348356

349357
/* Theme */

‎Services/Interfaces/web_interface/static/img/community/cloud_dark.png

369 KB
Loading

‎Services/Interfaces/web_interface/templates/about.html

+40-18
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,47 @@ <h2>Your OctoBot</h2>
2424
<br>
2525
<div class="card" id="hosting">
2626
<div class="card-header">
27-
<h2>Your OctoBot, always online and reachable</h2>
27+
<h2>Get more from OctoBot using OctoBot cloud</h2>
2828
</div>
29-
<div class="card-body">
29+
<div class="card-body py-0">
3030
<div class="row">
31-
<div class="col-12 col-md-2 col-lg-1 text-center">
32-
<a target="_blank" rel="noopener" href="{{OCTOBOT_CLOUD_URL}}">
33-
<img class="img-fluid cloud-logo"
34-
src="{{url_for('static', filename='img/community/octobot-cloud.png')}}" alt="OctoBot Cloud">
35-
</a>
31+
<div class="col-12 col-md-2 col-xl-1 d-flex">
32+
<div class="m-auto">
33+
<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">
34+
<img class="img-fluid cloud-logo-4x"
35+
src="{{url_for('static', filename='img/community/octobot-cloud.png')}}" alt="OctoBot cloud">
36+
</a>
37+
</div>
3638
</div>
37-
<div class="col-12 col-md-10 col-lg-11">
38-
<p>
39-
Deploy your OctoBot on the OctoBot Cloud
40-
and enjoy your OctoBot from anywhere. No more trouble installing the software on your computer and leaving it on.
41-
</p>
39+
<div class="col-12 col-md-10 col-lg-6 col-xl-7 pt-4">
40+
With
41+
<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">
42+
OctoBot cloud</a>, you can:
43+
<ul>
44+
<li>
45+
Use trading strategies in the <strong>simplest way possible</strong>.
46+
</li>
47+
<li>
48+
Apply as many trading strategies as you want <strong>for free</strong>
49+
</li>
50+
<li>
51+
Easily find and use the best strategies made by the community <span class="badge badge-light">coming soon</span>
52+
</li>
53+
<li>
54+
Deploy your OctoBot on the cloud and enjoy your OctoBot from anywhere while benefiting
55+
from cloud exclusive features such as the <a href="https://blog.octobot.online/strategy-designer-revamp" target="_blank" rel="noopener">strategy designer</a>.
56+
</li>
57+
</ul>
4258
<p>
43-
Try Cloud OctoBots for free on <a target="_blank" rel="noopener" href="{{OCTOBOT_CLOUD_URL}}">OctoBot Cloud</a>.
59+
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>.
4460
</p>
4561
</div>
62+
<div class="d-none d-lg-flex col-lg-4">
63+
<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">
64+
<img class="img-fluid cloud-logo-4x"
65+
src="{{url_for('static', filename='img/community/cloud_dark.png')}}" alt="OctoBot cloud">
66+
</a>
67+
</div>
4668
</div>
4769
</div>
4870
</div>
@@ -54,8 +76,7 @@ <h2>Help us to improve OctoBot</h2>
5476
<div class="card-body">
5577
<div class="mb-4">
5678
Any question ?
57-
Please Checkout the <a target="_blank" rel="noopener" href="{{OCTOBOT_WEBSITE_URL}}">OctoBot official website</a>
58-
and have a look at our
79+
Please have a look at our
5980
<a target="_blank" rel="noopener" href="{{OCTOBOT_DOCS_URL}}/usage/frequently-asked-questions-faq">
6081
Frequently ask question (FAQ) section
6182
</a>
@@ -87,7 +108,7 @@ <h2>Help us to improve OctoBot</h2>
87108
<a update-url="{{ url_for('api.user_feedback') }}" href="" id=feedbackButton class="btn btn-primary waves-effect disabled" target="_blank" rel="noopener">
88109
Tell us what you think about OctoBot
89110
</a>
90-
<a href="{{ OCTOBOT_FEEDBACK_URL }}" id=suggestButton class="btn btn-primary waves-effect" target="_blank" rel="noopener">
111+
<a href="{{ OCTOBOT_FEEDBACK_URL }}/open-source" id=suggestButton class="btn btn-primary waves-effect" target="_blank" rel="noopener">
91112
Suggest a feature for OctoBot
92113
</a>
93114
</div>
@@ -105,8 +126,9 @@ <h2>Support the OctoBot project</h2>
105126
That's why we are making OctoBot open source.
106127
</p>
107128
<p>
108-
If you wish to support the OctoBot project, please consider hosting your OctoBot for you on
109-
<a target="_blank" rel="noopener" href="{{OCTOBOT_CLOUD_URL}}">OctoBot Cloud</a>.
129+
If you wish to support the OctoBot project, please consider using
130+
<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">
131+
OctoBot cloud</a>.
110132
</p>
111133
</div>
112134
</div>

‎Services/Interfaces/web_interface/templates/footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<footer class="page-footer font-small fixed-bottom">
33

44
<div class="footer-copyright text-center py-sm-2 py-0">Follow the
5-
<a href="{{OCTOBOT_WEBSITE_URL}}" target="_blank" rel="noopener"> OctoBot project</a> <span class="d-none d-md-inline">updates </span>on
5+
<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
66
<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>
77
<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>
88
<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>

‎Services/Interfaces/web_interface/templates/index.html

+50-19
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,54 @@ <h5 class="d-none d-sm-inline"><span class="d-none d-md-inline"><i class="far fa
1616
Use <a href="backtesting">Backesting</a> to quickly test trading strategies.
1717
</div>
1818
{% endif %}
19+
<div class="card mt-2 mt-md-4 d-none d-md-block">
20+
<div class="card-header">
21+
<h4>
22+
The new OctoBot cloud is now live !
23+
</h4>
24+
</div>
25+
<div class="card-body row mx-0 py-0">
26+
<div class="col-12 col-md-2 col-lg-1 py-3">
27+
<a target="_blank" rel="noopener" href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=production_announcements&utm_content=dashboard_logo">
28+
<img class="img-fluid cloud-logo"
29+
src="{{url_for('static', filename='img/community/octobot-cloud.png')}}" alt="OctoBot cloud">
30+
</a>
31+
</div>
32+
<div class="col-8 col-lg-7 col-xl-4 card-text py-3">
33+
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>
34+
is much more than before ! Now with OctoBot cloud, you can:
35+
<ul>
36+
<li>
37+
Use trading strategies in the <strong>simplest way possible</strong>.
38+
</li>
39+
<li>
40+
Apply as many trading strategies as you want <strong>for free</strong>
41+
</li>
42+
<li>
43+
Easily find and use the best strategies made by the community <span class="badge badge-light">coming soon</span>
44+
</li>
45+
</ul>
46+
</div>
47+
<div class="d-none d-xl-flex col-2">
48+
<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">
49+
<img class="img-fluid cloud-logo-2x"
50+
src="{{url_for('static', filename='img/community/cloud_dark.png')}}" alt="OctoBot cloud">
51+
</a>
52+
</div>
53+
<div class="col-12 col-lg-4 col-xl-5 card-text py-3">
54+
<p>
55+
Find more information the recent changes and future plans on
56+
<a href="https://blog.octobot.online/introducing-the-new-octobot-cloud" target="_blank" rel="noopener"> our blog</a>.
57+
</p>
58+
<p>
59+
Please note that you will need to click "Forgot your password?" to set your password when first
60+
logging in to
61+
<a href="{{OCTOBOT_COMMUNITY_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=production_announcements&utm_content=dashboard" target="_blank" rel="noopener">
62+
the new OctoBot cloud</a> using your current OctoBot account.
63+
</p>
64+
</div>
65+
</div>
66+
</div>
1967
{% if is_in_stating_community_env() %}
2068
<div class="card mt-2 mt-md-4">
2169
<div class="card-header"><h2>
@@ -25,27 +73,10 @@ <h5 class="d-none d-sm-inline"><span class="d-none d-md-inline"><i class="far fa
2573
<div class="card-body card-text">
2674
<div class="alert alert-info">
2775
When the beta environment is enabled, you will be connected to the "in development"
28-
version of OctoBot cloud (<a href="{{OCTOBOT_COMMUNITY_URL}}">{{OCTOBOT_COMMUNITY_URL}})</a>. The beta OctoBot cloud has its own accounts and products.
76+
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>.
77+
The beta OctoBot cloud has its own accounts and products.
2978
Please login using your beta account.
3079
</div>
31-
<div>
32-
<div>
33-
Beta tentacles with early access features might be available.
34-
</div>
35-
<div>
36-
<button class="btn btn-primary waves-effect" id="install-beta-tentacles"
37-
update-url="{{url_for('advanced.install_official_tentacle_packages', use_beta_tentacles=True)}}">
38-
Install / Update beta tentacles
39-
</button>
40-
<button class="btn btn-outline-primary waves-effect" id="install-regular-tentacles"
41-
update-url="{{url_for('advanced.install_official_tentacle_packages', use_beta_tentacles=False)}}">
42-
Reinstall regular tentacles
43-
</button>
44-
</div>
45-
<div class='progress' id='packages_action_progess_bar' style='display: none;'>
46-
<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>
47-
</div>
48-
</div>
4980
</div>
5081
<div class="card-footer">
5182
You can disable the beta environment and go back to the regular one at anytime from the

0 commit comments

Comments
 (0)