load app new design

Update Dockerfile
2025-07-05 16:05:49 +00:00 · 2025-07-03 12:11:03 +00:00 · 2025-07-03 12:09:33 +00:00 · 2025-07-03 11:31:24 +00:00 · 2025-07-03 11:27:31 +00:00 · 2025-07-02 18:12:07 +00:00
29 changed files with 3485 additions and 433 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,10 +6,9 @@ node_selector:
  physical-node: dev1

 trigger:
-  branch:
-    - main
  event:
    - push
+    - tag
 workspace:
  path: /drone/src

@@ -30,6 +29,9 @@ steps:
      platforms:
        - linux/amd64
        - linux/arm64
+    when:  
+      event:
+        - push
    
  - name: pull image to dockerhub
    image: docker.io/owncloudci/drone-docker-buildx:4
@@ -44,4 +46,7 @@ steps:
        from_secret: dockerhub-password
      platforms:
        - linux/amd64
-        - linux/arm64
+        - linux/arm64
+    when:  
+      event:
+        - tag
--- a/17
+++ b/17
@@ -63,21 +63,18 @@ RUN apk --no-cache add php${PHP_VERSION} \
    php${PHP_VERSION}-fpm \
    php${PHP_VERSION}-curl \
    php${PHP_VERSION}-pecl-redis \
-    vim \
    curl \
+    vim \
+    git \
    rm -rf /var/cache/apk/*

 COPY nginx.conf /etc/nginx/nginx.conf
-
 RUN mkdir -p /usr/share/nginx/html
-COPY index.html    /usr/share/nginx/html
-COPY scan.html   /usr/share/nginx/html
-COPY manage.html   /usr/share/nginx/html
-COPY scan.php   /usr/share/nginx/html
-COPY functions.php   /usr/share/nginx/html
-COPY install.html  /usr/share/nginx/html
-COPY install.php   /usr/share/nginx/html
-COPY installer.css /usr/share/nginx/html
+COPY *.html    /usr/share/nginx/html
+COPY *.php   /usr/share/nginx/html
+COPY *.css /usr/share/nginx/html
+COPY *.js /usr/share/nginx/html
+COPY img /usr/share/nginx/html/img
 RUN chown -R nginx:nginx /usr/share/nginx/html

 RUN mkdir -p /usr/share/nginx/html/shared
--- a/common.js
+++ b/common.js
@@ -0,0 +1,556 @@
+function check_deployments() {
+  var url  = 'scan.php?op=check_deployments';
+  jQuery.get(url, function(data) {
+      console.log('check_deployments: '+data);
+      if (data=="WAIT" || data=="") {
+	  setTimeout(check_deployments, 1000);
+      }
+      else {
+	// manage2
+	apps.length = 0; // reset
+	apps.push(...JSON.parse(data)); // push each element
+	console.log(apps);
+
+	// manage
+	html_data = '';
+	data = jQuery.parseJSON(data);
+	for (var k in data) {
+		console.log(data[k]);
+		service_name = data[k].name;
+		orig_service_name = data[k].orig_name;
+		version = data[k].version;
+		installed = data[k].installed;
+		if (installed=='true') {
+			html_data += '<div><a href="#" onclick="reinstall(\''+service_name+'\',\''+service_name+'\')">'+orig_service_name+'</a> - '+version+' - INSTALLED</div>';
+		}
+		else {
+			html_data += '<div><a href="#" onclick="load_template(\''+service_name+'\',\''+service_name+'\')">'+orig_service_name+'</a> - '+version+'</div>';
+		}
+		html_data += '<div id="'+service_name+'" class="deployment"></div>';
+	}
+	jQuery("#deployments").html(html_data);
+
+      }
+  });
+}
+
+function get_deployments() {
+  var url  = 'scan.php?op=deployments';
+  jQuery.get(url, function(data) {
+  	console.log('deployments: '+data);
+	if (data=="OK") {
+      		setTimeout(check_deployments, 1000);
+	}
+	else jQuery("#deployments").html(data);
+  });
+}
+
+function check_system() {
+  var url  = 'scan.php?op=check_system&services=1';
+  jQuery.get(url, function(data) {
+    console.log('check_system: '+data);
+      if (data=="WAIT" || data=="") {
+        setTimeout(check_system, 1000);
+      }
+      else {
+        jQuery("#system").html(data);
+      }
+  });
+}
+
+function get_system() {
+  var url  = 'scan.php?op=system';
+  jQuery.get(url, function(data) {
+    console.log('system: '+data);
+	  if (data=="OK") {
+      		setTimeout(check_system, 1000);
+	  }
+	  else alert(data);
+  });
+}
+
+function check_repositories() {
+  var url  = 'scan.php?op=check_repositories';
+  jQuery.get(url, function(data) {
+      console.log('check_repositories: '+data);
+      if (data=="WAIT" || data=="") {
+		setTimeout(check_repositories, 500);
+      }
+      else {
+		jQuery("#repositories").html(data);
+      }
+  });
+}
+
+function get_repositories() {
+  var url  = 'scan.php?op=repositories';
+  jQuery.get(url, function(data) {
+	console.log('repositories: '+data);
+	if (data=="OK") {
+		setTimeout(check_repositories, 500);
+		get_deployments();
+	}
+	else alert(data);
+  });
+}
+
+function add_repository() {
+  var url  = 'scan.php?op=add_repository&repo='+jQuery('#repository').val();
+  jQuery.get(url, function(data) {
+	console.log('add_repository: '+data);
+	  if (data=="OK") {
+	  }
+	get_repositories();
+  });
+}
+
+function check_vpn() {
+  var url  = 'scan.php?op=check_vpn';
+  jQuery.get(url, function(data) {
+        console.log('check_vpn: '+data);
+        if (data=="2") {
+          $('#vpn_off').hide();
+          $('#vpn_on').show();
+          $('#pro_off').hide();
+          $('#pro_on').show();
+        }
+        else {
+          $('#vpn_on').hide();
+          $('#vpn_off').show();
+          $('#pro_on').hide();
+          $('#pro_off').show();
+        }
+        setTimeout(check_vpn, 10000);
+  });
+}
+
+function save_vpn() {
+  var url  = 'scan.php?op=save_vpn&vpn_domain='+jQuery('#vpn_domain').val()+'&vpn_pass='+jQuery('#vpn_pass').val()+'&letsencrypt_mail='+jQuery('#letsencrypt_mail').val()+'&letsencrypt_servername='+jQuery('#letsencrypt_servername').val();
+
+  jQuery.get(url, function(data) {
+	console.log('save_vpn: '+data);
+	  if (data=="OK") {
+	  }
+	//get_vpn();
+  });
+}
+
+function check_updates() {
+  var url  = 'scan.php?op=check_updates';
+  jQuery.get(url, function(data) {
+	console.log('check_updates: '+data);
+      if (data=="WAIT" || data=="") {
+        setTimeout(check_updates, 1000);
+      }
+      else {
+        jQuery("#updates").html(data);
+      }
+  });
+}
+
+function get_updates() {
+  var url  = 'scan.php?op=updates';
+  jQuery.get(url, function(data) {
+	console.log('updates: '+data);
+	  if (data=="ERROR") {
+        	jQuery("#updates").html('Searching for updates is in progress...');
+	  }
+      	setTimeout(check_updates, 1000);
+  });
+}
+
+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);
+      }
+      if (data!="OK") {
+              setTimeout(check_upgrade, 1000, service);
+      }
+      else {
+          console.log('upgrade end: '+service);
+	  jQuery("#status_"+service).html('Upgrade has finished');
+	  //get_updates();
+      }
+  });
+
+}
+
+function upgrade(service) {
+  var url  = 'scan.php?op=upgrade&service='+service;
+  jQuery("#status_"+service).html('Upgrade has started');
+  console.log('upgrade start: '+service);
+  jQuery.get(url, function(data) {
+          console.log('check_upgrade '+service+': '+data);
+          if (data=="OK") {
+                setTimeout(check_upgrade, 1000, service);
+          }
+	  else jQuery("#status_"+service).html(data);
+  });
+}
+
+function load_template(additional, block) {
+
+  jQuery("div.deployment").each(function(index) {
+        $(this).html('');
+  });
+  jQuery("#"+block).html('Loading '+additional+' template...');
+  var url  = 'scan.php?op=deployment&additional='+additional;
+  jQuery.get(url, function(data) {
+	console.log('load_template: '+data);
+	  if (data=="OK") {
+      		setTimeout(check_deployment, 1000, additional);
+	  }
+  });
+}
+
+function check_reinstall(additional) {
+  var url  = 'scan.php?op=check_reinstall';
+  jQuery.get(url, function(data) {
+	console.log('check_reinstall: '+data);
+      if (data!="") {
+	      jQuery("#"+additional).html(data);
+	      jQuery("#popupText").html(data); // manage2
+      }
+      else setTimeout(check_reinstall, 1000, additional);
+  });
+}
+
+function reinstall(additional, block) {
+  jQuery("div.deployment").each(function(index) {
+        $(this).html('');
+  });
+  jQuery("#"+block).html('Loading '+additional+' template...');
+  var url  = 'scan.php?op=reinstall&additional='+additional;
+  jQuery.get(url, function(data) {
+	console.log('reinstall '+additional+': '+data);
+	  if (data=="OK") {
+      		setTimeout(check_reinstall, 1000, additional);
+	  }
+  });
+}
+
+function check_uninstall(additional) {
+  var url  = 'scan.php?op=check_uninstall&additional='+additional;
+  jQuery.get(url, function(data) {
+        console.log('check_uninstall '+additional+': '+data);
+      if (data!="") {
+              jQuery("#"+additional).html(data);
+      }
+      if (data!="OK") {
+              setTimeout(check_uninstall, 1000, additional);
+      }
+      else {
+	  jQuery("#"+additional).html('Uninstall has finished');
+	  get_deployments();
+      }
+  });
+}
+
+function uninstall(additional) {
+
+  jQuery("div.deployment").each(function(index) {
+        $(this).html('');
+  });
+	data = '<fieldset><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="btn btn-lg btn-primary btn-block" type="button" onclick="confirm_uninstall(\''+additional+'\')">Uninstall</button></div></div></form></fieldset>';
+	jQuery("#"+additional).html(data);
+}
+
+function confirm_uninstall(additional) {
+  jQuery("#"+additional).html('Loading...');
+  var url  = 'scan.php?op=uninstall&additional='+additional;
+  jQuery.get(url, function(data) {
+        console.log('uninstall '+additional+': '+data);
+          if (data!="") {
+                jQuery("#"+additional).html(data);
+                setTimeout(check_uninstall, 1000, additional);
+          }
+  });
+}
+
+function update_deployment(additional) {
+  //jQuery("#"+additional).html('Loading...');
+  pars = '';
+  jQuery('input.additional_'+additional).each(function(index) {
+	console.log('Field ' + $(this).attr('name') + ': ' + $(this).val());
+	//pars += '&'+$(this).attr('id') + '=' + $(this).val();
+	pars += '&'+$(this).attr('name') + '=' + $(this).val();
+  });
+  //console.log(pars);
+  var url  = 'scan.php?op=edit&additional='+additional+pars;
+  jQuery.get(url, function(data) {
+        console.log('edit '+additional+': '+data);
+          if (data!="") {
+                jQuery("#"+additional).html(data);
+                setTimeout(check_deployment, 1000, additional);
+          }
+  });
+}
+
+function request_letsencrypt(domain) {
+  var url  = 'scan.php?op=request_letsencrypt&domain='+domain;
+  jQuery.get(url, function(data) {
+      console.log('letsencrypt '+domain);
+      if (data!="") {
+          jQuery("#letsencrypt").html(data);
+      }
+      setTimeout(check_letsencrypt, 2000, domain);
+  });
+}
+
+function check_letsencrypt(domain) {
+  var url  = 'scan.php?op=check_letsencrypt&domain='+domain;
+  jQuery.get(url, function(data) {
+      console.log('check_letsencrypt '+domain);
+      if (data!="") {
+          jQuery("#letsencrypt").html(data);
+      }
+      //setTimeout(check_letsencrypt, 1500, domain);
+  });
+}
+
+function check_deployment(additional) {
+  var url  = 'scan.php?op=check_deployment&additional='+additional;
+  jQuery.get(url, function(data) {
+      console.log('check_deployment '+additional);
+      //console.log('check_deployment data: '+data);
+      if (data!="") {
+	      jQuery("#"+additional).html(data);
+	      jQuery("#popupText").html(data); // manage2
+      }
+      else setTimeout(check_deployment, 1000, additional);
+  });
+}
+
+function deploy(additional) {
+  pars = '';
+  jQuery('input.additional_'+additional).each(function(index) {
+	console.log('Field ' + $(this).attr('name') + ': ' + $(this).val());
+	//pars += '&'+$(this).attr('id') + '=' + $(this).val();
+	pars += '&'+$(this).attr('name') + '=' + $(this).val();
+  });
+  //console.log(pars);
+  var url  = 'scan.php?op=deploy&additional='+additional+pars;
+  jQuery.get(url, function(data) {
+	console.log('deploy '+additional+': '+data);
+	  if (data!="") {
+	        jQuery("#"+additional).html(data);
+      		setTimeout(check_deployment, 1000, additional);
+	  }
+  });
+}
+
+function redeploy(additional) {
+  pars = '';
+  jQuery('input.additional_'+additional).each(function(index) {
+	console.log('Field ' + $(this).attr('name') + ': ' + $(this).val());
+	//pars += '&'+$(this).attr('id') + '=' + $(this).val();
+	pars += '&'+$(this).attr('name') + '=' + $(this).val();
+  });
+  //console.log(pars);
+  var url  = 'scan.php?op=redeploy&additional='+additional+pars;
+  jQuery.get(url, function(data) {
+	console.log('redeploy '+additional+': '+data);
+	  if (data!="") {
+	        jQuery("#"+additional).html(data);
+      		setTimeout(check_deployment, 1000, additional);
+	  }
+  });
+}
+
+function check_services() {
+  var url  = 'scan.php?op=check_services';
+  jQuery.get(url, function(data) {
+	console.log('check_services: '+data);
+      if (data=="WAIT" || data=="") {
+        setTimeout(check_services, 1000);
+      }
+      else {
+	jQuery("#services").html(data);
+      }
+  });
+}
+
+function get_services() {
+  var url  = 'scan.php?op=services';
+  jQuery.get(url, function(data) {
+	console.log('services: '+data);
+  	setTimeout(check_services, 1000);
+  });
+}
+
+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="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>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+				<label for="vpn_pass">Please type in the generated VPN passkey (8 digits):</label>
+				<input type="text" class="form-control" name="VPN_PASS" id="vpn_pass" value="" maxlength="8" size="10">
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+				<label for="letsencrypt_mail">Please add the letsencrypt mail address:</label>
+				<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 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>
+				<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>
+	<script>
+	jQuery('#vpn_save_btn').click(function() {
+		console.log('vpn save');
+		jQuery('#vpn').html('Loading...');
+		save_vpn();
+	});
+	</script>
+        `;
+	jQuery("#vpn").html(proxy_html);
+}
+
+function check_containers() {
+  var url  = 'scan.php?op=check_containers';
+  jQuery.get(url, function(data) {
+	console.log('check_containers: '+data);
+      if (data!="") {
+	      jQuery("#containers").html(data);
+      }
+      else setTimeout(check_containers, 1000);
+  });
+}
+
+function get_containers() {
+  var url  = 'scan.php?op=containers';
+  jQuery.get(url, function(data) {
+	console.log('containers: '+data);
+	  if (data=="OK") {
+      		setTimeout(check_containers, 1000);
+	  }
+  });
+}
+
+jQuery(document).ready(function(){
+
+	get_repositories();
+	get_system();
+	check_vpn();
+
+	jQuery('#deployments_btn').click(function() {
+		jQuery('#services').hide();
+		jQuery('#deployments').toggle();
+	});
+
+	jQuery('#services_btn').click(function() {
+		get_services();
+		jQuery('#deployments').hide();
+		jQuery('#services').toggle();
+	});
+
+	jQuery('#settings_btn').click(function() {
+		jQuery('#settings').toggle();
+		jQuery('#default').toggle();
+		jQuery('#vpn').hide();
+	});
+
+	jQuery('#vpn_btn').click(function() {
+		jQuery('#vpn').toggle();
+		jQuery('#settings').hide();
+	});
+
+	jQuery('#vpn_cancel_btn').click(function() {
+		jQuery('#vpn').hide();
+	});
+
+	jQuery('#update_btn').click(function() {
+		jQuery('#updates').html('Looking for updates... Please wait...');
+		get_updates();
+	});
+
+	jQuery('#add_repo').submit(function() {
+		jQuery('#repositories').html('Loading...');
+		add_repository();
+		return false;
+	});
+
+	jQuery('#save_vpn').submit(function() {
+		save_vpn();
+		jQuery('#vpn').html('Loading...');
+		return false;
+	});
+
+	jQuery('select#smarthost').click(function() {
+		if (jQuery(this).val()=='yes') jQuery('#div_smarthost').show();
+		else jQuery('#div_smarthost').hide();
+
+		if (jQuery("#smarthost").val()=='no' && jQuery("#localproxy").val()=='yes') {
+			alert("Warning! Local proxy will not work without smarthost proxy service.");
+		}
+	});
+	jQuery('select#vpn').click(function() {
+		if (jQuery(this).val()=='yes') jQuery('#div_vpn').show();
+		else jQuery('#div_vpn').hide();
+	});
+/*
+	jQuery('select#discovery').click(function() {
+		if (jQuery(this).val()=='yes') jQuery('#div_discover').show();
+		else jQuery('#div_discover').hide();
+	});
+	jQuery('select#additionals').click(function() {
+		if (jQuery(this).val()=='yes') jQuery('#div_additionals').show();
+		else jQuery('#div_additionals').hide();
+	});
+	jQuery('select#nextcloud').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_nextcloud').show();
+		else jQuery('#div_nextcloud').hide();
+	});
+	jQuery('select#bitwarden').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_bitwarden').show();
+		else jQuery('#div_bitwarden').hide();
+	});
+	jQuery('select#bitwarden_smtp').click(function() {
+		if (jQuery(this).val()=='3') jQuery('#div_bitwarden_smtp').show();
+		else jQuery('#div_bitwarden_smtp').hide();
+	});
+	jQuery('select#guacamole').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_guacamole').show();
+		else jQuery('#div_guacamole').hide();
+	});
+	jQuery('select#smtp_server').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_smtp_server').show();
+		else jQuery('#div_smtp_server').hide();
+	});
+	jQuery('select#roundcube').click(function() {
+		if (jQuery(this).val()=='Y') jQuery('#div_roundcube').show();
+		else jQuery('#div_roundcube').hide();
+	});
+*/
+});
+
--- a/functions.php
+++ b/functions.php
@@ -127,7 +127,7 @@ function get_vpn_url($domain,$passkey) {
 }

 function show_service($name, $containers) {
-	$str = '<table id="'.$name.'">';
+	$str = '<table id="service_'.$name.'">';
 	$str .= "<tr><th>{$name}</th></tr>";
 	$containers = trim($containers);
 	$arr = explode("|",$containers);
@@ -140,28 +140,41 @@ function show_service($name, $containers) {
 	echo $str;
 }

-function show_service_update($name, $update, $uptodate) {
-	$str = '<table id="'.$name.'">';
-	$str .= "<tr><th>{$name}</th></tr>";
+function show_service_update($name, $update, $uptodate, $error) {

+	$str = "";
 	$update = trim($update);
 	if (!empty($update)) {
 		$arr = explode(" ",$update);
 		foreach ($arr as $container) {
-			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>UPDATE AVAILABLE</td><td>UPDATE</td></tr>";
+			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">UPDATE AVAILABLE</div></td><td>&nbsp;</td></tr>";
 		}
+		$update_str = "<a href=\"javascript:void(0)\" onclick=\"upgrade('{$name}')\">UPDATE</a>";
 	}

 	$uptodate = trim($uptodate);
 	if (!empty($uptodate)) {
 		$arr = explode(" ",$uptodate);
 		foreach ($arr as $container) {
-			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>Already up to date</td><td></td></tr>";
+			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">Already up to date</div></td><td>&nbsp;</td></tr>";
 		}
+		$update_str = "<a href=\"javacript:void(0)\" onclick=\"upgrade('{$name}')\">FORCE UPDATE</a>";
 	}
-	$str .= '</table>';

+        $error = trim($error);
+        if (!empty($error)) {
+                $arr = explode(" ",$error);
+                foreach ($arr as $container) {
+                        //$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>N/A</td><td></td></tr>";
+                        $str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">N/A</div></td><td>&nbsp;</td></tr>";
+                }
+		$update_str = "<a href=\"javascript:void(0)\" onclick=\"upgrade('{$name}')\">TRY UPDATE</a>";
+        }
+
+	echo '<table id="update_'.$name.'">';
+	echo "<tr><th>{$name}</th><th>&nbsp;</th><th>&nbsp;</th><th>{$update_str}</th></tr>";
 	echo $str;
+	echo '</table>';
 }

 // not in use
@@ -267,7 +280,8 @@ function set_output($op,$output) {
 		redis_set($op,$output);
 	}
 	else {
-		file_put_contents($SHARED_DIR."/input/".$op.".json",$output);
+		if (file_exists($SHARED_DIR."/input/".$op.".json")) return false;
+		else file_put_contents($SHARED_DIR."/input/".$op.".json",$output);
 	}

 	return true;
@@ -294,6 +308,18 @@ function check_files($dir,$key) {
 	return $result;
 }

+function show_letsencrypt($letsencrypt, $domain) {
+	if (!empty($letsencrypt[$domain])) {
+		echo "LETSENCRYPT: ".$letsencrypt[$domain]["status"]." - ".$letsencrypt[$domain]["date"];
+		echo " - <a href=\"letsencrypt_log.php?domain={$domain}\" target=\"_blank\">LOG</a>";
+		if (date("Y-m-d",time()-60*24*3600)>substr($letsencrypt[$domain]["date"],0,10) || $letsencrypt[$domain]["status"]=="failed") {
+			echo " - <a href=\"#\" onclick=\"request_letsencrypt('{$domain}')\">Request new certificate</a>";
+		}
+		echo "<br><br>";
+	}
+	else echo "LETSENCRYPT in progress for {$domain}.<script>check_letsencrypt('{$domain}')</script>";
+}
+
 function check_letsencrypt() {

 	global $SHARED_DIR;
@@ -303,13 +329,12 @@ function check_letsencrypt() {
 		$json_data = file_get_contents($input_file);
 		$data = json_decode($json_data,true);
 		if ($data === null) {
-			echo "JSON read error...";
-			// TODO json error
+			return "ERROR";
 		}
 		else {
-			foreach ($data as $d) {	
-				$result[$d["domain"]] = $d;
-			}
+                        foreach ($data as $domain => $domain_data) {
+                                $result[$domain] = $domain_data;
+                        }
 		}
 	}
 	else $result = "";
@@ -354,7 +379,7 @@ function remove_response($key) {
 	}
 	else {
 		copy($SHARED_DIR."/output/".$key.".json",$SHARED_DIR."/".$key.".json"); // DEBUG - last json
-		unlink($SHARED_DIR."/output/".$key.".json");
+		if (!unlink($SHARED_DIR."/output/".$key.".json")) echo "UNLINK ERROR";
 	}	
 }

--- a/image.png
+++ b/image.png
--- a/img/app.png
+++ b/img/app.png
--- a/img/app2.png
+++ b/img/app2.png
--- a/img/bell.png
+++ b/img/bell.png
--- a/img/disk.png
+++ b/img/disk.png
--- a/img/disk2.png
+++ b/img/disk2.png
--- a/img/globe.png
+++ b/img/globe.png
--- a/img/logo.png
+++ b/img/logo.png
--- a/img/monitor.png
+++ b/img/monitor.png
--- a/img/monitor2.png
+++ b/img/monitor2.png
--- a/img/off.png
+++ b/img/off.png
--- a/img/on.png
+++ b/img/on.png
--- a/img/settings.png
+++ b/img/settings.png
--- a/img/settings2.png
+++ b/img/settings2.png
--- a/img/upgrade.png
+++ b/img/upgrade.png
--- a/img/x.png
+++ b/img/x.png
--- a/img/x2.png
+++ b/img/x2.png
--- a/img/yellow_corner.png
+++ b/img/yellow_corner.png
--- a/install.html
+++ b/install.html
@@ -93,8 +93,8 @@
 </div>
 <div class="row">
    <div class="mb-3">
-		<label for="disagnostic">Diagnostic mode enable?</label>
-		<select class="custom-select d-block w-100" name="DIAGNOSTIC" id="disagnostic">
+		<label for="diagnostic">Diagnostic mode enable?</label>
+		<select class="custom-select d-block w-100" name="DIAGNOSTIC" id="diagnostic">
 		<option value="yes">Yes</option>
 		<option value="no" selected>No</option>
 		</select>
@@ -137,8 +137,8 @@
 	    <div class="mb-3">
 		<label for="local_backend">Would you like to run local backend?</label>
 		<select class="custom-select d-block w-100" name="LOCAL_BACKEND" id="local_backend">
-		<option value="yes" selected>Yes</option>
-		<option value="no">No</option>
+		<option value="yes">Yes</option>
+		<option value="no" selected>No</option>
 		</select>
 	    </div>
 	</div>
@@ -178,6 +178,15 @@
 <script>
 jQuery(document).ready(function(){

+        jQuery('#diagnostic').click(function() {
+                if (jQuery(this).val()=='yes') {
+                        jQuery('#local_backend').val('yes');
+                }
+                else {
+                        jQuery('#local_backend').val('no');
+                }
+        });
+
 	jQuery('#advanced').click(function() {
 		jQuery('#advanced_div').toggle();
 	});
--- a/installer.css
+++ b/installer.css
@@ -1,5 +1,5 @@
 .hidden {display:none}
-fieldset {border: 1px solid  #049dff; padding-left: 40px; padding-right: 20px}
+fieldset {border: 1px solid  #049dff; padding-left: 40px; padding-right: 20px; border-radius: 10px; width: 100%}
 legend {width: auto;text-align: left !important; padding: 10px; color: #049dff;}
 fieldset.sub_block {border: 1px solid black; margin:-20px 0px 20px -15px}
 fieldset.sub_block legend {color: black}
@@ -16,6 +16,9 @@ body#scan{
 /*  background-color: #7E57C2; */
 }

+.red {color: red}
+.green {color: green}
+
 .mt-100{
  margin-top: 100px;
 }
@@ -129,3 +132,55 @@ body#scan{
    transform: rotate(135deg);
  }
 }
+
+    .info-container {
+      position: relative;
+      display: inline-block;
+      font-family: Arial, sans-serif;
+    }
+
+    .info-icon {
+      background-color: #007BFF;
+      color: white;
+      border-radius: 50%;
+      padding: 4px 8px;
+      cursor: pointer;
+      font-weight: bold;
+      font-size: 14px;
+      text-align: center;
+      line-height: 1;
+      display: inline-block;
+    }
+
+    .tooltip {
+      visibility: hidden;
+      background-color: #333;
+      color: #fff;
+      text-align: left;
+      border-radius: 4px;
+      padding: 8px;
+      position: absolute;
+      z-index: 1;
+      bottom: 125%; /* above the icon */
+      left: 50%;
+      transform: translateX(-50%);
+      opacity: 0;
+      transition: opacity 0.3s;
+      white-space: nowrap;
+    }
+
+    .tooltip::after {
+      content: "";
+      position: absolute;
+      top: 100%; /* bottom of tooltip */
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: #333 transparent transparent transparent;
+    }
+
+    .info-container:hover .tooltip {
+      visibility: visible;
+      opacity: 1;
+    }
--- a/manage.html
+++ b/manage.html
@@ -8,7 +8,7 @@
 <!-- Bootstrap CSS -->
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
 <!-- Custom styles for this template -->
-<link href="installer.css?t=4" rel="stylesheet">
+<link href="installer.css?t=7" rel="stylesheet">
 </head>
 <body id="manage" class="text-center">
 <div class="container-fluid">
@@ -16,8 +16,16 @@

 <h1>Found deployed environment</h1>

-<div style="text-align:left;float:left">
+<div style="text-align:left;float:left;width:33%">
 	<a href="javascript:void()" id="vpn_btn">VPN</a>
+        Status:
+	<span id="vpn_on" class="hidden green"><b>ON</b></span>
+	<span id="vpn_off" class="hidden red"><b>OFF</b></span>
+</div>
+<div style="text-align:center;float:left;width:34%">
+        <a href="manage.html" id="refresh_btn">REFRESH</a>
+        /
+	<a href="manage2.html" id="new_btn">NEW DESIGN</a>
 </div>
 <div style="text-align:right;float:right">
 	<a href="javascript:void()" id="settings_btn">SETTINGS</a>
@@ -60,7 +68,8 @@
 		</div>
 		<div class="row">
 		    <div class="mb-3">
-			<button class="btn btn-lg btn-primary btn-block" type="submit" id="vpn_save_btn"> Save </button>
+			<button class="btn btn-lg btn-primary btn-block" type="submit" id="vpn_save_btn"> Save </button> &nbsp;
+			<button class="btn btn-lg btn-primary btn-block" type="button" id="vpn_cancel_btn"> Cancel </button>
 		    </div>
 		</div>
 	</form>
@@ -99,8 +108,10 @@
 	
 	<fieldset>
 	<legend>Updates</legend>
+	<div style="text-align:left">
+		<a href="javascript:void()" id="update_btn">Search for updates</a>
+	</div>
 	<div id="updates" style="text-align:left">
-		<a href="javascript:void()" id="update_btn">Search updates</a>
 	</div>
 	</fieldset>
 	<br>
@@ -132,344 +143,15 @@
 </div>
 <br>
 <br>
+<script>
+    // apps array beállítása common.js-ben
+    const apps = []; // GLOBAL VARIABLE
+</script>
 <!-- Optional JavaScript -->
 <!-- jQuery first, then Popper.js, then Bootstrap JS -->
 <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>
-
-function check_deployments() {
-  var url  = 'scan.php?op=check_deployments';
-  jQuery.get(url, function(data) {
-      console.log('check_deployments: '+data);
-      if (data=="WAIT" || data=="") {
-	  setTimeout(check_deployments, 1000);
-      }
-      else jQuery("#deployments").html(data);
-  });
-}
-
-function get_deployments() {
-  var url  = 'scan.php?op=deployments';
-  jQuery.get(url, function(data) {
-  	console.log('deployments: '+data);
-	if (data=="OK") {
-      		setTimeout(check_deployments, 1000);
-	}
-	else jQuery("#deployments").html(data);
-  });
-}
-
-function check_system() {
-  var url  = 'scan.php?op=check_system&services=1';
-  jQuery.get(url, function(data) {
-    console.log('check_system: '+data);
-      if (data=="WAIT" || data=="") {
-        setTimeout(check_system, 1000);
-      }
-      else {
-        jQuery("#system").html(data);
-      }
-  });
-}
-
-function get_system() {
-  var url  = 'scan.php?op=system';
-  jQuery.get(url, function(data) {
-    console.log('system: '+data);
-	  if (data=="OK") {
-      		setTimeout(check_system, 1000);
-	  }
-	  else alert(data);
-  });
-}
-
-function check_repositories() {
-  var url  = 'scan.php?op=check_repositories';
-  jQuery.get(url, function(data) {
-      console.log('check_repositories: '+data);
-      if (data=="WAIT" || data=="") {
-		setTimeout(check_repositories, 500);
-      }
-      else {
-		jQuery("#repositories").html(data);
-      }
-  });
-}
-
-function get_repositories() {
-  var url  = 'scan.php?op=repositories';
-  jQuery.get(url, function(data) {
-	console.log('repositories: '+data);
-	if (data=="OK") {
-		setTimeout(check_repositories, 500);
-		get_deployments();
-	}
-	else alert(data);
-  });
-}
-
-function add_repository() {
-  var url  = 'scan.php?op=add_repository&repo='+jQuery('#repository').val();
-  jQuery.get(url, function(data) {
-	console.log('add_repository: '+data);
-	  if (data=="OK") {
-	  }
-	get_repositories();
-  });
-}
-
-function save_vpn() {
-  var url  = 'scan.php?op=save_vpn&vpn_domain='+jQuery('#vpn_domain').val()+'&vpn_pass='+jQuery('#vpn_pass').val()+'&letsencrypt_mail='+jQuery('#letsencrypt_mail').val()+'&letsencrypt_servername='+jQuery('#letsencrypt_servername').val();
-
-  jQuery.get(url, function(data) {
-	console.log('save_vpn: '+data);
-	  if (data=="OK") {
-	  }
-	//get_vpn();
-  });
-}
-
-function check_updates() {
-  var url  = 'scan.php?op=check_updates';
-  jQuery.get(url, function(data) {
-	console.log('check_updates: '+data);
-      if (data=="WAIT" || data=="") {
-        setTimeout(check_updates, 1000);
-      }
-      else {
-        jQuery("#updates").html(data);
-      }
-  });
-}
-
-function get_updates() {
-  var url  = 'scan.php?op=updates';
-  jQuery.get(url, function(data) {
-	console.log('updates: '+data);
-	  if (data=="OK") {
-      		setTimeout(check_updates, 1000);
-	  }
-  });
-}
-
-function load_template(additional) {
-  jQuery("#"+additional).html('Loading '+additional+' template...');
-  var url  = 'scan.php?op=deployment&additional='+additional;
-  jQuery.get(url, function(data) {
-	console.log('load_template: '+data);
-	  if (data=="OK") {
-      		setTimeout(check_deployment, 1000, additional);
-	  }
-  });
-}
-
-function check_reinstall(additional) {
-  var url  = 'scan.php?op=check_reinstall';
-  jQuery.get(url, function(data) {
-	console.log('check_reinstall: '+data);
-      if (data!="") {
-	      jQuery("#"+additional).html(data);
-      }
-      else setTimeout(check_reinstall, 1000, additional);
-  });
-}
-
-function reinstall(additional) {
-  jQuery("#"+additional).html('Loading...');
-  var url  = 'scan.php?op=reinstall&additional='+additional;
-  jQuery.get(url, function(data) {
-	console.log('reinstall '+additional+': '+data);
-	  if (data=="OK") {
-      		setTimeout(check_reinstall, 1000, additional);
-	  }
-  });
-}
-
-function check_uninstall(additional) {
-  var url  = 'scan.php?op=check_uninstall';
-  jQuery.get(url, function(data) {
-	console.log('check_uninstall '+additional+': '+data);
-      if (data!="") {
-	      jQuery("#"+additional).html(data);
-      }
-      else setTimeout(check_uninstall, 1000, additional);
-  });
-}
-
-function uninstall(additional) {
-  var url  = 'scan.php?op=uninstall&additional='+additional;
-  jQuery.get(url, function(data) {
-	console.log('uninstall '+additional+': '+data);
-	  if (data!="") {
-	        jQuery("#"+additional).html(data);
-      		setTimeout(check_uninstall, 1000, additional);
-	  }
-  });
-}
-
-function check_deployment(additional) {
-  var url  = 'scan.php?op=check_deployment&additional='+additional;
-  jQuery.get(url, function(data) {
-      console.log('check_deployment '+additional+': '+data);
-      if (data!="") {
-	      jQuery("#"+additional).html(data);
-      }
-      else setTimeout(check_deployment, 1000, additional);
-  });
-}
-
-function deploy(additional) {
-  pars = '';
-  jQuery('input.additional_field').each(function(index) {
-	console.log('Field ' + $(this).attr('id') + ': ' + $(this).val());
-	pars += '&'+$(this).attr('id') + '=' + $(this).val();
-  });
-  //console.log(pars);
-  var url  = 'scan.php?op=deploy&additional='+additional+pars;
-  jQuery.get(url, function(data) {
-	console.log('deploy '+additional+': '+data);
-	  if (data!="") {
-	        jQuery("#"+additional).html(data);
-      		setTimeout(check_deployment, 1000, additional);
-	  }
-  });
-}
-
-function check_services() {
-  var url  = 'scan.php?op=check_services';
-  jQuery.get(url, function(data) {
-	console.log('check_services: '+data);
-      if (data=="WAIT" || data=="") {
-        setTimeout(check_services, 1000);
-      }
-      else {
-	jQuery("#services").html(data);
-      }
-  });
-}
-
-function get_services() {
-  var url  = 'scan.php?op=services';
-  jQuery.get(url, function(data) {
-	console.log('services: '+data);
-  	setTimeout(check_services, 1000);
-  });
-}
-
-function check_containers() {
-  var url  = 'scan.php?op=check_containers';
-  jQuery.get(url, function(data) {
-	console.log('check_containers: '+data);
-      if (data!="") {
-	      jQuery("#containers").html(data);
-      }
-      else setTimeout(check_containers, 1000);
-  });
-}
-
-function get_containers() {
-  var url  = 'scan.php?op=containers';
-  jQuery.get(url, function(data) {
-	console.log('containers: '+data);
-	  if (data=="OK") {
-      		setTimeout(check_containers, 1000);
-	  }
-  });
-}
-
-jQuery(document).ready(function(){
-
-	get_repositories();
-	get_system();
-	get_services();
-
-	jQuery('#deployments_btn').click(function() {
-		jQuery('#services').hide();
-		jQuery('#deployments').toggle();
-	});
-
-	jQuery('#services_btn').click(function() {
-		jQuery('#deployments').hide();
-		jQuery('#services').toggle();
-	});
-
-	jQuery('#settings_btn').click(function() {
-		jQuery('#settings').toggle();
-		jQuery('#default').toggle();
-		jQuery('#vpn').hide();
-	});
-
-	jQuery('#vpn_btn').click(function() {
-		jQuery('#vpn').toggle();
-		jQuery('#settings').hide();
-	});
-
-	jQuery('#update_btn').click(function() {
-		jQuery('#updates').html('Looking for updates... Please wait...');
-		get_updates();
-	});
-
-	jQuery('#add_repo').submit(function() {
-		jQuery('#repositories').html('Loading...');
-		add_repository();
-		return false;
-	});
-
-	jQuery('#save_vpn').submit(function() {
-		save_vpn();
-		jQuery('#vpn').html('Loading...');
-		return false;
-	});
-
-	jQuery('select#smarthost').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_smarthost').show();
-		else jQuery('#div_smarthost').hide();
-
-		if (jQuery("#smarthost").val()=='no' && jQuery("#localproxy").val()=='yes') {
-			alert("Warning! Local proxy will not work without smarthost proxy service.");
-		}
-	});
-	jQuery('select#vpn').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_vpn').show();
-		else jQuery('#div_vpn').hide();
-	});
-/*
-	jQuery('select#discovery').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_discover').show();
-		else jQuery('#div_discover').hide();
-	});
-	jQuery('select#additionals').click(function() {
-		if (jQuery(this).val()=='yes') jQuery('#div_additionals').show();
-		else jQuery('#div_additionals').hide();
-	});
-	jQuery('select#nextcloud').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_nextcloud').show();
-		else jQuery('#div_nextcloud').hide();
-	});
-	jQuery('select#bitwarden').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_bitwarden').show();
-		else jQuery('#div_bitwarden').hide();
-	});
-	jQuery('select#bitwarden_smtp').click(function() {
-		if (jQuery(this).val()=='3') jQuery('#div_bitwarden_smtp').show();
-		else jQuery('#div_bitwarden_smtp').hide();
-	});
-	jQuery('select#guacamole').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_guacamole').show();
-		else jQuery('#div_guacamole').hide();
-	});
-	jQuery('select#smtp_server').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_smtp_server').show();
-		else jQuery('#div_smtp_server').hide();
-	});
-	jQuery('select#roundcube').click(function() {
-		if (jQuery(this).val()=='Y') jQuery('#div_roundcube').show();
-		else jQuery('#div_roundcube').hide();
-	});
-*/
-});
-</script>
+<script src="common.js?t=5"></script>
 </body>
 </html>
--- a/manage2.html
+++ b/manage2.html
@@ -0,0 +1,832 @@
+<!DOCTYPE html>
+<html lang="hu">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Safebox</title>
+    <style>
+        :root {
+            --bg-color: #ffffff;
+            --text-color: #000000;
+            --app-bg: #f0f0f0;
+            --button-border: #000000;
+        }
+        [data-theme="dark"] {
+            --bg-color: #1a1a1a;
+            --text-color: #ffffff;
+            --app-bg: #2c2c2c;
+            --button-border: #ffffff;
+        }
+        body {
+            margin: 0;
+            font-family: Arial, sans-serif;
+            background-color: var(--bg-color);
+            color: var(--text-color);
+            display: flex;
+            flex-direction: column;
+            min-height: 100vh;
+        }
+        header {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 10px 20px;
+        }
+	table {border: 1px solid orange; width:100%;}
+	table th {padding-left: 20px; text-align: left; color: orange; width: 25%;}
+	table td {padding-left: 20px; text-align:left; width: 25%;}
+
+	label {text-align: left !important;}
+	a, a:hover, a:visited {color: orange}
+
+	fieldset {border: 1px solid  #ffffff; padding-left: 20px; padding-right: 20px; border-radius: 10px;}
+	legend {width: auto;text-align: left !important; padding: 10px; color: #ffffff;}
+
+        .profile {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            font-weight: bold;
+            gap: 5px;
+            cursor: pointer;
+        }
+        .profile img {
+            width: 50px;
+            height: 50px;
+            object-fit: cover;
+            border-radius: 50%;
+        }
+        .settings {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            font-weight: bold;
+            gap: 5px;
+        }
+        .logo {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        }
+        .logo img {
+            width: 50px;
+            height: 50px;
+        }
+        .logo div {
+            margin: 0;
+            padding: 0;
+        }
+        .logo h1 {
+            margin: 0;
+            padding: 0;
+            font-size: 24px;
+	    color: var(--text-color);
+        }
+        .toggle {
+            cursor: pointer;
+            width: 40px;
+            height: 20px;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            position: relative;
+        }
+        .toggle::after {
+            content: '';
+            position: absolute;
+            top: 2px;
+            left: 2px;
+            width: 16px;
+            height: 16px;
+            background: var(--button-border);
+            border-radius: 50%;
+            transition: 0.3s;
+        }
+        .toggle.active::after {
+            transform: translateX(20px);
+        }
+        div#themeToggle {
+		position: fixed;
+		top: 10px;
+		right: 10px;
+        }
+        .buttons {
+            display: flex;
+            justify-content: center;
+            gap: 10px;
+            margin: 20px 0;
+            cursor: pointer;
+        }
+        .buttons button {
+            min-width: 150px;
+            padding: 10px 10px;
+            background: none;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            cursor: pointer;
+            color: var(--text-color);
+        }
+        .buttons button.active, .buttons button:hover {
+		color: orange;
+            	border: 1px solid orange;
+        }
+        .left-buttons {
+            display: flex;
+            justify-content: center;
+            gap: 10px;
+            margin: 20px 0;
+            cursor: pointer;
+        }
+        .left-buttons button {
+            min-width: 120px;
+            padding: 5px 5px;
+            background: none;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            cursor: pointer;
+            color: var(--text-color);
+        }
+        .container-frame {
+		border: 1px solid;
+            	border-radius: 10px;
+		padding: 0px;
+		margin: 5px;
+		height: 98vh;
+        }
+        .container {
+		clear:both;
+		float:none;
+		padding-bottom: 10px;
+		margin: 5px;
+		height: 88vh;
+        }
+        .leftside {
+		float:left;
+		width:10%;
+        }
+        .rightside {
+		float:right;
+		width:90%;
+		display: flex;
+		flex-direction: column;
+		height: 88vh;
+        }
+        .my-apps {
+            flex: 1;
+            background-color: var(--app-bg);
+            padding: 40px;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: flex-start;
+            align-items: flex-start;
+            gap: 40px;
+            min-width: 96%;
+            max-width: 96%;
+            margin: 0 auto;
+            border-radius: 10px;
+            box-sizing: border-box;
+        }
+        .my-apps-container {
+            width:100%;
+            display: flex;
+            flex-wrap: wrap;
+        }
+        .app {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            width: 120px;
+            cursor: pointer;
+        }
+        .app img {
+            width: 80px;
+            height: 80px;
+            object-fit: contain;
+            margin-bottom: 10px;
+        }
+        .innerDiv {
+            width:100%;
+        }
+        footer {
+	    position: fixed;
+	    bottom: 0;
+	    left: 0;
+	    width: 97%;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 20px;
+            font-size: 14px;
+	    z-index: 1000;
+	}
+        .footer-links {
+            display: flex;
+            gap: 15px;
+        }
+        .footer-links a {
+            color: black;
+            text-decoration: none;
+            font-weight: bold;
+        }
+        .footer-center {
+            text-align: center;
+        }
+        .footer-center p {
+            margin: 5px 0;
+        }
+        .footer-center strong {
+            font-size: 18px;
+        }
+        .footer-center a {
+            color: var(--text-color);
+            text-decoration: none;
+            font-weight: bold;
+        }
+        .footer-center a:hover {
+            text-decoration: underline;
+        }
+        .footer-social {
+            display: flex;
+            gap: 15px;
+        }
+        .footer-social a {
+            color: black;
+            text-decoration: none;
+            font-weight: bold;
+        }
+        .hidden {
+            display: none;
+        }
+
+        .popup.hidden {
+            display: none;
+        }
+
+        .popup {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: rgba(0,0,0,0.5);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            z-index: 999;
+        }
+
+        .popup-content {
+            background: var(--bg-color);
+            padding: 30px;
+            border-radius: 15px;
+            width: 80%;
+            text-align: left;
+            position: relative;
+            animation: fadeIn 0.3s ease;
+        }
+
+        .popup-content .close {
+            position: absolute;
+            top: 10px;
+            right: 15px;
+            font-size: 24px;
+            cursor: pointer;
+        }
+
+        [data-theme="dark"] .footer-links a,
+        [data-theme="dark"] .footer-social a {
+            color: white;
+        }
+
+        [data-theme="dark"] .footer-links a:hover,
+        [data-theme="dark"] .footer-social a:hover {
+            text-decoration: underline;
+        }
+
+        @keyframes fadeIn {
+            from { opacity: 0; transform: scale(0.9); }
+            to { opacity: 1; transform: scale(1); }
+        }
+
+        .input-group {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 10px;
+            margin: 20px 0;
+        }
+
+        .input-group input {
+		min-width:260px;
+            margin-top: 5px;
+            margin-bottom: 5px;
+            padding: 5px;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            background: none;
+            color: var(--text-color);
+            outline: none;
+        }
+
+        .input-group button {
+            padding: 10px 20px;
+            background: none;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            color: var(--text-color);
+            cursor: pointer;
+        }
+
+        .checkbox-container {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  cursor: pointer;
+  font-size: 16px;
+  user-select: none;
+  color: var(--text-color);
+  position: relative;
+}
+
+.checkbox-container input {
+  position: absolute;
+  opacity: 0;
+  cursor: pointer;
+  height: 0;
+  width: 0;
+}
+
+.checkmark {
+  position: relative;
+  height: 24px;
+  width: 24px;
+  background-color: var(--app-bg);
+  border: 2px solid var(--button-border);
+  border-radius: 6px;
+  box-sizing: border-box;
+  transition: background-color 0.3s, border-color 0.3s;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/* Ha be van pipálva: sötét hátteret és világos szegélyt */
+.checkbox-container input:checked ~ .checkmark {
+  background-color: var(--button-border);
+  border-color: var(--button-border);
+}
+
+/* A pipa - kisebb és középen */
+.checkmark::after {
+  content: "";
+  display: block;
+  width: 10px;
+  height: 6px;
+  border: solid var(--bg-color);
+  border-width: 0 0 3px 3px;
+  transform: rotate(-45deg);
+  opacity: 0;
+  transition: opacity 0.3s;
+}
+
+/* Ha be van jelölve: megjelenik a pipa */
+.checkbox-container input:checked ~ .checkmark::after {
+  opacity: 1;
+}
+
+/* Dark mode variációk */
+[data-theme="dark"] {
+  --bg-color: #1a1a1a;
+  --text-color: #f0f0f0;
+  --app-bg: #2c2c2c;
+  --button-border: #e0e0e0;
+}
+
+
+        .custom-select {
+            padding: 10px;
+            border: 1px solid var(--button-border);
+            border-radius: 10px;
+            background-color: var(--app-bg);
+            color: var(--text-color);
+            font-size: 16px;
+            appearance: none;
+            background-image: url("data:image/svg+xml;charset=US-ASCII,%3Csvg xmlns='http://www.w3.org/2000/svg' width='14' height='10' viewBox='0 0 14 10'%3E%3Cpolyline points='1 1 7 7 13 1' style='fill:none;stroke:black;stroke-width:2' /%3E%3C/svg%3E");
+            background-repeat: no-repeat;
+            background-position: right 10px center;
+            background-size: 12px;
+        }
+
+        [data-theme="dark"] .custom-select {
+            background-image: url("data:image/svg+xml;charset=US-ASCII,%3Csvg xmlns='http://www.w3.org/2000/svg' width='14' height='10' viewBox='0 0 14 10'%3E%3Cpolyline points='1 1 7 7 13 1' style='fill:none;stroke:white;stroke-width:2' /%3E%3C/svg%3E");
+        }
+
+
+        #popup .input-group {
+            display: block;
+        }
+
+        #popup .row {
+            display: flex;
+        }
+
+	.info-container {
+		position: relative;
+		display: inline-block;
+		font-family: Arial, sans-serif;
+		margin: 5px 0px 0px 5px;
+	}
+
+    .info-icon {
+      background-color: #007BFF;
+      color: white;
+      border-radius: 50%;
+      padding: 4px 8px;
+      cursor: pointer;
+      font-weight: bold;
+      font-size: 14px;
+      text-align: center;
+      line-height: 1;
+      display: inline-block;
+    }
+
+    .tooltip {
+      visibility: hidden;
+      background-color: #333;
+      color: #fff;
+      text-align: left;
+      border-radius: 4px;
+      padding: 8px;
+      position: absolute;
+      z-index: 1;
+      bottom: 125%; /* above the icon */
+      left: 50%;
+      transform: translateX(-50%);
+      opacity: 0;
+      transition: opacity 0.3s;
+      white-space: nowrap;
+    }
+
+    .tooltip::after {
+      content: "";
+      position: absolute;
+      top: 100%; /* bottom of tooltip */
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: #333 transparent transparent transparent;
+    }
+
+    .info-container:hover .tooltip {
+      visibility: visible;
+      opacity: 1;
+    }
+
+        @media (max-width: 768px) {
+            header {
+                flex-direction: column;
+                gap: 10px;
+            }
+
+            .buttons {
+                flex-direction: column;
+                align-items: center;
+            }
+
+            .buttons button {
+                width: 80%;
+            }
+
+            .my-apps {
+                min-width: 75%;
+                max-width: 75%;
+                padding: 20px;
+                justify-content: center;
+                flex-direction: column;
+                text-align: center;
+                align-items: center;
+            }
+
+            .app {
+                width: 80px;
+            }
+
+            footer {
+                flex-direction: column;
+                gap: 10px;
+                text-align: center;
+            }
+
+            .footer-links, .footer-social {
+                justify-content: center;
+            }
+            .input-group {
+                flex-direction: column;
+                align-items: stretch;
+            }
+            
+            .input-group input,
+            .input-group button,
+            .input-group select,
+            .checkbox-container {
+                width: 100%;
+            }
+        }
+    </style>
+</head>
+<body>
+
+<div class="container-frame">
+<div class="container">
+<div class="leftside">
+    <div class="logo">
+        <img src="image.png" alt="Logo">
+        <div>
+		<h1>Safebox</h1>
+	</div>
+    </div>
+    <div class="profile" id="profileSection">
+	<!--<img src="image.png" alt="Profilkép">-->
+        <div id="vpnBtn">Pro</div>
+    </div>
+    <div style="text-align:center">
+	Proxy&nbsp;status
+	<span id="vpn_on" class="hidden green"><b>ON</b></span>
+	<span id="vpn_off" class="hidden red"><b>OFF</b></span>
+    </div>
+	<div class="left-buttons">
+	 	<button id="servicesBtn">Services</button>
+	</div>
+    	<div class="settings">Settings</div>
+	<div class="left-buttons">
+		<button id="repositoriesBtn">Repositories</button>
+	</div>
+	<div class="left-buttons">
+		<button id="systemservicesBtn">System services</button>
+	</div>
+	<br>
+	<br>
+		<div style="text-align:center;">
+		<a href="manage2.html" id="refresh_btn">REFRESH</a>
+		<br>
+		<br>
+		<a href="manage.html" id="old_btn">OLD DESIGN</a>
+		</div>
+</div>
+
+<div class="rightside">
+	<div class="buttons">
+	    <button id="myAppsBtn">My Apps</button>
+	    <button id="installAppsBtn">Install Apps</button>
+	    <button id="updatesBtn">Updates</button>
+	    <button id="backupBtn">Backup</button>
+	    <button id="diskBtn">Disk Management</button>
+	    <button id="monitorBtn">Monitor</button>
+	    <div class="toggle" id="themeToggle"></div>
+	</div>
+
+	<div class="my-apps"><div id="myAppsContainer" class="my-apps-container"></div></div>
+</div>
+</div>
+
+<div id="popup" class="popup hidden">
+  <div class="popup-content">
+    <span class="close">&times;</span>
+    <div class="input-group">
+    <div id="popupText" class="deployment">Load app template here</div>
+    </div>
+  </div>
+</div>
+<footer>
+    <div class="footer-links">
+        <a href="#">Help</a>
+        <a href="#">Docs</a>
+        <a href="#">Report</a>
+    </div>
+
+    <div class="footer-center">
+        <p>Want to access your services remotely?</p>
+        <p class="hidden" id="pro_off"><strong><a href="#">Get Pro!</a></strong></p>
+        <p class="hidden" id="pro_on"><strong><a href="#">Pro settings</a></strong></p>
+    </div>
+
+    <div class="footer-social">
+        <a href="#">Discord</a>
+        <a href="#">X</a>
+    </div>
+</footer>
+
+</div>
+
+<script>
+    const toggle = document.getElementById('themeToggle');
+    toggle.addEventListener('click', () => {
+        const currentTheme = document.documentElement.getAttribute('data-theme');
+        if (currentTheme === 'dark') {
+            document.documentElement.removeAttribute('data-theme');
+        } else {
+            document.documentElement.setAttribute('data-theme', 'dark');
+        }
+        toggle.classList.toggle('active');
+    });
+    // default dark
+    document.documentElement.setAttribute('data-theme', 'dark');
+</script>
+
+<script>
+    // apps array beállítása common.js-ben
+    const apps = []; // GLOBAL VARIABLE
+
+    document.addEventListener('DOMContentLoaded', function() {
+
+    const myAppsBtn = document.getElementById('myAppsBtn');
+    const installAppsBtn = document.getElementById('installAppsBtn');
+    const backupBtn = document.getElementById('backupBtn');
+    const diskBtn = document.getElementById('diskBtn');
+    const monitorBtn = document.getElementById('monitorBtn');
+
+    const vpnBtn = document.getElementById('vpnBtn');
+    const servicesBtn = document.getElementById('servicesBtn');
+    const updatesBtn = document.getElementById('updatesBtn');
+    const repositoriesBtn = document.getElementById('repositoriesBtn');
+    const systemservicesBtn = document.getElementById('systemservicesBtn');
+
+    const myAppsContainer = document.getElementById('myAppsContainer');
+    const popup = document.getElementById('popup');
+    const popupText = document.getElementById('popupText');
+    const closeBtn = document.querySelector('.close');
+
+    //Appok betöltése
+    function renderApps(all) {
+        myAppsContainer.innerHTML = '';
+        apps.forEach(app => {
+	    if ((all==false && app.installed=='true') || (all==true && app.installed!='true')) {
+		    const appDiv = document.createElement('div');
+		    appDiv.className = 'app';
+		    appDiv.innerHTML = `
+			<img src="${app.image}" alt="${app.name}" title="${app.orig_name} ${app.version}">${app.orig_name}
+		    `;
+		    appDiv.addEventListener('click', () => {
+			    popupText.textContent = `You clicked on ${app.name} ${app.version}!`;
+			if (app.installed=='true') reinstall(app.name, 'popupText');
+			else load_template(app.name,'popupText');
+			popup.classList.remove('hidden');
+		    });
+		    myAppsContainer.appendChild(appDiv);
+            }
+        });
+    }
+
+    //TODO: Ilyen függvényeket kell csinálni és a listenerekhez adni az egyes részeket
+    function renderText(title) {
+        //TODO: itt kell a buttont editálni és így kell hozzáadni hozzá mindent
+        myAppsContainer.innerHTML = `
+            <h1 style="text-align: center;">${title}</h1>
+
+            <div class="input-group">
+                <input type="text" placeholder="Írj be valamit..." id="textInput">
+                <button id="submitButton">Küldés</button>
+
+                <select id="myComboBox" class="custom-select">
+                    <option value="">Válassz egy lehetőséget...</option>
+                    <option value="1">Első opció</option>
+                    <option value="2">Második opció</option>
+                    <option value="3">Harmadik opció</option>
+                </select>
+
+                <label class="checkbox-container">
+                    <input type="checkbox" id="myCheckbox">
+                    <span class="checkmark"></span>
+                    Elfogadom a feltételeket
+                </label>
+            </div>
+        `;
+
+        const submitButton = document.getElementById('submitButton');
+        const textInput = document.getElementById('textInput');
+
+        if (submitButton && textInput) {
+            submitButton.addEventListener('click', () => {
+                const value = textInput.value.trim();
+                if (value) {
+                    alert(`Beírt szöveg: ${value}`);
+                    textInput.value = '';
+                } else {
+                    alert('Kérlek írj be valamit!');
+                }
+            });
+        }
+    }
+
+    function renderVPN() {
+        myAppsContainer.innerHTML = `
+            <div id="vpn" class="innerDiv">
+	    Loading...
+            </div>
+        `;
+	get_proxy_html();
+    }
+
+    function renderServices() {
+        myAppsContainer.innerHTML = `
+            <div id="services" class="innerDiv">
+	    Loading...
+            </div>
+        `;
+	get_services();
+    }
+
+    function renderUpdates() {
+        myAppsContainer.innerHTML = `
+            <div id="updates" class="innerDiv">
+	    Looking for updates... Please wait...
+            </div>
+        `;
+	get_updates();
+    }
+
+    function renderRepositories() {
+        myAppsContainer.innerHTML = `
+        <div class="input-group">
+	<fieldset>
+	<legend>Repositories</legend>
+		<div id="repositories" style="text-align:left">Loading...</div>
+
+		<hr>
+		<form class="form-install" action="#" method="post" id="add_repo">
+		<div class="row">
+		    <div class="mb-3" style="text-align:left">
+			<label for="registry">Please add a new GIT repository URL: </label>
+			<input type="registry" class="form-control" name="repository" id="repository" size="100" value="" required>
+			<div class="invalid-feedback">
+			Please enter a valid repository url.
+			</div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="mb-3">
+			<button class="btn btn-lg btn-primary btn-block" type="submit" id="repo_add_btn"> Add </button>
+		    </div>
+		</div>
+		</form>
+	</fieldset>
+	</div>
+        `;
+    }
+
+    function renderSystemServices() {
+        myAppsContainer.innerHTML = `
+            <div id="system">
+	    Loading...
+            </div>
+        `;
+	get_system();
+    }
+
+	function activate(btn) {
+		myAppsBtn.classList.remove('active');
+		installAppsBtn.classList.remove('active');
+		btn.classList.add('active');
+	}
+
+    myAppsBtn.addEventListener('click', () => {renderApps(false); activate(myAppsBtn);});
+    installAppsBtn.addEventListener('click', () => {renderApps(true); activate(installAppsBtn);});
+    backupBtn.addEventListener('click', () => renderText('Backup'));
+    diskBtn.addEventListener('click', () => renderText('Disk Management'));
+    monitorBtn.addEventListener('click', () => renderText('Monitor'));
+
+    vpnBtn.addEventListener('click', () => renderVPN());
+    servicesBtn.addEventListener('click', () => renderServices());
+    updatesBtn.addEventListener('click', () => renderUpdates());
+    repositoriesBtn.addEventListener('click', () => renderRepositories());
+    systemservicesBtn.addEventListener('click', () => renderSystemServices());
+
+    closeBtn.addEventListener('click', () => {
+        popup.classList.add('hidden');
+    });
+
+    popup.addEventListener('click', (event) => {
+        if (event.target === popup) {
+            popup.classList.add('hidden');
+        }
+    });
+
+    renderApps(false);
+});
+</script>
+
+<script>
+    const profileSection = document.getElementById('profileSection');
+    profileSection.addEventListener('click', () => {
+        //TODO: profile szekcióra kattintott
+    });
+</script>
+
+<!-- Optional JavaScript -->
+<!-- jQuery first, then Popper.js, then Bootstrap JS -->
+<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=9"></script>
+</body>
+</html>
--- a/manage2B.html
+++ b/manage2B.html
--- a/manage3.html
+++ b/manage3.html
@@ -0,0 +1,875 @@
+<!DOCTYPE html>
+<html lang="hu">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Safebox</title>
+  <link href="https://fonts.googleapis.com/css2?family=Switzer:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap" rel="stylesheet" />
+  <style>
+    :root {
+      --highlight-color: #F9DB54;
+    }
+
+    body {
+      margin: 0;
+      font-family: 'Switzer', sans-serif;
+      font-weight: 500;
+      font-size: 16px;
+      background-color: #000;
+      color: white;
+      display: flex;
+      height: 100vh;
+    }
+
+    h4 {
+	font-size: 16px;
+    }
+
+	table {border: 1px solid var(--highlight-color); width:100%;}
+	table th {padding-left: 20px; text-align: left; color: var(--highlight-color); width: 25%;}
+	table td {padding-left: 20px; text-align:left; width: 25%;}
+
+    .sidebar {
+      width: 250px;
+      background-color: #101214;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      padding: 20px 0;
+      margin: 20px;
+      border-radius: 20px;
+      transition: width 0.3s;
+    }
+
+    .logo {
+      text-align: center;
+      margin-bottom: 40px;
+      font-size: 24px;
+      font-weight: bold;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 10px;
+    }
+
+    .logo img {
+      height: 30px;
+    }
+
+    .menu {
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+      padding: 0 10px;
+    }
+
+    .menu-item {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      padding: 10px 20px;
+      cursor: pointer;
+      color: white;
+      transition: color 0.3s;
+    }
+
+    .menu-item:hover {
+      color: var(--highlight-color);
+    }
+
+    .menu-item i {
+      font-size: 18px;
+    }
+
+    .menu-item span {
+      display: inline;
+    }
+
+    .menu-item img {
+      width: 24px;
+    }
+
+    .menu-item.active {
+      background-color: var(--highlight-color);
+      color: black;
+      border-radius: 10px;
+      font-weight: bold;
+      margin: 4px;
+    }
+
+    .menu-item.active:hover {
+      color: black;
+    }
+
+    .details {
+      color: white;
+      text-decoration: none;
+    }
+
+    .yellow-row {
+	max-width:250px;
+	display: flex;
+	align-items: flex-start;
+	box-sizing: border-box;
+        margin: 0px;
+	width: 100%;
+	padding: 0 20px;
+    }
+
+    .yellow-box {
+      background-color: var(--highlight-color);
+      color: black;
+      text-align: left;
+      margin: 0px;
+      padding: 10px 18px;
+      border-radius: 20px 20px 0px 20px;
+      font-weight: bold;
+      font-size: 12px;
+    }
+
+    .yellow-corner {
+	padding:0px;
+	border: 0px;
+	display: flex;
+	margin: 0px;
+	margin-top: auto;
+	align-items: flex-end;
+    }
+
+    .main {
+      flex: 1;
+      padding: 30px;
+      display: flex;
+      flex-direction: column;
+      overflow-y: auto;
+    }
+
+	#appsContainer {
+	  display: flex;
+	  flex-wrap: wrap;
+	  gap: 16px;
+	  padding: 0px;
+	}
+
+	.app {
+	  border: 1px solid #41464f;
+	  border-radius: 15px;
+	  text-align: left;
+	  padding: 20px;
+	  width: 130px;
+	  min-height: 200px;
+	  text-align: left;
+	  display: flex;
+	  flex-direction: column;
+	  align-items: left;
+	}
+
+	.app-img {
+	  padding: 0px;
+	}
+
+	.app img {
+	  border-radius: 15px;
+	  background-color: #101214;
+	  width: 110px;
+	  height: 110px;
+	  object-fit: contain;
+	  margin-bottom: 20px;
+	  padding: 10px;
+	}
+
+	.app-label {
+	  font-size: 10px;
+	  color: #cccccc;
+	  margin-bottom: 10px;
+	  align-items: left;
+	  text-align: left;
+	}
+
+	.app-name {
+	  font-size: 16px;
+	  font-weight: bold;
+	  margin-bottom: 30px;
+	}
+
+	.more-btn {
+	  background-color: var(--highlight-color);
+	  border: none;
+	  border-radius: 15px;
+	  padding: 20px;
+	  font-size: 16px;
+	  font-weight: 400;
+	  cursor: pointer;
+	  width: 100%;
+	}
+
+	.app-details {
+		padding: 0px 50px;
+	}
+
+	.app-fields {
+	  border: 1px solid #41464f;
+	  border-radius: 15px;
+	  text-align: left;
+	  padding: 20px;
+	  margin: 30px 0px 10px 0px;
+	  display: flex;
+	  flex-direction: column;
+	  align-items: left;
+	}
+
+	.app-fields .row {
+            display: block;
+	      justify-content: space-between;
+	      align-items: center;
+	      padding: 5px 20px;
+	      border-radius: 10px;
+	      gap: 10px;
+	}
+
+	#letsencrypt {
+		padding-top: 20px;
+	}
+
+.header-block {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  padding: 20px 0px;
+}
+
+.logo-and-text {
+  display: flex;
+  align-items: flex-start;
+  gap: 16px;
+}
+
+.applogo img {
+  border-radius: 15px;
+  background-color: #101214;
+  width: 70px;
+  height: 70px;
+  object-fit: contain;
+  padding: 40px;
+}
+
+.text-content {
+  display: flex;
+  flex-direction: column;
+}
+
+.title {
+  font-size: 20px;
+  font-weight: bold;
+  margin: 0;
+}
+
+.subtitle {
+  font-size: 14px;
+  margin: 4px 0;
+  color: #999;
+}
+
+.description {
+  font-size: 12px;
+  margin: 20px 0 0;
+  color: #999;
+}
+
+.notification-btn {
+      background-color: var(--highlight-color);
+      color: black;
+      border: none;
+      padding: 10px 20px;
+      border-radius: 10px;
+      cursor: pointer;
+      font-weight: bold;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+}
+
+    .main-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 30px;
+    }
+
+    .main-header h1 {
+      margin: 0;
+      font-size: 28px;
+    }
+
+    .main-header button {
+      background-color: var(--highlight-color);
+      color: black;
+      border: none;
+      padding: 10px 20px;
+      border-radius: 10px;
+      cursor: pointer;
+      font-weight: bold;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
+
+    .input-row, .input-group {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border: 1px solid #41464f;
+      padding: 15px 20px;
+      margin-bottom: 15px;
+      border-radius: 10px;
+      gap: 10px;
+    }
+
+    .input-container {
+      display: flex;
+      align-items: center;
+      gap: 5px;
+      flex: 1;
+      justify-content: flex-end;
+      position: relative;
+    }
+
+    .input-row input,
+    .input-row select,
+    .row input, 
+    .row select {
+      background: transparent;
+      border: 1px solid #41464f;
+      padding: 8px 30px 8px 8px;
+      border-radius: 10px;
+      color: white;
+      transition: color 0.2s;
+      max-width: 40%;
+      box-sizing: border-box;
+    }
+
+    .row input, 
+    .row select {
+      padding: 12px 30px 12px 12px;
+      font-size: 16px;
+    }
+
+    .input-row input:focus,
+    .input-row select:focus,
+    .row input,
+    .row select {
+      outline: none;
+      background-color: black;
+      color: var(--highlight-color);
+    }
+
+    .input-row select,
+    .row select {
+      appearance: none;
+      -webkit-appearance: none;
+      -moz-appearance: none;
+      background-image: url('data:image/svg+xml;utf8,<svg fill="white" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M7 10l5-5 5 5zM7 14l5 5 5-5z"/></svg>');
+      background-repeat: no-repeat;
+      background-position: right 8px center;
+      background-size: 16px;
+      padding-right: 32px;
+    }
+
+	.info-container {
+		position: relative;
+		left: -18px;
+		top: -22px;
+		display: inline-block;
+		font-family: Arial, sans-serif;
+		margin: 0px;
+		width: 0px;
+	}
+
+    .info-icon {
+      background-color: var(--highlight-color);
+      color: black;
+      border-radius: 50%;
+      padding: 1px 4px;
+      cursor: pointer;
+      font-weight: bold;
+      font-size: 10px;
+      text-align: center;
+      line-height: 1;
+      display: inline-block;
+    }
+
+    .tooltip {
+      visibility: hidden;
+      background-color: #333;
+      border-radius: 5px;
+      padding: 4px 8px;
+      position: absolute;
+      z-index: 1;
+      bottom: 100%; /* above the icon */
+      left: 50%;
+      transform: translateX(-78%);
+      opacity: 0;
+      transition: opacity 0.3s;
+      /*white-space: nowrap;*/
+      text-align: right;
+      width: 300px;
+    }
+
+    .tooltip::after {
+      content: "";
+      position: absolute;
+      top: 100%; /* bottom of tooltip */
+      left: 80%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: #333 transparent transparent transparent;
+    }
+
+    .info-container:hover .tooltip {
+      visibility: visible;
+      opacity: 1;
+    }
+
+    .clear-btn {
+      position: absolute;
+      right: 8px;
+      background: transparent;
+      border: none;
+      color: white;
+      cursor: pointer;
+      font-size: 16px;
+      padding: 0;
+      width: 20px;
+      height: 20px;
+      line-height: 20px;
+      text-align: center;
+      user-select: none;
+    }
+
+    .save-button {
+      background-color: var(--highlight-color);
+      color: black;
+      border: none;
+      padding: 15px 30px;
+      font-size: 16px;
+      border-radius: 10px;
+      font-weight: bold;
+      cursor: pointer;
+      margin-top: 30px;
+      align-self: flex-start;
+    }
+
+    .save-button:hover {
+      background-color: #f5c300;
+    }
+
+    .buttons .btn {
+      background-color: black;
+      border: 1px solid #999;
+      color: #999;
+      padding: 10px 15px;
+      font-size: 14px;
+      border-radius: 5px;
+      font-weight: bold;
+      cursor: pointer;
+      margin-top: 10px;
+      align-self: flex-start;
+    }
+
+    .buttons .btn:hover {
+      border: 1px solid #f5c300;
+      color: #f5c300;
+    }
+
+        .hidden {
+            display: none;
+        }
+
+        .popup {
+	    width: 100%;
+        }
+
+        .popup-content {
+            width: 100%;
+            text-align: left;
+        }
+
+        #popup .row {
+            display: flex;
+        }
+
+    @media (max-width: 768px) {
+      .sidebar {
+        width: 80px;
+        padding: 20px 5px;
+      }
+
+      .logo {
+        font-size: 0;
+      }
+
+      .logo span {
+        display: none;
+      }
+
+      .menu-item {
+        justify-content: center;
+        gap: 0;
+      }
+
+      .menu-item span {
+        display: none;
+      }
+
+      .yellow-box {
+        font-size: 0;
+        padding: 10px;
+      }
+
+      .input-row {
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      .input-container {
+        width: 100%;
+        justify-content: flex-start;
+      }
+
+      .input-row input,
+      .input-row select {
+        max-width: 100%;
+      }
+    }
+  </style>
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"/>
+</head>
+<body>
+  <div class="sidebar">
+    <div>
+      <div class="logo">
+        <img src="/img/logo.png" alt="Safebox"/>
+        <span>Safebox</span>
+      </div>
+      <div class="menu">
+<!--
+	<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>
+        <div class="menu-item"><i class="fas fa-chart-line"></i><span>Monitor</span></div>
+        <div class="menu-item active"><i class="fas fa-cog"></i><span>Settings</span></div>
+-->
+	<div class="menu-item" id="installAppsBtn"><img src="/img/app.png" data-src="/img/app.png" data-hover="/img/app2.png" alt="Applications" /><span>Applications</span></div>
+        <div class="menu-item" id="backupBtn"><img src="/img/disk.png" data-src="/img/disk.png" data-hover="/img/disk2.png" alt="Backup" /><span>Backup</span></div>
+        <div class="menu-item" id="diskBtn"><img src="/img/disk.png" data-src="/img/disk.png" data-hover="/img/disk2.png" alt="Disk Management" /><span>Disk Management</span></div>
+        <div class="menu-item" id="monitorBtn"><img src="/img/monitor.png" data-src="/img/monitor.png" data-hover="/img/monitor2.png" alt="Monitor" /><span>Monitor</span></div>
+	<div class="menu-item" id="settingsBtn"><img src="/img/settings.png" data-src="/img/settings.png" data-hover="/img/settings2.png" alt="Settings" /><span>Settings</span></div>
+      </div>
+    </div>
+    <div class="yellow-row">
+	    <div class="yellow-box">
+	      <h4>Safebox Pro</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>
+		<img src="/img/upgrade.png" alt="Upgrade now" width="100%"/>	
+	      </p>
+	    </div>
+	    <div class="yellow-corner">
+		<img src="img/yellow_corner.png" alt=""/>
+	    </div>
+    </div>
+  </div>
+  <div class="main" >
+    <div id="myAppsContainer">
+	    <div class="main-header">
+	      <h1>Settings</h1>
+	      <button id="updatesBtn"><i class="fas fa-bell"></i> Notification</button>
+	    </div>
+	    <div class="input-row">
+	      <label>Docker registry name</label>
+	      <div class="input-container">
+		<input type="text" placeholder="Enter name" />
+		<button class="clear-btn" onclick="this.previousElementSibling.value = ''">×</button>
+	      </div>
+	    </div>
+	    <div class="input-row">
+	      <label>Enable logging</label>
+	      <div class="input-container">
+		<select>
+		  <option>Yes</option>
+		  <option>No</option>
+		</select>
+	      </div>
+	    </div>
+	    <div class="input-row">
+	      <label>Backup folder</label>
+	      <div class="input-container">
+		<input type="text" placeholder="Path to backup" />
+		<button class="clear-btn" onclick="this.previousElementSibling.value = ''">×</button>
+	      </div>
+	    </div>
+	    <div class="input-row">
+	      <label>Send alerts</label>
+	      <div class="input-container">
+		<select>
+		  <option>Yes</option>
+		  <option>No</option>
+		</select>
+	      </div>
+	    </div>
+	    <button class="save-button">Save Settings</button>
+    </div>
+    <div id="popup" class="popup hidden">
+	<div class="popup-content">
+		<div id="popupText" class="deployment"></div>
+	</div>
+    </div>
+  </div>
+
+<script>
+    // apps array beállítása common.js-ben
+    const apps = []; // GLOBAL VARIABLE
+
+    document.addEventListener('DOMContentLoaded', function() {
+
+	  document.querySelectorAll('.menu-item.active').forEach(item => {
+	    const img = item.querySelector('img');
+	      img.src = img.dataset.hover;
+	/*
+	    item.addEventListener('mouseenter', () => {
+	      img.src = img.dataset.hover;
+	    });
+	    item.addEventListener('mouseleave', () => {
+	      img.src = img.dataset.src;
+	    });
+	*/
+	  });
+
+    const myAppsBtn = document.getElementById('myAppsBtn');
+    const installAppsBtn = document.getElementById('installAppsBtn');
+    const backupBtn = document.getElementById('backupBtn');
+    const diskBtn = document.getElementById('diskBtn');
+    const monitorBtn = document.getElementById('monitorBtn');
+    const settingsBtn = document.getElementById('settingsBtn');
+
+    const vpnBtn = document.getElementById('vpnBtn');
+
+    const myAppsContainer = document.getElementById('myAppsContainer');
+    const popup = document.getElementById('popup');
+    const popupText = document.getElementById('popupText');
+    const closeBtn = document.querySelector('.close');
+
+    //Appok betöltése
+    function renderApps(all) {
+	myAppsContainer.innerHTML = '<div class="main-header"><h1>Applications</h1><button id="updatesBtn"><i class="fas fa-bell"></i> Notification</button></div><div id="appsContainer"></div>';
+    	const appsContainer = document.getElementById('appsContainer');
+    	const updatesBtn = document.getElementById('updatesBtn');
+	updatesBtn.addEventListener('click', () => renderUpdates());
+
+        apps.forEach(app => {
+	    //if ((all==false && app.installed=='true') || (all==true && app.installed!='true')) {
+		    const appDiv = document.createElement('div');
+		    appDiv.className = 'app';
+		    appDiv.innerHTML = `
+			<div class="app-img"><img src="${app.image}" alt="${app.name}" title="${app.orig_name} ${app.version}"></div>
+			<div class="app-label">${app.name} ${app.version}</div>
+			<div class="app-name">${app.orig_name}</div>
+			<button class="more-btn">More</button>
+		    `;
+		    appDiv.addEventListener('click', () => {
+			popupText.textContent = `You clicked on ${app.name} ${app.version}!`;
+			if (app.installed=='true') reinstall(app.name, 'popupText');
+			else load_template(app.name,'popupText');
+			popup.classList.remove('hidden');
+			myAppsContainer.classList.add('hidden');
+		    });
+		    appsContainer.appendChild(appDiv);
+            //}
+        });
+    }
+
+    //TODO: Ilyen függvényeket kell csinálni és a listenerekhez adni az egyes részeket
+    function renderText(title) {
+        //TODO: itt kell a buttont editálni és így kell hozzáadni hozzá mindent
+        myAppsContainer.innerHTML = `
+            <h1 style="text-align: center;">${title}</h1>
+
+            <div class="input-group">
+                <input type="text" placeholder="Írj be valamit..." id="textInput">
+                <button id="submitButton">Küldés</button>
+
+                <select id="myComboBox" class="custom-select">
+                    <option value="">Válassz egy lehetőséget...</option>
+                    <option value="1">Első opció</option>
+                    <option value="2">Második opció</option>
+                    <option value="3">Harmadik opció</option>
+                </select>
+
+                <label class="checkbox-container">
+                    <input type="checkbox" id="myCheckbox">
+                    <span class="checkmark"></span>
+                    Elfogadom a feltételeket
+                </label>
+            </div>
+        `;
+
+        const submitButton = document.getElementById('submitButton');
+        const textInput = document.getElementById('textInput');
+
+        if (submitButton && textInput) {
+            submitButton.addEventListener('click', () => {
+                const value = textInput.value.trim();
+                if (value) {
+                    alert(`Beírt szöveg: ${value}`);
+                    textInput.value = '';
+                } else {
+                    alert('Kérlek írj be valamit!');
+                }
+            });
+        }
+    }
+
+    function renderVPN() {
+        myAppsContainer.innerHTML = `
+	    <div class="main-header">
+	      <h1>VPN</h1>
+	    </div>
+            <div id="vpn" class="innerDiv">
+	    Loading...
+            </div>
+        `;
+	get_proxy_html();
+    }
+
+    function renderServices() {
+        myAppsContainer.innerHTML = `
+	    <div class="main-header">
+	      <h1>Services</h1>
+	    </div>
+            <div id="services" class="innerDiv">
+	    Loading...
+            </div>
+        `;
+	get_services();
+    }
+
+    function renderUpdates() {
+        myAppsContainer.innerHTML = `
+	    <div class="main-header">
+	      <h1>Updates</h1>
+	    </div>
+            <div id="updates" class="innerDiv">
+	    Looking for updates... Please wait...
+            </div>
+        `;
+	get_updates();
+    }
+
+    function renderSystemServices() {
+        myAppsContainer.innerHTML = `
+	    <div class="main-header">
+	      <h1>System services</h1>
+	    </div>
+            <div id="system" class="innerDiv">
+	    Loading...
+            </div>
+        `;
+	get_system();
+    }
+
+    function renderSettings() {
+	myAppsContainer.innerHTML = `
+    <div class="main-header">
+      <h1>Settings</h1>
+      <button id="updatesBtn"><i class="fas fa-bell"></i> Notification</button>
+    </div>
+    <div class="input-row">
+	<button id="servicesBtn" class="save-button">Services</button>
+	<button id="repositoriesBtn" class="save-button">Repositories</button>
+	<button id="systemservicesBtn" class="save-button">System services</button>
+    </div>
+        `;
+	const servicesBtn = document.getElementById('servicesBtn');
+	const repositoriesBtn = document.getElementById('repositoriesBtn');
+	const systemservicesBtn = document.getElementById('systemservicesBtn');
+    	const updatesBtn = document.getElementById('updatesBtn');
+	servicesBtn.addEventListener('click', () => renderServices());
+	repositoriesBtn.addEventListener('click', () => renderRepositories());
+	systemservicesBtn.addEventListener('click', () => renderSystemServices());
+	updatesBtn.addEventListener('click', () => renderUpdates());
+    }
+
+    function renderRepositories() {
+        myAppsContainer.innerHTML = `
+	    <div class="main-header">
+	      <h1>Repositories</h1>
+	    </div>
+		<div id="repositories" style="text-align:left">Loading...</div>
+		<br>
+		<form class="form-install" action="#" method="post" id="add_repo">
+		<div class="input-row">
+			<label for="registry">Please add a new GIT repository URL: </label>
+      			<div class="input-container">
+				<input type="registry" name="repository" id="repository" size="100" value="" required>
+        			<button class="clear-btn" onclick="this.previousElementSibling.value = ''">×</button>
+      			</div>
+			<!--<div class="invalid-feedback">
+			Please enter a valid repository url.
+			</div>-->
+		</div>
+		<div class="row">
+			<button class="save-button" type="submit" id="repo_add_btn"> Add </button>
+		</div>
+		</form>
+        `;
+	jQuery('#add_repo').submit(function() {
+		jQuery('#repositories').html('Loading...');
+		add_repository();
+		return false;
+	});
+
+	get_repositories();
+    }
+
+	function activate(btn) {
+		//myAppsBtn.classList.remove('active');
+		installAppsBtn.classList.remove('active');
+		backupBtn.classList.remove('active');
+		diskBtn.classList.remove('active');
+		monitorBtn.classList.remove('active');
+		settingsBtn.classList.remove('active');
+		btn.classList.add('active');
+	}
+
+    //myAppsBtn.addEventListener('click', () => {renderApps(false); activate(myAppsBtn);});
+	installAppsBtn.addEventListener('click', () => {renderApps(true); activate(installAppsBtn);});
+	backupBtn.addEventListener('click', () => {renderText('Backup'); activate(backupBtn);});
+	diskBtn.addEventListener('click', () => {renderText('Disk Management'); activate(diskBtn)});
+	monitorBtn.addEventListener('click', () => {renderText('Monitor'); activate(monitorBtn)});
+    	settingsBtn.addEventListener('click', () => {renderSettings(); activate(settingsBtn)});
+
+//    vpnBtn.addEventListener('click', () => renderVPN());
+/*
+    closeBtn.addEventListener('click', () => {
+        popup.classList.add('hidden');
+    });
+
+    popup.addEventListener('click', (event) => {
+        if (event.target === popup) {
+            popup.classList.add('hidden');
+        }
+    });
+*/
+//    renderApps(false);
+});
+</script>
+
+<!-- Optional JavaScript -->
+<!-- jQuery first, then Popper.js, then Bootstrap JS -->
+<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=10"></script>
+</body>
+</html>
+
--- a/scan.php
+++ b/scan.php
@@ -116,7 +116,7 @@ switch ($_GET["op"]) {
 					if ($data["INSTALL_STATUS"]==1) {
 						echo "<table><tr><td><b>Service/Container</b></td><td><b>Image</b></td><td><b>Status</b></td><td><b>Action</b></td></tr></table>";
 						foreach ($data["INSTALLED_SERVICES"] as $service_name => $object) {
-							show_service_update($service_name, trim($object["update"]), trim($object["uptodate"]));
+							show_service_update($service_name, trim($object["update"]), trim($object["uptodate"]), trim($object["error"]));
 						}
 						echo "<br>";
 					}
@@ -134,46 +134,35 @@ switch ($_GET["op"]) {
 		else echo "ERROR";
 	break;
 	case "check_deployments":
+		$deployments = "";
 		$arr = check_response("deployments");
 		if (!empty($arr)) {
 			foreach ($arr as $key=>$data) {
 				if ($key=="deployments") {
 					if (count($data["DEPLOYMENTS"])) {
-						if ($data["DEPLOYMENTS"]["deployments"]=="NONE") echo "There are no deployments.<br>";
+						if ($data["DEPLOYMENTS"]["deployments"]=="NONE") $deployments = "There are no deployments.";
 						else {
 							foreach ($data["DEPLOYMENTS"] as $service_name => $content) {
-								$orig_service_name = $service_name;
+                                                                $orig_service_name = $service_name;
 								$service_name = strtolower($service_name);
-								//echo base64_decode($content);
-								if (array_key_exists($service_name,$data["INSTALLED_SERVICES"])) {
-									echo '<div>'.$service_name.' - '.$content.' - INSTALLED - <a href="#" onclick="uninstall(\''.$service_name.'\')">UNINSTALL</a> - <a href="#" onclick="reinstall(\''.$service_name.'\')">REINSTALL</a></div>';
-								}
-								else echo '<div><a href="#" onclick="load_template(\''.$service_name.'\')">'.$orig_service_name.'</a> - '.$content.'</div>';
-								echo '<div id="'.$service_name.'" class="deployment"></div>';
+								$version = $content["version"];
+								$icon = $content["icon"];
+								if (empty($icon) || $icon == "null") $icon = "image.png"; // default icon image
+								if (array_key_exists($service_name,$data["INSTALLED_SERVICES"])) $installed = "true";
+								else $installed = "false";
+								if (!empty($deployments)) $deployments .= ", ";
+								$deployments .= '{"name": "'.$service_name.'", "orig_name": "'.$orig_service_name.'", "image": "'.$icon.'", "version": "'.$version.'", "installed": "'.$installed.'"}';
 							}
+							if (!empty($deployments)) $deployments = "[{$deployments}]";
 						}
 					}
-					else echo "There are no deployments.";
-					echo "<br>";
-/*
-					if (count($data["INSTALLED_SERVICES"])) {
-						echo "<br>Installed services:<br>";
-						if ($data["INSTALLED_SERVICES"]["services"]=="NONE") echo "There are no installed services.<br>";
-						else {
-							foreach ($data["INSTALLED_SERVICES"] as $service_name => $content) {
-								//echo base64_decode($content);
-								echo $service_name."<br>";
-							}
-							echo "<br>";
-						}
-					}
-					else echo "There are no installed services.<br>";
-*/
+					else $deployments = "There are no deployments.";
 					remove_response("$key");
 				}
 			}
 		}
-		else echo "WAIT";
+		else $deployments = "WAIT";
+		echo $deployments;
 	break;
 	case "deployment":
 		$arr = array("NAME" => $_GET["additional"], "ACTION" => "ask");
@@ -191,48 +180,102 @@ switch ($_GET["op"]) {
 				if ($key=="deployment") {
 					if ($data["STATUS"]=="0") { // ask
 						$template = json_decode(base64_decode($data["TEMPLATE"]));
-						echo "<fieldset><form action=\"#\" method=\"post\" id=\"deploy_form\"><br>";
+
+						echo '
+						<div class="app-details">
+							<div class="header-block">
+							  <div class="logo-and-text">
+							    <div class="applogo">
+								<img src="'.$template->icon.'">
+							    </div>
+							    <div class="text-content">
+							      <h1 class="title">'.$template->name.'</h1>
+							      <h2 class="subtitle">'.$template->title.'</h2>
+							      <p class="description">'.$template->description.'</p>
+							    </div>
+							  </div>
+							  <button id="updatesBtn" class="notification-btn"><i class="fas fa-bell"></i> Notification</button>
+							</div>
+						';
 						if ($reinstall) {
+							echo '<div id="letsencrypt">';
 							//var_dump($template);
-                                                        //var_dump($template);
                                                        $letsencrypt = check_letsencrypt();
-                                                        foreach ($template->fields as $field) {
-                                                                if ($field->key=="DOMAIN") {
-                                                                        if (!empty($letsencrypt[$field->value])) {
-                                                                                echo "LETSENCRYPT: ".$letsencrypt[$field->value]["status"]." - ".$letsencrypt[$field->value]["date"];
-                                                                                echo " - <a href=\"letsencrypt_log.php?domain={$field->value}\" target=\"_blank\">LOG</a><br><br>";
-                                                                        }
-                                                                }
-                                                        }
+							if (empty($letsencrypt)) echo "LETSENCRYPT file doesn't exists...<br><br>";
+							elseif ($letsencrypt=="ERROR") echo "LETSENCRYPT file: read JSON error...<br><br>";
+							else {
+								$domain = "";
+								foreach ($template->fields as $field) {
+									if ($field->key=="DOMAIN") $domain = $field->value;
+								}
+								if (!empty($domain)) show_letsencrypt($letsencrypt, $domain);
+							}
+							echo '</div>';
 						}
+						echo "<form action=\"#\" method=\"post\" id=\"deploy_{$template->name}_form\">";
+						echo "<div class=\"app-fields\">";
 						foreach ($template->fields as $field) {
+							if (!empty($field->title)) echo "<div class=\"row\"><h3>".$field->title."</h3></div>";
 							if (isset($field->generated)) {
-								echo "<input type=\"hidden\" value=\"generated:{$field->generated}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_field\">";
+								echo "<input type=\"hidden\" value=\"generated:{$field->generated}:{$field->value}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\">";
 							}
 							else {
-							echo "<div class=\"row\"><div class=\"mb-3\"><label>".$field->description."</label>
-								<input ".($field->required=="true" ? "required" : "")." type=\"".(!empty($field->type) ? $field->type : "text")."\" value=\"{$field->value}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_field\">
-							</div></div>";
+								echo "<div class=\"row\">";
+								echo "<label>".$field->description."</label>
+								<div class=\"input-container\"><input ".($field->required=="true" ? "required" : "")." type=\"".(!empty($field->type) ? $field->type : "text")."\" value=\"{$field->value}\" name=\"{$field->key}\" id=\"{$template->name}_{$field->key}\" class=\"additional_{$template->name}\"></div>
+								<div class=\"info-container\">
+								";
+								if (!empty($field->info)) echo "
+									  <span class=\"info-icon\">i</span>
+									  <div class=\"tooltip\">{$field->info}</div>
+								";
+								echo "</div>";
+								echo "</div>";
+								if (!empty($field->details)) echo "<div class=\"row\"><i>".$field->details."</i></div>";
 							}
 						}
+						echo "</div>";
+
+                                                echo "<div class=\"row buttons\">";
+						if ($reinstall) {
+							echo "
+							<div class=\"mb-3\">
+							<button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"update_{$template->name}_btn\" onclick=\"update_deployment('{$template->name}')\">Update</button>
+							</div>";
+						}
 						echo "
-						<div class=\"row\">
-						<div class=\"mb-3\">
-						<input type=\"hidden\" value=\"{$template->name}\" id=\"additional\">
-						<button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"deploy_btn\">".($reinstall ? "Reinstall" : "Install")."</button>
+                                                <div class=\"mb-3\" style=\"margin-left:30px;\">
+                                                <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"deploy_{$template->name}_btn\">".($reinstall ? "Reinstall" : "Install")."</button>
+                                                </div>";
+						if ($reinstall) {
+							echo "
+							<div class=\"mb-3\" style=\"margin-left:30px;\">
+							<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"uninstall_{$template->name}_btn\" onclick=\"uninstall('{$template->name}')\">Uninstall</button>
+							</div>";
+						}
+						echo "<div class=\"mb-3\" style=\"margin-left:230px;float:\">
+						<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"cancel_{$template->name}_btn\">Cancel</button>
+						</div>"; // buttons
+                                                echo "
+                                                </div>
+						</form>
 						</div>
-						</div>
-						</form></fieldset>
 <script>
-	jQuery('#deploy_form').submit(function() {
-		deploy(jQuery('#additional').val());
+	jQuery('#deploy_{$template->name}_form').submit(function() {
+		".($reinstall ? "redeploy" : "deploy")."('{$template->name}');
 		return false;
 	});
+        jQuery('#cancel_{$template->name}_btn').click(function() {
+                $('div#{$template->name}').html('');
+    		document.getElementById('myAppsContainer').classList.remove('hidden'); // manage3
+    		document.getElementById('popup').classList.add('hidden'); // manage2
+        });
 </script>
 						";
 					}
 					elseif ($data["STATUS"]=="2") { // deploy
 						echo "Install has finished.";
+						echo "<script>get_deployments();</script>";
 					}
 					remove_response("$key");
 				}
@@ -244,10 +287,13 @@ switch ($_GET["op"]) {
 				foreach ($arr as $key=>$data) {
 					if ($key=="deploy-".$_GET["additional"]) {
 						if ($data["STATUS"]=="1") {
-							echo "Install in progress... Please wait...";
+							//echo "Install in progress... Please wait...";
+							echo "";
 						}
 						elseif ($data["STATUS"]=="2") { 
 							echo "Install has finished.";
+							echo "<script>get_deployments();</script>";
+							remove_response("$key"); // remove from output if finished so reinstall can start
 						}
 					}
 				}
@@ -255,6 +301,25 @@ switch ($_GET["op"]) {
 			else echo ""; // no deployment, finished
 		}
 	break;
+	case "request_letsencrypt":
+		$domain = $_GET["domain"];
+		$arr = array($domain => array("date" => date("Y-m-d H:i:s"), "status" => "requested"));
+		$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+
+		if (set_output("request_letsencrypt",$json)) echo "LETSENCRYPT in progress for {$domain}.<br><br>";
+		else echo "ERROR";
+	break;
+	case "check_letsencrypt":
+		$domain = $_GET["domain"];
+		$letsencrypt = check_letsencrypt();
+		if (empty($letsencrypt)) echo "LETSENCRYPT file doesn't exists...";
+		elseif ($letsencrypt=="ERROR") echo "LETSENCRYPT file: read JSON error...";
+		else {
+			show_letsencrypt($letsencrypt, $domain);
+		}
+	break;
+	case "edit": // update deployment after edit
+	case "redeploy":
 	case "deploy":
 		if ($key=check_deploy($_GET["additional"])) { 
 			$text="A deployment ({$_GET["additional"]}) has already started.<br>Please wait and do not start a new one...";
@@ -268,6 +333,11 @@ switch ($_GET["op"]) {
 			foreach ($fields as $field_key => $field_value) {
 				$field_arr = explode(":",$field_value);
 				if ($field_arr[0]=="generated") {
+					if ($_GET["op"]=="edit") {
+						$fields[$field_key] = $field_arr[2]; // replace with previously stored value
+						continue; // do NOT regenerate values
+					}
+
 					if (intval($field_arr[3])==0) $len = 10; // default length
 					else $len = $field_arr[3];

@@ -293,7 +363,7 @@ switch ($_GET["op"]) {
 				}
 			}
 			$payload = base64_encode(json_encode($fields, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT));
-			$arr = array("NAME" => $_GET["additional"], "ACTION" => "deploy", "PAYLOAD" => $payload);
+			$arr = array("NAME" => $_GET["additional"], "ACTION" => $_GET["op"], "PAYLOAD" => $payload);
 			$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
 			if (set_output("deployment",$json)) echo "OK";
 			else echo "ERROR";
@@ -307,20 +377,99 @@ switch ($_GET["op"]) {
 		if (set_output("deployment",$json)) echo "OK";
 		else echo "ERROR";
 	break;
-	case "uninstall":
-		if ($key=check_deploy()) { 
-			$text="Deploy/uninstall process has already started.<br>Please wait and do not start a new one...";
-		}
-		else {
-			$text="Uninstall in progress... Please wait...";
-			$arr = array("NAME" => $_GET["additional"], "ACTION" => "uninstall");
+        case "check_uninstall":
+                $arr = check_deploy($_GET["additional"]);
+                if (!empty($arr)) { // deployment in progress
+                        foreach ($arr as $key=>$data) {
+                                if ($key=="deploy-".$_GET["additional"]) {
+                                        if ($data["STATUS"]=="1") {
+                                                echo "Install in progress... You can't uninstall while in progress...";
+                                        }
+                                        elseif ($data["STATUS"]=="2") {
+                                                echo "Install has finished...";
+						echo "<script>get_deployments();</script>";
+                                                remove_response("$key");
+                                        }
+                                }
+                        }
+                }
+                else { // no deployment in progress -> uninstall
+                        $key = "uninstall-".$_GET["additional"];
+                        $arr = check_response($key);
+                        if (!empty($arr)) {
+                                $data = $arr[$key];
+                                if ($data["STATUS"]=="1") {
+                                        echo "Uninstall in progress... Please wait... ".date("Y-m-d H:i:s");
+                                }
+                                elseif ($data["STATUS"]=="2") {
+                                        echo "OK";
+                                        remove_response("$key");
+                                }
+                        }
+                        else echo "Uninstall in progress... Please wait...";
+                }
+        break;
+        case "uninstall":
+                if ($key=check_deploy($_GET["additional"])) {
+                        $text="Deploy/uninstall process has already started.<br>Please wait and do not start a new one...";
+                }
+                else {
+                        $text="Uninstall in progress... Please wait...";
+                        $arr = array("NAME" => $_GET["additional"], "ACTION" => "uninstall");
+                        $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+
+                        if (set_output("deployment",$json)) echo "OK";
+                        else echo "ERROR";
+                }
+                echo $text;
+        break;
+        case "check_upgrade":
+                $arr = check_deploy($_GET["service"]);
+                if (!empty($arr)) { // deployment in progress
+                        foreach ($arr as $key=>$data) {
+                                if ($key=="deploy-".$_GET["service"]) {
+                                        if ($data["STATUS"]=="1") {
+                                                echo "Install in progress... You can't uninstall while in progress...";
+                                        }
+                                        elseif ($data["STATUS"]=="2") {
+                                                echo "Install has finished... You can upgrade now.";
+						//echo "<script>get_deployments();</script>";
+                                                remove_response("$key");
+                                        }
+                                }
+                        }
+                }
+		else { // no upgrade in progress -> upgrade
+                        $key = "upgrade-".$_GET["service"];
+                        $arr = check_response($key);
+                        if (!empty($arr)) {
+                                $data = $arr[$key];
+                                if ($data["STATUS"]=="1") {
+                                        echo "Upgrade in progress... Please wait... ".date("Y-m-d H:i:s");
+                                }
+                                elseif ($data["STATUS"]=="2") {
+                                        echo "OK";
+                                        remove_response("$key");
+                                }
+                        }
+                        else echo "Upgrade in progress... Please wait...";
+                }
+        break;
+        case "upgrade":
+                if ($key=check_deploy($_GET["service"])) {
+                        $text="Deploy/uninstall of {$_GET["service"]} has started. Please wait...";
+                }
+                else {
+                        //$text="Deploy/uninstall of {$_GET["service"]} in progress... Please wait...";
+
+			$arr = array("NAME" => $_GET["service"], "ACTION" => "upgrade");
 			$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
-			$op = "deployment";
-			if (set_output("deployment",$json)) echo "OK";
-			else echo "ERROR";
-		}
-		echo $text;
-	break;
+
+			if (set_output("upgrade",$json)) $text = "OK";
+			else $text = "ERROR";
+                }
+                echo $text;
+        break;
 	case "repositories":
 		$arr = array("STATUS" => 0);
 		$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
@@ -353,6 +502,20 @@ switch ($_GET["op"]) {
 		if (set_output("add_repository",$json)) echo "OK";
 		else echo "ERROR";
 	break;
+        case "check_vpn":
+                $key = "check_vpn";
+                $arr = array("STATUS" => 0);
+                $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+                set_output($key,$json);
+                sleep(1);
+                $arr = check_response($key);
+                if (!empty($arr)) {
+                        $data = $arr[$key];
+                        echo $data["STATUS"];
+                        remove_response("$key");
+                }
+                else echo "NO";
+        break;
 	case "save_vpn":
 		remove_response("save_repository");
Author	SHA1	Message	Date
laci	e782254749	load app new design All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-07-05 16:05:49 +00:00
Gyorgy Berenyi	211ddc21ef	Update Dockerfile All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-07-03 12:11:03 +00:00
Gyorgy Berenyi	7ae74eb72d	Update Dockerfile	2025-07-03 12:09:33 +00:00
Gyorgy Berenyi	38b8c4a342	Update Dockerfile All checks were successful continuous-integration/drone/push Build is passing Details	2025-07-03 11:31:24 +00:00
Gyorgy Berenyi	6b70259829	Update Dockerfile Some checks reported errors continuous-integration/drone/push Build is failing Details continuous-integration/drone/tag Build encountered an error Details	2025-07-03 11:27:31 +00:00
laci	586dc4698f	new design Some checks reported errors continuous-integration/drone/push Build encountered an error Details continuous-integration/drone/tag Build is passing Details	2025-07-02 18:12:07 +00:00
hael	ed4c3593a4	Upload files to "img" All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-27 11:07:19 +00:00
hael	10d3de84d6	Upload files to "img" Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2025-06-27 11:04:29 +00:00
hael	91dc523420	Upload files to "img" All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-27 11:04:11 +00:00
hael	06e9ca7249	Upload files to "img" All checks were successful continuous-integration/drone/push Build is passing Details	2025-06-27 11:03:52 +00:00
hael	c42d89bea9	Upload files to "img" Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2025-06-27 11:03:28 +00:00
laci	4de1511546	layout changes All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-30 15:56:43 +00:00
laci	99b248577e	edit deployment data fix All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-29 12:46:17 +00:00
laci	8aed85fba5	edit deployment data All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-29 10:56:45 +00:00
laci	dab4cba11d	design changes and more All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-29 06:50:17 +00:00
laci	f5b93f5d39	restore original design All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-23 12:12:09 +00:00
laci	5dacc36836	new template fields All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-21 07:42:04 +00:00
laci	453f84f0e3	new design changes Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2025-05-19 06:11:42 +00:00
laci	6af1e18298	upgrade changes All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-16 08:52:20 +00:00
laci	2b0415fcb1	new design first version All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-13 07:10:42 +00:00
laci	4fb0051f95	letsencrypt rename All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-07 16:17:50 +00:00
laci	b40558e056	letsencrypt2-> All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-07 11:34:13 +00:00
laci	6a7451de83	letsencrypt request All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-05-07 11:09:37 +00:00
laci	96b93c4218	test Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone/tag Build is passing Details	2025-05-06 08:14:37 +00:00
laci	3007a536e6	new design first version	2025-05-06 07:31:21 +00:00
hael	92044caa21	update errors argument ( fix Some checks reported errors continuous-integration/drone/push Build was killed Details	2025-03-28 20:47:53 +01:00
hael	4d5b672e4c	update errors argument Some checks reported errors continuous-integration/drone/push Build was killed Details	2025-03-28 20:46:38 +01:00
hael	bef0b41fce	Merge branch 'main' of ssh://git.format.hu/safebox/web-installer Some checks reported errors continuous-integration/drone/push Build was killed Details	2025-03-28 20:44:15 +01:00
hael	24f13dd8cd	update errors	2025-03-28 20:44:05 +01:00
Gyorgy Berenyi	192d2ce3a8	Update .drone.yml Some checks reported errors continuous-integration/drone/push Build was killed Details continuous-integration/drone/tag Build was killed Details	2025-03-28 15:07:35 +00:00
hael	490503f476	upgrade changes Some checks reported errors continuous-integration/drone/push Build was killed Details	2025-03-26 20:04:08 +01:00
hael	184ec08938	Merge branch 'main' of ssh://git.format.hu/safebox/web-installer Some checks reported errors continuous-integration/drone/push Build was killed Details	2025-03-26 13:00:04 +01:00
hael	75b2212f8f	search for updates	2025-03-26 12:59:53 +01:00
Gyorgy Berenyi	c745c05eb5	Update .drone.yml All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-22 15:56:59 +00:00
hael	7377f5290c	change service table id All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-19 14:15:58 +01:00
hael	594a430eb9	check_upgrade All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-19 14:12:32 +01:00
hael	ae4a031584	change update service name	2025-03-19 14:08:58 +01:00
hael	7b09b19e81	upgrade call All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-19 00:47:47 +01:00
hael	65e8554032	update call All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-19 00:31:33 +01:00
hael	6b3a409dc2	vpn cancel button All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-18 23:49:18 +01:00
hael	c7e4f79f2f	cancel mod	2025-03-18 17:11:45 +01:00
hael	f0dbafd37c	refresh btn All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-18 17:06:15 +01:00
hael	22a1b07b85	uninstall, cancel just in case of reinstall All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-18 16:42:55 +01:00
hael	cb00ade9b6	deployment edit mods All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-18 15:25:44 +01:00
hael	b6a43bf316	show letsencrypt in progress if file or domain does not exists All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-14 15:23:31 +01:00
hael	95ab5e1d1c	show letsencryptinfo according to new json structure All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-14 15:12:55 +01:00
hael	ed6b08b481	close all deployments except the current one All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-14 14:48:38 +01:00
hael	aefc09d222	uninstall confirm All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-14 14:24:25 +01:00
hael	d146d2d054	refresh deployments All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-14 13:21:11 +01:00
hael	38305ffbee	diagnostic->local backend All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-13 21:57:12 +01:00
hael	6889af9aa8	add git for development All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-13 21:27:49 +01:00
hael	de23eaf27c	check_vpn status All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-13 21:08:33 +01:00
hael	26e37a16d3	uninstall, check_uninstall JS All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-13 13:02:02 +01:00
hael	49fa4e040d	uninstall, check_uninstall All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-13 13:00:25 +01:00
hael	16ea6140bd	redeploy All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-13 00:48:03 +01:00
hael	1cfa962229	do not finish check_deployment All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-12 23:26:39 +01:00
hael	d08594458e	remove from output if finished so reinstall can start All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-12 17:44:01 +01:00
hael	3301fb300f	addition field class rename All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-12 16:09:17 +01:00
hael	48a00a4e00	resolve duplicate id All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-12 15:33:40 +01:00
hael	dbda5055db	check_deployment debug	2025-03-12 15:12:14 +01:00
hael	651432b2f9	diagnostic -> local_backend All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-12 15:03:15 +01:00
hael	61ce35b591	deploy from name All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-12 12:56:52 +01:00
hael	e0f4ee5917	LOCAL_BACKEND default no All checks were successful continuous-integration/drone/push Build is passing Details	2025-03-12 08:42:59 +01:00
hael	c02920ddb5	deployment name	2025-03-12 01:18:34 +01:00
hael	48be304a6c	letsencrypt_log.php - show log	2025-03-12 00:58:34 +01:00