new template fields

Dockerfile

@@ -71,15 +71,10 @@ RUN apk --no-cache add php${PHP_VERSION} \
 COPY nginx.conf /etc/nginx/nginx.conf
 
 RUN mkdir -p /usr/share/nginx/html
-COPY index.html    /usr/share/nginx/html
+COPY *.html    /usr/share/nginx/html
-COPY scan.html   /usr/share/nginx/html
+COPY *.php   /usr/share/nginx/html
-COPY manage.html   /usr/share/nginx/html
+COPY *.css /usr/share/nginx/html
-COPY scan.php   /usr/share/nginx/html
+COPY *.js /usr/share/nginx/html
-COPY letsencrypt_log.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
 RUN chown -R nginx:nginx /usr/share/nginx/html
 
 RUN mkdir -p /usr/share/nginx/html/shared

common.js

@@ -155,27 +155,35 @@ function get_updates() {
   });
 }
 
-function check_upgrade() {
+function check_upgrade(service) {
-  var url  = 'scan.php?op=check_upgrade';
+  var url  = 'scan.php?op=check_upgrade&service='+service;
   jQuery.get(url, function(data) {
-        console.log('check_upgrade: '+data);
+        console.log('check_upgrade '+service+': '+data);
-      if (data=="WAIT" || data=="") {
+      if (data!="") {
-        setTimeout(check_upgrade, 1000);
+              jQuery("#status_"+service).html(data);
+      }
+      if (data!="OK") {
+              setTimeout(check_upgrade, 1000, service);
       }
       else {
-              // TODO
+          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('upgrade end: '+service);
+          console.log('check_upgrade '+service+': '+data);
           if (data=="OK") {
-                setTimeout(check_upgrade, 1000);
+                setTimeout(check_upgrade, 1000, service);
           }
+	  else jQuery("#status_"+service).html(data);
   });
 }
 
@@ -258,6 +266,28 @@ function confirm_uninstall(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) {
@@ -328,6 +358,61 @@ function get_services() {
   });
 }
 
+function get_proxy_html() {
+        proxy_html = `
+	<fieldset>
+	<legend>Enable proxy</legend>
+        <div class="input-group">
+	<form class="form-install" action="#" method="post" id="save_vpn">
+		<div class="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) {
@@ -353,7 +438,6 @@ jQuery(document).ready(function(){
 
 	get_repositories();
 	get_system();
-	get_services();
 	check_vpn();
 
 	jQuery('#deployments_btn').click(function() {
@@ -362,6 +446,7 @@ jQuery(document).ready(function(){
 	});
 
 	jQuery('#services_btn').click(function() {
+		get_services();
 		jQuery('#deployments').hide();
 		jQuery('#services').toggle();
 	});

functions.php

@@ -148,7 +148,7 @@ function show_service_update($name, $update, $uptodate, $error) {
 	if (!empty($update)) {
 		$arr = explode(" ",$update);
 		foreach ($arr as $container) {
-			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>UPDATE AVAILABLE</td><td><a href=\"#\" onclick=\"upgrade('{$name}')\">UPDATE</a></td></tr>";
+			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">UPDATE AVAILABLE</div></td><td><a href=\"javascript:void(0)\" onclick=\"upgrade('{$name}')\">UPDATE</a></td></tr>";
 		}
 	}
 
@@ -156,7 +156,7 @@ function show_service_update($name, $update, $uptodate, $error) {
 	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><a href=\"#\" onclick=\"upgrade('{$name}')\">FORCE UPDATE</a></td></tr>";
+			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">Already up to date</div></td><td><a href=\"javacript:void(0)\" onclick=\"upgrade('{$name}')\">FORCE UPDATE</a></td></tr>";
 		}
 	}
 
@@ -165,7 +165,7 @@ function show_service_update($name, $update, $uptodate, $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>N/A</td><td><a href=\"#\" onclick=\"upgrade('{$name}')\">TRY UPDATE</a></td></tr>";
+                        $str .= "<tr><td>&nbsp;</td><td>".$container."</td><td><div id=\"status_".$name."\">N/A</div></td><td><a href=\"javascript:void(0)\" onclick=\"upgrade('{$name}')\">TRY UPDATE</a></td></tr>";
                 }
         }
 
@@ -305,6 +305,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;
@@ -314,8 +326,7 @@ function check_letsencrypt() {
 		$json_data = file_get_contents($input_file);
 		$data = json_decode($json_data,true);
 		if ($data === null) {
-			echo "JSON read error...";
+			return "ERROR";
-			// TODO json error
 		}
 		else {
                         foreach ($data as $domain => $domain_data) {

installer.css

@@ -132,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;
+    }

manage.html

@@ -1,81 +1,689 @@
-<!doctype html>
+<!DOCTYPE html>
-<html lang="en">
+<html lang="hu">
 <head>
-<!-- Required meta tags -->
+    <meta charset="UTF-8">
-<meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>Safebox</title>
-<title>INSTALLER TOOL</title>
+    <style>
-<!-- Bootstrap CSS -->
+        :root {
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
+            --bg-color: #ffffff;
-<!-- Custom styles for this template -->
+            --text-color: #000000;
-<link href="installer.css?t=5" rel="stylesheet">
+            --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}
+
+        .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);
+        }
+        .buttons {
+            display: flex;
+            justify-content: center;
+            gap: 10px;
+            margin: 20px 0;
+            cursor: pointer;
+        }
+        .buttons button {
+            padding: 10px 20px;
+            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;
+        }
+        .container {
+		clear:both;
+		float:none;
+        }
+        .leftside {
+		float:left;
+		width:20%;
+        }
+        .rightside {
+		float:right;
+		width:80%;
+        }
+        .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: 92%;
+            max-width: 92%;
+            margin: 0 auto;
+            border-radius: 10px;
+            box-sizing: border-box;
+        }
+        .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;
+        }
+        footer {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 20px;
+            font-size: 14px;
+        }
+        .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 {
+            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");
+        }
+
+    .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;
+    }
+
+        @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 id="manage" class="text-center">
+<body>
-<div class="container-fluid">
-<div class="col-md-12">
 
-<h1>Found deployed environment</h1>
+<div class="container">
-
+<div class="leftside">
-<div style="text-align:left;float:left;width:33%">
+    <div class="logo">
-	<a href="javascript:void()" id="vpn_btn">VPN</a>
+        <img src="image.png" alt="Logo">
-        Status:
+        <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 style="text-align:center;float:left;width:34%">
+	<div class="buttons">
-        <a href="manage.html" id="refresh_btn">REFRESH</a>
+	 	<button id="servicesBtn">Services</button>
 	</div>
-<div style="text-align:right;float:right">
+    	<div class="settings">Settings</div>
-	<a href="javascript:void()" id="settings_btn">SETTINGS</a>
+	<div class="buttons">
+		<button id="updatesBtn">Updates</button>
 	</div>
-<div style="float:none;clear:both"/>
+	<div class="buttons">
-
+		<button id="repositoriesBtn">Repositories</button>
-<div id="vpn" class="hidden">
-	<fieldset>
-	<legend>Enable proxy</legend>
-	<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 class="buttons">
+		<button id="systemservicesBtn">System services</button>
 	</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">
-		    <div class="mb-3">
-			<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>
-	</fieldset>
 	<br>
+	<br>
+		<div style="text-align:center;">
+		<a href="manage.html" id="refresh_btn">REFRESH</a>
+		<br>
+		<br>
+		<a href="manage2.html" id="old_btn">OLD DESIGN</a>
+		</div>
 </div>
 
-<div id="settings" class="hidden">
+<div class="rightside">
+	<div class="buttons">
+	    <button id="myAppsBtn">My Apps</button>
+	    <button id="installAppsBtn">Install Apps</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" id="myAppsContainer"></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><strong><a href="#">Go Pro!</a></strong></p>
+    </div>
+
+    <div class="footer-social">
+        <a href="#">Discord</a>
+        <a href="#">X</a>
+    </div>
+</footer>
+
+<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.orig_name}
+		    `;
+		    appDiv.addEventListener('click', () => {
+			popupText.textContent = `You clicked on ${app.name}!`;
+			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">
+	    Loading...
+            </div>
+        `;
+	get_proxy_html();
+    }
+
+    function renderServices() {
+        myAppsContainer.innerHTML = `
+            <div id="services">
+	    Loading...
+            </div>
+        `;
+	get_services();
+    }
+
+    function renderUpdates() {
+        myAppsContainer.innerHTML = `
+            <div id="updates">
+	    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>
@@ -98,58 +706,63 @@
 		</div>
 		</form>
 	</fieldset>
-
-	<fieldset>
-	<legend>System services</legend>
-	<div id="system" style="text-align:left">Loading...</div>
-	</fieldset>
-	
-	<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">
+        `;
-	</div>
+    }
-	</fieldset>
+
-	<br>
+    function renderSystemServices() {
+        myAppsContainer.innerHTML = `
+            <div id="system">
+	    Loading...
             </div>
+        `;
+	get_system();
+    }
 
-<div id="default">
+	function activate(btn) {
+		myAppsBtn.classList.remove('active');
+		installAppsBtn.classList.remove('active');
+		btn.classList.add('active');
+	}
 
-	<fieldset>
+    myAppsBtn.addEventListener('click', () => {renderApps(false); activate(myAppsBtn);});
-	<legend><a href="javascript:void()" id="deployments_btn">Deployments</a></legend>
+    installAppsBtn.addEventListener('click', () => {renderApps(true); activate(installAppsBtn);});
-	<div id="deployments" style="text-align:left">Loading...</div>
+    backupBtn.addEventListener('click', () => renderText('Backup'));
-	</fieldset>
+    diskBtn.addEventListener('click', () => renderText('Disk Management'));
+    monitorBtn.addEventListener('click', () => renderText('Monitor'));
 
-	<fieldset>
+    vpnBtn.addEventListener('click', () => renderVPN());
-	<legend><a href="javascript:void()" id="services_btn">Services</a></legend>
+    servicesBtn.addEventListener('click', () => renderServices());
-	<div id="services" style="text-align:left;display:none;">Loading...</div>
+    updatesBtn.addEventListener('click', () => renderUpdates());
-	</fieldset>
+    repositoriesBtn.addEventListener('click', () => renderRepositories());
+    systemservicesBtn.addEventListener('click', () => renderSystemServices());
 
-	<fieldset>
+    closeBtn.addEventListener('click', () => {
-	<legend>Disk management</legend>
+        popup.classList.add('hidden');
-	</fieldset>
+    });
 
-	<fieldset>
+    popup.addEventListener('click', (event) => {
-	<legend>Monitor</legend>
+        if (event.target === popup) {
-	</fieldset>
+            popup.classList.add('hidden');
+        }
+    });
 
-</div>
+    renderApps(false);
-
+});
-</div>
-</div>
-<br>
-<br>
-<script>
-    // apps array beállítása common.js-ben
-    const apps = []; // GLOBAL VARIABLE
 </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"></script>
+<script src="common.js?t=7"></script>
 </body>
 </html>

manage2.html

@@ -1,562 +1,152 @@
-<!DOCTYPE html>
+<!doctype html>
-<html lang="hu">
+<html lang="en">
 <head>
-    <meta charset="UTF-8">
+<!-- Required meta tags -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta charset="utf-8">
-    <title>Control Panel</title>
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <style>
+<title>INSTALLER TOOL</title>
-        :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;
-        }
-        .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%;
-        }
-        .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;
-        }
-        .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);
-        }
-        .buttons {
-            display: flex;
-            justify-content: center;
-            gap: 10px;
-            margin: 20px 0;
-            cursor: pointer;
-        }
-        .buttons button {
-            padding: 10px 20px;
-            background: none;
-            border: 1px solid var(--button-border);
-            border-radius: 10px;
-            cursor: pointer;
-            color: var(--text-color);
-        }
-        .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: 92%;
-            max-width: 92%;
-            margin: 0 auto;
-            border-radius: 10px;
-            box-sizing: border-box;
-        }
-        .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;
-        }
-        footer {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 20px;
-            font-size: 14px;
-        }
-        .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: center;
-            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 {
-            padding: 10px;
-            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");
-        }
-        
-        @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>
 <!-- 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=5" rel="stylesheet">
+<link href="installer.css?t=6" rel="stylesheet">
 </head>
-<body>
+<body id="manage" class="text-center">
+<div class="container-fluid">
+<div class="col-md-12">
 
-<header>
+<h1>Found deployed environment</h1>
-    <div class="profile" id="profileSection">
-        <img src="image.png" alt="Profilkép">
-        <div>Pro</div>
-    </div>
-    <div class="logo">
-        <img src="image.png" alt="Logo">
-        <div><h1>Control Panel</h1></div>
-    </div>
-    <div class="toggle" id="themeToggle"></div>
-</header>
 
-<div class="buttons">
+<div style="text-align:left;float:left;width:33%">
-    <button id="myAppsBtn">My Apps</button>
+	<a href="javascript:void()" id="vpn_btn">VPN</a>
-    <button id="installAppsBtn">Install Apps</button>
+        Status:
-    <button id="backupBtn">Backup</button>
+	<span id="vpn_on" class="hidden green"><b>ON</b></span>
-    <button id="diskBtn">Disk Management</button>
+	<span id="vpn_off" class="hidden red"><b>OFF</b></span>
-    <button id="monitorBtn">Monitor</button>
+</div>
+<div style="text-align:center;float:left;width:34%">
+        <a href="manage2.html" id="refresh_btn">REFRESH</a>
+        /
+	<a href="manage.html" id="new_btn">NEW DESIGN</a>
+</div>
+<div style="text-align:right;float:right">
+	<a href="javascript:void()" id="settings_btn">SETTINGS</a>
+</div>
+<div style="float:none;clear:both"/>
+
+<div id="vpn" class="hidden">
+	<fieldset>
+	<legend>Enable proxy</legend>
+	<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">
+		    <div class="mb-3">
+			<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>
+	</fieldset>
+	<br>
 </div>
 
-<div class="my-apps" id="myAppsContainer"></div>
+<div id="settings" class="hidden">
-<div id="popup" class="popup hidden">
+	<fieldset>
-  <div class="popup-content">
+	<legend>Repositories</legend>
-    <span class="close">&times;</span>
+		<div id="repositories" style="text-align:left">Loading...</div>
-    <div id="popupText" class="deployment">Load app template here</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>
-<footer>
+		</div>
-    <div class="footer-links">
+		<div class="row">
-        <a href="#">Help</a>
+		    <div class="mb-3">
-        <a href="#">Docs</a>
+			<button class="btn btn-lg btn-primary btn-block" type="submit" id="repo_add_btn"> Add </button>
-        <a href="#">Report</a>
+		    </div>
+		</div>
+		</form>
+	</fieldset>
+
+	<fieldset>
+	<legend>System services</legend>
+	<div id="system" style="text-align:left">Loading...</div>
+	</fieldset>
+	
+	<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">
+	</div>
+	</fieldset>
+	<br>
 </div>
 
-    <div class="footer-center">
+<div id="default">
-        <p>Want to access your services remotely?</p>
+
-        <p><strong><a href="#">Go Pro!</a></strong></p>
+	<fieldset>
+	<legend><a href="javascript:void()" id="deployments_btn">Deployments</a></legend>
+	<div id="deployments" style="text-align:left">Loading...</div>
+	</fieldset>
+
+	<fieldset>
+	<legend><a href="javascript:void()" id="services_btn">Services</a></legend>
+	<div id="services" style="text-align:left;display:none;">Loading...</div>
+	</fieldset>
+
+	<fieldset>
+	<legend>Disk management</legend>
+	</fieldset>
+
+	<fieldset>
+	<legend>Monitor</legend>
+	</fieldset>
+
 </div>
 
-    <div class="footer-social">
-        <a href="#">GitHub</a>
-        <a href="#">X</a>
 </div>
-</footer>
+</div>
-
+<br>
-<script>
+<br>
-    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');
-    });
-</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 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.orig_name}
-		    `;
-		    appDiv.addEventListener('click', () => {
-			popupText.textContent = `You clicked on ${app.name}!`;
-			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!');
-                }
-            });
-        }
-    }
-
-    myAppsBtn.addEventListener('click', () => renderApps(false));
-    installAppsBtn.addEventListener('click', () => renderApps(true));
-    backupBtn.addEventListener('click', () => renderText('Backup'));
-    diskBtn.addEventListener('click', () => renderText('Disk Management'));
-    monitorBtn.addEventListener('click', () => renderText('Monitor'));
-
-    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>

scan.php

@@ -179,36 +179,48 @@ switch ($_GET["op"]) {
 					if ($data["STATUS"]=="0") { // ask
 						$template = json_decode(base64_decode($data["TEMPLATE"]));
 						echo "<fieldset><form action=\"#\" method=\"post\" id=\"deploy_{$template->name}_form\"><br>";
+						echo '<div id="letsencrypt">';
 						if ($reinstall) {
 							//var_dump($template);
                                                         $letsencrypt = check_letsencrypt();
-							if (empty($letsencrypt)) echo "LETSENCRYPT in progress...";
+							if (empty($letsencrypt)) echo "LETSENCRYPT file doesn't exists...";
+							elseif ($letsencrypt=="ERROR") echo "LETSENCRYPT file: read JSON error...";
 							else {
+								$domain = "";
 								foreach ($template->fields as $field) {
-									if ($field->key=="DOMAIN") {
+									if ($field->key=="DOMAIN") $domain = $field->value;
-										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>";
-										}
-										else echo "LETSENCRYPT in progress for {$field->value}.";
-									}
 								}
+								if (!empty($domain)) show_letsencrypt($letsencrypt, $domain);
 							}
 						}
+						echo '</div>';
+						if (!empty($template->icon)) echo "<div class=\"row\"><img src=\"".$template->icon."\"></div>";
+						if (!empty($template->description)) echo "<div class=\"row\"><label>".$template->description."</label></div>";
 						foreach ($template->fields as $field) {
+							if (!empty($field->title)) echo "<div class=\"row\"><b>".$field->title."</b></div>";
 							if (isset($field->generated)) {
 								echo "<input type=\"hidden\" value=\"generated:{$field->generated}\" 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>
+								echo "<div class=\"row\">";
+								echo "<div>
+									<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_{$template->name}\">
-							</div></div>";
+									</div>";
+								if (!empty($field->info)) echo "
+									<div class=\"info-container\">
+									  <span class=\"info-icon\">i</span>
+									  <div class=\"tooltip\">{$field->info}</div>
+									</div>
+								";
+								echo "</div>";
+								if (!empty($field->details)) echo "<div class=\"row\"><i>".$field->details."</i></div>";
 							}
 						}
 
 
                                                 echo "
-                                                <div class=\"row\">
+                                                <div class=\"row buttons\">
                                                 <div class=\"mb-3\">
                                                 <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\" id=\"deploy_{$template->name}_btn\">".($reinstall ? "Reinstall" : "Install")."</button>
                                                 </div>";
@@ -264,6 +276,23 @@ 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 "redeploy":
 	case "deploy":
 		if ($key=check_deploy($_GET["additional"])) { 
@@ -364,23 +393,51 @@ switch ($_GET["op"]) {
                 echo $text;
         break;
         case "check_upgrade":
-                $arr = check_response("upgrade");
+                $arr = check_deploy($_GET["service"]);
-                if (!empty($arr)) {
+                if (!empty($arr)) { // deployment in progress
                         foreach ($arr as $key=>$data) {
-                                if ($key=="upgrade") {
+                                if ($key=="deploy-".$_GET["service"]) {
-                                        var_dump($arr);
+                                        if ($data["STATUS"]=="1") {
-                                        //remove_response("$key");
+                                                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 echo "WAIT";
+                }
+		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);
 
-                if (set_output("upgrade",$json)) echo "OK";
+			if (set_output("upgrade",$json)) $text = "OK";
-                else echo "ERROR";
+			else $text = "ERROR";
+                }
+                echo $text;
         break;
 	case "repositories":
 		$arr = array("STATUS" => 0);