Merge pull request #4 from myoung34/hamburger

Add hamburger slider and settings support via FS sessions

.dockerignore

@@ -0,0 +1,2 @@
+.tox
+flask_session

.gitignore

@@ -7,3 +7,4 @@ __pycache__
 data
 .tox
 .venv
+flask_session

Makefile

@@ -21,6 +21,7 @@ run:
 
 .PHONY: seed
 seed:
-	rm data/*.sqlite
+	rm data || :
+	mkdir data || :
 	sqlite3 data/tilt.sqlite ".read seed/create.sql"
 	bash seed/seed.sh

docker-compose.yml

@@ -6,9 +6,3 @@ services:
       - ./data:/data
     ports:
       - 5000:5000
-    environment:
-      - AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
-      - AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
-      - AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN
-      - AWS_REGION=$AWS_REGION
-      - AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION

pyproject.toml

@@ -15,6 +15,7 @@ Flask-Cors = "^3.0.8"
 gunicorn = "^20.0.4"
 configobj = "^5.0.6"
 eventlet = "^0.26.1"
+flask-session = "^0.3.2"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^3.7"

requirements-dev.txt

@@ -3,6 +3,7 @@ astroid==2.4.2
 atomicwrites==1.4.0; sys_platform == "win32"
 attrs==19.3.0
 bandit==1.6.2
+cachelib==0.1.1
 certifi==2020.6.20
 chardet==3.0.4
 click==7.1.2
@@ -20,6 +21,7 @@ flake8==3.8.3
 flask==1.1.2
 flask-bootstrap==3.3.7.1
 flask-cors==3.0.8
+flask-session==0.3.2
 flask-socketio==4.3.1
 flask-sqlalchemy==2.4.4
 gitdb==4.0.5

requirements.txt

@@ -1,3 +1,4 @@
+cachelib==0.1.1
 click==7.1.2
 configobj==5.0.6
 dnspython==1.16.0
@@ -6,6 +7,7 @@ eventlet==0.26.1
 flask==1.1.2
 flask-bootstrap==3.3.7.1
 flask-cors==3.0.8
+flask-session==0.3.2
 flask-socketio==4.3.1
 flask-sqlalchemy==2.4.4
 greenlet==0.4.16

tests/test_app.py

@@ -22,6 +22,36 @@ def test_index(client):
     assert client.get(url_for('index')).status_code == 200
 
 
+def test_index(client):
+    """Test that the settings works."""
+
+    assert client.get(url_for('settings')).status_code == 200
+
+
+def test_save_settings(
+    app,
+):
+    test_client = app.test_client()
+    socketio_test_client = socketio.test_client(
+        app,
+        flask_test_client=test_client
+    )
+
+    assert socketio_test_client.is_connected()
+    assert test_client.get(url_for('index')).status_code == 200
+    socketio_test_client.emit(
+        'save settings',
+        {
+            'settings': {
+                'gravity_meas': 'Brix',
+                'gravity_offset': '',
+                'temp_meas': 'Fahrenheit',
+            }
+        }
+    )
+    assert socketio_test_client.get_received() == []
+
+
 def test_refresh(
     app,
 ):

tilty_dashboard/__init__.py

@@ -4,21 +4,24 @@
 import os
 from datetime import datetime, timedelta
 
-from flask import Flask, render_template
+from flask import Flask, render_template, session
 from flask_bootstrap import Bootstrap
 from flask_cors import CORS
 from flask_socketio import SocketIO, emit
 from sqlalchemy import and_
 from werkzeug.contrib.fixers import ProxyFix
 
+from flask_session import Session
 from tilty_dashboard.model import Tilt, db
 
 logging.basicConfig(level=logging.DEBUG)
 log = logging.getLogger(__name__)
 
 
 app = Flask(__name__)
-socketio = SocketIO(app)
+app.config['SESSION_TYPE'] = 'filesystem'
+Session(app)
+socketio = SocketIO(app, manage_session=False)
 
 
 def init_webapp(config):
@@ -36,19 +39,47 @@ def init_webapp(config):
     return app
 
 
+@socketio.on('save settings')
+def save_settings(message):
+    """ Save the settings into the cookie """
+    session["settings"] = message['settings']
+
+
+@app.route('/settings', methods=['GET', 'POST'])
+def settings():
+    """ Settings Page. """
+    return render_template(
+        'settings.html',
+        gravity_meas=session.get('settings', {}).get('gravity_meas'),
+        gravity_offset=session.get('settings', {}).get(
+            'gravity_offset',
+            -0.001
+        ),
+        temp_meas=session.get('settings', {}).get('temp_meas'),
+    )
+
+
 @app.route('/')
 def index():
     """A landing page.
 
     Nothing too interesting here.
 
     """
-    return render_template('index.html')
+    return render_template(
+        'index.html',
+        gravity_meas=session.get('settings', {}).get('gravity_meas'),
+        gravity_offset=session.get('settings', {}).get(
+            'gravity_offset',
+            -0.001
+        ),
+        temp_meas=session.get('settings', {}).get('temp_meas'),
+    )
 
 
 @socketio.on('refresh')
 def refresh():
-    """ todo """
+    """ Query The DB and refresh the socket """
 
     since = datetime.now() - timedelta(days=1)
     last_pulse = db.session.query(  # pylint:disable=E1101