From 76eb315b9d174f93ef45a6fa46fb14cbff10bebb Mon Sep 17 00:00:00 2001
From: PhilReact <philliplangmartinez@gmail.com>
Date: Thu, 6 Feb 2025 00:40:41 +0200
Subject: [PATCH] added private app name and logo

---
 src/components/Apps/AppsHomeDesktop.tsx      | 56 ++++++++++++++++++--
 src/components/Apps/SortablePinnedApps.tsx   |  6 +--
 src/components/Apps/TabComponent.tsx         |  4 +-
 src/components/Apps/useHandlePrivateApps.tsx | 16 ++++--
 4 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/src/components/Apps/AppsHomeDesktop.tsx b/src/components/Apps/AppsHomeDesktop.tsx
index 2b2ea00..76cffb2 100644
--- a/src/components/Apps/AppsHomeDesktop.tsx
+++ b/src/components/Apps/AppsHomeDesktop.tsx
@@ -9,7 +9,7 @@ import {
   PublishQAppChoseFile,
   PublishQAppInfo,
 } from "./Apps-styles";
-import { Avatar, Box, Button, ButtonBase, Dialog, DialogActions, DialogContent, DialogTitle, Input, MenuItem, Select, Tab, Tabs } from "@mui/material";
+import { Avatar, Box, Button, ButtonBase, Dialog, DialogActions, DialogContent, DialogTitle, Input, MenuItem, Select, Tab, Tabs, Typography } from "@mui/material";
 import { Add } from "@mui/icons-material";
 import { getBaseApiReact, isMobile, MyContext } from "../../App";
 import LogoSelected from "../../assets/svgs/LogoSelected.svg";
@@ -25,6 +25,9 @@ import { saveToLocalStorage } from "./AppsNavBarDesktop";
 import { Label } from "../Group/AddGroup";
 import { useHandlePrivateApps } from "./useHandlePrivateApps";
 import { useDropzone } from "react-dropzone";
+import ImageUploader from "../../common/ImageUploader";
+import { base64ToBlobUrl, fileToBase64 } from "../../utils/fileReading";
+import { objectToBase64 } from "../../qdn/encryption/group-encryption";
 
 const maxFileSize = 50 * 1024 * 1024 ; // 50MB or 400MB
 
@@ -37,6 +40,7 @@ export const AppsHomeDesktop = ({
 }) => {
     const {openApp} = useHandlePrivateApps()
     const [file, setFile] = useState(null)
+    const [logo, setLogo] = useState(null)
     const { getRootProps, getInputProps } = useDropzone({
       accept: {
         "application/zip": [".zip"], // Only accept zip files
@@ -91,7 +95,8 @@ const [myGroupsWhereIAmAdmin, setMyGroupsWhereIAmAdmin] = useRecoilState(
 
   const [newPrivateAppValues, setNewPrivateAppValues] = useState({
     service: 'DOCUMENT',
-    identifier: ''
+    identifier: '',
+    name: '',
   })
 
   const addPrivateApp = async ()=> {
@@ -114,23 +119,35 @@ const [myGroupsWhereIAmAdmin, setMyGroupsWhereIAmAdmin] = useRecoilState(
     })
     setNewPrivateAppValues({
 service: 'DOCUMENT',
-    identifier: ''
+    identifier: '',
+    name: ''
     })
     setFile(null)
     setValueTabPrivateApp(0)
-    setSelectedGroup(null)
+    setSelectedGroup(0)
+    setLogo(null)
     
   }
 
   const publishPrivateApp = async ()=> {
     try {
       if(selectedGroup === 0) return
+      if(!logo) throw new Error('Please select an image for a logo')
       if(!myName) throw new Error('You need a Qortal name to publish')
+        if(!newPrivateAppValues?.name) throw new Error('Your app needs a name')
+      const base64Logo = await fileToBase64(logo)
+      const base64App = await fileToBase64(file)
+      const objectToSave = {
+        app: base64App,
+        logo: base64Logo,
+        name: newPrivateAppValues.name
+      }
+      const object64 = await objectToBase64(objectToSave);
       const decryptedData = await window.sendMessage(
         "ENCRYPT_QORTAL_GROUP_DATA",
 
         {
-          file: file,
+          base64: object64,
           groupId: selectedGroup,
         }
       );
@@ -598,6 +615,35 @@ service: 'DOCUMENT',
                 })}
               />
             </Box>
+            <Spacer height="10px"/>
+            <Box
+              sx={{
+                display: "flex",
+                flexDirection: "column",
+                gap: "5px",
+                marginTop: "15px",
+              }}
+            >
+              <Label>App name</Label>
+              <Input
+                placeholder="App name"
+                value={newPrivateAppValues?.name}
+                onChange={(e) => setNewPrivateAppValues((prev)=> {
+                  return {
+                    ...prev,
+                    name: e.target.value
+                  }
+                })}
+              />
+            </Box>
+
+          <Spacer height="10px" />
+        <ImageUploader onPick={(file) => setLogo(file)}>
+          <Button variant="contained">Choose logo</Button>
+        </ImageUploader>
+        {logo?.name}
+        <Spacer height="25px" />
+
           </DialogContent>
           <DialogActions>
             <Button variant="contained" onClick={()=> {
diff --git a/src/components/Apps/SortablePinnedApps.tsx b/src/components/Apps/SortablePinnedApps.tsx
index 3adb470..5be9321 100644
--- a/src/components/Apps/SortablePinnedApps.tsx
+++ b/src/components/Apps/SortablePinnedApps.tsx
@@ -58,7 +58,7 @@ const SortableItem = ({ id, name, app, isDesktop }) => {
                     border: "none",
                   }}
                 >
-                  {app?.isPrivate ? (
+                  {app?.isPrivate && !app?.privateAppProperties?.logo ? (
           <LockIcon
             sx={{
               height: "42px",
@@ -75,7 +75,7 @@ const SortableItem = ({ id, name, app, isDesktop }) => {
                       }
                     }}
                     alt={app?.metadata?.title || app?.name}
-                    src={`${getBaseApiReact()}/arbitrary/THUMBNAIL/${
+                    src={ app?.privateAppProperties?.logo ? app?.privateAppProperties?.logo :`${getBaseApiReact()}/arbitrary/THUMBNAIL/${
                       app?.name
                     }/qortal_avatar?async=true`}
                   >
@@ -93,7 +93,7 @@ const SortableItem = ({ id, name, app, isDesktop }) => {
                 </AppCircle>
                 {app?.isPrivate ? (
                    <AppCircleLabel>
-                   Private
+                   {`${app?.privateAppProperties?.appName || "Private"}`}
                  </AppCircleLabel>
                 ) : (
                   <AppCircleLabel>
diff --git a/src/components/Apps/TabComponent.tsx b/src/components/Apps/TabComponent.tsx
index 303fcab..b685e6d 100644
--- a/src/components/Apps/TabComponent.tsx
+++ b/src/components/Apps/TabComponent.tsx
@@ -37,7 +37,7 @@ const TabComponent = ({ isSelected, app }) => {
             src={NavCloseTab}
           />
         )}
-        {app?.isPrivate ? (
+        {app?.isPrivate && !app?.privateAppProperties?.logo ? (
           <LockIcon
             sx={{
               height: "28px",
@@ -51,7 +51,7 @@ const TabComponent = ({ isSelected, app }) => {
               width: "28px",
             }}
             alt={app?.name}
-            src={`${getBaseApiReact()}/arbitrary/THUMBNAIL/${
+            src={app?.privateAppProperties?.logo ? app?.privateAppProperties?.logo :`${getBaseApiReact()}/arbitrary/THUMBNAIL/${
               app?.name
             }/qortal_avatar?async=true`}
           >
diff --git a/src/components/Apps/useHandlePrivateApps.tsx b/src/components/Apps/useHandlePrivateApps.tsx
index 8fce921..eb4dd68 100644
--- a/src/components/Apps/useHandlePrivateApps.tsx
+++ b/src/components/Apps/useHandlePrivateApps.tsx
@@ -8,6 +8,9 @@ import {
   sortablePinnedAppsAtom,
 } from "../../atoms/global";
 import { saveToLocalStorage } from "./AppsNavBarDesktop";
+import { base64ToBlobUrl } from "../../utils/fileReading";
+import { base64ToUint8Array } from "../../qdn/encryption/group-encryption";
+import { uint8ArrayToObject } from "../../backgroundFunctions/encryption";
 
 export const useHandlePrivateApps = () => {
   const [status, setStatus] = useState("");
@@ -58,6 +61,10 @@ export const useHandlePrivateApps = () => {
         }
       );
       if(decryptedData?.error) throw new Error(decryptedData?.error)
+        
+        const convertToUint = base64ToUint8Array(decryptedData)
+        const UintToObject = uint8ArrayToObject(convertToUint)
+        
       if (decryptedData) {
         setInfoSnackCustom({
           type: "info",
@@ -71,7 +78,7 @@ export const useHandlePrivateApps = () => {
           headers: {
             "Content-Type": "text/plain",
           },
-          body: decryptedData,
+          body: UintToObject?.app,
         });
         const previewPath = await response.text();
         setOpenSnackGlobal(false);
@@ -81,12 +88,15 @@ export const useHandlePrivateApps = () => {
           });
         };
 
+        const appName = UintToObject?.name
+        const logo = UintToObject?.logo ? `data:image/png;base64,${UintToObject?.logo}` : null
+
         executeEvent("addTab", {
           data: {
             url: await createEndpoint(previewPath),
             isPreview: true,
             isPrivate: true,
-            privateAppProperties: { ...privateAppProperties },
+            privateAppProperties: { ...privateAppProperties, logo, appName  },
             filePath: "",
             refreshFunc: (tabId) => {
               refreshfunc(tabId);
@@ -101,7 +111,7 @@ export const useHandlePrivateApps = () => {
               {
                 isPrivate: true,
                 isPreview: true,
-                privateAppProperties: { ...privateAppProperties },
+                privateAppProperties: { ...privateAppProperties, logo, appName },
               },
             ];