hyperware-ai · 0x70b1a5 · Jun 7, 2024 · Jun 10, 2024 · Jun 10, 2024 · Jun 12, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,17 +13,34 @@ lib = { path = "lib" }
 
 [workspace]
 members = [
-    "lib", "kinode",
-    "kinode/packages/app_store/app_store", "kinode/packages/app_store/ft_worker",
-    "kinode/packages/app_store/download", "kinode/packages/app_store/install", "kinode/packages/app_store/uninstall",
+    "lib",
+    "kinode",
+    "kinode/packages/app_store/app_store",
+    "kinode/packages/app_store/ft_worker",
+    "kinode/packages/app_store/download",
+    "kinode/packages/app_store/install",
+    "kinode/packages/app_store/uninstall",
     "kinode/packages/chess/chess",
     "kinode/packages/homepage/homepage",
     "kinode/packages/kino_updates/widget",
-    "kinode/packages/kns_indexer/kns_indexer", "kinode/packages/kns_indexer/get_block", "kinode/packages/kns_indexer/state",
+    "kinode/packages/kns_indexer/kns_indexer",
+    "kinode/packages/kns_indexer/get_block",
+    "kinode/packages/kns_indexer/state",
+    "kinode/packages/notify/notify",
     "kinode/packages/settings/settings",
     "kinode/packages/terminal/terminal",
-    "kinode/packages/terminal/alias", "kinode/packages/terminal/cat", "kinode/packages/terminal/echo", "kinode/packages/terminal/hi", "kinode/packages/terminal/kfetch", "kinode/packages/terminal/kill", "kinode/packages/terminal/m", "kinode/packages/terminal/top",
-    "kinode/packages/terminal/namehash_to_name", "kinode/packages/terminal/net_diagnostics", "kinode/packages/terminal/peer", "kinode/packages/terminal/peers",
+    "kinode/packages/terminal/alias",
+    "kinode/packages/terminal/cat",
+    "kinode/packages/terminal/echo",
+    "kinode/packages/terminal/hi",
+    "kinode/packages/terminal/kfetch",
+    "kinode/packages/terminal/kill",
+    "kinode/packages/terminal/m",
+    "kinode/packages/terminal/top",
+    "kinode/packages/terminal/namehash_to_name",
+    "kinode/packages/terminal/net_diagnostics",
+    "kinode/packages/terminal/peer",
+    "kinode/packages/terminal/peers",
     "kinode/packages/tester/tester",
 ]
 default-members = ["lib"]

diff --git a/kinode/packages/app_store/app_store/src/http_api.rs b/kinode/packages/app_store/app_store/src/http_api.rs
@@ -60,6 +60,7 @@ pub fn init_frontend(our: &Address) {
 fn make_widget() -> String {
     return r#"<html>
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>
         * {
             box-sizing: border-box;
@@ -84,7 +85,7 @@ fn make_widget() -> String {
             gap: 0.5rem;
             align-items: center;
             backdrop-filter: saturate(1.25);
-            border-radius: 0.75rem;
+            border-radius: 0.1rem;
             box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
             height: 100vh;
             width: 100vw;
@@ -98,7 +99,7 @@ fn make_widget() -> String {
             display: flex;
             flex-grow: 1;
             align-items: stretch;
-            border-radius: 0.75rem;
+            border-radius: 0.5rem;
             box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
             background-color: rgba(255, 255, 255, 0.1);
             cursor: pointer;

diff --git a/...app_store/pkg/ui/assets/index-I7H8IZID.js → ...app_store/pkg/ui/assets/index--ISnU8mD.js b/...app_store/pkg/ui/assets/index-I7H8IZID.js → ...app_store/pkg/ui/assets/index--ISnU8mD.js
diff --git a/kinode/packages/app_store/pkg/ui/assets/index-fGthT1qI.css b/kinode/packages/app_store/pkg/ui/assets/index-fGthT1qI.css
diff --git a/kinode/packages/app_store/pkg/ui/assets/index-x8quY1Q7.css b/kinode/packages/app_store/pkg/ui/assets/index-x8quY1Q7.css
diff --git a/kinode/packages/app_store/pkg/ui/index.html b/kinode/packages/app_store/pkg/ui/index.html
@@ -14,8 +14,8 @@
   <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport"
     content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1.00001, viewport-fit=cover" />
-  <script type="module" crossorigin src="/main:app_store:sys/assets/index-I7H8IZID.js"></script>
-  <link rel="stylesheet" crossorigin href="/main:app_store:sys/assets/index-fGthT1qI.css">
+  <script type="module" crossorigin src="/main:app_store:sys/assets/index--ISnU8mD.js"></script>
+  <link rel="stylesheet" crossorigin href="/main:app_store:sys/assets/index-x8quY1Q7.css">
 </head>
 
 <body>

diff --git a/kinode/packages/app_store/ui/src/components/AppEntry.tsx b/kinode/packages/app_store/ui/src/components/AppEntry.tsx
@@ -37,12 +37,13 @@ export default function AppEntry({ app, size = "medium", overrideImageSize, show
       }}
     >
       <AppHeader app={app} size={size} overrideImageSize={overrideImageSize} />
-      <div className={classNames("flex items-center", {
+      <div className={classNames("flex", {
+        'items-center': size !== 'large',
+        'items-start': size === 'large',
         'absolute': size !== 'large',
         'top-2 right-2': size !== 'large' && showMoreActions,
         'top-0 right-0': size !== 'large' && !showMoreActions,
         'ml-auto': size === 'large' && isMobile,
-        'min-w-1/5': size === 'large'
       })}>
         <ActionButton
           app={app}
@@ -54,7 +55,13 @@ export default function AppEntry({ app, size = "medium", overrideImageSize, show
             'w-full': size === 'large'
           })}
         />
-        {showMoreActions && <MoreActions app={app} className="self-stretch" />}
+        {showMoreActions && <MoreActions
+          app={app}
+          className={classNames("self-stretch", {
+            'self-start': size === 'large',
+
+          })}
+        />}
       </div>
     </div>
   );

diff --git a/kinode/packages/app_store/ui/src/components/Dropdown.tsx b/kinode/packages/app_store/ui/src/components/Dropdown.tsx
@@ -13,8 +13,8 @@ export default function Dropdown({ ...props }: DropdownProps) {
       unmountOnClose={true}
       className={classNames("relative", props.className)}
       direction='left'
-      menuButton={<MenuButton className="small">
-        <FaEllipsisH className='-mb-1' />
+      menuButton={<MenuButton>
+        <FaEllipsisH className='mb-[3px]' />
       </MenuButton>}
     >
       {props.children}

diff --git a/kinode/packages/app_store/ui/src/components/MoreActions.tsx b/kinode/packages/app_store/ui/src/components/MoreActions.tsx
@@ -17,13 +17,15 @@ export default function MoreActions({ app, className }: MoreActionsProps) {
   const navigate = useNavigate();
 
   const downloaded = Boolean(app.state);
+  const menuClass = "flex flex-col bg-black p-2 rounded-lg relative z-10 border border-orange -mr-[1px]"
 
   if (!downloaded) {
     if (!app.metadata) return <></>;
 
+
     return (
       <Dropdown className={className}>
-        <div className="flex flex-col backdrop-blur-lg bg-black/10 p-2 rounded-lg relative z-10">
+        <div className={menuClass}>
           {app.metadata?.description && (
             <button
               className="my-1 whitespace-nowrap clear"
@@ -48,7 +50,7 @@ export default function MoreActions({ app, className }: MoreActionsProps) {
 
   return (
     <Dropdown className={className}>
-      <div className="flex flex-col p-2 rounded-lg backdrop-blur-lg relative z-10">
+      <div className={menuClass}>
         <button
           className="my-1 whitespace-nowrap clear"
           onClick={() => navigate(`/${APP_DETAILS_PATH}/${appId(app)}`)}

diff --git a/kinode/packages/app_store/ui/src/components/SearchHeader.tsx b/kinode/packages/app_store/ui/src/components/SearchHeader.tsx
@@ -99,8 +99,8 @@ export default function SearchHeader({
         })}
         onClick={() => (isMyAppsPage ? navigate(-1) : navigate(MY_APPS_PATH))}
       >
-        {!isMobile && <span>My Apps</span>}
-        <FaDownload />
+        <span>My Apps</span>
+        {!isMobile && <FaDownload />}
       </button>
     </div>
   );

diff --git a/kinode/packages/app_store/ui/src/components/UpdateButton.tsx b/kinode/packages/app_store/ui/src/components/UpdateButton.tsx
@@ -5,7 +5,7 @@ import Modal from "./Modal";
 import { getAppName } from "../utils/app";
 import Loader from "./Loader";
 import classNames from "classnames";
-import { FaU } from "react-icons/fa6";
+import { FaExclamation } from "react-icons/fa6";
 
 interface UpdateButtonProps extends React.HTMLAttributes<HTMLButtonElement> {
   app: AppInfo;
@@ -61,7 +61,7 @@ export default function UpdateButton({ app, isIcon = false, ...props }: UpdateBu
         })}
         onClick={onClick}
       >
-        {isIcon ? <FaU /> : 'Update'}
+        {isIcon ? <FaExclamation /> : 'Update'}
       </button>
       <Modal show={showModal} hide={() => setShowModal(false)}>
         {loading ? (

diff --git a/kinode/packages/app_store/ui/src/pages/MyAppsPage.tsx b/kinode/packages/app_store/ui/src/pages/MyAppsPage.tsx
@@ -63,11 +63,11 @@ export default function MyAppsPage() { // eslint-disable-line
         'gap-4 max-w-screen': isMobile,
         'gap-8 max-w-[900px]': !isMobile,
       })}>
-      <HomeButton />
+      {!isMobile && <HomeButton />}
       <SearchHeader value={searchQuery} onChange={searchMyApps} />
       <div className="flex justify-between items-center mt-2">
         <h3>My Packages</h3>
-        <button onClick={() => navigate(PUBLISH_PATH)}>
+        <button className="alt" onClick={() => navigate(PUBLISH_PATH)}>
           <FaUpload className="mr-2" />
           Publish Package
         </button>

diff --git a/kinode/packages/app_store/ui/src/pages/StorePage.tsx b/kinode/packages/app_store/ui/src/pages/StorePage.tsx
@@ -11,6 +11,8 @@ import classNames from 'classnames';
 import { FaArrowRotateRight } from "react-icons/fa6";
 import { isMobileCheck } from "../utils/dimensions";
 import HomeButton from "../components/HomeButton";
+import Modal from "../components/Modal";
+import Loader from "../components/Loader";
 
 interface StorePageProps extends PageProps { }
 
@@ -24,6 +26,7 @@ export default function StorePage() {
   const [page, setPage] = useState(1);
   const [tags, setTags] = useState<string[]>([])
   const [launchPaths, setLaunchPaths] = useState<{ [package_name: string]: string }>({})
+  const [isRebuildingIndex, setIsRebuildingIndex] = useState(false);
 
   const pages = useMemo(
     () =>
@@ -97,12 +100,18 @@ export default function StorePage() {
   );
 
   const tryRebuildIndex = useCallback(async () => {
+    if (!window.confirm('Are you sure you want to rebuild the app index? This may take a few seconds.')) {
+      return;
+    }
+
+    setIsRebuildingIndex(true);
     try {
       await rebuildIndex();
-      alert("Index rebuilt successfully.");
       await getListedApps();
     } catch (error) {
       console.error(error);
+    } finally {
+      setIsRebuildingIndex(false);
     }
   }, [rebuildIndex]);
 
@@ -127,6 +136,7 @@ export default function StorePage() {
 
   return (
     <div className={classNames("flex flex-col w-full max-h-screen p-2", {
+      isMobile,
       'gap-4 max-w-screen': isMobile,
       'gap-6 max-w-[900px]': !isMobile
     })}>
@@ -174,41 +184,44 @@ export default function StorePage() {
       </div>
       {!searchQuery && <div className={classNames("flex flex-col", {
         'gap-4': !isMobile,
-        'grow overflow-y-auto gap-2 items-center px-2': isMobile
+        'gap-2 items-center': isMobile
       })}>
         <h2>Featured Apps</h2>
         <div className={classNames("flex gap-2", {
-          'flex-col': isMobile
+          'flex-wrap': isMobile
         })}>
           {listedApps.filter(app => {
             return featuredPackageNames.indexOf(app.package) !== -1
           }).map((app) => (
             <AppEntry
               key={appId(app) + (app.state?.our_version || "")}
-              size={'medium'}
+              size={isMobile ? 'small' : 'medium'}
               app={app}
               launchPath={launchPaths[app.package]}
               className={classNames("grow", {
                 'w-1/4': !isMobile,
-                'w-full': isMobile
+                'w-1/3': isMobile
               })}
             />
           ))}
         </div>
       </div>}
-      <h2>{searchQuery ? 'Search Results' : 'All Apps'}</h2>
-      <div className={classNames("flex flex-col grow overflow-y-auto", {
+      <h2 className={classNames({
+        'text-center': isMobile
+      })}>{searchQuery ? 'Search Results' : 'All Apps'}</h2>
+      <div className={classNames("flex flex-col grow", {
         'gap-2': isMobile,
-        'gap-4': !isMobile,
+        'gap-4 overflow-y-auto': !isMobile,
       })}>
         {displayedApps
           .filter(app => searchQuery ? true : featuredPackageNames.indexOf(app.package) === -1)
           .map(app => <AppEntry
             key={appId(app) + (app.state?.our_version || "")}
-            size='large'
+            size={isMobile ? 'medium' : 'large'}
             app={app}
             className="self-stretch"
             overrideImageSize="medium"
+            showMoreActions={!isMobile}
           />)}
       </div>
       {pages.length > 1 && <div className="flex flex-wrap self-center gap-2">
@@ -234,6 +247,9 @@ export default function StorePage() {
           <FaChevronRight />
         </button>
       </div>}
+      <Modal title="Rebuilding index..." show={isRebuildingIndex} hide={() => { }}>
+        <Loader msg="This may take a few seconds." />
+      </Modal>
     </div>
   );
 }
diff --git a/kinode/packages/app_store/ui/vite.config.ts b/kinode/packages/app_store/ui/vite.config.ts
@@ -82,6 +82,11 @@ export default defineConfig({
         target: PROXY_URL,
         changeOrigin: true,
       },
+      '/api/*': {
+        target: PROXY_URL,
+        changeOrigin: true,
+        rewrite: (path) => path.replace('/api', ''),
+      },
       // '/example': {
       //   target: PROXY_URL,
       //   changeOrigin: true,

diff --git a/kinode/packages/chess/chess/Cargo.lock b/kinode/packages/chess/chess/Cargo.lock