Updated deps

neuralinterfaces · Oct 10, 2023 · a188438 · a188438
1 parent 770def4
commit a188438
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 53 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
-COMMONERS_AUTH_STRING = 'adsfsafasdfasdfasdfsafsadfdsafasdfsda'
+SHARE_SECRET_KEY = '************************************'
 PORT = 8080
diff --git a/commoners.config.ts b/commoners.config.ts
@@ -22,7 +22,7 @@ const defineConfig = (o) => o
 
 export default defineConfig({
 
-    icon: './src/assets/commoners.png', 
+    // icon: './src/assets/logo.png', 
 
     electron: {
         window: {
@@ -36,8 +36,8 @@ export default defineConfig({
         bluetoothPlugin,
         serialPlugin,
         localServicesPlugin(null,  (ip, env) => {
-            const isLocalIP = process.env.LOCAL_IP === ip
-            const hasAuthString = process.env.COMMONERS_AUTH_STRING === env.COMMONERS_AUTH_STRING
+            const isLocalIP = ip === 'localhost'
+            const hasAuthString = process.env.SHARE_SECRET_KEY === env.SHARE_SECRET_KEY
             return hasAuthString || isLocalIP
         }),
 

diff --git a/index.html b/index.html
@@ -20,21 +20,19 @@
   </head>
 
   <body>
-    <div class="container">
-      <h1>Solidarity ✊</h1>
-      <hr/>
+      <nav>
+        <h1>Solidarity ✊</h1>
+      </nav>
       <main>
         <div id="console">
           <ul id="messages"></ul>
         </div>
         <div id="sidebar">
-          <h3>Available Commands</h3>
           <ul id="commands">
             <li>Connect to Serial Device <button id="testSerialConnection">Run</button></li>
             <li>Connect to Bluetooth Device <button id="testBluetoothConnection">Run</button></li>
           </ul>
         </div>
       </main>
-    </div>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,9 +37,9 @@
     "@capacitor/cli": "^5.3.0",
     "@capacitor/core": "^5.3.0",
     "@capacitor/ios": "^5.3.0",
-    "@commoners/bluetooth": "0.0.0",
-    "@commoners/serial": "0.0.0",
-    "@commoners/local-services": "0.0.0",
-    "commoners":  "0.0.21"
+    "@commoners/bluetooth": "0.0.1",
+    "@commoners/serial": "0.0.1",
+    "@commoners/local-services": "0.0.2",
+    "commoners":  "0.0.22"
   }
 }
diff --git a/src/assets/commoners.png b/src/assets/commoners.png
diff --git a/src/frontend/styles.css b/src/frontend/styles.css
@@ -7,21 +7,39 @@
   color: #0f0f0f;
   background-color: #f6f6f6;
 
-  box-sizing: border-box;
-
   font-synthesis: none;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -webkit-text-size-adjust: 100%;
 }
 
+* {
+  box-sizing: border-box;
+}
+
 
 [disabled] {
   opacity: 0.5;
   pointer-events: none;
 }
 
+html, body {
+  margin: 0;
+}
+
+
+body {
+  margin: 0;
+  padding-top: 10vh;
+  padding: 50px;
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+
+
 main {
   display: flex;
   justify-content: center;
@@ -65,15 +83,6 @@ main > * {
   font-size: 90%;
   overflow-y: auto;
 }
-
-.container {
-  margin: 0;
-  padding-top: 10vh;
-  padding: 50px;
-  display: flex;
-  flex-direction: column;
-}
-
 .logo {
   height: 6em;
   padding: 1.5em;
@@ -100,11 +109,13 @@ a:hover {
   color: #535bf2;
 }
 
+nav {
+  margin-bottom: 20px;
+}
 
 h1 {
   margin: 0;
-  margin-bottom: 10px; 
-  padding-bottom: 20px;
+  padding-bottom: 10px;
   border-bottom: 1px solid gainsboro;
 }
 

diff --git a/src/services/node/index.js b/src/services/node/index.js
@@ -11,6 +11,7 @@ const cfg = {
 };
 
 const port = process.env.PORT || 3000
+const host = process.env.HOST || '127.0.0.1'
 
 const server = cfg.ssl ? createServer({
   cert: readFileSync('/path/to/cert.pem'),
@@ -39,4 +40,4 @@ wss.on('connection', function connection(ws) {
   });
 });
 
-console.log(`Server running at http://localhost:${port}/`)
+console.log(`Server running at http://${host}:${port}/`)
diff --git a/src/services/python/main.py b/src/services/python/main.py
@@ -33,4 +33,5 @@ def post():
 if __name__ == "__main__":
     env_port = os.getenv('PORT')
     PORT = int(env_port) if env_port else 8080
-    app.run(host='0.0.0.0', port = PORT)
+    HOST = os.getenv('HOST') or '127.0.0.1'
+    app.run(host=HOST, port = PORT)