Merge pull request tonyantony300#127 from Avazbek22/fix/external-links-not-working-125

Fix external links/buttons by using opener plugin

Author: tonyantony300

web-app/src/components/AppFooter.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from '@/i18n'
 import { AppVersion } from './AppVersionPayload'
 import { Separator } from './ui/separator'
 import { Link } from 'react-router-dom'
-//import { Link } from 'react-router-dom'
+import { handleExternalLinkClick } from '@/lib/openExternalUrl'
 
 const CONTACTS = [
 	{
@@ -36,6 +36,7 @@ export function AppFooter() {
 					<a
 						key={contact.link}
 						href={contact.link}
+						onClick={(event) => handleExternalLinkClick(event, contact.link)}
 						target="_blank"
 						rel="noopener noreferrer"
 						aria-label={contact['aria-label']}

web-app/src/components/setting-sidebar/setting-sidebar.tsx

@@ -16,6 +16,7 @@ import { useTranslation } from '../../i18n'
 import { cn } from '../../lib/utils'
 import { LICENSE_LINK, PRIVACY_LINK, VERSION_DISPLAY } from '../../lib/version'
 import { Badge } from '../ui/badge'
+import { handleExternalLinkClick } from '@/lib/openExternalUrl'
 
 function SettingSidebarRoot(props: React.ComponentProps<typeof Sidebar>) {
 	return <Sidebar {...props} />
@@ -118,6 +119,7 @@ function SettingSidebarFooter({
 			<a
 				className="hover:underline hover:text-foreground transition-color"
 				href={PRIVACY_LINK}
+				onClick={(event) => handleExternalLinkClick(event, PRIVACY_LINK)}
 				target="_blank"
 				rel="noopener noreferrer"
 			>
@@ -127,6 +129,7 @@ function SettingSidebarFooter({
 			<a
 				className="hover:underline hover:text-foreground transition-color"
 				href={LICENSE_LINK}
+				onClick={(event) => handleExternalLinkClick(event, LICENSE_LINK)}
 				target="_blank"
 				rel="noopener noreferrer"
 			>

web-app/src/lib/openExternalUrl.ts

@@ -0,0 +1,27 @@
+import { openUrl } from '@tauri-apps/plugin-opener'
+
+export async function openExternalUrl(url: string): Promise<void> {
+	if (IS_TAURI) {
+		await openUrl(url)
+		return
+	}
+
+	const openedWindow = window.open(url, '_blank', 'noopener,noreferrer')
+	if (openedWindow) {
+		openedWindow.opener = null
+	}
+}
+
+export function handleExternalLinkClick(
+	event: { preventDefault: () => void },
+	url: string
+): void {
+	if (!IS_TAURI) {
+		return
+	}
+
+	event.preventDefault()
+	void openExternalUrl(url).catch((error) => {
+		console.error('Failed to open external URL:', error)
+	})
+}

web-app/src/lib/version.ts

@@ -3,6 +3,6 @@ import packageJson from '../../../package.json'
 export const VERSION = packageJson.version
 export const VERSION_DISPLAY = `v${VERSION}`
 export const PRIVACY_LINK =
-	'https://github.com/tonyantony300/alt-sendme/blob/main/PRIVACY'
+	'https://github.com/tonyantony300/alt-sendme/blob/main/PRIVACY.md'
 export const LICENSE_LINK =
 	'https://github.com/tonyantony300/alt-sendme/blob/main/LICENSE'