BDE_IUT_Info/Kfet-depreciated
Archived
1
0
Fork 0
Code Activity

Update frontend

Browse source
This commit is contained in:
Ethanell 2020-02-04 20:54:29 +01:00
parent c466784f8e
commit 354b35d70a
5 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/static/css/main.css
View file

@ -599,11 +599,6 @@ div#fct{
div#middle-container{
display: flex;
flex-wrap: wrap;
background: rgba(219,21,99,0.8);
background: -webkit-linear-gradient(45deg, rgba(213,0,125,0.8), rgba(229,57,53,0.8));
background: -o-linear-gradient(45deg, rgba(213,0,125,0.8), rgba(229,57,53,0.8));
background: -moz-linear-gradient(45deg, rgba(213,0,125,0.8), rgba(229,57,53,0.8));
background: linear-gradient(45deg, rgba(213,0,125,0.8), rgba(229,57,53,0.8));
min-height: 100vh;
width: 100%;
}
@ -669,43 +664,52 @@ audio{
#encours{
display: flex;
background-color: rgba(139, 91, 1, 0.87);
flex-wrap : nowrap;
flex-wrap : wrap;
flex-direction: row;
width: 100%;
justify-content: space-around;
}
#encours div{
background-color: rgb(192, 112, 7);
background-color: rgb(39, 39, 39);
padding: 1vw;
margin-top: 5vh;
height: 25vh;
border-radius: 0.5vw;
border: 0.4vw solid rgb(245, 144, 11);
}
#encours h1{
color: rgb(245, 144, 11);
}
#attente{
display: flex;
background-color: rgba(110, 1, 1, 0.466);
flex-wrap: wrap;
justify-content: space-around;
width: 100%;
}
#attente div{
background-color: rgb(190, 101, 101);
padding: 1vw;
margin-top: 2vh;
border-radius: 0.5vw;
height: 17vh;
border: 0.4vw solid rgb(190, 101, 101);
background-color: rgb(39, 39, 39);
}
#attente h1{
color: rgb(190, 101, 101);
}
.finie{
display: none;
}
#middle-container p{
font-size: 20px;
}
#realisee{
background-color: rgba(3, 102, 3, 0.849);
display: flex;
flex-wrap: wrap;
flex-direction: row-reverse;
@ -714,11 +718,15 @@ audio{
}
#realisee div{
background-color: rgb(86, 158, 75);
padding: 1vw;
border: 0.4vw solid rgb(122, 233, 105);
background-color: rgb(39, 39, 39);
padding: 1vw;
margin-top: 2vh;
border-radius: 0.5vw;
height: 17vh;
}
#realisee h1{
color: rgb(122, 233, 105);
}
#attente div :nth-child(2), #attente div :nth-child(3) {

BIN
app/static/images/bgcuisine.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 37 KiB

1
app/static/js/kitchen.js
View file

@ -23,7 +23,6 @@ function WIPed(e, name) {
WIP.insertAdjacentHTML("afterbegin", e.outerHTML);
WIP.querySelector(`#${e.id}`).addEventListener("click", ev => {
socket.emit("done command", {"id": parseInt(e.id.replace("cmd", ""))});
console.log("test");
});
e.remove();
}

2
app/templates/cuisine.html
View file

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block content %}
<div class="bg-contact2" id="main-container" style="background-image: url({{ url_for('static',filename='images/bg-01.jpg') }});">
<div class="bg-contact2" id="main-container" style="background-image: url({{ url_for('static',filename='images/bgcuisine.png') }});">
<div id="middle-container">
<div id="encours">

19
requirements.txt
View file

@ -1,9 +1,6 @@
alembic==1.3.2
certifi==2019.11.28
chardet==3.0.4
alembic==1.3.3
Click==7.0
Flask==1.1.1
Flask-JWT==0.3.2
Flask-Login==0.4.1
Flask-Migrate==2.5.2
Flask-SocketIO==4.2.1
@ -12,21 +9,15 @@ Flask-WTF==0.14.2
gevent==1.4.0
gevent-websocket==0.10.1
greenlet==0.4.15
idna==2.8
itsdangerous==1.1.0
Jinja2==2.10.3
Mako==1.1.0
Jinja2==2.11.1
Mako==1.1.1
MarkupSafe==1.1.1
marshmallow==3.3.0
marshmallow-sqlalchemy==0.21.0
PyJWT==1.4.2
python-dateutil==2.8.1
python-editor==1.0.4
python-engineio==3.11.2
python-socketio==4.4.0
requests==2.22.0
six==1.14.0
SQLAlchemy==1.3.12
urllib3==1.25.7
Werkzeug==0.16.0
SQLAlchemy==1.3.13
Werkzeug==0.16.1
WTForms==2.2.1