diff --git a/api/db.sqlite b/api/db.sqlite deleted file mode 100644 index 1d7ec9f..0000000 Binary files a/api/db.sqlite and /dev/null differ diff --git a/api/pyvenv.cfg b/api/pyvenv.cfg index bb4bb87..c9efe48 100644 --- a/api/pyvenv.cfg +++ b/api/pyvenv.cfg @@ -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 diff --git a/api/requirements.txt b/api/requirements.txt index 502ae16..a1ab5bc 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -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 diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index 11ba5ec..8e9aa79 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -1,4 +1,5 @@ export const environment = { - production : false, - apiUrl : 'http://localhost:5000/' + production : true, + apiUrl : 'apihelloasso.ringzero.fr' + }; diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts index 6862f1a..39cd2b2 100644 --- a/frontend/src/services/api.ts +++ b/frontend/src/services/api.ts @@ -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 { - return this.httpClient.get(`${environment.apiUrl}/topdonators`); + return this.httpClient.get(`https://${environment.apiUrl}/topdonators`); } } diff --git a/frontend/src/services/websocket.ts b/frontend/src/services/websocket.ts index 053aba9..fddc7aa 100644 --- a/frontend/src/services/websocket.ts +++ b/frontend/src/services/websocket.ts @@ -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;