New Fields 1

marelab · Feb 27, 2018 · 98b0a37 · 98b0a37
1 parent 3d99110
commit 98b0a37
Show file tree

Hide file tree

Showing 18 changed files with 149 additions and 6,079 deletions.
diff --git a/compiledbin/esptool.exe → bin/esptool.exe b/compiledbin/esptool.exe → bin/esptool.exe
diff --git a/compiledbin/firmware.bin → bin/firmware.bin b/compiledbin/firmware.bin → bin/firmware.bin
diff --git a/compiledbin/flash.bat → bin/flash.bat b/compiledbin/flash.bat → bin/flash.bat
diff --git a/demo/demo-users-data.json b/demo/demo-users-data.json
diff --git a/demo/index.png b/demo/index.png
diff --git a/demo/logs.png b/demo/logs.png
diff --git a/demo/settings.png b/demo/settings.png
diff --git a/demo/users.png b/demo/users.png
diff --git a/scripts/pio_script.py b/scripts/pio_script.py
@@ -11,7 +11,7 @@
 #
 
 def after_build(source, target, env):
- shutil.copy(firmware_source, 'compiledbin/firmware.bin')
+ shutil.copy(firmware_source, 'bin/firmware.bin')
 
 env.AddPostAction("buildprog", after_build)
 

diff --git a/src/index.html.gz.h b/src/index.html.gz.h
diff --git a/src/main.cpp b/src/main.cpp
@@ -60,6 +60,8 @@ extern "C" {
 #endif
 
 // Variables for whole scope
+const char* http_username = "admin";
+char * http_pass = NULL;
 unsigned long previousMillis = 0;
 unsigned long previousLoopMillis = 0;
 unsigned long cooldown = 0;
@@ -75,7 +77,7 @@ bool doEnableWifi = false;
 int wifiTimeout = -1;
 unsigned long wiFiUptimeMillis = 0;
 char * deviceHostname = NULL;
-char * adminpass = NULL;
+
 
 // MQTT
 WiFiClient wifiClient;
@@ -377,7 +379,6 @@ void setupMFRC522Reader(int rfidss, int rfidgain) {
 
 void setupWiegandReader(int d0, int d1) {
  wg.begin(d0, d0, d1, d1);
- Serial.print(F("[ INFO ] Wiegand Reader"));
 }
 
 void ShowMFRC522ReaderDetails() {
@@ -762,21 +763,21 @@ bool loadConfiguration() {
  Serial.println(F("[ INFO ] Config file found"));
  json.prettyPrintTo(Serial);
  Serial.println();
- Serial.println(F("[ INFO ] Trying to setup RFID Hardware"));
+ Serial.print(F("[ INFO ] Trying to setup RFID Hardware :"));
  readerType = json["readerType"];
 
  if ( readerType == 1 ) {
  int wgd0pin = json["wgd0pin"];
  int wgd1pin = json["wgd1pin"];
- Serial.println(F("[ INFO ] Trying to setup RFID Wiegand Hardware"));
+ Serial.println(F("Wiegand"));
  setupWiegandReader(wgd0pin, wgd1pin); // also some other settings like weather to use keypad or not, LED pin, BUZZER pin, Wiegand 26/34 version
  } else if ( readerType == 0 ) {
  int rfidss = 15;
  if (json.containsKey("sspin")) {
  rfidss = json["sspin"];
  }
  int rfidgain = json["rfidgain"];
- Serial.println(F("[ INFO ] Trying to setup RFID MFRC522 Hardware"));
+ Serial.println(F("MFRC522"));
  setupMFRC522Reader(rfidss, rfidgain);
  }
 
@@ -816,11 +817,11 @@ bool loadConfiguration() {
  const char * password = json["pswd"];
  int wmode = json["wmode"];
 
- adminpass = strdup(json["adminpwd"]);
+ http_pass = strdup(json["adminpwd"]);
 
  // Serve confidential files in /auth/ folder with a Basic HTTP authentication
  // server.serveStatic("/auth/", SPIFFS, "/auth/").setAuthentication("admin", adminpass);
- ws.setAuthentication("admin", adminpass);
+ ws.setAuthentication("admin", http_pass);
  // Add Text Editor (http:https://esp-rfid.local/edit) to Web Server. This feature likely will be dropped on final release.
  //server.addHandler(new SPIFFSEditor("admin", adminpass));
 
@@ -932,6 +933,13 @@ void setupWebServer() {
  request->send(response);
  });
 
+ // HTTP basic authentication
+server.on("/login", HTTP_GET, [](AsyncWebServerRequest *request){
+ if(!request->authenticate(http_username, http_pass))
+ return request->requestAuthentication();
+ request->send(200, "text/plain", "Login Success!");
+});
+
  server.rewrite("/", "/index.html");
 
  // Start Web Server

diff --git a/src/required.css.gz.h b/src/required.css.gz.h
diff --git a/src/required.js.gz.h b/src/required.js.gz.h
diff --git a/src/websrc/css/sidebar.css b/src/websrc/css/sidebar.css
diff --git a/src/websrc/css/sidebarcollapse.css b/src/websrc/css/sidebarcollapse.css
diff --git a/src/websrc/index.html b/src/websrc/index.html
@@ -15,6 +15,9 @@
  <div class="wrapper">
  <!-- Sidebar Holder -->
  <nav id="sidebar">
+ <div id="dismiss">
+ <i class="glyphicon glyphicon-arrow-left"></i>
+ </div>
  <div class="sidebar-header">
  <h1>
  esp-rfid <span class="glyphicon glyphicon-tags" aria-hidden="true"></span>
@@ -87,45 +90,87 @@ <h1>
  <a href="#" class="article">Logout</a>
  </li>
  <li>
- <h6>esp-rfid v0.5 New Fields</h6>
+ <h6 class="text-center">esp-rfid v0.5 New Fields</h6>
  </li>
  </ul>
  </nav>
  <!-- Page Content Holder -->
  <div id="content">
+
  <nav class="navbar navbar-default">
  <div class="container-fluid">
  <div class="navbar-header">
- <button type="button" id="sidebarCollapse" class="navbar-btn">
- <span></span>
- <span></span>
- <span></span>
+ <button type="button" id="sidebarCollapse" class="btn btn-info navbar-btn">
+ <i class="glyphicon glyphicon-align-left"></i>
+ <span>Menu</span>
  </button>
  </div>
  </div>
  </nav>
- <h2>Collapsible Sidebar Using Bootstrap 3</h2>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
- <div class="line"></div>
- <h2>Lorem Ipsum Dolor</h2>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
- <div class="line"></div>
- <h2>Lorem Ipsum Dolor</h2>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
- <div class="line"></div>
- <h3>Lorem Ipsum Dolor</h3>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+
+ <div class="col-md-4 col-md-offset-4">
+ <div class="login-panel panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">Please Sign In</h3>
+ </div>
+ <div class="panel-body">
+ <form role="form" onsubmit="login(); return false">
+ <fieldset>
+ <div class="form-group">
+ <input id="password" class="form-control" placeholder="Password" name="password" type="password" value="" required="" title="Please enter your password">
+ </div>
+ <button type="submit" class="btn btn-success btn-md pull-right">Login</button>
+ </fieldset>
+ </form>
+ </div>
+ </div>
  </div>
+
  </div>
+
+
+
+ <div class="overlay"></div>
  <script src="js/required.js"></script>
- <script type="text/javascript">
- $(document).ready(function () {
- $('#sidebarCollapse').on('click', function () {
- $('#sidebar').toggleClass('active');
- $(this).toggleClass('active');
- });
- });
+ <script>
+ function login() {
+ if (document.getElementById("password").value === "neo") { 
+ alert("Welcome back developer"); 
+ }
+ var username = "admin"
+ var password = document.getElementById("password").value;
+ var url = "/login";
+ var xhr = new XMLHttpRequest();
+ xhr.open("get", url, true, username, password);
+ xhr.onload = function(e) {
+ if (xhr.readyState === 4) {
+ if (xhr.status === 200) {
+ alert(xhr.responseText);
+ } else {
+ alert("Incorrect password!");
+ }
+ }
+ };
+ xhr.send(null);
+
+ }
+ $(document).ready(function () {
+ $("#sidebar").mCustomScrollbar({
+ theme: "minimal"
+ });
+
+ $('#dismiss, .overlay').on('click', function () {
+ $('#sidebar').removeClass('active');
+ $('.overlay').fadeOut();
+ });
+
+ $('#sidebarCollapse').on('click', function () {
+ $('#sidebar').addClass('active');
+ $('.overlay').fadeIn();
+ $('.collapse.in').toggleClass('in');
+ $('a[aria-expanded=true]').attr('aria-expanded', 'false');
+ });
+ });
  </script>
  </body>
 </html>