asaril/McLighting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update web libraries and get rid of app.manifest

Browse source 
Deprecated over http
This commit is contained in:
Tobias Blum 2017-12-16 23:41:55 +01:00
parent cf700d1ef5
commit b726aee15a
6 changed files with 17 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1 +1,3 @@
clients/web/node_modules/ clients/web/node_modules/
clients/web/\.vscode/

12
clients/web/build/index.htm
View file

@ -1,10 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html manifest="offline.appcache"> <html>
<head> <head>
<!--Import Google Icon Font--> <!--Import Google Icon Font-->
<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!--Import materialize.css--> <!--Import materialize.css-->
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/css/materialize.min.css" media="screen,projection" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" media="screen,projection" />
<!--Let browser know website is optimized for mobile--> <!--Let browser know website is optimized for mobile-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
@ -104,14 +104,14 @@
<div class="row"> <div class="row">
<div class="input-field col s12"> <div class="input-field col s12">
<label for="txt_delay">Speed</label><br/> <label for="txt_delay">Speed</label><br/>
<p class="range-field"><input type="range" id="rng_delay" min="0" max="255" value="50" class="update_delay" /></p> <p class="range-field"><input type="range" id="rng_delay" min="0" max="255" value="196" class="update_delay" /></p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="input-field col s12"> <div class="input-field col s12">
<label for="txt_delay">Brightness</label><br/> <label for="txt_delay">Brightness</label><br/>
<p class="range-field"><input type="range" id="rng_brightness" min="0" max="255" value="255" class="update_brightness" /></p> <p class="range-field"><input type="range" id="rng_brightness" min="0" max="255" value="196" class="update_brightness" /></p>
</div> </div>
</div> </div>
</form> </form>
@ -154,8 +154,8 @@
</style> </style>
<!--Import jQuery before materialize.js--> <!--Import jQuery before materialize.js-->
<script type="text/javascript" src="http://code.jquery.com/jquery-2.1.1.min.js"></script> <script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
<script type="text/javascript">(function($){ <script type="text/javascript">(function($){
$(function(){ $(function(){

13
clients/web/build/offline.appcache
View file

@ -1,13 +0,0 @@
CACHE MANIFEST
# Explicitly cached 'master entries'.
# index.html
http://code.jquery.com/jquery-2.1.1.min.js
http://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js
http://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/css/materialize.min.css
http://fonts.googleapis.com/icon?family=Material+Icons
# Resources that require the user to be online.
NETWORK:
*

14
clients/web/gulpfile.js
View file

@ -18,12 +18,6 @@ gulp.task('html', function() {
.pipe(connect.reload()); .pipe(connect.reload());
}); });
gulp.task('appcache', function() {
gulp.src(src_dir + '*.appcache')
.pipe(gulp.dest('build'))
.pipe(connect.reload());
});
gulp.task('connect', function() { gulp.task('connect', function() {
connect.server({ connect.server({
@ -35,12 +29,11 @@ gulp.task('connect', function() {
gulp.task('watch', function() { gulp.task('watch', function() {
gulp.watch(src_dir + '*.htm', ['html']); gulp.watch(src_dir + '*.htm', ['html']);
gulp.watch(src_dir + 'js/*.js', ['html']); gulp.watch(src_dir + 'js/*.js', ['html']);
gulp.watch(src_dir + '*.appcache', ['appcache']);
}); });
gulp.task('upload', ['html', 'appcache'], function() { gulp.task('upload', ['html'], function() {
var url = 'http://192.168.0.40/edit'; var url = 'http://192.168.0.49/edit';
var options = { var options = {
url: url, url: url,
headers: { headers: {
@ -56,8 +49,7 @@ gulp.task('upload', ['html', 'appcache'], function() {
}); });
var form = r.form(); var form = r.form();
form.append('data', fs.createReadStream(__dirname + "/" + build_dir + '/index.htm'), {filename: '/index.htm', contentType: "application/octet-stream"}); form.append('data', fs.createReadStream(__dirname + "/" + build_dir + '/index.htm'), {filename: '/index.htm', contentType: "application/octet-stream"});
form.append('data', fs.createReadStream(__dirname + "/" + build_dir + '/offline.appcache'), {filename: '/offline.appcache', contentType: "application/octet-stream"});
}); });
gulp.task('default', ['html', 'appcache']); gulp.task('default', ['html']);
gulp.task('serve', ['watch', 'connect']); gulp.task('serve', ['watch', 'connect']);

12
clients/web/src/index.htm
View file

@ -1,10 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html manifest="offline.appcache"> <html>
<head> <head>
<!--Import Google Icon Font--> <!--Import Google Icon Font-->
<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!--Import materialize.css--> <!--Import materialize.css-->
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/css/materialize.min.css" media="screen,projection" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" media="screen,projection" />
<!--Let browser know website is optimized for mobile--> <!--Let browser know website is optimized for mobile-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
@ -104,14 +104,14 @@
<div class="row"> <div class="row">
<div class="input-field col s12"> <div class="input-field col s12">
<label for="txt_delay">Speed</label><br/> <label for="txt_delay">Speed</label><br/>
<p class="range-field"><input type="range" id="rng_delay" min="0" max="255" value="50" class="update_delay" /></p> <p class="range-field"><input type="range" id="rng_delay" min="0" max="255" value="196" class="update_delay" /></p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="input-field col s12"> <div class="input-field col s12">
<label for="txt_delay">Brightness</label><br/> <label for="txt_delay">Brightness</label><br/>
<p class="range-field"><input type="range" id="rng_brightness" min="0" max="255" value="255" class="update_brightness" /></p> <p class="range-field"><input type="range" id="rng_brightness" min="0" max="255" value="196" class="update_brightness" /></p>
</div> </div>
</div> </div>
</form> </form>
@ -154,8 +154,8 @@
</style> </style>
<!--Import jQuery before materialize.js--> <!--Import jQuery before materialize.js-->
<script type="text/javascript" src="http://code.jquery.com/jquery-2.1.1.min.js"></script> <script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
<script type="text/javascript">@@include('js/script.js')</script> <script type="text/javascript">@@include('js/script.js')</script>
</body> </body>
</html> </html>

13
clients/web/src/offline.appcache
View file

@ -1,13 +0,0 @@
CACHE MANIFEST
# Explicitly cached 'master entries'.
# index.html
http://code.jquery.com/jquery-2.1.1.min.js
http://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js
http://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/css/materialize.min.css
http://fonts.googleapis.com/icon?family=Material+Icons
# Resources that require the user to be online.
NETWORK:
*