From c1c8c5b927ac3d7bd2810340cc00e365176972f7 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 13 Nov 2020 00:42:00 +0100
Subject: [PATCH] Misc fixes

---
 app/models/appcatalog.py        |  3 ++-
 app/static/css/tartiflette.css  |  2 +-
 app/templates/appci_branch.html | 17 +++--------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/models/appcatalog.py b/app/models/appcatalog.py
index c99652d..3b8fb2f 100644
--- a/app/models/appcatalog.py
+++ b/app/models/appcatalog.py
@@ -7,13 +7,14 @@ import datetime
 from .. import db
 
 
-class AppCatalog(db.Model):
+class AppCatalog():
 
     def update():
 
         g = Github()
 
         raw_apps = json.loads(requests.get("https://app.yunohost.org/default/v2/apps.json").text)
+        raw_apps = raw_apps["apps"]
 
         for name in sorted(raw_apps.keys()):
 
diff --git a/app/static/css/tartiflette.css b/app/static/css/tartiflette.css
index 2b43b6e..95c1606 100644
--- a/app/static/css/tartiflette.css
+++ b/app/static/css/tartiflette.css
@@ -36,7 +36,7 @@ th.ci-app-test-title > div > span
     border:none;
 }
 
-td.ci-app-level { width: 48px; }
+td.ci-app-level { width: 54px; }
 td.ci-app-test-result { text-align:center; padding: 14px 8px 8px 8px; }
 td.ci-app-test-result > div { position:relative; background-color: #bdc3c7; border-radius:5px; width: 18px; height: 18px;}
 td.ci-app-test-result > div.success { background-color: rgb(46,204,83); }
diff --git a/app/templates/appci_branch.html b/app/templates/appci_branch.html
index df1930d..9f96dea 100644
--- a/app/templates/appci_branch.html
+++ b/app/templates/appci_branch.html
@@ -75,10 +75,10 @@
                     <td class="ci-app-level" value="{{ result.level }}">
                     <div title="Level">
                         <strong>{{ result.level if result.level >= 0 else "?" }}</strong>
-                        {% if result.level < result.app.public_level %} 
+                        {% if result.level < result.app.public_level|int %} 
                         <span class="ml-1 oi oi-arrow-thick-bottom" title="Regression" aria-hidden="true" style="color: crimson;"></span>
-                        {% elif result.level > result.app.public_level %}
-                        <span class="ml-1 oi oi-arrow-thick-bottom" title="Improvement" aria-hidden="true" style="color: limegreen;"></span>
+                        {% elif result.level > result.app.public_level|int %}
+                        <span class="ml-1 oi oi-arrow-thick-top" title="Improvement" aria-hidden="true" style="color: limegreen;"></span>
                         {% endif %}
                     </div></td>
                     {% for test in tests %}
@@ -98,17 +98,6 @@
                               aria-hidden="true"
                               title="This test is outdated"></span>
                         {% endif %}
-                        {% if result.app.public_commit != 'HEAD' and result.app.public_commit != result.app.master_commit %}
-                        <!--
-                            {% if result.app.public_vs_master_time_diff > 60 %}
-                            <span class="oi oi-warning text-danger"
-                            {% else %}
-                            <span class="oi oi-warning text-warning"
-                            {% endif %}
-                              aria-hidden="true"
-                              title="Master commit is not up to date with {{ result.app.list.name }}.json !"></span>
-                        -->
-                        {% endif %}
                         {% if result.app.testing_pr %}
                         <span class="oi oi-fork text-info"
                               aria-hidden="true"