diff --git a/api/classes.py b/api/classes.py index 5299632..7cfee27 100644 --- a/api/classes.py +++ b/api/classes.py @@ -22,7 +22,8 @@ class Donator(json.JSONEncoder): def top_donator(conn: Connection): cur = conn.cursor() cur.execute("""select name, sum(amount) from orders - group by name + group by name + order by sum(amount) desc LIMIT 5 """) data = cur.fetchall(); diff --git a/api/serv.py b/api/serv.py index 9664d8c..e777268 100755 --- a/api/serv.py +++ b/api/serv.py @@ -59,7 +59,7 @@ def index(): @app.route('/test') def test(): - p = Payment(int(random.random()*100),5000,'TEST DE MESSAGE BIEN LONG SKLDJQLKDJQLKSJDQLSKJDQLKJD','Nom donation') + p = Payment(int(random.random()*100),0,'TEST DE MESSAGE BIEN LONG SKLDJQLKDJQLKSJDQLSKJDQLKJD','Test') p.save(get_db()) notify_client_payment(p) return jsonify(p), 200 diff --git a/frontend/src/app/donation/donation.component.html b/frontend/src/app/donation/donation.component.html index a25cae1..0fa9cf9 100644 --- a/frontend/src/app/donation/donation.component.html +++ b/frontend/src/app/donation/donation.component.html @@ -24,7 +24,7 @@ div {

{{ Name }}

-

{{ Euro }}

-

{{ Message }}

+

{{ Euro }} €

+

{{ Message }}

diff --git a/frontend/src/assets/sound.mp3 b/frontend/src/assets/sound.mp3 index 315af74..68e0fd3 100644 Binary files a/frontend/src/assets/sound.mp3 and b/frontend/src/assets/sound.mp3 differ diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index c5b49a3..ed43ba4 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -9,11 +9,12 @@ body { .donation-name{ font-style: bold; color: red; + font-size: 200%; } .donation-text{ font-style: bold; - color: white; + color: yellow; } .donation-amount{