yvachot/FlaskALED
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	backend/application/api_functions.py
This commit is contained in:
Yûki VACHOT 2022-01-10 21:23:19 +01:00
commit f1ae473b40
12 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
backend/__pycache__/app.cpython-38.pyc Normal file
View file

Binary file not shown.

BIN
backend/__pycache__/config.cpython-38.pyc Normal file
View file

Binary file not shown.

BIN
backend/application/__pycache__/__init__.cpython-38.pyc Normal file
View file

Binary file not shown.

BIN
backend/application/__pycache__/api_functions.cpython-38.pyc
View file

Binary file not shown.

BIN
backend/application/__pycache__/logs_model.cpython-38.pyc Normal file
View file

Binary file not shown.

BIN
backend/application/__pycache__/responses.cpython-38.pyc Normal file
View file

Binary file not shown.

BIN
backend/application/__pycache__/routes.cpython-38.pyc Normal file
View file

Binary file not shown.

BIN
backend/application/__pycache__/sessionJWT.cpython-38.pyc Normal file
View file

Binary file not shown.

BIN
backend/application/__pycache__/users_model.cpython-38.pyc
View file

Binary file not shown.

1
backend/env.sh
View file

@ -4,4 +4,3 @@ export FLASK_DEBUG=1
export PYTHONUNBUFFERED=1 export PYTHONUNBUFFERED=1
export DATABASE_URL_USERS=postgresql://flaskaled1:aled1@localhost:5433/flaskaledDb1 export DATABASE_URL_USERS=postgresql://flaskaled1:aled1@localhost:5433/flaskaledDb1
export DATABASE_URL_LOGS=postgresql://flaskaled2:aled2@localhost:5434/flaskaledDb2 export DATABASE_URL_LOGS=postgresql://flaskaled2:aled2@localhost:5434/flaskaledDb2
export SECRET_KEY=\xe6\xfe9;\xddA\x00\xca\xd4\xbb\x05q\xd9q\xe6e\x98DC\x08:+\xc9\x893\xd6\xa7\xea\x1e\x05\x03\xdc

0
backend/init-db1.sql Normal file → Executable file
View file

4
frontend/src/app/common/components/page-profil/page-profil.component.html
View file

@ -33,7 +33,7 @@
<div class="col-6"> <div class="col-6">
<div class="btnContainer"> <div class="btnContainer">
<button mat-button class="myBtn" (click)="onModifier()"> <button mat-button class="myBtn" (click)="onModifier()">
<mat-icon>edit</mat-icon> Modifier compte <mat-icon>edit</mat-icon> <mat-icon>edit</mat-icon> Modifier compte
</button> </button>
</div> </div>
</div> </div>
@ -41,7 +41,7 @@
<div class="col-6"> <div class="col-6">
<div class="btnContainer"> <div class="btnContainer">
<button mat-button class="myBtn" (click)="onSupprimer()"> <button mat-button class="myBtn" (click)="onSupprimer()">
<mat-icon>delete</mat-icon> Supprimer compte <mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon> Supprimer compte
</button> </button>
</div> </div>
</div> </div>