Merge branch 'qrcode-capacitor' of ssh://173.199.124.46:222/trent_larson/crowd-funder-for-time-pwa into qrcode-capacitor

- Fix Vue template syntax in App.vue by using proper event handler format
- Update Vite config to properly handle ESM imports and crypto modules
- Add manual chunks for better code splitting
- Improve environment variable handling in vite-env.d.ts
- Fix TypeScript linting errors in App.vue

.cursor/rules/architectural_decision_record.mdc

@@ -1,292 +0,0 @@
----
-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

@@ -1,222 +0,0 @@
----
-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/general-project-rule.mdc

@@ -0,0 +1,8 @@
+---
+description: General project rules that applies to all file types. Should be most general
+globs: **/*
+---
+- Naming Conventions: Follow clear and consistent naming conventions.
+- Performance Optimization: Optimize code for performance.
+- Key Conventions: Adhere to project-specific key conventions.
+- Error Handling and Validation: implement comprehensive error handling and validation.

.cursor/rules/general-typescript-rule.mdc

@@ -0,0 +1,7 @@
+---
+description: Applies general TypeScript best practices and style guidelines to all TypeScript files in the project.
+globs: **/*.ts
+---
+- You are an expert in TypeScript.
+- TypeScript Usage: Follow TypeScript best practices for type safety and code maintainability.
+- Syntax and Formatting: Adhere to consistent coding style and formatting guidelines for TypeScript.

.cursor/rules/reports.mdc

@@ -0,0 +1,9 @@
+---
+description: 
+globs: 
+alwaysApply: false
+---
+- make reports chronologically in paragraph form without using pronouns or references to people
+- use this git command to make a report: git log --since="12 hours ago" --pretty=format:"%H - %s (%an)" -p --color --all > output.txt
+- the output.txt is the basis of work in the last 12 hours
+- reports should always include pending issues and next steps along with urls to commits that day

.cursor/rules/tailwind-css-styling-rule.mdc

@@ -0,0 +1,6 @@
+---
+description: Apply Tailwind CSS styling conventions in all relevant files.
+globs: **/*.tsx
+---
+- You are an expert in Tailwind.
+- UI and Styling: Use Tailwind CSS for consistent UI styling.

.cursor/rules/timesafari.mdc

@@ -3,11 +3,6 @@ description:
 globs: 
 alwaysApply: true
 ---
----
-description: 
-globs: 
-alwaysApply: true
----
 # Time Safari Context
 
 ## Project Overview
@@ -44,7 +39,7 @@ This application is built on a privacy-preserving claims architecture (via endor
 - **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
+- **Native and Web App**: Works on iOS, Android, and web browsers
 
 ## User Journey
 
@@ -102,7 +97,7 @@ When developing new features, be mindful of these constraints:
 
 ## Project Technologies
 
-- Typescript using ES6 classes using vue-facing-decorator
+- Typescript using ES6 classes
 - TailwindCSS
 - Vite Build Tool
 - Playwright E2E testing
@@ -273,4 +268,3 @@ This expanded documentation provides:
 3. Real-world examples
 4. TypeScript integration
 5. Best practices for Time Safari
-

.cursor/rules/ts-cross-platform-rule.mdc

@@ -0,0 +1,16 @@
+---
+description: 
+globs: 
+alwaysApply: true
+---
+- all cross platform builds need to conform to [PlatformService.ts](mdc:src/services/PlatformService.ts), and [PlatformServiceFactory.ts](mdc:src/services/PlatformServiceFactory.ts)
+- [CapacitorPlatformService.ts](mdc:src/services/platforms/CapacitorPlatformService.ts) is used for mobile both iOS and Android
+- [ElectronPlatformService.ts](mdc:src/services/platforms/ElectronPlatformService.ts) is used for cross-platform (Windows, MacOS, and Linux) desktop builds using Electron.
+- [WebPlatformService.ts](mdc:src/services/platforms/WebPlatformService.ts) is used for traditional web browsers and PWA (Progressive Web Applications)
+- [PyWebViewPlatformService.ts](mdc:src/services/platforms/PyWebViewPlatformService.ts) is used for handling a electron-like desktop application which can run Python
+- Vite is used to differentiate builds for platforms
+- @vite.config.mts is used for general configuration which uses environment variables to determine next actions
+- @vite.config.common.mts handles common features in vite builds.
+- [vite.config.capacitor.mts](mdc:vite.config.capacitor.mts) handles features of Vite builds for capacitor
+- [vite.config.electron.mts](mdc:vite.config.electron.mts) handles features of Vite builds for electron
+- [vite.config.web.mts](mdc:vite.config.web.mts) handles features of Vite builds for traditional web browsers and PWAs

.eslintrc.js

@@ -1,32 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true,
-    es2022: true,
-  },
-  extends: [
-    "plugin:vue/vue3-recommended",
-    "eslint:recommended",
-    "@vue/typescript/recommended",
-    "plugin:prettier/recommended"
-  ],
-  // parserOptions: {
-  //   ecmaVersion: 2020,
-  // },
-  rules: {
-    "max-len": ["warn", {
-      code: 100,
-      ignoreComments: true,
-      ignorePattern: '^\\s*class="[^"]*"$',
-      ignoreStrings: true,
-      ignoreTemplateLiterals: true,
-      ignoreUrls: true,
-    }],
-    "no-console": process.env.NODE_ENV === "production" ? "error" : "warn",
-    "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-unused-vars": ["error", { "argsIgnorePattern": "^_" }]
-  },
-};

.eslintrc.json

@@ -0,0 +1,57 @@
+{
+  "root": true,
+  "env": {
+    "node": true,
+    "browser": true,
+    "es2022": true
+  },
+  "extends": [
+    "plugin:vue/vue3-recommended",
+    "eslint:recommended",
+    "@vue/typescript/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "parser": "vue-eslint-parser",
+  "parserOptions": {
+    "parser": "@typescript-eslint/parser",
+    "ecmaVersion": 2022,
+    "sourceType": "module",
+    "extraFileExtensions": [".vue"],
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "plugins": [
+    "@typescript-eslint",
+    "vue",
+    "prettier"
+  ],
+  "rules": {
+    "no-console": "warn",
+    "no-debugger": "warn",
+    "@typescript-eslint/no-explicit-any": "off",
+    "vue/multi-word-component-names": "off",
+    "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
+    "@typescript-eslint/no-unnecessary-type-constraint": "off",
+    "vue/no-parsing-error": ["error", {
+      "x-invalid-end-tag": false,
+      "invalid-first-character-of-tag-name": false
+    }],
+    "vue/no-v-html": "warn",
+    "prettier/prettier": ["error", {
+      "singleQuote": true,
+      "semi": false,
+      "trailingComma": "none"
+    }]
+  },
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.mts"],
+      "parser": "@typescript-eslint/parser"
+    },
+    {
+      "files": ["*.js", "*.jsx", "*.mjs"],
+      "parser": "@typescript-eslint/parser"
+    }
+  ]
+} 

.eslintrc.mjs

@@ -0,0 +1,55 @@
+export default {
+  root: true,
+  env: {
+    node: true,
+    browser: true,
+    es2022: true
+  },
+  extends: [
+    'plugin:vue/vue3-recommended',
+    'eslint:recommended',
+    '@vue/typescript/recommended'
+  ],
+  parser: 'vue-eslint-parser',
+  parserOptions: {
+    parser: {
+      'ts': '@typescript-eslint/parser',
+      'js': '@typescript-eslint/parser',
+      '<template>': 'espree'
+    },
+    ecmaVersion: 2022,
+    sourceType: 'module',
+    extraFileExtensions: ['.vue'],
+    ecmaFeatures: {
+      jsx: true
+    }
+  },
+  plugins: [
+    '@typescript-eslint',
+    'vue'
+  ],
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    'vue/multi-word-component-names': 'off',
+    '@typescript-eslint/no-unused-vars': ['error', { 'argsIgnorePattern': '^_' }]
+  },
+  overrides: [
+    {
+      files: ['*.ts', '*.tsx', '*.mts'],
+      parser: '@typescript-eslint/parser'
+    },
+    {
+      files: ['*.js', '*.jsx', '*.mjs'],
+      parser: '@typescript-eslint/parser'
+    }
+  ],
+  settings: {
+    'import/resolver': {
+      node: {
+        extensions: ['.js', '.jsx', '.ts', '.tsx', '.vue', '.mjs', '.mts']
+      }
+    }
+  }
+};

.gitignore

@@ -42,7 +42,7 @@ dist-electron-packages
 .ruby-version
 +.env
 
-# Test files generated by scripts test-ios.js & test-android.js
+# Generated test files
 .generated/
 
 .env.default
@@ -53,4 +53,5 @@ build_logs/
 
 android/app/src/main/assets/public
 android/app/src/main/res
-
+android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+android/.gradle/file-system.probe

BUILDING.md

@@ -11,7 +11,7 @@ For a quick dev environment setup, use [pkgx](https://pkgx.dev).
 - Git
 - For Android builds: Android Studio with SDK installed
 - For iOS builds: macOS with Xcode and ruby gems & bundle
-  - `pkgx +rubygems.org sh`
+  - pkgx +rubygems.org sh
 
   - ... and you may have to fix these, especially with pkgx
 
@@ -54,7 +54,7 @@ Install dependencies:
 1. Run the production build:
 
    ```bash
-   npm run build:web
+   npm run build
    ```
 
    The built files will be in the `dist` directory.
@@ -111,106 +111,8 @@ TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.
 
 * 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)
 
@@ -236,75 +138,21 @@ docker run -d \
    - 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
 
-- **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
-    ```
+- AppImage: Make executable and run
 
-- **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
+  ```bash
+  chmod +x dist-electron-packages/TimeSafari-*.AppImage
+  ./dist-electron-packages/TimeSafari-*.AppImage
+  ```
 
-  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
+- DEB: Install and run
+
+  ```bash
+  sudo dpkg -i dist-electron-packages/timesafari_*_amd64.deb
+  timesafari
+  ```
 
 ### Development Testing
 
@@ -327,8 +175,6 @@ Prerequisites: macOS with Xcode installed
 1. Build the web assets:
 
    ```bash
-   rm -rf dist
-   npm run build:web
    npm run build:capacitor
    ```
 
@@ -338,8 +184,6 @@ Prerequisites: macOS with Xcode installed
    npx cap sync ios
    ```
 
-  - If that fails with "Could not find..." then look at the "gem_path" instructions above.
-
 3. Copy the assets:
 
    ```bash
@@ -347,38 +191,13 @@ Prerequisites: macOS with Xcode installed
    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:
+3. Open the project in Xcode:
 
    ```bash
    npx cap open ios
    ```
 
-6. Use Xcode to build and run on simulator or device.
-
-7. Release
-
-  * 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".
+4. Use Xcode to build and run on simulator or device.
 
 #### First-time iOS Configuration
 
@@ -396,6 +215,9 @@ Prerequisites: Android Studio with SDK installed
    rm -rf dist
    npm run build:web
    npm run build:capacitor
+   cd android
+   ./gradlew clean
+   ./gradlew assembleDebug
    ```
 
 2. Update Android project with latest build:
@@ -410,15 +232,13 @@ Prerequisites: Android Studio with SDK installed
    npx capacitor-assets generate --android
    ```
 
-4. Bump version to match iOS: android/app/build.gradle
-
-5. Open the project in Android Studio:
+4. Open the project in Android Studio:
 
    ```bash
    npx cap open android
    ```
 
-6. Use Android Studio to build and run on emulator or device.
+5. Use Android Studio to build and run on emulator or device.
 
 ## Android Build from the console
 
@@ -426,7 +246,7 @@ Prerequisites: Android Studio with SDK installed
    cd android
    ./gradlew clean
    ./gradlew build -Dlint.baselines.continue=true
-   cd -
+   cd ..
    npx cap run android
    ```
 
@@ -436,25 +256,12 @@ Prerequisites: Android Studio with SDK installed
    ./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`:
+... or, to create a signed release, add the app/gradle.properties.secrets file (see properties at top of app/build.gradle) and the app/time-safari-upload-key-pkcs12.jks file, 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:
-
-- Go to the Testing Track (eg. Closed).
-- Click "Create new release".
-- Upload the `aab` file.
-- Hit "Next".
-- Save, go to "Publishing Overview" as prompted, and click "Send changes for review".
 
 
 ## First-time Android Configuration for deep links
@@ -468,4 +275,253 @@ 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 all tests (requires XCode and Android Studio/device):
+
+```bash
+npm run test:all
+```
+
+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
+
+
+# List all installed packages
+adb shell pm list packages | grep timesafari
+
+# Force stop the app (if it's running)
+adb shell am force-stop app.timesafari
+
+# Clear app data (if you don't want to fully uninstall)
+adb shell pm clear app.timesafari
+
+# Uninstall for all users
+adb shell pm uninstall -k --user 0 app.timesafari
+
+# Check if app is installed
+adb shell pm path app.timesafari

Dockerfile

@@ -1,36 +0,0 @@
-# Build stage
-FROM node:22-alpine3.20 AS builder
-
-# Install build dependencies
-
-RUN apk add --no-cache bash git 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-context.md

@@ -0,0 +1,322 @@
+# 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 iOS, Android, 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
+- 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
+
+
+## Vue Component Structure
+
+- Use `@Options`, `@Ref`, `@Prop`, `@Emit`, and `@Watch` Typescript decorators for clear component structure
+- Extend `Vue` class with proper type annotations for props, refs, and methods
+- Use Tailwind utility classes for accessible and responsive design
+- Avoid `setup()` or Composition API; use class syntax consistently
+- Keep methods pure when possible; extract logic into utilities
+- Ensure lifecycle methods are clearly defined inside class
+- Use semantic HTML + Tailwind classes for styling
+- Pinia for state management
+
+## Vue Facing Decorators
+
+- Ensure all Vue 3 components are written using TypeScript with strict type checking enabled.
+- Always include explicit types for props, emits, and reactive properties.
+- When using @Options, ensure it includes metadata like name, template, or styles.
+- Use @Prop for defining props with validation and default values.
+- Use @Emit for emitting events with proper payload typing.
+- Use @Watch for reactive property changes, and @Ref for DOM references."
+- Organize Vue 3 components with a clear structure: imports at the top, followed by @Options metadata, then class properties (props, refs, reactive state), lifecycle hooks, methods, and finally @Watch or @Emit handlers.
+- Ensure all props have explicit types and optional validation.
+- Use TypeScript interfaces or types for complex prop structures.
+- Validate default values for props where applicable.
+- Use lifecycle hooks (e.g., onMounted, onUnmounted) sparingly and document their purpose.
+- Avoid side effects in lifecycle hooks unless absolutely necessary.
+- Use @Emit for emitting events with strongly typed payloads.
+- Ensure event names are descriptive and match the action being performed.
+- Use ref or reactive for managing internal state.
+- Avoid overusing reactive state for simple values. Prefer computed properties for derived state.
+- Write unit tests for components using Vue Test Utils and Jest/Vitest.
+- Ensure tests cover props, events, and lifecycle behavior.
+- Avoid unnecessary re-renders by using v-once for static content and memoizing expensive computations with computed properties.
+- Ensure components are accessible by using semantic HTML and ARIA attributes.
+- Use scoped styles or CSS modules to encapsulate styles.
+
+## es6 classes
+
+- Use ES6 class syntax with decorators (@Options, @Prop, @Emit).
+- Use modular imports and default exports.
+- Use arrow functions for methods and callbacks.
+- Use destructuring for props and state.
+- Provide default parameters for optional props or arguments.
+- Use template literals for dynamic strings.
+- Use spread/rest operators for object manipulation and arguments.
+- Use const/let appropriately for variable declarations.
+- Use enhanced object literals for cleaner syntax.
+- Use async/await for asynchronous operations.
+- Add scoped styles for encapsulation.
+- Ensure accessibility with semantic HTML and ARIA attributes.
+
+## Documentation
+
+- Include JSDoc comments for all public methods and props.
+- Files must have comments explaing contents and workflow of file
+- Methods and props should explain role and workflow of each

README.md

@@ -12,8 +12,6 @@ See [project.task.yaml](project.task.yaml) for current priorities.
 
 Quick start:
 
-* For setup, we recommend [pkgx](https://pkgx.dev), which installs what you need (either automatically or with the `dev` command). Core dependencies are typescript & npm; when building for other platforms, you'll need other things such as those in the pkgx.yaml & BUILDING.md files.
-
 ```bash
 npm install
 npm run dev
@@ -33,9 +31,7 @@ See [TESTING.md](test-playwright/TESTING.md) for detailed test instructions.
 
 ## Icons
 
-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.
+To add an icon, add to main.ts and reference with `fa` element and `icon` attribute with the hyphenated name.
 
 ## Other
 
@@ -48,24 +44,6 @@ To add a Font Awesome icon, add to main.ts and reference with `font-awesome` ele
 
 * 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!

TASK_storage.md

@@ -1,84 +0,0 @@
-
-# What to do about storage for native apps?
-
-
-## Problem
-
-We can't trust iOS IndexedDB to persist. I want to start delivering an app to people now, in preparation for presentations mid-June: Rotary on June 12 and Porcfest on June 17.
-
-* Apple WebKit puts a [7-day cap on IndexedDB](https://webkit.org/blog/10218/full-third-party-cookie-blocking-and-more/).
-
-  * The web standards expose a `persist` method to mark memory as persistent, and [supposedly WebView supports it](https://developer.mozilla.org/en-US/docs/Web/API/StorageManager/persisted), but too many other things indicate it's not reliable. I've talked with [ChatGPT](https://chatgpt.com/share/68322f40-84c8-8007-b213-855f7962989a) & Venice & Claude (in Cursor); [this answer from Perplexity](https://www.perplexity.ai/search/which-platforms-prompt-the-use-HUQLqy4qQD2cRbkmO4CgHg) says that most platforms don't prompt and Safari doesn't support it; I don't know if that means WebKit as well.
-
-* Capacitor says [not to trust it on iOS](https://capacitorjs.com/docs/v6/guides/storage).
-
-Also, with sensitive data, the accounts info should be encrypted.
-
-
-# Options
-
-* There is a community [SQLite plugin for Capacitor](https://github.com/capacitor-community/sqlite) with encryption by [SQLCipher](https://github.com/sqlcipher/sqlcipher).
-
-  * [This tutorial](https://jepiqueau.github.io/2023/09/05/Ionic7Vue-SQLite-CRUD-App.html#part-1---web---table-of-contents) shows how that plugin works for web as well as native.
-
-* Capacitor abstracts [user preferences in an API](https://capacitorjs.com/docs/apis/preferences), which uses different underlying libraries on iOS & Android. Unfortunately, it won't do any filtering or searching, and is only meant for small amounts of data. (It could be used for settings and for identifiers, but contacts will grow and image blobs won't work.)
-
-  * There are hints that Capacitor offers another custom storage API but all I could find was that Preferences API.
-
-* [Ionic Storage](https://ionic.io/docs/secure-storage) is an enterprise solution, which also supports encryption.
-
-* Not an option yet: Dexie may support SQLite in [a future version](https://dexie.org/roadmap/dexie5.0).
-
-
-
-# Current Plan
-
-* Implement SQLite for Capacitor & web, with encryption. That will allow us to test quickly and keep the same interface for native & web, but we don't deal with migrations for current web users.
-
-* After that is delivered, write a migration for current web users from IndexedDB to SQLite.
-
-
-
-# Current method calls
-
-... which is not 100% complete because the AI that generated thus claimed no usage of 'temp' DB.
-
-### Secret Database (secretDB) - Used for storing the encryption key
-
-secretDB.open() - Opens the database
-secretDB.secret.get(MASTER_SECRET_KEY) - Retrieves the secret key
-secretDB.secret.add({ id: MASTER_SECRET_KEY, secret }) - Adds a new secret key
-
-### Accounts Database (accountsDB) - Used for storing sensitive account information
-
-accountsDB.open() - Opens the database
-accountsDB.accounts.count() - Counts number of accounts
-accountsDB.accounts.toArray() - Gets all accounts
-accountsDB.accounts.where("did").equals(did).first() - Gets a specific account by DID
-accountsDB.accounts.add(account) - Adds a new account
-
-### Non-sensitive Database (db) - Used for settings, contacts, logs, and temp data
-
-Settings operations:
-export all settings (Dexie format)
-db.settings.get(MASTER_SETTINGS_KEY) - Gets default settings
-db.settings.where("accountDid").equals(did).first() - Gets account-specific settings
-db.settings.where("accountDid").equals(did).modify(settingsChanges) - Updates account settings
-db.settings.add(settingsChanges) - Adds new settings
-db.settings.count() - Counts number of settings
-db.settings.update(key, changes) - Updates settings
-
-Contacts operations:
-export all contacts (Dexie format)
-db.contacts.toArray() - Gets all contacts
-db.contacts.add(contact) - Adds a new contact
-db.contacts.update(did, contactData) - Updates a contact
-db.contacts.delete(did) - Deletes a contact
-db.contacts.where("did").equals(did).first() - Gets a specific contact by DID
-
-Logs operations:
-db.logs.get(todayKey) - Gets logs for a specific day
-db.logs.update(todayKey, { message: fullMessage }) - Updates logs
-db.logs.clear() - Clears all logs
-
-

android/.gitignore

@@ -1,17 +1,5 @@
 # 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
 
@@ -106,3 +94,11 @@ 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

@@ -0,0 +1,2 @@
+#Wed Apr 09 09:01:13 UTC 2025
+gradle.version=8.11.1

android/app/.gitignore

@@ -0,0 +1,2 @@
+/build/*
+!/build/.npmkeep

android/app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 18
-        versionName "0.4.7"
+        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.

android/app/capacitor.build.gradle

@@ -9,12 +9,13 @@ 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-clipboard')
     implementation project(':capacitor-filesystem')
     implementation project(':capacitor-share')
     implementation project(':capawesome-capacitor-file-picker')
+    implementation project(':capacitor-mlkit-barcode-scanning')
 
 }
 

android/app/google-services.json

@@ -1,28 +0,0 @@
-{
-  "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/src/main/AndroidManifest.xml

@@ -42,5 +42,4 @@
     <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

@@ -16,6 +16,14 @@
 					}
 				]
 			}
+		},
+		"MLKitBarcodeScanner": {
+			"formats": [
+				"QR_CODE"
+			],
+			"detectorSize": 1,
+			"lensFacing": "back",
+			"googleBarcodeScannerModuleInstallState": true
 		}
 	}
 }

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

@@ -1,8 +1,4 @@
 [
-	{
-		"pkg": "@capacitor-mlkit/barcode-scanning",
-		"classpath": "io.capawesome.capacitorjs.plugins.mlkit.barcodescanning.BarcodeScannerPlugin"
-	},
 	{
 		"pkg": "@capacitor/app",
 		"classpath": "com.capacitorjs.plugins.app.AppPlugin"
@@ -11,6 +7,10 @@
 		"pkg": "@capacitor/camera",
 		"classpath": "com.capacitorjs.plugins.camera.CameraPlugin"
 	},
+	{
+		"pkg": "@capacitor/clipboard",
+		"classpath": "com.capacitorjs.plugins.clipboard.ClipboardPlugin"
+	},
 	{
 		"pkg": "@capacitor/filesystem",
 		"classpath": "com.capacitorjs.plugins.filesystem.FilesystemPlugin"
@@ -22,5 +22,9 @@
 	{
 		"pkg": "@capawesome/capacitor-file-picker",
 		"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
+	},
+	{
+		"pkg": "@capacitor-mlkit/barcode-scanning",
+		"classpath": "io.capawesome.capacitorjs.plugins.mlkit.barcodescanning.BarcodeScannerPlugin"
 	}
 ]

android/capacitor.settings.gradle

@@ -2,15 +2,15 @@
 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-clipboard'
+project(':capacitor-clipboard').projectDir = new File('../node_modules/@capacitor/clipboard/android')
+
 include ':capacitor-filesystem'
 project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
 
@@ -19,3 +19,6 @@ project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/sh
 
 include ':capawesome-capacitor-file-picker'
 project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
+
+include ':capacitor-mlkit-barcode-scanning'
+project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../node_modules/@capacitor-mlkit/barcode-scanning/android')

android/gradle.properties

@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -Djdk.io.File.enableADS=true -Dsun.net.inetaddr.ttl=0 -Dsun.net.inetaddr.negative.ttl=0 -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=10000
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -20,4 +20,8 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-android.suppressUnsupportedCompileSdk=34
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Use DNS servers that can resolve Google's Maven repository
+systemProp.sun.net.spi.nameservice.nameservers=8.8.8.8,8.8.4.4
+systemProp.sun.net.spi.nameservice.provider.1=dns,sun

assets/README.md

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

build.sh

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

capacitor.config.json

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

capacitor.config.ts

@@ -0,0 +1,31 @@
+import { CapacitorConfig } from '@capacitor/cli';
+
+const config: CapacitorConfig = {
+  appId: 'app.timesafari',
+  appName: 'TimeSafari',
+  webDir: 'dist',
+  bundledWebRuntime: false,
+  server: {
+    cleartext: true,
+  },
+  plugins: {
+    App: {
+      appUrlOpen: {
+        handlers: [
+          {
+            url: "timesafari://*",
+            autoVerify: true
+          }
+        ]
+      }
+    },
+    MLKitBarcodeScanner: {
+      formats: ['QR_CODE'], // Only enable QR code scanning to improve performance
+      detectorSize: 1.0, // Use full camera view for detection
+      lensFacing: 'back', // Default to back camera
+      googleBarcodeScannerModuleInstallState: true // Enable Google Play Services barcode module installation if needed
+    }
+  }
+};
+
+export default config;

doc/qr-code-implementation-guide.md

@@ -1,805 +0,0 @@
-# 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

docs/DEEP_LINKS.md

@@ -9,95 +9,21 @@ 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 using `z.infer`
+   - Generated from Zod schemas
    - 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/interfaces/deepLinks.ts`: Type definitions and validation schemas
+- `src/types/deepLinks.ts`: Type definitions and validation schemas
 - `src/services/deepLinks.ts`: Deep link processing service
 - `src/main.capacitor.ts`: Capacitor integration
 

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,viewport-fit=cover">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="/favicon.ico">
     <title>TimeSafari</title>
   </head>

ios/.gitignore

@@ -4,6 +4,7 @@ App/output
 App/App/public
 DerivedData
 xcuserdata
+*.xcuserstate
 
 # Cordova plugins for Capacitor
 capacitor-cordova-ios-plugins
@@ -11,3 +12,12 @@ capacitor-cordova-ios-plugins
 # Generated Config files
 App/App/capacitor.config.json
 App/App/config.xml
+
+# User-specific Xcode files
+App/App.xcodeproj/xcuserdata/*.xcuserdatad/
+App/App.xcodeproj/*.xcuserstate
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output

ios/App/App.xcworkspace/contents.xcworkspacedata

@@ -2,7 +2,7 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:App.xcodeproj">
+      location = "group:Time Safari.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:Pods/Pods.xcodeproj">

ios/App/App/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>TimeSafari</string>
+        <string>TimeSafari</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -22,10 +22,6 @@
 	<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>
@@ -49,5 +45,15 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
+	<key>UISupportsDocumentBrowser</key>
+	<true/>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>This app needs access to save exported files to your photo library.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app needs access to save exported files to your photo library.</string>
 </dict>
 </plist>

ios/App/App/entitlements.mac.plist

@@ -1,20 +0,0 @@
-<?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

@@ -11,12 +11,13 @@ 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 'CapacitorClipboard', :path => '../../node_modules/@capacitor/clipboard'
   pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
   pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
   pod 'CapawesomeCapacitorFilePicker', :path => '../../node_modules/@capawesome/capacitor-file-picker'
+  pod 'CapacitorMlkitBarcodeScanning', :path => '../../node_modules/@capacitor-mlkit/barcode-scanning'
 end
 
 target 'App' do

ios/App/Podfile.lock

@@ -1,144 +1,28 @@
 PODS:
-  - Capacitor (6.2.1):
+  - Capacitor (6.2.0):
     - 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)
+  - CapacitorCordova (6.2.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
+  Capacitor: 05d35014f4425b0740fc8776481f6a369ad071bf
   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
+  CapacitorCordova: b33e7f4aa4ed105dd43283acdd940964374a87d9
 
-PODFILE CHECKSUM: 7e7e09e6937de7f015393aecf2cf7823645689b3
+PODFILE CHECKSUM: 4233f5c5f414604460ff96d372542c311b0fb7a8
 
 COCOAPODS: 1.16.2

ios/App/Time Safari.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -20,7 +20,7 @@
 /* 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; };
+		504EC3041FED79650016851F /* Time Safari.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Time Safari.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>"; };
@@ -65,7 +65,7 @@
 		504EC3051FED79650016851F /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				504EC3041FED79650016851F /* App.app */,
+				504EC3041FED79650016851F /* Time Safari.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -97,24 +97,23 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		504EC3031FED79650016851F /* App */ = {
+		504EC3031FED79650016851F /* Time Safari */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
+			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "Time Safari" */;
 			buildPhases = (
 				6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
 				504EC3001FED79650016851F /* Sources */,
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
 				9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
-				012076E8FFE4BF260A79B034 /* Fix Privacy Manifest */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
-			name = App;
+			name = "Time Safari";
 			productName = App;
-			productReference = 504EC3041FED79650016851F /* App.app */;
+			productReference = 504EC3041FED79650016851F /* Time Safari.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -123,9 +122,8 @@
 		504EC2FC1FED79650016851F /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 920;
-				LastUpgradeCheck = 1630;
+				LastUpgradeCheck = 920;
 				TargetAttributes = {
 					504EC3031FED79650016851F = {
 						CreatedOnToolsVersion = 9.2;
@@ -134,7 +132,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */;
+			buildConfigurationList = 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "Time Safari" */;
 			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -143,11 +141,13 @@
 				Base,
 			);
 			mainGroup = 504EC2FB1FED79650016851F;
+			packageReferences = (
+			);
 			productRefGroup = 504EC3051FED79650016851F /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				504EC3031FED79650016851F /* App */,
+				504EC3031FED79650016851F /* Time Safari */,
 			);
 		};
 /* End PBXProject section */
@@ -169,26 +169,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		012076E8FFE4BF260A79B034 /* Fix Privacy Manifest */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Fix Privacy Manifest";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PROJECT_DIR}/app_privacy_manifest_fixer/fixer.sh\" ";
-			showEnvVarsInLog = 0;
-		};
 		6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -269,7 +249,6 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -277,10 +256,8 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -290,10 +267,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = 7XVXYPEQYJ;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -331,7 +306,6 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -339,10 +313,8 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -352,10 +324,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = 7XVXYPEQYJ;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -367,8 +337,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -379,23 +348,20 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
-				ENABLE_APP_SANDBOX = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				INFOPLIST_FILE = App/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "Time Safari";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 0.4.7;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.0;
 				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";
 			};
 			name = Debug;
 		};
@@ -405,29 +371,26 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
-				ENABLE_APP_SANDBOX = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				INFOPLIST_FILE = App/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "Time Safari";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 0.4.7;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.0;
 				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";
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */ = {
+		504EC2FF1FED79650016851F /* Build configuration list for PBXProject "Time Safari" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				504EC3141FED79650016851F /* Debug */,
@@ -436,7 +399,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */ = {
+		504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "Time Safari" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				504EC3171FED79650016851F /* Debug */,

ios/App/app_privacy_manifest_fixer/.gitignore

@@ -1,5 +0,0 @@
-# macOS
-.DS_Store
-
-# Build
-/Build/

ios/App/app_privacy_manifest_fixer/CHANGELOG.md

@@ -1,58 +0,0 @@
-## 1.4.1
-- Fix macOS app re-signing issue.
-- Automatically enable Hardened Runtime in macOS codesign.
-- Add clean script.
-
-## 1.4.0
-- Support for macOS app ([#9](https://github.com/crasowas/app_privacy_manifest_fixer/issues/9)).
-
-## 1.3.11
-- Fix install issue by skipping `PBXAggregateTarget` ([#4](https://github.com/crasowas/app_privacy_manifest_fixer/issues/4)).
-
-## 1.3.10
-- Fix app re-signing issue.
-- Enhance Build Phases script robustness.
-
-## 1.3.9
-- Add log file output.
-
-## 1.3.8
-- Add version info to privacy access report.
-- Remove empty tables from privacy access report.
-
-## 1.3.7
-- Enhance API symbols analysis with strings tool.
-- Improve performance of API usage analysis.
-
-## 1.3.5
-- Fix issue with inaccurate privacy manifest search.
-- Disable dependency analysis to force the script to run on every build.
-- Add placeholder for privacy access report.
-- Update build output directory naming convention.
-- Add examples for privacy access report.
-
-## 1.3.0
-- Add privacy access report generation.
-
-## 1.2.3
-- Fix issue with relative path parameter.
-- Add support for all application targets.
-
-## 1.2.1
-- Fix backup issue with empty user templates directory.
-
-## 1.2.0
-- Add uninstall script.
-
-## 1.1.2
-- Remove `Templates/.gitignore` to track `UserTemplates`.
-- Fix incorrect use of `App.xcprivacy` template in `App.framework`.
-
-## 1.1.0
-- Add logs for latest release fetch failure.
-- Fix issue with converting published time to local time.
-- Disable showing environment variables in the build log.
-- Add `--install-builds-only` command line option.
-
-## 1.0.0
-- Initial version.

ios/App/app_privacy_manifest_fixer/Common/constants.sh

@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2025, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-set -e
-
-# Prevent duplicate loading
-if [ -n "$CONSTANTS_SH_LOADED" ]; then
-    return
-fi
-
-readonly CONSTANTS_SH_LOADED=1
-
-# File name of the privacy manifest
-readonly PRIVACY_MANIFEST_FILE_NAME="PrivacyInfo.xcprivacy"
-
-# Common privacy manifest template file names
-readonly APP_TEMPLATE_FILE_NAME="AppTemplate.xcprivacy"
-readonly FRAMEWORK_TEMPLATE_FILE_NAME="FrameworkTemplate.xcprivacy"
-
-# Universal delimiter
-readonly DELIMITER=":"
-
-# Space escape symbol for handling space in path
-readonly SPACE_ESCAPE="\u0020"
-
-# Default value when the version cannot be retrieved
-readonly UNKNOWN_VERSION="unknown"
-
-# Categories of required reason APIs
-readonly API_CATEGORIES=(
-    "NSPrivacyAccessedAPICategoryFileTimestamp"
-    "NSPrivacyAccessedAPICategorySystemBootTime"
-    "NSPrivacyAccessedAPICategoryDiskSpace"
-    "NSPrivacyAccessedAPICategoryActiveKeyboards"
-    "NSPrivacyAccessedAPICategoryUserDefaults"
-)
-
-# Symbol of the required reason APIs and their categories
-#
-# See also:
-#   * https://developer.apple.com/documentation/bundleresources/describing-use-of-required-reason-api
-#   * https://github.com/Wooder/ios_17_required_reason_api_scanner/blob/main/required_reason_api_binary_scanner.sh
-readonly API_SYMBOLS=(
-    # NSPrivacyAccessedAPICategoryFileTimestamp
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}getattrlist"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}getattrlistbulk"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}fgetattrlist"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}stat"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}fstat"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}fstatat"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}lstat"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}getattrlistat"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}NSFileCreationDate"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}NSFileModificationDate"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}NSURLContentModificationDateKey"
-    "NSPrivacyAccessedAPICategoryFileTimestamp${DELIMITER}NSURLCreationDateKey"
-    # NSPrivacyAccessedAPICategorySystemBootTime
-    "NSPrivacyAccessedAPICategorySystemBootTime${DELIMITER}systemUptime"
-    "NSPrivacyAccessedAPICategorySystemBootTime${DELIMITER}mach_absolute_time"
-    # NSPrivacyAccessedAPICategoryDiskSpace
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}statfs"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}statvfs"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}fstatfs"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}fstatvfs"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}NSFileSystemFreeSize"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}NSFileSystemSize"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}NSURLVolumeAvailableCapacityKey"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}NSURLVolumeAvailableCapacityForImportantUsageKey"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}NSURLVolumeAvailableCapacityForOpportunisticUsageKey"
-    "NSPrivacyAccessedAPICategoryDiskSpace${DELIMITER}NSURLVolumeTotalCapacityKey"
-    # NSPrivacyAccessedAPICategoryActiveKeyboards
-    "NSPrivacyAccessedAPICategoryActiveKeyboards${DELIMITER}activeInputModes"
-    # NSPrivacyAccessedAPICategoryUserDefaults
-    "NSPrivacyAccessedAPICategoryUserDefaults${DELIMITER}NSUserDefaults"
-)

ios/App/app_privacy_manifest_fixer/Common/utils.sh

@@ -1,125 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2025, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-set -e
-
-# Prevent duplicate loading
-if [ -n "$UTILS_SH_LOADED" ]; then
-    return
-fi
-
-readonly UTILS_SH_LOADED=1
-
-# Absolute path of the script and the tool's root directory
-script_path="$(realpath "${BASH_SOURCE[0]}")"
-tool_root_path="$(dirname "$(dirname "$script_path")")"
-
-# Load common constants
-source "$tool_root_path/Common/constants.sh"
-
-# Print the elements of an array along with their indices
-function print_array() {
-    local -a array=("$@")
-    
-    for ((i=0; i<${#array[@]}; i++)); do
-        echo "[$i] $(decode_path "${array[i]}")"
-    done
-}
-
-# Split a string into substrings using a specified delimiter
-function split_string_by_delimiter() {
-    local string="$1"
-    local -a substrings=()
-
-    IFS="$DELIMITER" read -ra substrings <<< "$string"
-
-    echo "${substrings[@]}"
-}
-
-# Encode a path string by replacing space with an escape character
-function encode_path() {
-    echo "$1" | sed "s/ /$SPACE_ESCAPE/g"
-}
-
-# Decode a path string by replacing encoded character with space
-function decode_path() {
-    echo "$1" | sed "s/$SPACE_ESCAPE/ /g"
-}
-
-# Get the dependency name by removing common suffixes
-function get_dependency_name() {
-    local path="$1"
-    
-    local dir_name="$(basename "$path")"
-    # Remove `.app`, `.framework`, and `.xcframework` suffixes
-    local dep_name="${dir_name%.*}"
-    
-    echo "$dep_name"
-}
-
-# Get the executable name from the specified `Info.plist` file
-function get_plist_executable() {
-    local plist_file="$1"
-    
-    if [ ! -f "$plist_file" ]; then
-        echo ""
-    else
-        /usr/libexec/PlistBuddy -c "Print :CFBundleExecutable" "$plist_file" 2>/dev/null || echo ""
-    fi
-}
-
-# Get the version from the specified `Info.plist` file
-function get_plist_version() {
-    local plist_file="$1"
-
-    if [ ! -f "$plist_file" ]; then
-        echo "$UNKNOWN_VERSION"
-    else
-        /usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" "$plist_file" 2>/dev/null || echo "$UNKNOWN_VERSION"
-    fi
-}
-
-# Get the path of the specified framework version
-function get_framework_path() {
-    local path="$1"
-    local version_path="$2"
-
-    if [ -z "$version_path" ]; then
-        echo "$path"
-    else
-        echo "$path/$version_path"
-    fi
-}
-
-# Search for privacy manifest files in the specified directory
-function search_privacy_manifest_files() {
-    local path="$1"
-    local -a privacy_manifest_files=()
-
-    # Create a temporary file to store search results
-    local temp_file="$(mktemp)"
-
-    # Ensure the temporary file is deleted on script exit
-    trap "rm -f $temp_file" EXIT
-
-    # Find privacy manifest files within the specified directory and store the results in the temporary file
-    find "$path" -type f -name "$PRIVACY_MANIFEST_FILE_NAME" -print0 2>/dev/null > "$temp_file"
-
-    while IFS= read -r -d '' file; do
-        privacy_manifest_files+=($(encode_path "$file"))
-    done < "$temp_file"
-
-    echo "${privacy_manifest_files[@]}"
-}
-
-# Get the privacy manifest file with the shortest path
-function get_privacy_manifest_file() {
-    local privacy_manifest_file="$(printf "%s\n" "$@" | awk '{print length, $0}' | sort -n | head -n1 | cut -d ' ' -f2-)"
-    
-    echo "$(decode_path "$privacy_manifest_file")"
-}

ios/App/app_privacy_manifest_fixer/Helper/xcode_install_helper.rb

@@ -1,80 +0,0 @@
-# Copyright (c) 2024, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-require 'xcodeproj'
-
-RUN_SCRIPT_PHASE_NAME = 'Fix Privacy Manifest'
-
-if ARGV.length < 2
-  puts "Usage: ruby xcode_install_helper.rb <project_path> <script_content> [install_builds_only (true|false)]"
-  exit 1
-end
-
-project_path = ARGV[0]
-run_script_content = ARGV[1]
-install_builds_only = ARGV[2] == 'true'
-
-# Find the first .xcodeproj file in the project directory
-xcodeproj_path = Dir.glob(File.join(project_path, "*.xcodeproj")).first
-
-# Validate the .xcodeproj file existence
-unless xcodeproj_path
-  puts "Error: No .xcodeproj file found in the specified directory."
-  exit 1
-end
-
-# Open the Xcode project file
-begin
-  project = Xcodeproj::Project.open(xcodeproj_path)
-rescue StandardError => e
-  puts "Error: Unable to open the project file - #{e.message}"
-  exit 1
-end
-
-# Process all targets in the project
-project.targets.each do |target|
-  # Skip PBXAggregateTarget
-  if target.is_a?(Xcodeproj::Project::Object::PBXAggregateTarget)
-    puts "Skipping aggregate target: #{target.name}."
-    next
-  end
-
-  # Check if the target is a native application target
-  if target.product_type == 'com.apple.product-type.application'
-    puts "Processing target: #{target.name}..."
-
-    # Check for an existing Run Script phase with the specified name
-    existing_phase = target.shell_script_build_phases.find { |phase| phase.name == RUN_SCRIPT_PHASE_NAME }
-
-    # Remove the existing Run Script phase if found
-    if existing_phase
-      puts "  - Removing existing Run Script."
-      target.build_phases.delete(existing_phase)
-    end
-
-    # Add the new Run Script phase at the end
-    puts "  - Adding new Run Script."
-    new_phase = target.new_shell_script_build_phase(RUN_SCRIPT_PHASE_NAME)
-    new_phase.shell_script = run_script_content
-    # Disable showing environment variables in the build log
-    new_phase.show_env_vars_in_log = '0'
-    # Run only for deployment post-processing if install_builds_only is true
-    new_phase.run_only_for_deployment_postprocessing = install_builds_only ? '1' : '0'
-    # Disable dependency analysis to force the script to run on every build, unless restricted to deployment builds by post-processing setting
-    new_phase.always_out_of_date = '1'
-  else
-    puts "Skipping non-application target: #{target.name}."
-  end
-end
-
-# Save the project file
-begin
-  project.save
-  puts "Successfully added the Run Script phase: '#{RUN_SCRIPT_PHASE_NAME}'."
-rescue StandardError => e
-  puts "Error: Unable to save the project file - #{e.message}"
-  exit 1
-end

ios/App/app_privacy_manifest_fixer/Helper/xcode_uninstall_helper.rb

@@ -1,63 +0,0 @@
-# Copyright (c) 2024, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-require 'xcodeproj'
-
-RUN_SCRIPT_PHASE_NAME = 'Fix Privacy Manifest'
-
-if ARGV.length < 1
-  puts "Usage: ruby xcode_uninstall_helper.rb <project_path>"
-  exit 1
-end
-
-project_path = ARGV[0]
-
-# Find the first .xcodeproj file in the project directory
-xcodeproj_path = Dir.glob(File.join(project_path, "*.xcodeproj")).first
-
-# Validate the .xcodeproj file existence
-unless xcodeproj_path
-  puts "Error: No .xcodeproj file found in the specified directory."
-  exit 1
-end
-
-# Open the Xcode project file
-begin
-  project = Xcodeproj::Project.open(xcodeproj_path)
-rescue StandardError => e
-  puts "Error: Unable to open the project file - #{e.message}"
-  exit 1
-end
-
-# Process all targets in the project
-project.targets.each do |target|
-  # Check if the target is an application target
-  if target.product_type == 'com.apple.product-type.application'
-    puts "Processing target: #{target.name}..."
-
-    # Check for an existing Run Script phase with the specified name
-    existing_phase = target.shell_script_build_phases.find { |phase| phase.name == RUN_SCRIPT_PHASE_NAME }
-
-    # Remove the existing Run Script phase if found
-    if existing_phase
-      puts "  - Removing existing Run Script."
-      target.build_phases.delete(existing_phase)
-    else
-      puts "  - No existing Run Script found."
-    end
-  else
-    puts "Skipping non-application target: #{target.name}."
-  end
-end
-
-# Save the project file
-begin
-  project.save
-  puts "Successfully removed the Run Script phase: '#{RUN_SCRIPT_PHASE_NAME}'."
-rescue StandardError => e
-  puts "Error: Unable to save the project file - #{e.message}"
-  exit 1
-end

ios/App/app_privacy_manifest_fixer/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 crasowas
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

ios/App/app_privacy_manifest_fixer/README.md

@@ -1,240 +0,0 @@
-# App Privacy Manifest Fixer
-
-[![Latest Version](https://img.shields.io/github/v/release/crasowas/app_privacy_manifest_fixer?logo=github)](https://github.com/crasowas/app_privacy_manifest_fixer/releases/latest)
-![Supported Platforms](https://img.shields.io/badge/Supported%20Platforms-iOS%20%7C%20macOS-brightgreen)
-[![License](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
-
-**English | [简体中文](./README.zh-CN.md)**
-
-This tool is an automation solution based on Shell scripts, designed to analyze and fix the privacy manifest of iOS/macOS apps to ensure compliance with App Store requirements. It leverages the [App Store Privacy Manifest Analyzer](https://github.com/crasowas/app_store_required_privacy_manifest_analyser) to analyze API usage within the app and its dependencies, and generate or fix the `PrivacyInfo.xcprivacy` file.
-
-## ✨ Features
-
-- **Non-Intrusive Integration**: No need to modify the source code or adjust the project structure.
-- **Fast Installation and Uninstallation**: Quickly install or uninstall the tool with a single command.
-- **Automatic Analysis and Fixes**: Automatically analyzes API usage and fixes privacy manifest issues during the project build.
-- **Flexible Template Customization**: Supports custom privacy manifest templates for apps and frameworks, accommodating various usage scenarios.
-- **Privacy Access Report**: Automatically generates a report displaying the `NSPrivacyAccessedAPITypes` declarations for the app and SDKs.
-- **Effortless Version Upgrades**: Provides an upgrade script for quick updates to the latest version.
-
-## 📥 Installation
-
-### Download the Tool
-
-1. Download the [latest release](https://github.com/crasowas/app_privacy_manifest_fixer/releases/latest).
-2. Extract the downloaded file:
-   - The extracted directory is usually named `app_privacy_manifest_fixer-xxx` (where `xxx` is the version number).
-   - It is recommended to rename it to `app_privacy_manifest_fixer` or use the full directory name in subsequent paths.
-   - **It is advised to move the directory to your iOS/macOS project to avoid path-related issues on different devices, and to easily customize the privacy manifest template for each project**.
-
-### ⚡ Automatic Installation (Recommended)
-
-1. **Navigate to the tool's directory**:
-
-   ```shell
-   cd /path/to/app_privacy_manifest_fixer
-   ```
-
-2. **Run the installation script**:
-
-   ```shell
-   sh install.sh <project_path>
-   ```
-
-   - For Flutter projects, `project_path` should be the path to the `ios/macos` directory within the Flutter project.
-   - If the installation command is run again, the tool will first remove any existing installation (if present). To modify command-line options, simply rerun the installation command without the need to uninstall first.
-
-### Manual Installation
-
-If you prefer not to use the installation script, you can manually add the `Fix Privacy Manifest` task to the Xcode **Build Phases**. Follow these steps:
-
-#### 1. Add the Script in Xcode
-
-- Open your iOS/macOS project in Xcode, go to the **TARGETS** tab, and select your app target.
-- Navigate to **Build Phases**, click the **+** button, and select **New Run Script Phase**.
-- Rename the newly created **Run Script** to `Fix Privacy Manifest`.
-- In the Shell script box, add the following code:
-
-  ```shell
-  # Use relative path (recommended): if `app_privacy_manifest_fixer` is within the project directory
-  "$PROJECT_DIR/path/to/app_privacy_manifest_fixer/fixer.sh"
-
-  # Use absolute path: if `app_privacy_manifest_fixer` is outside the project directory
-  # "/absolute/path/to/app_privacy_manifest_fixer/fixer.sh"
-  ```
-
-  **Modify `path/to` or `absolute/path/to` as needed, and ensure the paths are correct. Remove or comment out the unused lines accordingly.**
-
-#### 2. Adjust the Script Execution Order
-
-**Move this script after all other Build Phases to ensure the privacy manifest is fixed after all resource copying and build tasks are completed**.
-
-### Build Phases Screenshot
-
-Below is a screenshot of the Xcode Build Phases configuration after successful automatic/manual installation (with no command-line options enabled):
-
-![Build Phases Screenshot](https://img.crasowas.dev/app_privacy_manifest_fixer/20250225011407.png)
-
-## 🚀 Getting Started
-
-After installation, the tool will automatically run with each project build, and the resulting application bundle will include the fixes.
-
-If the `--install-builds-only` command-line option is enabled during installation, the tool will only run during the installation of the build.
-
-### Xcode Build Log Screenshot
-
-Below is a screenshot of the log output from the tool during the project build (by default, it will be saved to the `app_privacy_manifest_fixer/Build` directory, unless the `-s` command-line option is enabled):
-
-![Xcode Build Log Screenshot](https://img.crasowas.dev/app_privacy_manifest_fixer/20250225011551.png)
-
-## 📖 Usage
-
-### Command Line Options
-
-- **Force overwrite existing privacy manifest (Not recommended)**:
-
-  ```shell
-  sh install.sh <project_path> -f
-  ```
-
-  Enabling the `-f` option will force the tool to generate a new privacy manifest based on the API usage analysis and privacy manifest template, overwriting the existing privacy manifest. By default (without `-f`), the tool only fixes missing privacy manifests.
-
-- **Silent mode**:
-
-  ```shell
-  sh install.sh <project_path> -s
-  ```
-
-  Enabling the `-s` option disables output during the fix process. The tool will no longer copy the generated `*.app`, automatically generate the privacy access report, or output the fix logs. By default (without `-s`), these outputs are stored in the `app_privacy_manifest_fixer/Build` directory.
-
-- **Run only during installation builds (Recommended)**:
-
-  ```shell
-  sh install.sh <project_path> --install-builds-only
-  ```
-
-  Enabling the `--install-builds-only` option makes the tool run only during installation builds (such as the **Archive** operation), optimizing build performance for daily development. If you manually installed, this option is ineffective, and you need to manually check the **"For install builds only"** option.
-
-  **Note**: If the iOS/macOS project is built in a development environment (where the generated app contains `*.debug.dylib` files), the tool's API usage analysis results may be inaccurate.
-
-### Upgrade the Tool
-
-To update to the latest version, run the following command:
-
-```shell
-sh upgrade.sh
-```
-
-### Uninstall the Tool
-
-To quickly uninstall the tool, run the following command:
-
-```shell
-sh uninstall.sh <project_path>
-```
-
-### Clean the Tool-Generated Files
-
-To remove files generated by the tool, run the following command:
-
-```shell
-sh clean.sh
-```
-
-## 🔥 Privacy Manifest Templates
-
-The privacy manifest templates are stored in the [`Templates`](https://github.com/crasowas/app_privacy_manifest_fixer/tree/main/Templates) directory, with the default templates already included in the root directory.
-
-**How can you customize the privacy manifests for apps or SDKs? Simply use [custom templates](#custom-templates)!**
-
-### Template Types
-
-The templates are categorized as follows:
-- **AppTemplate.xcprivacy**: A privacy manifest template for the app.
-- **FrameworkTemplate.xcprivacy**: A generic privacy manifest template for frameworks.
-- **FrameworkName.xcprivacy**: A privacy manifest template for a specific framework, available only in the `Templates/UserTemplates` directory.
-
-### Template Priority
-
-For an app, the priority of privacy manifest templates is as follows:
-- `Templates/UserTemplates/AppTemplate.xcprivacy` > `Templates/AppTemplate.xcprivacy`
-
-For a specific framework, the priority of privacy manifest templates is as follows:
-- `Templates/UserTemplates/FrameworkName.xcprivacy` > `Templates/UserTemplates/FrameworkTemplate.xcprivacy` > `Templates/FrameworkTemplate.xcprivacy`
-
-### Default Templates
-
-The default templates are located in the `Templates` root directory and currently include the following templates:
-- `Templates/AppTemplate.xcprivacy`
-- `Templates/FrameworkTemplate.xcprivacy`
-
-These templates will be modified based on the API usage analysis results, especially the `NSPrivacyAccessedAPIType` entries, to generate new privacy manifests for fixes, ensuring compliance with App Store requirements.
-
-**If adjustments to the privacy manifest template are needed, such as in the following scenarios, avoid directly modifying the default templates. Instead, use a custom template. If a custom template with the same name exists, it will take precedence over the default template for fixes.**
-- Generating a non-compliant privacy manifest due to inaccurate API usage analysis.
-- Modifying the reason declared in the template.
-- Adding declarations for collected data.
-
-The privacy access API categories and their associated declared reasons in `AppTemplate.xcprivacy` are listed below:
-
-| [NSPrivacyAccessedAPIType](https://developer.apple.com/documentation/bundleresources/app-privacy-configuration/nsprivacyaccessedapitypes/nsprivacyaccessedapitype) | [NSPrivacyAccessedAPITypeReasons](https://developer.apple.com/documentation/bundleresources/app-privacy-configuration/nsprivacyaccessedapitypes/nsprivacyaccessedapitypereasons) |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| NSPrivacyAccessedAPICategoryFileTimestamp                                                                                                                          | C617.1: Inside app or group container                                                                                                                                            |
-| NSPrivacyAccessedAPICategorySystemBootTime                                                                                                                         | 35F9.1: Measure time on-device                                                                                                                                                   |
-| NSPrivacyAccessedAPICategoryDiskSpace                                                                                                                              | E174.1: Write or delete file on-device                                                                                                                                           |
-| NSPrivacyAccessedAPICategoryActiveKeyboards                                                                                                                        | 54BD.1: Customize UI on-device                                                                                                                                                   |
-| NSPrivacyAccessedAPICategoryUserDefaults                                                                                                                           | CA92.1: Access info from same app                                                                                                                                                |
-
-The privacy access API categories and their associated declared reasons in `FrameworkTemplate.xcprivacy` are listed below:
-
-| [NSPrivacyAccessedAPIType](https://developer.apple.com/documentation/bundleresources/app-privacy-configuration/nsprivacyaccessedapitypes/nsprivacyaccessedapitype) | [NSPrivacyAccessedAPITypeReasons](https://developer.apple.com/documentation/bundleresources/app-privacy-configuration/nsprivacyaccessedapitypes/nsprivacyaccessedapitypereasons) |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| NSPrivacyAccessedAPICategoryFileTimestamp                                                                                                                          | 0A2A.1: 3rd-party SDK wrapper on-device                                                                                                                                          |
-| NSPrivacyAccessedAPICategorySystemBootTime                                                                                                                         | 35F9.1: Measure time on-device                                                                                                                                                   |
-| NSPrivacyAccessedAPICategoryDiskSpace                                                                                                                              | E174.1: Write or delete file on-device                                                                                                                                           |
-| NSPrivacyAccessedAPICategoryActiveKeyboards                                                                                                                        | 54BD.1: Customize UI on-device                                                                                                                                                   |
-| NSPrivacyAccessedAPICategoryUserDefaults                                                                                                                           | C56D.1: 3rd-party SDK wrapper on-device                                                                                                                                          |
-
-### Custom Templates
-
-To create custom templates, place them in the `Templates/UserTemplates` directory with the following structure:
-- `Templates/UserTemplates/AppTemplate.xcprivacy`
-- `Templates/UserTemplates/FrameworkTemplate.xcprivacy`
-- `Templates/UserTemplates/FrameworkName.xcprivacy`
-
-Among these templates, only `FrameworkTemplate.xcprivacy` will be modified based on the API usage analysis results to adjust the `NSPrivacyAccessedAPIType` entries, thereby generating a new privacy manifest for framework fixes. The other templates will remain unchanged and will be directly used for fixes.
-
-**Important Notes:**
-- The template for a specific framework must follow the naming convention `FrameworkName.xcprivacy`, where `FrameworkName` should match the name of the framework. For example, the template for `Flutter.framework` should be named `Flutter.xcprivacy`.
-- For macOS frameworks, the naming convention should be `FrameworkName.Version.xcprivacy`, where the version name is added to distinguish different versions. For a single version macOS framework, the `Version` is typically `A`.
-- The name of an SDK may not exactly match the name of the framework. To determine the correct framework name, check the `Frameworks` directory in the application bundle after building the project.
-
-## 📑 Privacy Access Report
-
-By default, the tool automatically generates privacy access reports for both the original and fixed versions of the app during each project build, and stores the reports in the `app_privacy_manifest_fixer/Build` directory.
-
-If you need to manually generate a privacy access report for a specific app, run the following command:
-
-```shell
-sh Report/report.sh <app_path> <report_output_path>
-# <app_path>: Path to the app (e.g., /path/to/App.app)
-# <report_output_path>: Path to save the report file (e.g., /path/to/report.html)
-```
-
-**Note**: The report generated by the tool currently only includes the privacy access section (`NSPrivacyAccessedAPITypes`). To view the data collection section (`NSPrivacyCollectedDataTypes`), please use Xcode to generate the `PrivacyReport`.
-
-### Sample Report Screenshots
-
-| Original App Report (report-original.html)                                                     | Fixed App Report (report.html)                                                              |
-|------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
-| ![Original App Report](https://img.crasowas.dev/app_privacy_manifest_fixer/20241218230746.png) | ![Fixed App Report](https://img.crasowas.dev/app_privacy_manifest_fixer/20241218230822.png) |
-
-## 💡 Important Considerations
-
-- If the latest version of the SDK supports a privacy manifest, please upgrade as soon as possible to avoid unnecessary risks.
-- This tool is a temporary solution and should not replace proper SDK management practices.
-- Before submitting your app for review, ensure that the privacy manifest fix complies with the latest App Store requirements.
-
-## 🙌 Contributing
-
-Contributions in any form are welcome, including code optimizations, bug fixes, documentation improvements, and more. Please follow the project's guidelines and maintain a consistent coding style. Thank you for your support!

ios/App/app_privacy_manifest_fixer/README.zh-CN.md

@@ -1,240 +0,0 @@
-# App Privacy Manifest Fixer
-
-[![Latest Version](https://img.shields.io/github/v/release/crasowas/app_privacy_manifest_fixer?logo=github)](https://github.com/crasowas/app_privacy_manifest_fixer/releases/latest)
-![Supported Platforms](https://img.shields.io/badge/Supported%20Platforms-iOS%20%7C%20macOS-brightgreen)
-[![License](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
-
-**[English](./README.md) | 简体中文**
-
-本工具是一个基于 Shell 脚本的自动化解决方案，旨在分析和修复 iOS/macOS App 的隐私清单，确保 App 符合 App Store 的要求。它利用 [App Store Privacy Manifest Analyzer](https://github.com/crasowas/app_store_required_privacy_manifest_analyser) 对 App 及其依赖项进行 API 使用分析，并生成或修复`PrivacyInfo.xcprivacy`文件。
-
-## ✨ 功能特点
-
-- **非侵入式集成**：无需修改源码或调整项目结构。
-- **极速安装与卸载**：一行命令即可快速完成工具的安装或卸载。
-- **自动分析与修复**：项目构建时自动分析 API 使用情况并修复隐私清单问题。
-- **灵活定制模板**：支持自定义 App 和 Framework 的隐私清单模板，满足多种使用场景。
-- **隐私访问报告**：自动生成报告用于查看 App 和 SDK 的`NSPrivacyAccessedAPITypes`声明情况。
-- **版本轻松升级**：提供升级脚本快速更新至最新版本。
-
-## 📥 安装
-
-### 下载工具
-
-1. 下载[最新发布版本](https://github.com/crasowas/app_privacy_manifest_fixer/releases/latest)。
-2. 解压下载的文件：
-   - 解压后的目录通常为`app_privacy_manifest_fixer-xxx`（其中`xxx`是版本号）。
-   - 建议重命名为`app_privacy_manifest_fixer`，或在后续路径中使用完整目录名。
-   - **建议将该目录移动至 iOS/macOS 项目中，以避免因路径问题在不同设备上运行时出现错误，同时便于为每个项目单独自定义隐私清单模板**。
-
-### ⚡ 自动安装（推荐）
-
-1. **切换到工具所在目录**：
-
-   ```shell
-   cd /path/to/app_privacy_manifest_fixer
-   ```
-
-2. **运行以下安装脚本**：
-
-   ```shell
-   sh install.sh <project_path>
-   ```  
-   
-   - 如果是 Flutter 项目，`project_path`应为 Flutter 项目中的`ios/macos`目录路径。
-   - 重复运行安装命令时，工具会先移除现有安装（如果有）。若需修改命令行选项，只需重新运行安装命令，无需先卸载。
-
-### 手动安装
-
-如果不使用安装脚本，可以手动添加`Fix Privacy Manifest`任务到 Xcode 的 **Build Phases** 完成安装。安装步骤如下：
-
-#### 1. 在 Xcode 中添加脚本
-
-- 用 Xcode 打开你的 iOS/macOS 项目，进入 **TARGETS** 选项卡，选择你的 App 目标。
-- 进入 **Build Phases**，点击 **+** 按钮，选择 **New Run Script Phase**。
-- 将新建的 **Run Script** 重命名为`Fix Privacy Manifest`。
-- 在 Shell 脚本框中添加以下代码：
-
-  ```shell
-  # 使用相对路径（推荐）：如果`app_privacy_manifest_fixer`在项目目录内
-  "$PROJECT_DIR/path/to/app_privacy_manifest_fixer/fixer.sh"
-
-  # 使用绝对路径：如果`app_privacy_manifest_fixer`不在项目目录内
-  # "/absolute/path/to/app_privacy_manifest_fixer/fixer.sh"
-  ```
-
-  **请根据实际情况修改`path/to`或`absolute/path/to`，并确保路径正确。同时，删除或注释掉不适用的行**。
-
-#### 2. 调整脚本执行顺序
-
-**将该脚本移动到所有其他 Build Phases 之后，确保隐私清单在所有资源拷贝和编译任务完成后再进行修复**。
-
-### Build Phases 截图
-
-下面是自动/手动安装成功后的 Xcode Build Phases 配置截图（未启用任何命令行选项）：
-
-![Build Phases Screenshot](https://img.crasowas.dev/app_privacy_manifest_fixer/20250225011407.png)
-
-## 🚀 快速开始
-
-安装后，工具将在每次构建项目时自动运行，构建完成后得到的 App 包已经是修复后的结果。
-
-如果启用`--install-builds-only`命令行选项安装，工具将仅在安装构建时运行。
-
-### Xcode Build Log 截图
-
-下面是项目构建时工具输出的日志截图（默认会存储到`app_privacy_manifest_fixer/Build`目录，除非启用`-s`命令行选项）：
-
-![Xcode Build Log Screenshot](https://img.crasowas.dev/app_privacy_manifest_fixer/20250225011551.png)
-
-## 📖 使用方法
-
-### 命令行选项
-
-- **强制覆盖现有隐私清单（不推荐）**：
-
-  ```shell
-  sh install.sh <project_path> -f
-  ```
-
-  启用`-f`选项后，工具会根据 API 使用分析结果和隐私清单模板生成新的隐私清单，并强制覆盖现有隐私清单。默认情况下（未启用`-f`），工具仅修复缺失的隐私清单。
-
-- **静默模式**：
-
-  ```shell
-  sh install.sh <project_path> -s
-  ```
-
-  启用`-s`选项后，工具将禁用修复时的输出，不再复制构建生成的`*.app`、自动生成隐私访问报告或输出修复日志。默认情况下（未启用`-s`），这些输出存储在`app_privacy_manifest_fixer/Build`目录。
-
-- **仅在安装构建时运行（推荐）**：
-
-  ```shell
-  sh install.sh <project_path> --install-builds-only
-  ```
-
-  启用`--install-builds-only`选项后，工具仅在执行安装构建（如 **Archive** 操作）时运行，以优化日常开发时的构建性能。如果你是手动安装的，该命令行选项无效，需要手动勾选 **"For install builds only"** 选项。
-
-  **注意**：如果 iOS/macOS 项目在开发环境构建（生成的 App 包含`*.debug.dylib`文件），工具的 API 使用分析结果可能不准确。
-
-### 升级工具
-
-要更新至最新版本，请运行以下命令：
-
-```shell
-sh upgrade.sh
-```
-
-### 卸载工具
-
-要快速卸载本工具，请运行以下命令：
-
-```shell
-sh uninstall.sh <project_path>
-```
-
-### 清理工具生成的文件
-
-要删除工具生成的文件，请运行以下命令：
-
-```shell
-sh clean.sh
-```
-
-## 🔥 隐私清单模板
-
-隐私清单模板存储在[`Templates`](https://github.com/crasowas/app_privacy_manifest_fixer/tree/main/Templates)目录，其中根目录已经包含默认模板。
-
-**如何为 App 或 SDK 自定义隐私清单？只需使用[自定义模板](#自定义模板)！**
-
-### 模板类型
-
-模板分为以下几类：
-- **AppTemplate.xcprivacy**：App 的隐私清单模板。
-- **FrameworkTemplate.xcprivacy**：通用的 Framework 隐私清单模板。
-- **FrameworkName.xcprivacy**：特定的 Framework 隐私清单模板，仅在`Templates/UserTemplates`目录有效。
-
-### 模板优先级
-
-对于 App，隐私清单模板的优先级如下：
-- `Templates/UserTemplates/AppTemplate.xcprivacy` > `Templates/AppTemplate.xcprivacy`
-
-对于特定的 Framework，隐私清单模板的优先级如下：
-- `Templates/UserTemplates/FrameworkName.xcprivacy` > `Templates/UserTemplates/FrameworkTemplate.xcprivacy` > `Templates/FrameworkTemplate.xcprivacy`
-
-### 默认模板
-
-默认模板位于`Templates`根目录，目前包括以下模板：
-- `Templates/AppTemplate.xcprivacy`
-- `Templates/FrameworkTemplate.xcprivacy`
-
-这些模板将根据 API 使用分析结果进行修改，特别是`NSPrivacyAccessedAPIType`条目将被调整，以生成新的隐私清单用于修复，确保符合 App Store 要求。
-
-**如果需要调整隐私清单模板，例如以下场景，请避免直接修改默认模板，而是使用自定义模板。如果存在相同名称的自定义模板，它将优先于默认模板用于修复。**
-- 由于 API 使用分析结果不准确，生成了不合规的隐私清单。
-- 需要修改模板中声明的理由。
-- 需要声明收集的数据。
-
-`AppTemplate.xcprivacy`中隐私访问 API 类别及其对应声明的理由如下：
-
-| [NSPrivacyAccessedAPIType](https://developer.apple.com/documentation/bundleresources/app-privacy-configuration/nsprivacyaccessedapitypes/nsprivacyaccessedapitype) | [NSPrivacyAccessedAPITypeReasons](https://developer.apple.com/documentation/bundleresources/app-privacy-configuration/nsprivacyaccessedapitypes/nsprivacyaccessedapitypereasons) |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| NSPrivacyAccessedAPICategoryFileTimestamp                                                                                                                          | C617.1: Inside app or group container                                                                                                                                            |
-| NSPrivacyAccessedAPICategorySystemBootTime                                                                                                                         | 35F9.1: Measure time on-device                                                                                                                                                   |
-| NSPrivacyAccessedAPICategoryDiskSpace                                                                                                                              | E174.1: Write or delete file on-device                                                                                                                                           |
-| NSPrivacyAccessedAPICategoryActiveKeyboards                                                                                                                        | 54BD.1: Customize UI on-device                                                                                                                                                   |
-| NSPrivacyAccessedAPICategoryUserDefaults                                                                                                                           | CA92.1: Access info from same app                                                                                                                                                |
-
-`FrameworkTemplate.xcprivacy`中隐私访问 API 类别及其对应声明的理由如下：
-
-| [NSPrivacyAccessedAPIType](https://developer.apple.com/documentation/bundleresources/app-privacy-configuration/nsprivacyaccessedapitypes/nsprivacyaccessedapitype) | [NSPrivacyAccessedAPITypeReasons](https://developer.apple.com/documentation/bundleresources/app-privacy-configuration/nsprivacyaccessedapitypes/nsprivacyaccessedapitypereasons) |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| NSPrivacyAccessedAPICategoryFileTimestamp                                                                                                                          | 0A2A.1: 3rd-party SDK wrapper on-device                                                                                                                                          |
-| NSPrivacyAccessedAPICategorySystemBootTime                                                                                                                         | 35F9.1: Measure time on-device                                                                                                                                                   |
-| NSPrivacyAccessedAPICategoryDiskSpace                                                                                                                              | E174.1: Write or delete file on-device                                                                                                                                           |
-| NSPrivacyAccessedAPICategoryActiveKeyboards                                                                                                                        | 54BD.1: Customize UI on-device                                                                                                                                                   |
-| NSPrivacyAccessedAPICategoryUserDefaults                                                                                                                           | C56D.1: 3rd-party SDK wrapper on-device                                                                                                                                          |
-
-### 自定义模板
-
-要创建自定义模板，请将其放在`Templates/UserTemplates`目录，结构如下：
-- `Templates/UserTemplates/AppTemplate.xcprivacy`
-- `Templates/UserTemplates/FrameworkTemplate.xcprivacy`
-- `Templates/UserTemplates/FrameworkName.xcprivacy`
-
-在这些模板中，只有`FrameworkTemplate.xcprivacy`会根据 API 使用分析结果对`NSPrivacyAccessedAPIType`条目进行调整，以生成新的隐私清单用于 Framework 修复。其他模板保持不变，将直接用于修复。
-
-**重要说明：**
-- 特定的 Framework 模板必须遵循命名规范`FrameworkName.xcprivacy`，其中`FrameworkName`需与 Framework 的名称匹配。例如`Flutter.framework`的模板应命名为`Flutter.xcprivacy`。
-- 对于 macOS Framework，应遵循命名规范`FrameworkName.Version.xcprivacy`，额外增加版本名称用于区分不同的版本。对于单一版本的 macOS Framework，`Version`通常为`A`。
-- SDK 的名称可能与 Framework 的名称不完全一致。要确定正确的 Framework 名称，请在构建项目后检查 App 包中的`Frameworks`目录。
-
-## 📑 隐私访问报告
-
-默认情况下，工具会自动在每次构建时为原始 App 和修复后的 App 生成隐私访问报告，并存储到`app_privacy_manifest_fixer/Build`目录。
-
-如果需要手动为特定 App 生成隐私访问报告，请运行以下命令：
-
-```shell
-sh Report/report.sh <app_path> <report_output_path>
-# <app_path>: App路径（例如：/path/to/App.app）
-# <report_output_path>: 报告文件保存路径（例如：/path/to/report.html）
-```
-
-**注意**：工具生成的报告目前仅包含隐私访问部分（`NSPrivacyAccessedAPITypes`），如果想看数据收集部分（`NSPrivacyCollectedDataTypes`）请使用 Xcode 生成`PrivacyReport`。
-
-### 报告示例截图
-
-| 原始 App 报告（report-original.html）                                                                | 修复后 App 报告（report.html）                                                                     |
-|------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
-| ![Original App Report](https://img.crasowas.dev/app_privacy_manifest_fixer/20241218230746.png) | ![Fixed App Report](https://img.crasowas.dev/app_privacy_manifest_fixer/20241218230822.png) |
-
-## 💡 重要考量 
-
-- 如果最新版本的 SDK 支持隐私清单，请尽可能升级，以避免不必要的风险。
-- 此工具仅为临时解决方案，不应替代正确的 SDK 管理实践。
-- 在提交 App 审核之前，请检查隐私清单修复后是否符合最新的 App Store 要求。
-
-## 🙌 贡献
-
-欢迎任何形式的贡献，包括代码优化、Bug 修复、文档改进等。请确保遵循项目规范，并保持代码风格一致。感谢你的支持！

ios/App/app_privacy_manifest_fixer/Report/report-template.html

@@ -1,124 +0,0 @@
-<!--
-  Copyright (c) 2024, crasowas.
-
-  Use of this source code is governed by a MIT-style license
-  that can be found in the LICENSE file or at
-  https://opensource.org/licenses/MIT.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <title>Privacy Access Report</title>
-
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            margin: 20px;
-            color: #333;
-            background-color: #f9f9f9;
-            line-height: 1.6;
-        }
-
-        .card {
-            background-color: #fff;
-            border-radius: 10px;
-            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-            margin-bottom: 20px;
-            padding: 20px;
-            min-width: 735px;
-        }
-
-        h2 {
-            font-size: 1.2em;
-            margin: 0 0 15px;
-            padding: 12px 20px;
-            color: #fff;
-            background-color: #5a9e6d;
-            border-radius: 8px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-
-        h2 .version {
-            font-size: 0.7em;
-            color: #5a9e6d;
-            background: #f1f1f1;
-            padding: 2px 6px;
-            border-radius: 6px;
-        }
-
-        a {
-            text-decoration: none;
-            color: #5a9e6d;
-            background-color: #fcfcfc;
-            padding: 8px 16px;
-            border: 1px solid #5a9e6d;
-            border-radius: 5px;
-            font-size: 0.9em;
-            margin-right: 16px;
-            transition: background-color 0.3s ease, color 0.3s ease;
-        }
-
-        a:hover {
-            color: #fff;
-            background-color: #5a9e6d;
-        }
-
-        a.warning {
-            color: #e0b73c;
-            background-color: #fcfcfc;
-            border: 1px solid #e0b73c;
-        }
-
-        a.warning:hover {
-            color: #fff;
-            background-color: #e0b73c;
-        }
-
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            background-color: #fff;
-            border-radius: 8px;
-            overflow: hidden;
-            margin-top: 20px;
-        }
-
-        th,
-        td {
-            border: 1px solid #ddd;
-            padding: 12px 20px;
-            text-align: left;
-        }
-
-        th {
-            color: #fff;
-            background-color: #b0b8b1;
-            font-weight: bold;
-        }
-
-        tbody tr:nth-child(odd) {
-            background-color: #f9f9f9;
-        }
-
-        tbody tr:hover {
-            background-color: #f0f0f0;
-        }
-    </style>
-</head>
-<body>
-<div class="card" style="display: flex; justify-content: space-between; align-items: center;">
-    <span>
-        This report was generated using version <strong>{{TOOL_VERSION}}</strong>.
-    </span>
-    <a href="https://github.com/crasowas/app_privacy_manifest_fixer" target="_blank">Like this
-        project? 🌟Star it on GitHub!</a>
-</div>
-{{REPORT_CONTENT}}
-</body>
-</html>

ios/App/app_privacy_manifest_fixer/Report/report.sh

@@ -1,285 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2024, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-set -e
-
-# Absolute path of the script and the tool's root directory
-script_path="$(realpath "$0")"
-tool_root_path="$(dirname "$(dirname "$script_path")")"
-
-# Load common constants and utils
-source "$tool_root_path/Common/constants.sh"
-source "$tool_root_path/Common/utils.sh"
-
-# Path to the app
-app_path="$1"
-
-# Check if the app exists
-if [ ! -d "$app_path" ] || [[ "$app_path" != *.app ]]; then
-    echo "Unable to find the app: $app_path"
-    exit 1
-fi
-
-# Check if the app is iOS or macOS
-is_ios_app=true
-frameworks_dir="$app_path/Frameworks"
-if [ -d "$app_path/Contents/MacOS" ]; then
-    is_ios_app=false
-    frameworks_dir="$app_path/Contents/Frameworks"
-fi
-
-report_output_file="$2"
-# Additional arguments as template usage records
-template_usage_records=("${@:2}")
-
-# Copy report template to output file
-report_template_file="$tool_root_path/Report/report-template.html"
-if ! rsync -a "$report_template_file" "$report_output_file"; then
-    echo "Failed to copy the report template to $report_output_file"
-    exit 1
-fi
-
-# Read the current tool's version from the VERSION file
-tool_version_file="$tool_root_path/VERSION"
-tool_version="N/A"
-if [ -f "$tool_version_file" ]; then
-    tool_version="$(cat "$tool_version_file")"
-fi
-
-# Initialize report content
-report_content=""
-
-# Get the template file used for fixing based on the app or framework name
-function get_used_template_file() {
-    local name="$1"
-    
-    for template_usage_record in "${template_usage_records[@]}"; do
-        if [[ "$template_usage_record" == "$name$DELIMITER"* ]]; then
-            echo "${template_usage_record#*$DELIMITER}"
-            return
-        fi
-    done
-    
-    echo ""
-}
-
-# Analyze accessed API types and their corresponding reasons
-function analyze_privacy_accessed_api() {
-    local privacy_manifest_file="$1"
-    local -a results=()
-
-    if [ -f "$privacy_manifest_file" ]; then
-        local api_count=$(xmllint --xpath 'count(//dict/key[text()="NSPrivacyAccessedAPIType"])' "$privacy_manifest_file")
-
-        for ((i=1; i<=api_count; i++)); do
-            local api_type=$(xmllint --xpath "(//dict/key[text()='NSPrivacyAccessedAPIType']/following-sibling::string[1])[$i]/text()" "$privacy_manifest_file" 2>/dev/null)
-            local api_reasons=$(xmllint --xpath "(//dict/key[text()='NSPrivacyAccessedAPITypeReasons']/following-sibling::array[1])[position()=$i]/string/text()" "$privacy_manifest_file" 2>/dev/null | paste -sd "/" -)
-            
-            if [ -z "$api_type" ]; then
-                api_type="N/A"
-            fi
-            
-            if [ -z "$api_reasons" ]; then
-                api_reasons="N/A"
-            fi
-            
-            results+=("$api_type$DELIMITER$api_reasons")
-        done
-    fi
-
-    echo "${results[@]}"
-}
-
-# Get the path to the `Info.plist` file for the specified app or framework
-function get_plist_file() {
-    local path="$1"
-    local version_path="$2"
-    local plist_file=""
-    
-    if [[ "$path" == *.app ]]; then
-        if [ "$is_ios_app" == true ]; then
-            plist_file="$path/Info.plist"
-        else
-            plist_file="$path/Contents/Info.plist"
-        fi
-    elif [[ "$path" == *.framework ]]; then
-        local framework_path="$(get_framework_path "$path" "$version_path")"
-        
-        if [ "$is_ios_app" == true ]; then
-            plist_file="$framework_path/Info.plist"
-        else
-            plist_file="$framework_path/Resources/Info.plist"
-        fi
-    fi
-    
-    echo "$plist_file"
-}
-
-# Add an HTML <div> element with the `card` class
-function add_html_card_container() {
-    local card="$1"
-    
-    report_content="$report_content<div class=\"card\">$card</div>"
-}
-
-# Generate an HTML <h2> element
-function generate_html_header() {
-    local title="$1"
-    local version="$2"
-    
-    echo "<h2>$title<span class=\"version\">Version $version</span></h2>"
-}
-
-# Generate an HTML <a> element with optional `warning` class
-function generate_html_anchor() {
-    local text="$1"
-    local href="$2"
-    local warning="$3"
-    
-    if [ "$warning" == true ]; then
-        echo "<a class=\"warning\" href=\"$href\">$text</a>"
-    else
-        echo "<a href=\"$href\">$text</a>"
-    fi
-}
-
-# Generate an HTML <table> element
-function generate_html_table() {
-    local thead="$1"
-    local tbody="$2"
-    
-    echo "<table>$thead$tbody</table>"
-}
-
-# Generate an HTML <thead> element
-function generate_html_thead() {
-    local ths=("$@")
-    local tr=""
-    
-    for th in "${ths[@]}"; do
-        tr="$tr<th>$th</th>"
-    done
-    
-    echo "<thead><tr>$tr</tr></thead>"
-}
-
-# Generate an HTML <tbody> element
-function generate_html_tbody() {
-    local trs=("$@")
-    local tbody=""
-    
-    for tr in "${trs[@]}"; do
-        tbody="$tbody<tr>"
-        local tds=($(split_string_by_delimiter "$tr"))
-        
-        for td in "${tds[@]}"; do
-            tbody="$tbody<td>$td</td>"
-        done
-        
-        tbody="$tbody</tr>"
-    done
-    
-    echo "<tbody>$tbody</tbody>"
-}
-
-# Generate the report content for the specified directory
-function generate_report_content() {
-    local path="$1"
-    local version_path="$2"
-    local privacy_manifest_file=""
-    
-    if [[ "$path" == *.app ]]; then
-        # Per the documentation, the privacy manifest should be placed at the root of the app’s bundle for iOS, while for macOS, it should be located in `Contents/Resources/` within the app’s bundle
-        # Reference: https://developer.apple.com/documentation/bundleresources/adding-a-privacy-manifest-to-your-app-or-third-party-sdk#Add-a-privacy-manifest-to-your-app
-        if [ "$is_ios_app" == true ]; then
-            privacy_manifest_file="$path/$PRIVACY_MANIFEST_FILE_NAME"
-        else
-            privacy_manifest_file="$path/Contents/Resources/$PRIVACY_MANIFEST_FILE_NAME"
-        fi
-    else
-        # Per the documentation, the privacy manifest should be placed at the root of the iOS framework, while for a macOS framework with multiple versions, it should be located in the `Resources` directory within the corresponding version
-        # Some SDKs don’t follow the guideline, so we use a search-based approach for now
-        # Reference: https://developer.apple.com/documentation/bundleresources/adding-a-privacy-manifest-to-your-app-or-third-party-sdk#Add-a-privacy-manifest-to-your-framework
-        local framework_path="$(get_framework_path "$path" "$version_path")"
-        local privacy_manifest_files=($(search_privacy_manifest_files "$framework_path"))
-        privacy_manifest_file="$(get_privacy_manifest_file "${privacy_manifest_files[@]}")"
-    fi
-    
-    local name="$(basename "$path")"
-    local title="$name"
-    if [ -n "$version_path" ]; then
-        title="$name ($version_path)"
-    fi
-    
-    local plist_file="$(get_plist_file "$path" "$version_path")"
-    local version="$(get_plist_version "$plist_file")"
-    local card="$(generate_html_header "$title" "$version")"
-    
-    if [ -f "$privacy_manifest_file" ]; then
-        card="$card$(generate_html_anchor "$PRIVACY_MANIFEST_FILE_NAME" "$privacy_manifest_file" false)"
-        
-        local used_template_file="$(get_used_template_file "$name$version_path")"
-        
-        if [ -f "$used_template_file" ]; then
-            card="$card$(generate_html_anchor "Template Used: $(basename "$used_template_file")" "$used_template_file" false)"
-        fi
-        
-        local trs=($(analyze_privacy_accessed_api "$privacy_manifest_file"))
-        
-        # Generate table only if the accessed privacy API types array is not empty
-        if [[ ${#trs[@]} -gt 0 ]]; then
-            local thead="$(generate_html_thead "NSPrivacyAccessedAPIType" "NSPrivacyAccessedAPITypeReasons")"
-            local tbody="$(generate_html_tbody "${trs[@]}")"
-            
-            card="$card$(generate_html_table "$thead" "$tbody")"
-        fi
-    else
-        card="$card$(generate_html_anchor "Missing Privacy Manifest" "$path" true)"
-    fi
-    
-    add_html_card_container "$card"
-}
-
-# Generate the report content for app
-function generate_app_report_content() {
-    generate_report_content "$app_path" ""
-}
-
-# Generate the report content for frameworks
-function generate_frameworks_report_content() {
-    if ! [ -d "$frameworks_dir" ]; then
-        return
-    fi
-    
-    for path in "$frameworks_dir"/*; do
-        if [ -d "$path" ]; then
-            local versions_dir="$path/Versions"
-            
-            if [ -d "$versions_dir" ]; then
-                for version in $(ls -1 "$versions_dir" | grep -vE '^Current$'); do
-                    local version_path="Versions/$version"
-                    generate_report_content "$path" "$version_path"
-                done
-            else
-                generate_report_content "$path" ""
-            fi
-        fi
-    done
-}
-
-# Generate the final report with all content
-function generate_final_report() {
-    # Replace placeholders in the template with the tool's version and report content
-    sed -i "" -e "s|{{TOOL_VERSION}}|$tool_version|g" -e "s|{{REPORT_CONTENT}}|${report_content}|g" "$report_output_file"
-    
-    echo "Privacy Access Report has been generated: $report_output_file"
-}
-
-generate_app_report_content
-generate_frameworks_report_content
-generate_final_report

ios/App/app_privacy_manifest_fixer/Templates/AppTemplate.xcprivacy

@@ -1,55 +0,0 @@
-<?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>NSPrivacyTracking</key>
-	<false/>
-	<key>NSPrivacyTrackingDomains</key>
-	<array/>
-	<key>NSPrivacyCollectedDataTypes</key>
-	<array/>
-	<key>NSPrivacyAccessedAPITypes</key>
-	<array>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>C617.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>35F9.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>E174.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryActiveKeyboards</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>54BD.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>CA92.1</string>
-			</array>
-		</dict>
-	</array>
-</dict>
-</plist>

ios/App/app_privacy_manifest_fixer/Templates/FrameworkTemplate.xcprivacy

@@ -1,55 +0,0 @@
-<?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>NSPrivacyTracking</key>
-	<false/>
-	<key>NSPrivacyTrackingDomains</key>
-	<array/>
-	<key>NSPrivacyCollectedDataTypes</key>
-	<array/>
-	<key>NSPrivacyAccessedAPITypes</key>
-	<array>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>0A2A.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>35F9.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>E174.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryActiveKeyboards</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>54BD.1</string>
-			</array>
-		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>C56D.1</string>
-			</array>
-		</dict>
-	</array>
-</dict>
-</plist>

ios/App/app_privacy_manifest_fixer/VERSION

@@ -1 +0,0 @@
-v1.4.1

ios/App/app_privacy_manifest_fixer/clean.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2025, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-set -e
-
-target_paths=("Build")
-
-echo "Cleaning..."
-
-deleted_anything=false
-
-for path in "${target_paths[@]}"; do
-    if [ -e "$path" ]; then
-        echo "Removing $path..."
-        rm -rf "./$path"
-        deleted_anything=true
-    fi
-done
-
-if [ "$deleted_anything" == true ]; then
-    echo "Cleanup completed."
-else
-    echo "Nothing to clean."
-fi

ios/App/app_privacy_manifest_fixer/fixer.sh

@@ -1,490 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2024, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-set -e
-
-# Absolute path of the script and the tool's root directory
-script_path="$(realpath "$0")"
-tool_root_path="$(dirname "$script_path")"
-
-# Load common constants and utils
-source "$tool_root_path/Common/constants.sh"
-source "$tool_root_path/Common/utils.sh"
-
-# Force replace the existing privacy manifest when the `-f` option is enabled
-force=false
-
-# Enable silent mode to disable build output when the `-s` option is enabled
-silent=false
-
-# Parse command-line options
-while getopts ":fs" opt; do
-    case $opt in
-        f)
-            force=true
-            ;;
-        s)
-            silent=true
-            ;;
-        \?)
-            echo "Invalid option: -$OPTARG" >&2
-            exit 1
-            ;;
-    esac
-done
-
-shift $((OPTIND - 1))
-
-# Path of the app produced by the build process
-app_path="${TARGET_BUILD_DIR}/${WRAPPER_NAME}"
-
-# Check if the app exists
-if [ ! -d "$app_path" ] || [[ "$app_path" != *.app ]]; then
-    echo "Unable to find the app: $app_path"
-    exit 1
-fi
-
-# Check if the app is iOS or macOS
-is_ios_app=true
-frameworks_dir="$app_path/Frameworks"
-if [ -d "$app_path/Contents/MacOS" ]; then
-    is_ios_app=false
-    frameworks_dir="$app_path/Contents/Frameworks"
-fi
-
-# Default template directories
-templates_dir="$tool_root_path/Templates"
-user_templates_dir="$tool_root_path/Templates/UserTemplates"
-
-# Use user-defined app privacy manifest template if it exists, otherwise fallback to default
-app_template_file="$user_templates_dir/$APP_TEMPLATE_FILE_NAME"
-if [ ! -f "$app_template_file" ]; then
-    app_template_file="$templates_dir/$APP_TEMPLATE_FILE_NAME"
-fi
-
-# Use user-defined framework privacy manifest template if it exists, otherwise fallback to default
-framework_template_file="$user_templates_dir/$FRAMEWORK_TEMPLATE_FILE_NAME"
-if [ ! -f "$framework_template_file" ]; then
-    framework_template_file="$templates_dir/$FRAMEWORK_TEMPLATE_FILE_NAME"
-fi
-
-# Disable build output in silent mode
-if [ "$silent" == false ]; then
-    # Script used to generate the privacy access report
-    report_script="$tool_root_path/Report/report.sh"
-    # An array to record template usage for generating the privacy access report
-    template_usage_records=()
-    
-    # Build output directory
-    build_dir="$tool_root_path/Build/${PRODUCT_NAME}-${CONFIGURATION}_${MARKETING_VERSION}_${CURRENT_PROJECT_VERSION}_$(date +%Y%m%d%H%M%S)"
-    # Ensure the build directory exists
-    mkdir -p "$build_dir"
-
-    # Redirect both stdout and stderr to a log file while keeping console output
-    exec > >(tee "$build_dir/fix.log") 2>&1
-fi
-
-# Get the path to the `Info.plist` file for the specified app or framework
-function get_plist_file() {
-    local path="$1"
-    local version_path="$2"
-    local plist_file=""
-    
-    if [[ "$path" == *.app ]]; then
-        if [ "$is_ios_app" == true ]; then
-            plist_file="$path/Info.plist"
-        else
-            plist_file="$path/Contents/Info.plist"
-        fi
-    elif [[ "$path" == *.framework ]]; then
-        local framework_path="$(get_framework_path "$path" "$version_path")"
-        
-        if [ "$is_ios_app" == true ]; then
-            plist_file="$framework_path/Info.plist"
-        else
-            plist_file="$framework_path/Resources/Info.plist"
-        fi
-    fi
-    
-    echo "$plist_file"
-}
-
-# Get the path to the executable for the specified app or framework
-function get_executable_path() {
-    local path="$1"
-    local version_path="$2"
-    local executable_path=""
-    
-    local plist_file="$(get_plist_file "$path" "$version_path")"
-    local executable_name="$(get_plist_executable "$plist_file")"
-    
-    if [[ "$path" == *.app ]]; then
-        if [ "$is_ios_app" == true ]; then
-            executable_path="$path/$executable_name"
-        else
-            executable_path="$path/Contents/MacOS/$executable_name"
-        fi
-    elif [[ "$path" == *.framework ]]; then
-        local framework_path="$(get_framework_path "$path" "$version_path")"
-        executable_path="$framework_path/$executable_name"
-    fi
-    
-    echo "$executable_path"
-}
-
-# Analyze the specified binary file for API symbols and their categories
-function analyze_binary_file() {
-    local path="$1"
-    local -a results=()
-
-    # Check if the API symbol exists in the binary file using `nm` and `strings`
-    local nm_output=$(nm "$path" 2>/dev/null | xcrun swift-demangle)
-    local strings_output=$(strings "$path")
-    local combined_output="$nm_output"$'\n'"$strings_output"
-
-    for api_symbol in "${API_SYMBOLS[@]}"; do
-        local substrings=($(split_string_by_delimiter "$api_symbol"))
-        local category=${substrings[0]}
-        local api=${substrings[1]}
-
-        if echo "$combined_output" | grep -E "$api\$" >/dev/null; then
-            local index=-1
-            for ((i=0; i < ${#results[@]}; i++)); do
-                local result="${results[i]}"
-                local result_substrings=($(split_string_by_delimiter "$result"))
-                # If the category matches an existing result, update it
-                if [ "$category" == "${result_substrings[0]}" ]; then
-                    index=i
-                    results[i]="${result_substrings[0]}$DELIMITER${result_substrings[1]},$api$DELIMITER${result_substrings[2]}"
-                    break
-                fi
-            done
-
-            # If no matching category found, add a new result
-            if [[ $index -eq -1 ]]; then
-                results+=("$category$DELIMITER$api$DELIMITER$(encode_path "$path")")
-            fi
-        fi
-    done
-    
-    echo "${results[@]}"
-}
-
-# Analyze API usage in a binary file
-function analyze_api_usage() {
-    local path="$1"
-    local version_path="$2"
-    local -a results=()
-    
-    local binary_file="$(get_executable_path "$path" "$version_path")"
-    
-    if [ -f "$binary_file" ]; then
-        results+=($(analyze_binary_file "$binary_file"))
-    fi
-
-    echo "${results[@]}"
-}
-
-
-
-# Get unique categories from analysis results
-function get_categories() {
-    local results=("$@")
-    local -a categories=()
-    
-    for result in "${results[@]}"; do
-        local substrings=($(split_string_by_delimiter "$result"))
-        local category=${substrings[0]}
-        if [[ ! "${categories[@]}" =~ "$category" ]]; then
-            categories+=("$category")
-        fi
-    done
-    
-    echo "${categories[@]}"
-}
-
-# Get template file for the specified app or framework
-function get_template_file() {
-    local path="$1"
-    local version_path="$2"
-    local template_file=""
-    
-    if [[ "$path" == *.app ]]; then
-        template_file="$app_template_file"
-    else
-        # Give priority to the user-defined framework privacy manifest template
-        local dep_name="$(get_dependency_name "$path")"
-        if [ -n "$version_path" ]; then
-            dep_name="$dep_name.$(basename "$version_path")"
-        fi
-        
-        local dep_template_file="$user_templates_dir/${dep_name}.xcprivacy"
-        if [ -f "$dep_template_file" ]; then
-            template_file="$dep_template_file"
-        else
-            template_file="$framework_template_file"
-        fi
-    fi
-    
-    echo "$template_file"
-}
-
-# Check if the specified template file should be modified
-#
-# The following template files will be modified based on analysis:
-# * Templates/AppTemplate.xcprivacy
-# * Templates/FrameworkTemplate.xcprivacy
-# * Templates/UserTemplates/FrameworkTemplate.xcprivacy
-function is_template_modifiable() {
-    local template_file="$1"
-    
-    local template_file_name="$(basename "$template_file")"
-
-    if [[ "$template_file" != "$user_templates_dir"* ]] || [ "$template_file_name" == "$FRAMEWORK_TEMPLATE_FILE_NAME" ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-# Check if `Hardened Runtime` is enabled for the specified path
-function is_hardened_runtime_enabled() {
-    local path="$1"
-
-    # Check environment variable first
-    if [ "${ENABLE_HARDENED_RUNTIME:-}" == "YES" ]; then
-        return 0
-    fi
-
-    # Check the code signature flags if environment variable is not set
-    local flags=$(codesign -dvvv "$path" 2>&1 | grep "flags=")
-    if echo "$flags" | grep -q "runtime"; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-# Re-sign the target app or framework if code signing is enabled
-function resign() {
-    local path="$1"
-
-    if [ -n "${EXPANDED_CODE_SIGN_IDENTITY:-}" ] && [ "${CODE_SIGNING_REQUIRED:-}" != "NO" ] && [ "${CODE_SIGNING_ALLOWED:-}" != "NO" ]; then
-        echo "Re-signing $path with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME:-$EXPANDED_CODE_SIGN_IDENTITY}"
-
-        local codesign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements"
-
-        if [ "$is_ios_app" == true ]; then
-            $codesign_cmd "$path"
-        else
-            if is_hardened_runtime_enabled "$path"; then
-                codesign_cmd="$codesign_cmd -o runtime"
-            fi
-            
-            if [ -d "$path/Contents/MacOS" ]; then
-                find "$path/Contents/MacOS" -type f -name "*.dylib" | while read -r dylib_file; do
-                    $codesign_cmd "$dylib_file"
-                done
-            fi
-            
-            $codesign_cmd "$path"
-        fi
-    fi
-}
-
-# Fix the privacy manifest for the app or specified framework
-# To accelerate the build, existing privacy manifests will be left unchanged unless the `-f` option is enabled
-# After fixing, the app or framework will be automatically re-signed
-function fix() {
-    local path="$1"
-    local version_path="$2"
-    local force_resign="$3"
-    local privacy_manifest_file=""
-    
-    if [[ "$path" == *.app ]]; then
-        # Per the documentation, the privacy manifest should be placed at the root of the app’s bundle for iOS, while for macOS, it should be located in `Contents/Resources/` within the app’s bundle
-        # Reference: https://developer.apple.com/documentation/bundleresources/adding-a-privacy-manifest-to-your-app-or-third-party-sdk#Add-a-privacy-manifest-to-your-app
-        if [ "$is_ios_app" == true ]; then
-            privacy_manifest_file="$path/$PRIVACY_MANIFEST_FILE_NAME"
-        else
-            privacy_manifest_file="$path/Contents/Resources/$PRIVACY_MANIFEST_FILE_NAME"
-        fi
-    else
-        # Per the documentation, the privacy manifest should be placed at the root of the iOS framework, while for a macOS framework with multiple versions, it should be located in the `Resources` directory within the corresponding version
-        # Some SDKs don’t follow the guideline, so we use a search-based approach for now
-        # Reference: https://developer.apple.com/documentation/bundleresources/adding-a-privacy-manifest-to-your-app-or-third-party-sdk#Add-a-privacy-manifest-to-your-framework
-        local framework_path="$(get_framework_path "$path" "$version_path")"
-        local privacy_manifest_files=($(search_privacy_manifest_files "$framework_path"))
-        privacy_manifest_file="$(get_privacy_manifest_file "${privacy_manifest_files[@]}")"
-        
-        if [ -z "$privacy_manifest_file" ]; then
-            if [ "$is_ios_app" == true ]; then
-                privacy_manifest_file="$framework_path/$PRIVACY_MANIFEST_FILE_NAME"
-            else
-                privacy_manifest_file="$framework_path/Resources/$PRIVACY_MANIFEST_FILE_NAME"
-            fi
-        fi
-    fi
-    
-    # Check if the privacy manifest file exists
-    if [ -f "$privacy_manifest_file" ]; then
-        echo "💡 Found privacy manifest file: $privacy_manifest_file"
-        
-        if [ "$force" == false ]; then
-            if [ "$force_resign" == true ]; then
-                resign "$path"
-            fi
-            echo "✅ Privacy manifest file already exists, skipping fix."
-            return
-        fi
-    else
-        echo "⚠️  Missing privacy manifest file!"
-    fi
-    
-    local results=($(analyze_api_usage "$path" "$version_path"))
-    echo "API usage analysis result(s): ${#results[@]}"
-    print_array "${results[@]}"
-    
-    local template_file="$(get_template_file "$path" "$version_path")"
-    template_usage_records+=("$(basename "$path")$version_path$DELIMITER$template_file")
-    
-    # Copy the template file to the privacy manifest location, overwriting if it exists
-    cp "$template_file" "$privacy_manifest_file"
-    
-    if is_template_modifiable "$template_file"; then
-        local categories=($(get_categories "${results[@]}"))
-        local remove_categories=()
-        
-        # Check if categories is non-empty
-        if [[ ${#categories[@]} -gt 0 ]]; then
-            # Convert categories to a single space-separated string for easy matching
-            local categories_set=" ${categories[*]} "
-            
-            # Iterate through each element in `API_CATEGORIES`
-            for element in "${API_CATEGORIES[@]}"; do
-                # If element is not found in `categories_set`, add it to `remove_categories`
-                if [[ ! $categories_set =~ " $element " ]]; then
-                    remove_categories+=("$element")
-                fi
-            done
-        else
-            # If categories is empty, add all of `API_CATEGORIES` to `remove_categories`
-            remove_categories=("${API_CATEGORIES[@]}")
-        fi
-
-        # Remove extra spaces in the XML file to simplify node removal
-        xmllint --noblanks "$privacy_manifest_file" -o "$privacy_manifest_file"
-
-        # Build a sed command to remove all matching nodes at once
-        local sed_pattern=""
-        for category in "${remove_categories[@]}"; do
-            # Find the node for the current category
-            local remove_node="$(xmllint --xpath "//dict[string='$category']" "$privacy_manifest_file" 2>/dev/null || true)"
-            
-            # If the node is found, escape special characters and append it to the sed pattern
-            if [ -n "$remove_node" ]; then
-                local escaped_node=$(echo "$remove_node" | sed 's/[\/&]/\\&/g')
-                sed_pattern+="s/$escaped_node//g;"
-            fi
-        done
-
-        # Apply the combined sed pattern to the file if it's not empty
-        if [ -n "$sed_pattern" ]; then
-            sed -i "" "$sed_pattern" "$privacy_manifest_file"
-        fi
-
-        # Reformat the XML file to restore spaces for readability
-        xmllint --format "$privacy_manifest_file" -o "$privacy_manifest_file"
-    fi
-    
-    resign "$path"
-    
-    echo "✅ Privacy manifest file fixed: $privacy_manifest_file."
-}
-
-# Fix privacy manifests for all frameworks
-function fix_frameworks() {
-    if ! [ -d "$frameworks_dir" ]; then
-        return
-    fi
-    
-    echo "🛠️ Fixing Frameworks..."
-    for path in "$frameworks_dir"/*; do
-        if [ -d "$path" ]; then
-            local dep_name="$(get_dependency_name "$path")"
-            local versions_dir="$path/Versions"
-            
-            if [ -d "$versions_dir" ]; then
-                for version in $(ls -1 "$versions_dir" | grep -vE '^Current$'); do
-                    local version_path="Versions/$version"
-                    echo "Analyzing $dep_name ($version_path) ..."
-                    fix "$path" "$version_path" false
-                    echo ""
-                done
-            else
-                echo "Analyzing $dep_name ..."
-                fix "$path" "" false
-                echo ""
-            fi
-        fi
-    done
-}
-
-# Fix the privacy manifest for the app
-function fix_app() {
-    echo "🛠️ Fixing $(basename "$app_path" .app) App..."
-    # Since the framework may have undergone fixes, the app must be forcefully re-signed
-    fix "$app_path" "" true
-    echo ""
-}
-
-# Generate the privacy access report for the app
-function generate_report() {
-    local original="$1"
-    
-    if [ "$silent" == true ]; then
-        return
-    fi
-
-    local app_name="$(basename "$app_path")"
-    local name="${app_name%.*}"
-    local report_name=""
-
-    # Adjust output names if the app is flagged as original
-    if [ "$original" == true ]; then
-        app_name="${name}-original.app"
-        report_name="report-original.html"
-    else
-        app_name="$name.app"
-        report_name="report.html"
-    fi
-    
-    local target_app_path="$build_dir/$app_name"
-    local report_path="$build_dir/$report_name"
-    
-    echo "Copy app to $target_app_path"
-    rsync -a "$app_path/" "$target_app_path/"
-    
-    # Generate the privacy access report using the script
-    sh "$report_script" "$target_app_path" "$report_path" "${template_usage_records[@]}"
-    echo ""
-}
-
-start_time=$(date +%s)
-
-generate_report true
-fix_frameworks
-fix_app
-generate_report false
-
-end_time=$(date +%s)
-
-echo "🎉 All fixed! ⏰ $((end_time - start_time)) seconds"
-echo "🌟 If you found this script helpful, please consider giving it a star on GitHub. Your support is appreciated. Thank you!"
-echo "🔗 Homepage: https://github.com/crasowas/app_privacy_manifest_fixer"
-echo "🐛 Report issues: https://github.com/crasowas/app_privacy_manifest_fixer/issues"

ios/App/app_privacy_manifest_fixer/install.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2024, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-set -e
-
-# Check if at least one argument (project_path) is provided
-if [[ "$#" -lt 1 ]]; then
-    echo "Usage: $0 <project_path> [options...]"
-    exit 1
-fi
-
-project_path="$1"
-
-shift
-
-options=()
-install_builds_only=false
-
-# Check if the `--install-builds-only` option is provided and separate it from other options
-for arg in "$@"; do
-  if [ "$arg" == "--install-builds-only" ]; then
-    install_builds_only=true
-  else
-    options+=("$arg")
-  fi
-done
-
-# Verify Ruby installation
-if ! command -v ruby &>/dev/null; then
-    echo "Ruby is not installed. Please install Ruby and try again."
-    exit 1
-fi
-
-# Check if xcodeproj gem is installed
-if ! gem list -i xcodeproj &>/dev/null; then
-    echo "The 'xcodeproj' gem is not installed."
-    read -p "Would you like to install it now? [Y/n] " response
-    if [[ "$response" =~ ^[Nn]$ ]]; then
-        echo "Please install 'xcodeproj' manually and re-run the script."
-        exit 1
-    fi
-    gem install xcodeproj || { echo "Failed to install 'xcodeproj'."; exit 1; }
-fi
-
-# Convert project path to an absolute path if it is relative
-if [[ ! "$project_path" = /* ]]; then
-    project_path="$(realpath "$project_path")"
-fi
-
-# Absolute path of the script and the tool's root directory
-script_path="$(realpath "$0")"
-tool_root_path="$(dirname "$script_path")"
-
-tool_portable_path="$tool_root_path"
-# If the tool's root directory is inside the project path, make the path portable
-if [[ "$tool_root_path" == "$project_path"* ]]; then
-    # Extract the path of the tool's root directory relative to the project path
-    tool_relative_path="${tool_root_path#$project_path}"
-    # Formulate a portable path using the `PROJECT_DIR` environment variable provided by Xcode
-    tool_portable_path="\${PROJECT_DIR}${tool_relative_path}"
-fi
-
-run_script_content="\"$tool_portable_path/fixer.sh\" ${options[@]}"
-
-# Execute the Ruby helper script
-ruby "$tool_root_path/Helper/xcode_install_helper.rb" "$project_path" "$run_script_content" "$install_builds_only"

ios/App/app_privacy_manifest_fixer/uninstall.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2024, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-set -e
-
-# Check if the project path is provided
-if [[ $# -eq 0 ]]; then
-    echo "Usage: $0 <project_path>"
-    exit 1
-fi
-
-project_path="$1"
-
-# Verify Ruby installation
-if ! command -v ruby &>/dev/null; then
-    echo "Ruby is not installed. Please install Ruby and try again."
-    exit 1
-fi
-
-# Check if xcodeproj gem is installed
-if ! gem list -i xcodeproj &>/dev/null; then
-    echo "The 'xcodeproj' gem is not installed."
-    read -p "Would you like to install it now? [Y/n] " response
-    if [[ "$response" =~ ^[Nn]$ ]]; then
-        echo "Please install 'xcodeproj' manually and re-run the script."
-        exit 1
-    fi
-    gem install xcodeproj || { echo "Failed to install 'xcodeproj'."; exit 1; }
-fi
-
-# Convert project path to an absolute path if it is relative
-if [[ ! "$project_path" = /* ]]; then
-    project_path="$(realpath "$project_path")"
-fi
-
-# Absolute path of the script and the tool's root directory
-script_path="$(realpath "$0")"
-tool_root_path="$(dirname "$script_path")"
-
-# Execute the Ruby helper script
-ruby "$tool_root_path/Helper/xcode_uninstall_helper.rb" "$project_path"

ios/App/app_privacy_manifest_fixer/upgrade.sh

@@ -1,108 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2024, crasowas.
-#
-# Use of this source code is governed by a MIT-style license
-# that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-set -e
-
-# Absolute path of the script and the tool's root directory
-script_path="$(realpath "$0")"
-tool_root_path="$(dirname "$script_path")"
-
-# Repository details
-readonly REPO_OWNER="crasowas"
-readonly REPO_NAME="app_privacy_manifest_fixer"
-
-# URL to fetch the latest release information
-readonly LATEST_RELEASE_URL="https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/releases/latest"
-
-# Fetch the release information from GitHub API
-release_info=$(curl -s "$LATEST_RELEASE_URL")
-
-# Extract the latest release version, download URL, and published time
-latest_version=$(echo "$release_info" | grep -o '"tag_name": "[^"]*' | sed 's/"tag_name": "//')
-download_url=$(echo "$release_info" | grep -o '"zipball_url": "[^"]*' | sed 's/"zipball_url": "//')
-published_time=$(echo "$release_info" | grep -o '"published_at": "[^"]*' | sed 's/"published_at": "//')
-
-# Ensure the latest version, download URL, and published time are successfully retrieved
-if [ -z "$latest_version" ] || [ -z "$download_url" ]  || [ -z "$published_time" ]; then
-    echo "Unable to fetch the latest release information."
-    echo "Request URL: $LATEST_RELEASE_URL"
-    echo "Response Data: $release_info"
-    exit 1
-fi
-
-# Convert UTC time to local time
-published_time=$(TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$published_time" +"%s" | xargs -I{} date -j -r {} +"%Y-%m-%d %H:%M:%S %z")
-
-# Read the current tool's version from the VERSION file
-tool_version_file="$tool_root_path/VERSION"
-if [ ! -f "$tool_version_file" ]; then
-    echo "VERSION file not found."
-    exit 1
-fi
-
-local_version="$(cat "$tool_version_file")"
-
-# Skip upgrade if the current version is already the latest
-if [ "$local_version" == "$latest_version" ]; then
-    echo "Version $latest_version • $published_time"
-    echo "Already up-to-date."
-    exit 0
-fi
-
-# Create a temporary directory for downloading the release
-temp_dir=$(mktemp -d)
-trap "rm -rf $temp_dir" EXIT
-
-download_file_name="latest-release.tar.gz"
-
-# Download the latest release archive
-echo "Downloading version $latest_version..."
-curl -L "$download_url" -o "$temp_dir/$download_file_name"
-
-# Check if the download was successful
-if [ $? -ne 0 ]; then
-    echo "Download failed, please check your network connection and try again."
-    exit 1
-fi
-
-# Extract the downloaded release archive
-echo "Extracting files..."
-tar -xzf "$temp_dir/$download_file_name" -C "$temp_dir"
-
-# Find the extracted release
-extracted_release_path=$(find "$temp_dir" -mindepth 1 -maxdepth 1 -type d -name "*$REPO_NAME*" | head -n 1)
-
-# Verify that an extracted release was found
-if [ -z "$extracted_release_path" ]; then
-    echo "No extracted release found for the latest version."
-    exit 1
-fi
-
-user_templates_dir="$tool_root_path/Templates/UserTemplates"
-user_templates_backup_dir="$temp_dir/Templates/UserTemplates"
-
-# Backup the user templates directory if it exists
-if [ -d "$user_templates_dir" ]; then
-    echo "Backing up user templates..."
-    mkdir -p "$user_templates_backup_dir"
-    rsync -a --exclude='.*' "$user_templates_dir/" "$user_templates_backup_dir/"
-fi
-
-# Replace old version files with the new version files
-echo "Replacing old version files..."
-rsync -a --delete "$extracted_release_path/" "$tool_root_path/"
-
-# Restore the user templates from the backup
-if [ -d "$user_templates_backup_dir" ]; then
-    echo "Restoring user templates..."
-    rsync -a --exclude='.*' "$user_templates_backup_dir/" "$user_templates_dir/"
-fi
-
-# Upgrade complete
-echo "Version $latest_version • $published_time"
-echo "Upgrade completed successfully!"

ios/fastlane/Fastfile

@@ -0,0 +1,22 @@
+default_platform(:ios)
+
+platform :ios do
+  desc "Build and deploy iOS app"
+  lane :beta do
+    build_ios_app(
+      scheme: "App",
+      workspace: "App.xcworkspace",
+      export_method: "app-store"
+    )
+    upload_to_testflight
+  end
+
+  lane :release do
+    build_ios_app(
+      scheme: "App",
+      workspace: "App.xcworkspace",
+      export_method: "app-store"
+    )
+    upload_to_app_store
+  end
+end

openssl_signing_console.rst

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

openssl_signing_console.sh

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

package.json

@@ -1,16 +1,21 @@
 {
   "name": "timesafari",
-  "version": "0.4.6",
+  "version": "0.4.4",
   "description": "Time Safari Application",
+  "type": "module",
   "author": {
     "name": "Time Safari Team"
   },
   "scripts": {
-    "dev": "vite --config vite.config.dev.mts --host",
+    "dev": "vite",
+    "dev:web": "vite --config vite.config.web.mts",
     "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",
+    "build": "vite build",
+    "build:mobile": "VITE_PLATFORM=capacitor vite build",
+    "preview": "vite preview",
+    "lint": "NODE_OPTIONS='--experimental-vm-modules --experimental-specifier-resolution=node' eslint --ext .vue,.js,.jsx,.mjs,.ts,.tsx,.mts --fix --ignore-path .gitignore",
+    "format": "prettier --write src/",
+    "lint-fix": "NODE_OPTIONS='--experimental-vm-modules --experimental-specifier-resolution=node' eslint \"src/**/*.{vue,js,jsx,ts,tsx,mjs,mts}\" --fix",
     "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js",
     "test:all": "npm run test:prerequisites && npm run build && npm run test:web && npm run test:mobile",
     "test:prerequisites": "node scripts/check-prerequisites.js",
@@ -22,11 +27,11 @@
     "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 && 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 .",
+    "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",
     "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",
@@ -41,17 +46,15 @@
     "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",
-    "electron:build-mac": "npm run build:electron-prod && electron-builder --mac",
-    "electron:build-mac-universal": "npm run build:electron-prod && electron-builder --mac --universal"
+    "fastlane:android:release": "cd android && fastlane release"
   },
   "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/clipboard": "^6.0.2",
+    "@capacitor/core": "^6.2.1",
     "@capacitor/filesystem": "^6.0.0",
     "@capacitor/ios": "^6.2.0",
     "@capacitor/share": "^6.0.3",
@@ -83,8 +86,10 @@
     "@zxing/text-encoding": "^0.9.0",
     "asn1-ber": "^1.2.2",
     "axios": "^1.6.8",
+    "buffer": "^6.0.3",
     "cbor-x": "^1.5.9",
     "class-transformer": "^0.5.1",
+    "crypto-browserify": "^3.12.1",
     "dexie": "^3.2.7",
     "dexie-export-import": "^4.1.4",
     "did-jwt": "^7.4.7",
@@ -101,7 +106,7 @@
     "lru-cache": "^10.2.0",
     "luxon": "^3.4.4",
     "merkletreejs": "^0.3.11",
-    "nostr-tools": "^2.10.4",
+    "nostr-tools": "^2.12.0",
     "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
     "pina": "^0.20.2204228",
@@ -123,11 +128,11 @@
     "vue-picture-cropper": "^0.7.0",
     "vue-qrcode-reader": "^5.5.3",
     "vue-router": "^4.5.0",
-    "wa-sqlite": "github:rhashimoto/wa-sqlite",
     "web-did-resolver": "^2.0.27",
     "zod": "^3.24.2"
   },
   "devDependencies": {
+    "@capacitor-mlkit/barcode-scanning": "^6.2.0",
     "@capacitor/assets": "^3.0.5",
     "@playwright/test": "^1.45.2",
     "@types/dom-webcodecs": "^0.1.7",
@@ -143,21 +148,23 @@
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "@vitejs/plugin-vue": "^5.2.1",
-    "@vue/eslint-config-typescript": "^11.0.3",
+    "@vue/eslint-config-typescript": "^12.0.0",
     "autoprefixer": "^10.4.19",
     "concurrently": "^8.2.2",
     "electron": "^33.2.1",
     "electron-builder": "^25.1.8",
-    "eslint": "^8.57.0",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-vue": "^9.32.0",
+    "eslint-import-resolver-node": "^0.3.9",
+    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-plugin-vue": "^9.33.0",
+    "espree": "^10.3.0",
     "fs-extra": "^11.3.0",
     "markdownlint": "^0.37.4",
     "markdownlint-cli": "^0.44.0",
     "npm-check-updates": "^17.1.13",
     "postcss": "^8.4.38",
-    "prettier": "^3.2.5",
+    "prettier": "^3.5.3",
     "rimraf": "^6.0.1",
     "tailwindcss": "^3.4.1",
     "typescript": "~5.2.2",
@@ -173,12 +180,13 @@
     },
     "files": [
       "dist-electron/**/*",
-      "dist/**/*"
+      "src/electron/**/*",
+      "main.js"
     ],
     "extraResources": [
       {
-        "from": "dist",
-        "to": "www"
+        "from": "dist-electron",
+        "to": "."
       }
     ],
     "linux": {
@@ -189,32 +197,6 @@
       "category": "Office",
       "icon": "build/icon.png"
     },
-    "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"
-        }
-      ]
-    }
+    "asar": true
   }
 }

pkgx.yaml

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

scripts/build-electron.js

@@ -1,243 +1,98 @@
-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 webDistPath = path.join(__dirname, '..', 'dist');
-const electronDistPath = path.join(__dirname, '..', 'dist-electron');
-const wwwPath = path.join(electronDistPath, 'www');
+    const wwwDir = path.join(distElectronDir, 'www');
+    await fs.ensureDir(wwwDir);
+    await fs.copy('dist', wwwDir);
 
-// Create www directory if it doesn't exist
-if (!fs.existsSync(wwwPath)) {
-  fs.mkdirSync(wwwPath, { recursive: true });
-}
+    // Copy and fix index.html
+    const indexPath = path.join(wwwDir, 'index.html');
+    let indexContent = await fs.readFile(indexPath, 'utf8');
 
-// 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
+    // More comprehensive path fixing
     indexContent = indexContent
-  .replace(/\/assets\//g, './assets/')
-  .replace(/href="\//g, 'href="./')
-  .replace(/src="\//g, 'src="./');
+      // 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/');
 
-fs.writeFileSync(indexPath, indexContent);
-
-// Check for remaining /assets/ paths
+    // Debug output
     console.log('After path fixing, checking for remaining /assets/ paths:', indexContent.includes('/assets/'));
-console.log('Sample of fixed content:', indexContent.substring(0, 500));
+    console.log('Sample of fixed content:', indexContent.slice(0, 500));
+
+    await fs.writeFile(indexPath, indexContent);
     
-console.log('Copied and fixed web files in:', wwwPath);
+    console.log('Copied and fixed web files in:', wwwDir);
 
     // Copy main process files
     console.log('Copying main process files...');
+    const mainProcessFiles = [
+      ['src/electron/main.js', 'main.js'],
+      ['src/electron/preload.js', 'preload.js']
+    ];
 
-// Create the main process file with inlined logger
-const mainContent = `const { app, BrowserWindow } = require("electron");
-const path = require("path");
-const fs = require("fs");
-
-// 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),
-};
-
-// Check if running in dev mode
-const isDev = process.argv.includes("--inspect");
-
-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));
-
-  // 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"),
-    },
-  });
-
-  // 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();
+    for (const [src, dest] of mainProcessFiles) {
+      const destPath = path.join(distElectronDir, dest);
+      console.log(`Copying ${src} to ${destPath}`);
+      await fs.copy(src, destPath);
     }
+
+    // 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,
+    };
+
+    await fs.writeJson(
+      path.join(distElectronDir, 'package.json'),
+      prodPackageJson,
+      { spaces: 2 }
+    );
+
+    // Verify the build
+    console.log('\nVerifying build structure:');
+    const files = await fs.readdir(distElectronDir);
+    console.log('Files in dist-electron:', files);
+
+    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');
+    }
+
+    console.log('Build completed successfully!');
+  } catch (error) {
+    console.error('Build failed:', error);
+    process.exit(1);
+  }
 }
 
-// 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!'); 
+main(); 

scripts/test-ios.js

@@ -103,7 +103,7 @@ const cleanIosPlatform = async (log) => {
             // 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';
+            const appId = packageJson.capacitor?.appId || 'io.ionic.starter';
             
             // Create a minimal capacitor config
             const capacitorConfig = `
@@ -441,8 +441,8 @@ const configureIosProject = async (log) => {
     try {
         // Try to run pod install normally first
         log('🔄 Running "pod install" in ios/App directory...');
-    execSync('cd ios/App && pod install', { stdio: 'inherit' });
-    log('✅ CocoaPods installation completed');
+        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}`);
@@ -467,12 +467,12 @@ const configureIosProject = async (log) => {
 // Build and test iOS project
 const buildAndTestIos = async (log, simulator) => {
     const simulatorName = simulator[0].name;
-    log('🏗️ Building iOS project...', simulator[0]);
+    log('🏗️ Building iOS project...');
     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,OS=17.2,name=${simulatorName}"`, { stdio: 'inherit' });
+    execSync(`cd ios/App && xcodebuild build -workspace App.xcworkspace -scheme App -destination "platform=iOS Simulator,name=${simulatorName}"`, { stdio: 'inherit' });
     log('✅ Xcode build completed');
 
     // Check if the project is configured for testing by querying the scheme capabilities
@@ -623,28 +623,28 @@ const runDeeplinkTests = async (log) => {
     }
     
     // Now we can safely create the deeplink tests knowing we have valid data
-        const deeplinkTests = [
-            {
+    const deeplinkTests = [
+        {
             url: `timesafari://claim/${testEnv.CLAIM_ID}`,
-                description: 'Claim view'
-            },
-            {
+            description: 'Claim view'
+        },
+        {
             url: `timesafari://claim-cert/${testEnv.CERT_ID || testEnv.CLAIM_ID}`,
-                description: 'Claim certificate view'
-            },
-            {
+            description: 'Claim certificate view'
+        },
+        {
             url: `timesafari://claim-add-raw/${testEnv.RAW_CLAIM_ID || testEnv.CLAIM_ID}`,
-                description: 'Raw claim addition'
-            },
-            {
-                url: 'timesafari://did/test',
-                description: 'DID view with test identifier'
-            },
-            {
-                url: `timesafari://did/${testEnv.CONTACT1_DID}`,
-                description: 'DID view with contact DID'
-            },
-            {
+            description: 'Raw claim addition'
+        },
+        {
+            url: 'timesafari://did/test',
+            description: 'DID view with test identifier'
+        },
+        {
+            url: `timesafari://did/${testEnv.CONTACT1_DID}`,
+            description: 'DID view with contact DID'
+        },
+        {
             url: (() => {
                 if (!testEnv?.CONTACT1_DID) {
                     throw new Error('Cannot construct contact-edit URL: CONTACT1_DID is missing');
@@ -653,13 +653,13 @@ const runDeeplinkTests = async (log) => {
                 log('Created contact-edit URL:', url);
                 return url;
             })(),
-                description: 'Contact editing'
-            },
-            {
-                url: `timesafari://contacts/import?contacts=${encodeURIComponent(JSON.stringify(contacts))}`,
-                description: 'Contacts import'
-            }
-        ];
+            description: 'Contact editing'
+        },
+        {
+            url: `timesafari://contacts/import?contacts=${encodeURIComponent(JSON.stringify(contacts))}`,
+            description: 'Contacts import'
+        }
+    ];
 
     // Log the final test configuration
     log('\n5. Final Test Configuration:');

src/App.vue

@@ -4,7 +4,7 @@
   <!-- Messages in the upper-right - https://github.com/emmanuelsw/notiwind -->
   <NotificationGroup group="alert">
     <div
-      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"
+      class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
     >
       <Notification
         v-slot="{ notifications, close }"
@@ -29,7 +29,9 @@
           >
             <div class="w-full px-4 py-3">
               <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ notification.text }}</p>
+              <p class="text-sm">
+                {{ notification.text }}
+              </p>
             </div>
           </div>
 
@@ -40,21 +42,20 @@
             <div
               class="flex items-center justify-center w-12 bg-slate-600 text-slate-100"
             >
-              <font-awesome
-                icon="circle-info"
-                class="fa-fw fa-xl"
-              ></font-awesome>
+              <font-awesome icon="circle-info" class="fa-fw fa-xl" />
             </div>
 
             <div class="relative w-full pl-4 pr-8 py-2 text-slate-900">
               <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ truncateLongWords(notification.text) }}</p>
+              <p class="text-sm">
+                {{ truncateLongWords(notification.text) }}
+              </p>
 
               <button
                 class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-slate-200 text-slate-600"
                 @click="close(notification.id)"
               >
-                <font-awesome icon="xmark" class="fa-fw"></font-awesome>
+                <font-awesome icon="xmark" class="fa-fw" />
               </button>
             </div>
           </div>
@@ -66,21 +67,20 @@
             <div
               class="flex items-center justify-center w-12 bg-emerald-600 text-emerald-100"
             >
-              <font-awesome
-                icon="circle-info"
-                class="fa-fw fa-xl"
-              ></font-awesome>
+              <font-awesome icon="circle-info" class="fa-fw fa-xl" />
             </div>
 
             <div class="relative w-full pl-4 pr-8 py-2 text-emerald-900">
               <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ truncateLongWords(notification.text) }}</p>
+              <p class="text-sm">
+                {{ truncateLongWords(notification.text) }}
+              </p>
 
               <button
                 class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-emerald-200 text-emerald-600"
                 @click="close(notification.id)"
               >
-                <font-awesome icon="xmark" class="fa-fw"></font-awesome>
+                <font-awesome icon="xmark" class="fa-fw" />
               </button>
             </div>
           </div>
@@ -92,21 +92,20 @@
             <div
               class="flex items-center justify-center w-12 bg-amber-600 text-amber-100"
             >
-              <font-awesome
-                icon="triangle-exclamation"
-                class="fa-fw fa-xl"
-              ></font-awesome>
+              <font-awesome icon="triangle-exclamation" class="fa-fw fa-xl" />
             </div>
 
             <div class="relative w-full pl-4 pr-8 py-2 text-amber-900">
               <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ truncateLongWords(notification.text) }}</p>
+              <p class="text-sm">
+                {{ truncateLongWords(notification.text) }}
+              </p>
 
               <button
                 class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-amber-200 text-amber-600"
                 @click="close(notification.id)"
               >
-                <font-awesome icon="xmark" class="fa-fw"></font-awesome>
+                <font-awesome icon="xmark" class="fa-fw" />
               </button>
             </div>
           </div>
@@ -118,21 +117,20 @@
             <div
               class="flex items-center justify-center w-12 bg-rose-600 text-rose-100"
             >
-              <font-awesome
-                icon="triangle-exclamation"
-                class="fa-fw fa-xl"
-              ></font-awesome>
+              <font-awesome icon="triangle-exclamation" class="fa-fw fa-xl" />
             </div>
 
             <div class="relative w-full pl-4 pr-8 py-2 text-rose-900">
               <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ truncateLongWords(notification.text) }}</p>
+              <p class="text-sm">
+                {{ truncateLongWords(notification.text) }}
+              </p>
 
               <button
                 class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-rose-200 text-rose-600"
                 @click="close(notification.id)"
               >
-                <font-awesome icon="xmark" class="fa-fw"></font-awesome>
+                <font-awesome icon="xmark" class="fa-fw" />
               </button>
             </div>
           </div>
@@ -144,10 +142,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-[env(safe-area-inset-top)] inset-x-0 w-full">
+    <div class="fixed z-[100] top-0 inset-x-0 w-full">
       <Notification
         v-slot="{ notifications, close }"
         enter="transform ease-out duration-300 transition"
@@ -167,10 +165,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'"
@@ -183,31 +181,33 @@
                 <span class="font-semibold text-lg">
                   {{ notification.title }}
                 </span>
-                <p class="text-sm mb-2">{{ notification.text }}</p>
+                <p class="text-sm mb-2">
+                  {{ notification.text }}
+                </p>
 
                 <button
                   v-if="notification.onYes"
                   class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                  @click="
+                  @click="{
                     notification.onYes();
                     close(notification.id);
-                  "
+                  }"
                 >
                   Yes{{
-                    notification.yesText ? ", " + notification.yesText : ""
+                    notification.yesText ? ', ' + notification.yesText : ''
                   }}
                 </button>
 
                 <button
                   v-if="notification.onNo"
                   class="block w-full text-center text-md font-bold uppercase bg-yellow-600 text-white px-2 py-2 rounded-md mb-2"
-                  @click="
+                  @click="{
                     notification.onNo(stopAsking);
                     close(notification.id);
                     stopAsking = false; // reset value
-                  "
+                  }"
                 >
-                  No{{ notification.noText ? ", " + notification.noText : "" }}
+                  No{{ notification.noText ? ', ' + notification.noText : '' }}
                 </button>
 
                 <label
@@ -228,25 +228,25 @@
                       class="sr-only"
                     />
                     <!-- line -->
-                    <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+                    <div class="block bg-slate-500 w-14 h-8 rounded-full" />
                     <!-- dot -->
                     <div
                       class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-                    ></div>
+                    />
                   </div>
                 </label>
 
                 <button
                   class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
-                  @click="
+                  @click="{
                     notification.onCancel
                       ? notification.onCancel(stopAsking)
                       : null;
                     close(notification.id);
                     stopAsking = false; // reset value for next time they open this modal
-                  "
+                  }"
                 >
-                  {{ notification.onYes ? "Cancel" : "Close" }}
+                  {{ notification.onYes ? 'Cancel' : 'Close' }}
                 </button>
               </div>
             </div>
@@ -306,10 +306,10 @@
 
                 <button
                   class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md mb-2"
-                  @click="
+                  @click="{
                     close(notification.id);
                     turnOffNotifications(notification);
-                  "
+                  }"
                 >
                   Turn Off Notification
                 </button>
@@ -329,21 +329,21 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
-import { logConsoleAndDb, retrieveSettingsForActiveAccount } from "./db/index";
-import { NotificationIface } from "./constants/app";
-import { logger } from "./utils/logger";
+import { Vue, Component } from 'vue-facing-decorator'
+import { logConsoleAndDb, retrieveSettingsForActiveAccount } from './db/index'
+import { NotificationIface } from './constants/app'
+import { logger } from './utils/logger'
 
 interface Settings {
-  notifyingNewActivityTime?: string;
-  notifyingReminderTime?: string;
+  notifyingNewActivityTime?: string
+  notifyingReminderTime?: string
 }
 
 @Component
 export default class App extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  stopAsking = false;
+  stopAsking = false
 
   // created() {
   //   logger.log(
@@ -382,172 +382,161 @@ export default class App extends Vue {
 
   truncateLongWords(sentence: string) {
     return sentence
-      .split(" ")
-      .map((word) => (word.length > 30 ? word.slice(0, 30) + "..." : word))
-      .join(" ");
+      .split(' ')
+      .map((word) => (word.length > 30 ? word.slice(0, 30) + '...' : word))
+      .join(' ')
   }
 
   async turnOffNotifications(
-    notification: NotificationIface,
+    notification: NotificationIface
   ): Promise<boolean> {
-    logger.log("Starting turnOffNotifications...");
-    let subscription: PushSubscriptionJSON | null = null;
-    let allGoingOff = false;
+    logger.log('Starting turnOffNotifications...')
+    let subscription: PushSubscriptionJSON | null = null
+    let allGoingOff = false
 
     try {
-      logger.log("Retrieving settings for the active account...");
-      const settings: Settings = await retrieveSettingsForActiveAccount();
-      logger.log("Retrieved settings:", settings);
+      logger.log('Retrieving settings for the active account...')
+      const settings: Settings = await retrieveSettingsForActiveAccount()
+      logger.log('Retrieved settings:', settings)
 
-      const notifyingNewActivity = !!settings?.notifyingNewActivityTime;
-      const notifyingReminder = !!settings?.notifyingReminderTime;
+      const notifyingNewActivity = !!settings?.notifyingNewActivityTime
+      const notifyingReminder = !!settings?.notifyingReminderTime
 
       if (!notifyingNewActivity || !notifyingReminder) {
-        allGoingOff = true;
-        logger.log("Both notifications are being turned off.");
+        allGoingOff = true
+        logger.log('Both notifications are being turned off.')
       }
 
-      logger.log("Checking service worker readiness...");
+      logger.log('Checking service worker readiness...')
       await navigator.serviceWorker?.ready
         .then((registration) => {
-          logger.log("Service worker is ready. Fetching subscription...");
-          return registration.pushManager.getSubscription();
+          logger.log('Service worker is ready. Fetching subscription...')
+          return registration.pushManager.getSubscription()
         })
         .then(async (subscript: PushSubscription | null) => {
           if (subscript) {
-            subscription = subscript.toJSON();
-            logger.log("PushSubscription retrieved:", subscription);
+            subscription = subscript.toJSON()
+            logger.log('PushSubscription retrieved:', subscription)
 
             if (allGoingOff) {
-              logger.log("Unsubscribing from push notifications...");
-              await subscript.unsubscribe();
-              logger.log("Successfully unsubscribed.");
+              logger.log('Unsubscribing from push notifications...')
+              await subscript.unsubscribe()
+              logger.log('Successfully unsubscribed.')
             }
           } else {
-            logConsoleAndDb("Subscription object is not available.");
-            logger.log("No subscription found.");
+            logConsoleAndDb('Subscription object is not available.')
+            logger.log('No subscription found.')
           }
         })
         .catch((error) => {
           logConsoleAndDb(
-            "Push provider server communication failed: " +
+            'Push provider server communication failed: ' +
               JSON.stringify(error),
-            true,
-          );
-          logger.error("Error during subscription fetch:", error);
-        });
+            true
+          )
+          logger.error('Error during subscription fetch:', error)
+        })
 
       if (!subscription) {
-        logger.log("No subscription available. Notifying user...");
+        logger.log('No subscription available. Notifying user...')
         this.$notify(
           {
-            group: "alert",
-            type: "info",
-            title: "Finished",
-            text: "Notifications are off.",
+            group: 'alert',
+            type: 'info',
+            title: 'Finished',
+            text: 'Notifications are off.'
           },
-          5000,
-        );
-        logger.log("Exiting as there is no subscription to process.");
-        return true;
+          5000
+        )
+        logger.log('Exiting as there is no subscription to process.')
+        return true
       }
 
       const serverSubscription = {
-        ...subscription,
-      };
+        ...subscription
+      }
       if (!allGoingOff) {
-        serverSubscription["notifyType"] = notification.title;
+        serverSubscription['notifyType'] = notification.title
         logger.log(
-          `Server subscription updated with notifyType: ${notification.title}`,
-        );
+          `Server subscription updated with notifyType: ${notification.title}`
+        )
       }
 
-      logger.log("Sending unsubscribe request to the server...");
-      const pushServerSuccess = await fetch("/web-push/unsubscribe", {
-        method: "POST",
+      logger.log('Sending unsubscribe request to the server...')
+      const pushServerSuccess = await fetch('/web-push/unsubscribe', {
+        method: 'POST',
         headers: {
-          "Content-Type": "application/json",
+          'Content-Type': 'application/json'
         },
-        body: JSON.stringify(serverSubscription),
+        body: JSON.stringify(serverSubscription)
       })
         .then(async (response) => {
           if (!response.ok) {
-            const errorBody = await response.text();
+            const errorBody = await response.text()
             logConsoleAndDb(
               `Push server failed: ${response.status} ${errorBody}`,
-              true,
-            );
-            logger.error("Push server error response:", errorBody);
+              true
+            )
+            logger.error('Push server error response:', errorBody)
           }
-          logger.log(`Server response status: ${response.status}`);
-          return response.ok;
+          logger.log(`Server response status: ${response.status}`)
+          return response.ok
         })
         .catch((error) => {
           logConsoleAndDb(
-            "Push server communication failed: " + JSON.stringify(error),
-            true,
-          );
-          logger.error("Error during server communication:", error);
-          return false;
-        });
+            'Push server communication failed: ' + JSON.stringify(error),
+            true
+          )
+          logger.error('Error during server communication:', error)
+          return false
+        })
 
       const message = pushServerSuccess
-        ? "Notification is off."
-        : "Notification is still on. Try to turn it off again.";
-      logger.log("Server response processed. Message:", message);
+        ? 'Notification is off.'
+        : 'Notification is still on. Try to turn it off again.'
+      logger.log('Server response processed. Message:', message)
 
       this.$notify(
         {
-          group: "alert",
-          type: "info",
-          title: "Finished",
-          text: message,
+          group: 'alert',
+          type: 'info',
+          title: 'Finished',
+          text: message
         },
-        5000,
-      );
+        5000
+      )
 
       if (notification.callback) {
-        logger.log("Executing notification callback...");
-        notification.callback(pushServerSuccess);
+        logger.log('Executing notification callback...')
+        notification.callback(pushServerSuccess)
       }
 
       logger.log(
-        "Completed turnOffNotifications with success:",
-        pushServerSuccess,
-      );
-      return pushServerSuccess;
+        'Completed turnOffNotifications with success:',
+        pushServerSuccess
+      )
+      return pushServerSuccess
     } catch (error) {
       logConsoleAndDb(
-        "Error turning off notifications: " + JSON.stringify(error),
-        true,
-      );
-      logger.error("Critical error in turnOffNotifications:", error);
+        'Error turning off notifications: ' + JSON.stringify(error),
+        true
+      )
+      logger.error('Critical error in turnOffNotifications:', error)
 
       this.$notify(
         {
-          group: "alert",
-          type: "error",
-          title: "Error",
-          text: "Failed to turn off notifications. Please try again.",
+          group: 'alert',
+          type: 'error',
+          title: 'Error',
+          text: 'Failed to turn off notifications. Please try again.'
         },
-        5000,
-      );
+        5000
+      )
 
-      return false;
+      return false
     }
   }
 }
 </script>
 
-<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>
+<style></style>

src/components/ActivityListItem.vue

@@ -29,7 +29,7 @@
 
         <div>
           <h3 class="font-semibold">
-            {{ record.issuer.known ? record.issuer.displayName : "" }}
+            {{ record.issuer.known ? record.issuer.displayName : '' }}
           </h3>
           <p class="ms-auto text-xs text-slate-500 italic">
             {{ friendlyDate }}
@@ -57,7 +57,7 @@
             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)"
+            @load="$emit('cacheImage', record.image)"
           />
         </a>
       </div>
@@ -123,7 +123,7 @@
 
             <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>
 
@@ -182,64 +182,59 @@
 </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";
+import { Component, Prop, Vue } 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,
-  },
+    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;
-  }
+  @Prop() record!: GiveRecordWithContactInfo
+  @Prop() lastViewedClaimId?: string
+  @Prop() isRegistered!: boolean
+  @Prop() activeDid!: string
+  @Prop() confirmerIdList?: string[]
 
   get fetchAmount(): string {
     const claim =
-      (this.record.fullClaim as unknown).claim || this.record.fullClaim;
+      (this.record.fullClaim as unknown).claim || this.record.fullClaim
 
     const amount = claim.object?.amountOfThisGood
       ? this.displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
-      : "";
+      : ''
 
-    return amount;
+    return amount
   }
 
   get description(): string {
     const claim =
-      (this.record.fullClaim as unknown).claim || this.record.fullClaim;
+      (this.record.fullClaim as unknown).claim || this.record.fullClaim
 
-    return `${claim.description}`;
+    return `${claim.description}`
   }
 
   private displayAmount(code: string, amt: number) {
-    return `${amt} ${this.currencyShortWordForCode(code, amt === 1)}`;
+    return `${amt} ${this.currencyShortWordForCode(code, amt === 1)}`
   }
 
   private currencyShortWordForCode(unitCode: string, single: boolean) {
-    return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
+    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;
+    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() {
@@ -247,24 +242,24 @@ export default class ActivityListItem extends Vue {
       notifyWhyCannotConfirm(
         this.$notify,
         this.isRegistered,
-        this.record.fullClaim?.["@type"],
+        this.record.fullClaim?.['@type'],
         this.record,
         this.activeDid,
-        this.confirmerIdList,
-      );
-      return;
+        this.confirmerIdList
+      )
+      return
     }
 
-    this.$emit("confirmClaim", this.record);
+    this.$emit('confirmClaim', this.record)
   }
 
   get friendlyDate(): string {
-    const date = new Date(this.record.issuedAt);
+    const date = new Date(this.record.issuedAt)
     return date.toLocaleDateString(undefined, {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-    });
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric'
+    })
   }
 }
 </script>

src/components/ChoiceButtonDialog.vue

@@ -26,7 +26,9 @@
             >
               <div class="w-full px-6 py-6 text-slate-900 text-center">
                 <span class="font-semibold text-lg">{{ title }}</span>
-                <p class="text-sm mb-2">{{ text }}</p>
+                <p class="text-sm mb-2">
+                  {{ text }}
+                </p>
 
                 <button
                   class="block w-full text-center text-md font-bold capitalize bg-blue-800 text-white px-2 py-2 rounded-md mb-2"
@@ -65,48 +67,48 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { NotificationIface } from "../constants/app";
+import { Component, Vue } from 'vue-facing-decorator'
+import { NotificationIface } from '../constants/app'
 
 @Component
 export default class PromptDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  title = "";
-  text = "";
-  option1Text = "";
-  option2Text = "";
-  option3Text = "";
-  onOption1?: () => void;
-  onOption2?: () => void;
-  onOption3?: () => void;
-  onCancel?: () => Promise<void>;
+  title = ''
+  text = ''
+  option1Text = ''
+  option2Text = ''
+  option3Text = ''
+  onOption1?: () => void
+  onOption2?: () => void
+  onOption3?: () => void
+  onCancel?: () => Promise<void>
 
   open(options: {
-    title: string;
-    text: string;
-    option1Text?: string;
-    option2Text?: string;
-    option3Text?: string;
-    onOption1?: () => void;
-    onOption2?: () => void;
-    onOption3?: () => void;
-    onCancel?: () => Promise<void>;
+    title: string
+    text: string
+    option1Text?: string
+    option2Text?: string
+    option3Text?: string
+    onOption1?: () => void
+    onOption2?: () => void
+    onOption3?: () => void
+    onCancel?: () => Promise<void>
   }) {
-    this.title = options.title;
-    this.text = options.text;
-    this.option1Text = options.option1Text || "";
-    this.option2Text = options.option2Text || "";
-    this.option3Text = options.option3Text || "";
-    this.onOption1 = options.onOption1;
-    this.onOption2 = options.onOption2;
-    this.onOption3 = options.onOption3;
-    this.onCancel = options.onCancel;
+    this.title = options.title
+    this.text = options.text
+    this.option1Text = options.option1Text || ''
+    this.option2Text = options.option2Text || ''
+    this.option3Text = options.option3Text || ''
+    this.onOption1 = options.onOption1
+    this.onOption2 = options.onOption2
+    this.onOption3 = options.onOption3
+    this.onCancel = options.onCancel
 
     this.$notify(
       {
-        group: "customModal",
-        type: "confirm",
+        group: 'customModal',
+        type: 'confirm',
         title: this.title,
         text: this.text,
         option1Text: this.option1Text,
@@ -115,38 +117,38 @@ export default class PromptDialog extends Vue {
         onOption1: this.onOption1,
         onOption2: this.onOption2,
         onOption3: this.onOption3,
-        onCancel: this.onCancel,
+        onCancel: this.onCancel
       } as NotificationIface,
-      -1,
-    );
+      -1
+    )
   }
 
   handleOption1(close: (id: string) => void) {
     if (this.onOption1) {
-      this.onOption1();
+      this.onOption1()
     }
-    close("string that does not matter");
+    close('string that does not matter')
   }
 
   handleOption2(close: (id: string) => void) {
     if (this.onOption2) {
-      this.onOption2();
+      this.onOption2()
     }
-    close("string that does not matter");
+    close('string that does not matter')
   }
 
   handleOption3(close: (id: string) => void) {
     if (this.onOption3) {
-      this.onOption3();
+      this.onOption3()
     }
-    close("string that does not matter");
+    close('string that does not matter')
   }
 
   handleCancel(close: (id: string) => void) {
     if (this.onCancel) {
-      this.onCancel();
+      this.onCancel()
     }
-    close("string that does not matter");
+    close('string that does not matter')
   }
 }
 </script>

src/components/ContactNameDialog.vue

@@ -2,7 +2,9 @@
 <template>
   <div v-if="visible" class="dialog-overlay">
     <div class="dialog">
-      <h1 class="text-xl font-bold text-center mb-4">{{ title }}</h1>
+      <h1 class="text-xl font-bold text-center mb-4">
+        {{ title }}
+      </h1>
       {{ message }}
       Note that their name is only stored on this device.
       <input
@@ -35,43 +37,43 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
+import { Vue, Component } from 'vue-facing-decorator'
 
 @Component
 export default class ContactNameDialog extends Vue {
-  cancelCallback: () => void = () => {};
-  saveCallback: (name?: string) => void = () => {};
-  message = "";
-  newText = "";
-  title = "Contact Name";
-  visible = false;
+  cancelCallback: () => void = () => {}
+  saveCallback: (name?: string) => void = () => {}
+  message = ''
+  newText = ''
+  title = 'Contact Name'
+  visible = false
 
   async open(
     title?: string,
     message?: string,
     saveCallback?: (name?: string) => void,
     cancelCallback?: () => void,
-    defaultName?: string,
+    defaultName?: string
   ) {
-    this.cancelCallback = cancelCallback || this.cancelCallback;
-    this.saveCallback = saveCallback || this.saveCallback;
-    this.message = message ?? this.message;
-    this.newText = defaultName ?? "";
-    this.title = title ?? this.title;
-    this.visible = true;
+    this.cancelCallback = cancelCallback || this.cancelCallback
+    this.saveCallback = saveCallback || this.saveCallback
+    this.message = message ?? this.message
+    this.newText = defaultName ?? ''
+    this.title = title ?? this.title
+    this.visible = true
   }
 
   async onClickSaveChanges() {
-    this.visible = false;
+    this.visible = false
     if (this.saveCallback) {
-      this.saveCallback(this.newText);
+      this.saveCallback(this.newText)
     }
   }
 
   onClickCancel() {
-    this.visible = false;
+    this.visible = false
     if (this.cancelCallback) {
-      this.cancelCallback();
+      this.cancelCallback()
     }
   }
 }

src/components/DataExportSection.vue

@@ -61,15 +61,15 @@ backup and database export, with platform-specific download instructions. * *
 </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 { 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";
+  PlatformCapabilities
+} from '../services/PlatformService'
 
 /**
  * @vue-component
@@ -82,33 +82,33 @@ 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;
+  $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;
+  @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 = "";
+  downloadUrl = ''
 
   /**
    * Platform service instance for platform-specific operations
    */
   private platformService: PlatformService =
-    PlatformServiceFactory.getInstance();
+    PlatformServiceFactory.getInstance()
 
   /**
    * Platform capabilities for the current platform
    */
   private get platformCapabilities(): PlatformCapabilities {
-    return this.platformService.getCapabilities();
+    return this.platformService.getCapabilities()
   }
 
   /**
@@ -117,7 +117,7 @@ export default class DataExportSection extends Vue {
    */
   beforeUnmount() {
     if (this.downloadUrl && this.platformCapabilities.hasFileDownload) {
-      URL.revokeObjectURL(this.downloadUrl);
+      URL.revokeObjectURL(this.downloadUrl)
     }
   }
 
@@ -131,58 +131,45 @@ export default class DataExportSection extends Vue {
    */
   public async exportDatabase() {
     try {
-      const blob = await db.export({
-        prettyJson: true,
-        transform: (table, value, key) => {
-          if (table === "contacts") {
-            // Dexie inserts a number 0 when some are undefined, so we need to totally remove them.
-            Object.keys(value).forEach(prop => {
-              if (value[prop] === undefined) {
-                delete value[prop];
-              }
-            });
-          }
-          return { value, key };
-        },
-      });
-      const fileName = `${db.name}-backup.json`;
+      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);
+        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);
+        const content = await blob.text()
+        await this.platformService.writeAndShareFile(fileName, content)
       }
 
       this.$notify(
         {
-          group: "alert",
-          type: "success",
-          title: "Export Successful",
+          group: 'alert',
+          type: 'success',
+          title: 'Export Successful',
           text: this.platformCapabilities.hasFileDownload
-            ? "See your downloads directory for the backup. It is in the Dexie format."
-            : "You should have been prompted to save your backup file.",
+            ? 'See your downloads directory for the backup. It is in the Dexie format.'
+            : 'Please choose a location to save your backup file.'
         },
-        -1,
-      );
+        -1
+      )
     } catch (error) {
-      logger.error("Export Error:", error);
+      logger.error('Export Error:', error)
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Export Error",
-          text: "There was an error exporting the data.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Export Error',
+          text: 'There was an error exporting the data.'
         },
-        3000,
-      );
+        3000
+      )
     }
   }
 
@@ -192,8 +179,8 @@ export default class DataExportSection extends Vue {
    */
   public computedStartDownloadLinkClassNames() {
     return {
-      hidden: this.downloadUrl && this.platformCapabilities.hasFileDownload,
-    };
+      hidden: this.downloadUrl && this.platformCapabilities.hasFileDownload
+    }
   }
 
   /**
@@ -202,8 +189,8 @@ export default class DataExportSection extends Vue {
    */
   public computedDownloadLinkClassNames() {
     return {
-      hidden: !this.downloadUrl || !this.platformCapabilities.hasFileDownload,
-    };
+      hidden: !this.downloadUrl || !this.platformCapabilities.hasFileDownload
+    }
   }
 }
 </script>

src/components/EntityIcon.vue

@@ -1,40 +1,40 @@
 <template>
   <!-- eslint-disable-next-line vue/no-v-html -->
-  <div class="w-fit" v-html="generateIcon()"></div>
+  <div class="w-fit" v-html="generateIcon()" />
 </template>
 <script lang="ts">
-import { createAvatar, StyleOptions } from "@dicebear/core";
-import { avataaars } from "@dicebear/collection";
-import { Vue, Component, Prop } from "vue-facing-decorator";
-import { Contact } from "../db/tables/contacts";
+import { createAvatar, StyleOptions } from '@dicebear/core'
+import { avataaars } from '@dicebear/collection'
+import { Vue, Component, Prop } from 'vue-facing-decorator'
+import { Contact } from '../db/tables/contacts'
 
 @Component
 export default class EntityIcon extends Vue {
-  @Prop contact: Contact;
-  @Prop entityId = ""; // overridden by contact.did or profileImageUrl
-  @Prop iconSize = 0;
-  @Prop profileImageUrl = ""; // overridden by contact.profileImageUrl
+  @Prop contact: Contact
+  @Prop entityId = '' // overridden by contact.did or profileImageUrl
+  @Prop iconSize = 0
+  @Prop profileImageUrl = '' // overridden by contact.profileImageUrl
 
   generateIcon() {
-    const imageUrl = this.contact?.profileImageUrl || this.profileImageUrl;
+    const imageUrl = this.contact?.profileImageUrl || this.profileImageUrl
     if (imageUrl) {
-      return `<img src="${imageUrl}" class="rounded" width="${this.iconSize}" height="${this.iconSize}" />`;
+      return `<img src="${imageUrl}" class="rounded" width="${this.iconSize}" height="${this.iconSize}" />`
     } else {
-      const identifier = this.contact?.did || this.entityId;
+      const identifier = this.contact?.did || this.entityId
       if (!identifier) {
-        return `<img src="../src/assets/blank-square.svg" class="rounded" width="${this.iconSize}" height="${this.iconSize}" />`;
+        return `<img src="../src/assets/blank-square.svg" class="rounded" width="${this.iconSize}" height="${this.iconSize}" />`
       }
       // https://api.dicebear.com/8.x/avataaars/svg?seed=
       // ... does not render things with the same seed as this library.
       // "did:ethr:0x222BB77E6Ff3774d34c751f3c1260866357B677b" yields a girl with flowers in her hair and a lightning earring
       // ... which looks similar to '' at the dicebear site but which is different.
       const options: StyleOptions<object> = {
-        seed: (identifier as string) || "",
-        size: this.iconSize,
-      };
-      const avatar = createAvatar(avataaars, options);
-      const svgString = avatar.toString();
-      return svgString;
+        seed: (identifier as string) || '',
+        size: this.iconSize
+      }
+      const avatar = createAvatar(avataaars, options)
+      const svgString = avatar.toString()
+      return svgString
     }
   }
 }

src/components/FeedFilters.vue

@@ -22,11 +22,11 @@
               class="sr-only"
             />
             <!-- line -->
-            <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+            <div class="block bg-slate-500 w-14 h-8 rounded-full" />
             <!-- dot -->
             <div
               class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-            ></div>
+            />
           </div>
         </div>
 
@@ -52,11 +52,11 @@
               class="sr-only"
             />
             <!-- line -->
-            <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+            <div class="block bg-slate-500 w-14 h-8 rounded-full" />
             <!-- dot -->
             <div
               class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-            ></div>
+            />
           </div>
           <div v-else class="relative ml-2">
             <button class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500">
@@ -91,101 +91,96 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
-import {
-  LMap,
-  LMarker,
-  LRectangle,
-  LTileLayer,
-} from "@vue-leaflet/vue-leaflet";
-import { Router } from "vue-router";
-import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
-import { db, retrieveSettingsForActiveAccount } from "../db/index";
+import { Vue, Component } from 'vue-facing-decorator'
+import { LMap, LMarker, LRectangle, LTileLayer } from '@vue-leaflet/vue-leaflet'
+import { Router } from 'vue-router'
+import { MASTER_SETTINGS_KEY } from '../db/tables/settings'
+import { db, retrieveSettingsForActiveAccount } from '../db/index'
 
 @Component({
   components: {
     LRectangle,
     LMap,
     LMarker,
-    LTileLayer,
-  },
+    LTileLayer
+  }
 })
 export default class FeedFilters extends Vue {
-  $router!: Router;
-  onCloseIfChanged = () => {};
-  hasSearchBox = false;
-  hasVisibleDid = false;
-  isNearby = false;
-  settingChanged = false;
-  visible = false;
+  $router!: Router
+  onCloseIfChanged = () => {}
+  hasSearchBox = false
+  hasVisibleDid = false
+  isNearby = false
+  settingChanged = false
+  visible = false
 
   async open(onCloseIfChanged: () => void) {
-    this.onCloseIfChanged = onCloseIfChanged;
+    this.onCloseIfChanged = onCloseIfChanged
 
-    const settings = await retrieveSettingsForActiveAccount();
-    this.hasVisibleDid = !!settings.filterFeedByVisible;
-    this.isNearby = !!settings.filterFeedByNearby;
+    const settings = await retrieveSettingsForActiveAccount()
+    this.hasVisibleDid = !!settings.filterFeedByVisible
+    this.isNearby = !!settings.filterFeedByNearby
     if (settings.searchBoxes && settings.searchBoxes.length > 0) {
-      this.hasSearchBox = true;
+      this.hasSearchBox = true
     }
 
-    this.settingChanged = false;
-    this.visible = true;
+    this.settingChanged = false
+    this.visible = true
   }
 
   async toggleHasVisibleDid() {
-    this.settingChanged = true;
-    this.hasVisibleDid = !this.hasVisibleDid;
+    this.settingChanged = true
+    this.hasVisibleDid = !this.hasVisibleDid
     await db.settings.update(MASTER_SETTINGS_KEY, {
-      filterFeedByVisible: this.hasVisibleDid,
-    });
+      filterFeedByVisible: this.hasVisibleDid
+    })
   }
 
   async toggleNearby() {
-    this.settingChanged = true;
-    this.isNearby = !this.isNearby;
+    this.settingChanged = true
+    this.isNearby = !this.isNearby
     await db.settings.update(MASTER_SETTINGS_KEY, {
-      filterFeedByNearby: this.isNearby,
-    });
+      filterFeedByNearby: this.isNearby
+    })
   }
 
   async clearAll() {
     if (this.hasVisibleDid || this.isNearby) {
-      this.settingChanged = true;
+      this.settingChanged = true
     }
 
     await db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: false,
-      filterFeedByVisible: false,
-    });
+      filterFeedByVisible: false
+    })
 
-    this.hasVisibleDid = false;
-    this.isNearby = false;
+    this.hasVisibleDid = false
+    this.isNearby = false
   }
 
   async setAll() {
     if (!this.hasVisibleDid || !this.isNearby) {
-      this.settingChanged = true;
+      this.settingChanged = true
     }
 
     await db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: true,
-      filterFeedByVisible: true,
-    });
+      filterFeedByVisible: true
+    })
 
-    this.hasVisibleDid = true;
-    this.isNearby = true;
+    this.hasVisibleDid = true
+    this.isNearby = true
   }
 
   close() {
     if (this.settingChanged) {
-      this.onCloseIfChanged();
+      this.onCloseIfChanged()
     }
-    this.visible = false;
+    this.visible = false
   }
 
   done() {
-    this.close();
+    this.close()
   }
 }
 </script>

src/components/GiftedDialog.vue

@@ -51,8 +51,8 @@
                 providerProjectId: fromProjectId,
                 recipientDid: receiver?.did,
                 recipientName: receiver?.name,
-                unitCode,
-              },
+                unitCode
+              }
             }"
             class="text-blue-500"
           >
@@ -87,44 +87,44 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component, Prop } from "vue-facing-decorator";
+import { Vue, Component, Prop } from 'vue-facing-decorator'
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface } from '../constants/app'
 import {
   createAndSubmitGive,
   didInfo,
-  serverMessageForUser,
-} from "../libs/endorserServer";
-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";
+  serverMessageForUser
+} from '../libs/endorserServer'
+import * as libsUtil from '../libs/util'
+import { db, retrieveSettingsForActiveAccount } from '../db/index'
+import { Contact } from '../db/tables/contacts'
+import { retrieveAccountDids } from '../libs/util'
 
 @Component
 export default class GiftedDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  @Prop() fromProjectId = "";
-  @Prop() toProjectId = "";
+  @Prop() fromProjectId = ''
+  @Prop() toProjectId = ''
 
-  activeDid = "";
-  allContacts: Array<Contact> = [];
-  allMyDids: Array<string> = [];
-  apiServer = "";
+  activeDid = ''
+  allContacts: Array<Contact> = []
+  allMyDids: Array<string> = []
+  apiServer = ''
 
-  amountInput = "0";
-  callbackOnSuccess?: (amount: number) => void = () => {};
-  customTitle?: string;
-  description = "";
-  giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
-  offerId = "";
-  prompt = "";
-  receiver?: libsUtil.GiverReceiverInputInfo;
-  unitCode = "HUR";
-  visible = false;
+  amountInput = '0'
+  callbackOnSuccess?: (amount: number) => void = () => {}
+  customTitle?: string
+  description = ''
+  giver?: libsUtil.GiverReceiverInputInfo // undefined means no identified giver agent
+  isTrade = false
+  offerId = ''
+  prompt = ''
+  receiver?: libsUtil.GiverReceiverInputInfo
+  unitCode = 'HUR'
+  visible = false
 
-  libsUtil = libsUtil;
+  libsUtil = libsUtil
 
   async open(
     giver?: libsUtil.GiverReceiverInputInfo,
@@ -132,146 +132,143 @@ export default class GiftedDialog extends Vue {
     offerId?: string,
     customTitle?: string,
     prompt?: string,
-    callbackOnSuccess: (amount: number) => void = () => {},
+    callbackOnSuccess: (amount: number) => void = () => {}
   ) {
-    this.customTitle = customTitle;
-    this.giver = giver;
-    this.prompt = prompt || "";
-    this.receiver = receiver;
+    this.customTitle = customTitle
+    this.giver = giver
+    this.prompt = prompt || ''
+    this.receiver = receiver
     // if we show "given to user" selection, default checkbox to true
-    this.amountInput = "0";
-    this.callbackOnSuccess = callbackOnSuccess;
-    this.offerId = offerId || "";
+    this.amountInput = '0'
+    this.callbackOnSuccess = callbackOnSuccess
+    this.offerId = offerId || ''
 
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+      const settings = await retrieveSettingsForActiveAccount()
+      this.apiServer = settings.apiServer || ''
+      this.activeDid = settings.activeDid || ''
 
-      this.allContacts = await db.contacts.toArray();
+      this.allContacts = await db.contacts.toArray()
 
-      this.allMyDids = await retrieveAccountDids();
+      this.allMyDids = await retrieveAccountDids()
 
       if (this.giver && !this.giver.name) {
         this.giver.name = didInfo(
           this.giver.did,
           this.activeDid,
           this.allMyDids,
-          this.allContacts,
-        );
+          this.allContacts
+        )
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      logger.error("Error retrieving settings from database:", err);
+      logger.error('Error retrieving settings from database:', err)
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: err.message || 'There was an error retrieving your settings.'
         },
-        -1,
-      );
+        -1
+      )
     }
 
-    this.visible = true;
+    this.visible = true
   }
 
   close() {
     // close the dialog but don't change values (since it might be submitting info)
-    this.visible = false;
+    this.visible = false
   }
 
   changeUnitCode() {
-    const units = Object.keys(this.libsUtil.UNIT_SHORT);
-    const index = units.indexOf(this.unitCode);
-    this.unitCode = units[(index + 1) % units.length];
+    const units = Object.keys(this.libsUtil.UNIT_SHORT)
+    const index = units.indexOf(this.unitCode)
+    this.unitCode = units[(index + 1) % units.length]
   }
 
   increment() {
-    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
+    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`
   }
 
   decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
+    this.amountInput = `${Math.max(0, (parseFloat(this.amountInput) || 1) - 1)}`
   }
 
   cancel() {
-    this.close();
-    this.eraseValues();
+    this.close()
+    this.eraseValues()
   }
 
   eraseValues() {
-    this.description = "";
-    this.giver = undefined;
-    this.amountInput = "0";
-    this.prompt = "";
-    this.unitCode = "HUR";
+    this.description = ''
+    this.giver = undefined
+    this.amountInput = '0'
+    this.prompt = ''
+    this.unitCode = 'HUR'
   }
 
   async confirm() {
     if (!this.activeDid) {
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identifier before you can record a give.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: 'You must select an identifier before you can record a give.'
         },
-        3000,
-      );
-      return;
+        3000
+      )
+      return
     }
     if (parseFloat(this.amountInput) < 0) {
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          text: "You may not send a negative number.",
-          title: "",
+          group: 'alert',
+          type: 'danger',
+          text: 'You may not send a negative number.',
+          title: ''
         },
-        2000,
-      );
-      return;
+        2000
+      )
+      return
     }
     if (!this.description && !parseFloat(this.amountInput)) {
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
           text: `You must enter a description or some number of ${
             this.libsUtil.UNIT_LONG[this.unitCode]
-          }.`,
+          }.`
         },
-        2000,
-      );
-      return;
+        2000
+      )
+      return
     }
 
-    this.close();
+    this.close()
     this.$notify(
       {
-        group: "alert",
-        type: "toast",
-        text: "Recording the give...",
-        title: "",
+        group: 'alert',
+        type: 'toast',
+        text: 'Recording the give...',
+        title: ''
       },
-      1000,
-    );
+      1000
+    )
     // this is asynchronous, but we don't need to wait for it to complete
     await this.recordGive(
       (this.giver?.did as string) || null,
       (this.receiver?.did as string) || null,
       this.description,
       parseFloat(this.amountInput),
-      this.unitCode,
+      this.unitCode
     ).then(() => {
-      this.eraseValues();
-    });
+      this.eraseValues()
+    })
   }
 
   /**
@@ -287,7 +284,7 @@ export default class GiftedDialog extends Vue {
     recipientDid: string | null,
     description: string,
     amount: number,
-    unitCode: string = "HUR",
+    unitCode: string = 'HUR'
   ) {
     try {
       const result = await createAndSubmitGive(
@@ -301,56 +298,56 @@ export default class GiftedDialog extends Vue {
         unitCode,
         this.toProjectId,
         this.offerId,
-        false,
+        this.isTrade,
         undefined,
-        this.fromProjectId,
-      );
+        this.fromProjectId
+      )
 
       if (
-        result.type === "error" ||
+        result.type === 'error' ||
         this.isGiveCreationError(result.response)
       ) {
-        const errorMessage = this.getGiveCreationErrorMessage(result);
-        logger.error("Error with give creation result:", result);
+        const errorMessage = this.getGiveCreationErrorMessage(result)
+        logger.error('Error with give creation result:', result)
         this.$notify(
           {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the give.",
+            group: 'alert',
+            type: 'danger',
+            title: 'Error',
+            text: errorMessage || 'There was an error creating the give.'
           },
-          -1,
-        );
+          -1
+        )
       } else {
         this.$notify(
           {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: `That gift was recorded.`,
+            group: 'alert',
+            type: 'success',
+            title: 'Success',
+            text: `That ${this.isTrade ? 'trade' : 'gift'} was recorded.`
           },
-          7000,
-        );
+          7000
+        )
         if (this.callbackOnSuccess) {
-          this.callbackOnSuccess(amount);
+          this.callbackOnSuccess(amount)
         }
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      logger.error("Error with give recordation caught:", error);
+      logger.error('Error with give recordation caught:', error)
       const errorMessage =
         error.userMessage ||
         serverMessageForUser(error) ||
-        "There was an error recording the give.";
+        'There was an error recording the give.'
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: errorMessage,
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: errorMessage
         },
-        -1,
-      );
+        -1
+      )
     }
   }
 
@@ -362,7 +359,7 @@ export default class GiftedDialog extends Vue {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   isGiveCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
+    return result.status !== 201 || result.data?.error
   }
 
   /**
@@ -375,19 +372,19 @@ export default class GiftedDialog extends Vue {
       result.error?.userMessage ||
       result.error?.error ||
       result.response?.data?.error?.message
-    );
+    )
   }
 
   explainData() {
     this.$notify(
       {
-        group: "alert",
-        type: "success",
-        title: "Data Sharing",
-        text: libsUtil.PRIVACY_MESSAGE,
+        group: 'alert',
+        type: 'success',
+        title: 'Data Sharing',
+        text: libsUtil.PRIVACY_MESSAGE
       },
-      -1,
-    );
+      -1
+    )
   }
 }
 </script>

src/components/GiftedPrompts.vue

@@ -7,7 +7,7 @@
           class="text-lg text-center p-2 leading-none absolute right-0 -top-1"
           @click="cancel"
         >
-          <font-awesome icon="xmark" class="w-[1em]"></font-awesome>
+          <font-awesome icon="xmark" class="w-[1em]" />
         </div>
       </h1>
       <span class="mt-2 flex justify-between">
@@ -71,92 +71,92 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
-import { Router } from "vue-router";
+import { Vue, Component } from 'vue-facing-decorator'
+import { Router } from 'vue-router'
 
-import { AppString, NotificationIface } from "../constants/app";
-import { db } from "../db/index";
-import { Contact } from "../db/tables/contacts";
-import { GiverReceiverInputInfo } from "../libs/util";
+import { AppString, NotificationIface } from '../constants/app'
+import { db } from '../db/index'
+import { Contact } from '../db/tables/contacts'
+import { GiverReceiverInputInfo } from '../libs/util'
 
 @Component
 export default class GivenPrompts extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-  $router!: Router;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
+  $router!: Router
 
-  CATEGORY_CONTACTS = 1;
-  CATEGORY_IDEAS = 0;
+  CATEGORY_CONTACTS = 1
+  CATEGORY_IDEAS = 0
   IDEAS = [
-    "What food did someone make? (How did it free up your time for something? Was something doable because it eased your stress?)",
-    "What did a family member do? (How did you take better action because it made you feel loved?)",
-    "What compliment did someone give you? (What task could you tackle because it boosted your confidence?)",
-    "Who is someone you can always rely on, and how did they demonstrate that? (What project tasks were enabled because you could depend on them?)",
-    "What did you see someone give to someone else? (What is the effect of the positivity you gained from seeing that?)",
-    "What is a way that someone helped you even though you have never met? (What different action did you take due to that newfound perspective or inspiration?)",
-    "How did a musician or author or artist inspire you? (What were you motivated to do more creatively because of that?)",
-    "What inspiration did you get from someone who handled tragedy well? (What could you accomplish with better grace or resilience after seeing their example?)",
-    "What is something worth respect that an organization gave you? (How did their contribution improve the situation or enable new activities?)",
-    "Who last gave you a good laugh? (What kind of bond or revitalization did that bring to a situation?)",
-    "What do you recall someone giving you while you were young? (How did it bring excitement or teach a skill or ignite a passion that resulted in improvements in your life?)",
-    "Who forgave you or overlooked a mistake? (How did that free you or build trust that enabled better relationships?)",
-    "What is a way an ancestor contributed to your life? (What in your life is now possible because of their efforts? What challenges are you undertaking knowing of their lives?)",
-    "What kind of help did someone at work give you? (How did that help with team progress? How did that lift your professional growth?)",
-    "How did a teacher or mentor or great example help you? (How did their guidance enhance your attitude or actions?)",
-    "What is a surprise gift you received? (What extra possibilities did it give you?)",
-  ];
+    'What food did someone make? (How did it free up your time for something? Was something doable because it eased your stress?)',
+    'What did a family member do? (How did you take better action because it made you feel loved?)',
+    'What compliment did someone give you? (What task could you tackle because it boosted your confidence?)',
+    'Who is someone you can always rely on, and how did they demonstrate that? (What project tasks were enabled because you could depend on them?)',
+    'What did you see someone give to someone else? (What is the effect of the positivity you gained from seeing that?)',
+    'What is a way that someone helped you even though you have never met? (What different action did you take due to that newfound perspective or inspiration?)',
+    'How did a musician or author or artist inspire you? (What were you motivated to do more creatively because of that?)',
+    'What inspiration did you get from someone who handled tragedy well? (What could you accomplish with better grace or resilience after seeing their example?)',
+    'What is something worth respect that an organization gave you? (How did their contribution improve the situation or enable new activities?)',
+    'Who last gave you a good laugh? (What kind of bond or revitalization did that bring to a situation?)',
+    'What do you recall someone giving you while you were young? (How did it bring excitement or teach a skill or ignite a passion that resulted in improvements in your life?)',
+    'Who forgave you or overlooked a mistake? (How did that free you or build trust that enabled better relationships?)',
+    'What is a way an ancestor contributed to your life? (What in your life is now possible because of their efforts? What challenges are you undertaking knowing of their lives?)',
+    'What kind of help did someone at work give you? (How did that help with team progress? How did that lift your professional growth?)',
+    'How did a teacher or mentor or great example help you? (How did their guidance enhance your attitude or actions?)',
+    'What is a surprise gift you received? (What extra possibilities did it give you?)'
+  ]
 
   callbackOnFullGiftInfo?: (
     contactInfo?: GiverReceiverInputInfo,
-    description?: string,
-  ) => void;
-  currentCategory = this.CATEGORY_IDEAS; // 0 = IDEAS, 1 = CONTACTS
-  currentContact: Contact | undefined = undefined;
-  currentIdeaIndex = 0;
-  numContacts = 0;
-  shownContactDbIndices: Array<boolean> = [];
-  visible = false;
+    description?: string
+  ) => void
+  currentCategory = this.CATEGORY_IDEAS // 0 = IDEAS, 1 = CONTACTS
+  currentContact: Contact | undefined = undefined
+  currentIdeaIndex = 0
+  numContacts = 0
+  shownContactDbIndices: Array<boolean> = []
+  visible = false
 
-  AppString = AppString;
+  AppString = AppString
 
   async open(
     callbackOnFullGiftInfo?: (
       contactInfo?: GiverReceiverInputInfo,
-      description?: string,
-    ) => void,
+      description?: string
+    ) => void
   ) {
-    this.visible = true;
-    this.callbackOnFullGiftInfo = callbackOnFullGiftInfo;
+    this.visible = true
+    this.callbackOnFullGiftInfo = callbackOnFullGiftInfo
 
-    await db.open();
-    this.numContacts = await db.contacts.count();
-    this.shownContactDbIndices = new Array<boolean>(this.numContacts); // all undefined to start
+    await db.open()
+    this.numContacts = await db.contacts.count()
+    this.shownContactDbIndices = new Array<boolean>(this.numContacts) // all undefined to start
   }
 
   cancel() {
-    this.currentCategory = this.CATEGORY_IDEAS;
-    this.currentContact = undefined;
-    this.currentIdeaIndex = 0;
-    this.numContacts = 0;
-    this.shownContactDbIndices = [];
+    this.currentCategory = this.CATEGORY_IDEAS
+    this.currentContact = undefined
+    this.currentIdeaIndex = 0
+    this.numContacts = 0
+    this.shownContactDbIndices = []
 
-    this.visible = false;
+    this.visible = false
   }
 
   proceed() {
     // proceed with logic but don't change values (just in case some actions are added later)
-    this.visible = false;
+    this.visible = false
     if (this.currentCategory === this.CATEGORY_IDEAS) {
       this.$router.push({
-        name: "contact-gift",
+        name: 'contact-gift',
         query: {
-          prompt: this.IDEAS[this.currentIdeaIndex],
-        },
-      });
+          prompt: this.IDEAS[this.currentIdeaIndex]
+        }
+      })
     } else {
       // must be this.CATEGORY_CONTACTS
       this.callbackOnFullGiftInfo?.(
-        this.currentContact as GiverReceiverInputInfo,
-      );
+        this.currentContact as GiverReceiverInputInfo
+      )
     }
   }
 
@@ -167,14 +167,14 @@ export default class GivenPrompts extends Vue {
   async nextIdea() {
     // check if the next one is an idea or a contact
     if (this.currentCategory === this.CATEGORY_IDEAS) {
-      this.currentIdeaIndex++;
+      this.currentIdeaIndex++
       if (this.currentIdeaIndex === this.IDEAS.length) {
         // must have just finished ideas so move to contacts
-        this.findNextUnshownContact();
+        this.findNextUnshownContact()
       }
     } else {
       // must be this.CATEGORY_CONTACTS
-      this.findNextUnshownContact();
+      this.findNextUnshownContact()
       // when that's finished, it'll reset to ideas
     }
   }
@@ -186,54 +186,52 @@ export default class GivenPrompts extends Vue {
   async prevIdea() {
     // check if the next one is an idea or a contact
     if (this.currentCategory === this.CATEGORY_IDEAS) {
-      this.currentIdeaIndex--;
+      this.currentIdeaIndex--
       if (this.currentIdeaIndex < 0) {
         // must have just finished ideas so move to contacts
-        this.findNextUnshownContact();
+        this.findNextUnshownContact()
       }
     } else {
       // must be this.CATEGORY_CONTACTS
-      this.findNextUnshownContact();
+      this.findNextUnshownContact()
       // when that's finished, it'll reset to ideas
     }
   }
 
   nextIdeaPastContacts() {
-    this.currentContact = undefined;
-    this.shownContactDbIndices = new Array<boolean>(this.numContacts);
+    this.currentContact = undefined
+    this.shownContactDbIndices = new Array<boolean>(this.numContacts)
 
-    this.currentCategory = this.CATEGORY_IDEAS;
+    this.currentCategory = this.CATEGORY_IDEAS
     // look at the previous idea and switch to the other side of the list
     this.currentIdeaIndex =
-      this.currentIdeaIndex >= this.IDEAS.length ? 0 : this.IDEAS.length - 1;
+      this.currentIdeaIndex >= this.IDEAS.length ? 0 : this.IDEAS.length - 1
   }
 
   async findNextUnshownContact() {
     if (this.currentCategory === this.CATEGORY_IDEAS) {
       // we're not in the contact prompts, so reset index array
-      this.shownContactDbIndices = new Array<boolean>(this.numContacts);
+      this.shownContactDbIndices = new Array<boolean>(this.numContacts)
     }
-    this.currentCategory = this.CATEGORY_CONTACTS;
+    this.currentCategory = this.CATEGORY_CONTACTS
 
-    let someContactDbIndex = Math.floor(Math.random() * this.numContacts);
-    let count = 0;
+    let someContactDbIndex = Math.floor(Math.random() * this.numContacts)
+    let count = 0
     // as long as the index has an entry, loop
     while (
       this.shownContactDbIndices[someContactDbIndex] != null &&
       count++ < this.numContacts
     ) {
-      someContactDbIndex = (someContactDbIndex + 1) % this.numContacts;
+      someContactDbIndex = (someContactDbIndex + 1) % this.numContacts
     }
     if (count >= this.numContacts) {
       // all contacts have been shown
-      this.nextIdeaPastContacts();
+      this.nextIdeaPastContacts()
     } else {
       // get the contact at that offset
-      await db.open();
-      this.currentContact = await db.contacts
-        .offset(someContactDbIndex)
-        .first();
-      this.shownContactDbIndices[someContactDbIndex] = true;
+      await db.open()
+      this.currentContact = await db.contacts.offset(someContactDbIndex).first()
+      this.shownContactDbIndices[someContactDbIndex] = true
     }
   }
 }

src/components/HiddenDidDialog.vue

@@ -100,33 +100,33 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import * as R from "ramda";
-import { useClipboard } from "@vueuse/core";
-import { Contact } from "../db/tables/contacts";
-import * as serverUtil from "../libs/endorserServer";
-import { NotificationIface } from "../constants/app";
+import { Component, Vue } from 'vue-facing-decorator'
+import * as R from 'ramda'
+import { useClipboard } from '@vueuse/core'
+import { Contact } from '../db/tables/contacts'
+import * as serverUtil from '../libs/endorserServer'
+import { NotificationIface } from '../constants/app'
 
 @Component
 export default class HiddenDidDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  isOpen = false;
-  roleName = "";
-  visibleToDids: string[] = [];
-  allContacts: Array<Contact> = [];
-  activeDid = "";
-  allMyDids: Array<string> = [];
-  canShare = false;
-  windowLocation = window.location.href;
+  isOpen = false
+  roleName = ''
+  visibleToDids: string[] = []
+  allContacts: Array<Contact> = []
+  activeDid = ''
+  allMyDids: Array<string> = []
+  canShare = false
+  windowLocation = window.location.href
 
-  R = R;
-  serverUtil = serverUtil;
+  R = R
+  serverUtil = serverUtil
 
   created() {
     // When Chrome compatibility is fixed https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
     // then use this truer check: navigator.canShare && navigator.canShare()
-    this.canShare = !!navigator.share;
+    this.canShare = !!navigator.share
   }
 
   open(
@@ -134,18 +134,18 @@ export default class HiddenDidDialog extends Vue {
     visibleToDids: string[],
     allContacts: Array<Contact>,
     activeDid: string,
-    allMyDids: Array<string>,
+    allMyDids: Array<string>
   ) {
-    this.roleName = roleName;
-    this.visibleToDids = visibleToDids;
-    this.allContacts = allContacts;
-    this.activeDid = activeDid;
-    this.allMyDids = allMyDids;
-    this.isOpen = true;
+    this.roleName = roleName
+    this.visibleToDids = visibleToDids
+    this.allContacts = allContacts
+    this.activeDid = activeDid
+    this.allMyDids = allMyDids
+    this.isOpen = true
   }
 
   close() {
-    this.isOpen = false;
+    this.isOpen = false
   }
 
   didInfo(did: string) {
@@ -153,8 +153,8 @@ export default class HiddenDidDialog extends Vue {
       did,
       this.activeDid,
       this.allMyDids,
-      this.allContacts,
-    );
+      this.allContacts
+    )
   }
 
   copyToClipboard(name: string, text: string) {
@@ -163,23 +163,23 @@ export default class HiddenDidDialog extends Vue {
       .then(() => {
         this.$notify(
           {
-            group: "alert",
-            type: "toast",
-            title: "Copied",
-            text: (name || "That") + " was copied to the clipboard.",
+            group: 'alert',
+            type: 'toast',
+            title: 'Copied',
+            text: (name || 'That') + ' was copied to the clipboard.'
           },
-          2000,
-        );
-      });
+          2000
+        )
+      })
   }
 
   onClickShareClaim() {
-    this.copyToClipboard("A link to this page", this.windowLocation);
+    this.copyToClipboard('A link to this page', this.windowLocation)
     window.navigator.share({
-      title: "Help Connect Me",
+      title: 'Help Connect Me',
       text: "I'm trying to find the people who recorded this. Can you help me?",
-      url: this.windowLocation,
-    });
+      url: this.windowLocation
+    })
   }
 }
 </script>

src/components/ImageMethodDialog.vue

@@ -1,678 +1,157 @@
 <template>
   <div v-if="visible" class="dialog-overlay z-[60]">
     <div class="dialog relative">
-      <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 class="text-lg text-center font-light relative z-50">
         <div
-          class="text-2xl text-center px-1 py-0.5 leading-none absolute -right-1 top-0"
+          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"
           @click="close()"
         >
-          <font-awesome icon="xmark" class="w-[1em]"></font-awesome>
+          <font-awesome icon="xmark" class="w-[1em]" />
         </div>
       </div>
 
-      <!-- FEEDBACK: Show if camera preview is not visible after mounting -->
-      <div
-        v-if="!showCameraPreview && !blob && isRegistered"
-        class="bg-red-100 text-red-700 border border-red-400 rounded px-4 py-3 my-4 text-sm"
-      >
-        <strong>Camera preview not started.</strong>
-        <div v-if="cameraState === 'off'">
-          <span v-if="platformCapabilities.isMobile">
-            <b>Note:</b> This mobile browser may not support direct camera
-            access, or the app is treating it as a native app.<br />
-            <b>Tip:</b> Try using a desktop browser, or check if your browser
-            supports camera access for web apps.<br />
-            <b>Developer:</b> The platform detection logic may be skipping
-            camera preview for mobile browsers. <br />
-            <b>Action:</b> Review <code>platformCapabilities.isMobile</code> and
-            ensure web browsers on mobile are not treated as native apps.
-          </span>
-          <span v-else>
-            <b>Tip:</b> Your browser supports camera APIs, but the preview did
-            not start. Try refreshing the page or checking browser permissions.
-          </span>
-        </div>
-        <div v-else-if="cameraState === 'error'">
-          <b>Error:</b> {{ error || cameraStateMessage }}
-        </div>
-        <div v-else>
-          <b>Status:</b> {{ cameraStateMessage || "Unknown reason." }}
-        </div>
-      </div>
-
-      <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"
-            >
-              <!-- Diagnostic Panel -->
-              <div
-                v-if="showDiagnostics"
-                class="absolute top-0 left-0 right-0 bg-black/80 text-white text-xs p-2 pt-8 z-20 overflow-auto max-h-[50vh]"
-              >
-                <div class="grid grid-cols-2 gap-2">
-                  <div>
-                    <p><strong>Camera State:</strong> {{ cameraState }}</p>
-                    <p>
-                      <strong>State Message:</strong>
-                      {{ cameraStateMessage || "None" }}
-                    </p>
-                    <p><strong>Error:</strong> {{ error || "None" }}</p>
-                    <p>
-                      <strong>Preview Active:</strong>
-                      {{ showCameraPreview ? "Yes" : "No" }}
-                    </p>
-                    <p>
-                      <strong>Stream Active:</strong>
-                      {{ !!cameraStream ? "Yes" : "No" }}
-                    </p>
-                  </div>
-                  <div>
-                    <p><strong>Browser:</strong> {{ userAgent }}</p>
-                    <p>
-                      <strong>HTTPS:</strong>
-                      {{ isSecureContext ? "Yes" : "No" }}
-                    </p>
-                    <p>
-                      <strong>MediaDevices:</strong>
-                      {{ hasMediaDevices ? "Yes" : "No" }}
-                    </p>
-                    <p>
-                      <strong>GetUserMedia:</strong>
-                      {{ hasGetUserMedia ? "Yes" : "No" }}
-                    </p>
-                    <p>
-                      <strong>Platform:</strong>
-                      {{ platformCapabilities.isMobile ? "Mobile" : "Desktop" }}
-                    </p>
-                  </div>
-                </div>
-              </div>
-
-              <!-- Toggle Diagnostics Button -->
-              <button
-                class="absolute top-2 right-2 bg-black/50 text-white px-2 py-1 rounded text-xs z-30"
-                @click="toggleDiagnostics"
-              >
-                {{ showDiagnostics ? "Hide Diagnostics" : "Show Diagnostics" }}
-              </button>
-              <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"
-                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"
-              >
-                <font-awesome icon="check" class="fa-fw" />
-              </button>
-            </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 v-else>
-            <div v-if="uploading" class="flex justify-center">
+          <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
-                icon="spinner"
-                class="fa-spin fa-3x text-center block px-12 py-12"
+                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"
+                @click="acceptUrl"
               />
-            </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-[50vh] max-w-[90vw] object-contain"
-                />
-              </div>
-              <div v-else>
-                <div class="flex justify-center">
-                  <img
-                    :src="createBlobURL(blob)"
-                    class="mt-2 rounded max-h-[50vh] 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>
+              <!-- 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>
           </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>
   </div>
+  <PhotoDialog ref="photoDialog" />
 </template>
 
 <script lang="ts">
-import axios from "axios";
-import { ref } from "vue";
-import { Component, Vue } from "vue-facing-decorator";
-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";
+import axios from 'axios'
+import { ref } from 'vue'
+import { Component, Vue } from 'vue-facing-decorator'
 
-const inputImageFileNameRef = ref<Blob>();
+import PhotoDialog from '../components/PhotoDialog.vue'
+import { NotificationIface } from '../constants/app'
+
+const inputImageFileNameRef = ref<Blob>()
 
 @Component({
-  components: { VuePictureCropper },
-  props: {
-    isRegistered: {
-      type: Boolean,
-      default: true,
-    },
-  },
+  components: { PhotoDialog }
 })
 export default class ImageMethodDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  /** 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();
-
-  // Add diagnostic properties
-  showDiagnostics = false;
-  userAgent = navigator.userAgent;
-  isSecureContext = window.isSecureContext;
-  hasMediaDevices = !!navigator.mediaDevices;
-  hasGetUserMedia = !!(
-    navigator.mediaDevices && navigator.mediaDevices.getUserMedia
-  );
-  cameraState:
-    | "off"
-    | "initializing"
-    | "ready"
-    | "active"
-    | "error"
-    | "permission_denied"
-    | "not_found"
-    | "in_use" = "off";
-  cameraStateMessage?: string;
-  error: string | null = null;
-
-  /**
-   * Lifecycle hook: Initializes component and retrieves user settings
-   * @throws {Error} When settings retrieval fails
-   */
-  async mounted() {
-    logger.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();
-  }
+  claimType: string
+  crop: boolean = false
+  imageCallback: (imageUrl?: string) => void = () => {}
+  imageUrl?: string
+  visible = false
 
   open(setImageFn: (arg: string) => void, claimType: string, crop?: boolean) {
-    this.claimType = claimType;
-    this.crop = !!crop;
-    this.imageCallback = setImageFn;
-    this.visible = true;
+    this.claimType = claimType
+    this.crop = !!crop
+    this.imageCallback = setImageFn
 
-    // Start camera preview immediately if not on mobile
-    if (!this.platformCapabilities.isNativeApp) {
-      this.startCameraPreview();
-    }
+    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
+    )
   }
 
   async uploadImageFile(event: Event) {
-    const target = event.target as HTMLInputElement;
-    if (!target.files) return;
+    this.visible = false
 
-    inputImageFileNameRef.value = target.files[0];
-    const file = inputImageFileNameRef.value;
+    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
+    const file = inputImageFileNameRef.value
     if (file != null) {
-      const reader = new FileReader();
+      const reader = new FileReader()
       reader.onload = async (e) => {
-        const data = e.target?.result as ArrayBuffer;
+        const data = e.target?.result as ArrayBuffer
         if (data) {
           const blob = new Blob([new Uint8Array(data)], {
-            type: file.type,
-          });
-          this.blob = blob;
-          this.fileName = file.name;
-          this.showRetry = false;
+            type: file.type
+          })
+          this.openPhotoDialog(blob, file.name as string)
         }
-      };
-      reader.readAsArrayBuffer(file as Blob);
+      }
+      reader.readAsArrayBuffer(file as Blob)
     }
   }
 
   async acceptUrl() {
+    this.visible = false
     if (this.crop) {
       try {
-        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.blob = urlBlobResponse.data as Blob;
-        this.fileName = fileName;
-        this.showRetry = false;
+        const urlBlobResponse: Blob = await axios.get(this.imageUrl as string, {
+          responseType: 'blob' // This ensures the data is returned as a 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
+        )
       } catch (error) {
         this.$notify(
           {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was an error retrieving that image.",
+            group: 'alert',
+            type: 'danger',
+            title: 'Error',
+            text: 'There was an error retrieving that image.'
           },
-          5000,
-        );
+          5000
+        )
       }
     } else {
-      this.imageCallback(this.imageUrl);
-      this.close();
+      this.imageCallback(this.imageUrl)
     }
   }
 
   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.isNativeApp) {
-      logger.debug("Using platform service for mobile device");
-      this.cameraState = "initializing";
-      this.cameraStateMessage = "Using platform camera service...";
-      try {
-        const result = await this.platformService.takePicture();
-        this.blob = result.blob;
-        this.fileName = result.fileName;
-        this.cameraState = "ready";
-        this.cameraStateMessage = "Photo captured successfully";
-      } catch (error) {
-        logger.error("Error taking picture:", error);
-        this.cameraState = "error";
-        this.cameraStateMessage =
-          error instanceof Error ? error.message : "Failed to take picture";
-        this.error =
-          error instanceof Error ? error.message : "Failed to take picture";
-        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.cameraState = "initializing";
-      this.cameraStateMessage = "Requesting camera access...";
-      this.showCameraPreview = true;
-      await this.$nextTick();
-
-      const stream = await navigator.mediaDevices.getUserMedia({
-        video: { facingMode: "environment" },
-      });
-      logger.debug("Camera access granted");
-      this.cameraStream = stream;
-      this.cameraState = "active";
-      this.cameraStateMessage = "Camera is active";
-
-      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);
-      let errorMessage =
-        error instanceof Error ? error.message : "Failed to access camera";
-      if (
-        error.name === "NotReadableError" ||
-        error.name === "TrackStartError"
-      ) {
-        errorMessage =
-          "Camera is in use by another application. Please close any other apps or browser tabs using the camera and try again.";
-      } else if (
-        error.name === "NotAllowedError" ||
-        error.name === "PermissionDeniedError"
-      ) {
-        errorMessage =
-          "Camera access was denied. Please allow camera access in your browser settings.";
-      }
-      this.cameraState = "error";
-      this.cameraStateMessage = errorMessage;
-      this.error = errorMessage;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: errorMessage,
-        },
-        5000,
-      );
-      this.showCameraPreview = false;
-    }
-  }
-
-  stopCameraPreview() {
-    if (this.cameraStream) {
-      this.cameraStream.getTracks().forEach((track) => track.stop());
-      this.cameraStream = null;
-    }
-    this.showCameraPreview = false;
-    this.cameraState = "off";
-    this.cameraStateMessage = "Camera stopped";
-    this.error = null;
-  }
-
-  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.isNativeApp) {
-      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;
-    }
-  }
-
-  // Add toggle method
-  toggleDiagnostics() {
-    this.showDiagnostics = !this.showDiagnostics;
+    this.visible = false
   }
 }
 </script>
@@ -698,16 +177,5 @@ 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;
-}
-
-/* Add styles for diagnostic panel */
-.diagnostic-panel {
-  font-family: monospace;
-  white-space: pre-wrap;
-  word-break: break-all;
 }
 </style>

src/components/ImageViewer.vue

@@ -38,45 +38,44 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-facing-decorator";
-import { UAParser } from "ua-parser-js";
-import { logger } from "../utils/logger";
+import { Component, Vue, Prop } from 'vue-facing-decorator'
+import { UAParser } from 'ua-parser-js'
 
-@Component({ emits: ["update:isOpen"] })
+@Component({ emits: ['update:isOpen'] })
 export default class ImageViewer extends Vue {
-  @Prop() imageUrl!: string;
-  @Prop() imageData!: Blob | null;
-  @Prop() isOpen!: boolean;
+  @Prop() imageUrl!: string
+  @Prop() imageData!: Blob | null
+  @Prop() isOpen!: boolean
 
-  userAgent = new UAParser();
+  userAgent = new UAParser()
 
   get isMobile() {
-    const os = this.userAgent.getOS().name;
-    return os === "iOS" || os === "Android";
+    const os = this.userAgent.getOS().name
+    return os === 'iOS' || os === 'Android'
   }
 
   close() {
-    this.$emit("update:isOpen", false);
+    this.$emit('update:isOpen', false)
   }
 
   async handleShare() {
-    const os = this.userAgent.getOS().name;
+    const os = this.userAgent.getOS().name
 
     try {
-      if (os === "iOS" || os === "Android") {
+      if (os === 'iOS' || os === 'Android') {
         if (navigator.share) {
           // Always share the URL since it's more reliable across platforms
           await navigator.share({
-            url: this.imageUrl,
-          });
+            url: this.imageUrl
+          })
         } else {
           // Fallback for browsers without share API
-          window.open(this.imageUrl, "_blank");
+          window.open(this.imageUrl, '_blank')
         }
       }
     } catch (error) {
-      logger.warn("Share failed, opening in new tab:", error);
-      window.open(this.imageUrl, "_blank");
+      logger.warn('Share failed, opening in new tab:', error)
+      window.open(this.imageUrl, '_blank')
     }
   }
 }

src/components/InfiniteScroll.vue

@@ -7,12 +7,12 @@ loading state management. * * @author Matthew Raymer * @version 1.0.0 */
 <template>
   <div ref="scrollContainer">
     <slot />
-    <div ref="sentinel" style="height: 1px"></div>
+    <div ref="sentinel" style="height: 1px" />
   </div>
 </template>
 
 <script lang="ts">
-import { Component, Emit, Prop, Vue } from "vue-facing-decorator";
+import { Component, Emit, Prop, Vue } from 'vue-facing-decorator'
 
 /**
  * InfiniteScroll Component
@@ -38,19 +38,19 @@ import { Component, Emit, Prop, Vue } from "vue-facing-decorator";
 export default class InfiniteScroll extends Vue {
   /** Distance in pixels from the bottom at which to trigger the reached-bottom event */
   @Prop({ default: 200 })
-  readonly distance!: number;
+  readonly distance!: number
 
   /** Intersection Observer instance for detecting scroll position */
-  private observer!: IntersectionObserver;
+  private observer!: IntersectionObserver
 
   /** Flag to track initial render state */
-  private isInitialRender = true;
+  private isInitialRender = true
 
   /** Flag to prevent multiple simultaneous loading states */
-  private isLoading = false;
+  private isLoading = false
 
   /** Timeout ID for debouncing scroll events */
-  private debounceTimeout: number | null = null;
+  private debounceTimeout: number | null = null
 
   /**
    * Vue lifecycle hook that runs after component updates.
@@ -64,13 +64,10 @@ export default class InfiniteScroll extends Vue {
       const options = {
         root: null,
         rootMargin: `0px 0px ${this.distance}px 0px`,
-        threshold: 1.0,
-      };
-      this.observer = new IntersectionObserver(
-        this.handleIntersection,
-        options,
-      );
-      this.observer.observe(this.$refs.sentinel as HTMLElement);
+        threshold: 1.0
+      }
+      this.observer = new IntersectionObserver(this.handleIntersection, options)
+      this.observer.observe(this.$refs.sentinel as HTMLElement)
     }
   }
 
@@ -83,10 +80,10 @@ export default class InfiniteScroll extends Vue {
    */
   beforeUnmount() {
     if (this.observer) {
-      this.observer.disconnect();
+      this.observer.disconnect()
     }
     if (this.debounceTimeout) {
-      window.clearTimeout(this.debounceTimeout);
+      window.clearTimeout(this.debounceTimeout)
     }
   }
 
@@ -101,25 +98,25 @@ export default class InfiniteScroll extends Vue {
    * Used internally by the Intersection Observer
    * @emits reached-bottom - Emitted when the user scrolls near the bottom
    */
-  @Emit("reached-bottom")
+  @Emit('reached-bottom')
   handleIntersection(entries: IntersectionObserverEntry[]) {
-    const entry = entries[0];
+    const entry = entries[0]
     if (entry.isIntersecting && !this.isLoading) {
       // Debounce the intersection event
       if (this.debounceTimeout) {
-        window.clearTimeout(this.debounceTimeout);
+        window.clearTimeout(this.debounceTimeout)
       }
 
       this.debounceTimeout = window.setTimeout(() => {
-        this.isLoading = true;
-        this.$emit("reached-bottom", true);
+        this.isLoading = true
+        this.$emit('reached-bottom', true)
         // Reset loading state after a short delay
         setTimeout(() => {
-          this.isLoading = false;
-        }, 1000);
-      }, 300);
+          this.isLoading = false
+        }, 1000)
+      }, 300)
     }
-    return false;
+    return false
   }
 }
 </script>

src/components/InviteDialog.vue

@@ -46,50 +46,50 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
+import { Vue, Component } from 'vue-facing-decorator'
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface } from '../constants/app'
 
 @Component
 export default class InviteDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  callback: (text: string, expiresAt: string) => void = () => {};
-  inviteIdentifier = "";
-  text = "";
-  visible = false;
+  callback: (text: string, expiresAt: string) => void = () => {}
+  inviteIdentifier = ''
+  text = ''
+  visible = false
   expiresAt = new Date(Date.now() + 1000 * 60 * 60 * 24 * 7)
     .toISOString()
-    .substring(0, 10);
+    .substring(0, 10)
 
   async open(
     inviteIdentifier: string,
-    aCallback: (text: string, expiresAt: string) => void,
+    aCallback: (text: string, expiresAt: string) => void
   ) {
-    this.callback = aCallback;
-    this.inviteIdentifier = inviteIdentifier;
-    this.visible = true;
+    this.callback = aCallback
+    this.inviteIdentifier = inviteIdentifier
+    this.visible = true
   }
 
   async onClickSaveChanges() {
     if (!this.expiresAt) {
       this.$notify(
         {
-          group: "alert",
-          type: "warning",
-          title: "Needs Expiration",
-          text: "You must select an expiration date.",
+          group: 'alert',
+          type: 'warning',
+          title: 'Needs Expiration',
+          text: 'You must select an expiration date.'
         },
-        5000,
-      );
+        5000
+      )
     } else {
-      this.callback(this.text, this.expiresAt);
-      this.visible = false;
+      this.callback(this.text, this.expiresAt)
+      this.visible = false
     }
   }
 
   onClickCancel() {
-    this.visible = false;
+    this.visible = false
   }
 }
 </script>

src/components/MembersList.vue

@@ -80,7 +80,9 @@
       >
         <div class="flex items-center justify-between">
           <div class="flex items-center">
-            <h3 class="text-lg font-medium">{{ member.name }}</h3>
+            <h3 class="text-lg font-medium">
+              {{ member.name }}
+            </h3>
             <div
               v-if="!getContactFor(member.did) && member.did !== activeDid"
               class="flex justify-end"
@@ -99,7 +101,7 @@
               title="Contact info"
               @click="
                 informAboutAddingContact(
-                  getContactFor(member.did) !== undefined,
+                  getContactFor(member.did) !== undefined
                 )
               "
             >
@@ -157,138 +159,138 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-facing-decorator";
+import { Component, Vue, Prop } from 'vue-facing-decorator'
 
 import {
   logConsoleAndDb,
   retrieveSettingsForActiveAccount,
-  db,
-} from "../db/index";
+  db
+} from '../db/index'
 import {
   errorStringForLog,
   getHeaders,
   register,
-  serverMessageForUser,
-} from "../libs/endorserServer";
-import { decryptMessage } from "../libs/crypto";
-import { Contact } from "../db/tables/contacts";
-import * as libsUtil from "../libs/util";
-import { NotificationIface } from "../constants/app";
+  serverMessageForUser
+} from '../libs/endorserServer'
+import { decryptMessage } from '../libs/crypto'
+import { Contact } from '../db/tables/contacts'
+import * as libsUtil from '../libs/util'
+import { NotificationIface } from '../constants/app'
 
 interface Member {
-  admitted: boolean;
-  content: string;
-  memberId: number;
+  admitted: boolean
+  content: string
+  memberId: number
 }
 
 interface DecryptedMember {
-  member: Member;
-  name: string;
-  did: string;
-  isRegistered: boolean;
+  member: Member
+  name: string
+  did: string
+  isRegistered: boolean
 }
 
 @Component
 export default class MembersList extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  libsUtil = libsUtil;
+  libsUtil = libsUtil
 
-  @Prop({ required: true }) password!: string;
-  @Prop({ default: false }) showOrganizerTools!: boolean;
+  @Prop({ required: true }) password!: string
+  @Prop({ default: false }) showOrganizerTools!: boolean
 
-  decryptedMembers: DecryptedMember[] = [];
-  firstName = "";
-  isLoading = true;
-  isOrganizer = false;
-  members: Member[] = [];
-  missingPassword = false;
-  missingMyself = false;
-  activeDid = "";
-  apiServer = "";
-  contacts: Array<Contact> = [];
+  decryptedMembers: DecryptedMember[] = []
+  firstName = ''
+  isLoading = true
+  isOrganizer = false
+  members: Member[] = []
+  missingPassword = false
+  missingMyself = false
+  activeDid = ''
+  apiServer = ''
+  contacts: Array<Contact> = []
 
   async created() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
-    this.firstName = settings.firstName || "";
-    await this.fetchMembers();
-    await this.loadContacts();
+    const settings = await retrieveSettingsForActiveAccount()
+    this.activeDid = settings.activeDid || ''
+    this.apiServer = settings.apiServer || ''
+    this.firstName = settings.firstName || ''
+    await this.fetchMembers()
+    await this.loadContacts()
   }
 
   async fetchMembers() {
     try {
-      this.isLoading = true;
-      const headers = await getHeaders(this.activeDid);
+      this.isLoading = true
+      const headers = await getHeaders(this.activeDid)
       const response = await this.axios.get(
         `${this.apiServer}/api/partner/groupOnboardMembers`,
-        { headers },
-      );
+        { headers }
+      )
 
       if (response.data && response.data.data) {
-        this.members = response.data.data;
-        await this.decryptMemberContents();
+        this.members = response.data.data
+        await this.decryptMemberContents()
       }
     } catch (error) {
       logConsoleAndDb(
-        "Error fetching members: " + errorStringForLog(error),
-        true,
-      );
+        'Error fetching members: ' + errorStringForLog(error),
+        true
+      )
       this.$emit(
-        "error",
-        serverMessageForUser(error) || "Failed to fetch members.",
-      );
+        'error',
+        serverMessageForUser(error) || 'Failed to fetch members.'
+      )
     } finally {
-      this.isLoading = false;
+      this.isLoading = false
     }
   }
 
   async decryptMemberContents() {
-    this.decryptedMembers = [];
+    this.decryptedMembers = []
 
     if (!this.password) {
-      this.missingPassword = true;
-      return;
+      this.missingPassword = true
+      return
     }
 
     let isFirstEntry = true,
-      foundMyself = false;
+      foundMyself = false
     for (const member of this.members) {
       try {
         const decryptedContent = await decryptMessage(
           member.content,
-          this.password,
-        );
-        const content = JSON.parse(decryptedContent);
+          this.password
+        )
+        const content = JSON.parse(decryptedContent)
 
         this.decryptedMembers.push({
           member: member,
           name: content.name,
           did: content.did,
-          isRegistered: !!content.isRegistered,
-        });
+          isRegistered: !!content.isRegistered
+        })
         if (isFirstEntry && content.did === this.activeDid) {
-          this.isOrganizer = true;
+          this.isOrganizer = true
         }
         if (content.did === this.activeDid) {
-          foundMyself = true;
+          foundMyself = true
         }
       } catch (error) {
         // do nothing, relying on the count of members to determine if there was an error
       }
-      isFirstEntry = false;
+      isFirstEntry = false
     }
-    this.missingMyself = !foundMyself;
+    this.missingMyself = !foundMyself
   }
 
   decryptionErrorMessage(): string {
     if (this.isOrganizer) {
       if (this.decryptedMembers.length < this.members.length) {
-        return "Some members have data that cannot be decrypted with that password.";
+        return 'Some members have data that cannot be decrypted with that password.'
       } else {
         // the lists must be equal
-        return "";
+        return ''
       }
     } else {
       // non-organizers should only see problems if the first (organizer) member is not decrypted
@@ -296,10 +298,10 @@ export default class MembersList extends Vue {
         this.decryptedMembers.length === 0 ||
         this.decryptedMembers[0].member.memberId !== this.members[0].memberId
       ) {
-        return "Your password is not the same as the organizer. Reload or have them check their password.";
+        return 'Your password is not the same as the organizer. Reload or have them check their password.'
       } else {
         // the first (organizer) member was decrypted OK
-        return "";
+        return ''
       }
     }
   }
@@ -307,118 +309,118 @@ export default class MembersList extends Vue {
   membersToShow(): DecryptedMember[] {
     if (this.isOrganizer) {
       if (this.showOrganizerTools) {
-        return this.decryptedMembers;
+        return this.decryptedMembers
       } else {
         return this.decryptedMembers.filter(
-          (member: DecryptedMember) => member.member.admitted,
-        );
+          (member: DecryptedMember) => member.member.admitted
+        )
       }
     }
     // non-organizers only get visible members from server
-    return this.decryptedMembers;
+    return this.decryptedMembers
   }
 
   informAboutAdmission() {
     this.$notify(
       {
-        group: "alert",
-        type: "info",
-        title: "Admission info",
-        text: "This is to register people in Time Safari and to admit them to the meeting. A '+' symbol means they are not yet admitted and you can register and admit them. A '-' means you can remove them, but they will stay registered.",
+        group: 'alert',
+        type: 'info',
+        title: 'Admission info',
+        text: "This is to register people in Time Safari and to admit them to the meeting. A '+' symbol means they are not yet admitted and you can register and admit them. A '-' means you can remove them, but they will stay registered."
       },
-      10000,
-    );
+      10000
+    )
   }
 
   informAboutAddingContact(contactImportedAlready: boolean) {
     if (contactImportedAlready) {
       this.$notify(
         {
-          group: "alert",
-          type: "info",
-          title: "Contact Exists",
-          text: "They are in your contacts. If you want to remove them, you must do that from the contacts screen.",
+          group: 'alert',
+          type: 'info',
+          title: 'Contact Exists',
+          text: 'They are in your contacts. If you want to remove them, you must do that from the contacts screen.'
         },
-        10000,
-      );
+        10000
+      )
     } else {
       this.$notify(
         {
-          group: "alert",
-          type: "info",
-          title: "Contact Available",
-          text: "This is to add them to your contacts. If you want to remove them later, you must do that from the contacts screen.",
+          group: 'alert',
+          type: 'info',
+          title: 'Contact Available',
+          text: 'This is to add them to your contacts. If you want to remove them later, you must do that from the contacts screen.'
         },
-        10000,
-      );
+        10000
+      )
     }
   }
 
   async loadContacts() {
-    this.contacts = await db.contacts.toArray();
+    this.contacts = await db.contacts.toArray()
   }
 
   getContactFor(did: string): Contact | undefined {
-    return this.contacts.find((contact) => contact.did === did);
+    return this.contacts.find((contact) => contact.did === did)
   }
 
   checkWhetherContactBeforeAdmitting(decrMember: DecryptedMember) {
-    const contact = this.getContactFor(decrMember.did);
+    const contact = this.getContactFor(decrMember.did)
     if (!decrMember.member.admitted && !contact) {
       // If not a contact, show confirmation dialog
       this.$notify(
         {
-          group: "modal",
-          type: "confirm",
-          title: "Add as Contact First?",
-          text: "This person is not in your contacts. Would you like to add them as a contact first?",
-          yesText: "Add as Contact",
-          noText: "Skip Adding Contact",
+          group: 'modal',
+          type: 'confirm',
+          title: 'Add as Contact First?',
+          text: 'This person is not in your contacts. Would you like to add them as a contact first?',
+          yesText: 'Add as Contact',
+          noText: 'Skip Adding Contact',
           onYes: async () => {
-            await this.addAsContact(decrMember);
+            await this.addAsContact(decrMember)
             // After adding as contact, proceed with admission
-            await this.toggleAdmission(decrMember);
+            await this.toggleAdmission(decrMember)
           },
           onNo: async () => {
             // If they choose not to add as contact, show second confirmation
             this.$notify(
               {
-                group: "modal",
-                type: "confirm",
-                title: "Continue Without Adding?",
-                text: "Are you sure you want to proceed with admission? If they are not a contact, you will not know their name after this meeting.",
-                yesText: "Continue",
+                group: 'modal',
+                type: 'confirm',
+                title: 'Continue Without Adding?',
+                text: 'Are you sure you want to proceed with admission? If they are not a contact, you will not know their name after this meeting.',
+                yesText: 'Continue',
                 onYes: async () => {
-                  await this.toggleAdmission(decrMember);
+                  await this.toggleAdmission(decrMember)
                 },
                 onCancel: async () => {
                   // Do nothing, effectively canceling the operation
-                },
+                }
               },
-              -1,
-            );
-          },
+              -1
+            )
+          }
         },
-        -1,
-      );
+        -1
+      )
     } else {
       // If already a contact, proceed directly with admission
-      this.toggleAdmission(decrMember);
+      this.toggleAdmission(decrMember)
     }
   }
 
   async toggleAdmission(decrMember: DecryptedMember) {
     try {
-      const headers = await getHeaders(this.activeDid);
+      const headers = await getHeaders(this.activeDid)
       await this.axios.put(
         `${this.apiServer}/api/partner/groupOnboardMember/${decrMember.member.memberId}`,
         { admitted: !decrMember.member.admitted },
-        { headers },
-      );
+        { headers }
+      )
       // Update local state
-      decrMember.member.admitted = !decrMember.member.admitted;
+      decrMember.member.admitted = !decrMember.member.admitted
 
-      const oldContact = this.getContactFor(decrMember.did);
+      const oldContact = this.getContactFor(decrMember.did)
       // if admitted, now register that user if they are not registered
       if (
         decrMember.member.admitted &&
@@ -427,61 +429,61 @@ export default class MembersList extends Vue {
       ) {
         const contactOldOrNew: Contact = oldContact || {
           did: decrMember.did,
-          name: decrMember.name,
-        };
+          name: decrMember.name
+        }
         try {
           const result = await register(
             this.activeDid,
             this.apiServer,
             this.axios,
-            contactOldOrNew,
-          );
+            contactOldOrNew
+          )
           if (result.success) {
-            decrMember.isRegistered = true;
+            decrMember.isRegistered = true
             if (oldContact) {
-              await db.contacts.update(decrMember.did, { registered: true });
-              oldContact.registered = true;
+              await db.contacts.update(decrMember.did, { registered: true })
+              oldContact.registered = true
             }
             this.$notify(
               {
-                group: "alert",
-                type: "success",
-                title: "Registered",
-                text: "Besides being admitted, they were also registered.",
+                group: 'alert',
+                type: 'success',
+                title: 'Registered',
+                text: 'Besides being admitted, they were also registered.'
               },
-              3000,
-            );
+              3000
+            )
           } else {
-            throw result;
+            throw result
           }
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
         } catch (error: any) {
           // registration failure is likely explained by a message from the server
           const additionalInfo =
-            serverMessageForUser(error) || error?.error || "";
+            serverMessageForUser(error) || error?.error || ''
           this.$notify(
             {
-              group: "alert",
-              type: "warning",
-              title: "Registration failed",
+              group: 'alert',
+              type: 'warning',
+              title: 'Registration failed',
               text:
-                "They were admitted to the meeting. However, registration failed. You can register them from the contacts screen. " +
-                additionalInfo,
+                'They were admitted to the meeting. However, registration failed. You can register them from the contacts screen. ' +
+                additionalInfo
             },
-            12000,
-          );
+            12000
+          )
         }
       }
     } catch (error) {
       logConsoleAndDb(
-        "Error toggling admission: " + errorStringForLog(error),
-        true,
-      );
+        'Error toggling admission: ' + errorStringForLog(error),
+        true
+      )
       this.$emit(
-        "error",
+        'error',
         serverMessageForUser(error) ||
-          "Failed to update member admission status.",
-      );
+          'Failed to update member admission status.'
+      )
     }
   }
 
@@ -489,36 +491,36 @@ export default class MembersList extends Vue {
     try {
       const newContact = {
         did: member.did,
-        name: member.name,
-      };
+        name: member.name
+      }
 
-      await db.contacts.add(newContact);
-      this.contacts.push(newContact);
+      await db.contacts.add(newContact)
+      this.contacts.push(newContact)
 
       this.$notify(
         {
-          group: "alert",
-          type: "success",
-          title: "Contact Added",
-          text: "They were added to your contacts.",
+          group: 'alert',
+          type: 'success',
+          title: 'Contact Added',
+          text: 'They were added to your contacts.'
         },
-        3000,
-      );
+        3000
+      )
     } catch (err) {
-      logConsoleAndDb("Error adding contact: " + errorStringForLog(err), true);
-      let message = "An error prevented adding this contact.";
-      if (err instanceof Error && err.message?.indexOf("already exists") > -1) {
-        message = "This person is already in your contact list.";
+      logConsoleAndDb('Error adding contact: ' + errorStringForLog(err), true)
+      let message = 'An error prevented adding this contact.'
+      if (err instanceof Error && err.message?.indexOf('already exists') > -1) {
+        message = 'This person is already in your contact list.'
       }
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Contact Not Added",
-          text: message,
+          group: 'alert',
+          type: 'danger',
+          title: 'Contact Not Added',
+          text: message
         },
-        5000,
-      );
+        5000
+      )
     }
   }
 }

src/components/OfferDialog.vue

@@ -49,8 +49,8 @@
                 projectName,
                 recipientDid,
                 recipientName,
-                unitCode: amountUnitCode,
-              },
+                unitCode: amountUnitCode
+              }
             }"
             class="text-blue-500"
           >
@@ -80,117 +80,114 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component, Prop } from "vue-facing-decorator";
+import { Vue, Component, Prop } from 'vue-facing-decorator'
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface } from '../constants/app'
 import {
   createAndSubmitOffer,
-  serverMessageForUser,
-} from "../libs/endorserServer";
-import * as libsUtil from "../libs/util";
-import { retrieveSettingsForActiveAccount } from "../db/index";
-import { logger } from "../utils/logger";
+  serverMessageForUser
+} from '../libs/endorserServer'
+import * as libsUtil from '../libs/util'
+import { retrieveSettingsForActiveAccount } from '../db/index'
+import { logger } from '../utils/logger'
 
 @Component
 export default class OfferDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  @Prop projectId?: string;
-  @Prop projectName?: string;
+  @Prop projectId?: string
+  @Prop projectName?: string
 
-  activeDid = "";
-  apiServer = "";
+  activeDid = ''
+  apiServer = ''
 
-  amountInput = "0";
-  amountUnitCode = "HUR";
-  description = "";
-  expirationDateInput = "";
-  recipientDid? = "";
-  recipientName? = "";
-  visible = false;
+  amountInput = '0'
+  amountUnitCode = 'HUR'
+  description = ''
+  expirationDateInput = ''
+  recipientDid? = ''
+  recipientName? = ''
+  visible = false
 
-  libsUtil = libsUtil;
+  libsUtil = libsUtil
 
   async open(recipientDid?: string, recipientName?: string) {
     try {
-      this.recipientDid = recipientDid;
-      this.recipientName = recipientName;
+      this.recipientDid = recipientDid
+      this.recipientName = recipientName
 
-      const settings = await retrieveSettingsForActiveAccount();
-      this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+      const settings = await retrieveSettingsForActiveAccount()
+      this.apiServer = settings.apiServer || ''
+      this.activeDid = settings.activeDid || ''
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      logger.error("Error retrieving settings from database:", err);
+      logger.error('Error retrieving settings from database:', err)
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: err.message || 'There was an error retrieving your settings.'
         },
-        -1,
-      );
+        -1
+      )
     }
 
-    this.visible = true;
+    this.visible = true
   }
 
   close() {
     // close the dialog but don't change values (since it might be submitting info)
-    this.visible = false;
+    this.visible = false
   }
 
   changeUnitCode() {
-    const units = Object.keys(this.libsUtil.UNIT_SHORT);
-    const index = units.indexOf(this.amountUnitCode);
-    this.amountUnitCode = units[(index + 1) % units.length];
+    const units = Object.keys(this.libsUtil.UNIT_SHORT)
+    const index = units.indexOf(this.amountUnitCode)
+    this.amountUnitCode = units[(index + 1) % units.length]
   }
 
   increment() {
-    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
+    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`
   }
 
   decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
+    this.amountInput = `${Math.max(0, (parseFloat(this.amountInput) || 1) - 1)}`
   }
 
   cancel() {
-    this.close();
-    this.eraseValues();
+    this.close()
+    this.eraseValues()
   }
 
   eraseValues() {
-    this.description = "";
-    this.amountInput = "0";
-    this.amountUnitCode = "HUR";
+    this.description = ''
+    this.amountInput = '0'
+    this.amountUnitCode = 'HUR'
   }
 
   async confirm() {
-    this.close();
+    this.close()
     this.$notify(
       {
-        group: "alert",
-        type: "toast",
-        text: "Recording the offer...",
-        title: "",
+        group: 'alert',
+        type: 'toast',
+        text: 'Recording the offer...',
+        title: ''
       },
-      1000,
-    );
+      1000
+    )
     // this is asynchronous, but we don't need to wait for it to complete
     this.recordOffer(
       this.description,
       parseFloat(this.amountInput),
       this.amountUnitCode,
-      this.expirationDateInput,
+      this.expirationDateInput
     ).then(() => {
-      this.description = "";
-      this.amountInput = "0";
-    });
+      this.description = ''
+      this.amountInput = '0'
+    })
   }
 
   /**
@@ -202,33 +199,33 @@ export default class OfferDialog extends Vue {
   public async recordOffer(
     description: string,
     amount: number,
-    unitCode: string = "HUR",
-    expirationDateInput?: string,
+    unitCode: string = 'HUR',
+    expirationDateInput?: string
   ) {
     if (!this.activeDid) {
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identity before you can record an offer.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: 'You must select an identity before you can record an offer.'
         },
-        7000,
-      );
-      return;
+        7000
+      )
+      return
     }
 
     if (!description && !amount) {
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: `You must enter a description or some number of ${this.libsUtil.UNIT_LONG[unitCode]}.`,
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: `You must enter a description or some number of ${this.libsUtil.UNIT_LONG[unitCode]}.`
         },
-        -1,
-      );
-      return;
+        -1
+      )
+      return
     }
 
     try {
@@ -239,54 +236,54 @@ export default class OfferDialog extends Vue {
         description,
         amount,
         unitCode,
-        "",
+        '',
         expirationDateInput,
         this.recipientDid,
-        this.projectId,
-      );
+        this.projectId
+      )
 
       if (
-        result.type === "error" ||
+        result.type === 'error' ||
         this.isOfferCreationError(result.response)
       ) {
-        const errorMessage = this.getOfferCreationErrorMessage(result);
-        logger.error("Error with offer creation result:", result);
+        const errorMessage = this.getOfferCreationErrorMessage(result)
+        logger.error('Error with offer creation result:', result)
         this.$notify(
           {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the offer.",
+            group: 'alert',
+            type: 'danger',
+            title: 'Error',
+            text: errorMessage || 'There was an error creating the offer.'
           },
-          -1,
-        );
+          -1
+        )
       } else {
         this.$notify(
           {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "That offer was recorded.",
+            group: 'alert',
+            type: 'success',
+            title: 'Success',
+            text: 'That offer was recorded.'
           },
-          5000,
-        );
+          5000
+        )
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      logger.error("Error with offer recordation caught:", error);
+      logger.error('Error with offer recordation caught:', error)
       const message =
         error.userMessage ||
         error.response?.data?.error?.message ||
-        "There was an error recording the offer.";
+        'There was an error recording the offer.'
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: message,
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: message
         },
-        -1,
-      );
+        -1
+      )
     }
   }
 
@@ -298,7 +295,7 @@ export default class OfferDialog extends Vue {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   isOfferCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
+    return result.status !== 201 || result.data?.error
   }
 
   /**
@@ -311,7 +308,7 @@ export default class OfferDialog extends Vue {
       serverMessageForUser(result) ||
       result.error?.userMessage ||
       result.error?.error
-    );
+    )
   }
 }
 </script>

src/components/OnboardingDialog.vue

@@ -198,64 +198,64 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
+import { Component, Vue } from 'vue-facing-decorator'
+import { Router } from 'vue-router'
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface } from '../constants/app'
 import {
   db,
   retrieveSettingsForActiveAccount,
-  updateAccountSettings,
-} from "../db/index";
-import { OnboardPage } from "../libs/util";
+  updateAccountSettings
+} from '../db/index'
+import { OnboardPage } from '../libs/util'
 
 @Component({
   computed: {
     OnboardPage() {
-      return OnboardPage;
-    },
+      return OnboardPage
+    }
   },
-  components: { OnboardPage },
+  components: { OnboardPage }
 })
 export default class OnboardingDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-  $router!: Router;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
+  $router!: Router
 
-  activeDid = "";
-  firstContactName = null;
-  givenName = "";
-  isRegistered = false;
-  numContacts = 0;
-  page = OnboardPage.Home;
-  visible = false;
+  activeDid = ''
+  firstContactName = null
+  givenName = ''
+  isRegistered = false
+  numContacts = 0
+  page = OnboardPage.Home
+  visible = false
 
   async open(page: OnboardPage) {
-    this.page = page;
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.isRegistered = !!settings.isRegistered;
-    const contacts = await db.contacts.toArray();
-    this.numContacts = contacts.length;
+    this.page = page
+    const settings = await retrieveSettingsForActiveAccount()
+    this.activeDid = settings.activeDid || ''
+    this.isRegistered = !!settings.isRegistered
+    const contacts = await db.contacts.toArray()
+    this.numContacts = contacts.length
     if (this.numContacts > 0) {
-      this.firstContactName = contacts[0].name;
+      this.firstContactName = contacts[0].name
     }
-    this.visible = true;
+    this.visible = true
     if (this.page === OnboardPage.Create) {
       // we'll assume that they've been through all the other pages
       await updateAccountSettings(this.activeDid, {
-        finishedOnboarding: true,
-      });
+        finishedOnboarding: true
+      })
     }
   }
 
   async onClickClose(done?: boolean, goHome?: boolean) {
-    this.visible = false;
+    this.visible = false
     if (done) {
       await updateAccountSettings(this.activeDid, {
-        finishedOnboarding: true,
-      });
+        finishedOnboarding: true
+      })
       if (goHome) {
-        this.$router.push({ name: "home" });
+        this.$router.push({ name: 'home' })
       }
     }
   }

src/components/PhotoDialog.vue

@@ -1,33 +1,21 @@
-/** * PhotoDialog.vue - Cross-platform photo capture and selection component * *
-This component provides a unified interface for taking photos and selecting
-images * across different platforms (web, mobile) using the PlatformService. It
-supports: * - Taking photos using device camera * - Selecting images from device
-gallery * - Image cropping functionality * - Image upload to server * - Error
-handling and user feedback * * Features: * - Responsive design with mobile-first
-approach * - Cross-platform compatibility through PlatformService * - Image
-cropping with aspect ratio control * - Progress feedback during upload * -
-Comprehensive error handling * * @author Matthew Raymer * @version 1.0.0 * @file
-PhotoDialog.vue */
-
 <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
           id="ViewHeading"
-          class="text-center font-bold absolute top-0 inset-x-0 px-4 py-2 bg-black/50 text-white leading-none pointer-events-none"
+          class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-0.5 bg-black/50 text-white leading-none"
         >
           <span v-if="uploading"> Uploading... </span>
           <span v-else-if="blob"> Look Good? </span>
-          <span v-else-if="showCameraPreview"> Take Photo </span>
           <span v-else> Say "Cheese"! </span>
         </div>
 
         <div
-          class="text-lg text-center px-2 py-2 leading-none absolute right-0 top-0 text-white cursor-pointer"
+          class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white"
           @click="close()"
         >
-          <font-awesome icon="xmark" class="w-[1em]"></font-awesome>
+          <font-awesome icon="xmark" class="w-[1em]" />
         </div>
       </div>
 
@@ -42,13 +30,13 @@ PhotoDialog.vue */
           <VuePictureCropper
             :box-style="{
               backgroundColor: '#f8f8f8',
-              margin: 'auto',
+              margin: 'auto'
             }"
             :img="createBlobURL(blob)"
             :options="{
               viewMode: 1,
               dragMode: 'crop',
-              aspectRatio: 1 / 1,
+              aspectRatio: 9 / 9
             }"
             class="max-h-[90vh] max-w-[90vw] object-contain"
           />
@@ -61,45 +49,31 @@ PhotoDialog.vue */
             />
           </div>
         </div>
-        <div class="grid grid-cols-2 gap-2 mt-2">
+        <div class="absolute bottom-[1rem] left-[1rem] px-2 py-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"
+            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-1 px-2 rounded-md"
             @click="uploadImage"
           >
             <span>Upload</span>
           </button>
+        </div>
+        <div
+          v-if="showRetry"
+          class="absolute bottom-[1rem] right-[1rem] px-2 py-1"
+        >
           <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"
+            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-1 px-2 rounded-md"
             @click="retryImage"
           >
             <span>Retry</span>
           </button>
         </div>
       </div>
-      <div v-else-if="showCameraPreview" class="camera-preview">
-        <div class="camera-container">
-          <video
-            ref="videoElement"
-            class="camera-video"
-            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 v-else>
         <div class="flex flex-col items-center justify-center gap-4 p-4">
           <button
-            v-if="isRegistered"
             class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
-            @click="startCameraPreview"
+            @click="takePhoto"
           >
             <font-awesome icon="camera" class="w-[1em]" />
           </button>
@@ -116,424 +90,199 @@ PhotoDialog.vue */
 </template>
 
 <script lang="ts">
-import axios from "axios";
-import { Component, Vue } from "vue-facing-decorator";
-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";
+/**
+ * PhotoDialog.vue - Cross-platform photo capture and selection component
+ *
+ * This component provides a unified interface for taking photos and selecting images
+ * across different platforms using the PlatformService.
+ *
+ * @author Matthew Raymer
+ * @file PhotoDialog.vue
+ */
+
+import axios from 'axios'
+import { Component, Vue } from 'vue-facing-decorator'
+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'
 
 @Component({ components: { VuePictureCropper } })
 export default class PhotoDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  /** Active DID for user authentication */
-  activeDid = "";
+  activeDid = ''
+  blob?: Blob
+  claimType = ''
+  crop = false
+  fileName?: string
+  setImageCallback: (arg: string) => void = () => {}
+  showRetry = true
+  uploading = false
+  visible = false
 
-  /** Current image blob being processed */
-  blob?: Blob;
+  private platformService = PlatformServiceFactory.getInstance()
+  URL = window.URL || window.webkitURL
 
-  /** Type of claim for the image */
-  claimType = "";
-
-  /** Whether to show cropping interface */
-  crop = false;
-
-  /** Name of the selected file */
-  fileName?: string;
-
-  /** Callback function to set image URL after upload */
-  setImageCallback: (arg: string) => void = () => {};
-
-  /** 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;
-
-  isRegistered = false;
-  private platformCapabilities = this.platformService.getCapabilities();
-
-  /**
-   * Lifecycle hook: Initializes component and retrieves user settings
-   * @throws {Error} When settings retrieval fails
-   */
   async mounted() {
-    logger.log("PhotoDialog mounted");
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.activeDid = settings.activeDid || "";
-      this.isRegistered = !!settings.isRegistered;
-      logger.log("isRegistered:", this.isRegistered);
-    } catch (error: unknown) {
-      logger.error("Error retrieving settings from database:", error);
+      const settings = await retrieveSettingsForActiveAccount()
+      this.activeDid = settings.activeDid || ''
+    } catch (err: unknown) {
+      logger.error('Error retrieving settings from database:', err)
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text:
-            error instanceof Error
-              ? error.message
-              : "There was an error retrieving your settings.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: err.message || 'There was an error retrieving your settings.'
         },
-        -1,
-      );
+        -1
+      )
     }
   }
 
-  /**
-   * Lifecycle hook: Cleans up camera stream when component is destroyed
-   */
-  beforeDestroy() {
-    this.stopCameraPreview();
-  }
-
-  /**
-   * Opens the photo dialog with specified configuration
-   * @param setImageFn - Callback function to handle image URL after upload
-   * @param claimType - Type of claim for the image
-   * @param crop - Whether to enable cropping
-   * @param blob - Optional existing image blob
-   * @param inputFileName - Optional filename for the image
-   */
-  async open(
+  open(
     setImageFn: (arg: string) => void,
     claimType: string,
     crop?: boolean,
     blob?: Blob,
-    inputFileName?: string,
+    inputFileName?: string
   ) {
-    this.visible = true;
-    this.claimType = claimType;
-    this.crop = !!crop;
-    const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
+    this.visible = true
+    this.claimType = claimType
+    this.crop = !!crop
+    const bottomNav = document.querySelector('#QuickNav') as HTMLElement
     if (bottomNav) {
-      bottomNav.style.display = "none";
+      bottomNav.style.display = 'none'
     }
-    this.setImageCallback = setImageFn;
+    this.setImageCallback = setImageFn
     if (blob) {
-      this.blob = blob;
-      this.fileName = inputFileName;
-      this.showRetry = false;
+      this.blob = blob
+      this.fileName = inputFileName
+      this.showRetry = false
     } else {
-      this.blob = undefined;
-      this.fileName = undefined;
-      this.showRetry = true;
-      // Start camera preview automatically if no blob is provided
-      if (!this.platformCapabilities.isMobile) {
-        await this.startCameraPreview();
-      }
+      this.blob = undefined
+      this.fileName = undefined
+      this.showRetry = true
     }
   }
 
-  /**
-   * Closes the photo dialog and resets state
-   */
   close() {
-    logger.debug(
-      "Dialog closing, current showCameraPreview:",
-      this.showCameraPreview,
-    );
-    this.visible = false;
-    this.stopCameraPreview();
-    const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
+    this.visible = false
+    const bottomNav = document.querySelector('#QuickNav') as HTMLElement
     if (bottomNav) {
-      bottomNav.style.display = "";
+      bottomNav.style.display = ''
     }
-    this.blob = undefined;
+    this.blob = undefined
   }
 
-  /**
-   * Starts the camera preview
-   */
-  async startCameraPreview() {
-    logger.debug("startCameraPreview called");
-    logger.debug("Current showCameraPreview state:", this.showCameraPreview);
-    logger.debug("Platform capabilities:", this.platformCapabilities);
-
-    // If we're on a mobile device or using Capacitor, use the platform service
-    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;
-    }
-
-    // For desktop web browsers, use our custom preview
-    logger.debug("Starting camera preview for desktop browser");
-    try {
-      // Set state before requesting camera access
-      this.showCameraPreview = true;
-      logger.debug("showCameraPreview set to:", this.showCameraPreview);
-
-      // Force a re-render
-      await this.$nextTick();
-      logger.debug(
-        "After nextTick, showCameraPreview is:",
-        this.showCameraPreview,
-      );
-
-      logger.debug("Requesting camera access...");
-      const stream = await navigator.mediaDevices.getUserMedia({
-        video: { facingMode: "environment" },
-      });
-      logger.debug("Camera access granted, setting up video element");
-      this.cameraStream = stream;
-
-      // Force another re-render after getting the stream
-      await this.$nextTick();
-      logger.debug(
-        "After getting stream, showCameraPreview is:",
-        this.showCameraPreview,
-      );
-
-      const videoElement = this.$refs.videoElement as HTMLVideoElement;
-      if (videoElement) {
-        logger.debug("Video element found, setting srcObject");
-        videoElement.srcObject = stream;
-        // Wait for video to be ready
-        await new Promise((resolve) => {
-          videoElement.onloadedmetadata = () => {
-            logger.debug("Video metadata loaded");
-            videoElement.play().then(() => {
-              logger.debug("Video playback started");
-              resolve(true);
-            });
-          };
-        });
-      } else {
-        logger.error("Video element not found");
-      }
-    } 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;
-    }
-  }
-
-  /**
-   * Stops the camera preview and cleans up resources
-   */
-  stopCameraPreview() {
-    logger.debug(
-      "Stopping camera preview, current showCameraPreview:",
-      this.showCameraPreview,
-    );
-    if (this.cameraStream) {
-      this.cameraStream.getTracks().forEach((track) => track.stop());
-      this.cameraStream = null;
-    }
-    this.showCameraPreview = false;
-    logger.debug(
-      "After stopping, showCameraPreview is:",
-      this.showCameraPreview,
-    );
-  }
-
-  /**
-   * Captures a photo from the camera preview
-   */
-  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.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,
-      );
-    }
-  }
-
-  /**
-   * Captures a photo using device camera
-   * @throws {Error} When camera access fails
-   */
   async takePhoto() {
     try {
-      const result = await this.platformService.takePicture();
-      this.blob = result.blob;
-      this.fileName = result.fileName;
+      const result = await this.platformService.takePicture()
+      this.blob = result.blob
+      this.fileName = result.fileName
     } catch (error: unknown) {
-      logger.error("Error taking picture:", error);
+      logger.error('Error taking picture:', error)
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Failed to take picture. Please try again.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: 'Failed to take picture. Please try again.'
         },
-        5000,
-      );
+        5000
+      )
     }
   }
 
-  /**
-   * Selects an image from device gallery
-   * @throws {Error} When gallery access fails
-   */
   async pickPhoto() {
     try {
-      const result = await this.platformService.pickImage();
-      this.blob = result.blob;
-      this.fileName = result.fileName;
+      const result = await this.platformService.pickImage()
+      this.blob = result.blob
+      this.fileName = result.fileName
     } catch (error: unknown) {
-      logger.error("Error picking image:", error);
+      logger.error('Error picking image:', error)
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Failed to pick image. Please try again.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: 'Failed to pick image. Please try again.'
         },
-        5000,
-      );
+        5000
+      )
     }
   }
 
-  /**
-   * Creates a blob URL for image preview
-   * @param blob - Image blob to create URL for
-   * @returns {string} Blob URL for the image
-   */
   private createBlobURL(blob: Blob): string {
-    return URL.createObjectURL(blob);
+    return URL.createObjectURL(blob)
   }
 
-  /**
-   * Resets the current image selection and restarts camera preview
-   */
   async retryImage() {
-    this.blob = undefined;
-    if (!this.platformCapabilities.isMobile) {
-      await this.startCameraPreview();
-    }
+    this.blob = undefined
   }
 
-  /**
-   * Uploads the current image to the server
-   * Handles cropping if enabled and manages upload state
-   * @throws {Error} When upload fails or server returns error
-   */
   async uploadImage() {
-    this.uploading = true;
+    this.uploading = true
 
     if (this.crop) {
-      this.blob = (await cropper?.getBlob()) || undefined;
+      this.blob = (await cropper?.getBlob()) || undefined
     }
 
-    const token = await accessToken(this.activeDid);
+    const token = await accessToken(this.activeDid)
     const headers = {
-      Authorization: "Bearer " + token,
-    };
-    const formData = new FormData();
+      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.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: 'There was an error finding the picture. Please try again.'
         },
-        5000,
-      );
-      this.uploading = false;
-      return;
+        5000
+      )
+      this.uploading = false
+      return
     }
-    formData.append("image", this.blob, this.fileName || "photo.jpg");
-    formData.append("claimType", this.claimType);
+    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")
+        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.",
-        );
+          '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",
+        DEFAULT_IMAGE_API_SERVER + '/image',
         formData,
-        { headers },
-      );
-      this.uploading = false;
+        { headers }
+      )
+      this.uploading = false
 
-      this.close();
-      this.setImageCallback(response.data.url as string);
+      this.close()
+      this.setImageCallback(response.data.url as string)
     } catch (error: unknown) {
       // Log the raw error first
-      logger.error("Raw error object:", JSON.stringify(error, null, 2));
+      logger.error('Raw error object:', JSON.stringify(error, null, 2))
 
-      let errorMessage = "There was an error saving the picture.";
+      let errorMessage = 'There was an error saving the picture.'
 
       if (axios.isAxiosError(error)) {
-        const status = error.response?.status;
-        const statusText = error.response?.statusText;
-        const data = error.response?.data;
+        const status = error.response?.status
+        const statusText = error.response?.statusText
+        const data = error.response?.data
 
         // Log detailed error information
-        logger.error("Upload error details:", {
+        logger.error('Upload error details:', {
           status,
           statusText,
           data: JSON.stringify(data, null, 2),
@@ -541,56 +290,55 @@ export default class PhotoDialog extends Vue {
           config: {
             url: error.config?.url,
             method: error.config?.method,
-            headers: error.config?.headers,
-          },
-        });
+            headers: error.config?.headers
+          }
+        })
 
         if (status === 401) {
-          errorMessage = "Authentication failed. Please try logging in again.";
+          errorMessage = 'Authentication failed. Please try logging in again.'
         } else if (status === 413) {
-          errorMessage = "Image file is too large. Please try a smaller image.";
+          errorMessage = 'Image file is too large. Please try a smaller image.'
         } else if (status === 415) {
           errorMessage =
-            "Unsupported image format. Please try a different image.";
+            'Unsupported image format. Please try a different image.'
         } else if (status && status >= 500) {
-          errorMessage = "Server error. Please try again later.";
+          errorMessage = 'Server error. Please try again later.'
         } else if (data?.message) {
-          errorMessage = data.message;
+          errorMessage = data.message
         }
       } else if (error instanceof Error) {
         // Log non-Axios error with full details
-        logger.error("Non-Axios error details:", {
+        logger.error('Non-Axios error details:', {
           name: error.name,
           message: error.message,
           stack: error.stack,
-          error: JSON.stringify(error, Object.getOwnPropertyNames(error), 2),
-        });
+          error: JSON.stringify(error, Object.getOwnPropertyNames(error), 2)
+        })
       } else {
         // Log any other type of error
-        logger.error("Unknown error type:", {
+        logger.error('Unknown error type:', {
           error: JSON.stringify(error, null, 2),
-          type: typeof error,
-        });
+          type: typeof error
+        })
       }
 
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: errorMessage,
+          group: 'alert',
+          type: 'danger',
+          title: 'Error',
+          text: errorMessage
         },
-        5000,
-      );
-      this.uploading = false;
-      this.blob = undefined;
+        5000
+      )
+      this.uploading = false
+      this.blob = undefined
     }
   }
 }
 </script>
 
 <style>
-/* Dialog overlay styling */
 .dialog-overlay {
   z-index: 60;
   position: fixed;
@@ -605,50 +353,11 @@ export default class PhotoDialog extends Vue {
   padding: 1.5rem;
 }
 
-/* Dialog container styling */
 .dialog {
   background-color: white;
   padding: 1rem;
   border-radius: 0.5rem;
   width: 100%;
   max-width: 700px;
-  max-height: 90vh;
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-}
-
-/* Camera preview styling */
-.camera-preview {
-  flex: 1;
-  background-color: #000;
-  overflow: hidden;
-  position: relative;
-}
-
-.camera-container {
-  width: 100%;
-  height: 100%;
-  position: relative;
-}
-
-.camera-video {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}
-
-.capture-button {
-  position: absolute;
-  bottom: 1rem;
-  left: 50%;
-  transform: translateX(-50%);
-  background: linear-gradient(to bottom, #60a5fa, #2563eb);
-  color: white;
-  padding: 0.75rem 1.5rem;
-  border-radius: 9999px;
-  box-shadow: inset 0 -1px 0 0 rgba(0, 0, 0, 0.5);
-  border: none;
-  cursor: pointer;
 }
 </style>

src/components/ProjectIcon.vue

@@ -15,35 +15,35 @@
   />
 </template>
 <script lang="ts">
-import { toSvg } from "jdenticon";
-import { Vue, Component, Prop } from "vue-facing-decorator";
+import { toSvg } from 'jdenticon'
+import { Vue, Component, Prop } from 'vue-facing-decorator'
 
 const BLANK_CONFIG = {
   lightness: {
     color: [1.0, 1.0],
-    grayscale: [1.0, 1.0],
+    grayscale: [1.0, 1.0]
   },
   saturation: {
     color: 0.0,
-    grayscale: 0.0,
+    grayscale: 0.0
   },
-  backColor: "#0000",
-};
+  backColor: '#0000'
+}
 
 @Component
 export default class ProjectIcon extends Vue {
-  @Prop entityId = "";
-  @Prop iconSize = 0;
-  @Prop imageUrl = "";
-  @Prop linkToFull = false;
+  @Prop entityId = ''
+  @Prop iconSize = 0
+  @Prop imageUrl = ''
+  @Prop linkToFull = false
 
   generateIdenticon() {
     if (this.imageUrl) {
-      return `<img src="${this.imageUrl}" class="w-full h-full object-contain" />`;
+      return `<img src="${this.imageUrl}" class="w-full h-full object-contain" />`
     } else {
-      const config = this.entityId ? undefined : BLANK_CONFIG;
-      const svgString = toSvg(this.entityId, this.iconSize, config);
-      return svgString;
+      const config = this.entityId ? undefined : BLANK_CONFIG
+      const svgString = toSvg(this.entityId, this.iconSize, config)
+      return svgString
     }
   }
 }

src/components/PushNotificationPermission.vue

@@ -45,7 +45,7 @@
               >
               <!-- eslint-enable -->
               <span class="w-full flex justify-between text-xs text-slate-500">
-                <span></span>
+                <span />
                 <span>(100 characters max)</span>
               </span>
             </div>
@@ -79,8 +79,8 @@
             <button
               class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white mt-2 px-2 py-2 rounded-md"
               @click="
-                close();
-                turnOnNotifications();
+                close()
+                turnOnNotifications()
               "
             >
               Turn on Daily Message
@@ -100,46 +100,46 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
+import { Component, Vue } from 'vue-facing-decorator'
 
-import { DEFAULT_PUSH_SERVER, NotificationIface } from "../constants/app";
+import { DEFAULT_PUSH_SERVER, NotificationIface } from '../constants/app'
 import {
   logConsoleAndDb,
   retrieveSettingsForActiveAccount,
-  secretDB,
-} from "../db/index";
-import { MASTER_SECRET_KEY } from "../db/tables/secret";
-import { urlBase64ToUint8Array } from "../libs/crypto/vc/util";
-import * as libsUtil from "../libs/util";
-import { logger } from "../utils/logger";
+  secretDB
+} from '../db/index'
+import { MASTER_SECRET_KEY } from '../db/tables/secret'
+import { urlBase64ToUint8Array } from '../libs/crypto/vc/util'
+import * as libsUtil from '../libs/util'
+import { logger } from '../utils/logger'
 
 // Example interface for error
 interface ErrorResponse {
-  message: string;
+  message: string
 }
 
 // PushSubscriptionJSON is defined in the Push API https://www.w3.org/TR/push-api/#dom-pushsubscriptionjson
 interface PushSubscriptionWithTime extends PushSubscriptionJSON {
-  message?: string;
-  notifyTime: { utcHour: number; minute: number };
-  notifyType: string;
+  message?: string
+  notifyTime: { utcHour: number; minute: number }
+  notifyType: string
 }
 
 interface ServiceWorkerMessage {
-  type: string;
-  data: string;
+  type: string
+  data: string
 }
 
 interface ServiceWorkerResponse {
   // Define the properties and their types
-  success: boolean;
-  message?: string;
+  success: boolean
+  message?: string
 }
 
 interface VapidResponse {
   data: {
-    vapidKey: string;
-  };
+    vapidKey: string
+  }
 }
 
 @Component
@@ -147,135 +147,135 @@ export default class PushNotificationPermission extends Vue {
   // eslint-disable-next-line
   $notify!: (notification: NotificationIface, timeout?: number) => Promise<() => void>;
 
-  DAILY_CHECK_TITLE = libsUtil.DAILY_CHECK_TITLE;
-  DIRECT_PUSH_TITLE = libsUtil.DIRECT_PUSH_TITLE;
+  DAILY_CHECK_TITLE = libsUtil.DAILY_CHECK_TITLE
+  DIRECT_PUSH_TITLE = libsUtil.DIRECT_PUSH_TITLE
 
   callback: (success: boolean, time: string, message?: string) => void =
-    () => {};
-  hourAm = true;
-  hourInput = "8";
-  isVisible = false;
-  messageInput = "";
-  minuteInput = "00";
-  pushType = "";
-  serviceWorkerReady = false;
-  vapidKey = "";
+    () => {}
+  hourAm = true
+  hourInput = '8'
+  isVisible = false
+  messageInput = ''
+  minuteInput = '00'
+  pushType = ''
+  serviceWorkerReady = false
+  vapidKey = ''
 
   async open(
     pushType: string,
-    callback?: (success: boolean, time: string, message?: string) => void,
+    callback?: (success: boolean, time: string, message?: string) => void
   ) {
-    this.callback = callback || this.callback;
-    this.isVisible = true;
-    this.pushType = pushType;
+    this.callback = callback || this.callback
+    this.isVisible = true
+    this.pushType = pushType
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      let pushUrl = DEFAULT_PUSH_SERVER;
+      const settings = await retrieveSettingsForActiveAccount()
+      let pushUrl = DEFAULT_PUSH_SERVER
       if (settings?.webPushServer) {
-        pushUrl = settings.webPushServer;
+        pushUrl = settings.webPushServer
       }
 
-      if (pushUrl.startsWith("http://localhost")) {
-        logConsoleAndDb("Not checking for VAPID in this local environment.");
+      if (pushUrl.startsWith('http://localhost')) {
+        logConsoleAndDb('Not checking for VAPID in this local environment.')
       } else {
-        let responseData = "";
+        let responseData = ''
         await this.axios
-          .get(pushUrl + "/web-push/vapid")
+          .get(pushUrl + '/web-push/vapid')
           .then((response: VapidResponse) => {
-            this.vapidKey = response.data?.vapidKey || "";
-            logConsoleAndDb("Got vapid key: " + this.vapidKey);
-            responseData = JSON.stringify(response.data);
+            this.vapidKey = response.data?.vapidKey || ''
+            logConsoleAndDb('Got vapid key: ' + this.vapidKey)
+            responseData = JSON.stringify(response.data)
             navigator.serviceWorker?.addEventListener(
-              "controllerchange",
+              'controllerchange',
               () => {
                 logConsoleAndDb(
-                  "New service worker is now controlling the page",
-                );
-              },
-            );
-          });
+                  'New service worker is now controlling the page'
+                )
+              }
+            )
+          })
         if (!this.vapidKey) {
           this.$notify(
             {
-              group: "alert",
-              type: "danger",
-              title: "Error Setting Notifications",
-              text: "Could not set notifications.",
+              group: 'alert',
+              type: 'danger',
+              title: 'Error Setting Notifications',
+              text: 'Could not set notifications.'
             },
-            5000,
-          );
+            5000
+          )
           logConsoleAndDb(
             "Error Setting Notifications: web push server response didn't have vapidKey: " +
               responseData,
-            true,
-          );
+            true
+          )
         }
       }
     } catch (error) {
-      if (window.location.host.startsWith("localhost")) {
+      if (window.location.host.startsWith('localhost')) {
         logConsoleAndDb(
-          "Ignoring the error getting VAPID for local development.",
-        );
+          'Ignoring the error getting VAPID for local development.'
+        )
       } else {
         logConsoleAndDb(
-          "Got an error initializing notifications: " + JSON.stringify(error),
-          true,
-        );
+          'Got an error initializing notifications: ' + JSON.stringify(error),
+          true
+        )
         this.$notify(
           {
-            group: "alert",
-            type: "danger",
-            title: "Error Setting Notifications",
-            text: "Got an error setting notifications.",
+            group: 'alert',
+            type: 'danger',
+            title: 'Error Setting Notifications',
+            text: 'Got an error setting notifications.'
           },
-          5000,
-        );
+          5000
+        )
       }
     }
     // there may be a long pause here on first initialization
     navigator.serviceWorker?.ready.then(() => {
-      this.serviceWorkerReady = true;
-    });
+      this.serviceWorkerReady = true
+    })
 
     if (this.pushType === this.DIRECT_PUSH_TITLE) {
       this.messageInput =
-        "Click to share some gratitude with the world -- even if they're unnamed.";
+        "Click to share some gratitude with the world -- even if they're unnamed."
       // focus on the message input
       setTimeout(function () {
-        document.getElementById("push-message")?.focus();
-      }, 100);
+        document.getElementById('push-message')?.focus()
+      }, 100)
     } else {
       // not critical but doesn't make sense in a daily check
-      this.messageInput = "";
+      this.messageInput = ''
     }
   }
 
   private close() {
-    this.isVisible = false;
+    this.isVisible = false
   }
 
   private sendMessageToServiceWorker(
-    message: ServiceWorkerMessage,
+    message: ServiceWorkerMessage
   ): Promise<unknown> {
     return new Promise((resolve, reject) => {
       if (navigator.serviceWorker?.controller) {
-        const messageChannel = new MessageChannel();
+        const messageChannel = new MessageChannel()
 
         messageChannel.port1.onmessage = (event: MessageEvent) => {
           if (event.data.error) {
-            reject(event.data.error as ErrorResponse);
+            reject(event.data.error as ErrorResponse)
           } else {
-            resolve(event.data as ServiceWorkerResponse);
+            resolve(event.data as ServiceWorkerResponse)
           }
-        };
+        }
 
         navigator.serviceWorker?.controller.postMessage(message, [
-          messageChannel.port2,
-        ]);
+          messageChannel.port2
+        ])
       } else {
-        reject("Service worker controller not available");
+        reject('Service worker controller not available')
       }
-    });
+    })
   }
 
   private async askPermission(): Promise<NotificationPermission> {
@@ -283,136 +283,136 @@ export default class PushNotificationPermission extends Vue {
     //   "Requesting permission for notifications: " + JSON.stringify(navigator),
     // );
     if (
-      !("serviceWorker" in navigator && navigator.serviceWorker?.controller)
+      !('serviceWorker' in navigator && navigator.serviceWorker?.controller)
     ) {
-      return Promise.reject("Service worker not available.");
+      return Promise.reject('Service worker not available.')
     }
 
-    await secretDB.open();
-    const secret = (await secretDB.secret.get(MASTER_SECRET_KEY))?.secret;
+    await secretDB.open()
+    const secret = (await secretDB.secret.get(MASTER_SECRET_KEY))?.secret
     if (!secret) {
-      return Promise.reject("No secret found.");
+      return Promise.reject('No secret found.')
     }
 
     return this.sendSecretToServiceWorker(secret)
       .then(() => this.checkNotificationSupport())
       .then(() => this.requestNotificationPermission())
-      .catch((error) => Promise.reject(error));
+      .catch((error) => Promise.reject(error))
   }
 
   private sendSecretToServiceWorker(secret: string): Promise<void> {
     const message: ServiceWorkerMessage = {
-      type: "SEND_LOCAL_DATA",
-      data: secret,
-    };
+      type: 'SEND_LOCAL_DATA',
+      data: secret
+    }
 
     return this.sendMessageToServiceWorker(message).then((response) => {
       logConsoleAndDb(
-        "Response from service worker: " + JSON.stringify(response),
-      );
-    });
+        'Response from service worker: ' + JSON.stringify(response)
+      )
+    })
   }
 
   private checkNotificationSupport(): Promise<void> {
-    if (!("Notification" in window)) {
+    if (!('Notification' in window)) {
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Browser Notifications Are Not Supported",
-          text: "This browser does not support notifications.",
+          group: 'alert',
+          type: 'danger',
+          title: 'Browser Notifications Are Not Supported',
+          text: 'This browser does not support notifications.'
         },
-        3000,
-      );
-      return Promise.reject("This browser does not support notifications.");
+        3000
+      )
+      return Promise.reject('This browser does not support notifications.')
     }
-    if (window.Notification.permission === "granted") {
-      return Promise.resolve();
+    if (window.Notification.permission === 'granted') {
+      return Promise.resolve()
     }
-    return Promise.resolve();
+    return Promise.resolve()
   }
 
   private requestNotificationPermission(): Promise<NotificationPermission> {
     return window.Notification.requestPermission().then(
       (permission: string) => {
-        if (permission !== "granted") {
+        if (permission !== 'granted') {
           this.$notify(
             {
-              group: "alert",
-              type: "danger",
-              title: "Error Requesting Notification Permission",
+              group: 'alert',
+              type: 'danger',
+              title: 'Error Requesting Notification Permission',
               text:
-                "Allow this app permission to make notifications for personal reminders." +
-                " You can adjust them at any time in your settings.",
+                'Allow this app permission to make notifications for personal reminders.' +
+                ' You can adjust them at any time in your settings.'
             },
-            -1,
-          );
-          throw new Error("Permission was not granted to this app.");
+            -1
+          )
+          throw new Error('Permission was not granted to this app.')
         }
-        return permission;
-      },
-    );
+        return permission
+      }
+    )
   }
 
   private checkHourInput() {
-    const hourNum = parseInt(this.hourInput);
+    const hourNum = parseInt(this.hourInput)
     if (isNaN(hourNum)) {
-      this.hourInput = "12";
+      this.hourInput = '12'
     } else if (hourNum < 1) {
-      this.hourInput = "12";
-      this.hourAm = !this.hourAm;
+      this.hourInput = '12'
+      this.hourAm = !this.hourAm
     } else if (hourNum > 12) {
-      this.hourInput = "1";
-      this.hourAm = !this.hourAm;
+      this.hourInput = '1'
+      this.hourAm = !this.hourAm
     } else {
-      this.hourInput = hourNum.toString();
+      this.hourInput = hourNum.toString()
     }
   }
 
   private checkMinuteInput() {
-    const minuteNum = parseInt(this.minuteInput);
+    const minuteNum = parseInt(this.minuteInput)
     if (isNaN(minuteNum)) {
-      this.minuteInput = "00";
+      this.minuteInput = '00'
     } else if (minuteNum < 0) {
-      this.minuteInput = "59";
+      this.minuteInput = '59'
     } else if (minuteNum < 10) {
-      this.minuteInput = "0" + minuteNum;
+      this.minuteInput = '0' + minuteNum
     } else if (minuteNum > 59) {
-      this.minuteInput = "00";
+      this.minuteInput = '00'
     } else {
-      this.minuteInput = minuteNum.toString();
+      this.minuteInput = minuteNum.toString()
     }
   }
 
   private async turnOnNotifications() {
-    let notifyCloser = () => {};
+    let notifyCloser = () => {}
     return this.askPermission()
       .then((permission) => {
-        logConsoleAndDb("Permission granted: " + JSON.stringify(permission));
+        logConsoleAndDb('Permission granted: ' + JSON.stringify(permission))
 
         // Call the function and handle promises
-        return this.subscribeToPush();
+        return this.subscribeToPush()
       })
       .then(() => {
-        logConsoleAndDb("Subscribed successfully.");
-        return navigator.serviceWorker?.ready;
+        logConsoleAndDb('Subscribed successfully.')
+        return navigator.serviceWorker?.ready
       })
       .then((registration) => {
-        return registration.pushManager.getSubscription();
+        return registration.pushManager.getSubscription()
       })
       .then(async (subscription) => {
         if (subscription) {
           notifyCloser = await this.$notify(
             {
-              group: "alert",
-              type: "info",
-              title: "Notification Setup Underway",
-              text: "Setting up notifications for interesting activity, which takes about 10 seconds. If you don't see a final confirmation, check the 'Troubleshoot' page.",
+              group: 'alert',
+              type: 'info',
+              title: 'Notification Setup Underway',
+              text: "Setting up notifications for interesting activity, which takes about 10 seconds. If you don't see a final confirmation, check the 'Troubleshoot' page."
             },
-            -1,
-          );
+            -1
+          )
           // we already checked that this is a valid hour number
-          const rawHourNum = libsUtil.numberOrZero(this.hourInput);
+          const rawHourNum = libsUtil.numberOrZero(this.hourInput)
           const adjHourNum = this.hourAm
             ? // If it's AM, then we'll change it to 0 for 12 AM but otherwise use rawHourNum
               rawHourNum === 12
@@ -421,153 +421,153 @@ export default class PushNotificationPermission extends Vue {
             : // Otherwise it's PM, so keep a 12 but otherwise add 12
               rawHourNum === 12
               ? 12
-              : rawHourNum + 12;
-          const hourNum = adjHourNum % 24; // probably unnecessary now
+              : rawHourNum + 12
+          const hourNum = adjHourNum % 24 // probably unnecessary now
           const utcHour =
-            hourNum + Math.round(new Date().getTimezoneOffset() / 60);
-          const finalUtcHour = (utcHour + (utcHour < 0 ? 24 : 0)) % 24;
-          const minuteNum = libsUtil.numberOrZero(this.minuteInput);
+            hourNum + Math.round(new Date().getTimezoneOffset() / 60)
+          const finalUtcHour = (utcHour + (utcHour < 0 ? 24 : 0)) % 24
+          const minuteNum = libsUtil.numberOrZero(this.minuteInput)
           const utcMinute =
-            minuteNum + Math.round(new Date().getTimezoneOffset() % 60);
-          const finalUtcMinute = (utcMinute + (utcMinute < 0 ? 60 : 0)) % 60;
+            minuteNum + Math.round(new Date().getTimezoneOffset() % 60)
+          const finalUtcMinute = (utcMinute + (utcMinute < 0 ? 60 : 0)) % 60
 
           const subscriptionWithTime: PushSubscriptionWithTime = {
             notifyTime: { utcHour: finalUtcHour, minute: finalUtcMinute },
             notifyType: this.pushType,
             message: this.messageInput,
-            ...subscription.toJSON(),
-          };
-          await this.sendSubscriptionToServer(subscriptionWithTime);
+            ...subscription.toJSON()
+          }
+          await this.sendSubscriptionToServer(subscriptionWithTime)
           // To help investigate potential issues with this: https://firebase.google.com/docs/cloud-messaging/migrate-v1
           logConsoleAndDb(
-            "Subscription data sent to server with endpoint: " +
-              subscription.endpoint,
-          );
-          return subscriptionWithTime;
+            'Subscription data sent to server with endpoint: ' +
+              subscription.endpoint
+          )
+          return subscriptionWithTime
         } else {
-          throw new Error("Subscription object is not available.");
+          throw new Error('Subscription object is not available.')
         }
       })
       .then(async (subscription: PushSubscriptionWithTime) => {
         logConsoleAndDb(
-          "Subscription data sent to server and all finished successfully.",
-        );
-        await libsUtil.sendTestThroughPushServer(subscription, true);
-        notifyCloser();
+          'Subscription data sent to server and all finished successfully.'
+        )
+        await libsUtil.sendTestThroughPushServer(subscription, true)
+        notifyCloser()
         setTimeout(() => {
           this.$notify(
             {
-              group: "alert",
-              type: "success",
-              title: "Notification Is On",
-              text: "You should see at least one on your device; if not, check the 'Troubleshoot' link.",
+              group: 'alert',
+              type: 'success',
+              title: 'Notification Is On',
+              text: "You should see at least one on your device; if not, check the 'Troubleshoot' link."
             },
-            7000,
-          );
-        }, 500);
+            7000
+          )
+        }, 500)
         const timeText =
           // eslint-disable-next-line
           this.hourInput + ":" + this.minuteInput + " " + (this.hourAm ? "AM" : "PM");
-        this.callback(true, timeText, this.messageInput);
+        this.callback(true, timeText, this.messageInput)
       })
       .catch((error) => {
         logConsoleAndDb(
-          "Got an error setting notification permissions: " +
-            " string " +
+          'Got an error setting notification permissions: ' +
+            ' string ' +
             error.toString() +
-            " JSON " +
+            ' JSON ' +
             JSON.stringify(error),
-          true,
-        );
+          true
+        )
         this.$notify(
           {
-            group: "alert",
-            type: "danger",
-            title: "Error Setting Notification Permissions",
-            text: "Could not set notification permissions.",
+            group: 'alert',
+            type: 'danger',
+            title: 'Error Setting Notification Permissions',
+            text: 'Could not set notification permissions.'
           },
-          3000,
-        );
+          3000
+        )
         // if we want to also unsubscribe, be sure to do that only if no other notification is active
-      });
+      })
   }
 
   private subscribeToPush(): Promise<void> {
     return new Promise<void>((resolve, reject) => {
-      if (!("serviceWorker" in navigator && "PushManager" in window)) {
-        const errorMsg = "Push messaging is not supported";
-        logger.warn(errorMsg);
-        return reject(new Error(errorMsg));
+      if (!('serviceWorker' in navigator && 'PushManager' in window)) {
+        const errorMsg = 'Push messaging is not supported'
+        logger.warn(errorMsg)
+        return reject(new Error(errorMsg))
       }
 
-      if (window.Notification.permission !== "granted") {
-        const errorMsg = "Notification permission not granted";
-        logger.warn(errorMsg);
-        return reject(new Error(errorMsg));
+      if (window.Notification.permission !== 'granted') {
+        const errorMsg = 'Notification permission not granted'
+        logger.warn(errorMsg)
+        return reject(new Error(errorMsg))
       }
 
-      const applicationServerKey = urlBase64ToUint8Array(this.vapidKey);
+      const applicationServerKey = urlBase64ToUint8Array(this.vapidKey)
       const options: PushSubscriptionOptions = {
         userVisibleOnly: true,
-        applicationServerKey: applicationServerKey,
-      };
+        applicationServerKey: applicationServerKey
+      }
 
       navigator.serviceWorker?.ready
         .then((registration) => {
-          return registration.pushManager.subscribe(options);
+          return registration.pushManager.subscribe(options)
         })
         .then((subscription) => {
           logConsoleAndDb(
-            "Push subscription successful: " + JSON.stringify(subscription),
-          );
-          resolve();
+            'Push subscription successful: ' + JSON.stringify(subscription)
+          )
+          resolve()
         })
         .catch((error) => {
           logConsoleAndDb(
-            "Push subscription failed: " +
+            'Push subscription failed: ' +
               JSON.stringify(error) +
-              " - " +
+              ' - ' +
               JSON.stringify(options),
-            true,
-          );
+            true
+          )
 
           // Inform the user about the issue
           this.$notify(
             {
-              group: "alert",
-              type: "danger",
-              title: "Error Setting Push Notifications",
+              group: 'alert',
+              type: 'danger',
+              title: 'Error Setting Push Notifications',
               text:
-                "We encountered an issue setting up push notifications. " +
-                "If you wish to revoke notification permissions, please do so in your browser settings.",
+                'We encountered an issue setting up push notifications. ' +
+                'If you wish to revoke notification permissions, please do so in your browser settings.'
             },
-            -1,
-          );
+            -1
+          )
 
-          reject(error);
-        });
-    });
+          reject(error)
+        })
+    })
   }
 
   private sendSubscriptionToServer(
-    subscription: PushSubscriptionWithTime,
+    subscription: PushSubscriptionWithTime
   ): Promise<void> {
     logConsoleAndDb(
-      "About to send subscription... " + JSON.stringify(subscription),
-    );
-    return fetch("/web-push/subscribe", {
-      method: "POST",
+      'About to send subscription... ' + JSON.stringify(subscription)
+    )
+    return fetch('/web-push/subscribe', {
+      method: 'POST',
       headers: {
-        "Content-Type": "application/json",
+        'Content-Type': 'application/json'
       },
-      body: JSON.stringify(subscription),
+      body: JSON.stringify(subscription)
     }).then((response) => {
       if (!response.ok) {
-        logger.error("Bad response subscribing to web push: ", response);
-        throw new Error("Failed to send push subscription to server");
+        logger.error('Bad response subscribing to web push: ', response)
+        throw new Error('Failed to send push subscription to server')
       }
-      logConsoleAndDb("Push subscription sent to server successfully.");
-    });
+      logConsoleAndDb('Push subscription sent to server successfully.')
+    })
   }
 }
 </script>

src/components/QRScanner/CapacitorScanner.ts

@@ -0,0 +1,124 @@
+import {
+  BarcodeScanner,
+  BarcodeFormat,
+  LensFacing,
+  ScanResult
+} from '@capacitor-mlkit/barcode-scanning'
+import type { QRScannerService, ScanListener } from './types'
+import { logger } from '../../utils/logger'
+
+export class CapacitorQRScanner implements QRScannerService {
+  private scanListener: ScanListener | null = null
+  private isScanning = false
+  private listenerHandles: Array<() => Promise<void>> = []
+
+  async checkPermissions() {
+    try {
+      const { camera } = await BarcodeScanner.checkPermissions()
+      return camera === 'granted'
+    } catch (error) {
+      logger.error('Error checking camera permissions:', error)
+      return false
+    }
+  }
+
+  async requestPermissions() {
+    try {
+      const { camera } = await BarcodeScanner.requestPermissions()
+      return camera === 'granted'
+    } catch (error) {
+      logger.error('Error requesting camera permissions:', error)
+      return false
+    }
+  }
+
+  async isSupported() {
+    try {
+      const { supported } = await BarcodeScanner.isSupported()
+      return supported
+    } catch (error) {
+      logger.error('Error checking barcode scanner support:', error)
+      return false
+    }
+  }
+
+  async startScan() {
+    if (this.isScanning) {
+      logger.warn('Scanner is already active')
+      return
+    }
+
+    try {
+      // First register listeners before starting scan
+      await this.registerListeners()
+
+      this.isScanning = true
+      await BarcodeScanner.startScan({
+        formats: [BarcodeFormat.QrCode],
+        lensFacing: LensFacing.Back
+      })
+    } catch (error) {
+      // Ensure cleanup on error
+      this.isScanning = false
+      await this.removeListeners()
+      logger.error('Error starting barcode scan:', error)
+      throw error
+    }
+  }
+
+  private async registerListeners() {
+    try {
+      const handle = await BarcodeScanner.addListener(
+        'barcodesScanned',
+        async (result: ScanResult) => {
+          if (result.barcodes.length > 0 && this.scanListener) {
+            const barcode = result.barcodes[0]
+            this.scanListener.onScan(barcode.rawValue)
+            await this.stopScan()
+          }
+        }
+      )
+      this.listenerHandles.push(() => handle.remove())
+    } catch (error) {
+      logger.error('Error registering barcode listener:', error)
+      throw error
+    }
+  }
+
+  private async removeListeners() {
+    for (const remove of this.listenerHandles) {
+      try {
+        await remove()
+      } catch (error) {
+        logger.error('Error removing listener:', error)
+      }
+    }
+    this.listenerHandles = []
+  }
+
+  async stopScan() {
+    if (!this.isScanning) {
+      return
+    }
+
+    try {
+      // First stop the scan
+      await BarcodeScanner.stopScan()
+    } catch (error) {
+      logger.error('Error stopping barcode scan:', error)
+    } finally {
+      // Always cleanup state even if stop fails
+      this.isScanning = false
+      await this.removeListeners()
+    }
+  }
+
+  addListener(listener: ScanListener): void {
+    this.scanListener = listener
+  }
+
+  async cleanup(): Promise<void> {
+    await this.stopScan()
+    this.scanListener = null
+  }
+}

src/components/QRScanner/QRScannerDialog.vue

@@ -0,0 +1,319 @@
+<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
+          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"
+        >
+          <span v-if="state.isProcessing">{{ state.processingStatus }}</span>
+          <span v-else>Scan QR Code</span>
+        </div>
+
+        <div
+          class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white cursor-pointer"
+          @click="close()"
+        >
+          <font-awesome icon="xmark" class="w-[1em]" />
+        </div>
+      </div>
+
+      <div class="mt-8">
+        <!-- Web QR Code Scanner -->
+        <qrcode-stream
+          v-if="useQRReader"
+          class="w-full max-w-lg mx-auto"
+          @detect="onScanDetect"
+          @error="onScanError"
+        />
+
+        <!-- Mobile Camera Button -->
+        <div v-else class="text-center mt-4">
+          <button
+            v-if="!state.isProcessing"
+            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-4 py-2 rounded-md"
+            @click="openMobileCamera"
+          >
+            Open Camera
+          </button>
+          <div v-else class="text-center">
+            <font-awesome icon="spinner" class="fa-spin fa-3x" />
+            <p class="mt-2">
+              {{ state.processingDetails }}
+            </p>
+          </div>
+        </div>
+
+        <p v-if="state.error" class="mt-4 text-red-500 text-center">
+          {{ state.error }}
+        </p>
+
+        <p class="mt-4 text-sm text-gray-600 text-center">
+          Position the QR code within the camera view to scan
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-facing-decorator'
+import { QrcodeStream } from 'vue-qrcode-reader'
+import { reactive } from 'vue'
+import {
+  BarcodeScanner,
+  type ScanResult
+} from '@capacitor-mlkit/barcode-scanning'
+import type { PluginListenerHandle } from '@capacitor/core'
+import { logger } from '../../utils/logger'
+import { NotificationIface } from '../../constants/app'
+
+// Declare global constants
+declare const __USE_QR_READER__: boolean
+declare const __IS_MOBILE__: boolean
+
+interface AppState {
+  isProcessing: boolean
+  processingStatus: string
+  processingDetails: string
+  error: string
+}
+
+@Component({
+  components: {
+    QrcodeStream
+  }
+})
+export default class QRScannerDialog extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void
+
+  visible = false
+  private scanListener: PluginListenerHandle | null = null
+  private onScanCallback: ((result: string) => void) | null = null
+
+  state = reactive<AppState>({
+    isProcessing: false,
+    processingStatus: '',
+    processingDetails: '',
+    error: ''
+  })
+
+  async open(onScan: (result: string) => void) {
+    this.onScanCallback = onScan
+    this.visible = true
+    this.state.error = ''
+
+    if (!this.useQRReader) {
+      // Check if barcode scanning is supported on mobile
+      try {
+        const { supported } = await BarcodeScanner.isSupported()
+        if (!supported) {
+          this.showError('Barcode scanning is not supported on this device')
+          return
+        }
+      } catch (error) {
+        this.showError('Failed to check barcode scanner support')
+        return
+      }
+    }
+  }
+
+  close() {
+    this.visible = false
+    this.stopScanning().catch((error) => {
+      logger.error('Error stopping scanner during close:', error)
+    })
+    this.onScanCallback = null
+  }
+
+  async openMobileCamera() {
+    try {
+      this.state.isProcessing = true
+      this.state.processingStatus = 'Starting camera...'
+      logger.log('Opening mobile camera - starting initialization')
+
+      // Check current permission status
+      const status = await BarcodeScanner.checkPermissions()
+      logger.log('Camera permission status:', JSON.stringify(status, null, 2))
+
+      if (status.camera !== 'granted') {
+        // Request permission if not granted
+        logger.log('Requesting camera permissions...')
+        const permissionStatus = await BarcodeScanner.requestPermissions()
+        if (permissionStatus.camera !== 'granted') {
+          throw new Error('Camera permission not granted')
+        }
+        logger.log(
+          'Camera permission granted:',
+          JSON.stringify(permissionStatus, null, 2)
+        )
+      }
+
+      // Remove any existing listener first
+      await this.cleanupScanListener()
+
+      // Set up the listener before starting the scan
+      logger.log('Setting up new barcode listener')
+      this.scanListener = await BarcodeScanner.addListener(
+        'barcodesScanned',
+        async (result: ScanResult) => {
+          logger.log(
+            'Barcode scan result received:',
+            JSON.stringify(result, null, 2)
+          )
+          if (result.barcodes && result.barcodes.length > 0) {
+            this.state.processingDetails = `Processing QR code: ${result.barcodes[0].rawValue}`
+            await this.handleScanResult(result.barcodes[0].rawValue)
+          }
+        }
+      )
+      logger.log('Barcode listener setup complete')
+
+      // Start the scanner
+      logger.log('Starting barcode scanner')
+      await BarcodeScanner.startScan()
+      logger.log('Barcode scanner started successfully')
+
+      this.state.isProcessing = false
+      this.state.processingStatus = ''
+    } catch (error) {
+      logger.error('Failed to open camera:', error)
+      this.state.isProcessing = false
+      this.state.processingStatus = ''
+      this.showError(
+        error instanceof Error ? error.message : 'Failed to open camera'
+      )
+
+      // Cleanup on error
+      await this.cleanupScanListener()
+    }
+  }
+
+  private async handleScanResult(rawValue: string) {
+    try {
+      this.state.isProcessing = true
+      this.state.processingStatus = 'Processing QR code...'
+      this.state.processingDetails = `Scanned value: ${rawValue}`
+
+      // Stop scanning before processing
+      await this.stopScanning()
+
+      if (this.onScanCallback) {
+        await this.onScanCallback(rawValue)
+        // Only close after the callback is complete
+        this.close()
+      }
+    } catch (error) {
+      logger.error('Error handling scan result:', error)
+      this.showError('Failed to process scan result')
+    } finally {
+      this.state.isProcessing = false
+      this.state.processingStatus = ''
+      this.state.processingDetails = ''
+    }
+  }
+
+  private async cleanupScanListener() {
+    try {
+      if (this.scanListener) {
+        await this.scanListener.remove()
+        this.scanListener = null
+      }
+    } catch (error) {
+      logger.error('Error removing scan listener:', error)
+    }
+  }
+
+  async stopScanning() {
+    try {
+      await this.cleanupScanListener()
+
+      if (!this.useQRReader) {
+        // Stop the native scanner
+        await BarcodeScanner.stopScan()
+      }
+    } catch (error) {
+      logger.error('Error stopping scanner:', error)
+      throw error
+    }
+  }
+
+  // Web QR reader handlers
+  async onScanDetect(result: { rawValue: string }) {
+    await this.handleScanResult(result.rawValue)
+  }
+
+  onScanError(error: Error) {
+    logger.error('Scan error:', error)
+    this.showError('Failed to scan QR code')
+  }
+
+  private showError(message: string) {
+    this.state.error = message
+    this.$notify(
+      {
+        group: 'alert',
+        type: 'danger',
+        title: 'Error',
+        text: message
+      },
+      5000
+    )
+  }
+
+  get useQRReader(): boolean {
+    return __USE_QR_READER__
+  }
+
+  get isMobile(): boolean {
+    return __IS_MOBILE__
+  }
+}
+</script>
+
+<style>
+.dialog-overlay {
+  z-index: 60;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem;
+}
+
+.dialog {
+  background-color: white;
+  padding: 1rem;
+  border-radius: 0.5rem;
+  width: 100%;
+  max-width: 700px;
+  position: relative;
+  z-index: 61;
+}
+
+/* Add styles for the camera preview */
+.qrcode-stream {
+  position: relative;
+  z-index: 62;
+}
+
+.qrcode-stream video {
+  width: 100%;
+  height: auto;
+  max-height: 70vh;
+  object-fit: contain;
+}
+
+/* Ensure mobile camera elements are also properly layered */
+.barcode-scanner-container {
+  position: relative;
+  z-index: 62;
+  width: 100%;
+  height: 100%;
+}
+</style>

src/components/QRScanner/WebDialogQRScanner.ts

@@ -0,0 +1,74 @@
+import type { QRScannerService, ScanListener } from './types'
+import QRScannerDialog from './QRScannerDialog.vue'
+import { createApp, type App } from 'vue'
+import { logger } from '../../utils/logger'
+
+// Import platform-specific flags from Vite config
+declare const __USE_QR_READER__: boolean
+
+export class WebDialogQRScanner implements QRScannerService {
+  private dialogApp: App | null = null
+  private dialogElement: HTMLDivElement | null = null
+  private scanListener: ScanListener | null = null
+
+  async checkPermissions(): Promise<boolean> {
+    return navigator?.mediaDevices !== undefined
+  }
+
+  async requestPermissions(): Promise<boolean> {
+    try {
+      const stream = await navigator.mediaDevices.getUserMedia({ video: true })
+      stream.getTracks().forEach((track) => track.stop())
+      return true
+    } catch (error) {
+      logger.error('Failed to get camera permissions:', error)
+      return false
+    }
+  }
+
+  async isSupported(): Promise<boolean> {
+    return Promise.resolve(
+      __USE_QR_READER__ && navigator?.mediaDevices !== undefined
+    )
+  }
+
+  async startScan(): Promise<void> {
+    if (!(await this.isSupported())) {
+      throw new Error('QR scanning is not supported in this environment')
+    }
+
+    this.dialogElement = document.createElement('div')
+    document.body.appendChild(this.dialogElement)
+
+    this.dialogApp = createApp(QRScannerDialog, {
+      onScan: (result: string) => {
+        if (this.scanListener) {
+          this.scanListener.onScan(result)
+        }
+      },
+      onClose: () => {
+        this.stopScan()
+      }
+    })
+
+    this.dialogApp.mount(this.dialogElement)
+  }
+
+  async stopScan(): Promise<void> {
+    if (this.dialogApp && this.dialogElement) {
+      this.dialogApp.unmount()
+      this.dialogElement.remove()
+      this.dialogApp = null
+      this.dialogElement = null
+    }
+  }
+
+  addListener(listener: ScanListener): void {
+    this.scanListener = listener
+  }
+
+  async cleanup(): Promise<void> {
+    await this.stopScan()
+    this.scanListener = null
+  }
+}

src/components/QRScanner/factory.ts

@@ -0,0 +1,38 @@
+import { Capacitor } from '@capacitor/core'
+import type { QRScannerService } from './types'
+import { logger } from '../../utils/logger'
+import { WebDialogQRScanner } from './WebDialogScanner'
+import { CapacitorQRScanner } from './CapacitorScanner'
+
+// Import platform-specific flags from Vite config
+declare const __USE_QR_READER__: boolean
+declare const __IS_MOBILE__: boolean
+
+export class QRScannerFactory {
+  private static instance: QRScannerService | null = null
+
+  static getInstance(): QRScannerService {
+    if (!this.instance) {
+      // Use platform-specific flags for more accurate detection
+      if (__IS_MOBILE__ || Capacitor.isNativePlatform()) {
+        logger.log('Creating native QR scanner instance')
+        this.instance = new CapacitorQRScanner()
+      } else if (__USE_QR_READER__) {
+        logger.log('Creating web QR scanner instance')
+        this.instance = new WebDialogQRScanner()
+      } else {
+        throw new Error(
+          'No QR scanner implementation available for this platform'
+        )
+      }
+    }
+    return this.instance
+  }
+
+  static async cleanup() {
+    if (this.instance) {
+      await this.instance.cleanup()
+      this.instance = null
+    }
+  }
+}

src/components/QRScanner/types.ts

@@ -0,0 +1,14 @@
+export interface ScanListener {
+  onScan: (result: string) => void
+  onError?: (error: Error) => void
+}
+
+export interface QRScannerService {
+  checkPermissions(): Promise<boolean>
+  requestPermissions(): Promise<boolean>
+  isSupported(): Promise<boolean>
+  startScan(): Promise<void>
+  stopScan(): Promise<void>
+  addListener(listener: ScanListener): void
+  cleanup(): Promise<void>
+}

src/components/QuickNav.vue

@@ -1,9 +1,6 @@
 <template>
   <!-- QUICK NAV -->
-  <nav
-    id="QuickNav"
-    class="fixed bottom-0 left-0 right-0 bg-slate-200 z-50 pb-[env(safe-area-inset-bottom)]"
-  >
+  <nav id="QuickNav" class="fixed bottom-0 left-0 right-0 bg-slate-200 z-50">
     <ul class="flex text-2xl px-6 py-2 gap-1 max-w-3xl mx-auto">
       <!-- Home Feed -->
       <li
@@ -11,7 +8,7 @@
           'basis-1/5': true,
           'rounded-md': true,
           'bg-slate-400 text-white': selected === 'Home',
-          'text-slate-500': selected !== 'Home',
+          'text-slate-500': selected !== 'Home'
         }"
       >
         <router-link :to="{ name: 'home' }" class="block text-center py-2 px-1">
@@ -27,7 +24,7 @@
           'basis-1/5': true,
           'rounded-md': true,
           'bg-slate-400 text-white': selected === 'Discover',
-          'text-slate-500': selected !== 'Discover',
+          'text-slate-500': selected !== 'Discover'
         }"
       >
         <router-link
@@ -46,7 +43,7 @@
           'basis-1/5': true,
           'rounded-md': true,
           'bg-slate-400 text-white': selected === 'Projects',
-          'text-slate-500': selected !== 'Projects',
+          'text-slate-500': selected !== 'Projects'
         }"
       >
         <router-link
@@ -65,7 +62,7 @@
           'basis-1/5': true,
           'rounded-md': true,
           'bg-slate-400 text-white': selected === 'Contacts',
-          'text-slate-500': selected !== 'Contacts',
+          'text-slate-500': selected !== 'Contacts'
         }"
       >
         <router-link
@@ -84,7 +81,7 @@
           'basis-1/5': true,
           'rounded-md': true,
           'bg-slate-400 text-white': selected === 'Profile',
-          'text-slate-500': selected !== 'Profile',
+          'text-slate-500': selected !== 'Profile'
         }"
       >
         <router-link
@@ -109,10 +106,10 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-facing-decorator";
+import { Component, Vue, Prop } from 'vue-facing-decorator'
 
 @Component
 export default class QuickNav extends Vue {
-  @Prop selected = "";
+  @Prop selected = ''
 }
 </script>

src/components/TopMessage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="absolute right-5 top-[calc(env(safe-area-inset-top)+0.75rem)]">
+  <div class="absolute right-5 top-3">
     <span class="align-center text-red-500 mr-2">{{ message }}</span>
     <span class="ml-2">
       <router-link
@@ -13,46 +13,46 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-facing-decorator";
+import { Component, Vue, Prop } from 'vue-facing-decorator'
 
-import { AppString, NotificationIface } from "../constants/app";
-import { retrieveSettingsForActiveAccount } from "../db/index";
+import { AppString, NotificationIface } from '../constants/app'
+import { retrieveSettingsForActiveAccount } from '../db/index'
 
 @Component
 export default class TopMessage extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void
 
-  @Prop selected = "";
+  @Prop selected = ''
 
-  message = "";
+  message = ''
 
   async mounted() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      const settings = await retrieveSettingsForActiveAccount()
       if (
         settings.warnIfTestServer &&
         settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER
       ) {
-        const didPrefix = settings.activeDid?.slice(11, 15);
-        this.message = "You're linked to a non-prod server, user " + didPrefix;
+        const didPrefix = settings.activeDid?.slice(11, 15)
+        this.message = "You're linked to a non-prod server, user " + didPrefix
       } else if (
         settings.warnIfProdServer &&
         settings.apiServer === AppString.PROD_ENDORSER_API_SERVER
       ) {
-        const didPrefix = settings.activeDid?.slice(11, 15);
+        const didPrefix = settings.activeDid?.slice(11, 15)
         this.message =
-          "You're linked to the production server, user " + didPrefix;
+          "You're linked to the production server, user " + didPrefix
       }
     } catch (err: unknown) {
       this.$notify(
         {
-          group: "alert",
-          type: "danger",
-          title: "Error Detecting Server",
-          text: JSON.stringify(err),
+          group: 'alert',
+          type: 'danger',
+          title: 'Error Detecting Server',
+          text: JSON.stringify(err)
         },
-        -1,
-      );
+        -1
+      )
     }
   }
 }