Mobile Work

This commit is contained in:
Eric Gullickson
2025-09-19 11:33:31 -05:00
parent 040da4c759
commit 3588372cef
7 changed files with 189 additions and 13 deletions

View File

@@ -1,5 +1,6 @@
import { create } from 'zustand'; import { create } from 'zustand';
import { persist, createJSONStorage } from 'zustand/middleware'; import { persist, createJSONStorage } from 'zustand/middleware';
import { safeStorage } from '../utils/safe-storage';
export type MobileScreen = 'Dashboard' | 'Vehicles' | 'Log Fuel' | 'Settings'; export type MobileScreen = 'Dashboard' | 'Vehicles' | 'Log Fuel' | 'Settings';
export type VehicleSubScreen = 'list' | 'detail' | 'add' | 'edit'; export type VehicleSubScreen = 'list' | 'detail' | 'add' | 'edit';
@@ -193,13 +194,20 @@ export const useNavigationStore = create<NavigationState>()(
}), }),
{ {
name: 'motovaultpro-mobile-navigation', name: 'motovaultpro-mobile-navigation',
storage: createJSONStorage(() => localStorage), storage: createJSONStorage(() => safeStorage),
partialize: (state) => ({ partialize: (state) => ({
activeScreen: state.activeScreen, activeScreen: state.activeScreen,
vehicleSubScreen: state.vehicleSubScreen, vehicleSubScreen: state.vehicleSubScreen,
selectedVehicleId: state.selectedVehicleId, selectedVehicleId: state.selectedVehicleId,
formStates: state.formStates, formStates: state.formStates,
}), }),
onRehydrateStorage: () => (state) => {
if (state) {
console.log('[Navigation] State rehydrated successfully');
} else {
console.warn('[Navigation] State rehydration failed, using defaults');
}
},
} }
) )
); );

View File

@@ -5,6 +5,7 @@
import React, { createContext, useContext, useState, useEffect, ReactNode } from 'react'; import React, { createContext, useContext, useState, useEffect, ReactNode } from 'react';
import { UnitSystem, UnitPreferences } from './units.types'; import { UnitSystem, UnitPreferences } from './units.types';
import { safeStorage } from '../utils/safe-storage';
import { import {
formatDistanceBySystem, formatDistanceBySystem,
formatVolumeBySystem, formatVolumeBySystem,
@@ -48,18 +49,26 @@ export const UnitsProvider: React.FC<UnitsProviderProps> = ({
}) => { }) => {
const [unitSystem, setUnitSystem] = useState<UnitSystem>(initialSystem); const [unitSystem, setUnitSystem] = useState<UnitSystem>(initialSystem);
// Load unit preference from localStorage on mount // Load unit preference from storage on mount
useEffect(() => { useEffect(() => {
const stored = localStorage.getItem('motovaultpro-unit-system'); try {
const stored = safeStorage.getItem('motovaultpro-unit-system');
if (stored === 'imperial' || stored === 'metric') { if (stored === 'imperial' || stored === 'metric') {
setUnitSystem(stored); setUnitSystem(stored);
} }
} catch (error) {
console.warn('[Units] Failed to load unit system preference:', error);
}
}, []); }, []);
// Save unit preference to localStorage when changed // Save unit preference to storage when changed
const handleSetUnitSystem = (system: UnitSystem) => { const handleSetUnitSystem = (system: UnitSystem) => {
setUnitSystem(system); setUnitSystem(system);
localStorage.setItem('motovaultpro-unit-system', system); try {
safeStorage.setItem('motovaultpro-unit-system', system);
} catch (error) {
console.warn('[Units] Failed to save unit system preference:', error);
}
}; };
// Generate preferences object based on current system // Generate preferences object based on current system

View File

@@ -0,0 +1,107 @@
/**
* @ai-summary Safe localStorage wrapper for mobile browsers
* @ai-context Prevents errors when localStorage is blocked in mobile browsers
*/
// Safe localStorage wrapper that won't crash on mobile browsers
const createSafeStorage = () => {
let isAvailable = false;
// Test localStorage availability
try {
const testKey = '__motovaultpro_storage_test__';
localStorage.setItem(testKey, 'test');
localStorage.removeItem(testKey);
isAvailable = true;
} catch (error) {
console.warn('[Storage] localStorage not available, using memory fallback:', error);
isAvailable = false;
}
// Memory fallback when localStorage is blocked
const memoryStorage = new Map<string, string>();
return {
getItem: (key: string): string | null => {
try {
if (isAvailable) {
return localStorage.getItem(key);
} else {
return memoryStorage.get(key) || null;
}
} catch (error) {
console.warn('[Storage] getItem failed, using memory fallback:', error);
return memoryStorage.get(key) || null;
}
},
setItem: (key: string, value: string): void => {
try {
if (isAvailable) {
localStorage.setItem(key, value);
} else {
memoryStorage.set(key, value);
}
} catch (error) {
console.warn('[Storage] setItem failed, using memory fallback:', error);
memoryStorage.set(key, value);
}
},
removeItem: (key: string): void => {
try {
if (isAvailable) {
localStorage.removeItem(key);
} else {
memoryStorage.delete(key);
}
} catch (error) {
console.warn('[Storage] removeItem failed, using memory fallback:', error);
memoryStorage.delete(key);
}
},
// For zustand createJSONStorage compatibility
key: (index: number): string | null => {
try {
if (isAvailable) {
return localStorage.key(index);
} else {
const keys = Array.from(memoryStorage.keys());
return keys[index] || null;
}
} catch (error) {
console.warn('[Storage] key access failed:', error);
return null;
}
},
get length(): number {
try {
if (isAvailable) {
return localStorage.length;
} else {
return memoryStorage.size;
}
} catch (error) {
console.warn('[Storage] length access failed:', error);
return 0;
}
},
clear: (): void => {
try {
if (isAvailable) {
localStorage.clear();
} else {
memoryStorage.clear();
}
} catch (error) {
console.warn('[Storage] clear failed:', error);
memoryStorage.clear();
}
}
};
};
export const safeStorage = createSafeStorage();

View File

@@ -1,11 +1,23 @@
import { useQuery } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query';
import { useAuth0 } from '@auth0/auth0-react';
import { fuelLogsApi } from '../api/fuel-logs.api'; import { fuelLogsApi } from '../api/fuel-logs.api';
import { FuelType, FuelGradeOption } from '../types/fuel-logs.types'; import { FuelType, FuelGradeOption } from '../types/fuel-logs.types';
export const useFuelGrades = (fuelType: FuelType) => { export const useFuelGrades = (fuelType: FuelType) => {
const { isAuthenticated, isLoading: authLoading } = useAuth0();
const { data, isLoading, error } = useQuery<FuelGradeOption[]>({ const { data, isLoading, error } = useQuery<FuelGradeOption[]>({
queryKey: ['fuelGrades', fuelType], queryKey: ['fuelGrades', fuelType],
queryFn: () => fuelLogsApi.getFuelGrades(fuelType), queryFn: () => fuelLogsApi.getFuelGrades(fuelType),
enabled: isAuthenticated && !authLoading,
retry: (failureCount, error: any) => {
// Retry 401 errors up to 3 times for mobile auth timing issues
if (error?.response?.status === 401 && failureCount < 3) {
console.log(`[Mobile Auth] Fuel grades API retry ${failureCount + 1}/3 for 401 error`);
return true;
}
return false;
},
retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000),
}); });
return { fuelGrades: data || [], isLoading, error }; return { fuelGrades: data || [], isLoading, error };
}; };

View File

@@ -1,19 +1,40 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { useAuth0 } from '@auth0/auth0-react';
import { fuelLogsApi } from '../api/fuel-logs.api'; import { fuelLogsApi } from '../api/fuel-logs.api';
import { CreateFuelLogRequest, FuelLogResponse, EnhancedFuelStats } from '../types/fuel-logs.types'; import { CreateFuelLogRequest, FuelLogResponse, EnhancedFuelStats } from '../types/fuel-logs.types';
export const useFuelLogs = (vehicleId?: string) => { export const useFuelLogs = (vehicleId?: string) => {
const { isAuthenticated, isLoading } = useAuth0();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const logsQuery = useQuery<FuelLogResponse[]>({ const logsQuery = useQuery<FuelLogResponse[]>({
queryKey: ['fuelLogs', vehicleId || 'all'], queryKey: ['fuelLogs', vehicleId || 'all'],
queryFn: () => (vehicleId ? fuelLogsApi.getFuelLogsByVehicle(vehicleId) : fuelLogsApi.getUserFuelLogs()), queryFn: () => (vehicleId ? fuelLogsApi.getFuelLogsByVehicle(vehicleId) : fuelLogsApi.getUserFuelLogs()),
enabled: isAuthenticated && !isLoading,
retry: (failureCount, error: any) => {
// Retry 401 errors up to 3 times for mobile auth timing issues
if (error?.response?.status === 401 && failureCount < 3) {
console.log(`[Mobile Auth] Fuel logs API retry ${failureCount + 1}/3 for 401 error`);
return true;
}
return false;
},
retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000),
}); });
const statsQuery = useQuery<EnhancedFuelStats>({ const statsQuery = useQuery<EnhancedFuelStats>({
queryKey: ['fuelLogsStats', vehicleId], queryKey: ['fuelLogsStats', vehicleId],
queryFn: () => fuelLogsApi.getVehicleStats(vehicleId!), queryFn: () => fuelLogsApi.getVehicleStats(vehicleId!),
enabled: !!vehicleId, enabled: !!vehicleId && isAuthenticated && !isLoading,
retry: (failureCount, error: any) => {
// Retry 401 errors up to 3 times for mobile auth timing issues
if (error?.response?.status === 401 && failureCount < 3) {
console.log(`[Mobile Auth] Fuel stats API retry ${failureCount + 1}/3 for 401 error`);
return true;
}
return false;
},
retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000),
}); });
const createMutation = useMutation({ const createMutation = useMutation({

View File

@@ -1,4 +1,5 @@
import { useCallback } from 'react'; import { useCallback } from 'react';
import { safeStorage } from '../../../core/utils/safe-storage';
export interface SettingsState { export interface SettingsState {
darkMode: boolean; darkMode: boolean;
@@ -15,19 +16,19 @@ const SETTINGS_STORAGE_KEY = 'motovaultpro-mobile-settings';
export const useSettingsPersistence = () => { export const useSettingsPersistence = () => {
const loadSettings = useCallback((): SettingsState | null => { const loadSettings = useCallback((): SettingsState | null => {
try { try {
const stored = localStorage.getItem(SETTINGS_STORAGE_KEY); const stored = safeStorage.getItem(SETTINGS_STORAGE_KEY);
return stored ? JSON.parse(stored) : null; return stored ? JSON.parse(stored) : null;
} catch (error) { } catch (error) {
console.error('Error loading settings:', error); console.error('[Settings] Error loading settings:', error);
return null; return null;
} }
}, []); }, []);
const saveSettings = useCallback((settings: SettingsState) => { const saveSettings = useCallback((settings: SettingsState) => {
try { try {
localStorage.setItem(SETTINGS_STORAGE_KEY, JSON.stringify(settings)); safeStorage.setItem(SETTINGS_STORAGE_KEY, JSON.stringify(settings));
} catch (error) { } catch (error) {
console.error('Error saving settings:', error); console.error('[Settings] Error saving settings:', error);
} }
}, []); }, []);

View File

@@ -23,6 +23,15 @@ export const useVehicles = () => {
queryKey: ['vehicles'], queryKey: ['vehicles'],
queryFn: vehiclesApi.getAll, queryFn: vehiclesApi.getAll,
enabled: isAuthenticated && !isLoading, enabled: isAuthenticated && !isLoading,
retry: (failureCount, error: any) => {
// Retry 401 errors up to 3 times for mobile auth timing issues
if (error?.response?.status === 401 && failureCount < 3) {
console.log(`[Mobile Auth] API retry ${failureCount + 1}/3 for 401 error`);
return true;
}
return false;
},
retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000),
}); });
}; };
@@ -32,6 +41,15 @@ export const useVehicle = (id: string) => {
queryKey: ['vehicles', id], queryKey: ['vehicles', id],
queryFn: () => vehiclesApi.getById(id), queryFn: () => vehiclesApi.getById(id),
enabled: !!id && isAuthenticated && !isLoading, enabled: !!id && isAuthenticated && !isLoading,
retry: (failureCount, error: any) => {
// Retry 401 errors up to 3 times for mobile auth timing issues
if (error?.response?.status === 401 && failureCount < 3) {
console.log(`[Mobile Auth] API retry ${failureCount + 1}/3 for 401 error`);
return true;
}
return false;
},
retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000),
}); });
}; };