Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
3 changed files with 7 additions and 5 deletions
Showing only changes of commit 0d251b212e - Show all commits

View File

@ -75,14 +75,14 @@
</div> </div>
<div class="ble"> <div class="ble">
<h2>WIFI</h2> <h2>WIFI</h2>
<div id="ip">
Local IP: null
</div>
<div> <div>
<select id="available" class="" onchange="mobile.editWifi();"> <select id="available" class="" onchange="mobile.editWifi();">
<option>N/A</option> <option>N/A</option>
</select> </select>
</div> </div>
<div id="ip">
Local IP: null
</div>
<div> <div>
<input type="password" id="password" class="" placeholder="Wifi Password" /> <input type="password" id="password" class="" placeholder="Wifi Password" />
</div> </div>

View File

@ -15,7 +15,7 @@ const INDEXPATH = './app/www/index.html'
let app = restify.createServer({ let app = restify.createServer({
name: APPNAME, name: APPNAME,
version: '0.0.1' version: PACKAGE.version
}) })
let ble let ble

View File

@ -1,9 +1,11 @@
'use strict' 'use strict'
const os = require('os') const os = require('os')
const path = require('path')
const sqlite3 = require('sqlite3').verbose() const sqlite3 = require('sqlite3').verbose()
const squel = require('squel') const squel = require('squel')
const DB_FILE = os.homedir() + '/.intval3.db'
const DB_FILE = path.join(os.homedir(), '.intval3.db')
const db = new sqlite3.Database(DB_FILE) const db = new sqlite3.Database(DB_FILE)
class DB { class DB {