Merge pull request #1284 from Drakkar-Software/dev

Dev merge
Drakkar-Software · Jul 5, 2024 · 87ee947 · 87ee947
2 parents f5e7e0b + 22fe129
commit 87ee947
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Services/Interfaces/web_interface/constants.py b/Services/Interfaces/web_interface/constants.py
@@ -46,4 +46,4 @@
 BOT_TOOLS_DATA_COLLECTOR = "data_collector"
 
 PRODUCT_HUNT_ANNOUNCEMENT = "product_hunt_announcement"
-PRODUCT_HUNT_ANNOUNCEMENT_DAY = 1720162860  # Wednesday, July 10, 2024 7:01:00 AM UTC
+PRODUCT_HUNT_ANNOUNCEMENT_DAY = 1720594860  # Wednesday, July 10, 2024 7:01:00 AM UTC
diff --git a/Services/Interfaces/web_interface/controllers/community_authentication.py b/Services/Interfaces/web_interface/controllers/community_authentication.py
@@ -60,7 +60,7 @@ def community_login():
                 except Exception as e:
                     logging.get_logger("CommunityAuthentication").exception(e, False)
                     flask.flash(f"Error during authentication: {e}", "error")
-        if flask.request.method == 'POST' and next_url:
+        if flask.request.method == 'POST' and next_url and authenticator.is_logged_in():
             return flask.redirect(next_url)
         return flask.render_template('community_login.html',
                                      form=form,

diff --git a/Services/Interfaces/web_interface/login/open_source_package_required.py b/Services/Interfaces/web_interface/login/open_source_package_required.py
@@ -24,7 +24,7 @@ def open_source_package_required(func):
     @functools.wraps(func)
     def decorated_view(*args, **kwargs):
         if models.has_open_source_package():
-            flask.flash(f"The {constants.OCTOBOT_EXTENSION_PACKAGE_1_NAME} is required to use this page")
             return func(*args, **kwargs)
+        flask.flash(f"The {constants.OCTOBOT_EXTENSION_PACKAGE_1_NAME} is required to use this page")
         return flask.redirect(flask.url_for('extensions'))
     return decorated_view
diff --git a/Services/Interfaces/web_interface/templates/components/config/exchange_card.html b/Services/Interfaces/web_interface/templates/components/config/exchange_card.html
@@ -42,7 +42,7 @@ <h4 class="text-capitalize">
                 </div>
                 <div class="{{'' if exchanges_details['configurable'] else 'd-none'}} col">
                     <div class="d-lg-flex justify-content-end">
-                        <a href="{{ url_for('config_tentacle', name=(exchange)) }}" class="text-light">
+                        <a href="{{ url_for('config_tentacle', name=(exchange)) }}">
                             <i class="fas fa-cog" data-toggle="tooltip" data-placement="top" title="Configure"></i>
                         </a>
                     </div>

diff --git a/...erfaces/web_interface/templates/components/tentacles_packages/tentacles_package_card.html b/...erfaces/web_interface/templates/components/tentacles_packages/tentacles_package_card.html
@@ -15,7 +15,7 @@ <h2>
         <a href="{{tentacles_package.url}}"
            class="btn btn-outline-primary waves-effect">
             <img src="{{tentacles_package.images[0] if tentacles_package.images else default_image}}" class="img-fluid" alt="Tentacles package illustration">
-            <p class="text-light mt-2">
+            <p class="mt-2">
                 See on OctoBot community
             </p>
         </a>

diff --git a/Services/Interfaces/web_interface/templates/welcome.html b/Services/Interfaces/web_interface/templates/welcome.html
@@ -33,7 +33,7 @@
                     <h3>OctoBot cloud strategies</h3>
                     <p>
                         I first want to use ready-made strategies from
-                    <a href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=welcome" target="_blank" class="text-light"> OctoBot cloud
+                    <a href="{{OCTOBOT_COMMUNITY_LANDING_URL}}?utm_source=octobot&utm_medium=dk&utm_campaign=regular_open_source_content&utm_content=welcome" target="_blank"> OctoBot cloud
                         <i class="fas fa-external-link-alt"></i></a>.
                     </p>
                     <p>