- {/* Header with status */}
-
-
-
-
-
-
-
- Vault Unlocked
-
-
-
- {sync.connectedProviderCount} provider(s) connected
-
-
-
-
-
-
-
-
-
- {/* Provider Cards */}
-
-
Cloud Providers
-
-
}
- isConnected={sync.providers.github.status === 'connected'}
- isSyncing={sync.providers.github.status === 'syncing'}
- account={sync.providers.github.account}
- lastSync={sync.providers.github.lastSync}
- error={sync.providers.github.error}
- onConnect={handleConnectGitHub}
- onDisconnect={() => sync.disconnectProvider('github')}
- onSync={() => handleSync('github')}
- />
-
-
}
- isConnected={sync.providers.google.status === 'connected'}
- isSyncing={sync.providers.google.status === 'syncing'}
- account={sync.providers.google.account}
- lastSync={sync.providers.google.lastSync}
- error={sync.providers.google.error}
- onConnect={handleConnectGoogle}
- onDisconnect={() => sync.disconnectProvider('google')}
- onSync={() => handleSync('google')}
- />
-
-
}
- isConnected={sync.providers.onedrive.status === 'connected'}
- isSyncing={sync.providers.onedrive.status === 'syncing'}
- account={sync.providers.onedrive.account}
- lastSync={sync.providers.onedrive.lastSync}
- error={sync.providers.onedrive.error}
- onConnect={handleConnectOneDrive}
- onDisconnect={() => sync.disconnectProvider('onedrive')}
- onSync={() => handleSync('onedrive')}
- />
-
-
- {/* Sync All Button */}
- {sync.hasAnyConnectedProvider && (
-
- )}
+ const result = await sync.syncToProvider(provider, payload);
- {/* Auto-sync Settings */}
-
-
-
-
Auto-sync
-
- Automatically sync when changes are made
+ if (result.success) {
+ toast.success(`Synced to ${provider}`);
+ } else if (result.conflictDetected) {
+ // Conflict modal will show automatically
+ } else {
+ toast.error(result.error || 'Sync failed', 'Sync failed');
+ }
+ } catch (error) {
+ toast.error(error instanceof Error ? error.message : 'Unknown error', 'Sync error');
+ }
+ };
+
+ // Resolve conflict
+ const handleResolveConflict = async (resolution: 'USE_LOCAL' | 'USE_REMOTE') => {
+ try {
+ const payload = await sync.resolveConflict(resolution);
+ if (payload && resolution === 'USE_REMOTE') {
+ onApplyPayload(payload);
+ toast.success('Downloaded cloud data');
+ } else if (resolution === 'USE_LOCAL') {
+ // Re-sync with local data
+ const localPayload = onBuildPayload();
+ await sync.syncNow(localPayload);
+ toast.success('Uploaded local data');
+ }
+ setShowConflictModal(false);
+ } catch (error) {
+ toast.error(error instanceof Error ? error.message : 'Unknown error', 'Conflict resolution failed');
+ }
+ };
+
+ return (
+
+ {/* Header with status */}
+
+
+
+
+
+
+
+ Vault Unlocked
+
+
+
+ {sync.connectedProviderCount} provider(s) connected
+
+
+
+
+
+
+
-
-
sync.setAutoSync(enabled)}
- />
+
+ {/* Provider Cards */}
+
+
Cloud Providers
+
+
}
+ isConnected={sync.providers.github.status === 'connected'}
+ isSyncing={sync.providers.github.status === 'syncing'}
+ account={sync.providers.github.account}
+ lastSync={sync.providers.github.lastSync}
+ error={sync.providers.github.error}
+ onConnect={handleConnectGitHub}
+ onDisconnect={() => sync.disconnectProvider('github')}
+ onSync={() => handleSync('github')}
+ />
+
+
}
+ isConnected={sync.providers.google.status === 'connected'}
+ isSyncing={sync.providers.google.status === 'syncing'}
+ account={sync.providers.google.account}
+ lastSync={sync.providers.google.lastSync}
+ error={sync.providers.google.error}
+ onConnect={handleConnectGoogle}
+ onDisconnect={() => sync.disconnectProvider('google')}
+ onSync={() => handleSync('google')}
+ />
+
+
}
+ isConnected={sync.providers.onedrive.status === 'connected'}
+ isSyncing={sync.providers.onedrive.status === 'syncing'}
+ account={sync.providers.onedrive.account}
+ lastSync={sync.providers.onedrive.lastSync}
+ error={sync.providers.onedrive.error}
+ onConnect={handleConnectOneDrive}
+ onDisconnect={() => sync.disconnectProvider('onedrive')}
+ onSync={() => handleSync('onedrive')}
+ />
+
+
+ {/* Sync All Button */}
+ {sync.hasAnyConnectedProvider && (
+
+ )}
+
+ {/* Auto-sync Settings */}
+
+
+
+
Auto-sync
+
+ Automatically sync when changes are made
+
+
+
sync.setAutoSync(enabled)}
+ />
+
+
+
+ {/* Modals */}
+ {
+ setShowGitHubModal(false);
+ setIsPollingGitHub(false);
+ }}
+ />
+
+ setShowConflictModal(false)}
+ />
-
-
- {/* Modals */}
-
{
- setShowGitHubModal(false);
- setIsPollingGitHub(false);
- }}
- />
-
- setShowConflictModal(false)}
- />
-
- );
+ );
};
// ============================================================================
@@ -910,24 +910,24 @@ export const SyncDashboard: React.FC
= ({
// ============================================================================
interface CloudSyncSettingsProps {
- onBuildPayload: () => SyncPayload;
- onApplyPayload: (payload: SyncPayload) => void;
+ onBuildPayload: () => SyncPayload;
+ onApplyPayload: (payload: SyncPayload) => void;
}
export const CloudSyncSettings: React.FC = (props) => {
- const { securityState } = useCloudSync();
- const [justSetup, setJustSetup] = useState(false);
+ const { securityState } = useCloudSync();
+ const [justSetup, setJustSetup] = useState(false);
- // Show appropriate screen based on security state
- if (securityState === 'NO_KEY') {
- return setJustSetup(true)} />;
- }
+ // Show appropriate screen based on security state
+ if (securityState === 'NO_KEY') {
+ return setJustSetup(true)} />;
+ }
- if (securityState === 'LOCKED' && !justSetup) {
- return {}} />;
- }
+ if (securityState === 'LOCKED' && !justSetup) {
+ return { }} />;
+ }
- return ;
+ return ;
};
export default CloudSyncSettings;
diff --git a/components/SyncStatusButton.tsx b/components/SyncStatusButton.tsx
index 17984c379..ada60f77a 100644
--- a/components/SyncStatusButton.tsx
+++ b/components/SyncStatusButton.tsx
@@ -13,25 +13,25 @@
import React, { useState } from 'react';
import {
- CloudOff,
- Github,
- Loader2,
- Lock,
- RefreshCw,
- Settings,
- Shield,
- ShieldAlert,
- ShieldCheck,
- Unlock,
+ CloudOff,
+ Github,
+ Loader2,
+ Lock,
+ RefreshCw,
+ Settings,
+ Shield,
+ ShieldAlert,
+ ShieldCheck,
+ Unlock,
} from 'lucide-react';
import { useCloudSync, useSecurityState } from '../application/state/useCloudSync';
import type { CloudProvider } from '../domain/sync';
import { cn } from '../lib/utils';
import { Button } from './ui/button';
import {
- Popover,
- PopoverContent,
- PopoverTrigger,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
} from './ui/popover';
// ============================================================================
@@ -39,21 +39,21 @@ import {
// ============================================================================
const GoogleDriveIcon: React.FC<{ className?: string }> = ({ className }) => (
-
+
);
const OneDriveIcon: React.FC<{ className?: string }> = ({ className }) => (
-
+
);
const providerIcons: Record = {
- github: ,
- google: ,
- onedrive: ,
+ github: ,
+ google: ,
+ onedrive: ,
};
// ============================================================================
@@ -61,31 +61,31 @@ const providerIcons: Record = {
// ============================================================================
interface StatusIndicatorProps {
- status: 'synced' | 'syncing' | 'error' | 'locked' | 'setup' | 'none';
- size?: 'sm' | 'md';
- className?: string;
+ status: 'synced' | 'syncing' | 'error' | 'locked' | 'setup' | 'none';
+ size?: 'sm' | 'md';
+ className?: string;
}
const StatusIndicator: React.FC = ({ status, size = 'sm', className }) => {
- const sizeClass = size === 'sm' ? 'w-2 h-2' : 'w-2.5 h-2.5';
-
- const baseClasses = cn(
- 'rounded-full',
- sizeClass,
- status === 'syncing' && 'animate-pulse',
- className
- );
-
- const colors = {
- synced: 'bg-green-500',
- syncing: 'bg-blue-500',
- error: 'bg-red-500',
- locked: 'bg-amber-500',
- setup: 'bg-muted-foreground/50',
- none: 'bg-muted-foreground/30',
- };
-
- return ;
+ const sizeClass = size === 'sm' ? 'w-2 h-2' : 'w-2.5 h-2.5';
+
+ const baseClasses = cn(
+ 'rounded-full',
+ sizeClass,
+ status === 'syncing' && 'animate-pulse',
+ className
+ );
+
+ const colors = {
+ synced: 'bg-green-500',
+ syncing: 'bg-blue-500',
+ error: 'bg-red-500',
+ locked: 'bg-amber-500',
+ setup: 'bg-muted-foreground/50',
+ none: 'bg-muted-foreground/30',
+ };
+
+ return ;
};
// ============================================================================
@@ -93,82 +93,82 @@ const StatusIndicator: React.FC = ({ status, size = 'sm',
// ============================================================================
interface ProviderRowProps {
- provider: CloudProvider;
- name: string;
- isConnected: boolean;
- isSyncing: boolean;
- lastSync?: number;
- avatarUrl?: string;
- error?: string;
- onSync: () => void;
+ provider: CloudProvider;
+ name: string;
+ isConnected: boolean;
+ isSyncing: boolean;
+ lastSync?: number;
+ avatarUrl?: string;
+ error?: string;
+ onSync: () => void;
}
const ProviderRow: React.FC = ({
- provider,
- name,
- isConnected,
- isSyncing,
- lastSync,
- avatarUrl,
- error,
- onSync,
+ provider,
+ name,
+ isConnected,
+ isSyncing,
+ lastSync,
+ avatarUrl,
+ error,
+ onSync,
}) => {
- const formatTime = (timestamp?: number): string => {
- if (!timestamp) return 'Never';
- const diff = Date.now() - timestamp;
- if (diff < 60000) return 'Just now';
- if (diff < 3600000) return `${Math.floor(diff / 60000)}m ago`;
- return new Date(timestamp).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
- };
+ const formatTime = (timestamp?: number): string => {
+ if (!timestamp) return 'Never';
+ const diff = Date.now() - timestamp;
+ if (diff < 60000) return 'Just now';
+ if (diff < 3600000) return `${Math.floor(diff / 60000)}m ago`;
+ return new Date(timestamp).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
+ };
- return (
-
-
- {providerIcons[provider]}
-
-
-
-
- {name}
- {isConnected && (
-
- )}
-
- {isConnected ? (
-
- {avatarUrl && (
-

+ return (
+
+
+ {providerIcons[provider]}
+
+
+
+
+ {name}
+ {isConnected && (
+
+ )}
+
+ {isConnected ? (
+
+ {avatarUrl && (
+

+ )}
+
+ {formatTime(lastSync)}
+
+
+ ) : (
+
Not connected
+ )}
+
+
+ {isConnected && (
+
)}
-
- {formatTime(lastSync)}
-
-
- ) : (
-
Not connected
- )}
-
-
- {isConnected && (
-
- )}
-
- );
+
+ );
};
// ============================================================================
@@ -176,248 +176,248 @@ const ProviderRow: React.FC = ({
// ============================================================================
interface SyncStatusButtonProps {
- onOpenSettings?: () => void;
- className?: string;
+ onOpenSettings?: () => void;
+ className?: string;
}
export const SyncStatusButton: React.FC = ({
- onOpenSettings,
- className,
+ onOpenSettings,
+ className,
}) => {
- const [isOpen, setIsOpen] = useState(false);
- const { isLocked, hasNoKey } = useSecurityState();
- const sync = useCloudSync();
+ const [isOpen, setIsOpen] = useState(false);
+ const { isLocked, hasNoKey } = useSecurityState();
+ const sync = useCloudSync();
- // Determine overall status for the button indicator
- const getOverallStatus = (): StatusIndicatorProps['status'] => {
- if (hasNoKey) return 'setup';
- if (isLocked) return 'locked';
- if (sync.isSyncing) return 'syncing';
- if (sync.lastError) return 'error';
- if (sync.hasAnyConnectedProvider) return 'synced';
- return 'none';
- };
+ // Determine overall status for the button indicator
+ const getOverallStatus = (): StatusIndicatorProps['status'] => {
+ if (hasNoKey) return 'setup';
+ if (isLocked) return 'locked';
+ if (sync.isSyncing) return 'syncing';
+ if (sync.lastError) return 'error';
+ if (sync.hasAnyConnectedProvider) return 'synced';
+ return 'none';
+ };
- const overallStatus = getOverallStatus();
+ const overallStatus = getOverallStatus();
- // Get the button icon based on state
- const getButtonIcon = () => {
- if (hasNoKey) return ;
- if (isLocked) return ;
- if (sync.isSyncing) return ;
- if (sync.lastError) return ;
- if (sync.hasAnyConnectedProvider) return ;
- return ;
- };
+ // Get the button icon based on state
+ const getButtonIcon = () => {
+ if (hasNoKey) return ;
+ if (isLocked) return ;
+ if (sync.isSyncing) return ;
+ if (sync.lastError) return ;
+ if (sync.hasAnyConnectedProvider) return ;
+ return ;
+ };
- // Handle sync for a specific provider
- const handleSync = async (provider: CloudProvider) => {
- // This would need the payload from the app - for now just trigger sync state
- // In real implementation, this should call through to the app's sync handler
- console.log('Sync requested for:', provider);
- };
+ // Handle sync for a specific provider
+ const handleSync = async (provider: CloudProvider) => {
+ // This would need the payload from the app - for now just trigger sync state
+ // In real implementation, this should call through to the app's sync handler
+ console.log('Sync requested for:', provider);
+ };
- return (
-
-
-
-
-
-
- {/* Header */}
-
-
-
- {overallStatus === 'synced' && (
-
- )}
- {overallStatus === 'syncing' && (
-
- )}
- {overallStatus === 'error' && (
-
- )}
- {overallStatus === 'locked' && (
-
- )}
- {(overallStatus === 'setup' || overallStatus === 'none') && (
-
- )}
-
-
- {overallStatus === 'synced' && 'Synced'}
- {overallStatus === 'syncing' && 'Syncing...'}
- {overallStatus === 'error' && 'Sync Error'}
- {overallStatus === 'locked' && 'Vault Locked'}
- {overallStatus === 'setup' && 'Setup Required'}
- {overallStatus === 'none' && 'Not Connected'}
-
-
-
- {onOpenSettings && (
-
- )}
-
-
- {sync.deviceName && overallStatus !== 'setup' && (
-
- {sync.deviceName}
-
- )}
-
+ return (
+
+
+