Merge pull request #201 from H2-invent/feature/repeater

Feature/repeater
H2-invent · Jun 3, 2021 · 9ae3162 · 9ae3162
2 parents 60e79ad + be3b761
commit 9ae3162
Show file tree

Hide file tree

Showing 48 changed files with 4,507 additions and 541 deletions.
diff --git a/.env b/.env
@@ -96,6 +96,7 @@ laf_keycloakGroupToCreateServer=/user
 laf_administratorEmail=admin@localhost.de
 laf_notificationUrl=""
 laf_bbb_Url=""
+laf_max_repeat=56
 ###< LaF ###
 
 ###> Default Jitsi Server ###

diff --git a/.env.sample b/.env.sample
@@ -62,6 +62,7 @@ laf_keycloakGroupToCreateServer=/user
 laf_administratorEmail=admin@localhost.de
 laf_notificationUrl=""
 laf_bbb_Url=""
+laf_max_repeat=56
 ###< LaF ###
 
 ###> Default Jitsi Server ###

diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,8 @@ yarn-error.log
 ###< symfony/web-server-bundle ###
 /public/trash/
 /.phpdoc/
+
+###> phpunit/phpunit ###
+/phpunit.xml
+.phpunit.result.cache
+###< phpunit/phpunit ###
diff --git a/assets/css/layout/_header.scss b/assets/css/layout/_header.scss
@@ -73,8 +73,8 @@ label.required:after {
 
 #snackbar.show {
   visibility: visible;
-  -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
-  animation: fadein 0.5s, fadeout 0.5s 2.5s;
+  -webkit-animation: fadein 0.5s ;
+  animation: fadein 0.5s;
 }
 
 @-webkit-keyframes fadein {

diff --git a/assets/css/layout/_main.scss b/assets/css/layout/_main.scss
@@ -79,3 +79,6 @@ a {
 .btn-outline-dashboard{
   border: 0.2rem solid $btn-primary;
 }
+#snackbar{
+  cursor: pointer;
+}
diff --git a/assets/js/app.js b/assets/js/app.js
@@ -56,11 +56,11 @@ $(document).ready(function () {
         window.location.reload();
     })
     setTimeout(function () {
-        $('#snackbar').addClass('show');
-        setTimeout(function () {
+        $('#snackbar').addClass('show').click(function (e) {
             $('#snackbar').removeClass('show');
-        }, 3000);
+        })
     }, 500);
+
     if (importBBB) {
         h2Button.init(bbbUrl);
     }
@@ -195,6 +195,7 @@ $('#loadContentModal').on('shown.bs.modal', function (e) {
 
     initSearchUser();
     initServerFeatures();
+    initRepeater();
     if(getCookie('room_server')){
         $('#room_server').val(getCookie('room_server'))
     }
@@ -335,3 +336,13 @@ function getCookie(cname) {
     }
     return "";
 }
+function initRepeater(){
+    $('.repeater').addClass('d-none');
+    $('#repeater_'+$('#repeater_repeatType').val()).removeClass('d-none');
+
+    $('#repeater_repeatType').change(function (){
+
+        $('.repeater').addClass('d-none');
+        $('#repeater_'+$(this).val()).removeClass('d-none');
+    })
+}