Merge pull request #91 from bmartin5692/move-web_template

move data web under bumper

bumper/confserver.py

@@ -58,7 +58,7 @@ class ConfServer:
         self.app = web.Application(loop=asyncio.get_event_loop(), middlewares=[
             self.log_all_requests,
             ])
-        aiohttp_jinja2.setup(self.app, loader=jinja2.FileSystemLoader(os.path.join(bumper.data_dir, "web","templates")))          
+        aiohttp_jinja2.setup(self.app, loader=jinja2.FileSystemLoader(os.path.join(bumper.bumper_dir,"bumper","web","templates")))
 
         self.app.add_routes(
             [

bumper/plugins/bumper_confserver_portal_pim.py

@@ -43,7 +43,7 @@ class portal_api_pim(plugins.ConfServerApp):
         try:
             fileID = request.match_info.get("id", "")
 
-            return web.FileResponse(os.path.join(bumper.data_dir,"web","robotvac_image.jpg"))
+            return web.FileResponse(os.path.join(bumper.bumper_dir,"bumper","web","images","robotvac_image.jpg"))
             
         except Exception as e:
             logging.exception("{}".format(e))          

bumper/plugins/bumper_confserver_upload_global.py

@@ -30,7 +30,7 @@ class upload_global(plugins.ConfServerApp):
         try:
             fileID = request.match_info.get("id", "")
 
-            return web.FileResponse(os.path.join(bumper.data_dir,"web","robotvac_image.jpg"))
+            return web.FileResponse(os.path.join(bumper.bumper_dir,"bumper","web","images","robotvac_image.jpg"))
             
         except Exception as e:
             logging.exception("{}".format(e))