michal/craftbeerpi3
1
0
Fork 0
mirror of https://github.com/Manuel83/craftbeerpi3 synced 2026-08-10 02:55:27 +02:00
Code Issues Releases Wiki Activity

- Login Added. Default Password is „beer“

Browse Source 
- Several UI Adjustments - still work in progress
- New API Method to add custom JavaScript to CraftBeerPi
- Global Action Buttons added
- Register new Web Modules for complete custom UI
This commit is contained in:
Manuel83
2017-09-24 15:10:45 +02:00
parent 42ed9f02af
commit 813b2f0035
22 changed files with 354 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/__init__.py
+15 -6
View File
@@ -1,4 +1,4 @@
from flask import Blueprint
from flask import Blueprint,render_template
from modules.core.core import cbpi
@@ -11,11 +11,20 @@ def init(cbpi):
@react.route('/', methods=["GET"])
def index():
return react.send_static_file("index.html")
#return react.send_static_file("index.html")
js_files = []
for key, value in cbpi.cache["js"].iteritems():
js_files.append(value)
print js_files
return render_template('index.html', js_files=js_files)
@cbpi._app.errorhandler(404)
def page_not_found(e):
return render_template('404.html'), 404
modules/ui/src/App.css
+1 -2
View File
@@ -7,8 +7,7 @@
}
.container-fluid {
padding-right: 5px;
padding-left: 5px;
}
modules/ui/src/index.css
+1 -3
View File
@@ -1,5 +1,3 @@
body {
margin: 0;
padding: 0;
font-family: sans-serif;
}
modules/ui/static/bundle.js
+44 -48
View File
File diff suppressed because one or more lines are too long
modules/ui/templates/404.html
+29
View File
@@ -0,0 +1,29 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<link rel="stylesheet" href="/ui/static/bootstrap.min.css">
<link rel="stylesheet" href="/ui/static/css/font-awesome.min.css">
<link rel="stylesheet" href="/ui/static/bootstrap.dark.css">
<link href="https://fonts.googleapis.com/css?family=Dosis:200,500" rel="stylesheet">
<style>
body, h1, h2, h3, h4, h5, h6 {
font-family: 'Dosis', sans-serif;
}
</style>
<title>CraftBeerPi 3.1</title>
</head>
<body>
<h1>CraftBeerPi - Page not Found!</h1>
</body>
</html>
modules/ui/templates/index.html
+33
View File
@@ -0,0 +1,33 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<link rel="stylesheet" href="static/bootstrap.min.css">
<link rel="stylesheet" href="static/css/font-awesome.min.css">
<link rel="stylesheet" href="static/bootstrap.dark.css">
<link href="https://fonts.googleapis.com/css?family=Dosis:200,500" rel="stylesheet">
<style>
body, h1, h2, h3, h4, h5, h6 {
font-family: 'Dosis', sans-serif;
}
</style>
<title>CraftBeerPi 3.1</title>
</head>
<body>
<div id="root" ></div>
{% for file in js_files %}
<script src="{{ file }}" type="text/javascript"></script>
{% endfor %}
<script src="static/bundle.js" type="text/javascript"></script>
</body>
</html>