Compare commits

..

2 Commits

Author SHA1 Message Date
9994c7b2f6 Fix shit 2024-11-22 01:44:06 +01:00
efbd6cb670 Stuff 2024-01-21 12:05:02 +01:00
11 changed files with 27 additions and 23 deletions

View File

@@ -22,7 +22,8 @@ class Donator(json.JSONEncoder):
def top_donator(conn: Connection): def top_donator(conn: Connection):
cur = conn.cursor() cur = conn.cursor()
cur.execute("""select name, sum(amount) from orders cur.execute("""select name, sum(amount) from orders
group by name group by name
order by sum(amount) desc
LIMIT 5 LIMIT 5
""") """)
data = cur.fetchall(); data = cur.fetchall();

Binary file not shown.

View File

@@ -1,5 +1,5 @@
home = /usr/lib/python-exec/python3.11 home = /usr/lib/python-exec/python3.12
include-system-site-packages = false include-system-site-packages = false
version = 3.11.4 version = 3.12.7
executable = /usr/bin/python3.11 executable = /usr/bin/python3.12
command = /usr/lib/python-exec/python3.11/python -m venv /stuffs/src/helloasso/api command = /usr/lib/python-exec/python3.12/python -m venv /ssd/src/helloasso/api

View File

@@ -1,12 +1,12 @@
blinker==1.6.2 blinker==1.9.0
click==8.1.7 click==8.1.7
Flask==2.3.3 Flask==3.1.0
Flask-Cors==4.0.0 Flask-Cors==5.0.0
flask-sock==0.6.0 flask-sock==0.7.0
h11==0.14.0 h11==0.14.0
itsdangerous==2.1.2 itsdangerous==2.2.0
Jinja2==3.1.2 Jinja2==3.1.4
MarkupSafe==2.1.3 MarkupSafe==3.0.2
simple-websocket==0.10.1 simple-websocket==1.1.0
Werkzeug==2.3.7 Werkzeug==3.1.3
wsproto==1.2.0 wsproto==1.2.0

View File

@@ -59,7 +59,7 @@ def index():
@app.route('/test') @app.route('/test')
def 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()) p.save(get_db())
notify_client_payment(p) notify_client_payment(p)
return jsonify(p), 200 return jsonify(p), 200

View File

@@ -24,7 +24,7 @@ div {
</video> </video>
<div> <div>
<p class="donation-name">{{ Name }}</p> <p class="donation-name">{{ Name }}</p>
<p class="donation-amount">{{ Euro }}</p> <p class="donation-amount">{{ Euro }}</p>
<p class="donation-test">{{ Message }}</p> <p class="donation-text">{{ Message }}</p>
</div> </div>
</div> </div>

Binary file not shown.

View File

@@ -1,4 +1,5 @@
export const environment = { export const environment = {
production : false, production : true,
apiUrl : 'http://localhost:5000/' apiUrl : 'apihelloasso.ringzero.fr'
}; };

View File

@@ -13,10 +13,10 @@ export class ApiService {
} }
Total() { Total() {
return this.httpClient.get(`${environment.apiUrl}/total`); return this.httpClient.get(`https://${environment.apiUrl}/total`);
} }
TopDonators() : Observable<Donator[]> { TopDonators() : Observable<Donator[]> {
return this.httpClient.get<Donator[]>(`${environment.apiUrl}/topdonators`); return this.httpClient.get<Donator[]>(`https://${environment.apiUrl}/topdonators`);
} }
} }

View File

@@ -1,6 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import {observable, Observable, Observer, Subject} from 'rxjs'; import {observable, Observable, Observer, Subject} from 'rxjs';
import { WSMessage } from '../app/models/WSMessage'; import { WSMessage } from '../app/models/WSMessage';
import {environment} from '../environments/environment';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
@@ -23,7 +24,7 @@ export class WebsocketService {
return !this.isConnected; return !this.isConnected;
} }
connect(){ connect(){
this.socket = new WebSocket('ws://localhost:5000/notify'); this.socket = new WebSocket((environment.production?'wss://':'ws://') +environment.apiUrl+'/notify');
this.socket.onopen = () => { this.socket.onopen = () => {
this.isConnected = true; this.isConnected = true;

View File

@@ -9,11 +9,12 @@ body {
.donation-name{ .donation-name{
font-style: bold; font-style: bold;
color: red; color: red;
font-size: 200%;
} }
.donation-text{ .donation-text{
font-style: bold; font-style: bold;
color: white; color: yellow;
} }
.donation-amount{ .donation-amount{