Merge branch 'master' into electron-copy-paste-keyboard-shortcuts

Reviewed-on: #191

BUILDING.md

@@ -617,7 +617,8 @@ The Electron build process follows a multi-stage approach:
 #### **Stage 2: Capacitor Sync**
 
 - Copies web assets to Electron app directory
-- Syncs Capacitor configuration and plugins
+- Uses Electron-specific Capacitor configuration (not copied from main config)
+- Syncs Capacitor plugins for Electron platform
 - Prepares native module bindings
 
 #### **Stage 3: TypeScript Compile**

electron/capacitor.config.ts

@@ -0,0 +1,116 @@
+import { CapacitorConfig } from '@capacitor/cli';
+
+const config: CapacitorConfig = {
+  appId: 'app.timesafari',
+  appName: 'TimeSafari',
+  webDir: 'dist',
+  server: {
+    cleartext: true
+  },
+  plugins: {
+    App: {
+      appUrlOpen: {
+        handlers: [
+          {
+            url: 'timesafari://*',
+            autoVerify: true
+          }
+        ]
+      }
+    },
+    SplashScreen: {
+      launchShowDuration: 3000,
+      launchAutoHide: true,
+      backgroundColor: '#ffffff',
+      androidSplashResourceName: 'splash',
+      androidScaleType: 'CENTER_CROP',
+      showSpinner: false,
+      androidSpinnerStyle: 'large',
+      iosSpinnerStyle: 'small',
+      spinnerColor: '#999999',
+      splashFullScreen: true,
+      splashImmersive: true
+    },
+    CapSQLite: {
+      iosDatabaseLocation: 'Library/CapacitorDatabase',
+      iosIsEncryption: false,
+      iosBiometric: {
+        biometricAuth: false,
+        biometricTitle: 'Biometric login for TimeSafari'
+      },
+      androidIsEncryption: false,
+      androidBiometric: {
+        biometricAuth: false,
+        biometricTitle: 'Biometric login for TimeSafari'
+      },
+      electronIsEncryption: false
+    }
+  },
+  ios: {
+    contentInset: 'never',
+    allowsLinkPreview: true,
+    scrollEnabled: true,
+    limitsNavigationsToAppBoundDomains: true,
+    backgroundColor: '#ffffff',
+    allowNavigation: [
+      '*.timesafari.app',
+      '*.jsdelivr.net',
+      'api.endorser.ch'
+    ]
+  },
+  android: {
+    allowMixedContent: true,
+    captureInput: true,
+    webContentsDebuggingEnabled: false,
+    allowNavigation: [
+      '*.timesafari.app',
+      '*.jsdelivr.net',
+      'api.endorser.ch',
+      '10.0.2.2:3000'
+    ]
+  },
+  electron: {
+    deepLinking: {
+      schemes: ['timesafari']
+    },
+    buildOptions: {
+      appId: 'app.timesafari',
+      productName: 'TimeSafari',
+      directories: {
+        output: 'dist-electron-packages'
+      },
+      files: [
+        'dist/**/*',
+        'electron/**/*'
+      ],
+      mac: {
+        category: 'public.app-category.productivity',
+        target: [
+          {
+            target: 'dmg',
+            arch: ['x64', 'arm64']
+          }
+        ]
+      },
+      win: {
+        target: [
+          {
+            target: 'nsis',
+            arch: ['x64']
+          }
+        ]
+      },
+      linux: {
+        target: [
+          {
+            target: 'AppImage',
+            arch: ['x64']
+          }
+        ],
+        category: 'Utility'
+      }
+    }
+  }
+};
+
+export default config;

electron/package-lock.json

@@ -56,7 +56,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/@capacitor-community/sqlite/-/sqlite-6.0.2.tgz",
       "integrity": "sha512-sj+2SPLu7E/3dM3xxcWwfNomG+aQHuN96/EFGrOtp4Dv30/2y5oIPyi6hZGjQGjPc5GDNoTQwW7vxWNzybjuMg==",
-      "license": "MIT",
       "dependencies": {
         "jeep-sqlite": "^2.7.2"
       },

electron/src/index.ts

@@ -50,6 +50,7 @@ process.stderr.on('error', (err) => {
 const trayMenuTemplate: (MenuItemConstructorOptions | MenuItem)[] = [new MenuItem({ label: 'Quit App', role: 'quit' })];
 const appMenuBarMenuTemplate: (MenuItemConstructorOptions | MenuItem)[] = [
   { role: process.platform === 'darwin' ? 'appMenu' : 'fileMenu' },
+  { role: 'editMenu' },
   { role: 'viewMenu' },
 ];
 

electron/src/setup.ts

@@ -53,6 +53,7 @@ export class ElectronCapacitorApp {
   ];
   private AppMenuBarMenuTemplate: (MenuItem | MenuItemConstructorOptions)[] = [
     { role: process.platform === 'darwin' ? 'appMenu' : 'fileMenu' },
+    { role: 'editMenu' },
     { role: 'viewMenu' },
   ];
   private mainWindowState;

electron/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compileOnSave": true,
-  "include": ["./src/**/*", "./capacitor.config.ts", "./capacitor.config.js"],
+  "include": ["./src/**/*"],
   "compilerOptions": {
     "outDir": "./build",
     "importHelpers": true,

scripts/build-electron.sh

@@ -181,7 +181,7 @@ sync_capacitor() {
 copy_web_assets() {
     log_info "Copying web assets to Electron"
     safe_execute "Copying assets" "cp -r dist/* electron/app/"
-    safe_execute "Copying config" "cp capacitor.config.json electron/capacitor.config.json"
+    # Note: Electron has its own capacitor.config.ts file, so we don't copy the main config
 }
 
 # Compile TypeScript

src/components/UserNameDialog.vue

@@ -84,7 +84,8 @@ export default class UserNameDialog extends Vue {
    */
   async open(aCallback?: (name?: string) => void) {
     this.callback = aCallback || this.callback;
-    const settings = await this.$settings();
+    // Load from account-specific settings instead of master settings
+    const settings = await this.$accountSettings();
     this.givenName = settings.firstName || "";
     this.visible = true;
   }
@@ -95,7 +96,18 @@ export default class UserNameDialog extends Vue {
    */
   async onClickSaveChanges() {
     try {
-      await this.$updateSettings({ firstName: this.givenName });
+      // Get the current active DID to save to user-specific settings
+      const settings = await this.$accountSettings();
+      const activeDid = settings.activeDid;
+
+      if (activeDid) {
+        // Save to user-specific settings for the current identity
+        await this.$saveUserSettings(activeDid, { firstName: this.givenName });
+      } else {
+        // Fallback to master settings if no active DID
+        await this.$saveSettings({ firstName: this.givenName });
+      }
+
       this.visible = false;
       this.callback(this.givenName);
     } catch (error) {

src/views/NewEditAccountView.vue

@@ -110,10 +110,22 @@ export default class NewEditAccountView extends Vue {
    * @async
    */
   async onClickSaveChanges() {
-    await this.$updateSettings({
-      firstName: this.givenName,
-      lastName: "", // deprecated, pre v 0.1.3
-    });
+    // Get the current active DID to save to user-specific settings
+    const settings = await this.$accountSettings();
+    const activeDid = settings.activeDid;
+
+    if (activeDid) {
+      // Save to user-specific settings for the current identity
+      await this.$saveUserSettings(activeDid, {
+        firstName: this.givenName,
+      });
+    } else {
+      // Fallback to master settings if no active DID
+      await this.$saveSettings({
+        firstName: this.givenName,
+      });
+    }
+
     this.$router.back();
   }