Merge pull request #220 from andi34/feature/devicecam-fixes

Device cam and styling fixes
andreknieriem · Feb 28, 2020 · 8ed143f · 8ed143f
2 parents 19780ee + db23778
commit 8ed143f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/api/admin.php b/api/admin.php
@@ -94,6 +94,10 @@
         $newConfig['login_password'] = NULL;
     }
 
+    if (!$newConfig['previewFromCam']) {
+        $newConfig['previewCamTakesPic'] = false;
+    }
+
     $content = "<?php\n\$config = ". var_export(arrayRecursiveDiff($newConfig, $defaultConfig), true) . ";";
 
     if (file_put_contents($my_config_file, $content)) {

diff --git a/api/takePic.php b/api/takePic.php
@@ -14,7 +14,7 @@ function takePicture($filename)
             $demoFolder . $devImg[array_rand($devImg)],
             $filename
         );
-    } elseif ($config['previewCamTakesPic']) {
+    } elseif ($config['previewFromCam'] && $config['previewCamTakesPic']) {
         $data = $_POST['canvasimg'];
         list($type, $data) = explode(';', $data);
         list(, $data)      = explode(',', $data);

diff --git a/index.php b/index.php
@@ -126,9 +126,7 @@
 					<i class="fa fa-cog fa-spin"></i>
 				</div>
 
-				<?php if ($config['previewFromCam']): ?>
 				<video id="video--view" autoplay playsinline></video>
-				<?php endif; ?>
 
 				<div id="counter">
 					<canvas id="video--sensor"</canvas>

diff --git a/resources/js/core.js b/resources/js/core.js
@@ -71,6 +71,8 @@ const photoBooth = (function () {
         gallery.find('.gallery__inner').hide();
         $('.spinner').hide();
         $('.send-mail').hide();
+        $('#video--view').hide();
+        $('#video--sensor').hide();
         public.resetMailForm();
     }
 
@@ -164,9 +166,18 @@ const photoBooth = (function () {
             $('<p>').text(`${nextCollageNumber + 1} / ${config.collage_limit}`).appendTo('.cheese');
         }
 
-        setTimeout(() => {
-            public.takePic(photoStyle);
-        }, config.cheese_time);
+        if (config.previewFromCam && config.previewCamTakesPic && !public.stream && !config.dev) {
+            console.log('No preview by device cam available!');
+
+            public.errorPic({
+                error: 'No preview by device cam available!'
+            });
+
+        } else {
+            setTimeout(() => {
+                public.takePic(photoStyle);
+            }, config.cheese_time);
+        }
     }
 
     // take Picture
@@ -247,6 +258,7 @@ const photoBooth = (function () {
             $('.spinner').hide();
             $('.loading').empty();
             $('.cheese').empty();
+            $('#video--view').hide();
             $('#video--sensor').hide();
             loader.addClass('error');
             $('.loading').append($('<p>').text(L10N.error));

diff --git a/resources/sass/style.scss b/resources/sass/style.scss
@@ -212,6 +212,10 @@ input[type="email"] {
   p {
     margin: 0 0 0.2em;
   }
+
+  .btn {
+    font-size: 0.4em;
+  }
 }
 
 .error {
-Original file line number
+Diff line change
@@ Expand Up / @@ -212,6 +212,10 @@ input[type="email"] { @@
       p {
         margin: 0 0 0.2em;
       }
+      .btn {
+        font-size: 0.4em;
+      }
     }
     .error {
@@ Expand Down @@