Update version.html

check_upgrade, check_vpn
version.html
2025-08-08 08:59:01 +00:00 · 2025-08-08 08:29:21 +00:00 · 2025-08-07 12:54:44 +00:00 · 2025-08-07 12:43:56 +00:00 · 2025-08-07 12:36:37 +00:00
6 changed files with 70 additions and 40 deletions
--- a/common.js
+++ b/common.js
@@ -106,9 +106,12 @@ function add_repository() {
  });
 }

-function check_vpn() {
+function check_vpn(service) {
  var url = 'scan.php?op=check_vpn';
-  jQuery.get(url, function(data) {
+  jQuery.ajax({
+    url: url,
+    method: 'GET',
+    success: function(data) {
        console.log('check_vpn: '+data);
        if (data=="1") { // save_vpn has finished or VPN ON
 	  const vpn_div = document.getElementById("vpn");
@@ -141,6 +144,11 @@ function check_vpn() {
 		$('#pro_off').show();
        }
        setTimeout(check_vpn, 10000);
+    },
+    error: function(xhr, status, error) {
+      console.warn('check_vpn error: ' + status + ' - ' + error);
+      setTimeout(check_vpn, 10000, service);
+    }
  });
 }

@@ -181,22 +189,27 @@ function get_updates() {
 }

 function check_upgrade(service) {
-  var url  = 'scan.php?op=check_upgrade&service='+service;
-  jQuery.get(url, function(data) {
-        console.log('check_upgrade '+service+': '+data);
-      if (data!="") {
-              jQuery("#status_"+service).html(data);
+  var url = 'scan.php?op=check_upgrade&service=' + service;
+  jQuery.ajax({
+    url: url,
+    method: 'GET',
+    success: function(data) {
+      console.log('check_upgrade ' + service + ': ' + data);
+      if (data !== "") {
+        jQuery("#status_" + service).html(data);
      }
-      if (data!="OK") {
+      if (data !== "OK") {
        setTimeout(check_upgrade, 1000, service);
+      } else {
+        console.log('upgrade end: ' + service);
+        jQuery("#status_" + service).html('Upgrade has finished');
      }
-      else {
-          console.log('upgrade end: '+service);
-	  jQuery("#status_"+service).html('Upgrade has finished');
-	  //get_updates();
+    },
+    error: function(xhr, status, error) {
+      console.warn('check_upgrade error: ' + status + ' - ' + error);
+      setTimeout(check_upgrade, 5000, service);
    }
  });
-
 }

 function upgrade(service) {
@@ -279,7 +292,7 @@ function uninstall(additional) {
  jQuery("div.deployment").each(function(index) {
        $(this).html('');
  });
-	data = '<form action="#" method="post"><div class="row">YOU ARE GOING TO UNINSTALL '+additional.toUpperCase()+'.<br>ARE YOU SURE? IF YES, PLEASE CLICK ON THE BUTTON BELOW.<br><br></div><div class="row"><div class="mb-3"><button class="save-button" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div></div></form>';
+	data = '<div class="confirm"><form action="#" method="post"><div class="row">You are going to uninstall '+additional.toUpperCase()+'.<br>Are you sure? If yes, please click on the Uninstall button below.<br><br></div><div class="row buttons"><div class="mb-3"><button class="btn" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div><div class="mb-3" style="margin-left:200px;float:"><button class="btn" onclick="reinstall(\''+additional+'\',\''+additional+'\')">Cancel</button></div></div></form></div>';
 	jQuery("#"+additional).html(data);
 	jQuery("#popupText").html(data); // manage2
 }
--- a/install.html
+++ b/install.html
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="style.css?t=1" />
 </head>
 <body id="installer">
-  <div class="main" >
+  <div class="main" style="max-width:1000px;margin:0px auto;">
    <div id="myAppsContainer">
 	      <div class="logo">
 		<img src="/img/logo.svg" alt="Safebox"/>
@@ -65,13 +65,7 @@
 		</select>
 	</div>
 </div>
-<div id="div_vpn" class="hidden">
-	<div class="input-row">
-		<label for="vpn_domain">Please add domain url to download the VPN hash from:</label>
-		<div class="input-container">
-			<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://portal.safebox.network" placeholder="https://portal.safebox.network" size="40">
-		</div>
-	</div>
+<div id="div_vpn1" class="hidden">
 	<div class="input-row">
 		<label for="vpn_pass">Please type in the generated VPN passkey (8 digits):</label>
 		<div class="input-container">
@@ -84,12 +78,6 @@
 			<input type="email" class="form-control" name="LETSENCRYPT_MAIL" id="letsencrypt_mail" value="">
 		</div>
 	</div>
-	<div class="input-row">
-		<label for="letsencrypt_servername">Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):</label>
-		<div class="input-container">
-			<input type="text" class="form-control" name="LETSENCRYPT_SERVERNAME" id="letsencrypt_servername" value="letsencrypt" placeholder="letsencrypt">
-	   	</div>
-	</div>
 </div>
 <div class="input-row">
 	<label for="diagnostic">Diagnostic mode enable?</label>
@@ -108,6 +96,20 @@
 		</div>
 <!-- advanced settings -->
 <div id="advanced_div" style="display:none">
+	<div id="div_vpn2" class="hidden">
+		<div class="input-row">
+			<label for="vpn_domain">Please add domain url to download the VPN hash from:</label>
+			<div class="input-container">
+				<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://portal.safebox.network" placeholder="https://portal.safebox.network" size="40">
+			</div>
+		</div>
+		<div class="input-row">
+			<label for="letsencrypt_servername">Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):</label>
+			<div class="input-container">
+				<input type="text" class="form-control" name="LETSENCRYPT_SERVERNAME" id="letsencrypt_servername" value="letsencrypt" placeholder="letsencrypt">
+			</div>
+		</div>
+	</div>
 	<div class="input-row">
 		<label for="registry">Please fill in the docker registry name (default:safebox):</label>
 		<div class="input-container">
@@ -199,8 +201,14 @@ jQuery(document).ready(function(){
 		else jQuery('#div_user_auth').hide();
 	});
 	jQuery('select#vpn').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_vpn').show();
-		else jQuery('#div_vpn').hide();
+		if (jQuery(this).val()=='yes') {
+			jQuery('#div_vpn1').show();
+			jQuery('#div_vpn2').show();
+		}
+		else {
+			jQuery('#div_vpn1').hide();
+			jQuery('#div_vpn2').hide();
+		}
 	});
 	jQuery('select#discovery').click(function() {
 		if (jQuery(this).val()=='yes') jQuery('#div_discover').show();
--- a/manage.html
+++ b/manage.html
@@ -9,7 +9,7 @@
 <title>Safebox</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Switzer:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap"/>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"/>
-<link rel="stylesheet" href="style.css?t=11" />
+<link rel="stylesheet" href="style.css?t=14" />
 </head>
 <body>
  <div class="sidebar">
@@ -192,6 +192,7 @@
 	      <h1>Monitor</h1>
 	      <button id="updatesBtn"><i class="fas fa-bell"></i> Notification</button>
 	    </div>
+	    <label>Under development...</label><br>
        	<img src="/img/monitor.jpg" alt="Under development..." width="1000" />
        `;
    }
@@ -389,6 +390,6 @@
 <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.6/dist/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
-<script src="common.js?t=41"></script>
+<script src="common.js?t=45"></script>
 </body>
 </html>
--- a/scan.php
+++ b/scan.php
@@ -268,7 +268,7 @@ switch ($_GET["op"]) {
 						}
 						echo "<div class=\"mb-3\" style=\"margin-left:200px;float:\">
 						<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"cancel_{$template->name}_btn\">Cancel</button>
-						</div>"; // buttons
+						</div>";
                                                echo "
                                                </div>
 						</form>
@@ -499,8 +499,8 @@ switch ($_GET["op"]) {
 			$data = $arr["version"];
 			echo "Framework version: ".$data["VERSION"]."\n";
 		}
-		else echo "Version not found";
-		echo "Frontend version: 1.1.14";
+		else echo "Framework version not found\n";
+		echo "Frontend version: ".file_get_contents("version.html");
 	break;
 	case "repositories":
 		$arr = array("STATUS" => 0);
--- a/style.css
+++ b/style.css
@@ -131,6 +131,13 @@
 	margin-top:300px;
    }

+    .confirm {
+	border: 2px solid #41464f;
+	border-radius: 10px;
+	margin-top:250px;
+	padding: 20px;
+    }
+
    .menu {
      display: flex;
      flex-direction: column;
--- a/version.html
+++ b/version.html
@@ -0,0 +1 @@
+1.1.16
Author	SHA1	Message	Date
hael	ea9e3d8e5b	Update version.html All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-08-08 08:59:01 +00:00
hael	5a7b2fc8be	check_upgrade, check_vpn All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-08 08:29:21 +00:00
hael	f08d9c7833	version.html All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-08-07 12:54:44 +00:00
hael	c4a9272444	install width All checks were successful continuous-integration/drone/push Build is passing Details	2025-08-07 12:43:56 +00:00
hael	9b4bc15e80	uninstall	2025-08-07 12:36:37 +00:00