Home Explore Help
Sign In
TC
/
arozos
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Added user overview in hwman=false mode

TC pushbot 5 4 years ago
parent
8d8d2fcebe
commit
fdd1f59e8c
3 changed files with 225 additions and 17 deletions
Unified View Show Diff Stats
  1. 40 15
      system.info.go
  2. 185 0
      web/SystemAO/info/overview.html
  3. 0 2
      web/desktop.system

+ 40 - 15
system.info.go
View File 

@@ -17,18 +17,20 @@ func SystemInfoInit() {
 
 	log.Println("Operation System: " + runtime.GOOS)
 
 	log.Println("Operation System: " + runtime.GOOS)
 
 	log.Println("System Architecture: " + runtime.GOARCH)
 
 	log.Println("System Architecture: " + runtime.GOARCH)
 
 
 
-	if *allow_hardware_management {
 
-		//Updates 5 Dec 2020, Added permission router
 
-		router := prout.NewModuleRouter(prout.RouterOption{
 
-			AdminOnly:   false,
 
-			UserHandler: userHandler,
 
-			DeniedHandler: func(w http.ResponseWriter, r *http.Request) {
 
-				sendErrorResponse(w, "Permission Denied")
 
-			},
 
-		})
 
+	//Updates 5 Dec 2020, Added permission router
 
+	router := prout.NewModuleRouter(prout.RouterOption{
 
+		AdminOnly:   false,
 
+		UserHandler: userHandler,
 
+		DeniedHandler: func(w http.ResponseWriter, r *http.Request) {
 
+			sendErrorResponse(w, "Permission Denied")
 
+		},
 
+	})
 
+
 
+	//Create Info Server Object
 
+	var infoServer *info.Server = nil
 
 
 
-		//Create Info Server Object
 
-		infoServer := info.NewInfoServer(info.ArOZInfo{
 
+	if *allow_hardware_management {
 
+		infoServer = info.NewInfoServer(info.ArOZInfo{
 
 			BuildVersion: build_version + "." + internal_version,
 
 			BuildVersion: build_version + "." + internal_version,
 
 			DeviceVendor: deviceVendor,
 
 			DeviceVendor: deviceVendor,
 
 			DeviceModel:  deviceModel,
 
 			DeviceModel:  deviceModel,
 
@@ -44,10 +46,6 @@ func SystemInfoInit() {
 
 		router.HandleFunc("/system/info/getDriveStat", info.GetDriveStat)
 
 		router.HandleFunc("/system/info/getDriveStat", info.GetDriveStat)
 
 		router.HandleFunc("/system/info/usbPorts", info.GetUSB)
 
 		router.HandleFunc("/system/info/usbPorts", info.GetUSB)
 
 		router.HandleFunc("/system/info/getRAMinfo", info.GetRamInfo)
 
 		router.HandleFunc("/system/info/getRAMinfo", info.GetRamInfo)
 
-		router.HandleFunc("/system/info/getRuntimeInfo", InfoHandleGetRuntimeInfo)
 
-
 
-		//ArOZ Info do not need permission router
 
-		http.HandleFunc("/system/info/getArOZInfo", infoServer.GetArOZInfo)
 
 
 
 		//Register as a system setting
 
 		//Register as a system setting
 
 		registerSetting(settingModule{
 
 		registerSetting(settingModule{
 
@@ -73,8 +71,35 @@ func SystemInfoInit() {
 
 
 
 		router.HandleFunc("/system/info/getUsageInfo", InfoHandleTaskInfo)
 
 		router.HandleFunc("/system/info/getUsageInfo", InfoHandleTaskInfo)
 
 
 
+	} else {
 
+		//Make a simpler page for the information of system for hardware management disabled nodes
 
+		registerSetting(settingModule{
 
+			Name:     "Overview",
 
+			Desc:     "Overview for user information",
 
+			IconPath: "SystemAO/info/img/small_icon.png",
 
+			Group:    "Info",
 
+			StartDir: "SystemAO/info/overview.html",
 
+		})
 
+
 
+		//Remve hardware information from the infoServer
 
+		infoServer = info.NewInfoServer(info.ArOZInfo{
 
+			BuildVersion: build_version + "." + internal_version,
 
+			DeviceVendor: deviceVendor,
 
+			DeviceModel:  deviceModel,
 
+			VendorIcon:   "../../" + iconVendor,
 
+			SN:           deviceUUID,
 
+			HostOS:       "virtualized",
 
+			CPUArch:      "generic",
 
+			HostName:     *host_name,
 
+		})
 
 	}
 
 	}
 
 
 
+	//Register endpoints that do not involve hardware management
 
+	router.HandleFunc("/system/info/getRuntimeInfo", InfoHandleGetRuntimeInfo)
 
+
 
+	//ArOZ Info do not need permission router
 
+	http.HandleFunc("/system/info/getArOZInfo", infoServer.GetArOZInfo)
 
+
 
 }
 
 }
 
 
 
 func InfoHandleGetRuntimeInfo(w http.ResponseWriter, r *http.Request) {
 
 func InfoHandleGetRuntimeInfo(w http.ResponseWriter, r *http.Request) {

+ 185 - 0
web/SystemAO/info/overview.html
View File 

@@ -0,0 +1,185 @@
 
+<!DOCTYPE html>
 
+<html ng-app="App">
 
+<head>
 
+    <title>System Info</title>
 
+    <meta charset="UTF-8">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0 user-scalable=no">
 
+    <link rel="stylesheet" href="../../script/semantic/semantic.min.css">
 
+    <script type="text/javascript" src="../../script/jquery.min.js"></script>
 
+    <script type="text/javascript" src="../../script/semantic/semantic.min.js"></script>
 
+</head>
 
+
 
+<body>
 
+    <div class="ui container">
 
+        <br>
 
+        <div class="ui stackable grid">
 
+            <div class="six wide column">
 
+                <div class="ui fluid card">
 
+                    <div class="image">
 
+                      <img id="avator" src="../../SystemAO/users/img/user.svg">
 
+                    </div>
 
+                    <div class="content">
 
+                      <a id="username" class="header">USER</a>
 
+                      <div class="meta">
 
+                        <span id="usergroup" class="date">@usergroup</span>
 
+                      </div>
 
+                    </div>
 
+                    <div class="extra content">
 
+                      <a href="#" onclick="parent.logout();">
 
+                        <i class="logout icon"></i>
 
+                        Logout
 
+                      </a>
 
+                    </div>
 
+                  </div>
 
+            </div>
 
+            <div class="ten wide column">
 
+                <div class="ui segment">
 
+                    <h3 class="ui header"><i class="yellow folder icon"></i> Storage</h3>
 
+                    <div class="ui divider"></div>
 
+                    <div class="ui grid">
 
+                        <div class="six wide column">
 
+                            Used Storage:
 
+                        </div>
 
+                        <div class="ten wide column" id="usedStorage">
 
+                            Loading...
 
+                        </div>
 
+                        <div class="six wide column">
 
+                            Total Storage:
 
+                        </div>
 
+                        <div class="ten wide column" id="totalStorage">
 
+                            Loading...
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+                <div class="ui segment">
 
+                    <h3 class="ui header"><i class="blue globe icon"></i> Personal Homepage</h3>
 
+                    <div class="ui divider"></div>
 
+                    <div class="ui grid">
 
+                        <div class="six wide column">
 
+                            Status:
 
+                        </div>
 
+                        <div class="ten wide column" id="homepageStatus">
 
+                            Loading...
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+                <div class="ui segment">
 
+                    <h3 class="ui header"><i class="teal clock icon"></i>  Operation Time</h3>
 
+                    <div class="ui divider"></div>
 
+                    <div class="ui grid">
 
+                        <div class="six wide column">
 
+                            Online Since:
 
+                        </div>
 
+                        <div class="ten wide column" id="startup">
 
+                            Loading...
 
+                        </div>
 
+                        <div class="six wide column">
 
+                            Up Time :
 
+                        </div>
 
+                        <div class="ten wide column" id="operation">
 
+                            Loading...
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+          </div>
 
+        
+    </div>
 
+    <div class="ui divider"></div>
 
+    <div style="float: right; text-align: right; color: #9c9c9c; margin-right: 1.5em;" >
 
+        <p><span id="hostname"></span><br>
 
+        <span id="version"></span></p>
 
+    </div>
 
+    <img class="ui small image" id="icon"></img>
 
+    
+    <br>
 
+</body>
 
+<script>
 
+    $(document).ready(function() {
 
+        $.getJSON("../../system/info/getRuntimeInfo", function(data){
 
+            $("#startup").text(ao_module_utils.timeConverter(data.StartupTime));
 
+            $("#operation").text(ao_module_utils.durationConverter(data.ContinuesRuntime));
 
+            $("#operation").attr("startunix", data.StartupTime);
 
+            accumulateOperationTime();
 
+        });
 
+
 
+        initUserInfo();
 
+        initStorageInfo();
 
+        initHomepageState();
 
+        initHostInfo();
 
+    });
 
+
 
+    function initHostInfo(){
 
+        $.get("../../system/info/getArOZInfo", function(data){
 
+            $("#icon").attr('src', data.VendorIcon);
 
+            $("#hostname").text(data.HostName);
 
+            $("#version").text(data.BuildVersion);
 
+        });
 
+    }
 
+
 
+    function initUserInfo(){
 
+        $.get("../../system/users/userinfo", function(data){
 
+            $("#username").text(data.Username);
 
+            $("#usergroup").text("@" + data.Usergroup.join(","));
 
+            if (data.Icondata != ""){
 
+                $("#avator").attr("src", data.Icondata);
 
+            }
 
+        });
 
+    }
 
+
 
+    function initStorageInfo(){
 
+        $.get("../../system/disk/quota/quotaInfo", function(data){
 
+            let percentageText = "0%";
 
+            if (data.Total == -1){
 
+                $("#totalStorage").text("Unlimited");
 
+            }else if (data.Total == 0){
 
+                $("#totalStorage").text("Read Only");
 
+                percentageText = "100%";
 
+            }else{
 
+                $("#totalStorage").text(ao_module_utils.formatBytes(data.Total, 2));
 
+                percentageText = parseInt((data.Used / data.Total) * 100).toFixed(2) + "%";
 
+            }
 
+            $("#usedStorage").text(ao_module_utils.formatBytes(data.Used, 2) + ` ( ${percentageText} )`);
 
+        });
 
+    }
 
+
 
+    function initHomepageState(){
 
+        $.get("../../system/network/www/toggle", function(data){
 
+            if (data == true){
 
+                $("#homepageStatus").html(`<h5><i class="green circle icon"></i> Online</h5>`);
 
+            }else{
 
+                $("#homepageStatus").html(`<h5><i class="red circle icon"></i> Offline</h5>`);
 
+            }
 
+           
+        });
 
+    }
 
+
 
+    function accumulateOperationTime(){
 
+        setTimeout(function(){
 
+            if ($("#operation").length > 0){
 
+                var startUnix = $("#operation").attr("startunix");
 
+                startUnix = parseInt(startUnix);
 
+                var newOprTime = parseInt(Date.now()/1000) - startUnix
 
+                $("#operation").text(ao_module_utils.durationConverter(newOprTime));
 
+                accumulateOperationTime();
 
+            }
 
+        }, 1000);
 
+    }
 
+
 
+    //https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
 
+    function humanFileSize(bytes, si) {
 
+        var thresh = si ? 1000 : 1024;
 
+        if (Math.abs(bytes) < thresh) {
 
+            return bytes + ' B';
 
+        }
 
+        var units = si ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
 
+        var u = -1;
 
+        do {
 
+            bytes /= thresh;
 
+            ++u;
 
+        } while (Math.abs(bytes) >= thresh && u < units.length - 1);
 
+        return bytes.toFixed(1) + ' ' + units[u];
 
+    }
 
+</script>
 
+
 
+</html>

+ 0 - 2
web/desktop.system
View File 

@@ -5216,8 +5216,6 @@
 
                 });
 
                 });
 
             }
 
             }
 
 
 
-            
-
 
             hideAllContextMenus();
 
             hideAllContextMenus();
 
         }
 
         }