Mention CLI in main dropdown

Author: gschier

crates-tauri/yaak-app/src/lib.rs

@@ -131,11 +131,7 @@ async fn cmd_metadata(app_handle: AppHandle) -> YaakResult<AppMetaData> {
 }
 
 async fn detect_cli_version() -> Option<String> {
-    // Prefer `yaak`, but support the legacy `yaakcli` alias if present.
-    if let Some(version) = detect_cli_version_for_binary("yaak").await {
-        return Some(version);
-    }
-    detect_cli_version_for_binary("yaakcli").await
+    detect_cli_version_for_binary("yaak").await
 }
 
 async fn detect_cli_version_for_binary(program: &str) -> Option<String> {

src-web/components/Settings/SettingsLicense.tsx

@@ -41,11 +41,7 @@ function SettingsLicenseCmp() {
 
       case 'trialing':
         return (
-          <Banner color="info" className="@container flex items-center gap-x-5 max-w-xl">
-            <LocalImage
-              src="static/greg.jpeg"
-              className="hidden @sm:block rounded-full h-14 w-14"
-            />
+          <Banner color="info" className="max-w-lg">
             <p className="w-full">
               <strong>
                 {pluralizeCount('day', differenceInDays(check.data.data.end, new Date()))}
@@ -55,10 +51,6 @@ function SettingsLicenseCmp() {
               <span className="opacity-50">Personal use is always free, forever.</span>
               <Separator className="my-2" />
               <div className="flex flex-wrap items-center gap-x-2 text-sm text-notice">
-                <Link noUnderline href="mailto:support@yaak.app">
-                  Contact Support
-                </Link>
-                <Icon icon="dot" size="sm" color="secondary" />
                 <Link noUnderline href={`https://yaak.app/pricing?s=learn&t=${check.data.status}`}>
                   Learn More
                 </Link>
@@ -69,24 +61,16 @@ function SettingsLicenseCmp() {
 
       case 'personal_use':
         return (
-          <Banner color="notice" className="@container flex items-center gap-x-5 max-w-xl">
-            <LocalImage
-              src="static/greg.jpeg"
-              className="hidden @sm:block rounded-full h-14 w-14"
-            />
+          <Banner color="notice" className="max-w-lg">
             <p className="w-full">
               Your commercial-use trial has ended.
               <br />
               <span className="opacity-50">
-                You may continue using Yaak for personal use free, forever.
+                You may continue using Yaak for personal use only.
                 <br />A license is required for commercial use.
               </span>
               <Separator className="my-2" />
               <div className="flex flex-wrap items-center gap-x-2 text-sm text-notice">
-                <Link noUnderline href="mailto:support@yaak.app">
-                  Contact Support
-                </Link>
-                <Icon icon="dot" size="sm" color="secondary" />
                 <Link noUnderline href={`https://yaak.app/pricing?s=learn&t=${check.data.status}`}>
                   Learn More
                 </Link>

src-web/components/SettingsDropdown.tsx

@@ -64,18 +64,26 @@ export function SettingsDropdown() {
           onSelect: () => openUrl('https://yaak.app/button/new'),
         },
         { type: 'separator', label: `Yaak v${appInfo.version}` },
+        {
+          label: 'Check for Updates',
+          leftSlot: <Icon icon="update" />,
+          hidden: !appInfo.featureUpdater,
+          onSelect: () => checkForUpdates.mutate(),
+        },
         {
           label: 'Purchase License',
           color: 'success',
           hidden: check.data == null || check.data.status === 'active',
           leftSlot: <Icon icon="circle_dollar_sign" />,
-          onSelect: () => openSettings.mutate('license'),
+          rightSlot: <Icon icon="external_link" color="success" className="opacity-60" />,
+          onSelect: () => openUrl('https://yaak.app/pricing'),
         },
         {
-          label: 'Check for Updates',
-          leftSlot: <Icon icon="update" />,
-          hidden: !appInfo.featureUpdater,
-          onSelect: () => checkForUpdates.mutate(),
+          label: 'Install CLI',
+          hidden: appInfo.cliVersion != null,
+          leftSlot: <Icon icon="square_terminal" />,
+          rightSlot: <Icon icon="external_link" color="secondary" />,
+          onSelect: () => openUrl('https://yaak.app/docs/cli'),
         },
         {
           label: 'Feedback',