cleaned up ui, upgraded to bootstrap5

Author: yamanote1138

config/main.cfg.default

@@ -10,3 +10,6 @@ eyes_speed = 100
 eyes_duration = .4
 mouth_speed = 100
 mouth_duration = .4
+[character]
+name = teddy
+prefix = t

index.html

@@ -36,12 +36,18 @@ def __init__(self, config):
       label='mouth'
     )
 
+    self.character = {
+      'name': config.get('character', 'name'),
+      'prefix': config.get('character', 'prefix')
+    }
+    logging.debug('character is:{}\nprefix is:{}'.format(self.character['name'], self.character['prefix']))
+
     #set starting motor positions
     self.eyes.open()
     self.mouth.close()
     self.talkThread = Thread(target=self.__talkMonitor)
     self.blinkThread = Thread(target=self.__blinkMonitor)
-    logging.debug("bear constructor finished")
+    logging.debug("bear ccconstructor finished")
 
   def __del__(self):
     logging.debug("bear deconstructor finished")

lib/bear.py

@@ -3,7 +3,6 @@
 from time import sleep
 import logging
 import RPi.GPIO as GPIO
-import time
 
 class Servo:
 

lib/servo.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
 from aiohttp import web
-from time import sleep
-import logging, socket, socketio, time
+import jinja2
+import aiohttp_jinja2
+import os, socket, socketio
 
 class WebServer:
   def __init__(self,bear):
@@ -15,16 +16,18 @@ def __init__(self,bear):
     ## Creates a new Aiohttp Web Application
     app = web.Application()
 
-    # Binds our Socket.IO server to our Web App
-    ## instance
+    aiohttp_jinja2.setup(
+      app, loader=jinja2.FileSystemLoader(os.path.join(os.getcwd(), "templates"))
+    )
+
+    # bind socketio server to web app instance
     sio.attach(app)
 
-    ## we can define aiohttp endpoints just as we normally
-    ## would with no change
+    @aiohttp_jinja2.template("index.html")
     async def index(request):
-      with open('index.html') as f:
-        return web.Response(text=f.read(), content_type='text/html')
+      return {'character':bear.character}
 
+    # respond to client events
     @sio.on('update_bear')
     async def update_bear(sid, data):
       bear.update(data)
@@ -38,17 +41,16 @@ async def speak(sid, phrase):
     @sio.on('play')
     async def play(sid, filename):
       if(filename != ""): bear.play(filename)
-      await sio.emit('speaking_done')
+      await sio.emit('playing_done')
 
     @sio.on('fetch_phrases')
     async def fetch_phrases(sid):
       await sio.emit('phrases_fetched', bear.phrases)
 
-    ## We bind our aiohttp endpoint to our app
-    ## router
+    # bind aiohttp endpoint to app router
     app.router.add_get('/', index)
 
-    ## add static file route
+    # add route for static files
     app.router.add_static('/public', 'public')
 
     self.app = app

lib/webServer.py

@@ -10,6 +10,7 @@
 from lib.webServer import WebServer
 
 logging.basicConfig(level=logging.DEBUG)
+logging.getLogger('asyncio').setLevel(logging.WARNING)
 
 # read main config file
 config = configparser.RawConfigParser()

main.py

@@ -32,6 +32,12 @@ def __init__(self, config):
       label='mouth'
     )
 
+    self.character = {
+      'name': config.get('character', 'name'),
+      'prefix': config.get('character', 'prefix')
+    }
+    logging.debug('character is:{}\nprefix is:{}'.format(self.character['name'], self.character['prefix']))
+
     #set starting motor positions
     self.eyes.open()
     self.mouth.close()

mock/bear.py

@@ -0,0 +1,24 @@
+body{
+  background-image: url(/public/img/bg_naughty.png)
+}
+
+area:focus{
+  border: none;
+  outline-style: none; 
+  -moz-outline-style:none;  
+}
+
+.form-switch.form-switch-md {
+  padding-left: 4.5em;
+  height: 2.5em;
+}
+
+.form-switch.form-switch-md .form-check-input {
+  margin-left: -4.5em;
+  height: 2em;
+  width: 4em;
+}
+
+.form-switch.form-switch-md .form-check-label {
+  padding-top: 0.5em;
+}