Commit af0fadd2 authored by Wen Wei Li's avatar Wen Wei Li

modify some ui

parent c15de659
......@@ -64,7 +64,6 @@ def wifi_scan():
return render_template('wifi.html', data=wifi_list)
@app.route('/wifi_select/<string:ssid>', methods=['GET'])
@app.route('/wifi_select/', methods=['GET'])
def wifi_pass(ssid):
global wifi_list
delete_connection(ssid)
......@@ -79,7 +78,9 @@ def wifi_pass(ssid):
else:
return redirect(url_for('index'))
@app.route('/wifi_select/', methods=['GET'])
def pass_without_ssid():
return redirect(url_for('wifi_scan'))
@app.route('/wifi_conn', methods=["POST"])
def wifi_conn():
......@@ -112,7 +113,5 @@ def pin_store():
def main_page():
return render_template("main_page.html")
if __name__ == '__main__':
if __name__ == '__main__':
app.run(host='0.0.0.0', port=8080, debug=True)
.inline {
display:inline-grid;
}
.table-wrapper-scroll-y{
display:block;
}
.scrollbar{
position:relative;
height: 300px;
overflow: auto;
}
.input {
width: auto;
height: 50px;
}
input:focus{
color:blue;
}
td {
cursor: pointer;
}
input.input_margin{
margin-right: 6%;
}
button .left{
float:right;
}
......@@ -37,19 +37,21 @@
{% block content%}
<body class="bg-light m-5">
<div>
<p style="visibility:hidden" id="ssid">{{data}}</p>
<h2 class="text-muted text-center m-5">Wifi Password</h2>
<center>
{% if isEnc is sameas true%}
<div class="row align-items-center m-5 col-8">
<div class="col-10 inline ">
<input type="password" class="form-control input" id="wifi-password"
<input type="password" class="form-control" id="wifi-password"
placeholder="Tap on the virtual keyboard to start">
</div>
{% endif%}
<div class="col-2 inline">
<button type="submit" class="btn btn-primary" id="conn" style="height:50px">Connect</button>
</div>
</div>
<div class="container m-5">
<button type="submit" class="btn btn-primary btn-danger btn-lg pull-left" id="prev" >Previous</button>
<button type="submit" class="btn btn-primary btn-danger btn-lg pull-right" id="conn" >Connect</button>
</div>
<div class="row align-items-center">
<div class="col m-5 inline">
......@@ -57,6 +59,7 @@
</div>
</div>
</center>
</div>
<script src="{{url_for('static', filename='js/keyboard.min.js')}}"></script>
<script src="{{url_for('static', filename='js/index.js')}}"></script>
<script>
......@@ -80,6 +83,9 @@
});
});
$('#prev').click(function(){
window.location.href="http://localhost:8080/wifi_scan";
});
</script>
<!-- keyboard js-->
</body>
......
......@@ -5,12 +5,12 @@
<link rel="stylesheet" href="{{url_for('static',filename='css/main.css')}}">
{% endblock %}
{% block content %}
<body >
<div class="col-2" >
<button type="submit" id="pin_setup" class="btn btn-primary">Pincode Setup</button>
</div>
<div class="col-2">
<button type="submit" id="setting" class="btn btn-primary">Preference</button>
<body class="m-5">
<div class="row align-items-center mx-auto col-8">
<center>
<button type="submit" id="pin_setup" class="btn btn-primary btn-lg px-md-5">Pincode Setup</button>
<button type="submit" id="setting" class="btn btn-primary btn-lg px-md-5">Preference</button>
</center>
</div>
{% block footer %}
......
......@@ -10,6 +10,7 @@
{% block content %}
<h2 class="text-muted text-center m-5">WIFI SSID</h2>
<div class="container m-5">
<div class="table-wrapper-scoll-y scrollbar">
<table class="table table-hover">
<thead>
<tr>
......@@ -28,7 +29,7 @@
{% endfor %}
</tbody>
</table>
</div>
<button type="button" id="prev" class="btn btn-danger btn-lg pull-left">previous</button>
<button type="button" id="button" class="btn btn-danger btn-lg pull-right">confirm</button>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment