From 74f14a8392316512f569c9d78b82c28ab95a99e1 Mon Sep 17 00:00:00 2001
From: Gregory Schier
Date: Tue, 18 Feb 2025 21:28:03 -0800
Subject: [PATCH] Tweak some things for launch
---
src-tauri/yaak-license/src/license.rs | 2 +-
src-web/components/RecentGrpcConnectionsDropdown.tsx | 2 +-
src-web/components/RecentHttpResponsesDropdown.tsx | 2 +-
.../components/RecentWebsocketConnectionsDropdown.tsx | 2 +-
src-web/components/Settings/SettingsLicense.tsx | 9 ++-------
src-web/components/core/Banner.tsx | 4 ++--
src-web/components/core/Button.tsx | 2 +-
src-web/components/core/Tabs/Tabs.tsx | 5 ++++-
src-web/lib/theme/window.ts | 4 ++--
9 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src-tauri/yaak-license/src/license.rs b/src-tauri/yaak-license/src/license.rs
index 05473447..2a84043d 100644
--- a/src-tauri/yaak-license/src/license.rs
+++ b/src-tauri/yaak-license/src/license.rs
@@ -11,7 +11,7 @@ use yaak_models::queries::UpdateSource;
const KV_NAMESPACE: &str = "license";
const KV_ACTIVATION_ID_KEY: &str = "activation_id";
-const TRIAL_SECONDS: u64 = 3600 * 24 * 14;
+const TRIAL_SECONDS: u64 = 3600 * 24 * 30;
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
#[serde(rename_all = "camelCase")]
diff --git a/src-web/components/RecentGrpcConnectionsDropdown.tsx b/src-web/components/RecentGrpcConnectionsDropdown.tsx
index 63f7ac24..cd167c9e 100644
--- a/src-web/components/RecentGrpcConnectionsDropdown.tsx
+++ b/src-web/components/RecentGrpcConnectionsDropdown.tsx
@@ -53,7 +53,7 @@ export function RecentGrpcConnectionsDropdown({
diff --git a/src-web/components/RecentHttpResponsesDropdown.tsx b/src-web/components/RecentHttpResponsesDropdown.tsx
index 04ff3a04..0fc41900 100644
--- a/src-web/components/RecentHttpResponsesDropdown.tsx
+++ b/src-web/components/RecentHttpResponsesDropdown.tsx
@@ -81,7 +81,7 @@ export const RecentHttpResponsesDropdown = function ResponsePane({
diff --git a/src-web/components/RecentWebsocketConnectionsDropdown.tsx b/src-web/components/RecentWebsocketConnectionsDropdown.tsx
index fee1b93e..979c0b6b 100644
--- a/src-web/components/RecentWebsocketConnectionsDropdown.tsx
+++ b/src-web/components/RecentWebsocketConnectionsDropdown.tsx
@@ -60,7 +60,7 @@ export function RecentWebsocketConnectionsDropdown({
diff --git a/src-web/components/Settings/SettingsLicense.tsx b/src-web/components/Settings/SettingsLicense.tsx
index 635976b8..7d57d40b 100644
--- a/src-web/components/Settings/SettingsLicense.tsx
+++ b/src-web/components/Settings/SettingsLicense.tsx
@@ -1,5 +1,5 @@
import { useLicense } from '@yaakapp-internal/license';
-import { formatDistanceToNow } from 'date-fns';
+import { formatDistanceToNowStrict } from 'date-fns';
import React, { useState } from 'react';
import { useToggle } from '../../hooks/useToggle';
import { Banner } from '../core/Banner';
@@ -30,7 +30,7 @@ export function SettingsLicense() {
{check.data?.type === 'trialing' && (
- You have {formatDistanceToNow(check.data.end)} remaining on your trial.
+ You have {formatDistanceToNowStrict(check.data.end)} remaining on your trial.
)}
@@ -40,11 +40,6 @@ export function SettingsLicense() {
Learn More
-
- This supports future development and ensures continued growth and improvement. Personal
- use and running the open-source code directly require no license.
-
- ~ Gregory
)}
diff --git a/src-web/components/core/Banner.tsx b/src-web/components/core/Banner.tsx
index 1f33e2b4..7afa055e 100644
--- a/src-web/components/core/Banner.tsx
+++ b/src-web/components/core/Banner.tsx
@@ -14,8 +14,8 @@ export function Banner({ children, className, color }: Props) {
className,
`x-theme-banner--${color}`,
'whitespace-pre-wrap',
- 'border border-dashed border-border bg-surface',
- 'px-3 py-2 rounded select-auto',
+ 'border border-border bg-surface',
+ 'px-4 py-3 rounded-lg select-auto',
'overflow-auto h-auto mb-auto text-text',
)}
>
diff --git a/src-web/components/core/Button.tsx b/src-web/components/core/Button.tsx
index b0da0d72..fb6fd86b 100644
--- a/src-web/components/core/Button.tsx
+++ b/src-web/components/core/Button.tsx
@@ -136,7 +136,7 @@ export const Button = forwardRef(function Button
{children}
{rightSlot && {rightSlot}
}
- {forDropdown && }
+ {forDropdown && }
);
});
diff --git a/src-web/components/core/Tabs/Tabs.tsx b/src-web/components/core/Tabs/Tabs.tsx
index d6909253..1765a9df 100644
--- a/src-web/components/core/Tabs/Tabs.tsx
+++ b/src-web/components/core/Tabs/Tabs.tsx
@@ -121,7 +121,10 @@ export function Tabs({
diff --git a/src-web/lib/theme/window.ts b/src-web/lib/theme/window.ts
index 596fd03e..3f69c486 100644
--- a/src-web/lib/theme/window.ts
+++ b/src-web/lib/theme/window.ts
@@ -113,8 +113,8 @@ function bannerColorVariables(color: YaakColor): Partial {
text: color.lift(0.8),
textSubtle: color.translucify(0.3),
textSubtlest: color,
- surface: color.translucify(0.9),
- border: color.lift(0.3).translucify(0.4),
+ surface: color.translucify(0.95),
+ border: color.lift(0.3).translucify(0.8),
};
}