Merge remote-tracking branch 'origin/master'

application/endpoints.py

@@ -114,7 +114,7 @@ class Camera(Resource):
     # provides th function used for the live streams
     class VideoCamera(object):
         """Video stream object"""
-        url = "http://131.95.3.162/mjpg/video.mjpg"
+        url = "https://webcam1.lpl.org/axis-cgi/mjpg/video.cgi"
         def __init__(self):
             self.video = cv2.VideoCapture(self.url)
 

application/static/render.js

@@ -8,7 +8,7 @@ function renderValidate(){
     string = `
     <img src="${rootKontext + "/api/v1/camera/stream"}" id="image-left"> </img>
     
-    <button onclick="validate()" class="btn btn-primary float-right middle-controls">Validate</button>
+    <button onclick="validate()" class="btn btn-primary float-right middle-controls">Verify</button>
     <button onclick="renderValidate()" class="btn btn-warning float-right middle-controls">Retry</button>
     `
     ml.innerHTML = string;
@@ -17,7 +17,9 @@ function renderValidate(){
 
 function renderChange(){
     clearMiddle()
+    $("#middle-right").removeClass("border-danger").removeClass("border-success")
     console.log("change")
+
 }
 function renderEnrole(){
     clearMiddle()
@@ -44,6 +46,7 @@ function renderEnrole(){
     <button type="button" class="btn btn-success float-right" onclick="enrole()">Enrole</button>
     `
     mr.innerHTML = string2;
+    $("#middle-right").removeClass("border-danger").removeClass("border-success")
 }
 function renderIdentify(){
     clearMiddle()
@@ -54,4 +57,5 @@ function renderIdentify(){
     <button onclick="renderIdentify()" class="btn btn-warning float-right middle-controls">Retry</button>
     `
     ml.innerHTML = string;
+    $("#middle-right").removeClass("border-danger").removeClass("border-success")
 }

application/templates/index.html

@@ -32,7 +32,7 @@
         <div class="navbar navbar-expand-lg navbar-dark bg-dark" id="switch">
             <div class="btn-group btn-group-toggle" data-toggle="buttons">        
                     <button type="button" class="btn btn-primary navButton active" id="option1" onclick="focusNav('#option1'); renderIdentify()"> Identify            
-                    <button type="button" class="btn  navButton" id="option2" onclick="focusNav('#option2'); renderValidate()"> Validate             
+                    <button type="button" class="btn  navButton" id="option2" onclick="focusNav('#option2'); renderValidate()"> Verify             
                     <button type="button" class="btn  navButton" id="option3" onclick="focusNav('#option3'); renderEnrole()"> Enrole          
                     <button type="button" class="btn  navButton" id="option4" onclick="focusNav('#option4'); renderChange()"> Change
             </div>