feat: add missing settings management functions

- Add getSettingsForAccount() to retrieve complete settings for any account DID
- Add getAccountSpecificSettings() to get account-specific settings without defaults
- Add mergeSettings() for consistent settings merging across SQLite and Dexie
- Update retrieveSettingsForActiveAccount() to use new mergeSettings() function
- Improve error handling and logging for settings operations
- Maintain backward compatibility with existing settings API

This provides better settings management capabilities for account switching,
debugging, and data validation while ensuring consistent behavior across
both SQLite and Dexie storage implementations.

.cursor/rules/SQLITE.mdc

@@ -1,172 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: true
----
-# @capacitor-community/sqlite MDC Ruleset
-
-## Project Overview
-This ruleset is for the `@capacitor-community/sqlite` plugin, a Capacitor community plugin that provides native and Electron SQLite database functionality with encryption support.
-
-## Key Features
-- Native SQLite database support for iOS, Android, and Electron
-- Database encryption support using SQLCipher (Native) and better-sqlite3-multiple-ciphers (Electron)
-- Biometric authentication support
-- Cross-platform database operations
-- JSON import/export capabilities
-- Database migration support
-- Sync table functionality
-
-## Platform Support Matrix
-
-### Core Database Operations
-| Operation | Android | iOS | Electron | Web |
-|-----------|---------|-----|----------|-----|
-| Create Connection (RW) | ✅ | ✅ | ✅ | ✅ |
-| Create Connection (RO) | ✅ | ✅ | ✅ | ❌ |
-| Open DB (non-encrypted) | ✅ | ✅ | ✅ | ✅ |
-| Open DB (encrypted) | ✅ | ✅ | ✅ | ❌ |
-| Execute/Query | ✅ | ✅ | ✅ | ✅ |
-| Import/Export JSON | ✅ | ✅ | ✅ | ✅ |
-
-### Security Features
-| Feature | Android | iOS | Electron | Web |
-|---------|---------|-----|----------|-----|
-| Encryption | ✅ | ✅ | ✅ | ❌ |
-| Biometric Auth | ✅ | ✅ | ✅ | ❌ |
-| Secret Management | ✅ | ✅ | ✅ | ❌ |
-
-## Configuration Requirements
-
-### Base Configuration
-```typescript
-// capacitor.config.ts
-{
-  plugins: {
-    CapacitorSQLite: {
-      iosDatabaseLocation: 'Library/CapacitorDatabase',
-      iosIsEncryption: true,
-      iosKeychainPrefix: 'your-app-prefix',
-      androidIsEncryption: true,
-      electronIsEncryption: true
-    }
-  }
-}
-```
-
-### Platform-Specific Requirements
-
-#### Android
-- Minimum SDK: 23
-- Target SDK: 35
-- Required Gradle JDK: 21
-- Required Android Gradle Plugin: 8.7.2
-- Required manifest settings for backup prevention
-- Required data extraction rules
-
-#### iOS
-- No additional configuration needed beyond base setup
-- Supports biometric authentication
-- Uses keychain for encryption
-
-#### Electron
-Required dependencies:
-```json
-{
-  "dependencies": {
-    "better-sqlite3-multiple-ciphers": "latest",
-    "electron-json-storage": "latest",
-    "jszip": "latest",
-    "node-fetch": "2.6.7",
-    "crypto": "latest",
-    "crypto-js": "latest"
-  }
-}
-```
-
-#### Web
-- Requires `sql.js` and `jeep-sqlite`
-- Manual copy of `sql-wasm.wasm` to assets folder
-- Framework-specific asset placement:
-  - Angular: `src/assets/`
-  - Vue/React: `public/assets/`
-
-## Best Practices
-
-### Database Operations
-1. Always close connections after use
-2. Use transactions for multiple operations
-3. Implement proper error handling
-4. Use prepared statements for queries
-5. Implement proper database versioning
-
-### Security
-1. Always use encryption for sensitive data
-2. Implement proper secret management
-3. Use biometric authentication when available
-4. Follow platform-specific security guidelines
-
-### Performance
-1. Use appropriate indexes
-2. Implement connection pooling
-3. Use transactions for bulk operations
-4. Implement proper database cleanup
-
-## Common Issues and Solutions
-
-### Android
-- Build data properties conflict: Add to `app/build.gradle`:
-  ```gradle
-  packagingOptions {
-      exclude 'build-data.properties'
-  }
-  ```
-
-### Electron
-- Node-fetch version must be ≤2.6.7
-- For Capacitor Electron v5:
-  - Use Electron@25.8.4
-  - Add `"skipLibCheck": true` to tsconfig.json
-
-### Web
-- Ensure proper WASM file placement
-- Handle browser compatibility
-- Implement proper fallbacks
-
-## Version Compatibility
-- Requires Node.js ≥16.0.0
-- Compatible with Capacitor ≥7.0.0
-- Supports TypeScript 4.1.5+
-
-## Testing Requirements
-- Unit tests for database operations
-- Platform-specific integration tests
-- Encryption/decryption tests
-- Biometric authentication tests
-- Migration tests
-- Sync functionality tests
-
-## Documentation
-- API Documentation: `/docs/API.md`
-- Connection API: `/docs/APIConnection.md`
-- DB Connection API: `/docs/APIDBConnection.md`
-- Release Notes: `/docs/info_releases.md`
-- Changelog: `CHANGELOG.md`
-
-## Contributing Guidelines
-- Follow Ionic coding standards
-- Use provided linting and formatting tools
-- Maintain platform compatibility
-- Update documentation
-- Add appropriate tests
-- Follow semantic versioning
-
-## Maintenance
-- Regular security updates
-- Platform compatibility checks
-- Performance optimization
-- Documentation updates
-- Dependency updates
-
-## License
-MIT License - See LICENSE file for details 

.env.development

@@ -2,11 +2,12 @@
 
 # iOS doesn't like spaces in the app title.
 TIME_SAFARI_APP_TITLE="TimeSafari_Dev"
-VITE_APP_SERVER=http://localhost:3000
+VITE_APP_SERVER=http://localhost:8080
 # This is the claim ID for actions in the BVC project, with the JWT ID on this environment (not production).
 VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F
 VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000
 # Using shared server by default to ease setup, which works for shared test users.
 VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app
 VITE_DEFAULT_PARTNER_API_SERVER=http://localhost:3000
+#VITE_DEFAULT_PUSH_SERVER... can't be set up with localhost domain
 VITE_PASSKEYS_ENABLED=true

.env.example

@@ -1,6 +0,0 @@
-# Admin DID credentials
-ADMIN_DID=did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F
-ADMIN_PRIVATE_KEY=2b6472c026ec2aa2c4235c994a63868fc9212d18b58f6cbfe861b52e71330f5b
-
-# API Configuration
-ENDORSER_API_URL=https://test-api.endorser.ch/api/v2/claim 

.env.production

@@ -9,3 +9,4 @@ VITE_DEFAULT_ENDORSER_API_SERVER=https://api.endorser.ch
 
 VITE_DEFAULT_IMAGE_API_SERVER=https://image-api.timesafari.app
 VITE_DEFAULT_PARTNER_API_SERVER=https://partner-api.endorser.ch
+VITE_DEFAULT_PUSH_SERVER=https://timesafari.app

.env.staging

@@ -9,4 +9,5 @@ VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch
 
 VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app
 VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch
+VITE_DEFAULT_PUSH_SERVER=https://test.timesafari.app
 VITE_PASSKEYS_ENABLED=true

.eslintrc.js

@@ -4,6 +4,12 @@ module.exports = {
     node: true,
     es2022: true,
   },
+  ignorePatterns: [
+    'node_modules/',
+    'dist/',
+    'dist-electron/',
+    '*.d.ts'
+  ],
   extends: [
     "plugin:vue/vue3-recommended",
     "eslint:recommended",

.gitignore

@@ -51,6 +51,7 @@ vendor/
 # Build logs
 build_logs/
 
-android/app/src/main/assets/public
+# PWA icon files generated by capacitor-assets
-android/app/src/main/res
+icons
+
 

BUILDING.md

@@ -9,19 +9,6 @@ For a quick dev environment setup, use [pkgx](https://pkgx.dev).
 - Node.js (LTS version recommended)
 - npm (comes with Node.js)
 - Git
-- For Android builds: Android Studio with SDK installed
-- For iOS builds: macOS with Xcode and ruby gems & bundle
-  - `pkgx +rubygems.org sh`
-
-  - ... and you may have to fix these, especially with pkgx
-
-   ```bash
-   gem_path=$(which gem)
-   shortened_path="${gem_path:h:h}"
-   export GEM_HOME=$shortened_path
-   export GEM_PATH=$shortened_path
-   ```
-
 - For desktop builds: Additional build tools based on your OS
 
 ## Forks
@@ -84,7 +71,7 @@ Install dependencies:
 * For test, build the app (because test server is not yet set up to build):
 
 ```bash
-TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_PASSKEYS_ENABLED=true npm run build
+TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_DEFAULT_PUSH_SERVER=https://test.timesafari.app VITE_PASSKEYS_ENABLED=true npm run build
 ```
 
    ... and transfer to the test server:
@@ -326,6 +313,32 @@ npm run build:electron-prod && npm run electron:start
 
 Prerequisites: macOS with Xcode installed
 
+#### First-time iOS Configuration
+
+- Generate certificates inside XCode.
+
+- Right-click on App and under Signing & Capabilities set the Team.
+
+#### Each Release
+
+0. First time (or if XCode dependencies change):
+
+  - `pkgx +rubygems.org sh`
+
+  - ... and you may have to fix these, especially with pkgx
+
+   ```bash
+   gem_path=$(which gem)
+   shortened_path="${gem_path:h:h}"
+   export GEM_HOME=$shortened_path
+   export GEM_PATH=$shortened_path
+   ```
+
+   ```bash
+   cd ios/App
+   pod install
+   ```
+
 1. Build the web assets:
 
    ```bash
@@ -334,6 +347,7 @@ Prerequisites: macOS with Xcode installed
    npm run build:capacitor
    ```
 
+
 2. Update iOS project with latest build:
 
    ```bash
@@ -345,7 +359,11 @@ Prerequisites: macOS with Xcode installed
 3. Copy the assets:
 
    ```bash
+   # It makes no sense why capacitor-assets will not run without these but it actually changes the contents.
    mkdir -p ios/App/App/Assets.xcassets/AppIcon.appiconset
+   echo '{"images":[]}' > ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json
+   mkdir -p ios/App/App/Assets.xcassets/Splash.imageset
+   echo '{"images":[]}' > ios/App/App/Assets.xcassets/Splash.imageset/Contents.json
    npx capacitor-assets generate --ios
    ```
 
@@ -353,10 +371,10 @@ Prerequisites: macOS with Xcode installed
 
    ```
    cd ios/App
-   xcrun agvtool new-version 15
+   xcrun agvtool new-version 25
    # 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
+   cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.0;/g" > temp
    mv temp App.xcodeproj/project.pbxproj
    cd -
    ```
@@ -369,28 +387,25 @@ Prerequisites: macOS with Xcode installed
 
 6. Use Xcode to build and run on simulator or device.
 
+  * Select Product -> Destination with some Simulator version. Then click the run arrow.
+
 7. Release
 
-  * Under "General" renamed a bunch of things to "Time Safari"
+  * Someday: Under "General" we want to rename a bunch of things to "Time Safari"
-  * Choose Product -> Destination -> Build Any iOS
+  * Choose Product -> Destination -> Any iOS Device
   * Choose Product -> Archive
-    * This will trigger a build and take time, needing user's "login" keychain password which is just their login password, repeatedly.
+    * This will trigger a build and take time, needing user's "login" keychain password (user's 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.
+    * May have to go to App Review, click Submission, then hover over the build and click "-".
     * 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".
 
-#### First-time iOS Configuration
-
-- Generate certificates inside XCode.
-
-- Right-click on App and under Signing & Capabilities set the Team.
-
 ### Android Build
 
-Prerequisites: Android Studio with SDK installed
+Prerequisites: Android Studio with Java SDK installed
 
 1. Build the web assets:
 
@@ -445,7 +460,9 @@ Prerequisites: Android Studio with SDK installed
   * Then `bundleRelease`:
 
    ```bash
+   cd android
    ./gradlew bundleRelease -Dlint.baselines.continue=true
+   cd -
    ```
 
   ... and find your `aab` file at app/build/outputs/bundle/release
@@ -458,6 +475,8 @@ At play.google.com/console:
 - Hit "Next".
 - Save, go to "Publishing Overview" as prompted, and click "Send changes for review".
 
+- Note that if you add testers, you have to go to "Publishing Overview" and send those changes or your (closed) testers won't see it.
+
 
 ## First-time Android Configuration for deep links
 

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [0.4.7]
+### Fixed
+- Cameras everywhere
+### Changed
+- IndexedDB -> SQLite
+
+
 ## [0.4.5] - 2025.02.23
 ### Added
 - Total amounts of gives on project page

android/app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 18
+        versionCode 25
-        versionName "0.4.7"
+        versionName "0.5.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -91,6 +91,8 @@ dependencies {
     implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
     implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
     implementation project(':capacitor-android')
+    implementation project(':capacitor-community-sqlite')
+    implementation "androidx.biometric:biometric:1.2.0-alpha05"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

android/app/capacitor.build.gradle

@@ -9,6 +9,7 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
+    implementation project(':capacitor-community-sqlite')
     implementation project(':capacitor-mlkit-barcode-scanning')
     implementation project(':capacitor-app')
     implementation project(':capacitor-camera')

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

@@ -16,6 +16,41 @@
 					}
 				]
 			}
+		},
+		"SQLite": {
+			"iosDatabaseLocation": "Library/CapacitorDatabase",
+			"iosIsEncryption": true,
+			"iosBiometric": {
+				"biometricAuth": true,
+				"biometricTitle": "Biometric login for TimeSafari"
+			},
+			"androidIsEncryption": true,
+			"androidBiometric": {
+				"biometricAuth": true,
+				"biometricTitle": "Biometric login for TimeSafari"
 			}
 		}
+	},
+	"ios": {
+		"contentInset": "never",
+		"allowsLinkPreview": true,
+		"scrollEnabled": true,
+		"limitsNavigationsToAppBoundDomains": true,
+		"backgroundColor": "#ffffff",
+		"allowNavigation": [
+			"*.timesafari.app",
+			"*.jsdelivr.net",
+			"api.endorser.ch"
+		]
+	},
+	"android": {
+		"allowMixedContent": false,
+		"captureInput": true,
+		"webContentsDebuggingEnabled": false,
+		"allowNavigation": [
+			"*.timesafari.app",
+			"*.jsdelivr.net",
+			"api.endorser.ch"
+		]
+	}
 }

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

@@ -1,4 +1,8 @@
 [
+	{
+		"pkg": "@capacitor-community/sqlite",
+		"classpath": "com.getcapacitor.community.database.sqlite.CapacitorSQLitePlugin"
+	},
 	{
 		"pkg": "@capacitor-mlkit/barcode-scanning",
 		"classpath": "io.capawesome.capacitorjs.plugins.mlkit.barcodescanning.BarcodeScannerPlugin"

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

@@ -1,7 +1,15 @@
 package app.timesafari;
 
+import android.os.Bundle;
 import com.getcapacitor.BridgeActivity;
+//import com.getcapacitor.community.sqlite.SQLite;
 
 public class MainActivity extends BridgeActivity {
-    // ... existing code ...
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        // Initialize SQLite
+        //registerPlugin(SQLite.class);
+    }
 } 

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

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

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

android/capacitor.settings.gradle

@@ -2,6 +2,9 @@
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
+include ':capacitor-community-sqlite'
+project(':capacitor-community-sqlite').projectDir = new File('../node_modules/@capacitor-community/sqlite/android')
+
 include ':capacitor-mlkit-barcode-scanning'
 project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../node_modules/@capacitor-mlkit/barcode-scanning/android')
 

capacitor.config.json

@@ -16,6 +16,41 @@
 					}
 				]
 			}
+		},
+		"SQLite": {
+			"iosDatabaseLocation": "Library/CapacitorDatabase",
+			"iosIsEncryption": true,
+			"iosBiometric": {
+				"biometricAuth": true,
+				"biometricTitle": "Biometric login for TimeSafari"
+			},
+			"androidIsEncryption": true,
+			"androidBiometric": {
+				"biometricAuth": true,
+				"biometricTitle": "Biometric login for TimeSafari"
 			}
 		}
+	},
+	"ios": {
+		"contentInset": "never",
+		"allowsLinkPreview": true,
+		"scrollEnabled": true,
+		"limitsNavigationsToAppBoundDomains": true,
+		"backgroundColor": "#ffffff",
+		"allowNavigation": [
+			"*.timesafari.app",
+			"*.jsdelivr.net",
+			"api.endorser.ch"
+		]
+	},
+	"android": {
+		"allowMixedContent": false,
+		"captureInput": true,
+		"webContentsDebuggingEnabled": false,
+		"allowNavigation": [
+			"*.timesafari.app",
+			"*.jsdelivr.net",
+			"api.endorser.ch"
+		]
+	}
 }

doc/secure-storage-implementation.md

@@ -2,283 +2,338 @@
 
 ## Overview
 
-This document outlines the implementation of secure storage for the TimeSafari app using a platform-agnostic approach with Capacitor and absurd-sql solutions. The implementation focuses on:
+This document outlines the implementation of secure storage for the TimeSafari app. The implementation focuses on:
 
 1. **Platform-Specific Storage Solutions**:
-   - Web: absurd-sql with IndexedDB backend and Web Worker support
+   - Web: SQLite with IndexedDB backend (absurd-sql)
-   - iOS/Android: Capacitor SQLite with native SQLite implementation
+   - Electron: SQLite with Node.js backend
-   - Electron: Node SQLite (planned, not implemented)
+   - Native: (Planned) SQLCipher with platform-specific secure storage
 
 2. **Key Features**:
-   - Platform-agnostic SQLite interface
+   - SQLite-based storage using absurd-sql for web
-   - Web Worker support for web platform
+   - Platform-specific service factory pattern
    - Consistent API across platforms
-   - Performance optimizations (WAL, mmap)
+   - Migration support from Dexie.js
-   - Comprehensive error handling and logging
-   - Type-safe database operations
-   - Storage quota management
-   - Platform-specific security features
 
-## Architecture
+## Quick Start
 
-The storage implementation follows a layered architecture:
+### 1. Installation
 
-1. **Platform Service Layer**
+```bash
-   - `PlatformService` interface defines platform capabilities
+# Core dependencies
-   - Platform-specific implementations:
+npm install @jlongster/sql.js
-     - `WebPlatformService`: Web platform with absurd-sql
+npm install absurd-sql
-     - `CapacitorPlatformService`: Mobile platforms with native SQLite
-     - `ElectronPlatformService`: Desktop platform (planned)
-   - Platform detection and capability reporting
-   - Storage quota and feature detection
 
-2. **SQLite Service Layer**
+# Platform-specific dependencies (for future native support)
-   - `SQLiteOperations` interface for database operations
+npm install @capacitor/preferences
-   - Base implementation in `BaseSQLiteService`
+npm install @capacitor-community/biometric-auth
-   - Platform-specific implementations:
-     - `AbsurdSQLService`: Web platform with Web Worker
-     - `CapacitorSQLiteService`: Mobile platforms with native SQLite
-     - `ElectronSQLiteService`: Desktop platform (planned)
-   - Common features:
-     - Transaction support
-     - Prepared statements
-     - Performance monitoring
-     - Error handling
-     - Database statistics
-
-3. **Data Access Layer**
-   - Type-safe database operations
-   - Transaction support
-   - Prepared statements
-   - Performance monitoring
-   - Error recovery
-   - Data integrity verification
-
-## Implementation Details
-
-### Web Platform (absurd-sql)
-
-The web implementation uses absurd-sql with the following features:
-
-1. **Web Worker Support**
-   - SQLite operations run in a dedicated worker thread
-   - Main thread remains responsive
-   - SharedArrayBuffer support when available
-   - Worker initialization in `sqlite.worker.ts`
-
-2. **IndexedDB Backend**
-   - Persistent storage using IndexedDB
-   - Automatic data synchronization
-   - Storage quota management (1GB limit)
-   - Virtual file system configuration
-
-3. **Performance Optimizations**
-   - WAL mode for better concurrency
-   - Memory-mapped I/O (30GB when available)
-   - Prepared statement caching
-   - 2MB cache size
-   - Configurable performance settings
-
-Example configuration:
-```typescript
-const webConfig: SQLiteConfig = {
-  name: 'timesafari',
-  useWAL: true,
-  useMMap: typeof SharedArrayBuffer !== 'undefined',
-  mmapSize: 30000000000,
-  usePreparedStatements: true,
-  maxPreparedStatements: 100
-};
 ```
 
-### Mobile Platform (Capacitor SQLite)
+### 2. Basic Usage
 
-The mobile implementation uses Capacitor SQLite with:
-
-1. **Native SQLite**
-   - Direct access to platform SQLite
-   - Native performance
-   - Platform-specific optimizations
-   - 2GB storage limit
-
-2. **Platform Integration**
-   - iOS: Native SQLite with WAL support
-   - Android: Native SQLite with WAL support
-   - Platform-specific permissions handling
-   - Storage quota management
-
-Example configuration:
 ```typescript
-const mobileConfig: SQLiteConfig = {
+// Using the platform service
-  name: 'timesafari',
+import { PlatformServiceFactory } from '../services/PlatformServiceFactory';
-  useWAL: true,
-  useMMap: false, // Not supported on mobile
-  usePreparedStatements: true
-};
-```
 
-## Database Schema
+// Get platform-specific service instance
+const platformService = PlatformServiceFactory.getInstance();
 
-The implementation uses the following schema:
+// Example database operations
+async function example() {
+  try {
+    // Query example
+    const result = await platformService.dbQuery(
+      "SELECT * FROM accounts WHERE did = ?",
+      [did]
+    );
 
-```sql
+    // Execute example
--- Accounts table
+    await platformService.dbExec(
-CREATE TABLE accounts (
+      "INSERT INTO accounts (did, public_key_hex) VALUES (?, ?)",
-  did TEXT PRIMARY KEY,
+      [did, publicKeyHex]
-  public_key_hex TEXT NOT NULL,
+    );
-  created_at INTEGER NOT NULL,
-  updated_at INTEGER NOT NULL
-);
 
--- Settings table
+    } catch (error) {
-CREATE TABLE settings (
+    console.error('Database operation failed:', error);
-  key TEXT PRIMARY KEY,
+  }
-  value TEXT NOT NULL,
-  updated_at INTEGER NOT NULL
-);
-
--- Contacts table
-CREATE TABLE contacts (
-  id TEXT PRIMARY KEY,
-  did TEXT NOT NULL,
-  name TEXT,
-  created_at INTEGER NOT NULL,
-  updated_at INTEGER NOT NULL,
-  FOREIGN KEY (did) REFERENCES accounts(did)
-);
-
--- Performance indexes
-CREATE INDEX idx_accounts_created_at ON accounts(created_at);
-CREATE INDEX idx_contacts_did ON contacts(did);
-CREATE INDEX idx_settings_updated_at ON settings(updated_at);
-```
-
-## Error Handling
-
-The implementation includes comprehensive error handling:
-
-1. **Error Types**
-```typescript
-export enum StorageErrorCodes {
-  INITIALIZATION_FAILED = 'STORAGE_INIT_FAILED',
-  QUERY_FAILED = 'STORAGE_QUERY_FAILED',
-  TRANSACTION_FAILED = 'STORAGE_TRANSACTION_FAILED',
-  PREPARED_STATEMENT_FAILED = 'STORAGE_PREPARED_STATEMENT_FAILED',
-  DATABASE_CORRUPTED = 'STORAGE_DB_CORRUPTED',
-  STORAGE_FULL = 'STORAGE_FULL',
-  CONCURRENT_ACCESS = 'STORAGE_CONCURRENT_ACCESS'
 }
 ```
 
-2. **Error Recovery**
+### 3. Platform Detection
-   - Automatic transaction rollback
-   - Connection recovery
-   - Data integrity verification
-   - Platform-specific error handling
-   - Comprehensive logging
 
-## Performance Monitoring
-
-The implementation includes built-in performance monitoring:
-
-1. **Statistics**
 ```typescript
-interface SQLiteStats {
+// src/services/PlatformServiceFactory.ts
-  totalQueries: number;
+export class PlatformServiceFactory {
-  avgExecutionTime: number;
+  static getInstance(): PlatformService {
-  preparedStatements: number;
+    if (process.env.ELECTRON) {
-  databaseSize: number;
+      // Electron platform
-  walMode: boolean;
+      return new ElectronPlatformService();
-  mmapActive: boolean;
+    } else {
+      // Web platform (default)
+      return new AbsurdSqlDatabaseService();
+    }
+  }
 }
 ```
 
-2. **Monitoring Features**
+### 4. Current Implementation Details
-   - Query execution time tracking
-   - Database size monitoring
-   - Prepared statement usage
-   - WAL and mmap status
-   - Platform-specific metrics
 
-## Security Considerations
+#### Web Platform (AbsurdSqlDatabaseService)
 
-1. **Web Platform**
+The web platform uses absurd-sql with IndexedDB backend:
-   - Worker thread isolation
-   - Storage quota monitoring
-   - Origin isolation
-   - Cross-origin protection
-   - SharedArrayBuffer availability check
 
-2. **Mobile Platform**
+```typescript
-   - Platform-specific permissions
+// src/services/AbsurdSqlDatabaseService.ts
-   - Storage access control
+export class AbsurdSqlDatabaseService implements PlatformService {
-   - File system security
+  private static instance: AbsurdSqlDatabaseService | null = null;
-   - Platform sandboxing
+  private db: AbsurdSqlDatabase | null = null;
+  private initialized: boolean = false;
       
-## Testing Strategy
+  // Singleton pattern
+  static getInstance(): AbsurdSqlDatabaseService {
+    if (!AbsurdSqlDatabaseService.instance) {
+      AbsurdSqlDatabaseService.instance = new AbsurdSqlDatabaseService();
+    }
+    return AbsurdSqlDatabaseService.instance;
+  }
 
-1. **Unit Tests**
+  // Database operations
-   - Platform service tests
+  async dbQuery(sql: string, params: unknown[] = []): Promise<QueryExecResult[]> {
-   - SQLite service tests
+    await this.waitForInitialization();
-   - Error handling tests
+    return this.queueOperation<QueryExecResult[]>("query", sql, params);
-   - Performance tests
+    }
 
-2. **Integration Tests**
+  async dbExec(sql: string, params: unknown[] = []): Promise<void> {
-   - Cross-platform tests
+    await this.waitForInitialization();
-   - Migration tests
+    await this.queueOperation<void>("run", sql, params);
-   - Transaction tests
+  }
-   - Concurrency tests
+}
+```
 
-3. **E2E Tests**
+Key features:
-   - Platform-specific workflows
+- Uses absurd-sql for SQLite in the browser
-   - Error recovery scenarios
+- Implements operation queuing for thread safety
-   - Performance benchmarks
+- Handles initialization and connection management
-   - Data integrity verification
+- Provides consistent API across platforms
+
+### 5. Migration from Dexie.js
+
+The current implementation supports gradual migration from Dexie.js:
+
+```typescript
+// Example of dual-storage pattern
+async function getAccount(did: string): Promise<Account | undefined> {
+  // Try SQLite first
+  const platform = PlatformServiceFactory.getInstance();
+  let account = await platform.dbQuery(
+    "SELECT * FROM accounts WHERE did = ?",
+    [did]
+  );
+
+  // Fallback to Dexie if needed
+  if (USE_DEXIE_DB) {
+    account = await db.accounts.get(did);
+  }
+
+  return account;
+   }
+```
+
+#### A. Modifying Code
+
+When converting from Dexie.js to SQL-based implementation, follow these patterns:
+
+1. **Database Access Pattern**
+   ```typescript
+   // Before (Dexie)
+   const result = await db.table.where("field").equals(value).first();
+
+   // After (SQL)
+   const platform = PlatformServiceFactory.getInstance();
+   let result = await platform.dbQuery(
+     "SELECT * FROM table WHERE field = ?",
+     [value]
+   );
+   result = databaseUtil.mapQueryResultToValues(result);
+   
+   // Fallback to Dexie if needed
+   if (USE_DEXIE_DB) {
+     result = await db.table.where("field").equals(value).first();
+   }
+   ```
+
+2. **Update Operations**
+   ```typescript
+   // Before (Dexie)
+   await db.table.where("id").equals(id).modify(changes);
+
+   // After (SQL)
+   // For settings updates, use the utility methods:
+   await databaseUtil.updateDefaultSettings(changes);
+   // OR
+   await databaseUtil.updateAccountSettings(did, changes);
+
+   // For other tables, use direct SQL:
+   const platform = PlatformServiceFactory.getInstance();
+   await platform.dbExec(
+     "UPDATE table SET field1 = ?, field2 = ? WHERE id = ?",
+     [changes.field1, changes.field2, id]
+   );
+
+   // Fallback to Dexie if needed
+   if (USE_DEXIE_DB) {
+     await db.table.where("id").equals(id).modify(changes);
+   }
+   ```
+
+3. **Insert Operations**
+   ```typescript
+   // Before (Dexie)
+   await db.table.add(item);
+
+   // After (SQL)
+   const platform = PlatformServiceFactory.getInstance();
+   const columns = Object.keys(item);
+   const values = Object.values(item);
+   const placeholders = values.map(() => '?').join(', ');
+   const sql = `INSERT INTO table (${columns.join(', ')}) VALUES (${placeholders})`;
+   await platform.dbExec(sql, values);
+
+   // Fallback to Dexie if needed
+   if (USE_DEXIE_DB) {
+     await db.table.add(item);
+   }
+   ```
+
+4. **Delete Operations**
+   ```typescript
+   // Before (Dexie)
+   await db.table.where("id").equals(id).delete();
+
+   // After (SQL)
+   const platform = PlatformServiceFactory.getInstance();
+   await platform.dbExec("DELETE FROM table WHERE id = ?", [id]);
+
+   // Fallback to Dexie if needed
+   if (USE_DEXIE_DB) {
+     await db.table.where("id").equals(id).delete();
+   }
+   ```
+
+5. **Result Processing**
+   ```typescript
+   // Before (Dexie)
+   const items = await db.table.toArray();
+
+   // After (SQL)
+   const platform = PlatformServiceFactory.getInstance();
+   let items = await platform.dbQuery("SELECT * FROM table");
+   items = databaseUtil.mapQueryResultToValues(items);
+
+   // Fallback to Dexie if needed
+   if (USE_DEXIE_DB) {
+     items = await db.table.toArray();
+   }
+   ```
+
+6. **Using Utility Methods**
+
+When working with settings or other common operations, use the utility methods in `db/index.ts`:
+
+```typescript
+// Settings operations
+await databaseUtil.updateDefaultSettings(settings);
+await databaseUtil.updateAccountSettings(did, settings);
+const settings = await databaseUtil.retrieveSettingsForDefaultAccount();
+const settings = await databaseUtil.retrieveSettingsForActiveAccount();
+
+// Logging operations
+await databaseUtil.logToDb(message);
+await databaseUtil.logConsoleAndDb(message, showInConsole);
+```
+
+Key Considerations:
+- Always use `databaseUtil.mapQueryResultToValues()` to process SQL query results
+- Use utility methods from `db/index.ts` when available instead of direct SQL
+- Keep Dexie fallbacks wrapped in `if (USE_DEXIE_DB)` checks
+- For queries that return results, use `let` variables to allow Dexie fallback to override
+- For updates/inserts/deletes, execute both SQL and Dexie operations when `USE_DEXIE_DB` is true
+
+Example Migration:
+```typescript
+// Before (Dexie)
+export async function updateSettings(settings: Settings): Promise<void> {
+  await db.settings.put(settings);
+}
+
+// After (SQL)
+export async function updateSettings(settings: Settings): Promise<void> {
+  const platform = PlatformServiceFactory.getInstance();
+  const { sql, params } = generateUpdateStatement(
+    settings,
+    "settings",
+    "id = ?",
+    [settings.id]
+  );
+  await platform.dbExec(sql, params);
+}
+```
+
+Remember to:
+- Create database access code to use the platform service, putting it in front of the Dexie version
+- Instead of removing Dexie-specific code, keep it.
+
+  - For creates & updates & deletes, the duplicate code is fine.
+
+  - For queries where we use the results, make the setting from SQL into a 'let' variable, then wrap the Dexie code in a check for USE_DEXIE_DB from app.ts and if
+it's true then use that result instead of the SQL code's result.
+
+- Consider data migration needs, and warn if there are any potential migration problems
 
 ## Success Criteria
 
-1. **Performance**
+1. **Functionality**
-   - Query response time < 100ms
+   - [x] Basic CRUD operations work correctly
-   - Transaction completion < 500ms
+   - [x] Platform service factory pattern implemented
-   - Memory usage < 50MB
+   - [x] Error handling in place
-   - Database size < platform limits:
+   - [ ] Native platform support (planned)
-     - Web: 1GB
-     - Mobile: 2GB
 
-2. **Reliability**
+2. **Performance**
-   - 99.9% uptime
+   - [x] Database operations complete within acceptable time
-   - Zero data loss
+   - [x] Operation queuing for thread safety
-   - Automatic recovery
+   - [x] Proper initialization handling
-   - Transaction atomicity
+   - [ ] Performance monitoring (planned)
 
 3. **Security**
-   - Platform-specific security features
+   - [x] Basic data integrity
-   - Storage access control
+   - [ ] Encryption (planned for native platforms)
-   - Data protection
+   - [ ] Secure key storage (planned)
-   - Audit logging
+   - [ ] Platform-specific security features (planned)
 
-4. **User Experience**
+4. **Testing**
-   - Smooth platform transitions
+   - [x] Basic unit tests
-   - Clear error messages
+   - [ ] Comprehensive integration tests (planned)
-   - Progress indicators
+   - [ ] Platform-specific tests (planned)
-   - Recovery options
+   - [ ] Migration tests (planned)
 
-## Future Improvements
+## Next Steps
 
-1. **Planned Features**
+1. **Native Platform Support**
-   - SQLCipher integration for mobile
+   - Implement SQLCipher for iOS/Android
-   - Electron platform support
+   - Add platform-specific secure storage
-   - Advanced backup/restore
+   - Implement biometric authentication
-   - Cross-platform sync
 
-2. **Security Enhancements**
+2. **Enhanced Security**
-   - Biometric authentication
+   - Add encryption for sensitive data
-   - Secure enclave usage
+   - Implement secure key storage
-   - Advanced encryption
+   - Add platform-specific security features
-   - Key management
 
-3. **Performance Optimizations**
+3. **Testing and Monitoring**
-   - Advanced caching
+   - Add comprehensive test coverage
-   - Query optimization
+   - Implement performance monitoring
-   - Memory management
+   - Add error tracking and analytics
-   - Storage efficiency
+
+4. **Documentation**
+   - Add API documentation
+   - Create migration guides
+   - Document security measures

doc/storage-implementation-checklist.md

@@ -2,289 +2,50 @@
 
 ## Core Services
 
-### 1. Platform Service Layer
+### 1. Storage Service Layer
 - [x] Create base `PlatformService` interface
-  - [x] Define platform capabilities
+  - [x] Define common methods for all platforms
-    - [x] File system access detection
+  - [x] Add platform-specific method signatures
-    - [x] Camera availability
+  - [x] Include error handling types
-    - [x] Mobile platform detection
+  - [x] Add migration support methods
-    - [x] iOS specific detection
-    - [x] File download capability
-    - [x] SQLite capabilities
-  - [x] Add SQLite operations interface
-    - [x] Database initialization
-    - [x] Query execution
-    - [x] Transaction management
-    - [x] Prepared statements
-    - [x] Database statistics
-  - [x] Include platform detection
-    - [x] Web platform detection
-    - [x] Mobile platform detection
-    - [x] Desktop platform detection
-  - [x] Add file system operations
-    - [x] File read operations
-    - [x] File write operations
-    - [x] File delete operations
-    - [x] Directory listing
 
 - [x] Implement platform-specific services
-  - [x] `WebPlatformService`
+  - [x] `AbsurdSqlDatabaseService` (web)
-    - [x] AbsurdSQL integration
-      - [x] SQL.js initialization
-      - [x] IndexedDB backend setup
-      - [x] Virtual file system configuration
-    - [x] Web Worker support
-      - [x] Worker thread initialization
-      - [x] Message passing
-      - [x] Error handling
-    - [x] IndexedDB backend
-      - [x] Database creation
-      - [x] Transaction handling
-      - [x] Storage quota management (1GB limit)
-    - [x] SharedArrayBuffer detection
-      - [x] Feature detection
-      - [x] Fallback handling
-    - [x] File system operations (intentionally not supported)
-      - [x] File read operations (not available in web)
-      - [x] File write operations (not available in web)
-      - [x] File delete operations (not available in web)
-      - [x] Directory operations (not available in web)
-    - [x] Settings implementation
-      - [x] AbsurdSQL settings operations
-        - [x] Worker-based settings updates
-        - [x] IndexedDB transaction handling
-        - [x] SharedArrayBuffer support
-      - [x] Web-specific settings features
-        - [x] Storage quota management
-        - [x] Worker thread isolation
-        - [x] Cross-origin settings
-      - [x] Web performance optimizations
-        - [x] Settings caching
-        - [x] Batch updates
-        - [x] Worker message optimization
-    - [x] Account implementation
-      - [x] Web-specific account handling
-        - [x] Browser storage persistence
-        - [x] Session management
-        - [x] Cross-tab synchronization
-      - [x] Web security features
-        - [x] Origin isolation
-        - [x] Worker thread security
-        - [x] Storage access control
-  - [x] `CapacitorPlatformService`
-    - [x] Native SQLite integration
-      - [x] Database connection
-      - [x] Query execution
-      - [x] Transaction handling
-    - [x] Platform capabilities
-      - [x] iOS detection
-      - [x] Android detection
-      - [x] Feature availability
-    - [x] File system operations
-      - [x] File read/write
-      - [x] Directory operations
-    - [x] Storage permissions
-      - [x] iOS permissions
-      - [x] Android permissions
-      - [x] Permission request handling
-    - [x] Settings implementation
-      - [x] Native SQLite settings operations
-        - [x] Platform-specific SQLite optimizations
-        - [x] Native transaction handling
-        - [x] Platform storage management
-      - [x] Mobile-specific settings features
-        - [x] Platform preferences sync
-        - [x] Background state handling
-      - [x] Mobile performance optimizations
-        - [x] Native caching
-        - [x] Battery-efficient updates
-        - [x] Memory management
-    - [x] Account implementation
-      - [x] Mobile-specific account handling
-        - [x] Platform storage integration
-        - [x] Background state handling
-      - [x] Mobile security features
-        - [x] Platform sandboxing
-        - [x] Storage access control
-        - [x] App sandboxing
-  - [ ] `ElectronPlatformService` (planned)
-    - [ ] Node SQLite integration
-      - [ ] Database connection
-      - [ ] Query execution
-      - [ ] Transaction handling
-    - [ ] File system access
-      - [ ] File read operations
-      - [ ] File write operations
-      - [ ] File delete operations
-      - [ ] Directory operations
-    - [ ] IPC communication
-      - [ ] Main process communication
-      - [ ] Renderer process handling
-      - [ ] Message passing
-    - [ ] Native features implementation
-      - [ ] System dialogs
-      - [ ] Native menus
-      - [ ] System integration
-    - [ ] Settings implementation
-      - [ ] Node SQLite settings operations
-        - [ ] Main process SQLite handling
-        - [ ] IPC-based updates
-        - [ ] File system persistence
-      - [ ] Desktop-specific settings features
-        - [ ] System preferences integration
-        - [ ] Multi-window sync
-        - [ ] Offline state handling
-      - [ ] Desktop performance optimizations
-        - [ ] Process-based caching
-        - [ ] Window state management
-        - [ ] Resource optimization
-    - [ ] Account implementation
-      - [ ] Desktop-specific account handling
-        - [ ] System keychain integration
-        - [ ] Native authentication
-        - [ ] Process isolation
-      - [ ] Desktop security features
-        - [ ] Process sandboxing
-        - [ ] IPC security
-        - [ ] File system protection
-
-### 2. SQLite Service Layer
-- [x] Create base `BaseSQLiteService`
-  - [x] Common SQLite operations
-    - [x] Query execution
-    - [x] Transaction management
-    - [x] Prepared statements
-    - [x] Database statistics
-  - [x] Performance monitoring
-    - [x] Query timing
-    - [x] Memory usage
-    - [x] Database size
-    - [x] Statement caching
-  - [x] Error handling
-    - [x] Connection errors
-    - [x] Query errors
-    - [x] Transaction errors
-    - [x] Resource errors
-  - [x] Transaction support
-    - [x] Begin transaction
-    - [x] Commit transaction
-    - [x] Rollback transaction
-    - [x] Nested transactions
-
-- [x] Implement platform-specific SQLite services
-  - [x] `AbsurdSQLService`
-    - [x] Web Worker initialization
-      - [x] Worker creation
-      - [x] Message handling
-      - [x] Error propagation
-    - [x] IndexedDB backend setup
-      - [x] Database creation
-      - [x] Transaction handling
-      - [x] Storage management
-    - [x] Prepared statements
-      - [x] Statement preparation
-      - [x] Parameter binding
-      - [x] Statement caching
-    - [x] Performance optimizations
-      - [x] WAL mode
-      - [x] Memory mapping
-      - [x] Cache configuration
-    - [x] WAL mode support
-      - [x] Journal mode configuration
-      - [x] Synchronization settings
-      - [x] Checkpoint handling
-    - [x] Memory-mapped I/O
-      - [x] MMAP size configuration (30GB)
-      - [x] Memory management
-      - [x] Performance monitoring
-  - [x] `CapacitorSQLiteService`
-    - [x] Native SQLite connection
     - [x] Database initialization
+    - [x] VFS setup with IndexedDB backend
     - [x] Connection management
-      - [x] Error handling
+    - [x] Operation queuing
-    - [x] Basic platform features
+  - [ ] `NativeSQLiteService` (iOS/Android) (planned)
-      - [x] Query execution
+    - [ ] SQLCipher integration
-      - [x] Transaction handling
+    - [ ] Native bridge setup
-      - [x] Statement management
+    - [ ] File system access
-    - [x] Error handling
-      - [x] Connection errors
-      - [x] Query errors
-      - [x] Resource errors
-    - [x] WAL mode support
-      - [x] Journal mode
-      - [x] Synchronization
-      - [x] Checkpointing
-    - [ ] SQLCipher integration (planned)
-      - [ ] Encryption setup
-      - [ ] Key management
-      - [ ] Secure storage
   - [ ] `ElectronSQLiteService` (planned)
     - [ ] Node SQLite integration
-      - [ ] Database connection
-      - [ ] Query execution
-      - [ ] Transaction handling
     - [ ] IPC communication
-      - [ ] Process communication
-      - [ ] Error handling
-      - [ ] Resource management
     - [ ] File system access
-      - [ ] Native file operations
+
-      - [ ] Path handling
+### 2. Migration Services
-      - [ ] Permissions
+- [x] Implement basic migration support
-    - [ ] Native features
+  - [x] Dual-storage pattern (SQLite + Dexie)
-      - [ ] System integration
+  - [x] Basic data verification
-      - [ ] Native dialogs
+  - [ ] Rollback procedures (planned)
-      - [ ] Process management
+  - [ ] Progress tracking (planned)
+- [ ] Create `MigrationUI` components (planned)
+  - [ ] Progress indicators
+  - [ ] Error handling
+  - [ ] User notifications
+  - [ ] Manual triggers
 
 ### 3. Security Layer
-- [x] Implement platform-specific security
+- [x] Basic data integrity
-  - [x] Web platform
+- [ ] Implement `EncryptionService` (planned)
-    - [x] Worker isolation
-      - [x] Thread separation
-      - [x] Message security
-      - [x] Resource isolation
-    - [x] Storage quota management
-      - [x] Quota detection
-      - [x] Usage monitoring
-      - [x] Error handling
-    - [x] Origin isolation
-      - [x] Cross-origin protection
-      - [x] Resource isolation
-      - [x] Security policy
-    - [x] Storage security
-      - [x] Access control
-      - [x] Data protection
-      - [x] Quota management
-  - [x] Mobile platform
-    - [x] Platform permissions
-      - [x] Storage access
-      - [x] File operations
-      - [x] System integration
-    - [x] Platform security
-      - [x] App sandboxing
-      - [x] Storage protection
-      - [x] Access control
-    - [ ] SQLCipher integration (planned)
-      - [ ] Encryption setup
   - [ ] Key management
+  - [ ] Encryption/decryption
   - [ ] Secure storage
-  - [ ] Electron platform (planned)
+- [ ] Add `BiometricService` (planned)
-    - [ ] IPC security
+  - [ ] Platform detection
-      - [ ] Message validation
+  - [ ] Authentication flow
-      - [ ] Process isolation
+  - [ ] Fallback mechanisms
-      - [ ] Resource protection
-    - [ ] File system security
-      - [ ] Access control
-      - [ ] Path validation
-      - [ ] Permission management
-    - [ ] Auto-update security
-      - [ ] Update verification
-      - [ ] Code signing
-      - [ ] Rollback protection
-    - [ ] Native security features
-      - [ ] System integration
-      - [ ] Security policies
-      - [ ] Resource protection
 
 ## Platform-Specific Implementation
 
@@ -297,125 +58,74 @@
       "absurd-sql": "^1.8.0"
     }
     ```
-  - [x] Configure Web Worker
+  - [x] Configure VFS with IndexedDB backend
-    - [x] Worker initialization
+  - [x] Setup worker threads
-    - [x] Message handling
+  - [x] Implement operation queuing
-    - [x] Error propagation
-  - [x] Setup IndexedDB backend
-    - [x] Database creation
-    - [x] Transaction handling
-    - [x] Storage management
   - [x] Configure database pragmas
+  
     ```sql
-    PRAGMA journal_mode = WAL;
+    PRAGMA journal_mode=MEMORY;
-    PRAGMA synchronous = NORMAL;
+    PRAGMA synchronous=NORMAL;
-    PRAGMA temp_store = MEMORY;
+    PRAGMA foreign_keys=ON;
-    PRAGMA cache_size = -2000;
+    PRAGMA busy_timeout=5000;
-    PRAGMA mmap_size = 30000000000;
     ```
 
 - [x] Update build configuration
-  - [x] Configure worker bundling
+  - [x] Modify `vite.config.ts`
-    - [x] Worker file handling
+  - [x] Add worker configuration
-    - [x] Asset management
+  - [x] Update chunk splitting
-    - [x] Source maps
+  - [x] Configure asset handling
-  - [x] Setup asset handling
-    - [x] SQL.js WASM
-    - [x] Worker scripts
-    - [x] Static assets
-  - [x] Configure chunk splitting
-    - [x] Code splitting
-    - [x] Dynamic imports
-    - [x] Asset optimization
 
-- [x] Implement fallback mechanisms
+- [x] Implement IndexedDB backend
-  - [x] SharedArrayBuffer detection
+  - [x] Create database service
-    - [x] Feature detection
+  - [x] Add operation queuing
-    - [x] Fallback handling
+  - [x] Handle initialization
-    - [x] Error reporting
+  - [x] Implement atomic operations
-  - [x] Storage quota monitoring
-    - [x] Quota detection
-    - [x] Usage tracking
-    - [x] Error handling
-  - [x] Worker initialization fallback
-    - [x] Fallback detection
-    - [x] Alternative initialization
-    - [x] Error recovery
-  - [x] Error recovery
-    - [x] Connection recovery
-    - [x] Transaction rollback
-    - [x] State restoration
 
-### Mobile Platform
+### iOS Platform (Planned)
-- [x] Setup Capacitor SQLite
+- [ ] Setup SQLCipher
-  - [x] Install dependencies
+  - [ ] Install pod dependencies
-    - [x] Core SQLite plugin
+  - [ ] Configure encryption
-    - [x] Platform plugins
+  - [ ] Setup keychain access
-    - [x] Native dependencies
+  - [ ] Implement secure storage
-  - [x] Configure native SQLite
-    - [x] Database initialization
-    - [x] Connection management
-    - [x] Query handling
-  - [x] Configure basic permissions
-    - [x] Storage access
-    - [x] File operations
-    - [x] System integration
 
-- [x] Update Capacitor config
+- [ ] Update Capacitor config
-  - [x] Add basic platform permissions
+  - [ ] Modify `capacitor.config.ts`
-    - [x] iOS permissions
+  - [ ] Add iOS permissions
-    - [x] Android permissions
+  - [ ] Configure backup
-    - [x] Feature flags
+  - [ ] Setup app groups
-  - [x] Configure storage limits
-    - [x] iOS storage limits
-    - [x] Android storage limits
-    - [x] Quota management
-  - [x] Setup platform security
-    - [x] App sandboxing
-    - [x] Storage protection
-    - [x] Access control
 
-### Electron Platform (planned)
+### Android Platform (Planned)
+- [ ] Setup SQLCipher
+  - [ ] Add Gradle dependencies
+  - [ ] Configure encryption
+  - [ ] Setup keystore
+  - [ ] Implement secure storage
+
+- [ ] Update Capacitor config
+  - [ ] Modify `capacitor.config.ts`
+  - [ ] Add Android permissions
+  - [ ] Configure backup
+  - [ ] Setup file provider
+
+### Electron Platform (Planned)
 - [ ] Setup Node SQLite
   - [ ] Install dependencies
-    - [ ] SQLite3 module
-    - [ ] Native bindings
-    - [ ] Development tools
   - [ ] Configure IPC
-    - [ ] Main process setup
-    - [ ] Renderer process handling
-    - [ ] Message passing
   - [ ] Setup file system access
-    - [ ] Native file operations
-    - [ ] Path handling
-    - [ ] Permission management
   - [ ] Implement secure storage
-    - [ ] Encryption setup
-    - [ ] Key management
-    - [ ] Secure containers
 
 - [ ] Update Electron config
+  - [ ] Modify `electron.config.ts`
   - [ ] Add security policies
-    - [ ] CSP configuration
-    - [ ] Process isolation
-    - [ ] Resource protection
   - [ ] Configure file access
-    - [ ] Access control
-    - [ ] Path validation
-    - [ ] Permission management
   - [ ] Setup auto-updates
-    - [ ] Update server
-    - [ ] Code signing
-    - [ ] Rollback protection
-  - [ ] Configure IPC security
-    - [ ] Message validation
-    - [ ] Process isolation
-    - [ ] Resource protection
 
 ## Data Models and Types
 
 ### 1. Database Schema
 - [x] Define tables
+
   ```sql
   -- Accounts table
   CREATE TABLE accounts (
@@ -448,312 +158,172 @@
   CREATE INDEX idx_settings_updated_at ON settings(updated_at);
   ```
 
+- [x] Create indexes
+- [x] Define constraints
+- [ ] Add triggers (planned)
+- [ ] Setup migrations (planned)
+
 ### 2. Type Definitions
+
 - [x] Create interfaces
   ```typescript
-  interface PlatformCapabilities {
+  interface Account {
-    hasFileSystem: boolean;
+    did: string;
-    hasCamera: boolean;
+    publicKeyHex: string;
-    isMobile: boolean;
+    createdAt: number;
-    isIOS: boolean;
+    updatedAt: number;
-    hasFileDownload: boolean;
-    needsFileHandlingInstructions: boolean;
-    sqlite: {
-      supported: boolean;
-      runsInWorker: boolean;
-      hasSharedArrayBuffer: boolean;
-      supportsWAL: boolean;
-      maxSize?: number;
-    };
   }
 
-  interface SQLiteConfig {
+  interface Setting {
-    name: string;
+    key: string;
-    useWAL?: boolean;
+    value: string;
-    useMMap?: boolean;
+    updatedAt: number;
-    mmapSize?: number;
-    usePreparedStatements?: boolean;
-    maxPreparedStatements?: number;
   }
 
-  interface SQLiteStats {
+  interface Contact {
-    totalQueries: number;
+    id: string;
-    avgExecutionTime: number;
+    did: string;
-    preparedStatements: number;
+    name?: string;
-    databaseSize: number;
+    createdAt: number;
-    walMode: boolean;
+    updatedAt: number;
-    mmapActive: boolean;
   }
   ```
 
+- [x] Add validation
+- [x] Create DTOs
+- [x] Define enums
+- [x] Add type guards
+
+## UI Components
+
+### 1. Migration UI (Planned)
+- [ ] Create components
+  - [ ] `MigrationProgress.vue`
+  - [ ] `MigrationError.vue`
+  - [ ] `MigrationSettings.vue`
+  - [ ] `MigrationStatus.vue`
+
+### 2. Settings UI (Planned)
+- [ ] Update components
+  - [ ] Add storage settings
+  - [ ] Add migration controls
+  - [ ] Add backup options
+  - [ ] Add security settings
+
+### 3. Error Handling UI (Planned)
+- [ ] Create components
+  - [ ] `StorageError.vue`
+  - [ ] `QuotaExceeded.vue`
+  - [ ] `MigrationFailed.vue`
+  - [ ] `RecoveryOptions.vue`
+
 ## Testing
 
 ### 1. Unit Tests
-- [x] Test platform services
+- [x] Basic service tests
-  - [x] Platform detection
+  - [x] Platform service tests
-    - [x] Web platform
+  - [x] Database operation tests
-    - [x] Mobile platform
+  - [ ] Security service tests (planned)
-    - [x] Desktop platform
+  - [ ] Platform detection tests (planned)
-  - [x] Capability reporting
-    - [x] Feature detection
-    - [x] Platform specifics
-    - [x] Error cases
-  - [x] Basic SQLite operations
-    - [x] Query execution
-    - [x] Transaction handling
-    - [x] Error cases
-  - [x] Basic error handling
-    - [x] Connection errors
-    - [x] Query errors
-    - [x] Resource errors
 
-### 2. Integration Tests
+### 2. Integration Tests (Planned)
-- [x] Test SQLite services
+- [ ] Test migrations
-  - [x] Web platform tests
+  - [ ] Web platform tests
-    - [x] Worker integration
+  - [ ] iOS platform tests
-    - [x] IndexedDB backend
+  - [ ] Android platform tests
-    - [x] Performance tests
+  - [ ] Electron platform tests
-  - [x] Basic mobile platform tests
-    - [x] Native SQLite
-    - [x] Platform features
-    - [x] Error handling
-  - [ ] Electron platform tests (planned)
-    - [ ] Node SQLite
-    - [ ] IPC communication
-    - [ ] File system
-  - [x] Cross-platform tests
-    - [x] Feature parity
-    - [x] Data consistency
-    - [x] Performance comparison
 
-### 3. E2E Tests
+### 3. E2E Tests (Planned)
-- [x] Test workflows
+- [ ] Test workflows
-  - [x] Basic database operations
+  - [ ] Account management
-    - [x] CRUD operations
+  - [ ] Settings management
-    - [x] Transaction handling
+  - [ ] Contact management
-    - [x] Error recovery
+  - [ ] Migration process
-  - [x] Platform transitions
-    - [x] Web to mobile
-    - [x] Mobile to web
-    - [x] State preservation
-  - [x] Basic error recovery
-    - [x] Connection loss
-    - [x] Transaction failure
-    - [x] Resource errors
-  - [x] Performance benchmarks
-    - [x] Query performance
-    - [x] Transaction speed
-    - [x] Memory usage
-    - [x] Storage efficiency
 
 ## Documentation
 
 ### 1. Technical Documentation
 - [x] Update architecture docs
-  - [x] System overview
+- [x] Add API documentation
-  - [x] Component interaction
+- [ ] Create migration guides (planned)
-  - [x] Platform specifics
+- [ ] Document security measures (planned)
-- [x] Add basic API documentation
-  - [x] Interface definitions
-  - [x] Method signatures
-  - [x] Usage examples
-- [x] Document platform capabilities
-  - [x] Feature matrix
-  - [x] Platform support
-  - [x] Limitations
-- [x] Document security measures
-  - [x] Platform security
-  - [x] Access control
-  - [x] Security policies
 
-### 2. User Documentation
+### 2. User Documentation (Planned)
-- [x] Update basic user guides
+- [ ] Update user guides
-  - [x] Installation
+- [ ] Add troubleshooting guides
-  - [x] Configuration
+- [ ] Create FAQ
-  - [x] Basic usage
+- [ ] Document new features
-- [x] Add basic troubleshooting guides
-  - [x] Common issues
-  - [x] Error messages
-  - [x] Recovery steps
-- [x] Document implemented platform features
-  - [x] Web platform
-  - [x] Mobile platform
-  - [x] Desktop platform
-- [x] Add basic performance tips
-  - [x] Optimization techniques
-  - [x] Best practices
-  - [x] Platform specifics
 
-## Monitoring and Analytics
+## Deployment
 
-### 1. Performance Monitoring
+### 1. Build Process
-- [x] Basic query execution time
+- [x] Update build scripts
-  - [x] Query timing
+- [x] Add platform-specific builds
-  - [x] Transaction timing
+- [ ] Configure CI/CD (planned)
-  - [x] Statement timing
+- [ ] Setup automated testing (planned)
-- [x] Database size monitoring
-  - [x] Size tracking
-  - [x] Growth patterns
-  - [x] Quota management
-- [x] Basic memory usage
-  - [x] Heap usage
-  - [x] Cache usage
-  - [x] Worker memory
-- [x] Worker performance
-  - [x] Message timing
-  - [x] Processing time
-  - [x] Resource usage
 
-### 2. Error Tracking
+### 2. Release Process (Planned)
-- [x] Basic error logging
+- [ ] Create release checklist
-  - [x] Error capture
+- [ ] Add version management
-  - [x] Stack traces
+- [ ] Setup rollback procedures
-  - [x] Context data
+- [ ] Configure monitoring
-- [x] Basic performance monitoring
-  - [x] Query metrics
-  - [x] Resource usage
-  - [x] Timing data
-- [x] Platform-specific errors
-  - [x] Web platform
-  - [x] Mobile platform
-  - [x] Desktop platform
-- [x] Basic recovery tracking
-  - [x] Recovery success
-  - [x] Failure patterns
-  - [x] User impact
 
-## Security Audit
+## Monitoring and Analytics (Planned)
+
+### 1. Error Tracking
+- [ ] Setup error logging
+- [ ] Add performance monitoring
+- [ ] Configure alerts
+- [ ] Create dashboards
+
+### 2. Usage Analytics
+- [ ] Add storage metrics
+- [ ] Track migration success
+- [ ] Monitor performance
+- [ ] Collect user feedback
+
+## Security Audit (Planned)
 
 ### 1. Code Review
-- [x] Review platform services
+- [ ] Review encryption
-  - [x] Interface security
+- [ ] Check access controls
-  - [x] Data handling
+- [ ] Verify data handling
-  - [x] Error management
+- [ ] Audit dependencies
-- [x] Check basic SQLite implementations
-  - [x] Query security
-  - [x] Transaction safety
-  - [x] Resource management
-- [x] Verify basic error handling
-  - [x] Error propagation
-  - [x] Recovery procedures
-  - [x] User feedback
-- [x] Complete dependency audit
-  - [x] Security vulnerabilities
-  - [x] License compliance
-  - [x] Update requirements
 
-### 2. Platform Security
+### 2. Penetration Testing
-- [x] Web platform
+- [ ] Test data access
-  - [x] Worker isolation
+- [ ] Verify encryption
-    - [x] Thread separation
+- [ ] Check authentication
-    - [x] Message security
+- [ ] Review permissions
-    - [x] Resource isolation
-  - [x] Basic storage security
-    - [x] Access control
-    - [x] Data protection
-    - [x] Quota management
-  - [x] Origin isolation
-    - [x] Cross-origin protection
-    - [x] Resource isolation
-    - [x] Security policy
-- [x] Mobile platform
-  - [x] Platform permissions
-    - [x] Storage access
-    - [x] File operations
-    - [x] System integration
-  - [x] Platform security
-    - [x] App sandboxing
-    - [x] Storage protection
-    - [x] Access control
-  - [ ] SQLCipher integration (planned)
-    - [ ] Encryption setup
-    - [ ] Key management
-    - [ ] Secure storage
-- [ ] Electron platform (planned)
-  - [ ] IPC security
-    - [ ] Message validation
-    - [ ] Process isolation
-    - [ ] Resource protection
-  - [ ] File system security
-    - [ ] Access control
-    - [ ] Path validation
-    - [ ] Permission management
-  - [ ] Auto-update security
-    - [ ] Update verification
-    - [ ] Code signing
-    - [ ] Rollback protection
 
 ## Success Criteria
 
 ### 1. Performance
-- [x] Basic query response time < 100ms
+- [x] Query response time < 100ms
-  - [x] Simple queries
+- [x] Operation queuing for thread safety
-  - [x] Indexed queries
+- [x] Proper initialization handling
-  - [x] Prepared statements
+- [ ] Migration time < 5s per 1000 records (planned)
-- [x] Basic transaction completion < 500ms
+- [ ] Storage overhead < 10% (planned)
-  - [x] Single operations
+- [ ] Memory usage < 50MB (planned)
-  - [x] Batch operations
-  - [x] Complex transactions
-- [x] Basic memory usage < 50MB
-  - [x] Normal operation
-  - [x] Peak usage
-  - [x] Background state
-- [x] Database size < platform limits
-  - [x] Web platform (1GB)
-  - [x] Mobile platform (2GB)
-  - [ ] Desktop platform (10GB, planned)
 
 ### 2. Reliability
-- [x] Basic uptime
-  - [x] Service availability
-  - [x] Connection stability
-  - [x] Error recovery
 - [x] Basic data integrity
-  - [x] Transaction atomicity
+- [x] Operation queuing
-  - [x] Data consistency
+- [ ] Automatic recovery (planned)
-  - [x] Error handling
+- [ ] Backup verification (planned)
-- [x] Basic recovery
+- [ ] Transaction atomicity (planned)
-  - [x] Connection recovery
+- [ ] Data consistency (planned)
-  - [x] Transaction rollback
-  - [x] State restoration
-- [x] Basic transaction atomicity
-  - [x] Commit success
-  - [x] Rollback handling
-  - [x] Error recovery
 
 ### 3. Security
-- [x] Platform-specific security
+- [x] Basic data integrity
-  - [x] Web platform security
+- [ ] AES-256 encryption (planned)
-  - [x] Mobile platform security
+- [ ] Secure key storage (planned)
-  - [ ] Desktop platform security (planned)
+- [ ] Access control (planned)
-- [x] Basic access control
+- [ ] Audit logging (planned)
-  - [x] User permissions
-  - [x] Resource access
-  - [x] Operation limits
-- [x] Basic audit logging
-  - [x] Access logs
-  - [x] Operation logs
-  - [x] Security events
-- [ ] Advanced security features (planned)
-  - [ ] SQLCipher encryption
-  - [ ] Biometric authentication
-  - [ ] Secure enclave
-  - [ ] Key management
 
 ### 4. User Experience
-- [x] Basic platform transitions
+- [x] Basic database operations
-  - [x] Web to mobile
+- [ ] Smooth migration (planned)
-  - [x] Mobile to web
+- [ ] Clear error messages (planned)
-  - [x] State preservation
+- [ ] Progress indicators (planned)
-- [x] Basic error messages
+- [ ] Recovery options (planned) 
-  - [x] User feedback
-  - [x] Recovery guidance
-  - [x] Error context
-- [x] Basic progress indicators
-  - [x] Operation status
-  - [x] Loading states
-  - [x] Completion feedback
-- [x] Basic recovery options
-  - [x] Automatic recovery
-  - [x] Manual intervention
-  - [x] Data restoration 

ios/.gitignore

@@ -11,3 +11,16 @@ 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
+
+# Generated Icons from capacitor-assets (also Contents.json which is confusing; see BUILDING.md)
+App/App/Assets.xcassets/AppIcon.appiconset
+App/App/Assets.xcassets/Splash.imageset

ios/App/App.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@
 		504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
-		A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
+		97EF2DC6FD76C3643D680B8D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90DCAFB4D8948F7A50C13800 /* Pods_App.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,9 +27,9 @@
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
-		AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		90DCAFB4D8948F7A50C13800 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
+		E2E9297D5D02C549106C77F9 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
-		FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
+		EAEC6436E595F7CD3A1C9E96 /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -37,17 +37,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
+				97EF2DC6FD76C3643D680B8D /* Pods_App.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
+		4B546315E668C7A13939F417 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
+				90DCAFB4D8948F7A50C13800 /* Pods_App.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -57,8 +57,8 @@
 			children = (
 				504EC3061FED79650016851F /* App */,
 				504EC3051FED79650016851F /* Products */,
-				7F8756D8B27F46E3366F6CEA /* Pods */,
+				BA325FFCDCE8D334E5C7AEBE /* Pods */,
-				27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
+				4B546315E668C7A13939F417 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -85,13 +85,13 @@
 			path = App;
 			sourceTree = "<group>";
 		};
-		7F8756D8B27F46E3366F6CEA /* Pods */ = {
+		BA325FFCDCE8D334E5C7AEBE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
+				EAEC6436E595F7CD3A1C9E96 /* Pods-App.debug.xcconfig */,
-				AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
+				E2E9297D5D02C549106C77F9 /* Pods-App.release.xcconfig */,
 			);
-			name = Pods;
+			path = Pods;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -101,12 +101,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
 			buildPhases = (
-				6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
+				92977BEA1068CC097A57FC77 /* [CP] Check Pods Manifest.lock */,
 				504EC3001FED79650016851F /* Sources */,
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
-				9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
 				012076E8FFE4BF260A79B034 /* Fix Privacy Manifest */,
+				3525031ED1C96EF4CF6E9959 /* [CP] Embed Pods Frameworks */,
+				96A7EF592DF3366D00084D51 /* Fix Privacy Manifest */,
 			);
 			buildRules = (
 			);
@@ -186,28 +187,10 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PROJECT_DIR}/app_privacy_manifest_fixer/fixer.sh\" ";
+			shellScript = "\"${PROJECT_DIR}/app_privacy_manifest_fixer/fixer.sh\" \n";
 			showEnvVarsInLog = 0;
 		};
-		6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
+		3525031ED1C96EF4CF6E9959 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -222,6 +205,47 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		92977BEA1068CC097A57FC77 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		96A7EF592DF3366D00084D51 /* 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\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -375,11 +399,12 @@
 		};
 		504EC3171FED79650016851F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
+			baseConfigurationReference = EAEC6436E595F7CD3A1C9E96 /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 25;
+				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -388,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.4.7;
+				MARKETING_VERSION = 0.5.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -401,11 +426,12 @@
 		};
 		504EC3181FED79650016851F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
+			baseConfigurationReference = E2E9297D5D02C549106C77F9 /* Pods-App.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 25;
+				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -414,7 +440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.4.7;
+				MARKETING_VERSION = 0.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

ios/App/App/AppDelegate.swift

@@ -1,5 +1,6 @@
 import UIKit
 import Capacitor
+import CapacitorCommunitySqlite
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -7,6 +8,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Initialize SQLite
+        //let sqlite = SQLite()
+        //sqlite.initialize()
+        
         // Override point for customization after application launch.
         return true
     }

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

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

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

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

ios/App/Podfile

@@ -11,6 +11,7 @@ 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 'CapacitorCommunitySqlite', :path => '../../node_modules/@capacitor-community/sqlite'
   pod 'CapacitorMlkitBarcodeScanning', :path => '../../node_modules/@capacitor-mlkit/barcode-scanning'
   pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
   pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
@@ -26,4 +27,9 @@ end
 
 post_install do |installer|
   assertDeploymentTarget(installer)
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64'
+    end
+  end
 end

ios/App/Podfile.lock

@@ -5,6 +5,10 @@ PODS:
     - Capacitor
   - CapacitorCamera (6.1.2):
     - Capacitor
+  - CapacitorCommunitySqlite (6.0.2):
+    - Capacitor
+    - SQLCipher
+    - ZIPFoundation
   - CapacitorCordova (6.2.1)
   - CapacitorFilesystem (6.0.3):
     - Capacitor
@@ -73,11 +77,18 @@ PODS:
   - nanopb/decode (2.30910.0)
   - nanopb/encode (2.30910.0)
   - PromisesObjC (2.4.0)
+  - SQLCipher (4.9.0):
+    - SQLCipher/standard (= 4.9.0)
+  - SQLCipher/common (4.9.0)
+  - SQLCipher/standard (4.9.0):
+    - SQLCipher/common
+  - ZIPFoundation (0.9.19)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
   - "CapacitorCamera (from `../../node_modules/@capacitor/camera`)"
+  - "CapacitorCommunitySqlite (from `../../node_modules/@capacitor-community/sqlite`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorFilesystem (from `../../node_modules/@capacitor/filesystem`)"
   - "CapacitorMlkitBarcodeScanning (from `../../node_modules/@capacitor-mlkit/barcode-scanning`)"
@@ -98,6 +109,8 @@ SPEC REPOS:
     - MLKitVision
     - nanopb
     - PromisesObjC
+    - SQLCipher
+    - ZIPFoundation
 
 EXTERNAL SOURCES:
   Capacitor:
@@ -106,6 +119,8 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/app"
   CapacitorCamera:
     :path: "../../node_modules/@capacitor/camera"
+  CapacitorCommunitySqlite:
+    :path: "../../node_modules/@capacitor-community/sqlite"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorFilesystem:
@@ -121,6 +136,7 @@ SPEC CHECKSUMS:
   Capacitor: c95400d761e376be9da6be5a05f226c0e865cebf
   CapacitorApp: e1e6b7d05e444d593ca16fd6d76f2b7c48b5aea7
   CapacitorCamera: 9bc7b005d0e6f1d5f525b8137045b60cffffce79
+  CapacitorCommunitySqlite: 0299d20f4b00c2e6aa485a1d8932656753937b9b
   CapacitorCordova: 8d93e14982f440181be7304aa9559ca631d77fff
   CapacitorFilesystem: 59270a63c60836248812671aa3b15df673fbaf74
   CapacitorMlkitBarcodeScanning: 7652be9c7922f39203a361de735d340ae37e134e
@@ -138,7 +154,9 @@ SPEC CHECKSUMS:
   MLKitVision: 90922bca854014a856f8b649d1f1f04f63fd9c79
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  SQLCipher: 31878d8ebd27e5c96db0b7cb695c96e9f8ad77da
+  ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
 
-PODFILE CHECKSUM: 7e7e09e6937de7f015393aecf2cf7823645689b3
+PODFILE CHECKSUM: f987510f7383b04a1b09ea8472bdadcd88b6c924
 
 COCOAPODS: 1.16.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timesafari",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Time Safari Application",
   "author": {
     "name": "Time Safari Team"
@@ -46,7 +46,7 @@
     "electron:build-mac-universal": "npm run build:electron-prod && electron-builder --mac --universal"
   },
   "dependencies": {
-    "@capacitor-community/sqlite": "6.0.0",
+    "@capacitor-community/sqlite": "6.0.2",
     "@capacitor-mlkit/barcode-scanning": "^6.0.0",
     "@capacitor/android": "^6.2.0",
     "@capacitor/app": "^6.0.0",
@@ -116,7 +116,6 @@
     "reflect-metadata": "^0.1.14",
     "register-service-worker": "^1.7.2",
     "simple-vue-camera": "^1.1.3",
-    "sqlite": "^5.1.1",
     "sqlite3": "^5.1.7",
     "stream-browserify": "^3.0.0",
     "three": "^0.156.1",
@@ -168,12 +167,11 @@
     "tailwindcss": "^3.4.1",
     "typescript": "~5.2.2",
     "vite": "^5.2.0",
-    "vite-plugin-node-polyfills": "^0.23.0",
+    "vite-plugin-pwa": "^1.0.0"
-    "vite-plugin-pwa": "^0.19.8"
   },
   "main": "./dist-electron/main.js",
   "build": {
-    "appId": "app.timesafari",
+    "appId": "app.timesafari.app",
     "productName": "TimeSafari",
     "directories": {
       "output": "dist-electron-packages"
@@ -184,7 +182,7 @@
     ],
     "extraResources": [
       {
-        "from": "dist",
+        "from": "dist-electron/www",
         "to": "www"
       }
     ],

pkgx.yaml

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

requirements.txt

@@ -1,5 +1,6 @@
 eth_keys
 pywebview
 pyinstaller>=6.12.0
+setuptools>=69.0.0  # Required for distutils for electron-builder on macOS
 # For development
 watchdog>=3.0.0  # For file watching support 

scripts/build-electron.js

@@ -1,10 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 
-    console.log('Starting electron build process...');
+console.log('Starting electron build process...');
 
-    // Copy web files
+// Define paths
-const webDistPath = path.join(__dirname, '..', 'dist');
 const electronDistPath = path.join(__dirname, '..', 'dist-electron');
 const wwwPath = path.join(electronDistPath, 'www');
 
@@ -13,231 +12,154 @@ if (!fs.existsSync(wwwPath)) {
   fs.mkdirSync(wwwPath, { recursive: true });
 }
 
-// Copy web files to www directory
+// Create a platform-specific index.html for Electron
-fs.cpSync(webDistPath, wwwPath, { recursive: true });
+const initialIndexContent = `<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,viewport-fit=cover">
+    <link rel="icon" href="/favicon.ico">
+    <title>TimeSafari</title>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but TimeSafari doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <script type="module">
+      // Force electron platform
+      window.process = { env: { VITE_PLATFORM: 'electron' } };
+      import('./src/main.electron.ts');
+    </script>
+  </body>
+</html>`;
 
-// Fix asset paths in index.html
+// Write the Electron-specific index.html
+fs.writeFileSync(path.join(wwwPath, 'index.html'), initialIndexContent);
+
+// Copy only necessary assets from web build
+const webDistPath = path.join(__dirname, '..', 'dist');
+if (fs.existsSync(webDistPath)) {
+  // Copy assets directory
+  const assetsSrc = path.join(webDistPath, 'assets');
+  const assetsDest = path.join(wwwPath, 'assets');
+  if (fs.existsSync(assetsSrc)) {
+    fs.cpSync(assetsSrc, assetsDest, { recursive: true });
+  }
+  
+  // Copy favicon
+  const faviconSrc = path.join(webDistPath, 'favicon.ico');
+  if (fs.existsSync(faviconSrc)) {
+    fs.copyFileSync(faviconSrc, path.join(wwwPath, 'favicon.ico'));
+  }
+}
+
+// Remove service worker files
+const swFilesToRemove = [
+  'sw.js',
+  'sw.js.map',
+  'workbox-*.js',
+  'workbox-*.js.map',
+  'registerSW.js',
+  'manifest.webmanifest',
+  '**/workbox-*.js',
+  '**/workbox-*.js.map',
+  '**/sw.js',
+  '**/sw.js.map',
+  '**/registerSW.js',
+  '**/manifest.webmanifest'
+];
+
+console.log('Removing service worker files...');
+swFilesToRemove.forEach(pattern => {
+  const files = fs.readdirSync(wwwPath).filter(file => 
+    file.match(new RegExp(pattern.replace(/\*/g, '.*')))
+  );
+  files.forEach(file => {
+    const filePath = path.join(wwwPath, file);
+    console.log(`Removing ${filePath}`);
+    try {
+      fs.unlinkSync(filePath);
+    } catch (err) {
+      console.warn(`Could not remove ${filePath}:`, err.message);
+    }
+  });
+});
+
+// Also check and remove from assets directory
+const assetsPath = path.join(wwwPath, 'assets');
+if (fs.existsSync(assetsPath)) {
+  swFilesToRemove.forEach(pattern => {
+    const files = fs.readdirSync(assetsPath).filter(file => 
+      file.match(new RegExp(pattern.replace(/\*/g, '.*')))
+    );
+    files.forEach(file => {
+      const filePath = path.join(assetsPath, file);
+      console.log(`Removing ${filePath}`);
+      try {
+        fs.unlinkSync(filePath);
+      } catch (err) {
+        console.warn(`Could not remove ${filePath}:`, err.message);
+      }
+    });
+  });
+}
+
+// Modify index.html to remove service worker registration
 const indexPath = path.join(wwwPath, 'index.html');
-let indexContent = fs.readFileSync(indexPath, 'utf8');
+if (fs.existsSync(indexPath)) {
+  console.log('Modifying index.html to remove service worker registration...');
+  let indexContent = fs.readFileSync(indexPath, 'utf8');
+  
+  // Remove service worker registration script
+  indexContent = indexContent
+    .replace(/<script[^>]*id="vite-plugin-pwa:register-sw"[^>]*><\/script>/g, '')
+    .replace(/<script[^>]*registerServiceWorker[^>]*><\/script>/g, '')
+    .replace(/<link[^>]*rel="manifest"[^>]*>/g, '')
+    .replace(/<link[^>]*rel="serviceworker"[^>]*>/g, '')
+    .replace(/navigator\.serviceWorker\.register\([^)]*\)/g, '')
+    .replace(/if\s*\(\s*['"]serviceWorker['"]\s*in\s*navigator\s*\)\s*{[^}]*}/g, '');
+  
+  fs.writeFileSync(indexPath, indexContent);
+  console.log('Successfully modified index.html');
+}
 
 // Fix asset paths
-    indexContent = indexContent
+console.log('Fixing asset paths in index.html...');
+let modifiedIndexContent = fs.readFileSync(indexPath, 'utf8');
+modifiedIndexContent = modifiedIndexContent
   .replace(/\/assets\//g, './assets/')
   .replace(/href="\//g, 'href="./')
   .replace(/src="\//g, 'src="./');
 
-fs.writeFileSync(indexPath, indexContent);
+fs.writeFileSync(indexPath, modifiedIndexContent);
+
+// Verify no service worker references remain
+const finalContent = fs.readFileSync(indexPath, 'utf8');
+if (finalContent.includes('serviceWorker') || finalContent.includes('workbox')) {
+  console.warn('Warning: Service worker references may still exist in index.html');
+}
 
 // Check for remaining /assets/ paths
-    console.log('After path fixing, checking for remaining /assets/ paths:', indexContent.includes('/assets/'));
+console.log('After path fixing, checking for remaining /assets/ paths:', finalContent.includes('/assets/'));
-console.log('Sample of fixed content:', indexContent.substring(0, 500));
+console.log('Sample of fixed content:', finalContent.substring(0, 500));
     
 console.log('Copied and fixed web files in:', wwwPath);
 
-    // Copy main process files
+// Copy main process files
-    console.log('Copying main process files...');
+console.log('Copying main process files...');
 
-// Create the main process file with inlined logger
+// Copy the main process file instead of creating a template
-const mainContent = `const { app, BrowserWindow } = require("electron");
+const mainSrcPath = path.join(__dirname, '..', 'dist-electron', 'main.js');
-const path = require("path");
+const mainDestPath = path.join(electronDistPath, 'main.js');
-const fs = require("fs");
 
-// Inline logger implementation
+if (fs.existsSync(mainSrcPath)) {
-const logger = {
+  fs.copyFileSync(mainSrcPath, mainDestPath);
-  log: (...args) => console.log(...args),
+  console.log('Copied main process file successfully');
-  error: (...args) => console.error(...args),
+} else {
-  info: (...args) => console.info(...args),
+  console.error('Main process file not found at:', mainSrcPath);
-  warn: (...args) => console.warn(...args),
+  process.exit(1);
-  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();
-    }
 }
 
-// Handle app ready
+console.log('Electron build process completed successfully');
-app.whenReady().then(createWindow);
-
-// Handle all windows closed
-app.on("window-all-closed", () => {
-  if (process.platform !== "darwin") {
-    app.quit();
-  }
-});
-
-app.on("activate", () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow();
-  }
-});
-
-// Handle any errors
-process.on("uncaughtException", (error) => {
-  logger.error("Uncaught Exception:", error);
-});
-`;
-
-// Write the main process file
-const mainDest = path.join(electronDistPath, 'main.js');
-fs.writeFileSync(mainDest, mainContent);
-
-// Copy preload script if it exists
-const preloadSrc = path.join(__dirname, '..', 'src', 'electron', 'preload.js');
-const preloadDest = path.join(electronDistPath, 'preload.js');
-if (fs.existsSync(preloadSrc)) {
-  console.log(`Copying ${preloadSrc} to ${preloadDest}`);
-  fs.copyFileSync(preloadSrc, preloadDest);
-}
-
-// Verify build structure
-console.log('\nVerifying build structure:');
-console.log('Files in dist-electron:', fs.readdirSync(electronDistPath));
-
-console.log('Build completed successfully!'); 

scripts/check-prerequisites.js

@@ -51,7 +51,7 @@ const { existsSync } = require('fs');
  */
 function checkCommand(command, errorMessage) {
     try {
-        execSync(command + ' --version', { stdio: 'ignore' });
+        execSync(command, { stdio: 'ignore' });
         return true;
     } catch (e) {
         console.error(`❌ ${errorMessage}`);
@@ -164,10 +164,10 @@ function main() {
 
     // Check required command line tools
     // These are essential for building and testing the application
-    success &= checkCommand('node', 'Node.js is required');
+    success &= checkCommand('node --version', 'Node.js is required');
-    success &= checkCommand('npm', 'npm is required');
+    success &= checkCommand('npm --version', 'npm is required');
-    success &= checkCommand('gradle', 'Gradle is required for Android builds');
+    success &= checkCommand('gradle --version', 'Gradle is required for Android builds');
-    success &= checkCommand('xcodebuild', 'Xcode is required for iOS builds');
+    success &= checkCommand('xcodebuild --help', 'Xcode is required for iOS builds');
 
     // Check platform-specific development environments
     success &= checkAndroidSetup();

scripts/test-android.js

@@ -170,7 +170,7 @@ const executeDeeplink = async (url, description, log) => {
     
     try {
         // Stop the app before executing the deep link
-        execSync('adb shell am force-stop app.timesafari');
+        execSync('adb shell am force-stop app.timesafari.app');
         await new Promise(resolve => setTimeout(resolve, 1000)); // Wait 1s
         
         execSync(`adb shell am start -W -a android.intent.action.VIEW -d "${url}" -c android.intent.category.BROWSABLE`);

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 z-[90] top-[max(1rem,env(safe-area-inset-top))] right-4 left-4 sm:left-auto sm:w-full sm:max-w-sm flex flex-col items-start justify-end"
     >
       <Notification
         v-slot="{ notifications, close }"
@@ -330,8 +330,11 @@
 
 <script lang="ts">
 import { Vue, Component } from "vue-facing-decorator";
-import { logConsoleAndDb, retrieveSettingsForActiveAccount } from "./db/index";
+
-import { NotificationIface } from "./constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "./constants/app";
+import * as databaseUtil from "./db/databaseUtil";
+import { retrieveSettingsForActiveAccount } from "./db/index";
+import { logConsoleAndDb } from "./db/databaseUtil";
 import { logger } from "./utils/logger";
 
 interface Settings {
@@ -396,7 +399,11 @@ export default class App extends Vue {
 
     try {
       logger.log("Retrieving settings for the active account...");
-      const settings: Settings = await retrieveSettingsForActiveAccount();
+      let settings: Settings =
+        await databaseUtil.retrieveSettingsForActiveAccount();
+      if (USE_DEXIE_DB) {
+        settings = await retrieveSettingsForActiveAccount();
+      }
       logger.log("Retrieved settings:", settings);
 
       const notifyingNewActivity = !!settings?.notifyingNewActivityTime;
@@ -541,13 +548,13 @@ export default class App extends Vue {
 
 <style>
 #Content {
-  padding-left: 1.5rem;
+  padding-left: max(1.5rem, env(safe-area-inset-left));
-  padding-right: 1.5rem;
+  padding-right: max(1.5rem, env(safe-area-inset-right));
-  padding-top: calc(env(safe-area-inset-top) + 1.5rem);
+  padding-top: max(1.5rem, env(safe-area-inset-top));
-  padding-bottom: calc(env(safe-area-inset-bottom) + 1.5rem);
+  padding-bottom: max(1.5rem, env(safe-area-inset-bottom));
 }
 
 #QuickNav ~ #Content {
-  padding-bottom: calc(env(safe-area-inset-bottom) + 6rem);
+  padding-bottom: calc(env(safe-area-inset-bottom) + 6.333rem);
 }
 </style>

src/components/ActivityListItem.vue

@@ -14,22 +14,34 @@
       class="flex items-center justify-between gap-2 text-lg bg-slate-200 border border-slate-300 border-b-0 rounded-t-md px-3 sm:px-4 py-1 sm:py-2"
     >
       <div class="flex items-center gap-2">
-        <div v-if="record.issuerDid">
+        <router-link
+          v-if="record.issuerDid && !isHiddenDid(record.issuerDid)"
+          :to="{
+            path: '/did/' + encodeURIComponent(record.issuerDid),
+          }"
+          title="More details about this person"
+        >
           <EntityIcon
             :entity-id="record.issuerDid"
             class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
           />
-        </div>
+        </router-link>
-        <div v-else>
         <font-awesome
-            icon="person-circle-question"
+          v-else-if="isHiddenDid(record.issuerDid)"
-            class="text-slate-300 text-[2rem]"
+          icon="eye-slash"
+          class="text-slate-400 !size-[2rem] cursor-pointer"
+          @click="notifyHiddenPerson"
+        />
+        <font-awesome
+          v-else
+          icon="person-circle-question"
+          class="text-slate-400 !size-[2rem] cursor-pointer"
+          @click="notifyUnknownPerson"
         />
-        </div>
 
         <div>
-          <h3 class="font-semibold">
+          <h3 v-if="record.issuer.known" class="font-semibold leading-tight">
-            {{ record.issuer.known ? record.issuer.displayName : "" }}
+            {{ record.issuer.displayName }}
           </h3>
           <p class="ms-auto text-xs text-slate-500 italic">
             {{ friendlyDate }}
@@ -37,7 +49,11 @@
         </div>
       </div>
 
-      <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
+      <a
+        class="cursor-pointer"
+        data-testid="circle-info-link"
+        @click="$emit('loadClaim', record.jwtId)"
+      >
         <font-awesome icon="circle-info" class="fa-fw text-slate-500" />
       </a>
     </div>
@@ -46,7 +62,7 @@
       <!-- Record Image -->
       <div
         v-if="record.image"
-        class="bg-cover mb-6 -mt-3 sm:-mt-4 -mx-3 sm:-mx-4"
+        class="bg-cover mb-2 -mt-3 sm:-mt-4 -mx-3 sm:-mx-4"
         :style="`background-image: url(${record.image});`"
       >
         <a
@@ -62,36 +78,67 @@
         </a>
       </div>
 
+      <!-- Description -->
+      <p class="font-medium">
+        <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
+          {{ description }}
+        </a>
+      </p>
+
       <div
-        class="relative flex justify-between gap-4 max-w-[40rem] mx-auto mb-5"
+        class="relative flex justify-between gap-4 max-w-[40rem] mx-auto mt-4"
       >
         <!-- Source -->
         <div
-          class="w-[8rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
+          class="w-[7rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
         >
           <div class="relative w-fit mx-auto">
             <div>
               <!-- Project Icon -->
               <div v-if="record.providerPlanName">
+                <router-link
+                  :to="{
+                    path:
+                      '/project/' +
+                      encodeURIComponent(record.providerPlanHandleId || ''),
+                  }"
+                  title="View project details"
+                >
                   <ProjectIcon
-                  :entity-id="record.providerPlanName"
+                    :entity-id="record.providerPlanHandleId || ''"
                     :icon-size="48"
                     class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
                   />
+                </router-link>
               </div>
               <!-- Identicon for DIDs -->
               <div v-else-if="record.agentDid">
+                <router-link
+                  v-if="!isHiddenDid(record.agentDid)"
+                  :to="{
+                    path: '/did/' + encodeURIComponent(record.agentDid),
+                  }"
+                  title="More details about this person"
+                >
                   <EntityIcon
                     :entity-id="record.agentDid"
                     :profile-image-url="record.issuer.profileImageUrl"
                     class="rounded-full bg-slate-100 overflow-hidden !size-[3rem] sm:!size-[4rem]"
                   />
+                </router-link>
+                <font-awesome
+                  v-else
+                  icon="eye-slash"
+                  class="text-slate-300 !size-[3rem] sm:!size-[4rem]"
+                  @click="notifyHiddenPerson"
+                />
               </div>
               <!-- Unknown Person -->
               <div v-else>
                 <font-awesome
                   icon="person-circle-question"
                   class="text-slate-300 text-[3rem] sm:text-[4rem]"
+                  @click="notifyUnknownPerson"
                 />
               </div>
             </div>
@@ -110,9 +157,11 @@
 
         <!-- Arrow -->
         <div
-          class="absolute inset-x-[8rem] sm:inset-x-[12rem] mx-2 top-1/2 -translate-y-1/2"
+          class="absolute inset-x-[7rem] sm:inset-x-[12rem] mx-2 top-1/2 -translate-y-1/2"
+        >
+          <div
+            class="text-sm text-center leading-none font-semibold pe-2 sm:pe-4"
           >
-          <div class="text-sm text-center leading-none font-semibold pe-[15px]">
             {{ fetchAmount }}
           </div>
 
@@ -129,31 +178,55 @@
 
         <!-- Destination -->
         <div
-          class="w-[8rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
+          class="w-[7rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
         >
           <div class="relative w-fit mx-auto">
             <div>
               <!-- Project Icon -->
               <div v-if="record.recipientProjectName">
+                <router-link
+                  :to="{
+                    path:
+                      '/project/' +
+                      encodeURIComponent(record.fulfillsPlanHandleId || ''),
+                  }"
+                  title="View project details"
+                >
                   <ProjectIcon
-                  :entity-id="record.recipientProjectName"
+                    :entity-id="record.fulfillsPlanHandleId || ''"
                     :icon-size="48"
                     class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
                   />
+                </router-link>
               </div>
               <!-- Identicon for DIDs -->
               <div v-else-if="record.recipientDid">
+                <router-link
+                  v-if="!isHiddenDid(record.recipientDid)"
+                  :to="{
+                    path: '/did/' + encodeURIComponent(record.recipientDid),
+                  }"
+                  title="More details about this person"
+                >
                   <EntityIcon
                     :entity-id="record.recipientDid"
                     :profile-image-url="record.receiver.profileImageUrl"
                     class="rounded-full bg-slate-100 overflow-hidden !size-[3rem] sm:!size-[4rem]"
                   />
+                </router-link>
+                <font-awesome
+                  v-else
+                  icon="eye-slash"
+                  class="text-slate-300 !size-[3rem] sm:!size-[4rem]"
+                  @click="notifyHiddenPerson"
+                />
               </div>
               <!-- Unknown Person -->
               <div v-else>
                 <font-awesome
                   icon="person-circle-question"
                   class="text-slate-300 text-[3rem] sm:text-[4rem]"
+                  @click="notifyUnknownPerson"
                 />
               </div>
             </div>
@@ -170,13 +243,6 @@
           </div>
         </div>
       </div>
-
-      <!-- Description -->
-      <p class="font-medium">
-        <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
-          {{ description }}
-        </a>
-      </p>
     </div>
   </li>
 </template>
@@ -186,8 +252,9 @@ 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 { containsHiddenDid, isHiddenDid } from "../libs/endorserServer";
 import ProjectIcon from "./ProjectIcon.vue";
+import { NotificationIface } from "../constants/app";
 
 @Component({
   components: {
@@ -202,6 +269,33 @@ export default class ActivityListItem extends Vue {
   @Prop() activeDid!: string;
   @Prop() confirmerIdList?: string[];
 
+  isHiddenDid = isHiddenDid;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  notifyHiddenPerson() {
+    this.$notify(
+      {
+        group: "alert",
+        type: "warning",
+        title: "Person Outside Your Network",
+        text: "This person is not visible to you.",
+      },
+      3000,
+    );
+  }
+
+  notifyUnknownPerson() {
+    this.$notify(
+      {
+        group: "alert",
+        type: "warning",
+        title: "Unidentified Person",
+        text: "Nobody specific was recognized.",
+      },
+      3000,
+    );
+  }
+
   @Emit()
   cacheImage(image: string) {
     return image;
@@ -222,7 +316,7 @@ export default class ActivityListItem extends Vue {
     const claim =
       (this.record.fullClaim as unknown).claim || this.record.fullClaim;
 
-    return `${claim.description}`;
+    return `${claim?.description || ""}`;
   }
 
   private displayAmount(code: string, amt: number) {

src/components/DataExportSection.vue

@@ -24,9 +24,7 @@ backup and database export, with platform-specific download instructions. * *
       class="block w-full text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
       @click="exportDatabase()"
     >
-      Download Settings & Contacts
+      Download Contacts
-      <br />
-      (excluding Identifier Data)
     </button>
     <a
       ref="downloadLink"
@@ -62,14 +60,18 @@ backup and database export, with platform-specific download instructions. * *
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-facing-decorator";
-import { NotificationIface } from "../constants/app";
+import { AppString, NotificationIface } from "../constants/app";
-import { db } from "../db/index";
+
+import { Contact } from "../db/tables/contacts";
+import * as databaseUtil from "../db/databaseUtil";
+
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
 import {
   PlatformService,
   PlatformCapabilities,
 } from "../services/PlatformService";
+import { contactsToExportJson } from "../libs/util";
 
 /**
  * @vue-component
@@ -131,21 +133,25 @@ export default class DataExportSection extends Vue {
    */
   public async exportDatabase() {
     try {
-      const blob = await db.export({
+      let allContacts: Contact[] = [];
-        prettyJson: true,
+      const platformService = PlatformServiceFactory.getInstance();
-        transform: (table, value, key) => {
+      const result = await platformService.dbQuery(`SELECT * FROM contacts`);
-          if (table === "contacts") {
+      if (result) {
-            // Dexie inserts a number 0 when some are undefined, so we need to totally remove them.
+        allContacts = databaseUtil.mapQueryResultToValues(
-            Object.keys(value).forEach((prop) => {
+          result,
-              if (value[prop] === undefined) {
+        ) as unknown as Contact[];
-                delete value[prop];
       }
-            });
+      // if (USE_DEXIE_DB) {
-          }
+      //   await db.open();
-          return { value, key };
+      //   allContacts = await db.contacts.toArray();
-        },
+      // }
-      });
+
-      const fileName = `${db.name}-backup.json`;
+      // Convert contacts to export format
+      const exportData = contactsToExportJson(allContacts);
+      const jsonStr = JSON.stringify(exportData, null, 2);
+      const blob = new Blob([jsonStr], { type: "application/json" });
+
+      const fileName = `${AppString.APP_NAME_NO_SPACES}-backup-contacts.json`;
 
       if (this.platformCapabilities.hasFileDownload) {
         // Web platform: Use download link
@@ -157,8 +163,9 @@ export default class DataExportSection extends Vue {
         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, jsonStr);
-        await this.platformService.writeAndShareFile(fileName, content);
+      } else {
+        throw new Error("This platform does not support file downloads.");
       }
 
       this.$notify(
@@ -167,10 +174,10 @@ export default class DataExportSection extends Vue {
           type: "success",
           title: "Export Successful",
           text: this.platformCapabilities.hasFileDownload
-            ? "See your downloads directory for the backup. It is in the Dexie format."
+            ? "See your downloads directory for the backup."
-            : "You should have been prompted to save your backup file.",
+            : "The backup file has been saved.",
         },
-        -1,
+        3000,
       );
     } catch (error) {
       logger.error("Export Error:", error);

src/components/FeedFilters.vue

@@ -100,6 +100,12 @@ import {
 } from "@vue-leaflet/vue-leaflet";
 import { Router } from "vue-router";
 
+import { USE_DEXIE_DB } from "@/constants/app";
+import * as databaseUtil from "../db/databaseUtil";
+import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
+import { db, retrieveSettingsForActiveAccount } from "../db/index";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
+
 @Component({
   components: {
     LRectangle,
@@ -120,8 +126,10 @@ export default class FeedFilters extends Vue {
   async open(onCloseIfChanged: () => void) {
     this.onCloseIfChanged = onCloseIfChanged;
 
-    const platform = this.$platform;
+    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
-    const settings = await platform.getActiveAccountSettings();
+    if (USE_DEXIE_DB) {
+      settings = await retrieveSettingsForActiveAccount();
+    }
     this.hasVisibleDid = !!settings.filterFeedByVisible;
     this.isNearby = !!settings.filterFeedByNearby;
     if (settings.searchBoxes && settings.searchBoxes.length > 0) {
@@ -135,8 +143,7 @@ export default class FeedFilters extends Vue {
   async toggleHasVisibleDid() {
     this.settingChanged = true;
     this.hasVisibleDid = !this.hasVisibleDid;
-    const platform = this.$platform;
+    await db.settings.update(MASTER_SETTINGS_KEY, {
-    await platform.updateMasterSettings({
       filterFeedByVisible: this.hasVisibleDid,
     });
   }
@@ -144,22 +151,36 @@ export default class FeedFilters extends Vue {
   async toggleNearby() {
     this.settingChanged = true;
     this.isNearby = !this.isNearby;
-    const platform = this.$platform;
+    const platformService = PlatformServiceFactory.getInstance();
-    await platform.updateMasterSettings({
+    await platformService.dbExec(
+      `UPDATE settings SET filterFeedByNearby = ? WHERE id = ?`,
+      [this.isNearby, MASTER_SETTINGS_KEY],
+    );
+
+    if (USE_DEXIE_DB) {
+      await db.settings.update(MASTER_SETTINGS_KEY, {
         filterFeedByNearby: this.isNearby,
       });
     }
+  }
 
   async clearAll() {
     if (this.hasVisibleDid || this.isNearby) {
       this.settingChanged = true;
     }
 
-    const platform = this.$platform;
+    const platformService = PlatformServiceFactory.getInstance();
-    await platform.updateMasterSettings({
+    await platformService.dbExec(
+      `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`,
+      [false, false, MASTER_SETTINGS_KEY],
+    );
+
+    if (USE_DEXIE_DB) {
+      await db.settings.update(MASTER_SETTINGS_KEY, {
         filterFeedByNearby: false,
         filterFeedByVisible: false,
       });
+    }
 
     this.hasVisibleDid = false;
     this.isNearby = false;
@@ -170,11 +191,18 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    const platform = this.$platform;
+    const platformService = PlatformServiceFactory.getInstance();
-    await platform.updateMasterSettings({
+    await platformService.dbExec(
+      `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`,
+      [true, true, MASTER_SETTINGS_KEY],
+    );
+
+    if (USE_DEXIE_DB) {
+      await db.settings.update(MASTER_SETTINGS_KEY, {
         filterFeedByNearby: true,
         filterFeedByVisible: true,
       });
+    }
 
     this.hasVisibleDid = true;
     this.isNearby = true;

src/components/GiftedDialog.vue

@@ -89,7 +89,7 @@
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import {
   createAndSubmitGive,
   didInfo,
@@ -98,8 +98,10 @@ import {
 import * as libsUtil from "../libs/util";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
 import { Contact } from "../db/tables/contacts";
+import * as databaseUtil from "../db/databaseUtil";
 import { retrieveAccountDids } from "../libs/util";
 import { logger } from "../utils/logger";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 @Component
 export default class GiftedDialog extends Vue {
@@ -144,11 +146,23 @@ export default class GiftedDialog extends Vue {
     this.offerId = offerId || "";
 
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      if (USE_DEXIE_DB) {
+        settings = await retrieveSettingsForActiveAccount();
+      }
       this.apiServer = settings.apiServer || "";
       this.activeDid = settings.activeDid || "";
 
+      const platformService = PlatformServiceFactory.getInstance();
+      const result = await platformService.dbQuery(`SELECT * FROM contacts`);
+      if (result) {
+        this.allContacts = databaseUtil.mapQueryResultToValues(
+          result,
+        ) as unknown as Contact[];
+      }
+      if (USE_DEXIE_DB) {
         this.allContacts = await db.contacts.toArray();
+      }
 
       this.allMyDids = await retrieveAccountDids();
 
@@ -306,10 +320,7 @@ export default class GiftedDialog extends Vue {
         this.fromProjectId,
       );
 
-      if (
+      if (!result.success) {
-        result.type === "error" ||
-        this.isGiveCreationError(result.response)
-      ) {
         const errorMessage = this.getGiveCreationErrorMessage(result);
         logger.error("Error with give creation result:", result);
         this.$notify(
@@ -356,15 +367,6 @@ export default class GiftedDialog extends Vue {
 
   // Helper functions for readability
 
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isGiveCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
   /**
    * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
    * @returns best guess at an error message

src/components/GiftedPrompts.vue

@@ -74,10 +74,12 @@
 import { Vue, Component } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
-import { AppString, NotificationIface } from "../constants/app";
+import { AppString, NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import { db } from "../db/index";
 import { Contact } from "../db/tables/contacts";
+import * as databaseUtil from "../db/databaseUtil";
 import { GiverReceiverInputInfo } from "../libs/util";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 @Component
 export default class GivenPrompts extends Vue {
@@ -127,8 +129,16 @@ export default class GivenPrompts extends Vue {
     this.visible = true;
     this.callbackOnFullGiftInfo = callbackOnFullGiftInfo;
 
-    await db.open();
+    const platformService = PlatformServiceFactory.getInstance();
+    const result = await platformService.dbQuery(
+      "SELECT COUNT(*) FROM contacts",
+    );
+    if (result) {
+      this.numContacts = result.values[0][0] as number;
+    }
+    if (USE_DEXIE_DB) {
       this.numContacts = await db.contacts.count();
+    }
     this.shownContactDbIndices = new Array<boolean>(this.numContacts); // all undefined to start
   }
 
@@ -229,10 +239,22 @@ export default class GivenPrompts extends Vue {
       this.nextIdeaPastContacts();
     } else {
       // get the contact at that offset
+      const platformService = PlatformServiceFactory.getInstance();
+      const result = await platformService.dbQuery(
+        "SELECT * FROM contacts LIMIT 1 OFFSET ?",
+        [someContactDbIndex],
+      );
+      if (result) {
+        this.currentContact = databaseUtil.mapQueryResultToValues(result)[
+          someContactDbIndex
+        ] as unknown as Contact;
+      }
+      if (USE_DEXIE_DB) {
         await db.open();
         this.currentContact = await db.contacts
           .offset(someContactDbIndex)
           .first();
+      }
       this.shownContactDbIndices[someContactDbIndex] = true;
     }
   }

src/components/HiddenDidDialog.vue

@@ -48,11 +48,7 @@
                   <span>
                     {{ didInfo(visDid) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                      <a
+                      <a :href="`/did/${visDid}`" class="text-blue-500">
-                        :href="`/did/${visDid}`"
-                        target="_blank"
-                        class="text-blue-500"
-                      >
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"

src/components/ImageMethodDialog.vue

@@ -4,7 +4,9 @@
       <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="blob">{{
+            crop ? "Crop Image" : "Preview Image"
+          }}</span>
           <span v-else-if="showCameraPreview">Upload Image</span>
           <span v-else>Add Photo</span>
         </h1>
@@ -119,12 +121,23 @@
                   playsinline
                   muted
                 ></video>
+                <div
+                  class="absolute bottom-4 inset-x-0 flex items-center justify-center gap-4"
+                >
                   <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"
+                    class="bg-white text-slate-800 p-3 rounded-full text-2xl leading-none"
                     @click="capturePhoto"
                   >
                     <font-awesome icon="camera" class="w-[1em]" />
                   </button>
+                  <button
+                    v-if="platformCapabilities.isMobile"
+                    class="bg-white text-slate-800 p-3 rounded-full text-2xl leading-none"
+                    @click="rotateCamera"
+                  >
+                    <font-awesome icon="rotate" class="w-[1em]" />
+                  </button>
+                </div>
               </div>
             </div>
             <div
@@ -229,12 +242,12 @@
             <p class="mb-2">
               Before you can upload a photo, a friend needs to register you.
             </p>
-            <router-link
+            <button
-              :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"
+              @click="handleQRCodeClick"
             >
               Share Your Info
-            </router-link>
+            </button>
           </div>
         </template>
       </div>
@@ -247,11 +260,17 @@ 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 { Capacitor } from "@capacitor/core";
+import {
+  DEFAULT_IMAGE_API_SERVER,
+  NotificationIface,
+  USE_DEXIE_DB,
+} from "../constants/app";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 import { accessToken } from "../libs/crypto";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
+import * as databaseUtil from "../db/databaseUtil";
 
 const inputImageFileNameRef = ref<Blob>();
 
@@ -262,6 +281,11 @@ const inputImageFileNameRef = ref<Blob>();
       type: Boolean,
       default: true,
     },
+    defaultCameraMode: {
+      type: String,
+      default: "environment",
+      validator: (value: string) => ["environment", "user"].includes(value),
+    },
   },
 })
 export default class ImageMethodDialog extends Vue {
@@ -303,6 +327,9 @@ export default class ImageMethodDialog extends Vue {
   /** Camera stream reference */
   private cameraStream: MediaStream | null = null;
 
+  /** Current camera facing mode */
+  private currentFacingMode: "environment" | "user" = "environment";
+
   private platformService = PlatformServiceFactory.getInstance();
   URL = window.URL || window.webkitURL;
 
@@ -334,7 +361,10 @@ export default class ImageMethodDialog extends Vue {
    */
   async mounted() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      if (USE_DEXIE_DB) {
+        settings = await retrieveSettingsForActiveAccount();
+      }
       this.activeDid = settings.activeDid || "";
     } catch (error: unknown) {
       logger.error("Error retrieving settings from database:", error);
@@ -361,16 +391,17 @@ export default class ImageMethodDialog extends Vue {
   }
 
   open(setImageFn: (arg: string) => void, claimType: string, crop?: boolean) {
+    logger.debug("ImageMethodDialog.open called");
     this.claimType = claimType;
     this.crop = !!crop;
     this.imageCallback = setImageFn;
     this.visible = true;
+    this.currentFacingMode = this.defaultCameraMode as "environment" | "user";
 
-    // Start camera preview immediately if not on mobile
+    // Start camera preview immediately
-    if (!this.platformCapabilities.isNativeApp) {
+    logger.debug("Starting camera preview from open()");
     this.startCameraPreview();
   }
-  }
 
   async uploadImageFile(event: Event) {
     const target = event.target as HTMLInputElement;
@@ -438,46 +469,24 @@ export default class ImageMethodDialog extends Vue {
     logger.debug("startCameraPreview called");
     logger.debug("Current showCameraPreview state:", this.showCameraPreview);
     logger.debug("Platform capabilities:", this.platformCapabilities);
-
+    logger.debug("MediaDevices available:", !!navigator.mediaDevices);
-    if (this.platformCapabilities.isNativeApp) {
+    logger.debug(
-      logger.debug("Using platform service for mobile device");
+      "getUserMedia available:",
-      this.cameraState = "initializing";
+      !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia),
-      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();
 
+      if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
+        throw new Error("Camera API not available in this browser");
+      }
+
       const stream = await navigator.mediaDevices.getUserMedia({
-        video: { facingMode: "environment" },
+        video: { facingMode: this.currentFacingMode },
       });
       logger.debug("Camera access granted");
       this.cameraStream = stream;
@@ -491,25 +500,36 @@ export default class ImageMethodDialog extends Vue {
         videoElement.srcObject = stream;
         await new Promise((resolve) => {
           videoElement.onloadedmetadata = () => {
-            videoElement.play().then(() => {
+            videoElement
+              .play()
+              .then(() => {
+                logger.debug("Video element started playing");
                 resolve(true);
+              })
+              .catch((error) => {
+                logger.error("Error playing video:", error);
+                throw error;
               });
           };
         });
+      } else {
+        logger.error("Video element not found");
+        throw new Error("Video element not found");
       }
     } 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 instanceof Error &&
-        error.name === "TrackStartError"
+        (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 instanceof Error &&
-        error.name === "PermissionDeniedError"
+        (error.name === "NotAllowedError" ||
+          error.name === "PermissionDeniedError")
       ) {
         errorMessage =
           "Camera access was denied. Please allow camera access in your browser settings.";
@@ -517,6 +537,7 @@ export default class ImageMethodDialog extends Vue {
       this.cameraState = "error";
       this.cameraStateMessage = errorMessage;
       this.error = errorMessage;
+      this.showCameraPreview = false;
       this.$notify(
         {
           group: "alert",
@@ -526,7 +547,6 @@ export default class ImageMethodDialog extends Vue {
         },
         5000,
       );
-      this.showCameraPreview = false;
     }
   }
 
@@ -578,6 +598,21 @@ export default class ImageMethodDialog extends Vue {
     }
   }
 
+  async rotateCamera() {
+    // Toggle between front and back cameras
+    this.currentFacingMode =
+      this.currentFacingMode === "environment" ? "user" : "environment";
+
+    // Stop current stream
+    if (this.cameraStream) {
+      this.cameraStream.getTracks().forEach((track) => track.stop());
+      this.cameraStream = null;
+    }
+
+    // Start new stream with updated facing mode
+    await this.startCameraPreview();
+  }
+
   private createBlobURL(blob: Blob): string {
     return URL.createObjectURL(blob);
   }
@@ -612,6 +647,7 @@ export default class ImageMethodDialog extends Vue {
         5000,
       );
       this.uploading = false;
+      this.close();
       return;
     }
     formData.append("image", this.blob, this.fileName || "photo.jpg");
@@ -666,6 +702,7 @@ export default class ImageMethodDialog extends Vue {
       );
       this.uploading = false;
       this.blob = undefined;
+      this.close();
     }
   }
 
@@ -673,6 +710,14 @@ export default class ImageMethodDialog extends Vue {
   toggleDiagnostics() {
     this.showDiagnostics = !this.showDiagnostics;
   }
+
+  private handleQRCodeClick() {
+    if (Capacitor.isNativePlatform()) {
+      this.$router.push({ name: "contact-qr-scan-full" });
+    } else {
+      this.$router.push({ name: "contact-qr" });
+    }
+  }
 }
 </script>
 

src/components/MembersList.vue

@@ -172,8 +172,10 @@ import {
 } from "../libs/endorserServer";
 import { decryptMessage } from "../libs/crypto";
 import { Contact } from "../db/tables/contacts";
+import * as databaseUtil from "../db/databaseUtil";
 import * as libsUtil from "../libs/util";
-import { NotificationIface } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 interface Member {
   admitted: boolean;
@@ -209,7 +211,10 @@ export default class MembersList extends Vue {
   contacts: Array<Contact> = [];
 
   async created() {
-    const settings = await retrieveSettingsForActiveAccount();
+    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    if (USE_DEXIE_DB) {
+      settings = await retrieveSettingsForActiveAccount();
+    }
     this.activeDid = settings.activeDid || "";
     this.apiServer = settings.apiServer || "";
     this.firstName = settings.firstName || "";
@@ -296,7 +301,7 @@ 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. Retry or have them check their password.";
       } else {
         // the first (organizer) member was decrypted OK
         return "";
@@ -337,7 +342,7 @@ export default class MembersList extends Vue {
           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.",
+          text: "They are in your contacts. To remove them, use the contacts page.",
         },
         10000,
       );
@@ -347,7 +352,7 @@ export default class MembersList extends Vue {
           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.",
+          text: "This is to add them to your contacts. To remove them later, use the contacts page.",
         },
         10000,
       );
@@ -355,8 +360,17 @@ export default class MembersList extends Vue {
   }
 
   async loadContacts() {
+    const platformService = PlatformServiceFactory.getInstance();
+    const result = await platformService.dbQuery("SELECT * FROM contacts");
+    if (result) {
+      this.contacts = databaseUtil.mapQueryResultToValues(
+        result,
+      ) as unknown as Contact[];
+    }
+    if (USE_DEXIE_DB) {
       this.contacts = await db.contacts.toArray();
     }
+  }
 
   getContactFor(did: string): Contact | undefined {
     return this.contacts.find((contact) => contact.did === did);
@@ -439,7 +453,14 @@ export default class MembersList extends Vue {
           if (result.success) {
             decrMember.isRegistered = true;
             if (oldContact) {
+              const platformService = PlatformServiceFactory.getInstance();
+              await platformService.dbExec(
+                "UPDATE contacts SET registered = ? WHERE did = ?",
+                [true, decrMember.did],
+              );
+              if (USE_DEXIE_DB) {
                 await db.contacts.update(decrMember.did, { registered: true });
+              }
               oldContact.registered = true;
             }
             this.$notify(
@@ -492,7 +513,14 @@ export default class MembersList extends Vue {
         name: member.name,
       };
 
+      const platformService = PlatformServiceFactory.getInstance();
+      await platformService.dbExec(
+        "INSERT INTO contacts (did, name) VALUES (?, ?)",
+        [member.did, member.name],
+      );
+      if (USE_DEXIE_DB) {
         await db.contacts.add(newContact);
+      }
       this.contacts.push(newContact);
 
       this.$notify(

src/components/OfferDialog.vue

@@ -82,12 +82,13 @@
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import {
   createAndSubmitOffer,
   serverMessageForUser,
 } from "../libs/endorserServer";
 import * as libsUtil from "../libs/util";
+import * as databaseUtil from "../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 import { logger } from "../utils/logger";
 
@@ -116,7 +117,10 @@ export default class OfferDialog extends Vue {
       this.recipientDid = recipientDid;
       this.recipientName = recipientName;
 
-      const settings = await retrieveSettingsForActiveAccount();
+      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      if (USE_DEXIE_DB) {
+        settings = await retrieveSettingsForActiveAccount();
+      }
       this.apiServer = settings.apiServer || "";
       this.activeDid = settings.activeDid || "";
 
@@ -245,10 +249,7 @@ export default class OfferDialog extends Vue {
         this.projectId,
       );
 
-      if (
+      if (!result.success) {
-        result.type === "error" ||
-        this.isOfferCreationError(result.response)
-      ) {
         const errorMessage = this.getOfferCreationErrorMessage(result);
         logger.error("Error with offer creation result:", result);
         this.$notify(
@@ -292,15 +293,6 @@ export default class OfferDialog extends Vue {
 
   // Helper functions for readability
 
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isOfferCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
   /**
    * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
    * @returns best guess at an error message

src/components/OnboardingDialog.vue

@@ -5,7 +5,7 @@
       <h1 class="text-xl font-bold text-center mb-4 relative">
         Welcome to Time Safari
         <br />
-        - Showcasing Gratitude & Magnifying Time
+        - Showcase Impact & Magnify Time
         <div
           class="text-lg text-center leading-none absolute right-0 -top-1"
           @click="onClickClose(true)"
@@ -14,6 +14,9 @@
         </div>
       </h1>
 
+      The feed underneath this pop-up shows the latest contributions, some from
+      people and some from projects.
+
       <p v-if="isRegistered" class="mt-4">
         You can now log things that you've seen:
         <span v-if="numContacts > 0">
@@ -23,14 +26,10 @@
         <span class="bg-green-600 text-white rounded-full">
           <font-awesome icon="plus" class="fa-fw" />
         </span>
-        button to express your appreciation for... whatever -- maybe thanks for
+        button to express your appreciation for... whatever.
-        showing you all these fascinating stories of
-        <em>gratitude</em>.
       </p>
-      <p v-else class="mt-4">
+      <p class="mt-4">
-        The feed underneath this pop-up shows the latest gifts that others have
+        Once someone registers you, you can log your appreciation, too.
-        recognized. Once someone registers you, you can log your appreciation,
-        too.
       </p>
 
       <p class="mt-4">
@@ -201,13 +200,16 @@
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import {
   db,
   retrieveSettingsForActiveAccount,
   updateAccountSettings,
 } from "../db/index";
+import * as databaseUtil from "../db/databaseUtil";
 import { OnboardPage } from "../libs/util";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
+import { Contact } from "@/db/tables/contacts";
 
 @Component({
   computed: {
@@ -222,7 +224,7 @@ export default class OnboardingDialog extends Vue {
   $router!: Router;
 
   activeDid = "";
-  firstContactName = null;
+  firstContactName = "";
   givenName = "";
   isRegistered = false;
   numContacts = 0;
@@ -231,29 +233,54 @@ export default class OnboardingDialog extends Vue {
 
   async open(page: OnboardPage) {
     this.page = page;
-    const settings = await retrieveSettingsForActiveAccount();
+    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    if (USE_DEXIE_DB) {
+      settings = await retrieveSettingsForActiveAccount();
+    }
     this.activeDid = settings.activeDid || "";
     this.isRegistered = !!settings.isRegistered;
+    const platformService = PlatformServiceFactory.getInstance();
+    const dbContacts = await platformService.dbQuery("SELECT * FROM contacts");
+    if (dbContacts) {
+      this.numContacts = dbContacts.values.length;
+      const firstContact = dbContacts.values[0];
+      const fullContact = databaseUtil.mapColumnsToValues(dbContacts.columns, [
+        firstContact,
+      ]) as unknown as Contact;
+      this.firstContactName = fullContact.name || "";
+    }
+    if (USE_DEXIE_DB) {
       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;
     if (this.page === OnboardPage.Create) {
       // we'll assume that they've been through all the other pages
+      await databaseUtil.updateAccountSettings(this.activeDid, {
+        finishedOnboarding: true,
+      });
+      if (USE_DEXIE_DB) {
         await updateAccountSettings(this.activeDid, {
           finishedOnboarding: true,
         });
       }
     }
+  }
 
   async onClickClose(done?: boolean, goHome?: boolean) {
     this.visible = false;
     if (done) {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
+        finishedOnboarding: true,
+      });
+      if (USE_DEXIE_DB) {
         await updateAccountSettings(this.activeDid, {
           finishedOnboarding: true,
         });
+      }
       if (goHome) {
         this.$router.push({ name: "home" });
       }

src/components/PhotoDialog.vue

@@ -119,7 +119,12 @@ 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 {
+  DEFAULT_IMAGE_API_SERVER,
+  NotificationIface,
+  USE_DEXIE_DB,
+} from "../constants/app";
+import * as databaseUtil from "../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 import { accessToken } from "../libs/crypto";
 import { logger } from "../utils/logger";
@@ -173,9 +178,12 @@ export default class PhotoDialog extends Vue {
    * @throws {Error} When settings retrieval fails
    */
   async mounted() {
-    logger.log("PhotoDialog mounted");
+    // logger.log("PhotoDialog mounted");
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      if (USE_DEXIE_DB) {
+        settings = await retrieveSettingsForActiveAccount();
+      }
       this.activeDid = settings.activeDid || "";
       this.isRegistered = !!settings.isRegistered;
       logger.log("isRegistered:", this.isRegistered);

src/components/ProjectIcon.vue

@@ -1,18 +1,14 @@
 <!-- eslint-disable vue/no-v-html -->
 <template>
   <a
-    v-if="linkToFull && imageUrl"
+    v-if="linkToFullImage && imageUrl"
     :href="imageUrl"
     target="_blank"
     class="h-full w-full object-contain"
   >
-    <div class="h-full w-full object-contain" v-html="generateIdenticon()" />
+    <div class="h-full w-full object-contain" v-html="generateIcon()" />
   </a>
-  <div
+  <div v-else class="h-full w-full object-contain" v-html="generateIcon()" />
-    v-else
-    class="h-full w-full object-contain"
-    v-html="generateIdenticon()"
-  />
 </template>
 <script lang="ts">
 import { toSvg } from "jdenticon";
@@ -35,9 +31,9 @@ export default class ProjectIcon extends Vue {
   @Prop entityId = "";
   @Prop iconSize = 0;
   @Prop imageUrl = "";
-  @Prop linkToFull = false;
+  @Prop linkToFullImage = false;
 
-  generateIdenticon() {
+  generateIcon() {
     if (this.imageUrl) {
       return `<img src="${this.imageUrl}" class="w-full h-full object-contain" />`;
     } else {

src/components/PushNotificationPermission.vue

@@ -102,7 +102,12 @@
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 
-import { DEFAULT_PUSH_SERVER, NotificationIface } from "../constants/app";
+import {
+  DEFAULT_PUSH_SERVER,
+  NotificationIface,
+  USE_DEXIE_DB,
+} from "../constants/app";
+import * as databaseUtil from "../db/databaseUtil";
 import {
   logConsoleAndDb,
   retrieveSettingsForActiveAccount,
@@ -169,7 +174,10 @@ export default class PushNotificationPermission extends Vue {
     this.isVisible = true;
     this.pushType = pushType;
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      if (USE_DEXIE_DB) {
+        settings = await retrieveSettingsForActiveAccount();
+      }
       let pushUrl = DEFAULT_PUSH_SERVER;
       if (settings?.webPushServer) {
         pushUrl = settings.webPushServer;

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-[max(0.75rem,env(safe-area-inset-top))]">
     <span class="align-center text-red-500 mr-2">{{ message }}</span>
     <span class="ml-2">
       <router-link
@@ -15,7 +15,8 @@
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-facing-decorator";
 
-import { AppString, NotificationIface } from "../constants/app";
+import { AppString, NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import * as databaseUtil from "../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 
 @Component
@@ -28,7 +29,10 @@ export default class TopMessage extends Vue {
 
   async mounted() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      if (USE_DEXIE_DB) {
+        settings = await retrieveSettingsForActiveAccount();
+      }
       if (
         settings.warnIfTestServer &&
         settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER

src/components/UserNameDialog.vue

@@ -37,9 +37,11 @@
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
+import * as databaseUtil from "../db/databaseUtil";
 import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 @Component
 export default class UserNameDialog extends Vue {
@@ -61,15 +63,25 @@ export default class UserNameDialog extends Vue {
    */
   async open(aCallback?: (name?: string) => void) {
     this.callback = aCallback || this.callback;
-    const settings = await retrieveSettingsForActiveAccount();
+    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    if (USE_DEXIE_DB) {
+      settings = await retrieveSettingsForActiveAccount();
+    }
     this.givenName = settings.firstName || "";
     this.visible = true;
   }
 
   async onClickSaveChanges() {
+    const platformService = PlatformServiceFactory.getInstance();
+    await platformService.dbExec(
+      "UPDATE settings SET firstName = ? WHERE id = ?",
+      [this.givenName, MASTER_SETTINGS_KEY],
+    );
+    if (USE_DEXIE_DB) {
       await db.settings.update(MASTER_SETTINGS_KEY, {
         firstName: this.givenName,
       });
+    }
     this.visible = false;
     this.callback(this.givenName);
   }

src/components/World/components/objects/landmarks.js

@@ -3,6 +3,8 @@ import * as THREE from "three";
 import { GLTFLoader } from "three/addons/loaders/GLTFLoader";
 import * as SkeletonUtils from "three/addons/utils/SkeletonUtils";
 import * as TWEEN from "@tweenjs/tween.js";
+import { USE_DEXIE_DB } from "../../../../constants/app";
+import * as databaseUtil from "../../../../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../../../../db";
 import { getHeaders } from "../../../../libs/endorserServer";
 import { logger } from "../../../../utils/logger";
@@ -14,7 +16,10 @@ export async function loadLandmarks(vue, world, scene, loop) {
   vue.setWorldProperty("animationDurationSeconds", ANIMATION_DURATION_SECS);
 
   try {
-    const settings = await retrieveSettingsForActiveAccount();
+    let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+    if (USE_DEXIE_DB) {
+      settings = await retrieveSettingsForActiveAccount();
+    }
     const activeDid = settings.activeDid || "";
     const apiServer = settings.apiServer;
     const headers = await getHeaders(activeDid);

src/constants/app.ts

@@ -7,6 +7,7 @@ export enum AppString {
   // This is used in titles and verbiage inside the app.
   // There is also an app name without spaces, for packaging in the package.json file used in the manifest.
   APP_NAME = "Time Safari",
+  APP_NAME_NO_SPACES = "TimeSafari",
 
   PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
   TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
@@ -32,24 +33,26 @@ export const APP_SERVER =
 
 export const DEFAULT_ENDORSER_API_SERVER =
   import.meta.env.VITE_DEFAULT_ENDORSER_API_SERVER ||
-  AppString.TEST_ENDORSER_API_SERVER;
+  AppString.PROD_ENDORSER_API_SERVER;
 
 export const DEFAULT_IMAGE_API_SERVER =
   import.meta.env.VITE_DEFAULT_IMAGE_API_SERVER ||
-  AppString.TEST_IMAGE_API_SERVER;
+  AppString.PROD_IMAGE_API_SERVER;
 
 export const DEFAULT_PARTNER_API_SERVER =
   import.meta.env.VITE_DEFAULT_PARTNER_API_SERVER ||
-  AppString.TEST_PARTNER_API_SERVER;
+  AppString.PROD_PARTNER_API_SERVER;
 
 export const DEFAULT_PUSH_SERVER =
-  window.location.protocol + "//" + window.location.host;
+  import.meta.env.VITE_DEFAULT_PUSH_SERVER || AppString.PROD_PUSH_SERVER;
 
 export const IMAGE_TYPE_PROFILE = "profile";
 
 export const PASSKEYS_ENABLED =
   !!import.meta.env.VITE_PASSKEYS_ENABLED || false;
 
+export const USE_DEXIE_DB = false;
+
 /**
  * The possible values for "group" and "type" are in App.vue.
  * Some of this comes from the notiwind package, some is custom.

src/db-sql/migration.ts

@@ -1,5 +1,31 @@
 import migrationService from "../services/migrationService";
-import type { QueryExecResult, SqlValue } from "../interfaces/database";
+import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
+import { arrayBufferToBase64 } from "@/libs/crypto";
+
+// Generate a random secret for the secret table
+
+// It's not really secure to maintain the secret next to the user's data.
+// However, until we have better hooks into a real wallet or reliable secure
+// storage, we'll do this for user convenience. As they sign more records
+// and integrate with more people, they'll value it more and want to be more
+// secure, so we'll prompt them to take steps to back it up, properly encrypt,
+// etc. At the beginning, we'll prompt for a password, then we'll prompt for a
+// PWA so it's not in a browser... and then we hope to be integrated with a
+// real wallet or something else more secure.
+
+// One might ask: why encrypt at all? We figure a basic encryption is better
+// than none. Plus, we expect to support their own password or keystore or
+// external wallet as better signing options in the future, so it's gonna be
+// important to have the structure where each account access might require
+// user action.
+
+// (Once upon a time we stored the secret in localStorage, but it frequently
+// got erased, even though the IndexedDB still had the identity data. This
+// ended up throwing lots of errors to the user... and they'd end up in a state
+// where they couldn't take action because they couldn't unlock that identity.)
+
+const randomBytes = crypto.getRandomValues(new Uint8Array(32));
+const secretBase64 = arrayBufferToBase64(randomBytes);
 
 // Each migration can include multiple SQL statements (with semicolons)
 const MIGRATIONS = [
@@ -12,8 +38,8 @@ const MIGRATIONS = [
         dateCreated TEXT NOT NULL,
         derivationPath TEXT,
         did TEXT NOT NULL,
-        identity TEXT,
+        identityEncrBase64 TEXT, -- encrypted & base64-encoded
-        mnemonic TEXT,
+        mnemonicEncrBase64 TEXT, -- encrypted & base64-encoded
         passkeyCredIdHex TEXT,
         publicKeyHex TEXT NOT NULL
       );
@@ -22,9 +48,11 @@ const MIGRATIONS = [
 
       CREATE TABLE IF NOT EXISTS secret (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
-        secret TEXT NOT NULL
+        secretBase64 TEXT NOT NULL
       );
 
+      INSERT INTO secret (id, secretBase64) VALUES (1, '${secretBase64}');
+
       CREATE TABLE IF NOT EXISTS settings (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         accountDid TEXT,
@@ -59,6 +87,8 @@ const MIGRATIONS = [
 
       CREATE INDEX IF NOT EXISTS idx_settings_accountDid ON settings(accountDid);
 
+      INSERT INTO settings (id, apiServer) VALUES (1, '${DEFAULT_ENDORSER_API_SERVER}');
+
       CREATE TABLE IF NOT EXISTS contacts (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         did TEXT NOT NULL,
@@ -76,7 +106,7 @@ const MIGRATIONS = [
       CREATE INDEX IF NOT EXISTS idx_contacts_name ON contacts(name);
 
       CREATE TABLE IF NOT EXISTS logs (
-        date TEXT PRIMARY KEY,
+        date TEXT NOT NULL,
         message TEXT NOT NULL
       );
 
@@ -88,19 +118,21 @@ const MIGRATIONS = [
   },
 ];
 
-export async function registerMigrations(): Promise<void> {
+/**
-  // Register all migrations
+ * @param sqlExec - A function that executes a SQL statement and returns the result
-  for (const migration of MIGRATIONS) {
+ * @param extractMigrationNames - A function that extracts the names (string array) from "select name from migrations"
-    await migrationService.registerMigration(migration);
+ */
-  }
+export async function runMigrations<T>(
-}
+  sqlExec: (sql: string) => Promise<unknown>,
-
+  sqlQuery: (sql: string) => Promise<T>,
-export async function runMigrations(
+  extractMigrationNames: (result: T) => Set<string>,
-  sqlExec: (
-    sql: string,
-    params?: SqlValue[],
-  ) => Promise<Array<QueryExecResult>>,
 ): Promise<void> {
-  await registerMigrations();
+  for (const migration of MIGRATIONS) {
-  await migrationService.runMigrations(sqlExec);
+    migrationService.registerMigration(migration);
+  }
+  await migrationService.runMigrations(
+    sqlExec,
+    sqlQuery,
+    extractMigrationNames,
+  );
 }

src/db/databaseUtil.ts

@@ -0,0 +1,419 @@
+/**
+ * This file is the SQL replacement of the index.ts file in the db directory.
+ * That file will eventually be deleted.
+ */
+
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
+import { MASTER_SETTINGS_KEY, Settings } from "./tables/settings";
+import { logger } from "@/utils/logger";
+import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
+import { QueryExecResult } from "@/interfaces/database";
+
+export async function updateDefaultSettings(
+  settingsChanges: Settings,
+): Promise<boolean> {
+  delete settingsChanges.accountDid; // just in case
+  // ensure there is no "id" that would override the key
+  delete settingsChanges.id;
+  try {
+    const platformService = PlatformServiceFactory.getInstance();
+    const { sql, params } = generateUpdateStatement(
+      settingsChanges,
+      "settings",
+      "id = ?",
+      [MASTER_SETTINGS_KEY],
+    );
+    const result = await platformService.dbExec(sql, params);
+    return result.changes === 1;
+  } catch (error) {
+    logger.error("Error updating default settings:", error);
+    if (error instanceof Error) {
+      throw error; // Re-throw if it's already an Error with a message
+    } else {
+      throw new Error(
+        `Failed to update settings. We recommend you try again or restart the app.`,
+      );
+    }
+  }
+}
+
+export async function updateAccountSettings(
+  accountDid: string,
+  settingsChanges: Settings,
+): Promise<boolean> {
+  settingsChanges.accountDid = accountDid;
+  delete settingsChanges.id; // key off account, not ID
+
+  const platform = PlatformServiceFactory.getInstance();
+
+  // First try to update existing record
+  const { sql: updateSql, params: updateParams } = generateUpdateStatement(
+    settingsChanges,
+    "settings",
+    "accountDid = ?",
+    [accountDid],
+  );
+
+  const updateResult = await platform.dbExec(updateSql, updateParams);
+  return updateResult.changes === 1;
+}
+
+const DEFAULT_SETTINGS: Settings = {
+  id: MASTER_SETTINGS_KEY,
+  activeDid: undefined,
+  apiServer: DEFAULT_ENDORSER_API_SERVER,
+};
+
+// retrieves default settings
+export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
+  const platform = PlatformServiceFactory.getInstance();
+  const sql = "SELECT * FROM settings WHERE id = ?";
+  const result = await platform.dbQuery(sql, [MASTER_SETTINGS_KEY]);
+  if (!result) {
+    return DEFAULT_SETTINGS;
+  } else {
+    const settings = mapColumnsToValues(
+      result.columns,
+      result.values,
+    )[0] as Settings;
+    if (settings.searchBoxes) {
+      // @ts-expect-error - the searchBoxes field is a string in the DB
+      settings.searchBoxes = JSON.parse(settings.searchBoxes);
+    }
+    return settings;
+  }
+}
+
+/**
+ * Retrieves settings for the active account, merging with default settings
+ *
+ * @returns Promise<Settings> Combined settings with account-specific overrides
+ * @throws Will log specific errors for debugging but returns default settings on failure
+ */
+export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
+  try {
+    // Get default settings first
+    const defaultSettings = await retrieveSettingsForDefaultAccount();
+    // If no active DID, return defaults
+    if (!defaultSettings.activeDid) {
+      logConsoleAndDb(
+        "[databaseUtil] No active DID found, returning default settings",
+      );
+      return defaultSettings;
+    }
+
+    // Get account-specific settings
+    try {
+      const platform = PlatformServiceFactory.getInstance();
+      const result = await platform.dbQuery(
+        "SELECT * FROM settings WHERE accountDid = ?",
+        [defaultSettings.activeDid],
+      );
+
+      if (!result?.values?.length) {
+        logConsoleAndDb(
+          `[databaseUtil] No account-specific settings found for ${defaultSettings.activeDid}`,
+        );
+        return defaultSettings;
+      }
+
+      // Map settings
+      const overrideSettings = mapColumnsToValues(
+        result.columns,
+        result.values,
+      )[0] as Settings;
+
+      // Use the new mergeSettings function for consistency
+      return mergeSettings(defaultSettings, overrideSettings);
+    } catch (error) {
+      logConsoleAndDb(
+        `[databaseUtil] Failed to retrieve account settings for ${defaultSettings.activeDid}: ${error}`,
+        true,
+      );
+      // Return defaults on error
+      return defaultSettings;
+    }
+  } catch (error) {
+    logConsoleAndDb(
+      `[databaseUtil] Failed to retrieve default settings: ${error}`,
+      true,
+    );
+    // Return minimal default settings on complete failure
+    return {
+      id: MASTER_SETTINGS_KEY,
+      activeDid: undefined,
+      apiServer: DEFAULT_ENDORSER_API_SERVER,
+    };
+  }
+}
+
+let lastCleanupDate: string | null = null;
+export let memoryLogs: string[] = [];
+
+/**
+ * Logs a message to the database with proper handling of concurrent writes
+ * @param message - The message to log
+ * @author Matthew Raymer
+ */
+export async function logToDb(message: string): Promise<void> {
+  const platform = PlatformServiceFactory.getInstance();
+  const todayKey = new Date().toDateString();
+  const nowKey = new Date().toISOString();
+
+  try {
+    memoryLogs.push(`${new Date().toISOString()} ${message}`);
+    // Try to insert first, if it fails due to UNIQUE constraint, update instead
+    await platform.dbExec("INSERT INTO logs (date, message) VALUES (?, ?)", [
+      nowKey,
+      message,
+    ]);
+
+    // Clean up old logs (keep only last 7 days) - do this less frequently
+    // Only clean up if the date is different from the last cleanup
+    if (!lastCleanupDate || lastCleanupDate !== todayKey) {
+      const sevenDaysAgo = new Date(
+        new Date().getTime() - 7 * 24 * 60 * 60 * 1000,
+      );
+      memoryLogs = memoryLogs.filter(
+        (log) => log.split(" ")[0] > sevenDaysAgo.toDateString(),
+      );
+      await platform.dbExec("DELETE FROM logs WHERE date < ?", [
+        sevenDaysAgo.toDateString(),
+      ]);
+      lastCleanupDate = todayKey;
+    }
+  } catch (error) {
+    // Log to console as fallback
+    // eslint-disable-next-line no-console
+    console.error(
+      "Error logging to database:",
+      error,
+      " ... for original message:",
+      message,
+    );
+  }
+}
+
+// similar method is in the sw_scripts/additional-scripts.js file
+export async function logConsoleAndDb(
+  message: string,
+  isError = false,
+): Promise<void> {
+  if (isError) {
+    logger.error(`${new Date().toISOString()} ${message}`);
+  } else {
+    logger.log(`${new Date().toISOString()} ${message}`);
+  }
+  await logToDb(message);
+}
+
+/**
+ * Generates an SQL INSERT statement and parameters from a model object.
+ * @param model The model object containing fields to update
+ * @param tableName The name of the table to update
+ * @returns Object containing the SQL statement and parameters array
+ */
+export function generateInsertStatement(
+  model: Record<string, unknown>,
+  tableName: string,
+): { sql: string; params: unknown[] } {
+  const columns = Object.keys(model).filter((key) => model[key] !== undefined);
+  const values = Object.values(model).filter((value) => value !== undefined);
+  const placeholders = values.map(() => "?").join(", ");
+  const insertSql = `INSERT INTO ${tableName} (${columns.join(", ")}) VALUES (${placeholders})`;
+  return {
+    sql: insertSql,
+    params: values,
+  };
+}
+
+/**
+ * Generates an SQL UPDATE statement and parameters from a model object.
+ * @param model The model object containing fields to update
+ * @param tableName The name of the table to update
+ * @param whereClause The WHERE clause for the update (e.g. "id = ?")
+ * @param whereParams Parameters for the WHERE clause
+ * @returns Object containing the SQL statement and parameters array
+ */
+export function generateUpdateStatement(
+  model: Record<string, unknown>,
+  tableName: string,
+  whereClause: string,
+  whereParams: unknown[] = [],
+): { sql: string; params: unknown[] } {
+  // Filter out undefined/null values and create SET clause
+  const setClauses: string[] = [];
+  const params: unknown[] = [];
+
+  Object.entries(model).forEach(([key, value]) => {
+    setClauses.push(`${key} = ?`);
+    params.push(value ?? null);
+  });
+
+  if (setClauses.length === 0) {
+    throw new Error("No valid fields to update");
+  }
+
+  const sql = `UPDATE ${tableName} SET ${setClauses.join(", ")} WHERE ${whereClause}`;
+
+  return {
+    sql,
+    params: [...params, ...whereParams],
+  };
+}
+
+export function mapQueryResultToValues(
+  record: QueryExecResult | undefined,
+): Array<Record<string, unknown>> {
+  if (!record) {
+    return [];
+  }
+  return mapColumnsToValues(record.columns, record.values) as Array<
+    Record<string, unknown>
+  >;
+}
+
+/**
+ * Maps an array of column names to an array of value arrays, creating objects where each column name
+ * is mapped to its corresponding value.
+ * @param columns Array of column names to use as object keys
+ * @param values Array of value arrays, where each inner array corresponds to one row of data
+ * @returns Array of objects where each object maps column names to their corresponding values
+ */
+export function mapColumnsToValues(
+  columns: string[],
+  values: unknown[][],
+): Array<Record<string, unknown>> {
+  return values.map((row) => {
+    const obj: Record<string, unknown> = {};
+    columns.forEach((column, index) => {
+      obj[column] = row[index];
+    });
+    return obj;
+  });
+}
+
+/**
+ * Retrieves settings for a specific account by DID
+ * @param accountDid - The DID of the account to retrieve settings for
+ * @returns Promise<Settings> Combined settings for the specified account
+ */
+export async function getSettingsForAccount(accountDid: string): Promise<Settings> {
+  try {
+    // Get default settings first
+    const defaultSettings = await retrieveSettingsForDefaultAccount();
+    
+    // Get account-specific settings
+    const platform = PlatformServiceFactory.getInstance();
+    const result = await platform.dbQuery(
+      "SELECT * FROM settings WHERE accountDid = ?",
+      [accountDid],
+    );
+
+    if (!result?.values?.length) {
+      logConsoleAndDb(
+        `[databaseUtil] No account-specific settings found for ${accountDid}`,
+      );
+      return defaultSettings;
+    }
+
+    // Map and merge settings
+    const overrideSettings = mapColumnsToValues(
+      result.columns,
+      result.values,
+    )[0] as Settings;
+    
+    return mergeSettings(defaultSettings, overrideSettings);
+  } catch (error) {
+    logConsoleAndDb(
+      `[databaseUtil] Failed to retrieve settings for account ${accountDid}: ${error}`,
+      true,
+    );
+    // Return default settings on error
+    return await retrieveSettingsForDefaultAccount();
+  }
+}
+
+/**
+ * Retrieves only account-specific settings for a given DID (without merging with defaults)
+ * @param accountDid - The DID of the account to retrieve settings for
+ * @returns Promise<Settings> Account-specific settings only
+ */
+export async function getAccountSpecificSettings(accountDid: string): Promise<Settings> {
+  try {
+    const platform = PlatformServiceFactory.getInstance();
+    const result = await platform.dbQuery(
+      "SELECT * FROM settings WHERE accountDid = ?",
+      [accountDid],
+    );
+
+    if (!result?.values?.length) {
+      logConsoleAndDb(
+        `[databaseUtil] No account-specific settings found for ${accountDid}`,
+      );
+      return {};
+    }
+
+    // Map settings
+    const settings = mapColumnsToValues(
+      result.columns,
+      result.values,
+    )[0] as Settings;
+
+    // Handle searchBoxes parsing
+    if (settings.searchBoxes) {
+      try {
+        // @ts-expect-error - the searchBoxes field is a string in the DB
+        settings.searchBoxes = JSON.parse(settings.searchBoxes);
+      } catch (error) {
+        logConsoleAndDb(
+          `[databaseUtil] Failed to parse searchBoxes for ${accountDid}: ${error}`,
+          true,
+        );
+        // Reset to empty array on parse failure
+        settings.searchBoxes = [];
+      }
+    }
+
+    return settings;
+  } catch (error) {
+    logConsoleAndDb(
+      `[databaseUtil] Failed to retrieve account-specific settings for ${accountDid}: ${error}`,
+      true,
+    );
+    return {};
+  }
+}
+
+/**
+ * Merges default settings with account-specific settings using consistent logic
+ * @param defaultSettings - The default/master settings
+ * @param accountSettings - The account-specific settings to merge
+ * @returns Settings - Merged settings with account-specific overrides
+ */
+export function mergeSettings(defaultSettings: Settings, accountSettings: Settings): Settings {
+  // Filter out null values from account settings
+  const accountSettingsFiltered = Object.fromEntries(
+    Object.entries(accountSettings).filter(([_, v]) => v !== null),
+  );
+
+  // Perform shallow merge (account settings override defaults)
+  const mergedSettings = { ...defaultSettings, ...accountSettingsFiltered };
+
+  // Handle searchBoxes parsing if present
+  if (mergedSettings.searchBoxes) {
+    try {
+      // @ts-expect-error - the searchBoxes field is a string in the DB
+      mergedSettings.searchBoxes = JSON.parse(mergedSettings.searchBoxes);
+    } catch (error) {
+      logConsoleAndDb(
+        `[databaseUtil] Failed to parse searchBoxes during merge: ${error}`,
+        true,
+      );
+      // Reset to empty array on parse failure
+      mergedSettings.searchBoxes = [];
+    }
+  }
+
+  return mergedSettings;
+}

src/db/index.ts

@@ -1,3 +1,9 @@
+/**
+ * This is the original IndexedDB version of the database.
+ * It will eventually be replaced fully by the SQL version in databaseUtil.ts.
+ * Turn this on or off with the USE_DEXIE_DB constant in constants/app.ts.
+ */
+
 import BaseDexie, { Table } from "dexie";
 import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
 import * as R from "ramda";
@@ -26,8 +32,8 @@ type NonsensitiveTables = {
 };
 
 // Using 'unknown' instead of 'any' for stricter typing and to avoid TypeScript warnings
-export type SecretDexie<T extends unknown = SecretTable> = BaseDexie & T;
+type SecretDexie<T extends unknown = SecretTable> = BaseDexie & T;
-export type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
+type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
 export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
   BaseDexie & T;
 
@@ -259,6 +265,43 @@ export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
   }
 }
 
+/**
+ * Retrieves settings for a specific account by DID
+ * @param accountDid - The DID of the account to retrieve settings for
+ * @returns Promise<Settings> Combined settings for the specified account
+ */
+export async function getSettingsForAccount(accountDid: string): Promise<Settings> {
+  const defaultSettings = await retrieveSettingsForDefaultAccount();
+  const overrideSettings =
+    (await db.settings
+      .where("accountDid")
+      .equals(accountDid)
+      .first()) || {};
+  return R.mergeDeepRight(defaultSettings, overrideSettings);
+}
+
+/**
+ * Retrieves only account-specific settings for a given DID (without merging with defaults)
+ * @param accountDid - The DID of the account to retrieve settings for
+ * @returns Promise<Settings> Account-specific settings only
+ */
+export async function getAccountSpecificSettings(accountDid: string): Promise<Settings> {
+  return (await db.settings
+    .where("accountDid")
+    .equals(accountDid)
+    .first()) || {};
+}
+
+/**
+ * Merges default settings with account-specific settings using consistent logic
+ * @param defaultSettings - The default/master settings
+ * @param accountSettings - The account-specific settings to merge
+ * @returns Settings - Merged settings with account-specific overrides
+ */
+export function mergeSettings(defaultSettings: Settings, accountSettings: Settings): Settings {
+  return R.mergeDeepRight(defaultSettings, accountSettings);
+}
+
 export async function updateAccountSettings(
   accountDid: string,
   settingsChanges: Settings,

src/db/tables/accounts.ts

@@ -45,6 +45,12 @@ export type Account = {
   publicKeyHex: string;
 };
 
+// When finished with USE_DEXIE_DB, move these fields to Account and move identity and mnemonic here.
+export type AccountEncrypted = Account & {
+  identityEncrBase64: string;
+  mnemonicEncrBase64: string;
+};
+
 /**
  * Schema for the accounts table in the database.
  * Fields starting with a $ character are encrypted.

src/electron/main.ts

@@ -25,6 +25,25 @@ function createWindow(): void {
   logger.log("Checking preload path:", preloadPath);
   logger.log("Preload exists:", fs.existsSync(preloadPath));
 
+  // Log environment and paths
+  logger.log("process.cwd():", process.cwd());
+  logger.log("__dirname:", __dirname);
+  logger.log("app.getAppPath():", app.getAppPath());
+  logger.log("app.isPackaged:", app.isPackaged);
+
+  // List files in __dirname and __dirname/www
+  try {
+    logger.log("Files in __dirname:", fs.readdirSync(__dirname));
+    const wwwDir = path.join(__dirname, "www");
+    if (fs.existsSync(wwwDir)) {
+      logger.log("Files in www:", fs.readdirSync(wwwDir));
+    } else {
+      logger.log("www directory does not exist in __dirname");
+    }
+  } catch (e) {
+    logger.error("Error reading directories:", e);
+  }
+
   // Create the browser window.
   const mainWindow = new BrowserWindow({
     width: 1200,
@@ -88,7 +107,16 @@ function createWindow(): void {
     logger.log("process.cwd():", process.cwd());
   }
 
-  const indexPath = path.join(__dirname, "www", "index.html");
+  let indexPath = path.resolve(__dirname, "dist-electron", "www", "index.html");
+  if (!fs.existsSync(indexPath)) {
+    // Fallback for dev mode
+    indexPath = path.resolve(
+      process.cwd(),
+      "dist-electron",
+      "www",
+      "index.html",
+    );
+  }
 
   if (isDev) {
     logger.log("Loading index from:", indexPath);

src/electron/preload.js

@@ -2,24 +2,33 @@ const { contextBridge, ipcRenderer } = require("electron");
 
 const logger = {
   log: (message, ...args) => {
+    // Always log in development, log with context in production
     if (process.env.NODE_ENV !== "production") {
       /* eslint-disable no-console */
-      console.log(message, ...args);
+      console.log(`[Preload] ${message}`, ...args);
       /* eslint-enable no-console */
     }
   },
   warn: (message, ...args) => {
-    if (process.env.NODE_ENV !== "production") {
+    // Always log warnings
     /* eslint-disable no-console */
-      console.warn(message, ...args);
+    console.warn(`[Preload] ${message}`, ...args);
     /* eslint-enable no-console */
-    }
   },
   error: (message, ...args) => {
+    // Always log errors
     /* eslint-disable no-console */
-    console.error(message, ...args); // Errors should always be logged
+    console.error(`[Preload] ${message}`, ...args);
     /* eslint-enable no-console */
   },
+  info: (message, ...args) => {
+    // Always log info in development, log with context in production
+    if (process.env.NODE_ENV !== "production") {
+      /* eslint-disable no-console */
+      console.info(`[Preload] ${message}`, ...args);
+      /* eslint-enable no-console */
+    }
+  },
 };
 
 // Use a more direct path resolution approach
@@ -41,7 +50,10 @@ const getPath = (pathType) => {
   }
 };
 
-logger.log("Preload script starting...");
+logger.info("Preload script starting...");
+
+// Force electron platform in the renderer process
+window.process = { env: { VITE_PLATFORM: "electron" } };
 
 try {
   contextBridge.exposeInMainWorld("electronAPI", {
@@ -65,6 +77,7 @@ try {
     env: {
       isElectron: true,
       isDev: process.env.NODE_ENV === "development",
+      platform: "electron", // Explicitly set platform
     },
     // Path utilities
     getBasePath: () => {
@@ -72,7 +85,7 @@ try {
     },
   });
 
-  logger.log("Preload script completed successfully");
+  logger.info("Preload script completed successfully");
 } catch (error) {
   logger.error("Error in preload script:", error);
 }

src/interfaces/absurd-sql.d.ts

@@ -0,0 +1,59 @@
+import type { QueryExecResult, SqlValue } from "./database";
+
+declare module "@jlongster/sql.js" {
+  interface SQL {
+    Database: new (path: string, options?: { filename: boolean }) => AbsurdSqlDatabase;
+    FS: {
+      mkdir: (path: string) => void;
+      mount: (fs: any, options: any, path: string) => void;
+      open: (path: string, flags: string) => any;
+      close: (stream: any) => void;
+    };
+    register_for_idb: (fs: any) => void;
+  }
+
+  interface AbsurdSqlDatabase {
+    exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
+    run: (
+      sql: string,
+      params?: unknown[],
+    ) => Promise<{ changes: number; lastId?: number }>;
+  }
+
+  const initSqlJs: (options?: {
+    locateFile?: (file: string) => string;
+  }) => Promise<SQL>;
+
+  export default initSqlJs;
+}
+
+declare module "absurd-sql" {
+  import type { SQL } from "@jlongster/sql.js";
+
+  export class SQLiteFS {
+    constructor(fs: any, backend: any);
+  }
+}
+
+declare module "absurd-sql/dist/indexeddb-backend" {
+  export default class IndexedDBBackend {
+    constructor();
+  }
+}
+
+declare module "absurd-sql/dist/indexeddb-main-thread" {
+  export interface SQLiteOptions {
+    filename?: string;
+    autoLoad?: boolean;
+    debug?: boolean;
+  }
+
+  export interface SQLiteDatabase {
+    exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
+    close: () => Promise<void>;
+  }
+
+  export function initSqlJs(options?: any): Promise<any>;
+  export function createDatabase(options?: SQLiteOptions): Promise<SQLiteDatabase>;
+  export function openDatabase(options?: SQLiteOptions): Promise<SQLiteDatabase>;
+} 

src/interfaces/claims.ts

@@ -1,15 +1,24 @@
-import { GenericVerifiableCredential } from "./common";
+/**
+ * Types of Claims
+ *
+ * Note that these are for the claims that get signed.
+ * Records that are the latest edited entities are in the records.ts file.
+ *
+ */
 
-export interface AgreeVerifiableCredential {
+import { ClaimObject } from "./common";
-  "@context": string;
+
+export interface AgreeActionClaim extends ClaimObject {
+  "@context": "https://schema.org";
   "@type": string;
   object: Record<string, unknown>;
 }
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id4
-export interface GiveVerifiableCredential extends GenericVerifiableCredential {
+export interface GiveActionClaim extends ClaimObject {
-  "@context"?: string;
+  // context is optional because it might be embedded in another claim, eg. an AgreeAction
+  "@context"?: "https://schema.org";
   "@type": "GiveAction";
   agent?: { identifier: string };
   description?: string;
@@ -17,16 +26,25 @@ export interface GiveVerifiableCredential extends GenericVerifiableCredential {
   identifier?: string;
   image?: string;
   object?: { amountOfThisGood: number; unitCode: string };
-  provider?: GenericVerifiableCredential;
+  provider?: ClaimObject;
   recipient?: { identifier: string };
 }
 
+export interface JoinActionClaim extends ClaimObject {
+  agent?: { identifier: string };
+  event?: { organizer?: { name: string }; name?: string; startTime?: string };
+}
+
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id8
-export interface OfferVerifiableCredential extends GenericVerifiableCredential {
+export interface OfferClaim extends ClaimObject {
-  "@context"?: string;
+  "@context": "https://schema.org";
   "@type": "Offer";
+  agent?: { identifier: string };
   description?: string;
+  fulfills?: { "@type": string; identifier?: string; lastClaimId?: string }[];
+  identifier?: string;
+  image?: string;
   includesObject?: { amountOfThisGood: number; unitCode: string };
   itemOffered?: {
     description?: string;
@@ -37,14 +55,18 @@ export interface OfferVerifiableCredential extends GenericVerifiableCredential {
       name?: string;
     };
   };
-  offeredBy?: { identifier: string };
+  offeredBy?: {
+    type?: "Person";
+    identifier: string;
+  };
+  provider?: ClaimObject;
   recipient?: { identifier: string };
   validThrough?: string;
 }
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id7
-export interface PlanVerifiableCredential extends GenericVerifiableCredential {
+export interface PlanActionClaim extends ClaimObject {
   "@context": "https://schema.org";
   "@type": "PlanAction";
   name: string;
@@ -58,11 +80,18 @@ export interface PlanVerifiableCredential extends GenericVerifiableCredential {
 }
 
 // AKA Registration & RegisterAction
-export interface RegisterVerifiableCredential {
+export interface RegisterActionClaim extends ClaimObject {
-  "@context": string;
+  "@context": "https://schema.org";
   "@type": "RegisterAction";
   agent: { identifier: string };
   identifier?: string;
-  object: string;
+  object?: string;
   participant?: { identifier: string };
 }
+
+export interface TenureClaim extends ClaimObject {
+  "@context": "https://endorser.ch";
+  "@type": "Tenure";
+  party?: { identifier: string };
+  spatialUnit?: { geo?: { polygon?: string } };
+}

src/interfaces/common.ts

@@ -34,3 +34,77 @@ export interface ErrorResult extends ResultWithType {
   type: "error";
   error: InternalError;
 }
+
+export interface KeyMeta {
+  did: string;
+  publicKeyHex: string;
+  derivationPath?: string;
+  passkeyCredIdHex?: string; // The Webauthn credential ID in hex, if this is from a passkey
+}
+
+export interface KeyMetaMaybeWithPrivate extends KeyMeta {
+  mnemonic?: string; // 12 or 24 words encoding the seed
+  identity?: string; // Stringified IIdentifier object from Veramo
+}
+
+export interface KeyMetaWithPrivate extends KeyMeta {
+  mnemonic: string; // 12 or 24 words encoding the seed
+  identity: string; // Stringified IIdentifier object from Veramo
+}
+
+export interface QuantitativeValue extends GenericVerifiableCredential {
+  "@type": "QuantitativeValue";
+  "@context"?: string;
+  amountOfThisGood: number;
+  unitCode: string;
+}
+
+export interface AxiosErrorResponse {
+  message?: string;
+  response?: {
+    data?: {
+      error?: {
+        message?: string;
+      };
+      [key: string]: unknown;
+    };
+    status?: number;
+    config?: unknown;
+  };
+  config?: unknown;
+  [key: string]: unknown;
+}
+
+export interface UserInfo {
+  did: string;
+  name: string;
+  publicEncKey: string;
+  registered: boolean;
+  profileImageUrl?: string;
+  nextPublicEncKeyHash?: string;
+}
+
+export interface CreateAndSubmitClaimResult {
+  success: boolean;
+  error?: string;
+  handleId?: string;
+}
+
+export interface Agent {
+  identifier?: string;
+  did?: string;
+}
+
+export interface ClaimObject {
+  "@type": string;
+  "@context"?: string;
+  [key: string]: unknown;
+}
+
+export interface VerifiableCredentialClaim {
+  "@context"?: string;
+  "@type": string;
+  type: string[];
+  credentialSubject: ClaimObject;
+  [key: string]: unknown;
+}

src/interfaces/database.ts

@@ -12,6 +12,4 @@ export interface DatabaseService {
     sql: string,
     params?: unknown[],
   ): Promise<{ changes: number; lastId?: number }>;
-  getOneRow(sql: string, params?: unknown[]): Promise<unknown[] | undefined>;
-  getAll(sql: string, params?: unknown[]): Promise<unknown[][]>;
 }

src/interfaces/give.ts

@@ -1,13 +1,17 @@
+/**
+ * Interfaces for the give records with limited contact information, good to show on a feed.
+ **/
+
 import { GiveSummaryRecord } from "./records";
 
-// Common interface for contact information
+// Common interface for views with summary contact information
 export interface ContactInfo {
   known: boolean;
   displayName: string;
   profileImageUrl?: string;
 }
 
-// Define the contact information fields
+// Define a subset of contact information fields
 interface GiveContactInfo {
   giver: ContactInfo;
   issuer: ContactInfo;
@@ -17,5 +21,5 @@ interface GiveContactInfo {
   image?: string;
 }
 
-// Combine GiveSummaryRecord with contact information using intersection type
+// Combine GiveSummaryRecord with contact information
 export type GiveRecordWithContactInfo = GiveSummaryRecord & GiveContactInfo;

src/interfaces/index.ts

@@ -1,7 +1,37 @@
-export * from "./claims";
+export type {
-export * from "./claims-result";
+  // From common.ts
-export * from "./common";
+  GenericCredWrapper,
+  GenericVerifiableCredential,
+  KeyMeta,
+  // Exclude types that are also exported from other files
+  // GiveVerifiableCredential,
+  // OfferVerifiableCredential,
+  // RegisterVerifiableCredential,
+  // PlanSummaryRecord,
+  // UserInfo,
+} from "./common";
+
+export type {
+  // From claims.ts
+  GiveActionClaim,
+  OfferClaim,
+  RegisterActionClaim,
+} from "./claims";
+
+export type {
+  // From claims-result.ts
+  CreateAndSubmitClaimResult,
+} from "./claims-result";
+
+export type {
+  // From records.ts
+  PlanSummaryRecord,
+} from "./records";
+
+export type {
+  // From user.ts
+  UserInfo,
+} from "./user";
+
 export * from "./limits";
-export * from "./records";
-export * from "./user";
 export * from "./deepLinks";

src/interfaces/records.ts

@@ -1,14 +1,14 @@
-import { GiveVerifiableCredential, OfferVerifiableCredential } from "./claims";
+import { GiveActionClaim, OfferClaim } from "./claims";
 
 // a summary record; the VC is found the fullClaim field
 export interface GiveSummaryRecord {
-  [x: string]: PropertyKey | undefined | GiveVerifiableCredential;
+  [x: string]: PropertyKey | undefined | GiveActionClaim;
   type?: string;
   agentDid: string;
   amount: number;
   amountConfirmed: number;
   description: string;
-  fullClaim: GiveVerifiableCredential;
+  fullClaim: GiveActionClaim;
   fulfillsHandleId: string;
   fulfillsPlanHandleId?: string;
   fulfillsType?: string;
@@ -26,7 +26,7 @@ export interface OfferSummaryRecord {
   amount: number;
   amountGiven: number;
   amountGivenConfirmed: number;
-  fullClaim: OfferVerifiableCredential;
+  fullClaim: OfferClaim;
   fulfillsPlanHandleId: string;
   handleId: string;
   issuerDid: string;