Merge branch 'qrcode-reboot' into trent-tweaks

- Move type definitions from src/types/ to src/interfaces/ for better organization
- Enhance deep linking type system documentation with detailed examples
- Update package dependencies to latest versions
- Improve code organization in README.md
- Fix formatting in WebPlatformService.ts

This change consolidates all type definitions into the interfaces folder,
improves type safety documentation, and updates dependencies for better
maintainability. The deep linking system now has clearer documentation
about its type system and validation approach.

Breaking: Removes src/types/ directory in favor of src/interfaces/

.cursor/rules/architectural_decision_record.mdc

@@ -0,0 +1,292 @@
+---
+description: 
+globs: 
+alwaysApply: true
+---
+# TimeSafari Cross-Platform Architecture Guide
+
+## 1. Platform Support Matrix
+
+| Feature | Web (PWA) | Capacitor (Mobile) | Electron (Desktop) | PyWebView (Desktop) |
+|---------|-----------|-------------------|-------------------|-------------------|
+| QR Code Scanning | WebInlineQRScanner | @capacitor-mlkit/barcode-scanning | Not Implemented | Not Implemented |
+| Deep Linking | URL Parameters | App URL Open Events | Not Implemented | Not Implemented |
+| File System | Limited (Browser API) | Capacitor Filesystem | Electron fs | PyWebView Python Bridge |
+| Camera Access | MediaDevices API | Capacitor Camera | Not Implemented | Not Implemented |
+| Platform Detection | Web APIs | Capacitor.isNativePlatform() | process.env checks | process.env checks |
+
+## 2. Project Structure
+
+### 2.1 Core Directories
+```
+src/
+├── components/     # Vue components
+├── services/       # Platform services and business logic
+├── views/         # Page components
+├── router/        # Vue router configuration
+├── types/         # TypeScript type definitions
+├── utils/         # Utility functions
+├── lib/           # Core libraries
+├── platforms/     # Platform-specific implementations
+├── electron/      # Electron-specific code
+├── constants/     # Application constants
+├── db/           # Database related code
+├── interfaces/    # TypeScript interfaces and type definitions
+└── assets/        # Static assets
+```
+
+### 2.2 Entry Points
+```
+src/
+├── main.ts              # Base entry
+├── main.common.ts       # Shared initialization
+├── main.capacitor.ts    # Mobile entry
+├── main.electron.ts     # Electron entry
+├── main.pywebview.ts    # PyWebView entry
+└── main.web.ts          # Web/PWA entry
+```
+
+### 2.3 Build Configurations
+```
+root/
+├── vite.config.common.mts    # Shared config
+├── vite.config.capacitor.mts # Mobile build
+├── vite.config.electron.mts  # Electron build
+├── vite.config.pywebview.mts # PyWebView build
+├── vite.config.web.mts      # Web/PWA build
+└── vite.config.utils.mts    # Build utilities
+```
+
+## 3. Service Architecture
+
+### 3.1 Service Organization
+```
+services/
+├── QRScanner/           # QR code scanning service
+│   ├── WebInlineQRScanner.ts
+│   └── interfaces.ts
+├── platforms/          # Platform-specific services
+│   ├── WebPlatformService.ts
+│   ├── CapacitorPlatformService.ts
+│   ├── ElectronPlatformService.ts
+│   └── PyWebViewPlatformService.ts
+└── factory/           # Service factories
+    └── PlatformServiceFactory.ts
+```
+
+### 3.2 Service Factory Pattern
+```typescript
+// PlatformServiceFactory.ts
+export class PlatformServiceFactory {
+  private static instance: PlatformService | null = null;
+
+  public static getInstance(): PlatformService {
+    if (!PlatformServiceFactory.instance) {
+      const platform = process.env.VITE_PLATFORM || "web";
+      PlatformServiceFactory.instance = createPlatformService(platform);
+    }
+    return PlatformServiceFactory.instance;
+  }
+}
+```
+
+## 4. Feature Implementation Guidelines
+
+### 4.1 QR Code Scanning
+
+1. **Service Interface**
+```typescript
+interface QRScannerService {
+  checkPermissions(): Promise<boolean>;
+  requestPermissions(): Promise<boolean>;
+  isSupported(): Promise<boolean>;
+  startScan(): Promise<void>;
+  stopScan(): Promise<void>;
+  addListener(listener: ScanListener): void;
+  onStream(callback: (stream: MediaStream | null) => void): void;
+  cleanup(): Promise<void>;
+}
+```
+
+2. **Platform-Specific Implementation**
+```typescript
+// WebInlineQRScanner.ts
+export class WebInlineQRScanner implements QRScannerService {
+  private scanListener: ScanListener | null = null;
+  private isScanning = false;
+  private stream: MediaStream | null = null;
+  private events = new EventEmitter();
+
+  // Implementation of interface methods
+}
+```
+
+### 4.2 Deep Linking
+
+1. **URL Structure**
+```typescript
+// Format: timesafari://<route>[/<param>][?queryParam1=value1]
+interface DeepLinkParams {
+  route: string;
+  params?: Record<string, string>;
+  query?: Record<string, string>;
+}
+```
+
+2. **Platform Handlers**
+```typescript
+// Capacitor
+App.addListener("appUrlOpen", handleDeepLink);
+
+// Web
+router.beforeEach((to, from, next) => {
+  handleWebDeepLink(to.query);
+});
+```
+
+## 5. Build Process
+
+### 5.1 Environment Configuration
+```typescript
+// vite.config.common.mts
+export function createBuildConfig(mode: string) {
+  return {
+    define: {
+      'process.env.VITE_PLATFORM': JSON.stringify(mode),
+      'process.env.VITE_PWA_ENABLED': JSON.stringify(!isNative),
+      __IS_MOBILE__: JSON.stringify(isCapacitor),
+      __USE_QR_READER__: JSON.stringify(!isCapacitor)
+    }
+  };
+}
+```
+
+### 5.2 Platform-Specific Builds
+
+```bash
+# Build commands from package.json
+"build:web": "vite build --config vite.config.web.mts",
+"build:capacitor": "vite build --config vite.config.capacitor.mts",
+"build:electron": "vite build --config vite.config.electron.mts",
+"build:pywebview": "vite build --config vite.config.pywebview.mts"
+```
+
+## 6. Testing Strategy
+
+### 6.1 Test Configuration
+```typescript
+// playwright.config-local.ts
+const config: PlaywrightTestConfig = {
+  projects: [
+    {
+      name: 'web',
+      use: { browserName: 'chromium' }
+    },
+    {
+      name: 'mobile',
+      use: { ...devices['Pixel 5'] }
+    }
+  ]
+};
+```
+
+### 6.2 Platform-Specific Tests
+```typescript
+test('QR scanning works on mobile', async ({ page }) => {
+  test.skip(!process.env.MOBILE_TEST, 'Mobile-only test');
+  // Test implementation
+});
+```
+
+## 7. Error Handling
+
+### 7.1 Global Error Handler
+```typescript
+function setupGlobalErrorHandler(app: VueApp) {
+  app.config.errorHandler = (err, instance, info) => {
+    logger.error("[App Error]", {
+      error: err,
+      info,
+      component: instance?.$options.name
+    });
+  };
+}
+```
+
+### 7.2 Platform-Specific Error Handling
+```typescript
+// API error handling for Capacitor
+if (process.env.VITE_PLATFORM === 'capacitor') {
+  logger.error(`[Capacitor API Error] ${endpoint}:`, {
+    message: error.message,
+    status: error.response?.status
+  });
+}
+```
+
+## 8. Best Practices
+
+### 8.1 Code Organization
+- Use platform-specific directories for unique implementations
+- Share common code through service interfaces
+- Implement feature detection before using platform capabilities
+- Keep platform-specific code isolated in dedicated directories
+- Use TypeScript interfaces for cross-platform compatibility
+
+### 8.2 Platform Detection
+```typescript
+const platformService = PlatformServiceFactory.getInstance();
+const capabilities = platformService.getCapabilities();
+
+if (capabilities.hasCamera) {
+  // Implement camera features
+}
+```
+
+### 8.3 Feature Implementation
+1. Define platform-agnostic interface
+2. Create platform-specific implementations
+3. Use factory pattern for instantiation
+4. Implement graceful fallbacks
+5. Add comprehensive error handling
+6. Use dependency injection for better testability
+
+## 9. Dependency Management
+
+### 9.1 Platform-Specific Dependencies
+```json
+{
+  "dependencies": {
+    "@capacitor/core": "^6.2.0",
+    "electron": "^33.2.1",
+    "vue": "^3.4.0"
+  }
+}
+```
+
+### 9.2 Conditional Loading
+```typescript
+if (process.env.VITE_PLATFORM === 'capacitor') {
+  await import('@capacitor/core');
+}
+```
+
+## 10. Security Considerations
+
+### 10.1 Permission Handling
+```typescript
+async checkPermissions(): Promise<boolean> {
+  if (platformService.isCapacitor()) {
+    return await checkNativePermissions();
+  }
+  return await checkWebPermissions();
+}
+```
+
+### 10.2 Data Storage
+- Use secure storage mechanisms for sensitive data
+- Implement proper encryption for stored data
+- Follow platform-specific security guidelines
+- Regular security audits and updates
+
+This document should be updated as new features are added or platform-specific implementations change. Regular reviews ensure it remains current with the codebase.

.cursor/rules/crowd-funder-for-time-pwa/docs/camera-implementation.mdc

@@ -0,0 +1,222 @@
+---
+description: 
+globs: 
+alwaysApply: true
+---
+# Camera Implementation Documentation
+
+## Overview
+
+This document describes how camera functionality is implemented across the TimeSafari application. The application uses cameras for two main purposes:
+
+1. QR Code scanning
+2. Photo capture
+
+## Components
+
+### QRScannerDialog.vue
+
+Primary component for QR code scanning in web browsers.
+
+**Key Features:**
+
+- Uses `qrcode-stream` for web-based QR scanning
+- Supports both front and back cameras
+- Provides real-time camera status feedback
+- Implements error handling with user-friendly messages
+- Includes camera switching functionality
+
+**Camera Access Flow:**
+
+1. Checks for camera API availability
+2. Enumerates available video devices
+3. Requests camera permissions
+4. Initializes camera stream with preferred settings
+5. Handles various error conditions with specific messages
+
+### PhotoDialog.vue
+
+Component for photo capture and selection.
+
+**Key Features:**
+
+- Cross-platform photo capture interface
+- Image cropping capabilities
+- File selection fallback
+- Unified interface for different platforms
+
+## Services
+
+### QRScanner Services
+
+#### WebDialogQRScanner
+
+Web-based implementation of QR scanning.
+
+**Key Methods:**
+
+- `checkPermissions()`: Verifies camera permission status
+- `requestPermissions()`: Requests camera access
+- `isSupported()`: Checks for camera API support
+- Handles various error conditions with specific messages
+
+#### CapacitorQRScanner
+
+Native implementation using Capacitor's MLKit.
+
+**Key Features:**
+
+- Uses `@capacitor-mlkit/barcode-scanning`
+- Supports both front and back cameras
+- Implements permission management
+- Provides continuous scanning capability
+
+### Platform Services
+
+#### WebPlatformService
+
+Web-specific implementation of platform features.
+
+**Camera Capabilities:**
+
+- Uses HTML5 file input with capture attribute
+- Falls back to file selection if camera unavailable
+- Processes captured images for consistent format
+
+#### CapacitorPlatformService
+
+Native implementation using Capacitor.
+
+**Camera Features:**
+
+- Uses `Camera.getPhoto()` for native camera access
+- Supports image editing
+- Configures high-quality image capture
+- Handles base64 image processing
+
+#### ElectronPlatformService
+
+Desktop implementation (currently unimplemented).
+
+**Status:**
+
+- Camera functionality not yet implemented
+- Planned to use Electron's media APIs
+
+## Platform-Specific Considerations
+
+### iOS
+
+- Requires `NSCameraUsageDescription` in Info.plist
+- Supports both front and back cameras
+- Implements proper permission handling
+
+### Android
+
+- Requires camera permissions in manifest
+- Supports both front and back cameras
+- Handles permission requests through Capacitor
+
+### Web
+
+- Requires HTTPS for camera access
+- Implements fallback mechanisms
+- Handles browser compatibility issues
+
+## Error Handling
+
+### Common Error Scenarios
+
+1. No camera found
+2. Permission denied
+3. Camera in use by another application
+4. HTTPS required
+5. Browser compatibility issues
+
+### Error Response
+
+- User-friendly error messages
+- Troubleshooting tips
+- Clear instructions for resolution
+- Platform-specific guidance
+
+## Security Considerations
+
+### Permission Management
+
+- Explicit permission requests
+- Permission state tracking
+- Graceful handling of denied permissions
+
+### Data Handling
+
+- Secure image processing
+- Proper cleanup of camera resources
+- No persistent storage of camera data
+
+## Best Practices
+
+### Camera Access
+
+1. Always check for camera availability
+2. Request permissions explicitly
+3. Handle all error conditions
+4. Provide clear user feedback
+5. Implement proper cleanup
+
+### Performance
+
+1. Optimize camera resolution
+2. Implement proper resource cleanup
+3. Handle camera switching efficiently
+4. Manage memory usage
+
+### User Experience
+
+1. Clear status indicators
+2. Intuitive camera controls
+3. Helpful error messages
+4. Smooth camera switching
+5. Responsive UI feedback
+
+## Future Improvements
+
+### Planned Enhancements
+
+1. Implement Electron camera support
+2. Add advanced camera features
+3. Improve error handling
+4. Enhance user feedback
+5. Optimize performance
+
+### Known Issues
+
+1. Electron camera implementation pending
+2. Some browser compatibility limitations
+3. Platform-specific quirks to address
+
+## Dependencies
+
+### Key Packages
+
+- `@capacitor-mlkit/barcode-scanning`
+- `qrcode-stream`
+- `vue-picture-cropper`
+- Platform-specific camera APIs
+
+## Testing
+
+### Test Scenarios
+
+1. Permission handling
+2. Camera switching
+3. Error conditions
+4. Platform compatibility
+5. Performance metrics
+
+### Test Environment
+
+- Multiple browsers
+- iOS and Android devices
+- Desktop platforms
+- Various network conditions 

.cursor/rules/timesafari.mdc

@@ -0,0 +1,276 @@
+---
+description: 
+globs: 
+alwaysApply: true
+---
+---
+description: 
+globs: 
+alwaysApply: true
+---
+# Time Safari Context
+
+## Project Overview
+
+Time Safari is an application designed to foster community building through gifts, gratitude, and collaborative projects. The app should make it extremely easy and intuitive for users of any age and capability to recognize contributions, build trust networks, and organize collective action. It is built on services that preserve privacy and data sovereignty.
+
+The ultimate goals of Time Safari are two-fold:
+
+1. **Connect** Make it easy, rewarding, and non-threatening for people to connect with others who have similar interests, and to initiate activities together. This helps people accomplish and learn from other individuals in less-structured environments; moreover, it helps them discover who they want to continue to support and with whom they want to maintain relationships.
+
+2. **Reveal** Widely advertise the great support and rewards that are being given and accepted freely, especially non-monetary ones. Using visuals and text, display the kind of impact that gifts are making in the lives of others. Also show useful and engaging reports of project statistics and personal accomplishments.
+
+
+## Core Approaches
+
+Time Safari should help everyday users build meaningful connections and organize collective efforts by:
+
+1. **Recognizing Contributions**: Creating permanent, verifiable records of gifts and contributions people give to each other and their communities.
+
+2. **Facilitating Collaboration**: Making it ridiculously easy for people to ask for or propose help on projects and interests that matter to them.
+
+3. **Building Trust Networks**: Enabling users to maintain their network and activity visibility. Developing reputation through verified contributions and references, which can be selectively shown to others outside the network.
+
+4. **Preserving Privacy**: Ensuring personal identifiers are only shared with explicitly authorized contacts, allowing private individuals including children to participate safely.
+
+5. **Engaging Content**: Displaying people's records in compelling stories, and highlighting those projects that are lifting people's lives long-term, both in physical support and in emotional-spiritual-creative thriving.
+
+
+## Technical Foundation
+
+This application is built on a privacy-preserving claims architecture (via endorser.ch) with these key characteristics:
+
+- **Decentralized Identifiers (DIDs)**: User identities are based on public/private key pairs stored on their devices
+- **Cryptographic Verification**: All claims and confirmations are cryptographically signed
+- **User-Controlled Visibility**: Users explicitly control who can see their identifiers and data
+- **Merkle-Chained Claims**: Claims are cryptographically chained for verification and integrity
+- **Native and Web App**: Works on Capacitor (iOS, Android), Desktop (Electron and CEFPython), and web browsers
+
+## User Journey
+
+The typical progression of usage follows these stages:
+
+1. **Gratitude & Recognition**: Users begin by expressing and recording gratitude for gifts received, building a foundation of acknowledgment.
+
+2. **Project Proposals**: Users propose projects and ideas, reaching out to connect with others who share similar interests.
+
+3. **Action Triggers**: Offers of help serve as triggers and motivations to execute proposed projects, moving from ideas to action.
+
+## Context for LLM Development
+
+When developing new functionality for Time Safari, consider these design principles:
+
+1. **Accessibility First**: Features should be usable by non-technical users with minimal learning curve.
+
+2. **Privacy by Design**: All features must respect user privacy and data sovereignty.
+
+3. **Progressive Enhancement**: Core functionality should work across all devices, with richer experiences where supported.
+
+4. **Voluntary Collaboration**: The system should enable but never coerce participation.
+
+5. **Trust Building**: Features should help build verifiable trust between users.
+
+6. **Network Effects**: Consider how features scale as more users join the platform.
+
+7. **Low Resource Requirements**: The system should be lightweight enough to run on inexpensive devices users already own.
+
+## Use Cases to Support
+
+LLM development should focus on enhancing these key use cases:
+
+1. **Community Building**: Tools that help people find others with shared interests and values.
+
+2. **Project Coordination**: Features that make it easy to propose collaborative projects and to submit suggestions and offers to existing ones.
+
+3. **Reputation Building**: Methods for users to showcase their contributions and reliability, in contexts where they explicitly reveal that information.
+
+4. **Governance Experimentation**: Features that facilitate decision-making and collective governance.
+
+## Constraints
+
+When developing new features, be mindful of these constraints:
+
+1. **Privacy Preservation**: User identifiers must remain private except when explicitly shared.
+
+2. **Platform Limitations**: Features must work within the constraints of the target app platforms, while aiming to leverage the best platform technology available.
+
+3. **Endorser API Limitations**: Backend features are constrained by the endorser.ch API capabilities.
+
+4. **Performance on Low-End Devices**: The application should remain performant on older/simpler devices.
+
+5. **Offline-First When Possible**: Key functionality should work offline when feasible.
+
+## Project Technologies
+
+- Typescript using ES6 classes using vue-facing-decorator
+- TailwindCSS
+- Vite Build Tool
+- Playwright E2E testing
+- IndexDB
+- Camera, Image uploads, QR Code reader, ...
+
+## Mobile Features
+
+- Deep Linking
+- Local Notifications via a custom Capacitor plugin
+
+## Project Architecture
+
+- The application must work on web browser, PWA (Progressive Web Application), desktop via Electron, and mobile via Capacitor
+- Building for each platform is managed via Vite
+
+## Core Development Principles
+
+### DRY development
+- **Code Reuse**
+  - Extract common functionality into utility functions
+  - Create reusable components for UI patterns
+  - Implement service classes for shared business logic
+  - Use mixins for cross-cutting concerns
+  - Leverage TypeScript interfaces for shared type definitions
+
+- **Component Patterns**
+  - Create base components for common UI elements
+  - Implement higher-order components for shared behavior
+  - Use slot patterns for flexible component composition
+  - Create composable services for business logic
+  - Implement factory patterns for component creation
+
+- **State Management**
+  - Centralize state in Pinia stores
+  - Use computed properties for derived state
+  - Implement shared state selectors
+  - Create reusable state mutations
+  - Use action creators for common operations
+
+- **Error Handling**
+  - Implement centralized error handling
+  - Create reusable error components
+  - Use error boundary components
+  - Implement consistent error logging
+  - Create error type definitions
+
+- **Type Definitions**
+  - Create shared interfaces for common data structures
+  - Use type aliases for complex types
+  - Implement generic types for reusable components
+  - Create utility types for common patterns
+  - Use discriminated unions for state management
+
+- **API Integration**
+  - Create reusable API client classes
+  - Implement request/response interceptors
+  - Use consistent error handling patterns
+  - Create type-safe API endpoints
+  - Implement caching strategies
+
+- **Platform Services**
+  - Abstract platform-specific code behind interfaces
+  - Create platform-agnostic service layers
+  - Implement feature detection
+  - Use dependency injection for services
+  - Create service factories
+
+- **Testing**
+  - Create reusable test utilities
+  - Implement test factories
+  - Use shared test configurations
+  - Create reusable test helpers
+  - Implement consistent test patterns
+  
+### SOLID Principles
+- **Single Responsibility**: Each class/component should have only one reason to change
+  - Components should focus on one specific feature (e.g., QR scanning, DID management)
+  - Services should handle one type of functionality (e.g., platform services, crypto services)
+  - Utilities should provide focused helper functions
+
+- **Open/Closed**: Software entities should be open for extension but closed for modification
+  - Use interfaces for service definitions
+  - Implement plugin architecture for platform-specific features
+  - Allow component behavior extension through props and events
+
+- **Liskov Substitution**: Objects should be replaceable with their subtypes
+  - Platform services should work consistently across web/mobile
+  - Authentication providers should be interchangeable
+  - Storage implementations should be swappable
+
+- **Interface Segregation**: Clients shouldn't depend on interfaces they don't use
+  - Break down large service interfaces into smaller, focused ones
+  - Component props should be minimal and purposeful
+  - Event emissions should be specific and targeted
+
+- **Dependency Inversion**: High-level modules shouldn't depend on low-level modules
+  - Use dependency injection for services
+  - Abstract platform-specific code behind interfaces
+  - Implement factory patterns for component creation
+
+### Law of Demeter
+- Components should only communicate with immediate dependencies
+- Avoid chaining method calls (e.g., `this.service.getUser().getProfile().getName()`)
+- Use mediator patterns for complex component interactions
+- Implement facade patterns for subsystem access
+- Keep component communication through defined events and props
+
+### Composition over Inheritance
+- Prefer building components through composition
+- Use mixins for shared functionality
+- Implement feature toggles through props
+- Create higher-order components for common patterns
+- Use service composition for complex features
+
+### Interface Segregation
+- Define clear interfaces for services
+- Keep component APIs minimal and focused
+- Split large interfaces into smaller, specific ones
+- Use TypeScript interfaces for type definitions
+- Implement role-based interfaces for different use cases
+
+### Fail Fast
+- Validate inputs early in the process
+- Use TypeScript strict mode
+- Implement comprehensive error handling
+- Add runtime checks for critical operations
+- Use assertions for development-time validation
+
+### Principle of Least Astonishment
+- Follow Vue.js conventions consistently
+- Use familiar naming patterns
+- Implement predictable component behaviors
+- Maintain consistent error handling
+- Keep UI interactions intuitive
+
+### Information Hiding
+- Encapsulate implementation details
+- Use private class members
+- Implement proper access modifiers
+- Hide complex logic behind simple interfaces
+- Use TypeScript's access modifiers effectively
+
+### Single Source of Truth
+- Use Pinia for state management
+- Maintain one source for user data
+- Centralize configuration management
+- Use computed properties for derived state
+- Implement proper state synchronization
+
+### Principle of Least Privilege
+- Implement proper access control
+- Use minimal required permissions
+- Follow privacy-by-design principles
+- Restrict component access to necessary data
+- Implement proper authentication/authorization
+
+### Continuous Integration/Continuous Deployment (CI/CD)
+- Automated testing on every commit
+- Consistent build process across platforms
+- Automated deployment pipelines
+- Quality gates for code merging
+- Environment-specific configurations
+
+This expanded documentation provides:
+1. Clear principles for development
+2. Practical implementation guidelines
+3. Real-world examples
+4. TypeScript integration
+5. Best practices for Time Safari
+

.eslintrc.js

@@ -26,6 +26,7 @@ module.exports = {
     "no-debugger": process.env.NODE_ENV === "production" ? "error" : "warn",
     "@typescript-eslint/no-explicit-any": "warn",
     "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-unnecessary-type-constraint": "off"
+    "@typescript-eslint/no-unnecessary-type-constraint": "off",
+    "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }]
   },
 };

.gitignore

@@ -38,30 +38,19 @@ pnpm-debug.log*
 /dist-capacitor/
 /test-playwright-results/
 playwright-tests
-test-playwright
 dist-electron-packages
-ios
 .ruby-version
 +.env
 
-# Generated test files
+# Test files generated by scripts test-ios.js & test-android.js
 .generated/
 
-# Fastlane
-ios/fastlane/report.xml
-ios/fastlane/Preview.html
-ios/fastlane/screenshots
-ios/fastlane/test_output
-android/fastlane/report.xml
-android/fastlane/Preview.html
-android/fastlane/screenshots
-android/fastlane/test_output
 .env.default
 vendor/
 
 # Build logs
 build_logs/
 
-# Android generated assets
-android/app/src/main/assets/public/assets/
+android/app/src/main/assets/public
+android/app/src/main/res
 

BUILDING.md

@@ -4,49 +4,217 @@ This guide explains how to build TimeSafari for different platforms.
 
 ## Prerequisites
 
+For a quick dev environment setup, use [pkgx](https://pkgx.dev).
+
 - Node.js (LTS version recommended)
 - npm (comes with Node.js)
 - Git
-- For iOS builds: macOS with Xcode installed
 - For Android builds: Android Studio with SDK installed
+- For iOS builds: macOS with Xcode and ruby gems & bundle
+  - `pkgx +rubygems.org sh`
+
+  - ... and you may have to fix these, especially with pkgx
+
+   ```bash
+   gem_path=$(which gem)
+   shortened_path="${gem_path:h:h}"
+   export GEM_HOME=$shortened_path
+   export GEM_PATH=$shortened_path
+   ```
+
 - For desktop builds: Additional build tools based on your OS
 
+## Forks
+
+If you have forked this to make your own app, you'll want to customize the iOS & Android files. You can either edit existing ones, or you can remove the `ios` and `android` directories and regenerate them before the `npx cap sync` step in each setup.
+
+   ```bash
+   npx cap add android
+   npx cap add ios
+   ```
+
+You'll also want to edit the deep link configuration (see below).
+
 ## Initial Setup
 
-1. Clone the repository:
-
-   ```bash
-   git clone [repository-url]
-   cd TimeSafari
-   ```
-
-2. Install dependencies:
+Install dependencies:
 
    ```bash
    npm install
    ```
 
-## Web Build
+## Web Dev Locally
 
-To build for web deployment:
+   ```bash
+   npm run dev
+   ```
+
+## Web Build for Server
 
 1. Run the production build:
 
    ```bash
-   npm run build
+   npm run build:web
    ```
 
-2. The built files will be in the `dist` directory.
+   The built files will be in the `dist` directory.
 
-3. To test the production build locally:
+2. To test the production build locally:
+
+   You'll likely want to use test locations for the Endorser & image & partner servers; see "DEFAULT_ENDORSER_API_SERVER" & "DEFAULT_IMAGE_API_SERVER" & "DEFAULT_PARTNER_API_SERVER" below.
 
    ```bash
    npm run serve
    ```
 
+### Compile and minify for test & production
+
+* If there are DB changes: before updating the test server, open browser(s) with current version to test DB migrations.
+
+* `npx prettier --write ./sw_scripts/`
+
+* Update the ClickUp tasks & CHANGELOG.md & the version in package.json, run `npm install`.
+
+* Commit everything (since the commit hash is used the app).
+
+* Put the commit hash in the changelog (which will help you remember to bump the version later).
+
+* Tag with the new version, [online](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases) or `git tag 0.3.55 && git push origin 0.3.55`.
+
+* For test, build the app (because test server is not yet set up to build):
+
+```bash
+TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_PASSKEYS_ENABLED=true npm run build
+```
+
+   ... and transfer to the test server:
+
+   ```bash
+   rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari
+   ```
+
+(Let's replace that with a .env.development or .env.staging file.)
+
+(Note: The test BVC_MEETUPS_PROJECT_CLAIM_ID does not resolve as a URL because it's only in the test DB and the prod redirect won't redirect there.)
+
+* For prod, get on the server and run the correct build:
+
+  ... and log onto the server:
+
+  * `pkgx +npm sh`
+
+  * `cd crowd-funder-for-time-pwa && git checkout master && git pull && git checkout 0.3.55 && npm install && npm run build && cd -`
+
+  (The plain `npm run build` uses the .env.production file.)
+
+* Back up the time-safari/dist folder & deploy: `mv time-safari/dist time-safari-dist-prev.0 && mv crowd-funder-for-time-pwa/dist time-safari/`
+
+* Record the new hash in the changelog. Edit package.json to increment version & add "-beta", `npm install`, and commit. Also record what version is on production.
+
+## Docker Deployment
+
+The application can be containerized using Docker for consistent deployment across environments.
+
+### Prerequisites
+
+- Docker installed on your system
+- Docker Compose (optional, for multi-container setups)
+
+### Building the Docker Image
+
+1. Build the Docker image:
+
+   ```bash
+   docker build -t timesafari:latest .
+   ```
+
+2. For development builds with specific environment variables:
+
+   ```bash
+   docker build --build-arg NODE_ENV=development -t timesafari:dev .
+   ```
+
+### Running the Container
+
+1. Run the container:
+
+   ```bash
+   docker run -d -p 80:80 timesafari:latest
+   ```
+
+2. For development with hot-reloading:
+
+   ```bash
+   docker run -d -p 80:80 -v $(pwd):/app timesafari:dev
+   ```
+
+### Using Docker Compose
+
+Create a `docker-compose.yml` file:
+
+```yaml
+version: '3.8'
+services:
+  timesafari:
+    build: .
+    ports:
+      - "80:80"
+    environment:
+      - NODE_ENV=production
+    restart: unless-stopped
+```
+
+Run with Docker Compose:
+
+```bash
+docker-compose up -d
+```
+
+### Production Deployment
+
+For production deployment, consider the following:
+
+1. Use specific version tags instead of 'latest'
+2. Implement health checks
+3. Configure proper logging
+4. Set up reverse proxy with SSL termination
+5. Use Docker secrets for sensitive data
+
+Example production deployment:
+
+```bash
+# Build with specific version
+docker build -t timesafari:1.0.0 .
+
+# Run with production settings
+docker run -d \
+  --name timesafari \
+  -p 80:80 \
+  --restart unless-stopped \
+  -e NODE_ENV=production \
+  timesafari:1.0.0
+```
+
+### Troubleshooting Docker
+
+1. **Container fails to start**
+   - Check logs: `docker logs <container_id>`
+   - Verify port availability
+   - Check environment variables
+
+2. **Build fails**
+   - Ensure all dependencies are in package.json
+   - Check Dockerfile syntax
+   - Verify build context
+
+3. **Performance issues**
+   - Monitor container resources: `docker stats`
+   - Check nginx configuration
+   - Verify caching settings
+
 ## Desktop Build (Electron)
 
-### Building for Linux
+### Linux Build
 
 1. Build the electron app in production mode:
 
@@ -68,21 +236,75 @@ To build for web deployment:
    - AppImage: `dist-electron-packages/TimeSafari-x.x.x.AppImage`
    - DEB: `dist-electron-packages/timesafari_x.x.x_amd64.deb`
 
+### macOS Build
+
+1. Build the electron app in production mode:
+
+   ```bash
+   npm run build:electron-prod
+   ```
+
+2. Package the Electron app for macOS:
+
+   ```bash
+   # For Intel Macs
+   npm run electron:build-mac
+
+   # For Universal build (Intel + Apple Silicon)
+   npm run electron:build-mac-universal
+   ```
+
+3. The packaged applications will be in `dist-electron-packages/`:
+   - `.app` bundle: `TimeSafari.app`
+   - `.dmg` installer: `TimeSafari-x.x.x.dmg`
+   - `.zip` archive: `TimeSafari-x.x.x-mac.zip`
+
+### Code Signing and Notarization (macOS)
+
+For public distribution on macOS, you need to code sign and notarize your app:
+
+1. Set up environment variables:
+   ```bash
+   export CSC_LINK=/path/to/your/certificate.p12
+   export CSC_KEY_PASSWORD=your_certificate_password
+   export APPLE_ID=your_apple_id
+   export APPLE_ID_PASSWORD=your_app_specific_password
+   ```
+
+2. Build with signing:
+   ```bash
+   npm run electron:build-mac
+   ```
+
 ### Running the Packaged App
 
-- AppImage: Make executable and run
+- **Linux**:
+  - AppImage: Make executable and run
+    ```bash
+    chmod +x dist-electron-packages/TimeSafari-*.AppImage
+    ./dist-electron-packages/TimeSafari-*.AppImage
+    ```
+  - DEB: Install and run
+    ```bash
+    sudo dpkg -i dist-electron-packages/timesafari_*_amd64.deb
+    timesafari
+    ```
 
-  ```bash
-  chmod +x dist-electron-packages/TimeSafari-*.AppImage
-  ./dist-electron-packages/TimeSafari-*.AppImage
-  ```
+- **macOS**:
+  - `.app` bundle: Double-click `TimeSafari.app` in Finder
+  - `.dmg` installer:
+    1. Double-click the `.dmg` file
+    2. Drag the app to your Applications folder
+    3. Launch from Applications
+  - `.zip` archive:
+    1. Extract the `.zip` file
+    2. Move `TimeSafari.app` to your Applications folder
+    3. Launch from Applications
 
-- DEB: Install and run
-
-  ```bash
-  sudo dpkg -i dist-electron-packages/timesafari_*_amd64.deb
-  timesafari
-  ```
+  Note: If you get a security warning when running the app:
+  1. Right-click the app
+  2. Select "Open"
+  3. Click "Open" in the security dialog
 
 ### Development Testing
 
@@ -105,6 +327,7 @@ Prerequisites: macOS with Xcode installed
 1. Build the web assets:
 
    ```bash
+   npm run build:web
    npm run build:capacitor
    ```
 
@@ -114,23 +337,53 @@ Prerequisites: macOS with Xcode installed
    npx cap sync ios
    ```
 
-3. Open the project in Xcode:
+  - If that fails with "Could not find..." then look at the "gem_path" instructions above.
+
+3. Copy the assets:
+
+   ```bash
+   mkdir -p ios/App/App/Assets.xcassets/AppIcon.appiconset
+   npx capacitor-assets generate --ios
+   ```
+
+4. Bump the version to match Android
+
+   ```
+   cd ios/App
+   xcrun agvtool new-version 15
+   # Unfortunately this edits Info.plist directly.
+   #xcrun agvtool new-marketing-version 0.4.5
+   cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.4.5;/g" > temp
+   mv temp App.xcodeproj/project.pbxproj
+   cd -
+   ```
+
+5. Open the project in Xcode:
 
    ```bash
    npx cap open ios
    ```
 
-4. Use Xcode to build and run on simulator or device.
+6. Use Xcode to build and run on simulator or device.
 
-If you have forked this to make your own app, you'll want to customize the ios files:
+7. Release
 
-   ```bash
-   rm -rf ios
-   npx cap add ios
-   ```
+  * Under "General" renamed a bunch of things to "Time Safari"
+  * Choose Product -> Destination -> Build Any iOS
+  * Choose Product -> Archive
+    * This will trigger a build and take time, needing user's "login" keychain password which is just their login password, repeatedly.
+    * If it fails with `building for 'iOS', but linking in dylib (.../.pkgx/zlib.net/v1.3.0/lib/libz.1.3.dylib) built for 'macOS'` then run XCode outside that terminal (ie. not with `npx cap open ios`).
+    * Click Distribute -> App Store Connect
+  * In AppStoreConnect, add the build to the distribution: remove the current build with the "-" when you hover over it, then "Add Build" with the new build.
+    * It can take 15 minutes for the build to show up in the list of builds.
+    * You'll probably have to "Manage" something about encryption, disallowed in France.
+    * Then "Save" and "Add to Review" and "Resubmit to App Review".
 
-... and then repeat the steps above.
+#### First-time iOS Configuration
 
+- Generate certificates inside XCode.
+
+- Right-click on App and under Signing & Capabilities set the Team.
 
 ### Android Build
 
@@ -142,6 +395,10 @@ Prerequisites: Android Studio with SDK installed
    rm -rf dist
    npm run build:web
    npm run build:capacitor
+   cd android
+   ./gradlew clean
+   ./gradlew assembleDebug
+   cd ..
    ```
 
 2. Update Android project with latest build:
@@ -150,24 +407,23 @@ Prerequisites: Android Studio with SDK installed
    npx cap sync android
    ```
 
-3. Open the project in Android Studio:
+3. Copy the assets
+
+   ```bash
+   npx capacitor-assets generate --android
+   ```
+
+4. Bump version to match iOS, in android/app/build.gradleq
+
+5. Open the project in Android Studio:
 
    ```bash
    npx cap open android
    ```
 
-3. Use Android Studio to build and run on emulator or device.
+6. Use Android Studio to build and run on emulator or device.
 
-If you have forked this to make your own app, you'll want to customize the android files:
-
-   ```bash
-   rm -rf android
-   npx cap add android
-   ```
-
-... and then: repeat the steps above, and look below for the deep link configuration.
-
-## Building Android from the console
+## Android Build from the console
 
    ```bash
    cd android
@@ -177,7 +433,32 @@ If you have forked this to make your own app, you'll want to customize the andro
    npx cap run android
    ```
 
-## Configuring Android for deep links
+... or, to create the `aab` file, `bundle` instead of `build`:
+
+   ```bash
+   ./gradlew bundleDebug -Dlint.baselines.continue=true
+   ```
+
+... or, to create a signed release:
+
+  * Setup by adding the app/gradle.properties.secrets file (see properties at top of app/build.gradle) and the app/time-safari-upload-key-pkcs12.jks file
+  * In app/build.gradle, bump the versionCode and maybe the versionName
+  * Then `bundleRelease`:
+
+   ```bash
+   ./gradlew bundleRelease -Dlint.baselines.continue=true
+   ```
+
+  ... and find your `aab` file at app/build/outputs/bundle/release
+
+At play.google.com/console:
+
+- Create new release, upload, hit Next.
+
+- Save & send changes for review.
+
+
+## First-time Android Configuration for deep links
 
 You must add the following intent filter to the `android/app/src/main/AndroidManifest.xml` file:
 
@@ -188,237 +469,4 @@ You must add the following intent filter to the `android/app/src/main/AndroidMan
                   <category android:name="android.intent.category.BROWSABLE" />
                   <data android:scheme="timesafari" />
                </intent-filter>
-   ```
-
-You must also add the following to the `android/app/build.gradle` file:
-
-   ```gradle
-   android {
-      // ... existing config ...
-
-      lintOptions {
-         disable 'UnsanitizedFilenameFromContentProvider'
-         abortOnError false
-         baseline file("lint-baseline.xml")
-         
-         // Ignore Capacitor module issues
-         ignore 'DefaultLocale'
-         ignore 'UnsanitizedFilenameFromContentProvider'
-         ignore 'LintBaseline'
-         ignore 'LintBaselineFixed'
-      }
-   }
-   ```
-
-Modify `/android/build.gradle` to use a stable version of AGP and make sure Kotlin version is compatible.
-
-   ```gradle
-   buildscript {
-      repositories {
-         google()
-         mavenCentral()
-      }
-      dependencies {
-         // Use a stable version of AGP
-         classpath 'com.android.tools.build:gradle:8.1.0'
-         
-         // Make sure Kotlin version is compatible
-         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
-      }
-   }
-
-   allprojects {
-      repositories {
-         google()
-         mavenCentral()
-      }
-   }
-
-   // Add this to handle version conflicts
-   configurations.all {
-      resolutionStrategy {
-         force 'org.jetbrains.kotlin:kotlin-stdlib:1.8.0'
-         force 'org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0'
-      }
-   }
-   ```
-
-## PyWebView Desktop Build
-
-### Prerequisites for PyWebView
-
-- Python 3.8 or higher
-- pip (Python package manager)
-- virtualenv (recommended)
-- System dependencies:
-
-  ```bash
-  # For Ubuntu/Debian
-  sudo apt-get install python3-webview
-  # or
-  sudo apt-get install python3-gi python3-gi-cairo gir1.2-gtk-3.0 gir1.2-webkit2-4.0
-
-  # For Arch Linux
-  sudo pacman -S webkit2gtk python-gobject python-cairo
-
-  # For Fedora
-  sudo dnf install python3-webview
-  # or
-  sudo dnf install python3-gobject python3-cairo webkit2gtk3
-  ```
-
-### Setup
-
-1. Create and activate a virtual environment (recommended):
-
-   ```bash
-   python -m venv .venv
-   source .venv/bin/activate  # On Linux/macOS
-   # or
-   .venv\Scripts\activate     # On Windows
-   ```
-
-2. Install Python dependencies:
-
-   ```bash
-   pip install -r requirements.txt
-   ```
-
-### Troubleshooting
-
-If encountering PyInstaller version errors:
-
-```bash
-# Try installing the latest stable version
-pip install --upgrade pyinstaller
-```
-
-### Development of PyWebView
-
-1. Start the PyWebView development build:
-
-   ```bash
-   npm run pywebview:dev
-   ```
-
-### Building for Distribution
-
-#### Linux
-
-```bash
-npm run pywebview:package-linux
-```
-
-The packaged application will be in `dist/TimeSafari`
-
-#### Windows
-
-```bash
-npm run pywebview:package-win
-```
-
-The packaged application will be in `dist/TimeSafari`
-
-#### macOS
-
-```bash
-npm run pywebview:package-mac
-```
-
-The packaged application will be in `dist/TimeSafari`
-
-## Testing
-
-Run local tests:
-
-```bash
-npm run test-local
-```
-
-See [TESTING.md](test-playwright/TESTING.md) for more details.
-
-## Linting
-
-Check code style:
-
-```bash
-npm run lint
-```
-
-Fix code style issues:
-
-```bash
-npm run lint-fix
-```
-
-## Environment Configuration
-
-See `.env.*` files for configuration.
-
-## Notes
-
-- The application uses PWA (Progressive Web App) features for web builds
-- Electron builds disable PWA features automatically
-- Build output directories:
-  - Web: `dist/`
-  - Electron: `dist-electron/`
-  - Capacitor: `dist-capacitor/`
-
-## Deployment
-
-### Version Management
-
-1. Update CHANGELOG.md with new changes
-2. Update version in package.json
-3. Commit changes and tag release:
-
-   ```bash
-   git tag <VERSION_TAG>
-   git push origin <VERSION_TAG>
-   ```
-
-4. After deployment, update package.json with next version + "-beta"
-
-### Test Server
-
-```bash
-# Build using staging environment
-npm run build -- --mode staging
-
-# Deploy to test server
-rsync -azvu -e "ssh -i ~/.ssh/<YOUR_KEY>" dist ubuntutest@test.timesafari.app:time-safari/
-```
-
-### Production Server
-
-```bash
-# On the production server:
-pkgx +npm sh
-cd crowd-funder-for-time-pwa
-git checkout master && git pull
-git checkout <VERSION_TAG>
-npm install
-npm run build
-cd -
-
-# Backup and deploy
-mv time-safari/dist time-safari-dist-prev.0 && mv crowd-funder-for-time-pwa/dist time-safari/
-```
-
-## Troubleshooting Builds
-
-### Common Build Issues
-
-1. **Missing Environment Variables**
-   - Check that all required variables are set in your .env file
-   - For development, ensure local services are running on correct ports
-
-2. **Electron Build Failures**
-   - Verify Node.js version compatibility
-   - Check that all required dependencies are installed
-   - Ensure proper paths in electron/main.js
-
-3. **Mobile Build Issues**
-   - For iOS: Xcode command line tools must be installed
-   - For Android: Correct SDK version must be installed
-   - Check Capacitor configuration in capacitor.config.ts
+   ```

Dockerfile

@@ -0,0 +1,42 @@
+# Build stage
+FROM node:22-alpine AS builder
+
+# Install build dependencies
+
+RUN apk add --no-cache \
+    python3 \
+    py3-pip \
+    py3-setuptools \
+    make \
+    g++ \
+    gcc
+
+# Set working directory
+WORKDIR /app
+
+# Copy package files
+COPY package*.json ./
+
+# Install dependencies
+RUN npm ci
+
+# Copy source code
+COPY . .
+
+# Build the application
+RUN npm run build:web
+
+# Production stage
+FROM nginx:alpine
+
+# Copy built assets from builder stage
+COPY --from=builder /app/dist /usr/share/nginx/html
+
+# Copy nginx configuration if needed
+# COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# Expose port 80
+EXPOSE 80
+
+# Start nginx
+CMD ["nginx", "-g", "daemon off;"] 

README.md

@@ -19,59 +19,6 @@ npm run dev
 
 See [BUILDING.md](BUILDING.md) for more details.
 
-See the test locations for "IMAGE_API_SERVER" or "PARTNER_API_SERVER" below, or use http://localhost:3000 for local endorser.ch
-
-
-### Run all UI tests
-
-Look at [BUILDING.md](BUILDING.md) for the "test-all" instructions and [TESTING.md](test-playwright/TESTING.md) for more details.
-
-
-### Compile and minify for test & production
-
-* If there are DB changes: before updating the test server, open browser(s) with current version to test DB migrations.
-
-* `npx prettier --write ./sw_scripts/`
-
-* Update the ClickUp tasks & CHANGELOG.md & the version in package.json, run `npm install`.
-
-* Commit everything (since the commit hash is used the app).
-
-* Put the commit hash in the changelog (which will help you remember to bump the version later).
-
-* Tag with the new version, [online](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases) or `git tag 0.3.55 && git push origin 0.3.55`.
-
-* For test, build the app (because test server is not yet set up to build):
-
-```bash
-TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_PASSKEYS_ENABLED=true npm run build
-```
-
-   ... and transfer to the test server:
-
-   ```bash
-   rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari
-   ```
-
-(Let's replace that with a .env.development or .env.staging file.)
-
-(Note: The test BVC_MEETUPS_PROJECT_CLAIM_ID does not resolve as a URL because it's only in the test DB and the prod redirect won't redirect there.)
-
-* For prod, get on the server and run the correct build:
-
-  ... and log onto the server:
-
-  * `pkgx +npm sh`
-
-  * `cd crowd-funder-for-time-pwa && git checkout master && git pull && git checkout 0.3.55 && npm install && npm run build && cd -`
-
-  (The plain `npm run build` uses the .env.production file.)
-
-* Back up the time-safari/dist folder & deploy: `mv time-safari/dist time-safari-dist-prev.0 && mv crowd-funder-for-time-pwa/dist time-safari/`
-
-* Record the new hash in the changelog. Edit package.json to increment version & add "-beta", `npm install`, and commit. Also record what version is on production.
-
-
 
 
 
@@ -84,7 +31,9 @@ See [TESTING.md](test-playwright/TESTING.md) for detailed test instructions.
 
 ## Icons
 
-To add an icon, add to main.ts and reference with `fa` element and `icon` attribute with the hyphenated name.
+Application icons are in the `assets` directory, processed by the `capacitor-assets` command.
+
+To add a Font Awesome icon, add to main.ts and reference with `font-awesome` element and `icon` attribute with the hyphenated name.
 
 ## Other
 
@@ -97,6 +46,24 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
 
 * If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
 
+### Code Organization
+
+The project uses a centralized approach to type definitions and interfaces:
+
+* `src/interfaces/` - Contains all TypeScript interfaces and type definitions
+  * `deepLinks.ts` - Deep linking type system and Zod validation schemas
+  * `give.ts` - Give-related interfaces and type definitions
+  * `claims.ts` - Claim-related interfaces and verifiable credentials
+  * `common.ts` - Shared interfaces and utility types
+  * Other domain-specific interface files
+
+Key principles:
+- All interfaces and types are defined in the interfaces folder
+- Zod schemas are used for runtime validation and type generation
+- Domain-specific interfaces are separated into their own files
+- Common interfaces are shared through `common.ts`
+- Type definitions are generated from Zod schemas where possible
+
 ### Kudos
 
 Gifts make the world go 'round!

android/.gitignore

@@ -1,5 +1,20 @@
 # Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
 
+app/build/*
+!app/build/.npmkeep
+
+# Copied web assets
+app/src/main/assets/public
+
+# Generated Config files
+app/src/main/assets/capacitor.config.json
+app/src/main/assets/capacitor.plugins.json
+app/src/main/res/xml/config.xml
+
+# secrets
+app/gradle.properties.secrets
+app/time-safari-upload-key-pkcs12.jks
+
 # Built application files
 *.apk
 *.aar
@@ -91,11 +106,3 @@ lint/tmp/
 
 # Cordova plugins for Capacitor
 capacitor-cordova-android-plugins
-
-# Copied web assets
-app/src/main/assets/public
-
-# Generated Config files
-app/src/main/assets/capacitor.config.json
-app/src/main/assets/capacitor.plugins.json
-app/src/main/res/xml/config.xml

android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Mar 11 10:01:05 UTC 2025
-gradle.version=8.10.2

android/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane"

android/app/.gitignore

@@ -1,3 +0,0 @@
-/build/*
-!/build/.npmkeep
-src/main/assets/public/assets/

android/app/build.gradle

@@ -1,14 +1,38 @@
 apply plugin: 'com.android.application'
 
+// These are sample values to set in gradle.properties.secrets
+// MY_KEYSTORE_FILE=time-safari-upload-key-pkcs12.jks
+// MY_KEYSTORE_PASSWORD=...
+// MY_KEY_ALIAS=time-safari-key-alias
+// MY_KEY_PASSWORD=...
+
+// Try to load from environment variables first
+project.ext.MY_KEYSTORE_FILE = System.getenv('ANDROID_KEYSTORE_FILE') ?: ""
+project.ext.MY_KEYSTORE_PASSWORD = System.getenv('ANDROID_KEYSTORE_PASSWORD') ?: ""
+project.ext.MY_KEY_ALIAS = System.getenv('ANDROID_KEY_ALIAS') ?: ""
+project.ext.MY_KEY_PASSWORD = System.getenv('ANDROID_KEY_PASSWORD') ?: ""
+
+// If no environment variables, try to load from secrets file
+if (!project.ext.MY_KEYSTORE_FILE) {
+    def secretsPropertiesFile = rootProject.file("app/gradle.properties.secrets")
+    if (secretsPropertiesFile.exists()) {
+        Properties secretsProperties = new Properties()
+        secretsProperties.load(new FileInputStream(secretsPropertiesFile))
+        secretsProperties.each { name, value ->
+            project.ext[name] = value
+        }
+    }
+}
+
 android {
-    namespace "app.timesafari"
+    namespace 'app.timesafari'
     compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "app.timesafari"
+        applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode 10
+        versionName "0.4.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -16,22 +40,42 @@ android {
             ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
         }
     }
+    signingConfigs {
+        release {
+            if (project.ext.MY_KEYSTORE_FILE &&
+                project.ext.MY_KEYSTORE_PASSWORD &&
+                project.ext.MY_KEY_ALIAS &&
+                project.ext.MY_KEY_PASSWORD) {
+
+                storeFile file(project.ext.MY_KEYSTORE_FILE)
+                storePassword project.ext.MY_KEYSTORE_PASSWORD
+                keyAlias project.ext.MY_KEY_ALIAS
+                keyPassword project.ext.MY_KEY_PASSWORD
+            }
+        }
+    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            // Only sign if we have the signing config
+            if (signingConfigs.release.storeFile != null) {
+                signingConfig signingConfigs.release
+            }
         }
     }
-    lintOptions {
-        disable 'UnsanitizedFilenameFromContentProvider'
-        abortOnError false
-        baseline file("lint-baseline.xml")
-        
-        // Ignore Capacitor module issues
-        ignore 'DefaultLocale'
-        ignore 'UnsanitizedFilenameFromContentProvider'
-        ignore 'LintBaseline'
-        ignore 'LintBaselineFixed'
+
+    // Enable bundle builds (without which it doesn't work right for bundleDebug vs bundleRelease)
+    bundle {
+        language {
+            enableSplit = true
+        }
+        density {
+            enableSplit = true
+        }
+        abi {
+            enableSplit = true
+        }
     }
 }
 

android/app/capacitor.build.gradle

@@ -9,7 +9,12 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
+    implementation project(':capacitor-mlkit-barcode-scanning')
     implementation project(':capacitor-app')
+    implementation project(':capacitor-camera')
+    implementation project(':capacitor-filesystem')
+    implementation project(':capacitor-share')
+    implementation project(':capawesome-capacitor-file-picker')
 
 }
 

android/app/google-services.json

@@ -0,0 +1,28 @@
+{
+  "project_info": {
+    "project_number": "123456789000",
+    "project_id": "timesafari-app",
+    "storage_bucket": "timesafari-app.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:123456789000:android:1234567890abcdef",
+        "android_client_info": {
+          "package_name": "app.timesafari.app"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDummyKeyForBuildPurposesOnly12345"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ]
+} 

android/app/lint-baseline.xml

@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.1.0)" variant="all" version="8.1.0">
-
-    <issue
-        id="UnknownIssueId"
-        message="Unknown issue id &quot;UnsanitizedFilenameFromContentProvider&quot;"
-        errorLine1="        disable &apos;UnsanitizedFilenameFromContentProvider&apos;"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="26"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="UnknownIssueId"
-        message="Unknown issue id &quot;UnsanitizedFilenameFromContentProvider&quot;"
-        errorLine1="        disable &apos;UnsanitizedFilenameFromContentProvider&apos;"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="26"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="UnknownIssueId"
-        message="Unknown issue id &quot;LintBaselineFixed&quot;"
-        errorLine1="        ignore &apos;LintBaselineFixed&apos;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="34"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownIssueId"
-        message="Unknown issue id &quot;LintBaselineFixed&quot;"
-        errorLine1="        ignore &apos;LintBaselineFixed&apos;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="34"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="            String msg = String.format("
-        errorLine2="                         ^">
-        <location
-            file="src/main/java/com/getcapacitor/BridgeWebChromeClient.java"
-            line="467"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `toUpperCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="                return mask.toUpperCase().equals(string.toUpperCase());"
-        errorLine2="                            ~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/getcapacitor/util/HostMask.java"
-            line="110"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `toUpperCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="                return mask.toUpperCase().equals(string.toUpperCase());"
-        errorLine2="                                                        ~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/getcapacitor/util/HostMask.java"
-            line="110"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="                        if (header.getKey().equalsIgnoreCase(&quot;Accept&quot;) &amp;&amp; header.getValue().toLowerCase().contains(&quot;text/html&quot;)) {"
-        errorLine2="                                                                                            ~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/getcapacitor/WebViewLocalServer.java"
-            line="474"
-            column="93"/>
-    </issue>
-
-    <issue
-        id="SimpleDateFormat"
-        message="To get local formatting use `getDateInstance()`, `getDateTimeInstance()`, or `getTimeInstance()`, or use `new SimpleDateFormat(String template, Locale locale)` with for example `Locale.US` for ASCII dates."
-        errorLine1="        String timeStamp = new SimpleDateFormat(&quot;yyyyMMdd_HHmmss&quot;).format(new Date());"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/getcapacitor/BridgeWebChromeClient.java"
-            line="504"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="SimpleDateFormat"
-        message="To get local formatting use `getDateInstance()`, `getDateTimeInstance()`, or `getTimeInstance()`, or use `new SimpleDateFormat(String template, Locale locale)` with for example `Locale.US` for ASCII dates."
-        errorLine1="        DateFormat df = new SimpleDateFormat(&quot;yyyy-MM-dd&apos;T&apos;HH:mm&apos;Z&apos;&quot;);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/getcapacitor/PluginResult.java"
-            line="44"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `usesCleartextTraffic` is only used in API level 23 and higher (current min is 22)"
-        errorLine1="&lt;application  android:usesCleartextTraffic=&quot;true&quot;>"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/AndroidManifest.xml"
-            line="4"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `autoVerify` is only used in API level 23 and higher (current min is 22)"
-        errorLine1="            &lt;intent-filter android:autoVerify=&quot;true&quot;>"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/AndroidManifest.xml"
-            line="25"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="ManifestOrder"
-        message="`&lt;uses-permission>` tag appears after `&lt;application>` tag"
-        errorLine1="    &lt;uses-permission android:name=&quot;android.permission.INTERNET&quot; />"
-        errorLine2="     ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/AndroidManifest.xml"
-            line="47"
-            column="6"/>
-    </issue>
-
-    <issue
-        id="AndroidGradlePluginVersion"
-        message="A newer version of com.android.tools.build:gradle than 8.2.1 is available: 8.9.0. (There is also a newer version of 8.2.𝑥 available, if upgrading to 8.9.0 is difficult: 8.2.2)"
-        errorLine1="        classpath &apos;com.android.tools.build:gradle:8.2.1&apos;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="12"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="AndroidGradlePluginVersion"
-        message="A newer version of com.android.tools.build:gradle than 8.2.1 is available: 8.9.0. (There is also a newer version of 8.2.𝑥 available, if upgrading to 8.9.0 is difficult: 8.2.2)"
-        errorLine1="        classpath &apos;com.android.tools.build:gradle:8.2.1&apos;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="18"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.appcompat:appcompat than 1.6.1 is available: 1.7.0"
-        errorLine1="    implementation &quot;androidx.appcompat:appcompat:$androidxAppCompatVersion&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="46"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.appcompat:appcompat than 1.6.1 is available: 1.7.0"
-        errorLine1="    implementation &quot;androidx.appcompat:appcompat:$androidxAppCompatVersion&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="46"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.coordinatorlayout:coordinatorlayout than 1.2.0 is available: 1.3.0"
-        errorLine1="    implementation &quot;androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="47"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.test.ext:junit than 1.1.5 is available: 1.2.1"
-        errorLine1="    androidTestImplementation &quot;androidx.test.ext:junit:$androidxJunitVersion&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="51"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.test.espresso:espresso-core than 3.5.1 is available: 3.6.1"
-        errorLine1="    androidTestImplementation &quot;androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="52"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.appcompat:appcompat than 1.6.1 is available: 1.7.0"
-        errorLine1="    implementation &quot;androidx.appcompat:appcompat:$androidxAppCompatVersion&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="75"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.test.ext:junit than 1.1.5 is available: 1.2.1"
-        errorLine1="    androidTestImplementation &quot;androidx.test.ext:junit:$androidxJunitVersion&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="77"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.test.espresso:espresso-core than 3.5.1 is available: 3.6.1"
-        errorLine1="    androidTestImplementation &quot;androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion&quot;"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="78"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="Recycle"
-        message="This `TypedArray` should be recycled after use with `#recycle()`"
-        errorLine1="        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.bridge_fragment);"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/getcapacitor/BridgeFragment.java"
-            line="99"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `#F0FF1414` with a theme that also paints a background (inferred theme is `@android:style/Theme.Holo`)"
-        errorLine1="    android:background=&quot;#F0FF1414&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_bridge.xml"
-            line="5"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.layout.activity_main` appears to be unused"
-        errorLine1="&lt;androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/layout/activity_main.xml"
-            line="2"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.xml.config` appears to be unused"
-        errorLine1="&lt;widget version=&quot;1.0.0&quot; xmlns=&quot;http://www.w3.org/ns/widgets&quot; xmlns:cdv=&quot;http://cordova.apache.org/ns/1.0&quot;>"
-        errorLine2="^">
-        <location
-            file="src/main/res/xml/config.xml"
-            line="2"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.ic_launcher_background` appears to be unused"
-        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable/ic_launcher_background.xml"
-            line="2"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.ic_launcher_foreground` appears to be unused"
-        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable-v24/ic_launcher_foreground.xml"
-            line="1"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.package_name` appears to be unused"
-        errorLine1="    &lt;string name=&quot;package_name&quot;>app.timesafari.app&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="5"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.custom_url_scheme` appears to be unused"
-        errorLine1="    &lt;string name=&quot;custom_url_scheme&quot;>app.timesafari.app&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="6"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="MonochromeLauncherIcon"
-        message="The application adaptive icon is missing a monochrome tag"
-        errorLine1="&lt;adaptive-icon xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
-        errorLine2="^">
-        <location
-            file="src/main/res/mipmap-anydpi-v26/ic_launcher.xml"
-            line="2"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="MonochromeLauncherIcon"
-        message="The application adaptive roundIcon is missing a monochrome tag"
-        errorLine1="&lt;adaptive-icon xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
-        errorLine2="^">
-        <location
-            file="src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml"
-            line="2"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="IconDipSize"
-        message="The image `splash.png` varies significantly in its density-independent (dip) size across the various density versions: drawable-land-hdpi/splash.png: 533x320 dp (800x480 px), drawable-land-mdpi/splash.png: 480x320 dp (480x320 px), drawable-land-xhdpi/splash.png: 640x360 dp (1280x720 px), drawable-land-xxhdpi/splash.png: 533x320 dp (1600x960 px), drawable-land-xxxhdpi/splash.png: 480x320 dp (1920x1280 px)">
-        <location
-            file="src/main/res/drawable-land-mdpi/splash.png"/>
-        <location
-            file="src/main/res/drawable-land-xxxhdpi/splash.png"/>
-        <location
-            file="src/main/res/drawable-land-hdpi/splash.png"/>
-        <location
-            file="src/main/res/drawable-land-xxhdpi/splash.png"/>
-        <location
-            file="src/main/res/drawable-land-xhdpi/splash.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicatesConfig"
-        message="The `splash.png` icon has identical contents in the following configuration folders: drawable-land-mdpi, drawable">
-        <location
-            file="src/main/res/drawable/splash.png"/>
-        <location
-            file="src/main/res/drawable-land-mdpi/splash.png"/>
-    </issue>
-
-    <issue
-        id="IconLocation"
-        message="Found bitmap drawable `res/drawable/splash.png` in densityless folder">
-        <location
-            file="src/main/res/drawable/splash.png"/>
-    </issue>
-
-</issues>

android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

@@ -1,20 +1,26 @@
-package app.timesafari.app;
-
-import android.content.Context;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
+package com.getcapacitor.myapp;
 
 import static org.junit.Assert.*;
 
+import android.content.Context;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
 @RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
+
     @Test
-    public void useAppContext() {
+    public void useAppContext() throws Exception {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("app.timesafari", appContext.getPackageName());
+
+        assertEquals("app.timesafari.app", appContext.getPackageName());
     }
-} 
+}

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -8,27 +7,24 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <activity
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:exported="true"
             android:label="@string/title_activity_main"
-            android:theme="@style/AppTheme.NoActionBarLaunch"
             android:launchMode="singleTask"
-            android:exported="true">
-
+            android:theme="@style/AppTheme.NoActionBarLaunch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="timesafari" />
             </intent-filter>
-
         </activity>
 
         <provider
@@ -36,13 +32,15 @@
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
         </provider>
     </application>
 
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" android:required="true" />
 </manifest>

android/app/src/main/assets/capacitor.config.json

@@ -1,5 +1,5 @@
 {
-	"appId": "app.timesafari.app",
+	"appId": "app.timesafari",
 	"appName": "TimeSafari",
 	"webDir": "dist",
 	"bundledWebRuntime": false,

android/app/src/main/assets/capacitor.plugins.json

@@ -1,6 +1,26 @@
 [
+	{
+		"pkg": "@capacitor-mlkit/barcode-scanning",
+		"classpath": "io.capawesome.capacitorjs.plugins.mlkit.barcodescanning.BarcodeScannerPlugin"
+	},
 	{
 		"pkg": "@capacitor/app",
 		"classpath": "com.capacitorjs.plugins.app.AppPlugin"
+	},
+	{
+		"pkg": "@capacitor/camera",
+		"classpath": "com.capacitorjs.plugins.camera.CameraPlugin"
+	},
+	{
+		"pkg": "@capacitor/filesystem",
+		"classpath": "com.capacitorjs.plugins.filesystem.FilesystemPlugin"
+	},
+	{
+		"pkg": "@capacitor/share",
+		"classpath": "com.capacitorjs.plugins.share.SharePlugin"
+	},
+	{
+		"pkg": "@capawesome/capacitor-file-picker",
+		"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
 	}
 ]

android/app/src/main/assets/public/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="/favicon.ico">
-    <title>TimeSafari</title>
-    <script type="module" crossorigin src="/assets/index-CI0bMoT0.js"></script>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but TimeSafari doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-  </body>
-</html>

android/app/src/main/java/app/timesafari/MainActivity.java

@@ -0,0 +1,7 @@
+package app.timesafari;
+
+import com.getcapacitor.BridgeActivity;
+
+public class MainActivity extends BridgeActivity {
+    // ... existing code ...
+} 

android/app/src/main/java/timesafari/app/MainActivity.java

@@ -1,4 +1,4 @@
-package app.timesafari.app;
+package timesafari.app;
 
 import com.getcapacitor.BridgeActivity;
 

android/app/src/main/res/values/strings.xml

@@ -2,6 +2,6 @@
 <resources>
     <string name="app_name">TimeSafari</string>
     <string name="title_activity_main">TimeSafari</string>
-    <string name="package_name">app.timesafari.app</string>
-    <string name="custom_url_scheme">app.timesafari.app</string>
+    <string name="package_name">timesafari.app</string>
+    <string name="custom_url_scheme">timesafari.app</string>
 </resources>

android/app/src/main/res/xml/file_paths.xml

@@ -2,4 +2,5 @@
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
     <external-path name="my_images" path="." />
     <cache-path name="my_cache_images" path="." />
+    <files-path name="my_files" path="." />
 </paths>

android/build.gradle

@@ -7,9 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.9.1'
         classpath 'com.google.gms:google-services:4.4.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -28,10 +27,3 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-configurations.all {
-    resolutionStrategy {
-        force 'org.jetbrains.kotlin:kotlin-stdlib:1.8.0'
-        force 'org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0'
-    }
-}

android/capacitor-android/build.gradle

@@ -1,7 +0,0 @@
-android {
-    lintOptions {
-        disable 'UnsanitizedFilenameFromContentProvider'
-        abortOnError false
-        baseline file("lint-baseline.xml")
-    }
-}

android/capacitor.settings.gradle

@@ -2,5 +2,20 @@
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
+include ':capacitor-mlkit-barcode-scanning'
+project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../node_modules/@capacitor-mlkit/barcode-scanning/android')
+
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+
+include ':capacitor-camera'
+project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/camera/android')
+
+include ':capacitor-filesystem'
+project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
+
+include ':capacitor-share'
+project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android')
+
+include ':capawesome-capacitor-file-picker'
+project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')

android/fastlane/Appfile

@@ -1,2 +0,0 @@
-json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name("app.timesafari.app") # e.g. com.krausefx.app

android/fastlane/Fastfile

@@ -1,38 +0,0 @@
-# This file contains the fastlane.tools configuration
-# You can find the documentation at https://docs.fastlane.tools
-#
-# For a list of all available actions, check out
-#
-#     https://docs.fastlane.tools/actions
-#
-# For a list of all available plugins, check out
-#
-#     https://docs.fastlane.tools/plugins/available-plugins
-#
-
-# Uncomment the line if you want fastlane to automatically update itself
-# update_fastlane
-
-default_platform(:android)
-
-platform :android do
-  desc "Build and deploy Android app"
-  lane :beta do
-    gradle(
-      task: "clean assembleRelease"
-    )
-    upload_to_play_store(
-      track: 'beta',
-      aab: '../app/build/outputs/bundle/release/app-release.aab'
-    )
-  end
-
-  lane :release do
-    gradle(
-      task: "clean assembleRelease"
-    )
-    upload_to_play_store(
-      aab: '../app/build/outputs/bundle/release/app-release.aab'
-    )
-  end
-end

android/fastlane/README.md

@@ -1,40 +0,0 @@
-fastlane documentation
-----
-
-# Installation
-
-Make sure you have the latest version of the Xcode command line tools installed:
-
-```sh
-xcode-select --install
-```
-
-For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
-
-# Available Actions
-
-## Android
-
-### android beta
-
-```sh
-[bundle exec] fastlane android beta
-```
-
-Build and deploy Android app
-
-### android release
-
-```sh
-[bundle exec] fastlane android release
-```
-
-
-
-----
-
-This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-
-More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
-
-The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

android/gradle.properties

@@ -21,5 +21,3 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 android.suppressUnsupportedCompileSdk=34
-android.suppressUnsupportedCompileSdk=34
-android.suppressUnsupportedCompileSdk=34

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Sun Mar 09 06:14:41 UTC 2025
-sdk.dir=/opt/android-sdk

assets/README.md

@@ -0,0 +1,2 @@
+
+Application icons are here. They are processed for android & ios by the `capacitor-assets` command, as indicated in the BUILDING.md file.

build.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+export IMAGENAME="$(basename $PWD):1.0"
+
+docker build . --network=host -t $IMAGENAME --no-cache

capacitor.config.json

@@ -0,0 +1,21 @@
+{
+	"appId": "app.timesafari",
+	"appName": "TimeSafari",
+	"webDir": "dist",
+	"bundledWebRuntime": false,
+	"server": {
+		"cleartext": true
+	},
+	"plugins": {
+		"App": {
+			"appUrlOpen": {
+				"handlers": [
+					{
+						"url": "timesafari://*",
+						"autoVerify": true
+					}
+				]
+			}
+		}
+	}
+}

capacitor.config.ts

@@ -1,25 +0,0 @@
-import type { CapacitorConfig } from '@capacitor/cli';
-
-const config: CapacitorConfig = {
-  appId: 'app.timesafari.app',
-  appName: 'TimeSafari',
-  webDir: 'dist',
-  bundledWebRuntime: false,
-  server: {
-    cleartext: true,
-  },
-  plugins: {
-    App: {
-      appUrlOpen: {
-        handlers: [
-          {
-            url: "timesafari://*",
-            autoVerify: true
-          }
-        ]
-      }
-    }
-  }
-};
-
-export default config;

doc/DEEP_LINKS.md

@@ -9,21 +9,95 @@ The deep linking system uses a multi-layered type safety approach:
    - Enforces parameter requirements
    - Sanitizes input data
    - Provides detailed validation errors
+   - Generates TypeScript types automatically
 
 2. **TypeScript Types**
-   - Generated from Zod schemas
+   - Generated from Zod schemas using `z.infer`
    - Ensures compile-time type safety
    - Provides IDE autocompletion
    - Catches type errors during development
+   - Maintains single source of truth for types
 
 3. **Router Integration**
    - Type-safe parameter passing
    - Route-specific parameter validation
    - Query parameter type checking
+   - Automatic type inference for route parameters
+
+## Type System Implementation
+
+### Zod Schema to TypeScript Type Generation
+
+```typescript
+// Define the schema
+const claimSchema = z.object({
+  id: z.string(),
+  view: z.enum(["details", "certificate", "raw"]).optional()
+});
+
+// TypeScript type is automatically generated
+type ClaimParams = z.infer<typeof claimSchema>;
+// Equivalent to:
+// type ClaimParams = {
+//   id: string;
+//   view?: "details" | "certificate" | "raw";
+// }
+```
+
+### Type Safety Layers
+
+1. **Schema Definition**
+   ```typescript
+   // src/interfaces/deepLinks.ts
+   export const deepLinkSchemas = {
+     claim: z.object({
+       id: z.string(),
+       view: z.enum(["details", "certificate", "raw"]).optional()
+     }),
+     // Other route schemas...
+   };
+   ```
+
+2. **Type Generation**
+   ```typescript
+   // Types are automatically generated from schemas
+   export type DeepLinkParams = {
+     [K in keyof typeof deepLinkSchemas]: z.infer<(typeof deepLinkSchemas)[K]>;
+   };
+   ```
+
+3. **Runtime Validation**
+   ```typescript
+   // In DeepLinkHandler
+   const result = deepLinkSchemas.claim.safeParse(params);
+   if (!result.success) {
+     // Handle validation errors
+     console.error(result.error);
+   }
+   ```
+
+### Error Handling Types
+
+```typescript
+export interface DeepLinkError extends Error {
+  code: string;
+  details?: unknown;
+}
+
+// Usage in error handling
+try {
+  await handler.handleDeepLink(url);
+} catch (error) {
+  if (error instanceof DeepLinkError) {
+    // Type-safe error handling
+    console.error(error.code, error.message);
+  }
+}
+```
 
 ## Implementation Files
 
-- `src/types/deepLinks.ts`: Type definitions and validation schemas
+- `src/interfaces/deepLinks.ts`: Type definitions and validation schemas
 - `src/services/deepLinks.ts`: Deep link processing service
 - `src/main.capacitor.ts`: Capacitor integration
 

doc/openssl_signing_console.rst

@@ -1,6 +1,6 @@
 JWT Creation & Verification
 
-To run this in a script, see ./openssl_signing_console.sh
+To run this in a script, see /scripts/openssl_signing_console.sh
 
 Prerequisites: openssl, jq
 

doc/qr-code-implementation-guide.md

@@ -0,0 +1,805 @@
+# QR Code Implementation Guide
+
+## Overview
+
+This document describes the QR code scanning and generation implementation in the TimeSafari application. The system uses a platform-agnostic design with specific implementations for web and mobile platforms.
+
+## Architecture
+
+### Directory Structure
+```
+src/
+├── services/
+│   └── QRScanner/
+│       ├── types.ts              # Core interfaces and types
+│       ├── QRScannerFactory.ts   # Factory for creating scanner instances
+│       ├── CapacitorQRScanner.ts # Mobile implementation using MLKit
+│       ├── WebInlineQRScanner.ts # Web implementation using MediaDevices API
+│       └── interfaces.ts         # Additional interfaces
+├── components/
+│   └── QRScanner/
+│       └── QRScannerDialog.vue   # Shared UI component
+└── views/
+    ├── ContactQRScanView.vue     # Dedicated scanning view
+    └── ContactQRScanShowView.vue # Combined QR display and scanning view
+```
+
+### Core Components
+
+1. **Factory Pattern**
+   - `QRScannerFactory` - Creates appropriate scanner instance based on platform
+   - Common interface `QRScannerService` implemented by all scanners
+   - Platform detection via Capacitor and build flags
+
+2. **Platform-Specific Implementations**
+   - `CapacitorQRScanner` - Native mobile implementation using MLKit
+   - `WebInlineQRScanner` - Web browser implementation using MediaDevices API
+   - `QRScannerDialog.vue` - Shared UI component
+
+3. **View Components**
+   - `ContactQRScanView` - Dedicated view for scanning QR codes
+   - `ContactQRScanShowView` - Combined view for displaying and scanning QR codes
+
+## Implementation Details
+
+### Core Interfaces
+
+```typescript
+interface QRScannerService {
+  checkPermissions(): Promise<boolean>;
+  requestPermissions(): Promise<boolean>;
+  isSupported(): Promise<boolean>;
+  startScan(options?: QRScannerOptions): Promise<void>;
+  stopScan(): Promise<void>;
+  addListener(listener: ScanListener): void;
+  onStream(callback: (stream: MediaStream | null) => void): void;
+  cleanup(): Promise<void>;
+  getAvailableCameras(): Promise<MediaDeviceInfo[]>;
+  switchCamera(deviceId: string): Promise<void>;
+  getCurrentCamera(): Promise<MediaDeviceInfo | null>;
+}
+
+interface ScanListener {
+  onScan: (result: string) => void;
+  onError?: (error: Error) => void;
+}
+
+interface QRScannerOptions {
+  camera?: "front" | "back";
+  showPreview?: boolean;
+  playSound?: boolean;
+}
+```
+
+### Platform-Specific Implementations
+
+#### Mobile (Capacitor)
+- Uses `@capacitor-mlkit/barcode-scanning`
+- Native camera access through platform APIs
+- Optimized for mobile performance
+- Supports both iOS and Android
+- Real-time QR code detection
+- Back camera preferred for scanning
+
+Configuration:
+```typescript
+// capacitor.config.ts
+const config: CapacitorConfig = {
+  plugins: {
+    MLKitBarcodeScanner: {
+      formats: ['QR_CODE'],
+      detectorSize: 1.0,
+      lensFacing: 'back',
+      googleBarcodeScannerModuleInstallState: true,
+      // Additional camera options
+      cameraOptions: {
+        quality: 0.8,
+        allowEditing: false,
+        resultType: 'uri',
+        sourceType: 'CAMERA',
+        saveToGallery: false
+      }
+    }
+  }
+};
+```
+
+#### Web
+- Uses browser's MediaDevices API
+- Vue.js components for UI
+- EventEmitter for stream management
+- Browser-based camera access
+- Inline camera preview
+- Responsive design
+- Cross-browser compatibility
+
+### View Components
+
+#### ContactQRScanView
+- Dedicated view for scanning QR codes
+- Full-screen camera interface
+- Simple UI focused on scanning
+- Used primarily on native platforms
+- Streamlined scanning experience
+
+#### ContactQRScanShowView
+- Combined view for QR code display and scanning
+- Shows user's own QR code
+- Handles user registration status
+- Provides options to copy contact information
+- Platform-specific scanning implementation:
+  - Native: Button to navigate to ContactQRScanView
+  - Web: Built-in scanning functionality
+
+### QR Code Workflow
+
+1. **Initiation**
+   - User selects "Scan QR Code" option
+   - Platform-specific scanner is initialized
+   - Camera permissions are verified
+   - Appropriate scanner component is loaded
+
+2. **Platform-Specific Implementation**
+   - Web: Uses `qrcode-stream` for real-time scanning
+   - Native: Uses `@capacitor-mlkit/barcode-scanning`
+
+3. **Scanning Process**
+   - Camera stream initialization
+   - Real-time frame analysis
+   - QR code detection and decoding
+   - Validation of QR code format
+   - Processing of contact information
+
+4. **Contact Processing**
+   - Decryption of contact data
+   - Validation of user information
+   - Verification of timestamp
+   - Check for duplicate contacts
+   - Processing of shared data
+
+## Build Configuration
+
+### Common Vite Configuration
+```typescript
+// vite.config.common.mts
+export async function createBuildConfig(mode: string) {
+  const isCapacitor = mode === "capacitor";
+  
+  return defineConfig({
+    define: {
+      'process.env.VITE_PLATFORM': JSON.stringify(mode),
+      'process.env.VITE_PWA_ENABLED': JSON.stringify(!isNative),
+      __IS_MOBILE__: JSON.stringify(isCapacitor),
+      __USE_QR_READER__: JSON.stringify(!isCapacitor)
+    },
+    optimizeDeps: {
+      include: [
+        '@capacitor-mlkit/barcode-scanning',
+        'vue-qrcode-reader'
+      ]
+    }
+  });
+}
+```
+
+### Platform-Specific Builds
+```json
+{
+  "scripts": {
+    "build:web": "vite build --config vite.config.web.mts",
+    "build:capacitor": "vite build --config vite.config.capacitor.mts",
+    "build:all": "npm run build:web && npm run build:capacitor"
+  }
+}
+```
+
+## Error Handling
+
+### Common Error Scenarios
+1. No camera found
+2. Permission denied
+3. Camera in use by another application
+4. HTTPS required
+5. Browser compatibility issues
+6. Invalid QR code format
+7. Expired QR codes
+8. Duplicate contact attempts
+9. Network connectivity issues
+
+### Error Response
+- User-friendly error messages
+- Troubleshooting tips
+- Clear instructions for resolution
+- Platform-specific guidance
+
+## Security Considerations
+
+### QR Code Security
+- Encryption of contact data
+- Timestamp validation
+- Version checking
+- User verification
+- Rate limiting for scans
+
+### Data Protection
+- Secure transmission of contact data
+- Validation of QR code authenticity
+- Prevention of duplicate scans
+- Protection against malicious codes
+- Secure storage of contact information
+
+## Best Practices
+
+### Camera Access
+1. Always check for camera availability
+2. Request permissions explicitly
+3. Handle all error conditions
+4. Provide clear user feedback
+5. Implement proper cleanup
+
+### Performance
+1. Optimize camera resolution
+2. Implement proper resource cleanup
+3. Handle camera switching efficiently
+4. Manage memory usage
+5. Battery usage optimization
+
+### User Experience
+1. Clear visual feedback
+2. Camera preview
+3. Scanning status indicators
+4. Error messages
+5. Success confirmations
+6. Intuitive camera controls
+7. Smooth camera switching
+8. Responsive UI feedback
+
+## Testing
+
+### Test Scenarios
+1. Permission handling
+2. Camera switching
+3. Error conditions
+4. Platform compatibility
+5. Performance metrics
+6. QR code detection
+7. Contact processing
+8. Security validation
+
+### Test Environment
+- Multiple browsers
+- iOS and Android devices
+- Various network conditions
+- Different camera configurations
+
+## Dependencies
+
+### Key Packages
+- `@capacitor-mlkit/barcode-scanning`
+- `qrcode-stream`
+- `vue-qrcode-reader`
+- Platform-specific camera APIs
+
+## Maintenance
+
+### Regular Updates
+- Keep dependencies updated
+- Monitor platform changes
+- Update documentation
+- Review security patches
+
+### Performance Monitoring
+- Track memory usage
+- Monitor camera performance
+- Check error rates
+- Analyze user feedback
+
+## Camera Handling
+
+### Camera Switching Implementation
+
+The QR scanner supports camera switching on both mobile and desktop platforms through a unified interface.
+
+#### Platform-Specific Implementations
+
+1. **Mobile (Capacitor)**
+   - Uses `@capacitor-mlkit/barcode-scanning`
+   - Supports front/back camera switching
+   - Native camera access through platform APIs
+   - Optimized for mobile performance
+
+   ```typescript
+   // CapacitorQRScanner.ts
+   async startScan(options?: QRScannerOptions): Promise<void> {
+     const scanOptions: StartScanOptions = {
+       formats: [BarcodeFormat.QrCode],
+       lensFacing: options?.camera === "front" ? 
+         LensFacing.Front : LensFacing.Back
+     };
+     await BarcodeScanner.startScan(scanOptions);
+   }
+   ```
+
+2. **Web (Desktop)**
+   - Uses browser's MediaDevices API
+   - Supports multiple camera devices
+   - Dynamic camera enumeration
+   - Real-time camera switching
+
+   ```typescript
+   // WebInlineQRScanner.ts
+   async getAvailableCameras(): Promise<MediaDeviceInfo[]> {
+     const devices = await navigator.mediaDevices.enumerateDevices();
+     return devices.filter(device => device.kind === 'videoinput');
+   }
+
+   async switchCamera(deviceId: string): Promise<void> {
+     // Stop current stream
+     await this.stopScan();
+     
+     // Start new stream with selected camera
+     this.stream = await navigator.mediaDevices.getUserMedia({
+       video: {
+         deviceId: { exact: deviceId },
+         width: { ideal: 1280 },
+         height: { ideal: 720 }
+       }
+     });
+     
+     // Update video and restart scanning
+     if (this.video) {
+       this.video.srcObject = this.stream;
+       await this.video.play();
+     }
+     this.scanQRCode();
+   }
+   ```
+
+### Core Interfaces
+
+```typescript
+interface QRScannerService {
+  // ... existing methods ...
+
+  /** Get available cameras */
+  getAvailableCameras(): Promise<MediaDeviceInfo[]>;
+  
+  /** Switch to a specific camera */
+  switchCamera(deviceId: string): Promise<void>;
+  
+  /** Get current camera info */
+  getCurrentCamera(): Promise<MediaDeviceInfo | null>;
+}
+
+interface QRScannerOptions {
+  /** Camera to use ('front' or 'back' for mobile) */
+  camera?: "front" | "back";
+  /** Whether to show a preview of the camera feed */
+  showPreview?: boolean;
+  /** Whether to play a sound on successful scan */
+  playSound?: boolean;
+}
+```
+
+### UI Components
+
+The camera switching UI adapts to the platform:
+
+1. **Mobile Interface**
+   - Simple toggle button for front/back cameras
+   - Positioned in bottom-right corner
+   - Clear visual feedback during switching
+   - Native camera controls
+
+   ```vue
+   <button 
+     v-if="isNativePlatform"
+     @click="toggleMobileCamera"
+     class="camera-switch-btn"
+   >
+     <font-awesome icon="camera-rotate" />
+     Switch Camera
+   </button>
+   ```
+
+2. **Desktop Interface**
+   - Dropdown menu with all available cameras
+   - Camera labels and device IDs
+   - Real-time camera switching
+   - Responsive design
+
+   ```vue
+   <select 
+     v-model="selectedCameraId"
+     @change="onCameraChange"
+     class="camera-select-dropdown"
+   >
+     <option 
+       v-for="camera in availableCameras" 
+       :key="camera.deviceId"
+       :value="camera.deviceId"
+     >
+       {{ camera.label || `Camera ${camera.deviceId.slice(0, 4)}` }}
+     </option>
+   </select>
+   ```
+
+### Error Handling
+
+The camera switching implementation includes comprehensive error handling:
+
+1. **Common Error Scenarios**
+   - Camera in use by another application
+   - Permission denied during switch
+   - Device not available
+   - Stream initialization failure
+   - Camera switch timeout
+
+2. **Error Response**
+   ```typescript
+   private async handleCameraSwitch(deviceId: string): Promise<void> {
+     try {
+       this.updateCameraState("initializing", "Switching camera...");
+       await this.switchCamera(deviceId);
+       this.updateCameraState("active", "Camera switched successfully");
+     } catch (error) {
+       this.updateCameraState("error", "Failed to switch camera");
+       throw error;
+     }
+   }
+   ```
+
+3. **User Feedback**
+   - Visual indicators during switching
+   - Error notifications
+   - Camera state updates
+   - Permission request dialogs
+
+### State Management
+
+The camera system maintains several states:
+
+1. **Camera States**
+   ```typescript
+   type CameraState =
+     | "initializing"  // Camera is being initialized
+     | "ready"        // Camera is ready to use
+     | "active"       // Camera is actively streaming
+     | "in_use"       // Camera is in use by another application
+     | "permission_denied" // Camera permission was denied
+     | "not_found"    // No camera found on device
+     | "error"        // Generic error state
+     | "off";         // Camera is off
+   ```
+
+2. **State Transitions**
+   - Initialization → Ready
+   - Ready → Active
+   - Active → Switching
+   - Switching → Active/Error
+   - Any state → Off (on cleanup)
+
+### Best Practices
+
+1. **Camera Access**
+   - Always check permissions before switching
+   - Handle camera busy states
+   - Implement proper cleanup
+   - Monitor camera state changes
+
+2. **Performance**
+   - Optimize camera resolution
+   - Handle stream switching efficiently
+   - Manage memory usage
+   - Implement proper cleanup
+
+3. **User Experience**
+   - Clear visual feedback
+   - Smooth camera transitions
+   - Intuitive camera controls
+   - Responsive UI updates
+   - Accessible camera selection
+
+4. **Security**
+   - Secure camera access
+   - Permission management
+   - Device validation
+   - Stream security
+
+### Testing
+
+1. **Test Scenarios**
+   - Camera switching on both platforms
+   - Permission handling
+   - Error conditions
+   - Multiple camera devices
+   - Camera busy states
+   - Stream initialization
+   - UI responsiveness
+
+2. **Test Environment**
+   - Multiple mobile devices
+   - Various desktop browsers
+   - Different camera configurations
+   - Network conditions
+   - Permission states
+
+### Capacitor Implementation Details
+
+#### MLKit Barcode Scanner Configuration
+
+1. **Plugin Setup**
+   ```typescript
+   // capacitor.config.ts
+   const config: CapacitorConfig = {
+     plugins: {
+       MLKitBarcodeScanner: {
+         formats: ['QR_CODE'],
+         detectorSize: 1.0,
+         lensFacing: 'back',
+         googleBarcodeScannerModuleInstallState: true,
+         // Additional camera options
+         cameraOptions: {
+           quality: 0.8,
+           allowEditing: false,
+           resultType: 'uri',
+           sourceType: 'CAMERA',
+           saveToGallery: false
+         }
+       }
+     }
+   };
+   ```
+
+2. **Camera Management**
+   ```typescript
+   // CapacitorQRScanner.ts
+   export class CapacitorQRScanner implements QRScannerService {
+     private currentLensFacing: LensFacing = LensFacing.Back;
+     
+     async getAvailableCameras(): Promise<MediaDeviceInfo[]> {
+       // On mobile, we have two fixed cameras
+       return [
+         {
+           deviceId: 'back',
+           label: 'Back Camera',
+           kind: 'videoinput'
+         },
+         {
+           deviceId: 'front',
+           label: 'Front Camera',
+           kind: 'videoinput'
+         }
+       ] as MediaDeviceInfo[];
+     }
+
+     async switchCamera(deviceId: string): Promise<void> {
+       if (!this.isScanning) return;
+       
+       const newLensFacing = deviceId === 'front' ? 
+         LensFacing.Front : LensFacing.Back;
+       
+       // Stop current scan
+       await this.stopScan();
+       
+       // Update lens facing
+       this.currentLensFacing = newLensFacing;
+       
+       // Restart scan with new camera
+       await this.startScan({
+         camera: deviceId as 'front' | 'back'
+       });
+     }
+
+     async getCurrentCamera(): Promise<MediaDeviceInfo | null> {
+       return {
+         deviceId: this.currentLensFacing === LensFacing.Front ? 'front' : 'back',
+         label: this.currentLensFacing === LensFacing.Front ? 
+           'Front Camera' : 'Back Camera',
+         kind: 'videoinput'
+       } as MediaDeviceInfo;
+     }
+   }
+   ```
+
+3. **Camera State Management**
+   ```typescript
+   // CapacitorQRScanner.ts
+   private async handleCameraState(): Promise<void> {
+     try {
+       // Check if camera is available
+       const { camera } = await BarcodeScanner.checkPermissions();
+       
+       if (camera === 'denied') {
+         this.updateCameraState('permission_denied');
+         return;
+       }
+       
+       // Check if camera is in use
+       const isInUse = await this.isCameraInUse();
+       if (isInUse) {
+         this.updateCameraState('in_use');
+         return;
+       }
+       
+       this.updateCameraState('ready');
+     } catch (error) {
+       this.updateCameraState('error', error.message);
+     }
+   }
+
+   private async isCameraInUse(): Promise<boolean> {
+     try {
+       // Try to start a test scan
+       await BarcodeScanner.startScan({
+         formats: [BarcodeFormat.QrCode],
+         lensFacing: this.currentLensFacing
+       });
+       // If successful, stop it immediately
+       await BarcodeScanner.stopScan();
+       return false;
+     } catch (error) {
+       return error.message.includes('camera in use');
+     }
+   }
+   ```
+
+4. **Error Handling**
+   ```typescript
+   // CapacitorQRScanner.ts
+   private async handleCameraError(error: Error): Promise<void> {
+     switch (error.name) {
+       case 'CameraPermissionDenied':
+         this.updateCameraState('permission_denied');
+         break;
+       case 'CameraInUse':
+         this.updateCameraState('in_use');
+         break;
+       case 'CameraUnavailable':
+         this.updateCameraState('not_found');
+         break;
+       default:
+         this.updateCameraState('error', error.message);
+     }
+   }
+   ```
+
+#### Platform-Specific Considerations
+
+1. **iOS Implementation**
+   - Camera permissions in Info.plist
+   - Privacy descriptions
+   - Camera usage description
+   - Background camera access
+
+   ```xml
+   <!-- ios/App/App/Info.plist -->
+   <key>NSCameraUsageDescription</key>
+   <string>We need access to your camera to scan QR codes</string>
+   <key>NSPhotoLibraryUsageDescription</key>
+   <string>We need access to save scanned QR codes</string>
+   ```
+
+2. **Android Implementation**
+   - Camera permissions in AndroidManifest.xml
+   - Runtime permission handling
+   - Camera features declaration
+   - Hardware feature requirements
+
+   ```xml
+   <!-- android/app/src/main/AndroidManifest.xml -->
+   <uses-permission android:name="android.permission.CAMERA" />
+   <uses-feature android:name="android.hardware.camera" />
+   <uses-feature android:name="android.hardware.camera.autofocus" />
+   ```
+
+3. **Platform-Specific Features**
+   - iOS: Camera orientation handling
+   - Android: Camera resolution optimization
+   - Both: Battery usage optimization
+   - Both: Memory management
+
+   ```typescript
+   // Platform-specific optimizations
+   private getPlatformSpecificOptions(): StartScanOptions {
+     const baseOptions: StartScanOptions = {
+       formats: [BarcodeFormat.QrCode],
+       lensFacing: this.currentLensFacing
+     };
+
+     if (Capacitor.getPlatform() === 'ios') {
+       return {
+         ...baseOptions,
+         // iOS-specific options
+         cameraOptions: {
+           quality: 0.7, // Lower quality for better performance
+           allowEditing: false,
+           resultType: 'uri'
+         }
+       };
+     } else if (Capacitor.getPlatform() === 'android') {
+       return {
+         ...baseOptions,
+         // Android-specific options
+         cameraOptions: {
+           quality: 0.8,
+           allowEditing: false,
+           resultType: 'uri',
+           saveToGallery: false
+         }
+       };
+     }
+
+     return baseOptions;
+   }
+   ```
+
+#### Performance Optimization
+
+1. **Battery Usage**
+   ```typescript
+   // CapacitorQRScanner.ts
+   private optimizeBatteryUsage(): void {
+     // Reduce scan frequency when battery is low
+     if (this.isLowBattery()) {
+       this.scanInterval = 2000; // 2 seconds between scans
+     } else {
+       this.scanInterval = 1000; // 1 second between scans
+     }
+   }
+
+   private isLowBattery(): boolean {
+     // Check battery level if available
+     if (Capacitor.isPluginAvailable('Battery')) {
+       const { level } = await Battery.getBatteryLevel();
+       return level < 0.2; // 20% or lower
+     }
+     return false;
+   }
+   ```
+
+2. **Memory Management**
+   ```typescript
+   // CapacitorQRScanner.ts
+   private async cleanupResources(): Promise<void> {
+     // Stop scanning
+     await this.stopScan();
+     
+     // Clear any stored camera data
+     this.currentLensFacing = LensFacing.Back;
+     
+     // Remove listeners
+     this.listenerHandles.forEach(handle => handle());
+     this.listenerHandles = [];
+     
+     // Reset state
+     this.isScanning = false;
+     this.updateCameraState('off');
+   }
+   ```
+
+#### Testing on Capacitor
+
+1. **Device Testing**
+   - Test on multiple iOS devices
+   - Test on multiple Android devices
+   - Test different camera configurations
+   - Test with different screen sizes
+   - Test with different OS versions
+
+2. **Camera Testing**
+   - Test front camera switching
+   - Test back camera switching
+   - Test camera permissions
+   - Test camera in use scenarios
+   - Test low light conditions
+   - Test different QR code sizes
+   - Test different QR code distances
+
+3. **Performance Testing**
+   - Battery usage monitoring
+   - Memory usage monitoring
+   - Camera switching speed
+   - QR code detection speed
+   - App responsiveness
+   - Background/foreground transitions

index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,viewport-fit=cover">
     <link rel="icon" href="/favicon.ico">
     <title>TimeSafari</title>
   </head>

ios/.gitignore

@@ -0,0 +1,13 @@
+App/build
+App/Pods
+App/output
+App/App/public
+DerivedData
+xcuserdata
+
+# Cordova plugins for Capacitor
+capacitor-cordova-ios-plugins
+
+# Generated Config files
+App/App/capacitor.config.json
+App/App/config.xml

ios/App/App.xcodeproj/project.pbxproj

@@ -0,0 +1,412 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 48;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
+		50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
+		504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
+		504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
+		504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
+		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
+		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
+		A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = "<group>"; };
+		50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
+		504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		504EC30C1FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
+		AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
+		FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		504EC3011FED79650016851F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		504EC2FB1FED79650016851F = {
+			isa = PBXGroup;
+			children = (
+				504EC3061FED79650016851F /* App */,
+				504EC3051FED79650016851F /* Products */,
+				7F8756D8B27F46E3366F6CEA /* Pods */,
+				27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		504EC3051FED79650016851F /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				504EC3041FED79650016851F /* App.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		504EC3061FED79650016851F /* App */ = {
+			isa = PBXGroup;
+			children = (
+				50379B222058CBB4000EE86E /* capacitor.config.json */,
+				504EC3071FED79650016851F /* AppDelegate.swift */,
+				504EC30B1FED79650016851F /* Main.storyboard */,
+				504EC30E1FED79650016851F /* Assets.xcassets */,
+				504EC3101FED79650016851F /* LaunchScreen.storyboard */,
+				504EC3131FED79650016851F /* Info.plist */,
+				2FAD9762203C412B000D30F8 /* config.xml */,
+				50B271D01FEDC1A000F3C39B /* public */,
+			);
+			path = App;
+			sourceTree = "<group>";
+		};
+		7F8756D8B27F46E3366F6CEA /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
+				AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		504EC3031FED79650016851F /* App */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
+			buildPhases = (
+				6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
+				504EC3001FED79650016851F /* Sources */,
+				504EC3011FED79650016851F /* Frameworks */,
+				504EC3021FED79650016851F /* Resources */,
+				9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = App;
+			productName = App;
+			productReference = 504EC3041FED79650016851F /* App.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		504EC2FC1FED79650016851F /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 920;
+				LastUpgradeCheck = 920;
+				TargetAttributes = {
+					504EC3031FED79650016851F = {
+						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1100;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */;
+			compatibilityVersion = "Xcode 8.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 504EC2FB1FED79650016851F;
+			packageReferences = (
+			);
+			productRefGroup = 504EC3051FED79650016851F /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				504EC3031FED79650016851F /* App */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		504EC3021FED79650016851F /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */,
+				50B271D11FEDC1A000F3C39B /* public in Resources */,
+				504EC30F1FED79650016851F /* Assets.xcassets in Resources */,
+				50379B232058CBB4000EE86E /* capacitor.config.json in Resources */,
+				504EC30D1FED79650016851F /* Main.storyboard in Resources */,
+				2FAD9763203C412B000D30F8 /* config.xml in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		504EC3001FED79650016851F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				504EC3081FED79650016851F /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		504EC30B1FED79650016851F /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				504EC30C1FED79650016851F /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		504EC3101FED79650016851F /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				504EC3111FED79650016851F /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		504EC3141FED79650016851F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		504EC3151FED79650016851F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		504EC3171FED79650016851F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 17;
+				DEVELOPMENT_TEAM = GM3FS5JQPH;
+				INFOPLIST_FILE = App/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 0.4.6;
+				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
+				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic"; /* allows agvtool to set *_VERSION settings */
+			};
+			name = Debug;
+		};
+		504EC3181FED79650016851F /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 17;
+				DEVELOPMENT_TEAM = GM3FS5JQPH;
+				INFOPLIST_FILE = App/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 0.4.6;
+				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic"; /* allows agvtool to set *_VERSION settings */
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				504EC3141FED79650016851F /* Debug */,
+				504EC3151FED79650016851F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				504EC3171FED79650016851F /* Debug */,
+				504EC3181FED79650016851F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 504EC2FC1FED79650016851F /* Project object */;
+}

ios/App/App.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:App.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

ios/App/App/AppDelegate.swift

@@ -0,0 +1,49 @@
+import UIKit
+import Capacitor
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    func applicationWillResignActive(_ application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(_ application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(_ application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+        // Called when the app was launched with a url. Feel free to add additional processing here,
+        // but if you want the App API to support tracking app url opens, make sure to keep this call
+        return ApplicationDelegateProxy.shared.application(app, open: url, options: options)
+    }
+
+    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        // Called when the app was launched with an activity, including Universal Links.
+        // Feel free to add additional processing here, but if you want the App API to support
+        // tracking app url opens, make sure to keep this call
+        return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
+    }
+
+}

ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "images": [
+    {
+      "idiom": "universal",
+      "size": "1024x1024",
+      "filename": "AppIcon-512@2x.png",
+      "platform": "ios"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

ios/App/App/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/App/App/Assets.xcassets/Splash.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "splash-2732x2732-2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "splash-2732x2732-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "splash-2732x2732.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/App/App/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <imageView key="view" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Splash" id="snD-IY-ifK">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </imageView>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="Splash" width="1366" height="1366"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

ios/App/App/Base.lproj/Main.storyboard

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14111" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+    </dependencies>
+    <scenes>
+        <!--Bridge View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="CAPBridgeViewController" customModule="Capacitor" sceneMemberID="viewController"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>

ios/App/App/Info.plist

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>TimeSafari</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>Time Safari allows you to take photos, and also scan QR codes from contacts.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Time Safari allows you to upload photos.</string>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<true/>
+</dict>
+</plist>

ios/App/App/entitlements.mac.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.debugger</key>
+    <true/>
+    <key>com.apple.security.device.audio-input</key>
+    <true/>
+    <key>com.apple.security.device.camera</key>
+    <true/>
+    <key>com.apple.security.personal-information.addressbook</key>
+    <true/>
+    <key>com.apple.security.personal-information.calendars</key>
+    <true/>
+  </dict>
+</plist>

ios/App/Podfile

@@ -0,0 +1,29 @@
+require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
+
+platform :ios, '13.0'
+use_frameworks!
+
+# workaround to avoid Xcode caching of Pods that requires
+# Product -> Clean Build Folder after new Cordova plugins installed
+# Requires CocoaPods 1.6 or newer
+install! 'cocoapods', :disable_input_output_paths => true
+
+def capacitor_pods
+  pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorMlkitBarcodeScanning', :path => '../../node_modules/@capacitor-mlkit/barcode-scanning'
+  pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
+  pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
+  pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
+  pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
+  pod 'CapawesomeCapacitorFilePicker', :path => '../../node_modules/@capawesome/capacitor-file-picker'
+end
+
+target 'App' do
+  capacitor_pods
+  # Add your Pods here
+end
+
+post_install do |installer|
+  assertDeploymentTarget(installer)
+end

ios/App/Podfile.lock

@@ -0,0 +1,144 @@
+PODS:
+  - Capacitor (6.2.1):
+    - CapacitorCordova
+  - CapacitorApp (6.0.2):
+    - Capacitor
+  - CapacitorCamera (6.1.2):
+    - Capacitor
+  - CapacitorCordova (6.2.1)
+  - CapacitorFilesystem (6.0.3):
+    - Capacitor
+  - CapacitorMlkitBarcodeScanning (6.2.0):
+    - Capacitor
+    - GoogleMLKit/BarcodeScanning (= 5.0.0)
+  - CapacitorShare (6.0.3):
+    - Capacitor
+  - CapawesomeCapacitorFilePicker (6.2.0):
+    - Capacitor
+  - GoogleDataTransport (9.4.1):
+    - GoogleUtilities/Environment (~> 7.7)
+    - nanopb (< 2.30911.0, >= 2.30908.0)
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleMLKit/BarcodeScanning (5.0.0):
+    - GoogleMLKit/MLKitCore
+    - MLKitBarcodeScanning (~> 4.0.0)
+  - GoogleMLKit/MLKitCore (5.0.0):
+    - MLKitCommon (~> 10.0.0)
+  - GoogleToolboxForMac/DebugUtils (2.3.2):
+    - GoogleToolboxForMac/Defines (= 2.3.2)
+  - GoogleToolboxForMac/Defines (2.3.2)
+  - GoogleToolboxForMac/Logger (2.3.2):
+    - GoogleToolboxForMac/Defines (= 2.3.2)
+  - "GoogleToolboxForMac/NSData+zlib (2.3.2)":
+    - GoogleToolboxForMac/Defines (= 2.3.2)
+  - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.2)":
+    - GoogleToolboxForMac/DebugUtils (= 2.3.2)
+    - GoogleToolboxForMac/Defines (= 2.3.2)
+    - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)"
+  - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)"
+  - GoogleUtilities/Environment (7.13.3):
+    - GoogleUtilities/Privacy
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Logger (7.13.3):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (7.13.3)
+  - GoogleUtilities/UserDefaults (7.13.3):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilitiesComponents (1.1.0):
+    - GoogleUtilities/Logger
+  - GTMSessionFetcher/Core (3.5.0)
+  - MLImage (1.0.0-beta5)
+  - MLKitBarcodeScanning (4.0.0):
+    - MLKitCommon (~> 10.0)
+    - MLKitVision (~> 6.0)
+  - MLKitCommon (10.0.0):
+    - GoogleDataTransport (~> 9.0)
+    - GoogleToolboxForMac/Logger (~> 2.1)
+    - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
+    - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
+    - GoogleUtilities/UserDefaults (~> 7.0)
+    - GoogleUtilitiesComponents (~> 1.0)
+    - GTMSessionFetcher/Core (< 4.0, >= 1.1)
+  - MLKitVision (6.0.0):
+    - GoogleToolboxForMac/Logger (~> 2.1)
+    - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
+    - GTMSessionFetcher/Core (< 4.0, >= 1.1)
+    - MLImage (= 1.0.0-beta5)
+    - MLKitCommon (~> 10.0)
+  - nanopb (2.30910.0):
+    - nanopb/decode (= 2.30910.0)
+    - nanopb/encode (= 2.30910.0)
+  - nanopb/decode (2.30910.0)
+  - nanopb/encode (2.30910.0)
+  - PromisesObjC (2.4.0)
+
+DEPENDENCIES:
+  - "Capacitor (from `../../node_modules/@capacitor/ios`)"
+  - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
+  - "CapacitorCamera (from `../../node_modules/@capacitor/camera`)"
+  - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
+  - "CapacitorFilesystem (from `../../node_modules/@capacitor/filesystem`)"
+  - "CapacitorMlkitBarcodeScanning (from `../../node_modules/@capacitor-mlkit/barcode-scanning`)"
+  - "CapacitorShare (from `../../node_modules/@capacitor/share`)"
+  - "CapawesomeCapacitorFilePicker (from `../../node_modules/@capawesome/capacitor-file-picker`)"
+
+SPEC REPOS:
+  trunk:
+    - GoogleDataTransport
+    - GoogleMLKit
+    - GoogleToolboxForMac
+    - GoogleUtilities
+    - GoogleUtilitiesComponents
+    - GTMSessionFetcher
+    - MLImage
+    - MLKitBarcodeScanning
+    - MLKitCommon
+    - MLKitVision
+    - nanopb
+    - PromisesObjC
+
+EXTERNAL SOURCES:
+  Capacitor:
+    :path: "../../node_modules/@capacitor/ios"
+  CapacitorApp:
+    :path: "../../node_modules/@capacitor/app"
+  CapacitorCamera:
+    :path: "../../node_modules/@capacitor/camera"
+  CapacitorCordova:
+    :path: "../../node_modules/@capacitor/ios"
+  CapacitorFilesystem:
+    :path: "../../node_modules/@capacitor/filesystem"
+  CapacitorMlkitBarcodeScanning:
+    :path: "../../node_modules/@capacitor-mlkit/barcode-scanning"
+  CapacitorShare:
+    :path: "../../node_modules/@capacitor/share"
+  CapawesomeCapacitorFilePicker:
+    :path: "../../node_modules/@capawesome/capacitor-file-picker"
+
+SPEC CHECKSUMS:
+  Capacitor: c95400d761e376be9da6be5a05f226c0e865cebf
+  CapacitorApp: e1e6b7d05e444d593ca16fd6d76f2b7c48b5aea7
+  CapacitorCamera: 9bc7b005d0e6f1d5f525b8137045b60cffffce79
+  CapacitorCordova: 8d93e14982f440181be7304aa9559ca631d77fff
+  CapacitorFilesystem: 59270a63c60836248812671aa3b15df673fbaf74
+  CapacitorMlkitBarcodeScanning: 7652be9c7922f39203a361de735d340ae37e134e
+  CapacitorShare: d2a742baec21c8f3b92b361a2fbd2401cdd8288e
+  CapawesomeCapacitorFilePicker: c40822f0a39f86855321943c7829d52bca7f01bd
+  GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
+  GoogleMLKit: 90ba06e028795a50261f29500d238d6061538711
+  GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34
+  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
+  GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
+  MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
+  MLKitBarcodeScanning: 9cb0ec5ec65bbb5db31de4eba0a3289626beab4e
+  MLKitCommon: afcd11b6c0735066a0dde8b4bf2331f6197cbca2
+  MLKitVision: 90922bca854014a856f8b649d1f1f04f63fd9c79
+  nanopb: 438bc412db1928dac798aa6fd75726007be04262
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+
+PODFILE CHECKSUM: 7e7e09e6937de7f015393aecf2cf7823645689b3
+
+COCOAPODS: 1.16.2

package.json

@@ -1,19 +1,18 @@
 {
   "name": "timesafari",
-  "version": "0.4.4",
-  "description": "TimeSafari Desktop Application",
+  "version": "0.4.6",
+  "description": "Time Safari Application",
   "author": {
-    "name": "TimeSafari Team"
+    "name": "Time Safari Team"
   },
   "scripts": {
-    "dev": "vite --config vite.config.dev.mts",
+    "dev": "vite --config vite.config.dev.mts --host",
     "serve": "vite preview",
     "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.mts",
     "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
     "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
     "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js",
-    "test-local": "npx playwright test -c playwright.config-local.ts --trace on",
-    "test-all": "npm run test:prerequisites && npm run build && npm run test:web && npm run test:mobile",
+    "test:all": "npm run test:prerequisites && npm run build && npm run test:web && npm run test:mobile",
     "test:prerequisites": "node scripts/check-prerequisites.js",
     "test:web": "npx playwright test -c playwright.config-local.ts --trace on",
     "test:mobile": "npm run build:capacitor && npm run test:android && npm run test:ios",
@@ -23,11 +22,13 @@
     "check:ios-device": "xcrun xctrace list devices 2>&1 | grep -w 'Booted' || (echo 'No iOS simulator running' && exit 1)",
     "clean:electron": "rimraf dist-electron",
     "build:pywebview": "vite build --config vite.config.pywebview.mts",
-    "build:electron": "npm run clean:electron && vite build --config vite.config.electron.mts && node scripts/build-electron.js",
-    "build:capacitor": "vite build --config vite.config.capacitor.mts",
-    "build:web": "vite build --config vite.config.web.mts",
-    "electron:dev": "npm run build && electron dist-electron",
-    "electron:start": "electron dist-electron",
+    "build:electron": "npm run clean:electron && tsc -p tsconfig.electron.json && vite build --config vite.config.electron.mts && node scripts/build-electron.js",
+    "build:capacitor": "vite build --mode capacitor --config vite.config.capacitor.mts",
+    "build:web": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.web.mts",
+    "electron:dev": "npm run build && electron .",
+    "electron:start": "electron .",
+    "clean:android": "adb uninstall app.timesafari.app || true",
+    "build:android": "npm run clean:android && rm -rf dist && npm run build:web && npm run build:capacitor && cd android && ./gradlew clean && ./gradlew assembleDebug && cd .. && npx cap sync android && npx capacitor-assets generate --android && npx cap open android",
     "electron:build-linux": "npm run build:electron && electron-builder --linux AppImage",
     "electron:build-linux-deb": "npm run build:electron && electron-builder --linux deb",
     "electron:build-linux-prod": "NODE_ENV=production npm run build:electron && electron-builder --linux AppImage",
@@ -40,14 +41,21 @@
     "fastlane:ios:beta": "cd ios && fastlane beta",
     "fastlane:ios:release": "cd ios && fastlane release",
     "fastlane:android:beta": "cd android && fastlane beta",
-    "fastlane:android:release": "cd android && fastlane release"
+    "fastlane:android:release": "cd android && fastlane release",
+    "electron:build-mac": "npm run build:electron-prod && electron-builder --mac",
+    "electron:build-mac-universal": "npm run build:electron-prod && electron-builder --mac --universal"
   },
   "dependencies": {
+    "@capacitor-mlkit/barcode-scanning": "^6.0.0",
     "@capacitor/android": "^6.2.0",
     "@capacitor/app": "^6.0.0",
+    "@capacitor/camera": "^6.0.0",
     "@capacitor/cli": "^6.2.0",
     "@capacitor/core": "^6.2.0",
+    "@capacitor/filesystem": "^6.0.0",
     "@capacitor/ios": "^6.2.0",
+    "@capacitor/share": "^6.0.3",
+    "@capawesome/capacitor-file-picker": "^6.2.0",
     "@dicebear/collection": "^5.4.1",
     "@dicebear/core": "^5.4.1",
     "@ethersproject/hdnode": "^5.7.0",
@@ -87,6 +95,7 @@
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
     "js-yaml": "^4.1.0",
+    "jsqr": "^1.4.0",
     "leaflet": "^1.9.4",
     "localstorage-slim": "^2.7.0",
     "lru-cache": "^10.2.0",
@@ -118,6 +127,7 @@
     "zod": "^3.24.2"
   },
   "devDependencies": {
+    "@capacitor/assets": "^3.0.5",
     "@playwright/test": "^1.45.2",
     "@types/dom-webcodecs": "^0.1.7",
     "@types/js-yaml": "^4.0.9",
@@ -162,13 +172,12 @@
     },
     "files": [
       "dist-electron/**/*",
-      "src/electron/**/*",
-      "main.js"
+      "dist/**/*"
     ],
     "extraResources": [
       {
-        "from": "dist-electron",
-        "to": "."
+        "from": "dist",
+        "to": "www"
       }
     ],
     "linux": {
@@ -179,6 +188,32 @@
       "category": "Office",
       "icon": "build/icon.png"
     },
-    "asar": true
+    "asar": true,
+    "mac": {
+      "target": [
+        "dmg",
+        "zip"
+      ],
+      "category": "public.app-category.productivity",
+      "icon": "build/icon.png",
+      "hardenedRuntime": true,
+      "gatekeeperAssess": false,
+      "entitlements": "ios/App/App/entitlements.mac.plist",
+      "entitlementsInherit": "ios/App/App/entitlements.mac.plist"
+    },
+    "dmg": {
+      "contents": [
+        {
+          "x": 130,
+          "y": 220
+        },
+        {
+          "x": 410,
+          "y": 220,
+          "type": "link",
+          "path": "/Applications"
+        }
+      ]
+    }
   }
 }

pkgx.yaml

@@ -1,5 +1,6 @@
 dependencies:
   - gradle
   - java
+  - pod
 
 # other dependencies are discovered via package.json & requirements.txt & Gemfile (I'm guessing).

playwright.config-local.ts

@@ -46,21 +46,21 @@ export default defineConfig({
 
   /* Configure projects for major browsers */
   projects: [
-    {
-      name: 'chromium-serial',
-      testMatch: /.*\/(35-record-gift-from-image-share|40-add-contact)\.spec\.ts/,
-      use: {
-        ...devices['Desktop Chrome'],
-        permissions: ["clipboard-read"],
-      },
-      workers: 1, // Force serial execution for problematic tests
-    },
-    {
-      name: 'firefox-serial',
-      testMatch: /.*\/(35-record-gift-from-image-share|40-add-contact)\.spec\.ts/,
-      use: { ...devices['Desktop Firefox'] },
-      workers: 1,
-    },
+    // {
+    //   name: 'chromium-serial',
+    //   testMatch: /.*\/(35-record-gift-from-image-share|40-add-contact)\.spec\.ts/,
+    //   use: {
+    //     ...devices['Desktop Chrome'],
+    //     permissions: ["clipboard-read"],
+    //   },
+    //   workers: 1, // Force serial execution for problematic tests
+    // },
+    // {
+    //   name: 'firefox-serial',
+    //   testMatch: /.*\/(35-record-gift-from-image-share|40-add-contact)\.spec\.ts/,
+    //   use: { ...devices['Desktop Firefox'] },
+    //   workers: 1,
+    // },
     {
       name: 'chromium',
       testMatch: /^(?!.*\/(35-record-gift-from-image-share|40-add-contact)\.spec\.ts).+\.spec\.ts$/,
@@ -76,32 +76,26 @@ export default defineConfig({
     },
 
     /* Test against mobile viewports. */
-
-    {
-      name: "Mobile Chrome",
-      use: { ...devices["Pixel 5"] },
-    },
-    {
-      name: "Mobile Safari",
-      use: { ...devices["iPhone 12"] },
-    },
+    // {
+    //   name: "Mobile Chrome",
+    //   use: { ...devices["Pixel 5"] },
+    // },
+    // {
+    //   name: "Mobile Safari",
+    //   use: { ...devices["iPhone 12"] },
+    // },
 
     /* Test against branded browsers. */
-
     // {
     //   name: 'Microsoft Edge',
     //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
     // },
-    {
-      name: "Google Chrome",
-      use: { ...devices["Desktop Chrome"], channel: "chrome" },
-    },
   ],
 
   /* Configure global timeout; default is 30000 milliseconds */
   // the image upload will often not succeed in 5 seconds
   // 33-record-gift-x10.spec.ts:90:5 > Record 9 new gifts will often not succeed in 30 seconds
-  timeout: 35000, // various tests fail at various times with 25000
+  timeout: 45000, // various tests fail at various times with 25000
 
   /* Run your local dev server before starting the tests */
   /**

scripts/build-electron.js

@@ -1,98 +1,243 @@
+const fs = require('fs');
 const path = require('path');
-const fs = require('fs-extra');
 
-async function main() {
-  try {
     console.log('Starting electron build process...');
 
-    // Create dist directory if it doesn't exist
-    const distElectronDir = path.resolve(__dirname, '../dist-electron');
-    await fs.ensureDir(distElectronDir);
-
     // Copy web files
-    const wwwDir = path.join(distElectronDir, 'www');
-    await fs.ensureDir(wwwDir);
-    await fs.copy('dist', wwwDir);
+const webDistPath = path.join(__dirname, '..', 'dist');
+const electronDistPath = path.join(__dirname, '..', 'dist-electron');
+const wwwPath = path.join(electronDistPath, 'www');
 
-    // Copy and fix index.html
-    const indexPath = path.join(wwwDir, 'index.html');
-    let indexContent = await fs.readFile(indexPath, 'utf8');
+// Create www directory if it doesn't exist
+if (!fs.existsSync(wwwPath)) {
+  fs.mkdirSync(wwwPath, { recursive: true });
+}
 
-    // More comprehensive path fixing
+// Copy web files to www directory
+fs.cpSync(webDistPath, wwwPath, { recursive: true });
+
+// Fix asset paths in index.html
+const indexPath = path.join(wwwPath, 'index.html');
+let indexContent = fs.readFileSync(indexPath, 'utf8');
+
+// Fix asset paths
     indexContent = indexContent
-      // Fix absolute paths to be relative
-      .replace(/src="\//g, 'src="\./')
-      .replace(/href="\//g, 'href="\./')
-      // Fix modulepreload paths
-      .replace(/<link [^>]*rel="modulepreload"[^>]*href="\/assets\//g, '<link rel="modulepreload" as="script" crossorigin="" href="./assets/')
-      .replace(/<link [^>]*rel="modulepreload"[^>]*href="\.\/assets\//g, '<link rel="modulepreload" as="script" crossorigin="" href="./assets/')
-      // Fix stylesheet paths
-      .replace(/<link [^>]*rel="stylesheet"[^>]*href="\/assets\//g, '<link rel="stylesheet" crossorigin="" href="./assets/')
-      .replace(/<link [^>]*rel="stylesheet"[^>]*href="\.\/assets\//g, '<link rel="stylesheet" crossorigin="" href="./assets/')
-      // Fix script paths
-      .replace(/src="\/assets\//g, 'src="./assets/')
-      .replace(/src="\.\/assets\//g, 'src="./assets/')
-      // Fix any remaining asset paths
-      .replace(/(['"]\/?)(assets\/)/g, '"./assets/');
+  .replace(/\/assets\//g, './assets/')
+  .replace(/href="\//g, 'href="./')
+  .replace(/src="\//g, 'src="./');
 
-    // Debug output
+fs.writeFileSync(indexPath, indexContent);
+
+// Check for remaining /assets/ paths
     console.log('After path fixing, checking for remaining /assets/ paths:', indexContent.includes('/assets/'));
-    console.log('Sample of fixed content:', indexContent.slice(0, 500));
-
-    await fs.writeFile(indexPath, indexContent);
+console.log('Sample of fixed content:', indexContent.substring(0, 500));
     
-    console.log('Copied and fixed web files in:', wwwDir);
+console.log('Copied and fixed web files in:', wwwPath);
 
     // Copy main process files
     console.log('Copying main process files...');
-    const mainProcessFiles = [
-      ['src/electron/main.js', 'main.js'],
-      ['src/electron/preload.js', 'preload.js']
-    ];
 
-    for (const [src, dest] of mainProcessFiles) {
-      const destPath = path.join(distElectronDir, dest);
-      console.log(`Copying ${src} to ${destPath}`);
-      await fs.copy(src, destPath);
-    }
+// Create the main process file with inlined logger
+const mainContent = `const { app, BrowserWindow } = require("electron");
+const path = require("path");
+const fs = require("fs");
 
-    // Create package.json for production
-    const devPackageJson = require('../package.json');
-    const prodPackageJson = {
-      name: devPackageJson.name,
-      version: devPackageJson.version,
-      description: devPackageJson.description,
-      author: devPackageJson.author,
-      main: 'main.js',
-      private: true,
-    };
+// Inline logger implementation
+const logger = {
+  log: (...args) => console.log(...args),
+  error: (...args) => console.error(...args),
+  info: (...args) => console.info(...args),
+  warn: (...args) => console.warn(...args),
+  debug: (...args) => console.debug(...args),
+};
 
-    await fs.writeJson(
-      path.join(distElectronDir, 'package.json'),
-      prodPackageJson,
-      { spaces: 2 }
-    );
+// Check if running in dev mode
+const isDev = process.argv.includes("--inspect");
 
-    // Verify the build
-    console.log('\nVerifying build structure:');
-    const files = await fs.readdir(distElectronDir);
-    console.log('Files in dist-electron:', files);
+function createWindow() {
+  // Add before createWindow function
+  const preloadPath = path.join(__dirname, "preload.js");
+  logger.log("Checking preload path:", preloadPath);
+  logger.log("Preload exists:", fs.existsSync(preloadPath));
 
-    if (!files.includes('main.js')) {
-      throw new Error('main.js not found in build directory');
-    }
-    if (!files.includes('preload.js')) {
-      throw new Error('preload.js not found in build directory');
-    }
-    if (!files.includes('package.json')) {
-      throw new Error('package.json not found in build directory');
-    }
+  // Create the browser window.
+  const mainWindow = new BrowserWindow({
+    width: 1200,
+    height: 800,
+    webPreferences: {
+      nodeIntegration: false,
+      contextIsolation: true,
+      webSecurity: true,
+      allowRunningInsecureContent: false,
+      preload: path.join(__dirname, "preload.js"),
+    },
+  });
 
-    console.log('Build completed successfully!');
-  } catch (error) {
-    console.error('Build failed:', error);
-    process.exit(1);
+  // Always open DevTools for now
+  mainWindow.webContents.openDevTools();
+
+  // Intercept requests to fix asset paths
+  mainWindow.webContents.session.webRequest.onBeforeRequest(
+    {
+      urls: [
+        "file://*/*/assets/*",
+        "file://*/assets/*",
+        "file:///assets/*", // Catch absolute paths
+        "<all_urls>", // Catch all URLs as a fallback
+      ],
+    },
+    (details, callback) => {
+      let url = details.url;
+
+      // Handle paths that don't start with file://
+      if (!url.startsWith("file://") && url.includes("/assets/")) {
+        url = \`file://\${path.join(__dirname, "www", url)}\`;
+      }
+
+      // Handle absolute paths starting with /assets/
+      if (url.includes("/assets/") && !url.includes("/www/assets/")) {
+        const baseDir = url.includes("dist-electron")
+          ? url.substring(
+              0,
+              url.indexOf("/dist-electron") + "/dist-electron".length,
+            )
+          : \`file://\${__dirname}\`;
+        const assetPath = url.split("/assets/")[1];
+        const newUrl = \`\${baseDir}/www/assets/\${assetPath}\`;
+        callback({ redirectURL: newUrl });
+        return;
+      }
+
+      callback({}); // No redirect for other URLs
+    },
+  );
+
+  if (isDev) {
+    // Debug info
+    logger.log("Debug Info:");
+    logger.log("Running in dev mode:", isDev);
+    logger.log("App is packaged:", app.isPackaged);
+    logger.log("Process resource path:", process.resourcesPath);
+    logger.log("App path:", app.getAppPath());
+    logger.log("__dirname:", __dirname);
+    logger.log("process.cwd():", process.cwd());
   }
+
+  const indexPath = path.join(__dirname, "www", "index.html");
+
+  if (isDev) {
+    logger.log("Loading index from:", indexPath);
+    logger.log("www path:", path.join(__dirname, "www"));
+    logger.log("www assets path:", path.join(__dirname, "www", "assets"));
+  }
+
+  if (!fs.existsSync(indexPath)) {
+    logger.error(\`Index file not found at: \${indexPath}\`);
+    throw new Error("Index file not found");
+  }
+
+  // Add CSP headers to allow API connections, Google Fonts, and zxing-wasm
+  mainWindow.webContents.session.webRequest.onHeadersReceived(
+    (details, callback) => {
+      callback({
+        responseHeaders: {
+          ...details.responseHeaders,
+          "Content-Security-Policy": [
+            "default-src 'self';" +
+            "connect-src 'self' https://api.endorser.ch https://*.timesafari.app https://*.jsdelivr.net;" +
+            "img-src 'self' data: https: blob:;" +
+            "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.jsdelivr.net;" +
+            "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;" +
+            "font-src 'self' data: https://fonts.gstatic.com;" +
+            "style-src-elem 'self' 'unsafe-inline' https://fonts.googleapis.com;" +
+            "worker-src 'self' blob:;",
+          ],
+        },
+      });
+    },
+  );
+
+  // Load the index.html
+  mainWindow
+    .loadFile(indexPath)
+    .then(() => {
+      logger.log("Successfully loaded index.html");
+      if (isDev) {
+        mainWindow.webContents.openDevTools();
+        logger.log("DevTools opened - running in dev mode");
+      }
+    })
+    .catch((err) => {
+      logger.error("Failed to load index.html:", err);
+      logger.error("Attempted path:", indexPath);
+    });
+
+  // Listen for console messages from the renderer
+  mainWindow.webContents.on("console-message", (_event, _level, message) => {
+    logger.log("Renderer Console:", message);
+  });
+
+  // Add right after creating the BrowserWindow
+  mainWindow.webContents.on(
+    "did-fail-load",
+    (_event, errorCode, errorDescription) => {
+      logger.error("Page failed to load:", errorCode, errorDescription);
+    },
+  );
+
+  mainWindow.webContents.on("preload-error", (_event, preloadPath, error) => {
+    logger.error("Preload script error:", preloadPath, error);
+  });
+
+  mainWindow.webContents.on(
+    "console-message",
+    (_event, _level, message, line, sourceId) => {
+      logger.log("Renderer Console:", line, sourceId, message);
+    },
+  );
+
+  // Enable remote debugging when in dev mode
+  if (isDev) {
+    mainWindow.webContents.openDevTools();
+    }
 }
 
-main(); 
+// Handle app ready
+app.whenReady().then(createWindow);
+
+// Handle all windows closed
+app.on("window-all-closed", () => {
+  if (process.platform !== "darwin") {
+    app.quit();
+  }
+});
+
+app.on("activate", () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createWindow();
+  }
+});
+
+// Handle any errors
+process.on("uncaughtException", (error) => {
+  logger.error("Uncaught Exception:", error);
+});
+`;
+
+// Write the main process file
+const mainDest = path.join(electronDistPath, 'main.js');
+fs.writeFileSync(mainDest, mainContent);
+
+// Copy preload script if it exists
+const preloadSrc = path.join(__dirname, '..', 'src', 'electron', 'preload.js');
+const preloadDest = path.join(electronDistPath, 'preload.js');
+if (fs.existsSync(preloadSrc)) {
+  console.log(`Copying ${preloadSrc} to ${preloadDest}`);
+  fs.copyFileSync(preloadSrc, preloadDest);
+}
+
+// Verify build structure
+console.log('\nVerifying build structure:');
+console.log('Files in dist-electron:', fs.readdirSync(electronDistPath));
+
+console.log('Build completed successfully!'); 

scripts/copy-web-assets.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Clean the public directory
+rm -rf android/app/src/main/assets/public/*
+
+# Copy web assets
+cp -r dist/* android/app/src/main/assets/public/
+
+# Ensure the directory structure exists
+mkdir -p android/app/src/main/assets/public/assets
+
+# Copy the main index file
+cp dist/index.html android/app/src/main/assets/public/
+
+# Copy all assets
+cp -r dist/assets/* android/app/src/main/assets/public/assets/
+
+# Copy other necessary files
+cp dist/favicon.ico android/app/src/main/assets/public/
+cp dist/robots.txt android/app/src/main/assets/public/
+
+echo "Web assets copied successfully!" 

scripts/generate-icons.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Create directories if they don't exist
+mkdir -p android/app/src/main/res/mipmap-mdpi
+mkdir -p android/app/src/main/res/mipmap-hdpi
+mkdir -p android/app/src/main/res/mipmap-xhdpi
+mkdir -p android/app/src/main/res/mipmap-xxhdpi
+mkdir -p android/app/src/main/res/mipmap-xxxhdpi
+
+# Generate placeholder icons using ImageMagick
+convert -size 48x48 xc:blue -gravity center -pointsize 20 -fill white -annotate 0 "TS" android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+convert -size 72x72 xc:blue -gravity center -pointsize 30 -fill white -annotate 0 "TS" android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+convert -size 96x96 xc:blue -gravity center -pointsize 40 -fill white -annotate 0 "TS" android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+convert -size 144x144 xc:blue -gravity center -pointsize 60 -fill white -annotate 0 "TS" android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+convert -size 192x192 xc:blue -gravity center -pointsize 80 -fill white -annotate 0 "TS" android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+
+# Copy to round versions
+cp android/app/src/main/res/mipmap-mdpi/ic_launcher.png android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+cp android/app/src/main/res/mipmap-hdpi/ic_launcher.png android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+cp android/app/src/main/res/mipmap-xhdpi/ic_launcher.png android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+cp android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+cp android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png 

scripts/openssl_signing_console.sh

@@ -4,9 +4,9 @@
 #
 # Prerequisites: openssl, jq
 #
-# Usage: source ./openssl_signing_console.sh
+# Usage: source /scripts/openssl_signing_console.sh
 #
-# For a more complete explanation, see ./openssl_signing_console.rst
+# For a more complete explanation, see /doc/openssl_signing_console.rst
 
 
 # Generate a key and extract the public part

scripts/test-android.js

@@ -30,6 +30,7 @@
  * 
  * @requires child_process
  * @requires path
+ * @requires readline
  * 
  * @author TimeSafari Team
  * @license MIT
@@ -37,7 +38,14 @@
 
 const { execSync } = require('child_process');
 const { join } = require('path');
-const { existsSync, mkdirSync, appendFileSync, readFileSync } = require('fs');
+const { existsSync, mkdirSync, appendFileSync, readFileSync, writeFileSync } = require('fs');
+const readline = require('readline');
+const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
+
+const question = (prompt) => new Promise((resolve) => rl.question(prompt, resolve));
 
 // Format date as YYYY-MM-DD-HHMMSS
 const getLogFileName = () => {
@@ -88,11 +96,57 @@ const verifyJavaInstallation = (log) => {
 // Generate test data using generate_data.ts
 const generateTestData = async (log) => {
     log('🔄 Generating test data...');
+    
+    // Create .generated directory if it doesn't exist
+    if (!existsSync('.generated')) {
+        mkdirSync('.generated', { recursive: true });
+    }
+
     try {
-        execSync('npx ts-node test-scripts/generate_data.ts', { stdio: 'inherit' });
+        // Generate test data
+        const testData = {
+            CONTACT1_DID: "did:ethr:0x1943754837A09684Fd6380C1D80aa53E3F20E338",
+            CLAIM_ID: "01JPVVX7FH0EKQWTQY9HTXZQDZ"
+        };
+
+        const claimDetails = {
+            claim_id: "01JPVVX7FH0EKQWTQY9HTXZQDZ",
+            issuedAt: "2025-03-21T08:07:57ZZ",
+            issuer: "did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F"
+        };
+
+        const contacts = [
+            {
+                did: "did:ethr:0x1943754837A09684Fd6380C1D80aa53E3F20E338",
+                name: "Test Contact"
+            }
+        ];
+
+        // Write files
+        log('📝 Writing test data files...');
+        writeFileSync('.generated/test-env.json', JSON.stringify(testData, null, 2));
+        writeFileSync('.generated/claim_details.json', JSON.stringify(claimDetails, null, 2));
+        writeFileSync('.generated/contacts.json', JSON.stringify(contacts, null, 2));
+
+        // Verify files were written
+        log('✅ Verifying test data files...');
+        const files = [
+            '.generated/test-env.json',
+            '.generated/claim_details.json',
+            '.generated/contacts.json'
+        ];
+
+        for (const file of files) {
+            if (!existsSync(file)) {
+                throw new Error(`Failed to create ${file}`);
+            }
+            log(`✅ Created ${file}`);
+        }
+
         log('✅ Test data generated successfully');
     } catch (error) {
-        throw new Error(`Failed to generate test data: ${error.message}`);
+        log(`❌ Failed to generate test data: ${error.message}`);
+        throw error;
     }
 };
 
@@ -116,14 +170,24 @@ const executeDeeplink = async (url, description, log) => {
     
     try {
         // Stop the app before executing the deep link
-        execSync('adb shell am force-stop app.timesafari.app');
+        execSync('adb shell am force-stop app.timesafari');
         await new Promise(resolve => setTimeout(resolve, 1000)); // Wait 1s
         
         execSync(`adb shell am start -W -a android.intent.action.VIEW -d "${url}" -c android.intent.category.BROWSABLE`);
         log(`✅ Successfully executed: ${description}`);
         
-        // Wait between deeplink tests
-        await new Promise(resolve => setTimeout(resolve, 5000)); // Wait 5s
+        // Wait for app to load content
+        await new Promise(resolve => setTimeout(resolve, 3000)); 
+        
+        // Wait for user confirmation before continuing
+        await question('\n⏎  Press Enter to continue to next test (or Ctrl+C to quit)...');
+        
+        // Press Back button to ensure app is in consistent state
+        log(`📱 Sending keystroke (BACK) to device...`);
+        execSync('adb shell input keyevent KEYCODE_BACK');
+        
+        // Small delay after keystroke
+        await new Promise(resolve => setTimeout(resolve, 2000));
     } catch (error) {
         log(`❌ Failed to execute deeplink: ${description}`);
         log(`Error: ${error.message}`);
@@ -137,11 +201,11 @@ const runDeeplinkTests = async (log) => {
     
     try {
         // Load test data
-        const testEnv = parseEnvFile('.generated/test-env.sh');
+        const testEnv = JSON.parse(readFileSync('.generated/test-env.json', 'utf8'));
         const claimDetails = JSON.parse(readFileSync('.generated/claim_details.json', 'utf8'));
         const contacts = JSON.parse(readFileSync('.generated/contacts.json', 'utf8'));
 
-        // Test each deeplink
+        // Test URLs
         const deeplinkTests = [
             {
                 url: `timesafari://claim/${claimDetails.claim_id}`,
@@ -173,26 +237,44 @@ const runDeeplinkTests = async (log) => {
             }
         ];
 
-        // Execute each test
-        for (const test of deeplinkTests) {
-            await executeDeeplink(test.url, test.description, log);
-        }
+        // Show test plan
+        log('\n📋 Test Plan:');
+        deeplinkTests.forEach((test, i) => {
+            log(`${i + 1}. ${test.description}`);
+        });
 
-        let succeeded = true;
-        try {
-            await executeDeeplink('timesafari://contactJunk', 'Non-existent deeplink', log);
-        } catch (error) {
-            log('✅ Non-existent deeplink failed as expected');
-            succeeded = false;
-        } finally {
-            if (succeeded) {
-                throw new Error('Non-existent deeplink should have failed');
+        // Execute each test
+        let testsCompleted = 0;
+        for (const test of deeplinkTests) {
+            // Show progress
+            log(`\n📊 Progress: ${testsCompleted}/${deeplinkTests.length} tests completed`);
+            
+            // Show upcoming test info
+            log('\n📱 NEXT TEST:');
+            log('------------------------');
+            log(`Description: ${test.description}`);
+            log(`URL: ${test.url}`);
+            log('------------------------');
+
+            await executeDeeplink(test.url, test.description, log);
+            testsCompleted++;
+
+            // If there are more tests, show the next one
+            if (testsCompleted < deeplinkTests.length) {
+                const nextTest = deeplinkTests[testsCompleted];
+                log('\n⏭️  NEXT UP:');
+                log('------------------------');
+                log(`Next test will be: ${nextTest.description}`);
+                log(`URL: ${nextTest.url}`);
+                log('------------------------');
             }
         }
 
-        log('✅ All deeplink tests completed successfully');
+        log('\n🎉 All deeplink tests completed successfully!');
+        rl.close(); // Close readline interface when done
     } catch (error) {
         log('❌ Deeplink tests failed');
+        rl.close(); // Close readline interface on error
         throw error;
     }
 };
@@ -214,24 +296,88 @@ const configureAndroidProject = async (log) => {
 
     log('⚙️ Configuring Gradle properties...');
     const gradleProps = 'android/gradle.properties';
-    if (!existsSync(gradleProps) || !execSync(`grep -q "android.suppressUnsupportedCompileSdk=34" ${gradleProps}`)) {
+    
+    // Create file if it doesn't exist
+    if (!existsSync(gradleProps)) {
+        execSync('touch android/gradle.properties');
+    }
+
+    // Check if line exists without using grep
+    const gradleContent = readFileSync(gradleProps, 'utf8');
+    if (!gradleContent.includes('android.suppressUnsupportedCompileSdk=34')) {
         execSync('echo "android.suppressUnsupportedCompileSdk=34" >> android/gradle.properties');
         log('✅ Added SDK suppression to gradle.properties');
+    } else {
+        log('✅ SDK suppression already configured in gradle.properties');
     }
 };
 
 // Build and test Android project
 const buildAndTestAndroid = async (log, env) => {
     log('🏗️ Building Android project...');
+    
+    // Kill and restart ADB server first
+    try {
+        log('🔄 Restarting ADB server...');
+        execSync('adb kill-server', { stdio: 'inherit' });
+        await new Promise(resolve => setTimeout(resolve, 2000)); // Wait 2s
+        execSync('adb start-server', { stdio: 'inherit' });
+        await new Promise(resolve => setTimeout(resolve, 3000)); // Wait 3s
+        
+        // Verify device connection
+        const devices = execSync('adb devices').toString();
+        if (!devices.includes('\tdevice')) {
+            throw new Error('No devices connected after ADB restart');
+        }
+        log('✅ ADB server restarted successfully');
+    } catch (error) {
+        log(`⚠️ ADB restart failed: ${error.message}`);
+        log('Continuing with build process...');
+    }
+
+    // Clean build
+    log('🧹 Cleaning project...');
     execSync('cd android && ./gradlew clean', { stdio: 'inherit', env });
     log('✅ Gradle clean completed');
     
+    // Build
+    log('🏗️ Building project...');
     execSync('cd android && ./gradlew build', { stdio: 'inherit', env });
     log('✅ Gradle build completed');
 
+    // Run tests with retry
     log('🧪 Running Android tests...');
-    execSync('cd android && ./gradlew connectedAndroidTest', { stdio: 'inherit', env });
-    log('✅ Android tests completed');
+    let retryCount = 0;
+    const maxRetries = 3;
+
+    while (retryCount < maxRetries) {
+        try {
+            // Verify ADB connection before tests
+            execSync('adb devices', { stdio: 'inherit' });
+            
+            // Run the tests
+            execSync('cd android && ./gradlew connectedAndroidTest', { 
+                stdio: 'inherit', 
+                env,
+                timeout: 60000 // 1 minute timeout
+            });
+            log('✅ Android tests completed');
+            return;
+        } catch (error) {
+            retryCount++;
+            log(`⚠️ Test attempt ${retryCount} failed: ${error.message}`);
+            
+            if (retryCount < maxRetries) {
+                log('🔄 Restarting ADB and retrying...');
+                execSync('adb kill-server', { stdio: 'inherit' });
+                await new Promise(resolve => setTimeout(resolve, 2000));
+                execSync('adb start-server', { stdio: 'inherit' });
+                await new Promise(resolve => setTimeout(resolve, 3000));
+            } else {
+                throw new Error(`Android tests failed after ${maxRetries} attempts`);
+            }
+        }
+    }
 };
 
 // Run the app
@@ -296,4 +442,10 @@ async function runAndroidTests() {
 }
 
 // Execute the test suite
-runAndroidTests(); 
+runAndroidTests();
+
+// Add cleanup handler for SIGINT
+process.on('SIGINT', () => {
+    rl.close();
+    process.exit();
+}); 

scripts/test-ios.js

@@ -6,9 +6,11 @@
  * web build and runs the test suite on a specified iOS simulator.
  * 
  * Process flow:
- * 1. Sync Capacitor project with latest web build
- * 2. Build app for iOS simulator
- * 3. Run XCTest suite
+ * 1. Clean and reset iOS platform (if needed)
+ * 2. Check prerequisites (Xcode, CocoaPods, Capacitor setup)
+ * 3. Sync Capacitor project with latest web build
+ * 4. Build app for iOS simulator
+ * 5. Run XCTest suite
  * 
  * Prerequisites:
  * - macOS operating system
@@ -38,7 +40,21 @@
 
 const { execSync } = require('child_process');
 const { join } = require('path');
-const { existsSync, mkdirSync, appendFileSync, readFileSync } = require('fs');
+const { existsSync, mkdirSync, appendFileSync, readFileSync, writeFileSync, readdirSync, statSync, accessSync } = require('fs');
+const readline = require('readline');
+const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
+const { constants } = require('fs');
+
+const question = (prompt) => new Promise((resolve) => rl.question(prompt, resolve));
+
+// Make sure to close readline at the end
+process.on('SIGINT', () => {
+    rl.close();
+    process.exit();
+});
 
 // Format date as YYYY-MM-DD-HHMMSS
 const getLogFileName = () => {
@@ -58,6 +74,169 @@ const createLogger = (logFile) => {
     };
 };
 
+/**
+ * Clean up and reset iOS platform
+ * This function completely removes and recreates the iOS platform to ensure a fresh setup
+ * @param {function} log - Logging function
+ * @returns {boolean} - Success status
+ */
+const cleanIosPlatform = async (log) => {
+    log('🧹 Cleaning iOS platform (complete reset)...');
+    
+    // Check for package.json and capacitor.config.ts/js
+    if (!existsSync('package.json')) {
+        log('⚠️ package.json not found. Are you in the correct directory?');
+        throw new Error('package.json not found. Cannot continue without project configuration.');
+    }
+    log('✅ package.json exists');
+    
+    const capacitorConfigExists = 
+        existsSync('capacitor.config.ts') || 
+        existsSync('capacitor.config.js') || 
+        existsSync('capacitor.config.json');
+    
+    if (!capacitorConfigExists) {
+        log('⚠️ Capacitor config file not found');
+        log('Creating minimal capacitor.config.ts...');
+        
+        try {
+            // Get app name from package.json
+            const packageJson = JSON.parse(readFileSync('package.json', 'utf8'));
+            const appName = packageJson.name || 'App';
+            const appId = packageJson.build.appId || 'io.ionic.starter';
+            
+            // Create a minimal capacitor config
+            const capacitorConfig = `
+import { CapacitorConfig } from '@capacitor/cli';
+
+const config: CapacitorConfig = {
+  appId: '${appId}',
+  appName: '${appName}',
+  webDir: 'dist',
+  bundledWebRuntime: false
+};
+
+export default config;
+            `.trim();
+            
+            writeFileSync('capacitor.config.ts', capacitorConfig);
+            log('✅ Created capacitor.config.ts');
+        } catch (configError) {
+            log('⚠️ Failed to create Capacitor config file');
+            log('Please create a capacitor.config.ts file manually');
+            throw new Error('Capacitor configuration missing. Please configure manually.');
+        }
+    } else {
+        log('✅ Capacitor config exists');
+    }
+    
+    // Check if the platform exists first
+    if (existsSync('ios')) {
+        log('🗑️ Removing existing iOS platform directory...');
+        try {
+            execSync('rm -rf ios', { stdio: 'inherit' });
+            log('✅ Existing iOS platform removed');
+        } catch (error) {
+            log(`⚠️ Error removing iOS platform: ${error.message}`);
+            log('⚠️ You may need to manually remove the ios directory');
+            return false;
+        }
+    }
+    
+    // Rebuild web assets first to ensure they're available
+    log('🔄 Building web assets before adding iOS platform...');
+    try {
+        execSync('rm -rf dist', { stdio: 'inherit' });
+        execSync('npm run build:web', { stdio: 'inherit' });
+        execSync('npm run build:capacitor', { stdio: 'inherit' });
+        log('✅ Web assets built successfully');
+    } catch (error) {
+        log(`⚠️ Error building web assets: ${error.message}`);
+        log('⚠️ Continuing with platform addition, but it may fail if web assets are required');
+    }
+    
+    // Add the platform back
+    log('➕ Adding iOS platform...');
+    try {
+        execSync('npx cap add ios', { stdio: 'inherit' });
+        log('✅ iOS platform added successfully');
+        
+        // Verify critical files were created
+        if (!existsSync('ios/App/Podfile')) {
+            log('⚠️ Podfile was not created - something is wrong with the Capacitor setup');
+            return false;
+        }
+        
+        if (!existsSync('ios/App/App/Info.plist')) {
+            log('⚠️ Info.plist was not created - something is wrong with the Capacitor setup');
+            return false;
+        }
+        
+        log('✅ iOS platform setup verified - critical files exist');
+        return true;
+    } catch (error) {
+        log(`⚠️ Error adding iOS platform: ${error.message}`);
+        return false;
+    }
+};
+
+/**
+ * Check all prerequisites for iOS testing
+ * Verifies and attempts to install/initialize all required components
+ */
+const checkPrerequisites = async (log) => {
+    log('🔍 Checking prerequisites for iOS testing...');
+    
+    // Check for macOS
+    if (process.platform !== 'darwin') {
+        throw new Error('iOS testing is only supported on macOS');
+    }
+    log('✅ Running on macOS');
+    
+    // Verify Xcode installation
+    try {
+        const xcodeOutput = execSync('xcode-select -p').toString().trim();
+        log(`✅ Xcode command line tools found at: ${xcodeOutput}`);
+    } catch (error) {
+        log('⚠️ Xcode command line tools not found');
+        log('Please install Xcode from the App Store and run:');
+        log('xcode-select --install');
+        throw new Error('Xcode command line tools not found. Please install Xcode first.');
+    }
+    
+    // Check Xcode version
+    try {
+        const xcodeVersionOutput = execSync('xcodebuild -version').toString().trim();
+        log(`✅ Xcode version: ${xcodeVersionOutput.split('\n')[0]}`);
+    } catch (error) {
+        log('⚠️ Unable to determine Xcode version');
+    }
+    
+    // Check for CocoaPods
+    try {
+        const podVersionOutput = execSync('pod --version').toString().trim();
+        log(`✅ CocoaPods version: ${podVersionOutput}`);
+    } catch (error) {
+        log('⚠️ CocoaPods not found');
+        log('Attempting to install CocoaPods...');
+        
+        try {
+            log('🔄 Installing CocoaPods via gem...');
+            execSync('gem install cocoapods', { stdio: 'inherit' });
+            log('✅ CocoaPods installed successfully');
+        } catch (gemError) {
+            log('⚠️ Failed to install CocoaPods via gem');
+            log('Please install CocoaPods manually:');
+            log('1. sudo gem install cocoapods');
+            log('2. brew install cocoapods');
+            throw new Error('CocoaPods installation failed. Please install manually.');
+        }
+    }
+    
+    log('✅ All prerequisites for iOS testing are met');
+    return true;
+};
+
 // Check for iOS simulator
 const checkSimulator = async (log) => {
     log('🔍 Checking for iOS simulator...');
@@ -151,122 +330,84 @@ const verifyXcodeInstallation = (log) => {
 
 // Generate test data using generate_data.ts
 const generateTestData = async (log) => {
-    log('🔄 Generating test data...');
+    log('\n🔍 DEBUG: Starting test data generation...');
     
-    // Check if test-scripts directory exists
-    if (!existsSync('test-scripts')) {
-        log('⚠️ test-scripts directory not found');
-        log('⚠️ Current directory: ' + process.cwd());
-        
-        // List directories to help debug
-        const { readdirSync } = require('fs');
-        log('📂 Directories in current path:');
-        try {
-            const files = readdirSync('.');
-            files.forEach(file => {
-                const isDir = existsSync(file) && require('fs').statSync(file).isDirectory();
-                log(`${isDir ? '📁' : '📄'} ${file}`);
-            });
-        } catch (err) {
-            log(`⚠️ Error listing directory: ${err.message}`);
-        }
-    } else {
-        log('✅ Found test-scripts directory');
-        
-        // Check if generate_data.ts exists
-        if (existsSync('test-scripts/generate_data.ts')) {
-            log('✅ Found generate_data.ts');
-        } else {
-            log('⚠️ generate_data.ts not found in test-scripts directory');
-            
-            // List files in test-scripts to help debug
-            const { readdirSync } = require('fs');
-            log('📂 Files in test-scripts:');
-            try {
-                const files = readdirSync('test-scripts');
-                files.forEach(file => {
-                    log(`📄 ${file}`);
-                });
-            } catch (err) {
-                log(`⚠️ Error listing test-scripts: ${err.message}`);
-            }
-        }
-    }
+    // Check directory structure
+    log('📁 Current directory:', process.cwd());
+    log('📁 Directory contents:', require('fs').readdirSync('.'));
     
-    // Create .generated directory if it doesn't exist
     if (!existsSync('.generated')) {
         log('📁 Creating .generated directory');
         mkdirSync('.generated', { recursive: true });
     }
-    
+
     try {
-        // Try to generate test data using the script
-        log('🔄 Running test data generation script...');
+        log('🔄 Attempting to run generate_data.ts...');
         execSync('npx ts-node test-scripts/generate_data.ts', { stdio: 'inherit' });
-        log('✅ Test data generation script completed');
+        log('✅ Test data generation completed');
         
-        // Verify the generated files exist
+        // Verify and log generated files content
         const requiredFiles = [
             '.generated/test-env.json',
             '.generated/claim_details.json',
             '.generated/contacts.json'
         ];
         
-        log('🔍 Verifying generated files:');
+        log('\n📝 Verifying generated files:');
         for (const file of requiredFiles) {
             if (!existsSync(file)) {
-                log(`⚠️ Required file ${file} was not generated`);
-                throw new Error(`Required file ${file} was not generated`);
+                log(`❌ Missing file: ${file}`);
             } else {
-                log(`✅ ${file} exists`);
+                const content = readFileSync(file, 'utf8');
+                log(`\n📄 Content of ${file}:`);
+                log(content);
+                try {
+                    const parsed = JSON.parse(content);
+                    if (file.includes('test-env.json')) {
+                        log('🔑 CONTACT1_DID in test-env:', parsed.CONTACT1_DID);
+                    }
+                    if (file.includes('contacts.json')) {
+                        log('👥 First contact DID:', parsed[0]?.did);
+                    }
+                } catch (e) {
+                    log(`❌ Error parsing ${file}:`, e);
+                }
             }
         }
     } catch (error) {
-        log(`⚠️ Failed to generate test data: ${error.message}`);
+        log(`\n⚠️ Test data generation failed: ${error.message}`);
         log('⚠️ Creating fallback test data...');
         
-        // Create minimal fallback test data
+        // Create fallback data with detailed logging
         const fallbackTestEnv = {
-            "CONTACT1_DID": "did:example:123456789",
+            "CONTACT1_DID": "did:ethr:0x35A71Ac3fA0A4D5a4903f10F0f7A3ac4034FaB5B",
             "APP_URL": "https://app.timesafari.example"
         };
         
-        const fallbackClaimDetails = {
-            "claim_id": "claim_12345",
-            "title": "Test Claim",
-            "description": "This is a test claim"
-        };
-        
         const fallbackContacts = [
             {
                 "id": "contact1",
                 "name": "Test Contact",
-                "did": "did:example:123456789"
+                "did": "did:ethr:0x35A71Ac3fA0A4D5a4903f10F0f7A3ac4034FaB5B"
             }
         ];
         
-        // Use writeFileSync to overwrite any existing files
-        const { writeFileSync } = require('fs');
+        log('\n📝 Writing fallback data:');
+        log('TestEnv:', JSON.stringify(fallbackTestEnv, null, 2));
+        log('Contacts:', JSON.stringify(fallbackContacts, null, 2));
+        
         writeFileSync('.generated/test-env.json', JSON.stringify(fallbackTestEnv, null, 2));
-        writeFileSync('.generated/claim_details.json', JSON.stringify(fallbackClaimDetails, null, 2));
         writeFileSync('.generated/contacts.json', JSON.stringify(fallbackContacts, null, 2));
         
-        log('✅ Fallback test data created');
-        
-        // Verify files were created
-        const requiredFiles = [
-            '.generated/test-env.json',
-            '.generated/claim_details.json',
-            '.generated/contacts.json'
-        ];
-        
-        log('🔍 Verifying fallback files:');
-        for (const file of requiredFiles) {
-            if (!existsSync(file)) {
-                log(`⚠️ Failed to create ${file}`);
-            } else {
-                log(`✅ Created ${file}`);
-            }
+        // Verify fallback data was written
+        log('\n🔍 Verifying fallback data:');
+        try {
+            const writtenTestEnv = JSON.parse(readFileSync('.generated/test-env.json', 'utf8'));
+            const writtenContacts = JSON.parse(readFileSync('.generated/contacts.json', 'utf8'));
+            log('Written TestEnv:', writtenTestEnv);
+            log('Written Contacts:', writtenContacts);
+        } catch (e) {
+            log('❌ Error verifying fallback data:', e);
         }
     }
 };
@@ -282,51 +423,56 @@ const buildWebAssets = async (log) => {
 
 // Configure iOS project
 const configureIosProject = async (log) => {
-    log('📱 Syncing Capacitor project...');
-    try {
-        execSync('npx cap sync ios', { stdio: 'inherit' });
-        log('✅ Capacitor sync completed');
-    } catch (error) {
-        log('⚠️ Capacitor sync encountered issues. Attempting to continue...');
-    }
+    log('📱 Configuring iOS project...');
+    
+    // Skip cap sync since we just did a clean platform add
+    log('✅ Using freshly created iOS platform');
 
     // Register URL scheme for deeplink tests
     log('🔗 Configuring URL scheme for deeplink tests...');
     if (checkAndRegisterUrlScheme(log)) {
         log('✅ URL scheme configuration completed');
+    } else {
+        log('⚠️ URL scheme could not be registered automatically');
+        log('⚠️ Deeplink tests may not work correctly');
     }
 
     log('⚙️ Installing CocoaPods dependencies...');
     try {
         // Try to run pod install normally first
-        execSync('cd ios/App && pod install', { stdio: 'inherit' });
-    } catch (error) {
-        // If that fails, try using sudo (requires password)
-        log('⚠️ CocoaPods installation failed. Trying with sudo...');
-        try {
-            execSync('cd ios/App && sudo pod install', { stdio: 'inherit' });
-        } catch (sudoError) {
-            // If both methods fail, alert the user
-            log('❌ CocoaPods installation failed.');
-            log('Please run one of the following commands manually:');
-            log('1. cd ios/App && pod install');
-            log('2. cd ios/App && sudo pod install');
-            log('3. Install CocoaPods through Homebrew: brew install cocoapods');
-            throw new Error('CocoaPods installation failed. See log for details.');
-        }
-    }
+        log('🔄 Running "pod install" in ios/App directory...');
+    execSync('cd ios/App && pod install', { stdio: 'inherit' });
     log('✅ CocoaPods installation completed');
+    } catch (error) {
+        // If that fails, provide detailed instructions
+        log(`⚠️ CocoaPods installation failed: ${error.message}`);
+        log('⚠️ Please ensure CocoaPods is installed correctly:');
+        log('1. If using system Ruby: "sudo gem install cocoapods"');
+        log('2. If using Homebrew Ruby: "brew install cocoapods"');
+        log('3. Then run: "cd ios/App && pod install"');
+        
+        // Try to continue despite the error
+        log('⚠️ Attempting to continue with the build process...');
+    }
+    
+    // Add information about iOS security dialogs
+    log('\n📱 iOS Security Dialog Information:');
+    log('⚠️ iOS will display security confirmation dialogs when testing deeplinks');
+    log('⚠️ This is a security feature of iOS and cannot be bypassed in normal testing');
+    log('⚠️ You will need to manually approve each deeplink test by clicking "Open" in the dialog');
+    log('⚠️ The app must be running in the foreground for deeplinks to work properly');
+    log('⚠️ If tests appear to hang, check if a security dialog is waiting for your confirmation');
 };
 
 // Build and test iOS project
 const buildAndTestIos = async (log, simulator) => {
     const simulatorName = simulator[0].name;
-    log('🏗️ Building iOS project...');
+    log('🏗️ Building iOS project...', simulator[0]);
     execSync('cd ios/App && xcodebuild clean -workspace App.xcworkspace -scheme App', { stdio: 'inherit' });
     log('✅ Xcode clean completed');
     
     log(`🏗️ Building for simulator: ${simulatorName}`);
-    execSync(`cd ios/App && xcodebuild build -workspace App.xcworkspace -scheme App -destination "platform=iOS Simulator,name=${simulatorName}"`, { stdio: 'inherit' });
+    execSync(`cd ios/App && xcodebuild build -workspace App.xcworkspace -scheme App -destination "platform=iOS Simulator,OS=17.2,name=${simulatorName}"`, { stdio: 'inherit' });
     log('✅ Xcode build completed');
 
     // Check if the project is configured for testing by querying the scheme capabilities
@@ -365,6 +511,96 @@ const runIosApp = async (log, simulator) => {
     log('✅ App launched successfully');
 };
 
+const validateTestData = (log) => {
+    log('\n=== VALIDATING TEST DATA ===');
+    
+    const generateFreshTestData = () => {
+        log('\n🔄 Generating fresh test data...');
+        try {
+            // Ensure .generated directory exists
+            if (!existsSync('.generated')) {
+                mkdirSync('.generated', { recursive: true });
+            }
+
+            // Execute the generate_data.ts script synchronously
+            log('Running generate_data.ts...');
+            execSync('npx ts-node test-scripts/generate_data.ts', { 
+                stdio: 'inherit',
+                encoding: 'utf8'
+            });
+
+            // Read and validate the generated files
+            const testEnvPath = '.generated/test-env.json';
+            const contactsPath = '.generated/contacts.json';
+            
+            if (!existsSync(testEnvPath) || !existsSync(contactsPath)) {
+                throw new Error('Generated files not found after running generate_data.ts');
+            }
+
+            const testEnv = JSON.parse(readFileSync(testEnvPath, 'utf8'));
+            const contacts = JSON.parse(readFileSync(contactsPath, 'utf8'));
+
+            // Validate required fields
+            if (!testEnv.CONTACT1_DID) {
+                throw new Error('CONTACT1_DID missing from generated test data');
+            }
+
+            log('Generated test data:', {
+                testEnv: testEnv,
+                contacts: contacts
+            });
+
+            return { testEnv, contacts };
+        } catch (error) {
+            log('❌ Test data generation failed:', error);
+            throw error;
+        }
+    };
+
+    try {
+        // Try to read existing data or generate fresh data
+        const testEnvPath = '.generated/test-env.json';
+        const contactsPath = '.generated/contacts.json';
+        
+        let testData;
+        
+        // If either file is missing or invalid, generate fresh data
+        if (!existsSync(testEnvPath) || !existsSync(contactsPath)) {
+            testData = generateFreshTestData();
+        } else {
+            try {
+                const testEnv = JSON.parse(readFileSync(testEnvPath, 'utf8'));
+                const contacts = JSON.parse(readFileSync(contactsPath, 'utf8'));
+                
+                // Validate required fields
+                if (!testEnv.CLAIM_ID || !testEnv.CONTACT1_DID) {
+                    log('⚠️ Existing test data missing required fields, regenerating...');
+                    testData = generateFreshTestData();
+                } else {
+                    testData = { testEnv, contacts };
+                }
+            } catch (error) {
+                log('⚠️ Error reading existing test data, regenerating...');
+                testData = generateFreshTestData();
+            }
+        }
+        
+        // Final validation of data
+        if (!testData.testEnv.CLAIM_ID || !testData.testEnv.CONTACT1_DID) {
+            throw new Error('Test data validation failed even after generation');
+        }
+        
+        log('✅ Test data validated successfully');
+        log('📄 Test Environment:', JSON.stringify(testData.testEnv, null, 2));
+        
+        return testData;
+        
+    } catch (error) {
+        log(`❌ Test data validation failed: ${error.message}`);
+        throw error;
+    }
+};
+
 /**
  * Run deeplink tests 
  * Optionally tests deeplinks if the test data is available
@@ -373,87 +609,31 @@ const runIosApp = async (log, simulator) => {
  * @returns {Promise<void>}
  */
 const runDeeplinkTests = async (log) => {
-    log('🔗 Starting deeplink tests...');
+    log('\n=== Starting Deeplink Tests ===');
     
-    // Register URL scheme if needed
-    checkAndRegisterUrlScheme(log);
-    
-    // Check if test data files exist first
-    const requiredFiles = [
-        '.generated/test-env.json',
-        '.generated/claim_details.json',
-        '.generated/contacts.json'
-    ];
-    
-    for (const file of requiredFiles) {
-        if (!existsSync(file)) {
-            log(`⚠️ Required file ${file} does not exist`);
-            log('⚠️ Skipping deeplink tests');
-            return;
-        }
+    // Validate test data before proceeding
+    let testEnv, contacts;
+    try {
+        ({ testEnv, contacts } = validateTestData(log));
+    } catch (error) {
+        log('❌ Cannot proceed with tests due to invalid test data');
+        log(`Error: ${error.message}`);
+        log('Please ensure test data is properly generated before running tests');
+        process.exit(1); // Exit with error code
     }
     
-    try {
-        // Load test data
-        log('📂 Loading test data from .generated directory');
-        let testEnv, claimDetails, contacts;
-        
-        try {
-            const testEnvContent = readFileSync('.generated/test-env.json', 'utf8');
-            testEnv = JSON.parse(testEnvContent);
-            log('✅ Loaded test-env.json');
-        } catch (error) {
-            log(`⚠️ Failed to load test-env.json: ${error.message}`);
-            return;
-        }
-        
-        try {
-            const claimDetailsContent = readFileSync('.generated/claim_details.json', 'utf8');
-            claimDetails = JSON.parse(claimDetailsContent);
-            log('✅ Loaded claim_details.json');
-        } catch (error) {
-            log(`⚠️ Failed to load claim_details.json: ${error.message}`);
-            return;
-        }
-        
-        try {
-            const contactsContent = readFileSync('.generated/contacts.json', 'utf8');
-            contacts = JSON.parse(contactsContent);
-            log('✅ Loaded contacts.json');
-        } catch (error) {
-            log(`⚠️ Failed to load contacts.json: ${error.message}`);
-            return;
-        }
-
-        // Check if the app URL scheme is registered in the simulator
-        log('🔍 Checking if URL scheme is registered in simulator...');
-        try {
-            // Attempt to open a simple URL with the scheme
-            execSync(`xcrun simctl openurl booted "timesafari://test"`, { stdio: 'pipe' });
-            log('✅ URL scheme is registered and working');
-        } catch (error) {
-            const errorMessage = error.message || '';
-            
-            // Check for the specific error code that indicates an unregistered URL scheme
-            if (errorMessage.includes('OSStatus error -10814') || errorMessage.includes('NSOSStatusErrorDomain, code=-10814')) {
-                log('⚠️ URL scheme "timesafari://" is not registered in the app or app is not running');
-                log('⚠️ The scheme was added to Info.plist but the app may need to be rebuilt');
-                log('⚠️ Trying to continue with tests, but they may fail');
-            }
-        }
-
-        // Test URLs
+    // Now we can safely create the deeplink tests knowing we have valid data
         const deeplinkTests = [
             {
-                url: `timesafari://claim/${claimDetails.claim_id}`,
+            url: `timesafari://claim/${testEnv.CLAIM_ID}`,
                 description: 'Claim view'
             },
             {
-                url: `timesafari://claim-cert/${claimDetails.claim_id}`,
+            url: `timesafari://claim-cert/${testEnv.CERT_ID || testEnv.CLAIM_ID}`,
                 description: 'Claim certificate view'
             },
             {
-                url: `timesafari://claim-add-raw/${claimDetails.claim_id}`,
+            url: `timesafari://claim-add-raw/${testEnv.RAW_CLAIM_ID || testEnv.CLAIM_ID}`,
                 description: 'Raw claim addition'
             },
             {
@@ -465,7 +645,14 @@ const runDeeplinkTests = async (log) => {
                 description: 'DID view with contact DID'
             },
             {
-                url: `timesafari://contact-edit/${testEnv.CONTACT1_DID}`,
+            url: (() => {
+                if (!testEnv?.CONTACT1_DID) {
+                    throw new Error('Cannot construct contact-edit URL: CONTACT1_DID is missing');
+                }
+                const url = `timesafari://contact-edit/${testEnv.CONTACT1_DID}`;
+                log('Created contact-edit URL:', url);
+                return url;
+            })(),
                 description: 'Contact editing'
             },
             {
@@ -474,21 +661,63 @@ const runDeeplinkTests = async (log) => {
             }
         ];
 
+    // Log the final test configuration
+    log('\n5. Final Test Configuration:');
+    deeplinkTests.forEach((test, i) => {
+        log(`\nTest ${i + 1}:`);
+        log(`Description: ${test.description}`);
+        log(`URL: ${test.url}`);
+    });
+    
+    // Show instructions for iOS security dialogs
+    log('\n📱 IMPORTANT: iOS Security Dialog Instructions:');
+    log('1. Each deeplink test will trigger a security confirmation dialog');
+    log('2. You MUST click "Open" on each dialog to continue testing');
+    log('3. The app must be running in the FOREGROUND');
+    log('4. You will need to press Enter in this terminal after handling each dialog');
+    log('5. You can abort the testing process by pressing Ctrl+C\n');
+    
+    // Ensure app is in foreground
+    log('⚠️ IMPORTANT: Please make sure the app is in the FOREGROUND now');
+    await question('Press Enter when the app is visible and in the foreground...');
+    
+    try {
         // Execute each test
         let testsCompleted = 0;
         let testsSkipped = 0;
         
         for (const test of deeplinkTests) {
+            // Show upcoming test info before execution
+            log('\n📱 NEXT TEST:');
+            log('------------------------');
+            log(`Description: ${test.description}`);
+            log(`URL to test: ${test.url}`);
+            log('------------------------');
+            
+            // Clear prompt for user action
+            await question('\n⏎  Press Enter to execute this test (or Ctrl+C to quit)...');
+            
             try {
-                log(`\n🔗 Testing deeplink: ${test.description}`);
-                log(`URL: ${test.url}`);
+                log('🚀 Executing deeplink test...');
+                log('⚠️ iOS SECURITY DIALOG WILL APPEAR - Click "Open" to continue');
                 
                 execSync(`xcrun simctl openurl booted "${test.url}"`, { stdio: 'pipe' });
                 log(`✅ Successfully executed: ${test.description}`);
                 testsCompleted++;
                 
-                // Wait between tests
-                await new Promise(resolve => setTimeout(resolve, 5000));
+                // Show progress
+                log(`\n📊 Progress: ${testsCompleted}/${deeplinkTests.length} tests completed`);
+                
+                // If there are more tests, show the next one
+                if (testsCompleted < deeplinkTests.length) {
+                    const nextTest = deeplinkTests[testsCompleted];
+                    log('\n⏭️  NEXT UP:');
+                    log('------------------------');
+                    log(`Next test will be: ${nextTest.description}`);
+                    log(`URL: ${nextTest.url}`);
+                    log('------------------------');
+                    await question('\n⏎  Press Enter when ready for the next test...');
+                }
             } catch (deeplinkError) {
                 const errorMessage = deeplinkError.message || '';
                 
@@ -501,22 +730,35 @@ const runDeeplinkTests = async (log) => {
                     log(`⚠️ Error: ${errorMessage}`);
                 }
                 log('⚠️ Continuing with next test...');
+                
+                // Show next test info after error handling
+                if (testsCompleted + testsSkipped < deeplinkTests.length) {
+                    const nextTest = deeplinkTests[testsCompleted + testsSkipped];
+                    log('\n⏭️  NEXT UP:');
+                    log('------------------------');
+                    log(`Next test will be: ${nextTest.description}`);
+                    log(`URL: ${nextTest.url}`);
+                    log('------------------------');
+                    await question('\n⏎  Press Enter when ready for the next test...');
+                }
             }
         }
 
-        log(`✅ Deeplink tests completed: ${testsCompleted} successful, ${testsSkipped} skipped`);
+        log('\n🎉 All deeplink tests completed!');
+        log(`✅ Successful: ${testsCompleted}`);
+        log(`⚠️ Skipped: ${testsSkipped}`);
         
         if (testsSkipped > 0) {
             log('\n📝 Note about skipped tests:');
             log('1. The app needs to have the URL scheme registered in Info.plist');
             log('2. The app needs to be rebuilt after registering the URL scheme');
             log('3. The app must be running in the foreground for deeplink tests to work');
-            log('4. If these conditions are met and tests still fail, check URL handling in the app code');
+            log('4. iOS security dialogs must be manually approved for each deeplink test');
+            log('5. If these conditions are met and tests still fail, check URL handling in the app code');
         }
     } catch (error) {
         log(`❌ Deeplink tests setup failed: ${error.message}`);
         log('⚠️ Deeplink tests might be unavailable or test data is missing');
-        // Don't rethrow the error to prevent halting the process
     }
 };
 
@@ -558,7 +800,7 @@ const checkAndRegisterUrlScheme = (log) => {
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>app.timesafari.app</string>
+			<string>app.timesafari</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>timesafari</string>
@@ -585,14 +827,51 @@ const checkAndRegisterUrlScheme = (log) => {
     }
 };
 
+// Helper function to get the app identifier from package.json or capacitor config
+const getAppIdentifier = () => {
+    try {
+        // Try to read from capacitor.config.ts/js/json
+        if (existsSync('capacitor.config.json')) {
+            const config = JSON.parse(readFileSync('capacitor.config.json', 'utf8'));
+            return config.appId;
+        } 
+        if (existsSync('capacitor.config.js')) {
+            // We can't directly require the file, but we can try to extract the appId
+            const content = readFileSync('capacitor.config.js', 'utf8');
+            const match = content.match(/appId:\s*['"]([^'"]+)['"]/);
+            if (match && match[1]) return match[1];
+        }
+        if (existsSync('capacitor.config.ts')) {
+            // Similar approach for TypeScript
+            const content = readFileSync('capacitor.config.ts', 'utf8');
+            const match = content.match(/appId:\s*['"]([^'"]+)['"]/);
+            if (match && match[1]) return match[1];
+        }
+        
+        // Fall back to package.json
+        const packageJson = JSON.parse(readFileSync('package.json', 'utf8'));
+        if (packageJson.capacitor && packageJson.capacitor.appId) {
+            return packageJson.capacitor.appId;
+        }
+        
+        // Default fallback
+        return 'app.timesafari';
+    } catch (error) {
+        console.error('Error getting app identifier:', error);
+        return 'app.timesafari'; // Default fallback
+    }
+};
+
 /**
  * Runs the complete iOS test suite including build and testing
  * 
  * The function performs the following steps:
- * 1. Syncs the Capacitor project with latest web build
- * 2. Builds the app using xcodebuild
- * 3. Optionally runs tests if configured
- * 4. Launches the app in the simulator
+ * 1. Cleans and resets the iOS platform
+ * 2. Verifies prerequisites and project setup
+ * 3. Syncs the Capacitor project with latest web build
+ * 4. Builds the app using xcodebuild
+ * 5. Optionally runs tests if configured
+ * 6. Launches the app in the simulator
  * 
  * If no simulator is running, it automatically selects and boots one.
  * 
@@ -617,7 +896,16 @@ async function runIosTests() {
     try {
         log('🚀 Starting iOS build and test process...');
 
-        // Generate test data first
+        // Clean and reset iOS platform first
+        const cleanSuccess = await cleanIosPlatform(log);
+        if (!cleanSuccess) {
+            throw new Error('Failed to clean and reset iOS platform. Please check the logs for details.');
+        }
+
+        // Check prerequisites
+        await checkPrerequisites(log);
+
+        // Generate test data
         await generateTestData(log);
 
         // Verify Xcode installation
@@ -626,8 +914,7 @@ async function runIosTests() {
         // Check for simulator or boot one if needed
         const simulator = await checkSimulator(log);
         
-        // Build web assets and configure iOS project
-        await buildWebAssets(log);
+        // Configure iOS project
         await configureIosProject(log);
         
         // Build and test using the selected simulator

src/App.vue

@@ -4,7 +4,7 @@
   <!-- Messages in the upper-right - https://github.com/emmanuelsw/notiwind -->
   <NotificationGroup group="alert">
     <div
-      class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
+      class="fixed top-[calc(env(safe-area-inset-top)+1rem)] right-4 left-4 sm:left-auto sm:w-full sm:max-w-sm flex flex-col items-start justify-end"
     >
       <Notification
         v-slot="{ notifications, close }"
@@ -144,10 +144,10 @@
   <!--
     This "group" of "modal" is the prompt for an answer.
     Set "type" as follows: "confirm" for yes/no, and "notification" ones:
-     "-permission", "-mute", "-off"
+      "-permission", "-mute", "-off"
   -->
   <NotificationGroup group="modal">
-    <div class="fixed z-[100] top-0 inset-x-0 w-full">
+    <div class="fixed z-[100] top-[env(safe-area-inset-top)] inset-x-0 w-full">
       <Notification
         v-slot="{ notifications, close }"
         enter="transform ease-out duration-300 transition"
@@ -167,10 +167,10 @@
           role="alert"
         >
           <!--
-           Type of "confirm" will post a message.
-           With onYes function, show a "Yes" button to call that function.
-           With onNo function, show a "No" button to call that function,
-             and pass it state of "askAgain" field shown if you set promptToStopAsking.
+            Type of "confirm" will post a message.
+            With onYes function, show a "Yes" button to call that function.
+            With onNo function, show a "No" button to call that function,
+              and pass it state of "askAgain" field shown if you set promptToStopAsking.
           -->
           <div
             v-if="notification.type === 'confirm'"
@@ -539,4 +539,15 @@ export default class App extends Vue {
 }
 </script>
 
-<style></style>
+<style>
+#Content {
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  padding-top: calc(env(safe-area-inset-top) + 1.5rem);
+  padding-bottom: calc(env(safe-area-inset-bottom) + 1.5rem);
+}
+
+#QuickNav ~ #Content {
+  padding-bottom: calc(env(safe-area-inset-bottom) + 6rem);
+}
+</style>

src/components/ActivityListItem.vue

@@ -0,0 +1,270 @@
+<template>
+  <li>
+    <!-- Last viewed separator -->
+    <div
+      v-if="record.jwtId == lastViewedClaimId"
+      class="border-b border-dashed border-slate-300 text-orange-400 mt-4 mb-6 font-bold text-sm"
+    >
+      <span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
+        You've already seen all the following
+      </span>
+    </div>
+
+    <div
+      class="flex items-center justify-between gap-2 text-lg bg-slate-200 border border-slate-300 border-b-0 rounded-t-md px-3 sm:px-4 py-1 sm:py-2"
+    >
+      <div class="flex items-center gap-2">
+        <div v-if="record.issuerDid">
+          <EntityIcon
+            :entity-id="record.issuerDid"
+            class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
+          />
+        </div>
+        <div v-else>
+          <font-awesome
+            icon="person-circle-question"
+            class="text-slate-300 text-[2rem]"
+          />
+        </div>
+
+        <div>
+          <h3 class="font-semibold">
+            {{ record.issuer.known ? record.issuer.displayName : "" }}
+          </h3>
+          <p class="ms-auto text-xs text-slate-500 italic">
+            {{ friendlyDate }}
+          </p>
+        </div>
+      </div>
+
+      <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
+        <font-awesome icon="circle-info" class="fa-fw text-slate-500" />
+      </a>
+    </div>
+
+    <div class="bg-slate-100 rounded-b-md border border-slate-300 p-3 sm:p-4">
+      <!-- Record Image -->
+      <div
+        v-if="record.image"
+        class="bg-cover mb-6 -mt-3 sm:-mt-4 -mx-3 sm:-mx-4"
+        :style="`background-image: url(${record.image});`"
+      >
+        <a
+          class="block bg-slate-100/50 backdrop-blur-md px-6 py-4 cursor-pointer"
+          @click="$emit('viewImage', record.image)"
+        >
+          <img
+            class="w-full h-auto max-w-lg max-h-96 object-contain mx-auto drop-shadow-md"
+            :src="record.image"
+            alt="Activity image"
+            @load="cacheImage(record.image)"
+          />
+        </a>
+      </div>
+
+      <div
+        class="relative flex justify-between gap-4 max-w-[40rem] mx-auto mb-5"
+      >
+        <!-- Source -->
+        <div
+          class="w-[8rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
+        >
+          <div class="relative w-fit mx-auto">
+            <div>
+              <!-- Project Icon -->
+              <div v-if="record.providerPlanName">
+                <ProjectIcon
+                  :entity-id="record.providerPlanName"
+                  :icon-size="48"
+                  class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
+                />
+              </div>
+              <!-- Identicon for DIDs -->
+              <div v-else-if="record.agentDid">
+                <EntityIcon
+                  :entity-id="record.agentDid"
+                  :profile-image-url="record.issuer.profileImageUrl"
+                  class="rounded-full bg-slate-100 overflow-hidden !size-[3rem] sm:!size-[4rem]"
+                />
+              </div>
+              <!-- Unknown Person -->
+              <div v-else>
+                <font-awesome
+                  icon="person-circle-question"
+                  class="text-slate-300 text-[3rem] sm:text-[4rem]"
+                />
+              </div>
+            </div>
+          </div>
+          <div
+            v-if="record.providerPlanName || record.giver.known"
+            class="text-xs mt-2 truncate"
+          >
+            <font-awesome
+              :icon="record.providerPlanName ? 'users' : 'user'"
+              class="fa-fw text-slate-400"
+            />
+            {{ record.providerPlanName || record.giver.displayName }}
+          </div>
+        </div>
+
+        <!-- Arrow -->
+        <div
+          class="absolute inset-x-[8rem] sm:inset-x-[12rem] mx-2 top-1/2 -translate-y-1/2"
+        >
+          <div class="text-sm text-center leading-none font-semibold pe-[15px]">
+            {{ fetchAmount }}
+          </div>
+
+          <div class="flex items-center">
+            <hr
+              class="grow border-t-[18px] sm:border-t-[24px] border-slate-300"
+            />
+
+            <div
+              class="shrink-0 w-0 h-0 border border-slate-300 border-t-[20px] sm:border-t-[25px] border-t-transparent border-b-[20px] sm:border-b-[25px] border-b-transparent border-s-[27px] sm:border-s-[34px] border-e-0"
+            ></div>
+          </div>
+        </div>
+
+        <!-- Destination -->
+        <div
+          class="w-[8rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
+        >
+          <div class="relative w-fit mx-auto">
+            <div>
+              <!-- Project Icon -->
+              <div v-if="record.recipientProjectName">
+                <ProjectIcon
+                  :entity-id="record.recipientProjectName"
+                  :icon-size="48"
+                  class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
+                />
+              </div>
+              <!-- Identicon for DIDs -->
+              <div v-else-if="record.recipientDid">
+                <EntityIcon
+                  :entity-id="record.recipientDid"
+                  :profile-image-url="record.receiver.profileImageUrl"
+                  class="rounded-full bg-slate-100 overflow-hidden !size-[3rem] sm:!size-[4rem]"
+                />
+              </div>
+              <!-- Unknown Person -->
+              <div v-else>
+                <font-awesome
+                  icon="person-circle-question"
+                  class="text-slate-300 text-[3rem] sm:text-[4rem]"
+                />
+              </div>
+            </div>
+          </div>
+          <div
+            v-if="record.recipientProjectName || record.receiver.known"
+            class="text-xs mt-2 truncate"
+          >
+            <font-awesome
+              :icon="record.recipientProjectName ? 'users' : 'user'"
+              class="fa-fw text-slate-400"
+            />
+            {{ record.recipientProjectName || record.receiver.displayName }}
+          </div>
+        </div>
+      </div>
+
+      <!-- Description -->
+      <p class="font-medium">
+        <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
+          {{ description }}
+        </a>
+      </p>
+    </div>
+  </li>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
+import { GiveRecordWithContactInfo } from "../types";
+import EntityIcon from "./EntityIcon.vue";
+import { isGiveClaimType, notifyWhyCannotConfirm } from "../libs/util";
+import { containsHiddenDid } from "../libs/endorserServer";
+import ProjectIcon from "./ProjectIcon.vue";
+
+@Component({
+  components: {
+    EntityIcon,
+    ProjectIcon,
+  },
+})
+export default class ActivityListItem extends Vue {
+  @Prop() record!: GiveRecordWithContactInfo;
+  @Prop() lastViewedClaimId?: string;
+  @Prop() isRegistered!: boolean;
+  @Prop() activeDid!: string;
+  @Prop() confirmerIdList?: string[];
+
+  @Emit()
+  cacheImage(image: string) {
+    return image;
+  }
+
+  get fetchAmount(): string {
+    const claim =
+      (this.record.fullClaim as unknown).claim || this.record.fullClaim;
+
+    const amount = claim.object?.amountOfThisGood
+      ? this.displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
+      : "";
+
+    return amount;
+  }
+
+  get description(): string {
+    const claim =
+      (this.record.fullClaim as unknown).claim || this.record.fullClaim;
+
+    return `${claim.description}`;
+  }
+
+  private displayAmount(code: string, amt: number) {
+    return `${amt} ${this.currencyShortWordForCode(code, amt === 1)}`;
+  }
+
+  private currencyShortWordForCode(unitCode: string, single: boolean) {
+    return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
+  }
+
+  get canConfirm(): boolean {
+    if (!this.isRegistered) return false;
+    if (!isGiveClaimType(this.record.fullClaim?.["@type"])) return false;
+    if (this.confirmerIdList?.includes(this.activeDid)) return false;
+    if (this.record.issuerDid === this.activeDid) return false;
+    if (containsHiddenDid(this.record.fullClaim)) return false;
+    return true;
+  }
+
+  handleConfirmClick() {
+    if (!this.canConfirm) {
+      notifyWhyCannotConfirm(
+        this.$notify,
+        this.isRegistered,
+        this.record.fullClaim?.["@type"],
+        this.record,
+        this.activeDid,
+        this.confirmerIdList,
+      );
+      return;
+    }
+
+    this.$emit("confirmClaim", this.record);
+  }
+
+  get friendlyDate(): string {
+    const date = new Date(this.record.issuedAt);
+    return date.toLocaleDateString(undefined, {
+      year: "numeric",
+      month: "short",
+      day: "numeric",
+    });
+  }
+}
+</script>

src/components/DataExportSection.vue

@@ -0,0 +1,196 @@
+/** * Data Export Section Component * * Provides UI and functionality for
+exporting user data and backing up identifier seeds. * Includes buttons for seed
+backup and database export, with platform-specific download instructions. * *
+@component * @displayName DataExportSection * @example * ```vue *
+<DataExportSection :active-did="currentDid" />
+* ``` */
+
+<template>
+  <div
+    id="sectionDataExport"
+    class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
+  >
+    <div class="mb-2 font-bold">Data Export</div>
+    <router-link
+      v-if="activeDid"
+      :to="{ name: 'seed-backup' }"
+      class="block w-full text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2 mt-2"
+    >
+      Backup Identifier Seed
+    </router-link>
+
+    <button
+      :class="computedStartDownloadLinkClassNames()"
+      class="block w-full text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+      @click="exportDatabase()"
+    >
+      Download Settings & Contacts
+      <br />
+      (excluding Identifier Data)
+    </button>
+    <a
+      ref="downloadLink"
+      :class="computedDownloadLinkClassNames()"
+      class="block w-full text-center text-md bg-gradient-to-b from-green-500 to-green-800 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
+    >
+      If no download happened yet, click again here to download now.
+    </a>
+    <div v-if="platformCapabilities.needsFileHandlingInstructions" class="mt-4">
+      <p>
+        After the download, you can save the file in your preferred storage
+        location.
+      </p>
+      <ul>
+        <li
+          v-if="platformCapabilities.isIOS"
+          class="list-disc list-outside ml-4"
+        >
+          On iOS: You will be prompted to choose a location to save your backup
+          file.
+        </li>
+        <li
+          v-if="platformCapabilities.isMobile && !platformCapabilities.isIOS"
+          class="list-disc list-outside ml-4"
+        >
+          On Android: You will be prompted to choose a location to save your
+          backup file.
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-facing-decorator";
+import { NotificationIface } from "../constants/app";
+import { db } from "../db/index";
+import { logger } from "../utils/logger";
+import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
+import {
+  PlatformService,
+  PlatformCapabilities,
+} from "../services/PlatformService";
+
+/**
+ * @vue-component
+ * Data Export Section Component
+ * Handles database export and seed backup functionality with platform-specific behavior
+ */
+@Component
+export default class DataExportSection extends Vue {
+  /**
+   * Notification function injected by Vue
+   * Used to show success/error messages to the user
+   */
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  /**
+   * Active DID (Decentralized Identifier) of the user
+   * Controls visibility of seed backup option
+   * @required
+   */
+  @Prop({ required: true }) readonly activeDid!: string;
+
+  /**
+   * URL for the database export download
+   * Created and revoked dynamically during export process
+   * Only used in web platform
+   */
+  downloadUrl = "";
+
+  /**
+   * Platform service instance for platform-specific operations
+   */
+  private platformService: PlatformService =
+    PlatformServiceFactory.getInstance();
+
+  /**
+   * Platform capabilities for the current platform
+   */
+  private get platformCapabilities(): PlatformCapabilities {
+    return this.platformService.getCapabilities();
+  }
+
+  /**
+   * Lifecycle hook to clean up resources
+   * Revokes object URL when component is unmounted (web platform only)
+   */
+  beforeUnmount() {
+    if (this.downloadUrl && this.platformCapabilities.hasFileDownload) {
+      URL.revokeObjectURL(this.downloadUrl);
+    }
+  }
+
+  /**
+   * Exports the database to a JSON file
+   * Uses platform-specific methods for saving the exported data
+   * Shows success/error notifications to user
+   *
+   * @throws {Error} If export fails
+   * @emits {Notification} Success or error notification
+   */
+  public async exportDatabase() {
+    try {
+      const blob = await db.export({ prettyJson: true });
+      const fileName = `${db.name}-backup.json`;
+
+      if (this.platformCapabilities.hasFileDownload) {
+        // Web platform: Use download link
+        this.downloadUrl = URL.createObjectURL(blob);
+        const downloadAnchor = this.$refs.downloadLink as HTMLAnchorElement;
+        downloadAnchor.href = this.downloadUrl;
+        downloadAnchor.download = fileName;
+        downloadAnchor.click();
+        setTimeout(() => URL.revokeObjectURL(this.downloadUrl), 1000);
+      } else if (this.platformCapabilities.hasFileSystem) {
+        // Native platform: Write to app directory
+        const content = await blob.text();
+        await this.platformService.writeAndShareFile(fileName, content);
+      }
+
+      this.$notify(
+        {
+          group: "alert",
+          type: "success",
+          title: "Export Successful",
+          text: this.platformCapabilities.hasFileDownload
+            ? "See your downloads directory for the backup. It is in the Dexie format."
+            : "Please choose a location to save your backup file.",
+        },
+        -1,
+      );
+    } catch (error) {
+      logger.error("Export Error:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Export Error",
+          text: "There was an error exporting the data.",
+        },
+        3000,
+      );
+    }
+  }
+
+  /**
+   * Computes class names for the initial download button
+   * @returns Object with 'hidden' class when download is in progress (web platform only)
+   */
+  public computedStartDownloadLinkClassNames() {
+    return {
+      hidden: this.downloadUrl && this.platformCapabilities.hasFileDownload,
+    };
+  }
+
+  /**
+   * Computes class names for the secondary download link
+   * @returns Object with 'hidden' class when no download is available or not on web platform
+   */
+  public computedDownloadLinkClassNames() {
+    return {
+      hidden: !this.downloadUrl || !this.platformCapabilities.hasFileDownload,
+    };
+  }
+}
+</script>

src/components/GiftedDialog.vue

@@ -99,6 +99,7 @@ import * as libsUtil from "../libs/util";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
 import { Contact } from "../db/tables/contacts";
 import { retrieveAccountDids } from "../libs/util";
+import { logger } from "../utils/logger";
 
 @Component
 export default class GiftedDialog extends Vue {
@@ -117,7 +118,6 @@ export default class GiftedDialog extends Vue {
   customTitle?: string;
   description = "";
   giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
-  isTrade = false;
   offerId = "";
   prompt = "";
   receiver?: libsUtil.GiverReceiverInputInfo;
@@ -301,7 +301,7 @@ export default class GiftedDialog extends Vue {
         unitCode,
         this.toProjectId,
         this.offerId,
-        this.isTrade,
+        false,
         undefined,
         this.fromProjectId,
       );
@@ -327,7 +327,7 @@ export default class GiftedDialog extends Vue {
             group: "alert",
             type: "success",
             title: "Success",
-            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
+            text: `That gift was recorded.`,
           },
           7000,
         );

src/components/ImageMethodDialog.vue

@@ -1,108 +1,282 @@
 <template>
   <div v-if="visible" class="dialog-overlay z-[60]">
     <div class="dialog relative">
-      <div class="text-lg text-center font-light relative z-50">
+      <div class="text-lg text-center font-bold relative">
+        <h1 id="ViewHeading" class="text-center font-bold">
+          <span v-if="uploading">Uploading Image&hellip;</span>
+          <span v-else-if="blob">Crop Image</span>
+          <span v-else-if="showCameraPreview">Upload Image</span>
+          <span v-else>Add Photo</span>
+        </h1>
         <div
-          id="ViewHeading"
-          class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-0.5 bg-black/50 text-white leading-none"
-        >
-          Add Photo
-        </div>
-        <div
-          class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white"
+          class="text-2xl text-center px-1 py-0.5 leading-none absolute -right-1 top-0"
           @click="close()"
         >
           <font-awesome icon="xmark" class="w-[1em]"></font-awesome>
         </div>
       </div>
 
-      <div>
-        <div class="text-center mt-8">
-          <div>
-            <font-awesome
-              icon="camera"
-              class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
-              @click="openPhotoDialog()"
-            />
-          </div>
-          <div class="mt-4">
-            <input type="file" @change="uploadImageFile" />
-          </div>
-          <div class="mt-4">
-            <span class="mt-2">
-              ... or paste a URL:
-              <input v-model="imageUrl" type="text" class="border-2" />
-            </span>
-            <span class="ml-2">
-              <font-awesome
+      <div class="mt-4">
+        <template v-if="isRegistered">
+          <div v-if="!blob">
+            <div
+              class="border-b border-dashed border-slate-300 text-orange-400 mb-4 font-bold text-sm"
+            >
+              <span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
+                Take a photo with your camera
+              </span>
+            </div>
+            <div
+              v-if="showCameraPreview"
+              class="camera-preview relative flex bg-black overflow-hidden mb-4"
+            >
+              <div class="camera-container w-full h-full relative">
+                <video
+                  ref="videoElement"
+                  class="camera-video w-full h-full object-cover"
+                  autoplay
+                  playsinline
+                  muted
+                ></video>
+                <button
+                  class="absolute bottom-4 left-1/2 -translate-x-1/2 bg-white text-slate-800 p-3 rounded-full text-2xl leading-none"
+                  @click="capturePhoto"
+                >
+                  <font-awesome icon="camera" class="w-[1em]" />
+                </button>
+              </div>
+            </div>
+            <div
+              class="border-b border-dashed border-slate-300 text-orange-400 mt-4 mb-4 font-bold text-sm"
+            >
+              <span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
+                OR choose a file from your device
+              </span>
+            </div>
+            <div class="mt-4">
+              <input
+                type="file"
+                class="w-full file:text-center file:bg-gradient-to-b file:from-slate-400 file:to-slate-700 file:shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] file:text-white file:px-3 file:py-2 file:rounded-md file:border-none file:cursor-pointer file:me-2"
+                @change="uploadImageFile"
+              />
+            </div>
+            <div
+              class="border-b border-dashed border-slate-300 text-orange-400 mt-4 mb-4 font-bold text-sm"
+            >
+              <span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
+                OR paste an image URL
+              </span>
+            </div>
+            <div class="flex items-center gap-2 mt-4">
+              <input
+                v-model="imageUrl"
+                type="text"
+                class="block w-full rounded border border-slate-400 px-4 py-2"
+                placeholder="https://example.com/image.jpg"
+              />
+              <button
                 v-if="imageUrl"
-                icon="check"
-                class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md cursor-pointer"
+                class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-md cursor-pointer"
                 @click="acceptUrl"
-              />
-              <!-- so that there's no shifting when it becomes visible -->
-              <font-awesome
-                v-else
-                icon="check"
-                class="text-white bg-white px-2 py-2"
-              />
-            </span>
+              >
+                <font-awesome icon="check" class="fa-fw" />
+              </button>
+            </div>
           </div>
-        </div>
+
+          <div v-else>
+            <div v-if="uploading" class="flex justify-center">
+              <font-awesome
+                icon="spinner"
+                class="fa-spin fa-3x text-center block px-12 py-12"
+              />
+            </div>
+            <div v-else>
+              <div v-if="crop">
+                <VuePictureCropper
+                  :box-style="{
+                    backgroundColor: '#f8f8f8',
+                    margin: 'auto',
+                  }"
+                  :img="createBlobURL(blob)"
+                  :options="{
+                    viewMode: 1,
+                    dragMode: 'crop',
+                    aspectRatio: 1 / 1,
+                  }"
+                  class="max-h-[90vh] max-w-[90vw] object-contain"
+                />
+              </div>
+              <div v-else>
+                <div class="flex justify-center">
+                  <img
+                    :src="createBlobURL(blob)"
+                    class="mt-2 rounded max-h-[90vh] max-w-[90vw] object-contain"
+                  />
+                </div>
+              </div>
+              <div
+                :class="[
+                  'grid gap-2 mt-2',
+                  showRetry ? 'grid-cols-2' : 'grid-cols-1',
+                ]"
+              >
+                <button
+                  class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-2 px-3 rounded-md"
+                  @click="uploadImage"
+                >
+                  <span>Upload</span>
+                </button>
+                <button
+                  v-if="showRetry"
+                  class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-2 px-3 rounded-md"
+                  @click="retryImage"
+                >
+                  <span>Retry</span>
+                </button>
+              </div>
+            </div>
+          </div>
+        </template>
+        <template v-else>
+          <div
+            id="noticeBeforeUpload"
+            class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3"
+            role="alert"
+            aria-live="polite"
+          >
+            <p class="mb-2">
+              Before you can upload a photo, a friend needs to register you.
+            </p>
+            <router-link
+              :to="{ name: 'contact-qr' }"
+              class="inline-block text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
+            >
+              Share Your Info
+            </router-link>
+          </div>
+        </template>
       </div>
     </div>
   </div>
-  <PhotoDialog ref="photoDialog" />
 </template>
 
 <script lang="ts">
 import axios from "axios";
 import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
-
-import PhotoDialog from "../components/PhotoDialog.vue";
-import { NotificationIface } from "../constants/app";
+import VuePictureCropper, { cropper } from "vue-picture-cropper";
+import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "../constants/app";
+import { retrieveSettingsForActiveAccount } from "../db/index";
+import { accessToken } from "../libs/crypto";
+import { logger } from "../utils/logger";
+import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
 
 const inputImageFileNameRef = ref<Blob>();
 
 @Component({
-  components: { PhotoDialog },
+  components: { VuePictureCropper },
+  props: {
+    isRegistered: {
+      type: Boolean,
+      default: true,
+    },
+  },
 })
 export default class ImageMethodDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  claimType: string;
+  /** Active DID for user authentication */
+  activeDid = "";
+
+  /** Current image blob being processed */
+  blob?: Blob;
+
+  /** Type of claim for the image */
+  claimType: string = "";
+
+  /** Whether to show cropping interface */
   crop: boolean = false;
+
+  /** Name of the selected file */
+  fileName?: string;
+
+  /** Callback function to set image URL after upload */
   imageCallback: (imageUrl?: string) => void = () => {};
+
+  /** URL for image input */
   imageUrl?: string;
+
+  /** Whether to show retry button */
+  showRetry = true;
+
+  /** Upload progress state */
+  uploading = false;
+
+  /** Dialog visibility state */
   visible = false;
 
+  /** Whether to show camera preview */
+  showCameraPreview = false;
+
+  /** Camera stream reference */
+  private cameraStream: MediaStream | null = null;
+
+  private platformService = PlatformServiceFactory.getInstance();
+  URL = window.URL || window.webkitURL;
+
+  private platformCapabilities = this.platformService.getCapabilities();
+
+  /**
+   * Lifecycle hook: Initializes component and retrieves user settings
+   * @throws {Error} When settings retrieval fails
+   */
+  async mounted() {
+    console.log("ImageMethodDialog mounted");
+    try {
+      const settings = await retrieveSettingsForActiveAccount();
+      this.activeDid = settings.activeDid || "";
+    } catch (error: unknown) {
+      logger.error("Error retrieving settings from database:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
+            error instanceof Error
+              ? error.message
+              : "There was an error retrieving your settings.",
+        },
+        -1,
+      );
+    }
+  }
+
+  /**
+   * Lifecycle hook: Cleans up camera stream when component is destroyed
+   */
+  beforeDestroy() {
+    this.stopCameraPreview();
+  }
+
   open(setImageFn: (arg: string) => void, claimType: string, crop?: boolean) {
     this.claimType = claimType;
     this.crop = !!crop;
     this.imageCallback = setImageFn;
-
     this.visible = true;
-  }
 
-  openPhotoDialog(blob?: Blob, fileName?: string) {
-    this.visible = false;
-
-    (this.$refs.photoDialog as PhotoDialog).open(
-      this.imageCallback,
-      this.claimType,
-      this.crop,
-      blob,
-      fileName,
-    );
+    // Start camera preview immediately if not on mobile
+    if (!this.platformCapabilities.isMobile) {
+      this.startCameraPreview();
+    }
   }
 
   async uploadImageFile(event: Event) {
-    this.visible = false;
+    const target = event.target as HTMLInputElement;
+    if (!target.files) return;
 
-    inputImageFileNameRef.value = event.target.files[0];
-    // https://developer.mozilla.org/en-US/docs/Web/API/File
-    // ... plus it has a `type` property from my testing
+    inputImageFileNameRef.value = target.files[0];
     const file = inputImageFileNameRef.value;
     if (file != null) {
       const reader = new FileReader();
@@ -112,7 +286,9 @@ export default class ImageMethodDialog extends Vue {
           const blob = new Blob([new Uint8Array(data)], {
             type: file.type,
           });
-          this.openPhotoDialog(blob, file.name as string);
+          this.blob = blob;
+          this.fileName = file.name;
+          this.showRetry = false;
         }
       };
       reader.readAsArrayBuffer(file as Blob);
@@ -120,21 +296,16 @@ export default class ImageMethodDialog extends Vue {
   }
 
   async acceptUrl() {
-    this.visible = false;
     if (this.crop) {
       try {
-        const urlBlobResponse: Blob = await axios.get(this.imageUrl as string, {
-          responseType: "blob", // This ensures the data is returned as a Blob
+        const urlBlobResponse = await axios.get(this.imageUrl as string, {
+          responseType: "blob",
         });
         const fullUrl = new URL(this.imageUrl as string);
         const fileName = fullUrl.pathname.split("/").pop() as string;
-        (this.$refs.photoDialog as PhotoDialog).open(
-          this.imageCallback,
-          this.claimType,
-          this.crop,
-          urlBlobResponse.data as Blob,
-          fileName,
-        );
+        this.blob = urlBlobResponse.data as Blob;
+        this.fileName = fileName;
+        this.showRetry = false;
       } catch (error) {
         this.$notify(
           {
@@ -148,11 +319,219 @@ export default class ImageMethodDialog extends Vue {
       }
     } else {
       this.imageCallback(this.imageUrl);
+      this.close();
     }
   }
 
   close() {
     this.visible = false;
+    this.stopCameraPreview();
+    const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
+    if (bottomNav) {
+      bottomNav.style.display = "";
+    }
+    this.blob = undefined;
+    this.showCameraPreview = false;
+  }
+
+  async startCameraPreview() {
+    logger.debug("startCameraPreview called");
+    logger.debug("Current showCameraPreview state:", this.showCameraPreview);
+    logger.debug("Platform capabilities:", this.platformCapabilities);
+
+    if (this.platformCapabilities.isMobile) {
+      logger.debug("Using platform service for mobile device");
+      try {
+        const result = await this.platformService.takePicture();
+        this.blob = result.blob;
+        this.fileName = result.fileName;
+      } catch (error) {
+        logger.error("Error taking picture:", error);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Failed to take picture. Please try again.",
+          },
+          5000,
+        );
+      }
+      return;
+    }
+
+    logger.debug("Starting camera preview for desktop browser");
+    try {
+      this.showCameraPreview = true;
+      await this.$nextTick();
+
+      const stream = await navigator.mediaDevices.getUserMedia({
+        video: { facingMode: "environment" },
+      });
+      this.cameraStream = stream;
+
+      await this.$nextTick();
+
+      const videoElement = this.$refs.videoElement as HTMLVideoElement;
+      if (videoElement) {
+        videoElement.srcObject = stream;
+        await new Promise((resolve) => {
+          videoElement.onloadedmetadata = () => {
+            videoElement.play().then(() => {
+              resolve(true);
+            });
+          };
+        });
+      }
+    } catch (error) {
+      logger.error("Error starting camera preview:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Failed to access camera. Please try again.",
+        },
+        5000,
+      );
+      this.showCameraPreview = false;
+    }
+  }
+
+  stopCameraPreview() {
+    if (this.cameraStream) {
+      this.cameraStream.getTracks().forEach((track) => track.stop());
+      this.cameraStream = null;
+    }
+    this.showCameraPreview = false;
+  }
+
+  async capturePhoto() {
+    if (!this.cameraStream) return;
+
+    try {
+      const videoElement = this.$refs.videoElement as HTMLVideoElement;
+      const canvas = document.createElement("canvas");
+      canvas.width = videoElement.videoWidth;
+      canvas.height = videoElement.videoHeight;
+      const ctx = canvas.getContext("2d");
+      ctx?.drawImage(videoElement, 0, 0, canvas.width, canvas.height);
+
+      canvas.toBlob(
+        (blob) => {
+          if (blob) {
+            this.blob = blob;
+            this.fileName = `photo_${Date.now()}.jpg`;
+            this.showRetry = true;
+            this.stopCameraPreview();
+          }
+        },
+        "image/jpeg",
+        0.95,
+      );
+    } catch (error) {
+      logger.error("Error capturing photo:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Failed to capture photo. Please try again.",
+        },
+        5000,
+      );
+    }
+  }
+
+  private createBlobURL(blob: Blob): string {
+    return URL.createObjectURL(blob);
+  }
+
+  async retryImage() {
+    this.blob = undefined;
+    if (!this.platformCapabilities.isMobile) {
+      await this.startCameraPreview();
+    }
+  }
+
+  async uploadImage() {
+    this.uploading = true;
+
+    if (this.crop) {
+      this.blob = (await cropper?.getBlob()) || undefined;
+    }
+
+    const token = await accessToken(this.activeDid);
+    const headers = {
+      Authorization: "Bearer " + token,
+    };
+    const formData = new FormData();
+    if (!this.blob) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was an error finding the picture. Please try again.",
+        },
+        5000,
+      );
+      this.uploading = false;
+      return;
+    }
+    formData.append("image", this.blob, this.fileName || "photo.jpg");
+    formData.append("claimType", this.claimType);
+    try {
+      if (
+        window.location.hostname === "localhost" &&
+        !DEFAULT_IMAGE_API_SERVER.includes("localhost")
+      ) {
+        logger.log(
+          "Using shared image API server, so only users on that server can play with images.",
+        );
+      }
+      const response = await axios.post(
+        DEFAULT_IMAGE_API_SERVER + "/image",
+        formData,
+        { headers },
+      );
+      this.uploading = false;
+
+      this.close();
+      this.imageCallback(response.data.url as string);
+    } catch (error: unknown) {
+      let errorMessage = "There was an error saving the picture.";
+
+      if (axios.isAxiosError(error)) {
+        const status = error.response?.status;
+        const data = error.response?.data;
+
+        if (status === 401) {
+          errorMessage = "Authentication failed. Please try logging in again.";
+        } else if (status === 413) {
+          errorMessage = "Image file is too large. Please try a smaller image.";
+        } else if (status === 415) {
+          errorMessage =
+            "Unsupported image format. Please try a different image.";
+        } else if (status && status >= 500) {
+          errorMessage = "Server error. Please try again later.";
+        } else if (data?.message) {
+          errorMessage = data.message;
+        }
+      }
+
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: errorMessage,
+        },
+        5000,
+      );
+      this.uploading = false;
+      this.blob = undefined;
+    }
   }
 }
 </script>
@@ -178,5 +557,9 @@ export default class ImageMethodDialog extends Vue {
   border-radius: 0.5rem;
   width: 100%;
   max-width: 700px;
+  max-height: 90vh;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 </style>