UPDATE-10112019-2

gemichelst · Nov 9, 2019 · 525eea7 · 525eea7
1 parent 3c2b992
commit 525eea7
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 8 deletions.
diff --git a/www/assets/css/style.css b/www/assets/css/style.css
diff --git a/www/assets/css/style.css.map b/www/assets/css/style.css.map
diff --git a/www/assets/js/script-default.js b/www/assets/js/script-default.js
@@ -208,7 +208,7 @@ $(document).ready(function() {
     ////////////////////
     // REFRESH ACTION //
     ////////////////////
-    $(".client-list_icon-link, .icon-link, .dashboard-link").click(function() {
+    $(".refresh--link").click(function() {
         $("#snackbar").snackbar('IN');
         <?php
 
@@ -231,9 +231,13 @@ $(document).ready(function() {
                 $SPLITDIR       = explode("www",$DOCROOT);
                 $BINDIR         = $SPLITDIR[0];
                 $BINCMD         = 'server-host';
-                $EXECCMD        = $BINDIR.$BINCMD;
-                $BASHEXEC       = exec("cd ".$BINDIR." && bash ./".$BINCMD);
-                // $BASHEXEC       = exec('./$EXECCMD');
+                $BINFULL        = $BINDIR.$BINCMD;
+                $BASHEXEC       = "cd ".$BINDIR."; bash ./".$BINCMD." 2>&1";
+                $EXECOUTPUT     .= "<pre>".exec("$BASHEXEC")."</pre>";
+                $EXECMESSAGE    = (!$EXECOUTPUT) ? 'An Error has occured while executing the REFRESH command. Please read the following STDOUT:' : 'The Refresh command was executed succesfull. STDOUT:';
+                $EXECMSGTITLE   = (!$EXECOUTPUT) ? 'REFRESH FAILED' : 'REFRESH DONE';
+                $EXECMSGICON    = (!$EXECOUTPUT) ? 'error' : 'check_circle';
+                $EXECOUTPUT     = '<div class="msg--container"><div class="msg--container_icon"><i class="material-icons">'.$EXECMSGICON.'</i></div><div class="msg--container_title">'.$EXECMSGTITLE.'</div><div class="msg--container_message"><p>'.$EXECMESSAGE.'</p></div></div><div class="exec-output">'.$EXECOUTPUT.'</div>';
 
             # COPYING FILES FROM DATA FOLDER TO WWW/TMP
             #
@@ -248,15 +252,19 @@ $(document).ready(function() {
                     print_r("\r\t\t// DOCROOT: $BINDIR\r\t");
                     print_r("\r\t\t// BINHOST: $BINCMD\r\t");
                     print_r("\r\t\t// BASHEXEC: cd ".$BINDIR." && bash ./".$BINCMD."\r\t");
-                    //print_r("\r\t\t// EXECCMD: $EXECCMD\r\t");
                     $EXECHECK1      = ($BASHEXEC) ? print_r("\t// stateSRV-HOST: $BASHEXEC\r\t") : print_r("\t// stateSRV-HOST: FAILED\r\t// stateSRV-HOST: $BASHEXEC\r\t");
                     $EXECHECK2      = ($BASHEXEC) ? print_r("\tconsole.log('stateSRV-HOST: $BASHEXEC');\r") : print_r("\tconsole.log('stateSRV-HOST: FAILED');\r\tconsole.log('stateSRV-HOST: $BASHEXEC');\r");
                     $copyCheck1     = ($copyFiles) ? print_r("\r\t\t// COPY JSON FILES FROM DOC2TMP: SUCCESS\r\t") : print_r("\r\t\t// COPY JSON FILES FROM DOC2TMP: FAILED\r\t");
                     $copyCheck2     = ($copyFiles) ? print_r("\tconsole.log('COPY DOC2TMP: SUCCESS');\r") : print_r("\tconsole.log('COPY DOC2TMP: FAILED');\r");
                 }
             }   
         ?>
+
+        var EXECOUTPUT='<?php echo $EXECOUTPUT; ?>';
         $("#snackbar").snackbar('OUT');
+        setTimeout(function() { 
+            $('.mdc-data-table').html('<?php echo $EXECOUTPUT; ?>');
+        }, 1000);
     });
 
 
@@ -328,7 +336,7 @@ $(document).ready(function() {
         // ELSE
         else {
             dataLink == 'dashboard'
-            var html = '<!-- DATA TABLE --> <div class="mdc-data-table" id="mdc-data-table"></div> <!-- DATA TABLE -->';
+            var html = '<!-- DATA TABLE: ELSE --> <div class="mdc-data-table" id="mdc-data-table"></div> <!-- DATA TABLE -->';
             animatedContentLoader(html);
         }
 

diff --git a/www/index.php b/www/index.php
@@ -76,7 +76,7 @@
               <a class="client-list_icon-link" id="link--add" href="#add-client" data-link="add"><i class="material-icons">add</i></a>
             </div>
             <div class="clients-list_icon" id="icon--refresh-clients">
-              <a class="client-list_icon-link" id="link--refresh" href="#refresh-clients" data-link="refresh"><i class="material-icons">refresh</i></a>
+              <a class="client-list_icon-link refresh--link" id="link--refresh" href="#refresh-clients" data-link="refresh"><i class="material-icons">refresh</i></a>
             </div>
           </div>
         </div>

diff --git a/www/src/stylus/_base/_layout.styl b/www/src/stylus/_base/_layout.styl
@@ -10,3 +10,26 @@
 	used
 		color red
 		padding 0 1vh 0 1vh
+
+.msg--container
+	width 100%
+	margin 2vh
+	color $green-dark-matt
+	.msg--container_icon
+		float left
+		color inherit
+		.material-icons
+			font-size 4vh !important
+	.msg--container_title
+		font-weight 700
+		color inherit
+		padding-left 5vw
+		padding-bottom 0.25
+		text-decoration underline
+	.msg--container_message
+		font-weight 200
+		color inherit
+		padding-left 5vw
+.exec-output
+	color rgba(0,0,0,1)
+	margin 2vh