fix working bluetooth to make it more working

ee282aa6 · Michael Loipführer · ea8dd590 · ee282aa6 · ee282aa6 · ee282aa6
Commit ee282aa6 authored Jun 24, 2019 by Michael Loipführer
--- a/web/static/js/script.js
+++ b/web/static/js/script.js
 function sendToken(token) {
+  console.log('Sending token: ' + token);
+
  const serviceUUID = '12345678-1234-5678-1234-56789abcdef0';
  const characteristicUUID = '12345678-1234-5678-1234-56789abcdef5';
  const options = {
@@ -20,13 +22,14 @@ function sendToken(token) {
    .then(server => server.getPrimaryService(serviceUUID))
    .then(service => service.getCharacteristic(characteristicUUID))
    .then(characteristic => {
-      const t = Uint8Array.from(atob(token), c => c.charCodeAt(0));
+      const t = Uint8Array.from(token, c => c.charCodeAt(0));
      return characteristic.writeValue(t);
    })
    .then(_ => {
-      console.log('Successfully sent token:', token);
+      alert('Successfully sent token!');
    })
    .catch(error => {
+      alert('Something went wrong:\n' + error);
      console.log('Argh! ' + error);
    });
 }
--- a/web/templates/access.html
+++ b/web/templates/access.html
 {% extends "base.html" %}

 {% block content %}
-  <div class="card" style="width: 18rem;">
-    <div class="card-header">
+  <div class="card">
+    <div class="card-header bg-success text-white">
      <h5 class="card-title">Access Granted</h5>
    </div>
    <div class="card-body">
      <div class="card-text">
-        <div class="row">
-          <img src="{{ qrcode(token) }}" alt="{{ token }}" style="max-width: 100%;">
+        <div class="text-center">
+          <img src="{{ qrcode(token) }}" alt="{{ token }}">
        </div>
-        <div class="text-center pt-3">
+        <div class="pt-3 text-center">
          <button class="btn btn-lg btn-primary" onclick="sendToken('{{ token }}')">Bluetooth</button>
        </div>
      </div>


--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -7,31 +7,16 @@
 </head>
 <body>
 <div class="container">
-  <div class="row justify-content-md-center pt-4 pb-5">
+  <div class="row justify-content-center pt-4 pb-5">
    <h1>Spacelock</h1>
  </div>
  <div class="row justify-content-md-center">
+  <div class="col-sm-12 col-md-8 col-xl-5">
    {% block content %}
-    <div class="card" style="width: 18rem;">
-      <div class="card-header">
-        <h5 class="card-title">Hackerspace Access</h5>
-      </div>
-      <div class="card-body">
-        <form action="/" method="post">
-          <div class="card-text">
-            <div class="form-group">
-              <label for="secret-key">Secret Key</label>
-              <input type="password" class="form-control" id="secret-key" name='secret_key' placeholder="Your Key">
-            </div>
-          </div>
-
-          <button type="submit" class="btn btn-primary float-right">Submit</button>
-        </form>
-      </div>
-    </div>
    {% endblock %}
  </div>
  </div>
+</div>

 {% block scripts %}
 <script type="application/javascript" src="{{ url_for('static', filename='js/script.js') }}"></script>


--- a/web/templates/error.html
+++ b/web/templates/error.html
 {% extends "base.html" %}

 {% block content %}
-  <div class="card" style="width: 18rem;">
+  <div class="card">
    <div class="card-header text-white bg-danger">
      <h5 class="card-title">Access Denied</h5>
    </div>


--- a/web/templates/index.html
+++ b/web/templates/index.html
 {% extends "base.html" %}

 {% block content %}
-  <div class="card" style="width: 18rem;">
+  <div class="card">
    <div class="card-header">
      <h5 class="card-title">Hackerspace Access</h5>
    </div>


--- a/web/web.py
+++ b/web/web.py
@@ -29,7 +29,6 @@ def gen_token(key):
 def index():
    if request.method == 'POST':
        token = gen_token(request.form['secret_key'])
-        print(token)
        if token is None:
            return render_template('error.html', error='DENIED!!!')