Merge pull request #5 from tago-io/feature/os-rock-pi

Feature: Added Rock Pi logo on 'operating system' card in home page
tago-io · Jul 6, 2022 · 19a94a0 · 19a94a0
2 parents e278ef2 + fee3891
commit 19a94a0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -39,6 +39,7 @@
     "rcompare",
     "rerender",
     "respawn",
+    "rockchip",
     "rpio",
     "svgr",
     "swaptotal",

diff --git a/packages/tcore-api/src/Services/Hardware.ts b/packages/tcore-api/src/Services/Hardware.ts
@@ -45,12 +45,13 @@ export async function getOSInfo() {
   const osInfo = await si.osInfo();
   const osPlatform = os.platform();
 
-  let version = osInfo.release;
+  let version = `Version ${osInfo.release}`;
   let code = "";
   let hardware = "";
   let name = osInfo.distro || osInfo.codename;
   const arch = osInfo.arch;
   const hostname = os.hostname();
+  const osVersion = os.version();
 
   // debian
   // redhat
@@ -75,9 +76,14 @@ export async function getOSInfo() {
       break;
   }
 
+  if (String(osVersion).includes("rockchip")) {
+    name = "Rock Pi";
+    version = `${osInfo.distro || osInfo.codename} ${osInfo.release}`;
+    hardware = "rock-pi";
+  }
   if (system.raspberry) {
     hardware = "raspberry-pi";
-    version = system.raspberry?.type;
+    version = `Version ${system.raspberry.type}`;
     name = "Raspberry Pi";
   }
 

diff --git a/packages/tcore-console/assets/icons/rock-pi.svg b/packages/tcore-console/assets/icons/rock-pi.svg
diff --git a/packages/tcore-console/src/Components/Home/OperatingSystem/OperatingSystem.tsx b/packages/tcore-console/src/Components/Home/OperatingSystem/OperatingSystem.tsx
@@ -30,6 +30,8 @@ function OperatingSystem(props: IOperatingSystemProps) {
   const getHardwareIcon = () => {
     if (os.hardware === "raspberry-pi") {
       return EIcon["raspberry-pi"];
+    } else if (os.hardware === "rock-pi") {
+      return EIcon["rock-pi"];
     }
   };
 
@@ -71,7 +73,7 @@ function OperatingSystem(props: IOperatingSystemProps) {
       <div className="data">
         <h3>{os.name || "-"}</h3>
         <span className="description">
-          Version {os.version}
+          {os.version}
           {os.arch ? " • " : ""}
           {os.arch}
         </span>

diff --git a/packages/tcore-console/src/Components/Icon/Icon.types.ts b/packages/tcore-console/src/Components/Icon/Icon.types.ts
@@ -81,6 +81,7 @@ enum EIcon {
   "question-circle" = "question-circle",
   "raspberry-pi" = "raspberry-pi",
   "redo" = "redo",
+  "rock-pi" = "rock-pi",
   "save" = "save",
   "scroll" = "scroll",
   "search" = "search",
@@ -179,6 +180,7 @@ const icons = {
   "question-circle": require("../../../assets/icons/question-circle.svg"),
   "raspberry-pi": require("../../../assets/icons/raspberry-pi.svg"),
   "redo": require("../../../assets/icons/redo.svg"),
+  "rock-pi": require("../../../assets/icons/rock-pi.svg"),
   "save": require("../../../assets/icons/save.svg"),
   "scroll": require("../../../assets/icons/scroll.svg"),
   "search": require("../../../assets/icons/search.svg"),