diff --git a/.gitignore b/.gitignore index 7824f1c..1fe2b59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /node_modules /npm-debug.log -/app/public/external \ No newline at end of file +/app/public/external +/.idea \ No newline at end of file diff --git a/app/public/app.css b/app/public/app.css index 9cf1736..0015288 100644 --- a/app/public/app.css +++ b/app/public/app.css @@ -233,16 +233,8 @@ html, body { cursor: pointer; } .btn-cancel { - background: #881111; top: 90px; left: 20px; } .btn-ok { top: 90px; left: 170px; - background: #118811; -} -.btn-cancel:hover { - background: #ff2222; -} -.btn-ok:hover { - background: #22ff22; -} +} \ No newline at end of file diff --git a/app/public/app.js b/app/public/app.js index 4f402ce..87858ed 100644 --- a/app/public/app.js +++ b/app/public/app.js @@ -113,7 +113,7 @@ app.directive("rwcPasswordEntry", function($timeout) { template: [ "
", "
", - " ", + " ", "
Cancel
", "
Submit
", "
", diff --git a/app/views/index.ejs b/app/views/index.ejs index 581611a..03c9716 100644 --- a/app/views/index.ejs +++ b/app/views/index.ejs @@ -2,7 +2,7 @@ - Rpi Wifi Config + Gardenspace Configuration Wizard @@ -16,8 +16,12 @@ +
+ Gardenspace Logo +
+
- Choose a Wifi Ap + Choose a Wifi AP diff --git a/assets/img/logo.jpg b/assets/img/logo.jpg new file mode 100644 index 0000000..2bf5aa2 Binary files /dev/null and b/assets/img/logo.jpg differ diff --git a/config.json b/config.json index c078123..cda3434 100644 --- a/config.json +++ b/config.json @@ -3,10 +3,10 @@ "wifi_driver_type": "nl80211", "access_point": { - "force_reconfigure": true, + "force_reconfigure": false, "wifi_interface": "wlan0", - "ssid": "rpi-config-ap", - "passphrase": "zzzzzzzz", + "ssid": "gardenspace", + "passphrase": "gardenspace", "domain": "rpi.config", "ip_addr": "192.168.44.1", "netmask": "255.255.255.0", diff --git a/server.js b/server.js index 9f8dd78..ac91a0c 100644 --- a/server.js +++ b/server.js @@ -68,7 +68,7 @@ async.series([ function start_http_server(next_step) { console.log("\nHTTP server running..."); require("./app/api.js")(wifi_manager, next_step); - }, + } ], function(error) { if (error) {