Compare commits
2 Commits
ee80e7be55
...
9994c7b2f6
| Author | SHA1 | Date | |
|---|---|---|---|
| 9994c7b2f6 | |||
| efbd6cb670 |
@@ -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();
|
||||
|
||||
BIN
api/db.sqlite
BIN
api/db.sqlite
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
home = /usr/lib/python-exec/python3.11
|
||||
home = /usr/lib/python-exec/python3.12
|
||||
include-system-site-packages = false
|
||||
version = 3.11.4
|
||||
executable = /usr/bin/python3.11
|
||||
command = /usr/lib/python-exec/python3.11/python -m venv /stuffs/src/helloasso/api
|
||||
version = 3.12.7
|
||||
executable = /usr/bin/python3.12
|
||||
command = /usr/lib/python-exec/python3.12/python -m venv /ssd/src/helloasso/api
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
blinker==1.6.2
|
||||
blinker==1.9.0
|
||||
click==8.1.7
|
||||
Flask==2.3.3
|
||||
Flask-Cors==4.0.0
|
||||
flask-sock==0.6.0
|
||||
Flask==3.1.0
|
||||
Flask-Cors==5.0.0
|
||||
flask-sock==0.7.0
|
||||
h11==0.14.0
|
||||
itsdangerous==2.1.2
|
||||
Jinja2==3.1.2
|
||||
MarkupSafe==2.1.3
|
||||
simple-websocket==0.10.1
|
||||
Werkzeug==2.3.7
|
||||
itsdangerous==2.2.0
|
||||
Jinja2==3.1.4
|
||||
MarkupSafe==3.0.2
|
||||
simple-websocket==1.1.0
|
||||
Werkzeug==3.1.3
|
||||
wsproto==1.2.0
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -24,7 +24,7 @@ div {
|
||||
</video>
|
||||
<div>
|
||||
<p class="donation-name">{{ Name }}</p>
|
||||
<p class="donation-amount">{{ Euro }}</p>
|
||||
<p class="donation-test">{{ Message }}</p>
|
||||
<p class="donation-amount">{{ Euro }} €</p>
|
||||
<p class="donation-text">{{ Message }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Binary file not shown.
@@ -1,4 +1,5 @@
|
||||
export const environment = {
|
||||
production : false,
|
||||
apiUrl : 'http://localhost:5000/'
|
||||
production : true,
|
||||
apiUrl : 'apihelloasso.ringzero.fr'
|
||||
|
||||
};
|
||||
|
||||
@@ -13,10 +13,10 @@ export class ApiService {
|
||||
}
|
||||
|
||||
Total() {
|
||||
return this.httpClient.get(`${environment.apiUrl}/total`);
|
||||
return this.httpClient.get(`https://${environment.apiUrl}/total`);
|
||||
}
|
||||
|
||||
TopDonators() : Observable<Donator[]> {
|
||||
return this.httpClient.get<Donator[]>(`${environment.apiUrl}/topdonators`);
|
||||
return this.httpClient.get<Donator[]>(`https://${environment.apiUrl}/topdonators`);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import {observable, Observable, Observer, Subject} from 'rxjs';
|
||||
import { WSMessage } from '../app/models/WSMessage';
|
||||
import {environment} from '../environments/environment';
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
@@ -23,7 +24,7 @@ export class WebsocketService {
|
||||
return !this.isConnected;
|
||||
}
|
||||
connect(){
|
||||
this.socket = new WebSocket('ws://localhost:5000/notify');
|
||||
this.socket = new WebSocket((environment.production?'wss://':'ws://') +environment.apiUrl+'/notify');
|
||||
|
||||
this.socket.onopen = () => {
|
||||
this.isConnected = true;
|
||||
|
||||
@@ -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{
|
||||
|
||||
Reference in New Issue
Block a user