logo change

common.js

@@ -110,29 +110,35 @@ function check_vpn() {
   var url  = 'scan.php?op=check_vpn';
   jQuery.get(url, function(data) {
         console.log('check_vpn: '+data);
-        if (data=="1") { // save_vpn has finished
+        if (data=="1") { // save_vpn has finished or VPN ON
 	  const vpn_div = document.getElementById("vpn");
-	  console.log(vpn_div);
+	  console.log('vpn_div: '+vpn_div);
 	  if (vpn_div) {
 	  	vpn_div.innerHTML = 'VPN start process has finished';
-		//document.getElementById('installAppsBtn').click();
+		setTimeout(function() {
+			document.getElementById('installAppsBtn').click();
+		}, 2000);
+	  }
+	  else {
+		$('#pro_off').hide();
+		$('#pro_on').show();
+		$('#vpn_off').hide();
+		$('#vpn_on').show();
+		document.getElementById('vpnToggle').checked = true;
+		document.querySelector(".switch-label").textContent = "ON";
 	  }
 	}
 	else if (data=="2") {
-		document.getElementById('vpnToggle').checked = true;
-  		document.querySelector(".switch-label").textContent = "ON";
-          $('#vpn_off').hide();
-          $('#vpn_on').show();
-          $('#pro_off').hide();
-          $('#pro_on').show();
-        }
-        else {
+		$('#pro_off').hide();
+		$('#pro_on').show();
+		$('#vpn_on').hide();
+		$('#vpn_off').show();
 		document.getElementById('vpnToggle').checked = false;
-  		document.querySelector(".switch-label").textContent = "OFF";
-          $('#vpn_on').hide();
-          $('#vpn_off').show();
-          $('#pro_on').hide();
-          $('#pro_off').show();
+		document.querySelector(".switch-label").textContent = "OFF";
+        }
+        else { // data == 0
+		$('#pro_on').hide();
+		$('#pro_off').show();
         }
         setTimeout(check_vpn, 10000);
   });
@@ -211,7 +217,8 @@ function load_template(additional, block) {
   jQuery("div.deployment").each(function(index) {
         $(this).html('');
   });
-  jQuery("#"+block).html('Loading '+additional+' template...');
+  //jQuery("#"+block).html('Loading '+additional+' template...');
+  jQuery("#"+block).html('<div class="loading">Loading...</div>');
   var url  = 'scan.php?op=deployment&additional='+additional;
   jQuery.get(url, function(data) {
 	console.log('load_template: '+data);
@@ -237,7 +244,8 @@ function reinstall(additional, block) {
   jQuery("div.deployment").each(function(index) {
         $(this).html('');
   });
-  jQuery("#"+block).html('Loading '+additional+' template...');
+  //jQuery("#"+block).html('Loading '+additional+' template...');
+  jQuery("#"+block).html('<div class="loading">Loading...</div>');
   var url  = 'scan.php?op=reinstall&additional='+additional;
   jQuery.get(url, function(data) {
 	console.log('reinstall '+additional+': '+data);
@@ -277,8 +285,8 @@ function uninstall(additional) {
 }
 
 function confirm_uninstall(additional) {
-  jQuery("#"+additional).html('Loading...');
-  jQuery("#popupText").html('Loading'); // manage2
+  jQuery("#"+additional).html('<div class="loading">Loading...</div>');
+  jQuery("#popupText").html('<div class="loading">Loading...</div>'); // manage2
   var url  = 'scan.php?op=uninstall&additional='+additional;
   jQuery.get(url, function(data) {
         console.log('uninstall '+additional+': '+data);
@@ -406,53 +414,52 @@ function get_services() {
 
 function get_proxy_html() {
         proxy_html = `
-	<fieldset>
-	<legend>Enable proxy</legend>
-        <div class="input-group">
 	<form class="form-install" action="#" method="post" id="save_vpn">
+        <div class="app-fields">
+        	<div class="app-field">
 		<div class="row">
-		    <div class="mb-3">
-				<label for="vpn_domain">Please add domain url to download the VPN hash from (default: https://portal.safebox.network):</label>
-				<input type="text" class="form-control" name="VPN_DOMAIN" id="vpn_domain" value="https://portal.safebox.network">
-				<div class="invalid-feedback">
-				Please enter a valid domain.
-				</div>
+			<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" size="40">
 		    </div>
 		</div>
+		</div>
+        	<div class="app-field">
 		<div class="row">
-		    <div class="mb-3">
-				<label for="vpn_pass">Please type in the generated VPN passkey (8 digits):</label>
+			<label for="vpn_pass">Please type in the generated VPN passkey (8 digits):</label>
+		    <div class="input-container">
 				<input type="text" class="form-control" name="VPN_PASS" id="vpn_pass" value="" maxlength="8" size="10">
 		    </div>
 		</div>
+		</div>
+        	<div class="app-field">
 		<div class="row">
-		    <div class="mb-3">
-				<label for="letsencrypt_mail">Please add the letsencrypt mail address:</label>
+			<label for="letsencrypt_mail">Please add the letsencrypt mail address:</label>
+		    <div class="input-container">
 				<input type="email" class="form-control" name="LETSENCRYPT_MAIL" id="letsencrypt_mail" value="">
-				<div class="invalid-feedback">
-				Please enter a valid email.
-				</div>
 		    </div>
 		</div>
+		</div>
+        	<div class="app-field">
 		<div class="row">
-		    <div class="mb-3">
-				<label for="letsencrypt_servername">Please add letsencrypt server name (default is letsencrypt but you can add zerossl too):</label>
+			<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">
 		    </div>
 		</div>
-		<div class="row buttons">
-		    <div class="mb-3">
-			<button class="btn btn-lg btn-primary btn-block" type="button" id="vpn_save_btn"> Save </button>
-		    </div>
 		</div>
-	</form>
 	</div>
-	</fieldset>
+	<div class="row buttons">
+	    <div class="mb-3">
+		<button class="btn btn-lg btn-primary btn-block" type="button" id="vpn_save_btn"> Save </button>
+	    </div>
+	</div>
+	</form>
 	<script>
 	jQuery('#vpn_save_btn').click(function() {
 		console.log('vpn save');
 		save_vpn();
-		jQuery('#vpn').html('VPN start process in progress. Please wait...');
+		jQuery('#vpn').html('<div class="loading">VPN start process in progress. Please wait...</div>');
 	});
 	</script>
         `;
@@ -523,19 +530,19 @@ jQuery(document).ready(function(){
 	});
 
 	jQuery('#update_btn').click(function() {
-		jQuery('#updates').html('Looking for updates... Please wait...');
+		jQuery('#updates').html('<div class="loading">Looking for updates...</div>');
 		get_updates();
 	});
 
 	jQuery('#add_repo').submit(function() {
-		jQuery('#repositories').html('Loading...');
+		jQuery('#repositories').html('<div class="loading">Loading...</div>');
 		add_repository();
 		return false;
 	});
 
 	jQuery('#save_vpn').submit(function() {
 		save_vpn();
-		jQuery('#vpn').html('Loading...');
+		jQuery('#vpn').html('<div class="loading">Loading...</div>');
 		return false;
 	});
 

install.html

@@ -12,7 +12,7 @@
   <div class="main" >
     <div id="myAppsContainer">
 	      <div class="logo">
-		<img src="/img/logo.png" alt="Safebox"/>
+		<img src="/img/logo.svg" alt="Safebox"/>
 		<span>Safebox</span>
 	      </div>
 		<h3 style="text-align:center">No any previous deployed environment has found</h3>

install.js

@@ -155,7 +155,7 @@ function check_install() {
 
     console.log('install: '+install);
     if (install==1) {
-	  var url  = 'scan.php?op=check_install&key=<?php echo $key;?>';
+	  var url  = 'scan.php?op=check_install';
 	  $.get(url, function(data){
 	    console.log('check_install:'+data+' counter: '+counter);
 	    if (data=='INSTALLED') {
@@ -163,7 +163,7 @@ function check_install() {
 	    }
 	    else {
 	      counter+=1
-	      $("#info").html('Please wait ... ' + counter);
+	      $("#info").html('Please wait ...');
 	      setTimeout(check_install, 1000);
 	    }
 	  });

install.php

@@ -46,7 +46,7 @@ else {
 	$header_text="Installing in progress... Please wait...";
 	//$key = "install:".date("YmdHis");
 	$key = "install";
-	if (set_output($key,$json)) echo "OK";
+	if (set_output($key,$json)) echo "";
 	else echo "ERROR";
 }
 
@@ -74,8 +74,8 @@ echo "<pre>".$output."</pre>";
 <body id="install" class="text-center">
   <div class="main">
     <div id="myAppsContainer">
-	<div class="logo" style="margin-top:100px">
-		<img src="/img/logo.png" alt="Safebox"/>
+	<div class="logo" style="margin:100px 0px 20px 0px;">
+		<img src="/img/logo.svg" alt="Safebox"/>
 		<span>Safebox</span>
 	</div>
 	<div class="progress-box">

manage.html

@@ -6,27 +6,16 @@
   <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=1" />
+  <link rel="stylesheet" href="style.css?t=10" />
 </head>
 <body>
   <div class="sidebar">
-    <div>
+    <div class="sidebar-top">
       <div id="logo" class="logo">
-        <img src="/img/logo.png" alt="Safebox"/>
+        <img src="/img/logo.svg" alt="Safebox"/>
         <span>Safebox</span>
       </div>
       <div class="menu">
-	    <div class="menu-item" style="margin-bottom:20px">
-		<img src="/img/globe.png" data-src="/img/globe.png" data-hover="/img/globe.png" alt="VPN" />
-		<div class="menu-label">
-		    <span id="vpnBtn">VPN</span>
-		    <label class="switch">
-		      <input type="checkbox" id="vpnToggle">
-		      <span class="slider-text"><span class="switch-label">OFF</span></span>
-		    </label>
-		</div>
-	    </div>
-
 <!--
 	<div class="menu-item"><i class="fas fa-th"></i><span>Applications</span></div>
         <div class="menu-item"><i class="fas fa-hdd"></i><span>Disk Management</span></div>
@@ -46,29 +35,42 @@
       </div>
     </div>
     <div class="yellow-row">
+	<div id="pro_off">
 	    <div class="yellow-box">
-		<div id="pro_off">
-		      <h4>Safebox Pro</h4>
+		<div class="pro-text">
+		  <span>Safebox Pro</span>
+		</div>
 		      <p>Enjoy benefits and unlock more feature such as remote access, geo-redundant backups etc. <br><br>
 		      <a href="" class="details">Read details</a><br><br>
-			<img src="/img/upgrade.png" alt="Upgrade now" width="100%"/>	
+			<img src="/img/upgrade.png" alt="Upgrade now" width="80%"/>	
 		      </p>
+	    </div>
+	</div>
+	<div id="pro_on" class="hidden">
+	    <div class="grey-box">
+		<div class="vpn-text" id="vpnBtn" >
+		  <img src="/img/globe.png" data-src="/img/globe.png" data-hover="/img/globe.png" alt="VPN"/>
+		  <span>Remote access</span>
 		</div>
-		<div id="pro_on" class="hidden">
-		      <h4>Login</h4>
-		      <p>Enjoy benefits and unlock more feature such as remote access, geo-redundant backups etc. <br><br>
-		      <a href="" class="details">Read details</a><br><br>
+		      <p>It allows you to connect your installed apps to a custom domain (your own or one registered through us), so you can securely log in from any browser, anywhere in the world.
 		      </p>
-		</div>
-	    </div>
-	    <div class="yellow-corner">
-		<img src="img/yellow_corner.png" alt=""/>
+			<div class="vpn-item">
+<!--
+			    <label class="switch">
+			      <input type="checkbox" id="vpnToggle" onclick="return false">
+			      <span class="slider-text"><span class="switch-label">OFF</span></span>
+			    </label>
+-->
+				<span id="vpn_on" class="hidden"><img src="/img/on.png" alt="on" /></span>
+				<span id="vpn_ff" class="hidden"><img src="/img/off.png" alt="off" /></span>
+			</div>
 	    </div>
+	</div>
     </div>
   </div>
   <div class="main" >
     <div id="myAppsContainer">
-	    Loading applications. Please wait...
+	    <div class="loading">Loading applications...</div>
     </div>
     <div id="popup" class="popup hidden">
 	<div class="popup-content">
@@ -182,10 +184,10 @@
 
         myAppsContainer.innerHTML = `
 	    <div class="main-header">
-	      <h1>VPN</h1>
+	      <h1>VPN - enable proxy</h1>
 	    </div>
             <div id="vpn" class="innerDiv">
-	    Loading...
+	    <div class="loading">Loading...</div>
             </div>
         `;
 	get_proxy_html();
@@ -197,7 +199,7 @@
 	      <h1>Services</h1>
 	    </div>
             <div id="services" class="innerDiv">
-	    Loading...
+	    <div class="loading">Loading...</div>
             </div>
         `;
 	get_services();
@@ -209,7 +211,7 @@
 	      <h1>Updates</h1>
 	    </div>
             <div id="updates" class="innerDiv">
-	    Looking for updates... Please wait...
+	    <div class="loading">Looking for updates...</div>
             </div>
         `;
 	get_updates();
@@ -221,7 +223,7 @@
 	      <h1>System services</h1>
 	    </div>
             <div id="system" class="innerDiv">
-	    Loading...
+	    <div class="loading">Loading...</div>
             </div>
         `;
 	get_system();
@@ -293,7 +295,7 @@
 	    <div class="main-header">
 	      <h1>Repositories</h1>
 	    </div>
-		<div id="repositories" style="text-align:left">Loading...</div>
+		<div id="repositories" style="text-align:left">Loading repositories...</div>
 		<br>
 		<form class="form-install" action="#" method="post" id="add_repo">
 		<div class="input-row">
@@ -351,6 +353,9 @@
 	}
 
 	vpnToggle.addEventListener("change", updateStatus);
+	vpnToggle.addEventListener('click', function (e) {
+		e.preventDefault();
+	});
 
 	// Alapállapot beállítása
 	updateStatus();
@@ -363,6 +368,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=33"></script>
+<script src="common.js?t=40"></script>
 </body>
 </html>

scan.html

@@ -11,8 +11,8 @@
 <body id="scan" class="text-center">
   <div class="main">
     <div id="myAppsContainer">
-	<div class="logo" style="margin-top:100px">
-		<img src="/img/logo.png" alt="Safebox"/>
+	<div class="logo" style="margin:100px 0px 20px 0px;">
+		<img src="/img/logo.svg" alt="Safebox"/>
 		<span>Safebox</span>
 	</div>
 	<div class="progress-box">

scan.php

@@ -59,12 +59,12 @@ switch ($_GET["op"]) {
 		}
 		else echo "WAIT";
 	break;
-	case "check_install": // called in install.php - check if install process has finished
-		$arr = check_response($_GET["key"]); // TODO - replace key with "install", key can be "install*"
+	case "check_install": // called in install.js - check if install process has finished
+		$arr = check_response("install");
 		if (!empty($arr)) {
 			foreach ($arr as $key=>$data) {
 				//echo $key."-".$_GET["key"];
-				if ($key==$_GET["key"]) { // if install key moved to web_out
+				if ($key=="install") { // if install key moved to web_out
 					if ($data["INSTALL_STATUS"]>0) {
 						remove_response("$key");
 						echo "INSTALLED";
@@ -149,7 +149,7 @@ switch ($_GET["op"]) {
 								$subtitle = $content["subtitle"];
 								if (empty($subtitle) || $subtitle == "null") $subtitle = "";
 								$icon = $content["icon"];
-								if (empty($icon) || $icon == "null") $icon = "img/default_logo.png"; // default icon image
+								if (empty($icon) || $icon == "null") $icon = "img/logo.svg"; // default icon image
 								if (array_key_exists($service_name,$data["INSTALLED_SERVICES"])) $installed = "true";
 								else $installed = "false";
 								if (!empty($deployments)) $deployments .= ", ";
@@ -348,7 +348,7 @@ switch ($_GET["op"]) {
 			$text="A deployment ({$_GET["additional"]}) has already started.<br>Please wait and do not start a new one...";
 		}
 		else {
-			$text="Install in progress... Please wait...";
+			$text="Install in progress...";
 			$fields = $_GET;
 			unset($fields["op"]);
 			unset($fields["additional"]);

style.css

@@ -1,5 +1,5 @@
     :root {
-      --highlight-color: #F9DB54;
+      --highlight-color: #FFB806;
     }
 
     body {
@@ -96,16 +96,24 @@
       background-color: #101214;
       display: flex;
       flex-direction: column;
+      /*height: 100vh;*/
       justify-content: space-between;
-      padding: 20px 0;
       margin: 20px;
       border-radius: 20px;
       transition: width 0.3s;
     }
 
+.sidebar-top {
+      padding: 20px 0px 0px 0px;
+	overflow-y: auto;
+	flex: 1 1 auto;
+	display: flex;
+	flex-direction: column;
+	justify-content: center; /* ez teszi középre függőlegesen a menüt */
+}
+
     .logo {
       text-align: center;
-      margin-bottom: 40px;
       font-size: 24px;
       font-weight: bold;
       display: flex;
@@ -118,9 +126,16 @@
       height: 30px;
     }
 
+    .loading {
+	    text-align:center;
+	    margin-top:300px;
+    }
+
     .menu {
       display: flex;
       flex-direction: column;
+      justify-content: center; /* középre igazít függőlegesen */
+      flex-grow: 1;
       gap: 5px;
       padding: 0 10px;
     }
@@ -129,8 +144,6 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      padding: 10px 20px;
-      cursor: pointer;
       color: white;
       transition: color 0.3s;
     }
@@ -227,7 +240,7 @@
   right: 0;
   bottom: 0;
   background-color: #ccc;
-  border-radius: 26px;
+  border-radius: 8px;
   transition: background-color 0.3s;
   display: flex !important;
   align-items: center;
@@ -235,7 +248,7 @@
   padding: 0 8px;
   font-size: 12px;
   font-weight: bold;
-  color: #fff;
+  color: #000;
 }
 
 /* Circle */
@@ -253,7 +266,7 @@
 
 /* Checked: move dot, change background and text alignment */
 .switch input:checked + .slider-text {
-  background-color: #4CAF50;
+  background-color: var(--highlight-color);
   justify-content: flex-start;
 }
 
@@ -277,24 +290,29 @@
     }
 
     .yellow-row {
+	flex-shrink: 0;
 	max-width:250px;
 	display: flex;
 	align-items: flex-start;
 	box-sizing: border-box;
         margin: 0px;
 	width: 100%;
-	padding: 0 20px;
+	padding: 0px 20px 20px 20px;
     }
 
     .yellow-box {
-      background-color: var(--highlight-color);
+      background-image: url('img/yellow-box.png');
+      background-repeat: no-repeat;
+      /*background-color: var(--highlight-color);
+      border-radius: 20px 20px 0px 20px;*/
       color: black;
       text-align: left;
       margin: 0px;
-      padding: 10px 18px;
-      border-radius: 20px 20px 0px 20px;
+      padding: 20px 18px;
       font-weight: bold;
       font-size: 12px;
+      width: 156px;
+      height: 176px;
     }
 
     .yellow-corner {
@@ -306,6 +324,35 @@
 	align-items: flex-end;
     }
 
+.pro-text {
+	font-size: 16px;
+	color: black;
+}
+
+    .grey-box {
+      background-image: url('img/grey-box.png');
+      background-repeat: no-repeat;
+ /*     border: 2px solid #41464f;  */
+      border-radius: 20px 20px 0px 20px;
+      color: #999;
+      text-align: left;
+      margin: 0px;
+      padding: 20px 18px;
+      font-weight: bold;
+      font-size: 12px;
+      width: 158px;
+      height: 178px;
+    }
+
+.vpn-text {
+	display: flex;
+	align-items: center;  /* Ez igazítja középre függőlegesen a tartalmat */
+	gap: 10px;            /* Távolság kép és szöveg között (opcionális) */
+	font-size: 16px;
+	color: var(--highlight-color);
+	cursor: pointer;
+}
+
     .main {
       flex: 1;
       padding: 30px;
@@ -396,7 +443,7 @@
 	}
 
 	.app-fields .row {
-            display: block;
+            display: flex;
 	      justify-content: space-between;
 	      align-items: center;
 	      padding: 5px 20px;