From a4d7fa9b3b1d6320d9e9bb7acae25683d786918c Mon Sep 17 00:00:00 2001
From: SanderGi <97496861+SanderGi@users.noreply.github.com>
Date: Sun, 13 Feb 2022 21:30:16 -0800
Subject: [PATCH] Source v1.0.1

---
 Source/README.MD      |  3 +++
 Source/app.py         |  2 +-
 Source/app.spec       | 44 +++++++++++++++++++++++++++++++++++++++++++
 Source/web/index.html | 11 +++++++----
 Source/web/sketch.js  | 25 ++++++++++++++++++++----
 Source/web/style.css  | 19 +++++++++++++++----
 6 files changed, 91 insertions(+), 13 deletions(-)
 create mode 100644 Source/app.spec

diff --git a/Source/README.MD b/Source/README.MD
index 7188a24..d4d8116 100644
--- a/Source/README.MD
+++ b/Source/README.MD
@@ -5,3 +5,6 @@ pip install PyInstaller
 
 # Compile to exe:
 python -m eel app.py web --onefile --noconsole
+
+# Compile to folder:
+python -m eel app.py web --noconsole
\ No newline at end of file
diff --git a/Source/app.py b/Source/app.py
index cbbda4b..1c078e0 100644
--- a/Source/app.py
+++ b/Source/app.py
@@ -10,4 +10,4 @@ def collectWifiData(times, waittime):
         eel.sleep(waittime)
         eel.displayWifiData(i, str(get_BSSI()))
 
-eel.start('index.html', size=(1024, 768), position=(0,0))
\ No newline at end of file
+eel.start('index.html', port=8080, size=(1024, 768), position=(0,0))
\ No newline at end of file
diff --git a/Source/app.spec b/Source/app.spec
new file mode 100644
index 0000000..7c15d1a
--- /dev/null
+++ b/Source/app.spec
@@ -0,0 +1,44 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['app.py'],
+             pathex=[],
+             binaries=[],
+             datas=[('C:\\Users\\alexa\\Desktop\\Project Scioly\\WiFi\\WiFiStrengthTester\\env\\lib\\site-packages\\eel\\eel.js', 'eel'), ('web', 'web')],
+             hiddenimports=['bottle_websocket'],
+             hookspath=[],
+             hooksconfig={},
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts, 
+          [],
+          exclude_binaries=True,
+          name='app',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          console=False,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas, 
+               strip=False,
+               upx=True,
+               upx_exclude=[],
+               name='app')
diff --git a/Source/web/index.html b/Source/web/index.html
index 9451b17..57c5766 100644
--- a/Source/web/index.html
+++ b/Source/web/index.html
@@ -15,19 +15,22 @@
         <h2>Control Panel</h2>
         <div>
             <label>Trial Count: </label>
-            <input type="text" id="trialcount" value="10">
+            <input type="text" id="trialcount" value="15" placeholder="How many scans">
         </div>
         <div>
             <label>Time (sec): </label>
-            <input type="text" id="interval" value="10">
+            <input type="text" id="interval" value="10" placeholder="How long to scan">
         </div>
         <div>
             <label>SSID: </label>
-            <input type="text" id="ssid" value="master-control">
+            <input type="text" id="ssid" value="dd-wrt" list="ssids" placeholder="Network Name">
+            <datalist id="ssids">
+                <option value="*all*">
+            </datalist>
         </div>
         <br>
         <button id="measure" onclick="collectData()">COLLECT DATA!</button>
-
+        <div style="height: 15px;"></div>
         <p id="average">Mean RSS: not calculated</p>
         <p id="range">RSS range: not calculated</p>
         <p id="successes">Complete Scans: not calculated</p>
diff --git a/Source/web/sketch.js b/Source/web/sketch.js
index baccaf1..8416d96 100644
--- a/Source/web/sketch.js
+++ b/Source/web/sketch.js
@@ -20,9 +20,12 @@ function displayWifiData(trial, string) {
     }
 
     // format data in table
+    document.getElementById('ssids').innerHTML = '<option value="*all*">';
     $('table tr:last').css("border-bottom","2px solid black");
     for (const [ssid, rss] of Object.entries(ssids)) {
         // const average = (array) => array.reduce((a, b) => a + b) / array.length;
+        document.getElementById('ssids').innerHTML += '<option value="'+ssid+'">';
+        if (ssid != id && id != '*all*') continue;
         let tr = tbody.insertRow();
         let td = tr.insertCell();
         td.appendChild(document.createTextNode(`${trial}`));
@@ -42,12 +45,17 @@ function displayWifiData(trial, string) {
             totalRSS += rssReading;
             minRSS = Math.min(rssReading, minRSS);
             maxRSS = Math.max(rssReading, maxRSS);
-            let average = totalRSS / count;
+            let average = Math.round(totalRSS / count);
             document.getElementById("average").innerHTML = `Mean RSS: ${average} dBm`;
             document.getElementById("range").innerHTML = `RSS range: ${minRSS} to ${maxRSS} dBm`;
             document.getElementById("successes").innerHTML = "Complete Scans: " + count;
         }
     }
+
+    // reenable button if all trials are complete
+    if (trial == trialcount - 1) {
+        document.getElementById("measure").disabled = false;
+    }
 }
 
 let tbl = document.createElement('table');
@@ -76,16 +84,19 @@ function createTable() {
 }
 
 createTable();
-let id;
+let id = "alor873uw:#(*ug";
 let minRSS = Infinity;
 let maxRSS = -Infinity;
 let totalRSS = 0;
 let count = 0;
+let trialcount = 0;
+eel.collectWifiData(2, 2) // initial trial to find networks
 function collectData() {
+    document.getElementById("measure").disabled = true;
     document.getElementById("trials").innerHTML = "<h2>Data Table</h2>";
     tbl = document.createElement('table');
     createTable();
-    let trialcount = parseInt(document.getElementById("trialcount").value);
+    trialcount = parseInt(document.getElementById("trialcount").value);
     let interval = parseInt(document.getElementById("interval").value);
     id = document.getElementById("ssid").value;
     minRSS = Infinity;
@@ -93,4 +104,10 @@ function collectData() {
     totalRSS = 0;
     count = 0;
     eel.collectWifiData(trialcount, interval / trialcount);
-}
\ No newline at end of file
+}
+
+let savedVal;
+$('#ssid').on('click', function() {
+    savedVal = $(this).val();
+    $(this).val('');
+});
\ No newline at end of file
diff --git a/Source/web/style.css b/Source/web/style.css
index 0fcfe6b..47c23d2 100644
--- a/Source/web/style.css
+++ b/Source/web/style.css
@@ -20,7 +20,7 @@ body {
 }
 
 #control > div {
-    margin-bottom: 10px;
+    margin-bottom: 5px;
     width: 90%;
     text-align: right;
 }
@@ -39,13 +39,20 @@ body {
     border-radius: 15px;
     box-shadow: 0 9px #999;
     margin: auto;
-  }
+}
   
-  #measure:active {
+#measure:active {
     background-color: #3e8e41;
     box-shadow: 0 5px #666;
     transform: translateY(4px);
-  }
+}
+
+#measure:disabled {
+    color: rgba(255, 255, 255, 0.705);
+    background-color: rgba(76, 175, 79, 0.705);
+    box-shadow: 0 9px rgba(153, 153, 153, 0.705);
+    cursor: wait;
+}
 
 table {
     margin: 20px;
@@ -92,4 +99,8 @@ td {
     bottom: 40%;
     width: 40%;
     text-align: left;
+}
+
+input::-webkit-calendar-picker-indicator {
+    opacity: 100;
 }
\ No newline at end of file