Compare commits
7 Commits
80d5199259
...
project-re
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e3e293495 | ||
|
|
65533c15d2 | ||
|
|
2530bc0ec2 | ||
| b1fa6ac458 | |||
| 9ff24f8258 | |||
|
|
9a3409c29f | ||
|
|
a142737771 |
57
BUILDING.md
57
BUILDING.md
@@ -1151,28 +1151,28 @@ If you need to build manually or want to understand the individual steps:
|
|||||||
|
|
||||||
- ... and you may have to fix these, especially with pkgx:
|
- ... and you may have to fix these, especially with pkgx:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gem_path=$(which gem)
|
gem_path=$(which gem)
|
||||||
shortened_path="${gem_path:h:h}"
|
shortened_path="${gem_path:h:h}"
|
||||||
export GEM_HOME=$shortened_path
|
export GEM_HOME=$shortened_path
|
||||||
export GEM_PATH=$shortened_path
|
export GEM_PATH=$shortened_path
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;
|
##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd ios/App && xcrun agvtool new-version 47 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.2;/g" App.xcodeproj/project.pbxproj && cd -
|
cd ios/App && xcrun agvtool new-version 46 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.1;/g" App.xcodeproj/project.pbxproj && cd -
|
||||||
# Unfortunately this edits Info.plist directly.
|
# Unfortunately this edits Info.plist directly.
|
||||||
#xcrun agvtool new-marketing-version 0.4.5
|
#xcrun agvtool new-marketing-version 0.4.5
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 2. Build
|
##### 2. Build
|
||||||
|
|
||||||
Here's prod. Also available: test, dev
|
Here's prod. Also available: test, dev
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm run build:ios:prod
|
npm run build:ios:prod
|
||||||
```
|
```
|
||||||
|
|
||||||
3.1. Use Xcode to build and run on simulator or device.
|
3.1. Use Xcode to build and run on simulator or device.
|
||||||
|
|
||||||
@@ -1197,8 +1197,7 @@ npm run build:ios:prod
|
|||||||
- It can take 15 minutes for the build to show up in the list of builds.
|
- 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.
|
- You'll probably have to "Manage" something about encryption, disallowed in France.
|
||||||
- Then "Save" and "Add to Review" and "Resubmit to App Review".
|
- Then "Save" and "Add to Review" and "Resubmit to App Review".
|
||||||
- Eventually it'll be "Ready for Distribution" which means it's live
|
- Eventually it'll be "Ready for Distribution" which means
|
||||||
- When finished, bump package.json version
|
|
||||||
|
|
||||||
### Android Build
|
### Android Build
|
||||||
|
|
||||||
@@ -1316,26 +1315,26 @@ The recommended way to build for Android is using the automated build script:
|
|||||||
|
|
||||||
#### Android Manual Build Process
|
#### Android Manual Build Process
|
||||||
|
|
||||||
##### 1. Bump the version in package.json, then update these versions & run:
|
##### 1. Bump the version in package.json, then here: android/app/build.gradle
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
perl -p -i -e 's/versionCode .*/versionCode 47/g' android/app/build.gradle
|
perl -p -i -e 's/versionCode .*/versionCode 46/g' android/app/build.gradle
|
||||||
perl -p -i -e 's/versionName .*/versionName "1.1.2"/g' android/app/build.gradle
|
perl -p -i -e 's/versionName .*/versionName "1.1.1"/g' android/app/build.gradle
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 2. Build
|
##### 2. Build
|
||||||
|
|
||||||
Here's prod. Also available: test, dev
|
Here's prod. Also available: test, dev
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm run build:android:prod
|
npm run build:android:prod
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 3. Open the project in Android Studio
|
##### 3. Open the project in Android Studio
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx cap open android
|
npx cap open android
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 4. Use Android Studio to build and run on emulator or device
|
##### 4. Use Android Studio to build and run on emulator or device
|
||||||
|
|
||||||
@@ -1380,8 +1379,6 @@ At play.google.com/console:
|
|||||||
- Note that if you add testers, you have to go to "Publishing Overview" and send
|
- 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.
|
those changes or your (closed) testers won't see it.
|
||||||
|
|
||||||
- When finished, bump package.json version
|
|
||||||
|
|
||||||
### Capacitor Operations
|
### Capacitor Operations
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -6,12 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
|
||||||
## [1.1.2] - 2025.11.06
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Bad page when user follows prompt to backup seed
|
|
||||||
|
|
||||||
|
|
||||||
## [1.1.1] - 2025.11.03
|
## [1.1.1] - 2025.11.03
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ android {
|
|||||||
applicationId "app.timesafari.app"
|
applicationId "app.timesafari.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 47
|
versionCode 46
|
||||||
versionName "1.1.2"
|
versionName "1.1.1"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ dependencies {
|
|||||||
implementation project(':capacitor-share')
|
implementation project(':capacitor-share')
|
||||||
implementation project(':capacitor-status-bar')
|
implementation project(':capacitor-status-bar')
|
||||||
implementation project(':capawesome-capacitor-file-picker')
|
implementation project(':capawesome-capacitor-file-picker')
|
||||||
implementation project(':timesafari-daily-notification-plugin')
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,30 +36,6 @@
|
|||||||
android:grantUriPermissions="true">
|
android:grantUriPermissions="true">
|
||||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
|
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
<!-- Daily Notification Plugin Receivers -->
|
|
||||||
<receiver
|
|
||||||
android:name="com.timesafari.dailynotification.DailyNotificationReceiver"
|
|
||||||
android:enabled="true"
|
|
||||||
android:exported="false">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="com.timesafari.daily.NOTIFICATION" />
|
|
||||||
</intent-filter>
|
|
||||||
</receiver>
|
|
||||||
<receiver
|
|
||||||
android:name="com.timesafari.dailynotification.BootReceiver"
|
|
||||||
android:directBootAware="true"
|
|
||||||
android:enabled="true"
|
|
||||||
android:exported="true">
|
|
||||||
<intent-filter android:priority="1000">
|
|
||||||
<!-- Delivered very early after reboot (before unlock) -->
|
|
||||||
<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
|
|
||||||
<!-- Delivered after the user unlocks / credential-encrypted storage is available -->
|
|
||||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
|
||||||
<!-- Delivered after app update; great for rescheduling alarms without reboot -->
|
|
||||||
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
|
|
||||||
</intent-filter>
|
|
||||||
</receiver>
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
<!-- Permissions -->
|
<!-- Permissions -->
|
||||||
@@ -69,15 +45,4 @@
|
|||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
<uses-permission android:name="android.permission.CAMERA" />
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
<uses-feature android:name="android.hardware.camera" android:required="true" />
|
<uses-feature android:name="android.hardware.camera" android:required="true" />
|
||||||
|
|
||||||
<!-- Notification permissions -->
|
|
||||||
<!-- POST_NOTIFICATIONS required for Android 13+ (API 33+) -->
|
|
||||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
|
||||||
|
|
||||||
<!-- SCHEDULE_EXACT_ALARM required for Android 12+ (API 31+) to schedule exact alarms -->
|
|
||||||
<!-- Note: On Android 12+, users can grant/deny this permission -->
|
|
||||||
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
|
|
||||||
|
|
||||||
<!-- RECEIVE_BOOT_COMPLETED needed to reschedule notifications after device reboot -->
|
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|||||||
@@ -34,9 +34,5 @@
|
|||||||
{
|
{
|
||||||
"pkg": "@capawesome/capacitor-file-picker",
|
"pkg": "@capawesome/capacitor-file-picker",
|
||||||
"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
|
"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
|
||||||
},
|
|
||||||
{
|
|
||||||
"pkg": "@timesafari/daily-notification-plugin",
|
|
||||||
"classpath": "com.timesafari.dailynotification.DailyNotificationPlugin"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -28,6 +28,3 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacit
|
|||||||
|
|
||||||
include ':capawesome-capacitor-file-picker'
|
include ':capawesome-capacitor-file-picker'
|
||||||
project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
|
project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
|
||||||
|
|
||||||
include ':timesafari-daily-notification-plugin'
|
|
||||||
project(':timesafari-daily-notification-plugin').projectDir = new File('../node_modules/@timesafari/daily-notification-plugin/android')
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -403,7 +403,7 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 47;
|
CURRENT_PROJECT_VERSION = 46;
|
||||||
DEVELOPMENT_TEAM = GM3FS5JQPH;
|
DEVELOPMENT_TEAM = GM3FS5JQPH;
|
||||||
ENABLE_APP_SANDBOX = NO;
|
ENABLE_APP_SANDBOX = NO;
|
||||||
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
||||||
@@ -413,7 +413,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.1.2;
|
MARKETING_VERSION = 1.1.1;
|
||||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
|
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
@@ -430,7 +430,7 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 47;
|
CURRENT_PROJECT_VERSION = 46;
|
||||||
DEVELOPMENT_TEAM = GM3FS5JQPH;
|
DEVELOPMENT_TEAM = GM3FS5JQPH;
|
||||||
ENABLE_APP_SANDBOX = NO;
|
ENABLE_APP_SANDBOX = NO;
|
||||||
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
||||||
@@ -440,7 +440,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.1.2;
|
MARKETING_VERSION = 1.1.1;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
|
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
||||||
|
|||||||
46
package-lock.json
generated
46
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.3-beta",
|
"version": "1.1.2-beta",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.3-beta",
|
"version": "1.1.2-beta",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capacitor-community/electron": "^5.0.1",
|
"@capacitor-community/electron": "^5.0.1",
|
||||||
"@capacitor-community/sqlite": "6.0.2",
|
"@capacitor-community/sqlite": "6.0.2",
|
||||||
@@ -37,7 +37,6 @@
|
|||||||
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
||||||
"@simplewebauthn/browser": "^10.0.0",
|
"@simplewebauthn/browser": "^10.0.0",
|
||||||
"@simplewebauthn/server": "^10.0.0",
|
"@simplewebauthn/server": "^10.0.0",
|
||||||
"@timesafari/daily-notification-plugin": "file:../daily-notification-plugin",
|
|
||||||
"@tweenjs/tween.js": "^21.1.1",
|
"@tweenjs/tween.js": "^21.1.1",
|
||||||
"@types/qrcode": "^1.5.5",
|
"@types/qrcode": "^1.5.5",
|
||||||
"@veramo/core": "^5.6.0",
|
"@veramo/core": "^5.6.0",
|
||||||
@@ -150,43 +149,6 @@
|
|||||||
"vite": "^5.2.0"
|
"vite": "^5.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"../daily-notification-plugin": {
|
|
||||||
"name": "@timesafari/daily-notification-plugin",
|
|
||||||
"version": "1.0.8",
|
|
||||||
"license": "MIT",
|
|
||||||
"workspaces": [
|
|
||||||
"packages/*"
|
|
||||||
],
|
|
||||||
"dependencies": {
|
|
||||||
"@capacitor/core": "^6.2.1"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@capacitor/android": "^6.2.1",
|
|
||||||
"@capacitor/cli": "^6.2.1",
|
|
||||||
"@capacitor/ios": "^6.2.1",
|
|
||||||
"@types/jest": "^29.5.0",
|
|
||||||
"@types/jsdom": "^21.1.7",
|
|
||||||
"@types/node": "^20.19.0",
|
|
||||||
"@typescript-eslint/eslint-plugin": "^5.57.0",
|
|
||||||
"@typescript-eslint/parser": "^5.57.0",
|
|
||||||
"eslint": "^8.37.0",
|
|
||||||
"jest": "^29.5.0",
|
|
||||||
"jest-environment-jsdom": "^30.0.5",
|
|
||||||
"jsdom": "^26.1.0",
|
|
||||||
"markdownlint-cli2": "^0.18.1",
|
|
||||||
"prettier": "^2.8.7",
|
|
||||||
"rimraf": "^4.4.0",
|
|
||||||
"rollup": "^3.20.0",
|
|
||||||
"rollup-plugin-typescript2": "^0.31.0",
|
|
||||||
"standard-version": "^9.5.0",
|
|
||||||
"ts-jest": "^29.1.0",
|
|
||||||
"typescript": "~5.2.0",
|
|
||||||
"vite": "^7.1.9"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@0no-co/graphql.web": {
|
"node_modules/@0no-co/graphql.web": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.2.0.tgz",
|
||||||
@@ -9643,10 +9605,6 @@
|
|||||||
"node": ">=10"
|
"node": ">=10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@timesafari/daily-notification-plugin": {
|
|
||||||
"resolved": "../daily-notification-plugin",
|
|
||||||
"link": true
|
|
||||||
},
|
|
||||||
"node_modules/@tootallnate/once": {
|
"node_modules/@tootallnate/once": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.3-beta",
|
"version": "1.1.2-beta",
|
||||||
"description": "Time Safari Application",
|
"description": "Time Safari Application",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Time Safari Team"
|
"name": "Time Safari Team"
|
||||||
@@ -166,7 +166,6 @@
|
|||||||
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
||||||
"@simplewebauthn/browser": "^10.0.0",
|
"@simplewebauthn/browser": "^10.0.0",
|
||||||
"@simplewebauthn/server": "^10.0.0",
|
"@simplewebauthn/server": "^10.0.0",
|
||||||
"@timesafari/daily-notification-plugin": "file:../daily-notification-plugin",
|
|
||||||
"@tweenjs/tween.js": "^21.1.1",
|
"@tweenjs/tween.js": "^21.1.1",
|
||||||
"@types/qrcode": "^1.5.5",
|
"@types/qrcode": "^1.5.5",
|
||||||
"@veramo/core": "^5.6.0",
|
"@veramo/core": "^5.6.0",
|
||||||
|
|||||||
@@ -436,21 +436,7 @@ fi
|
|||||||
log_info "Cleaning dist directory..."
|
log_info "Cleaning dist directory..."
|
||||||
clean_build_artifacts "dist"
|
clean_build_artifacts "dist"
|
||||||
|
|
||||||
# Step 4: Run TypeScript type checking for test and production builds
|
# Step 4: Build Capacitor version with mode
|
||||||
if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then
|
|
||||||
log_info "Running TypeScript type checking for $BUILD_MODE mode..."
|
|
||||||
|
|
||||||
if ! measure_time npm run type-check; then
|
|
||||||
log_error "TypeScript type checking failed for $BUILD_MODE mode!"
|
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
|
|
||||||
log_success "TypeScript type checking completed for $BUILD_MODE mode"
|
|
||||||
else
|
|
||||||
log_debug "Skipping TypeScript type checking for development mode"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 5: Build Capacitor version with mode
|
|
||||||
if [ "$BUILD_MODE" = "development" ]; then
|
if [ "$BUILD_MODE" = "development" ]; then
|
||||||
safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
|
safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
|
||||||
elif [ "$BUILD_MODE" = "test" ]; then
|
elif [ "$BUILD_MODE" = "test" ]; then
|
||||||
@@ -459,23 +445,23 @@ elif [ "$BUILD_MODE" = "production" ]; then
|
|||||||
safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
|
safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 6: Clean Gradle build
|
# Step 5: Clean Gradle build
|
||||||
safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4
|
safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4
|
||||||
|
|
||||||
# Step 7: Build based on type
|
# Step 6: Build based on type
|
||||||
if [ "$BUILD_TYPE" = "debug" ]; then
|
if [ "$BUILD_TYPE" = "debug" ]; then
|
||||||
safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug && cd .." || exit 5
|
safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug && cd .." || exit 5
|
||||||
elif [ "$BUILD_TYPE" = "release" ]; then
|
elif [ "$BUILD_TYPE" = "release" ]; then
|
||||||
safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease && cd .." || exit 5
|
safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease && cd .." || exit 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 8: Sync with Capacitor
|
# Step 7: Sync with Capacitor
|
||||||
safe_execute "Syncing with Capacitor" "npx cap sync android" || exit 6
|
safe_execute "Syncing with Capacitor" "npx cap sync android" || exit 6
|
||||||
|
|
||||||
# Step 9: Generate assets
|
# Step 8: Generate assets
|
||||||
safe_execute "Generating assets" "npx capacitor-assets generate --android" || exit 7
|
safe_execute "Generating assets" "npx capacitor-assets generate --android" || exit 7
|
||||||
|
|
||||||
# Step 10: Build APK/AAB if requested
|
# Step 9: Build APK/AAB if requested
|
||||||
if [ "$BUILD_APK" = true ]; then
|
if [ "$BUILD_APK" = true ]; then
|
||||||
if [ "$BUILD_TYPE" = "debug" ]; then
|
if [ "$BUILD_TYPE" = "debug" ]; then
|
||||||
safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5
|
safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5
|
||||||
@@ -488,7 +474,7 @@ if [ "$BUILD_AAB" = true ]; then
|
|||||||
safe_execute "Building AAB" "cd android && ./gradlew bundleRelease && cd .." || exit 5
|
safe_execute "Building AAB" "cd android && ./gradlew bundleRelease && cd .." || exit 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 11: Auto-run app if requested
|
# Step 10: Auto-run app if requested
|
||||||
if [ "$AUTO_RUN" = true ]; then
|
if [ "$AUTO_RUN" = true ]; then
|
||||||
log_step "Auto-running Android app..."
|
log_step "Auto-running Android app..."
|
||||||
safe_execute "Launching app" "npx cap run android" || {
|
safe_execute "Launching app" "npx cap run android" || {
|
||||||
@@ -499,7 +485,7 @@ if [ "$AUTO_RUN" = true ]; then
|
|||||||
log_success "Android app launched successfully!"
|
log_success "Android app launched successfully!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 12: Open Android Studio if requested
|
# Step 11: Open Android Studio if requested
|
||||||
if [ "$OPEN_STUDIO" = true ]; then
|
if [ "$OPEN_STUDIO" = true ]; then
|
||||||
safe_execute "Opening Android Studio" "npx cap open android" || exit 8
|
safe_execute "Opening Android Studio" "npx cap open android" || exit 8
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -381,21 +381,7 @@ safe_execute "Cleaning iOS build" "clean_ios_build" || exit 1
|
|||||||
log_info "Cleaning dist directory..."
|
log_info "Cleaning dist directory..."
|
||||||
clean_build_artifacts "dist"
|
clean_build_artifacts "dist"
|
||||||
|
|
||||||
# Step 4: Run TypeScript type checking for test and production builds
|
# Step 4: Build Capacitor version with mode
|
||||||
if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then
|
|
||||||
log_info "Running TypeScript type checking for $BUILD_MODE mode..."
|
|
||||||
|
|
||||||
if ! measure_time npm run type-check; then
|
|
||||||
log_error "TypeScript type checking failed for $BUILD_MODE mode!"
|
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
|
|
||||||
log_success "TypeScript type checking completed for $BUILD_MODE mode"
|
|
||||||
else
|
|
||||||
log_debug "Skipping TypeScript type checking for development mode"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 5: Build Capacitor version with mode
|
|
||||||
if [ "$BUILD_MODE" = "development" ]; then
|
if [ "$BUILD_MODE" = "development" ]; then
|
||||||
safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
|
safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
|
||||||
elif [ "$BUILD_MODE" = "test" ]; then
|
elif [ "$BUILD_MODE" = "test" ]; then
|
||||||
@@ -404,16 +390,16 @@ elif [ "$BUILD_MODE" = "production" ]; then
|
|||||||
safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
|
safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 6: Sync with Capacitor
|
# Step 5: Sync with Capacitor
|
||||||
safe_execute "Syncing with Capacitor" "npx cap sync ios" || exit 6
|
safe_execute "Syncing with Capacitor" "npx cap sync ios" || exit 6
|
||||||
|
|
||||||
# Step 7: Generate assets
|
# Step 6: Generate assets
|
||||||
safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
|
safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
|
||||||
|
|
||||||
# Step 8: Build iOS app
|
# Step 7: Build iOS app
|
||||||
safe_execute "Building iOS app" "build_ios_app" || exit 5
|
safe_execute "Building iOS app" "build_ios_app" || exit 5
|
||||||
|
|
||||||
# Step 9: Build IPA/App if requested
|
# Step 8: Build IPA/App if requested
|
||||||
if [ "$BUILD_IPA" = true ]; then
|
if [ "$BUILD_IPA" = true ]; then
|
||||||
log_info "Building IPA package..."
|
log_info "Building IPA package..."
|
||||||
cd ios/App
|
cd ios/App
|
||||||
@@ -440,12 +426,12 @@ if [ "$BUILD_APP" = true ]; then
|
|||||||
log_success "App bundle built successfully"
|
log_success "App bundle built successfully"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 10: Auto-run app if requested
|
# Step 9: Auto-run app if requested
|
||||||
if [ "$AUTO_RUN" = true ]; then
|
if [ "$AUTO_RUN" = true ]; then
|
||||||
safe_execute "Auto-running iOS app" "auto_run_ios_app" || exit 9
|
safe_execute "Auto-running iOS app" "auto_run_ios_app" || exit 9
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 11: Open Xcode if requested
|
# Step 10: Open Xcode if requested
|
||||||
if [ "$OPEN_STUDIO" = true ]; then
|
if [ "$OPEN_STUDIO" = true ]; then
|
||||||
safe_execute "Opening Xcode" "npx cap open ios" || exit 8
|
safe_execute "Opening Xcode" "npx cap open ios" || exit 8
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
<li
|
<li
|
||||||
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
||||||
>
|
>
|
||||||
Everyone Else
|
Everyone
|
||||||
</li>
|
</li>
|
||||||
<PersonCard
|
<PersonCard
|
||||||
v-for="person in alphabeticalContacts"
|
v-for="person in alphabeticalContacts"
|
||||||
@@ -208,7 +208,18 @@ export default class EntityGrid extends Vue {
|
|||||||
infiniteScrollReset?: () => void;
|
infiniteScrollReset?: () => void;
|
||||||
scrollContainer?: HTMLElement;
|
scrollContainer?: HTMLElement;
|
||||||
|
|
||||||
/** Array of entities to display */
|
/**
|
||||||
|
* Array of entities to display
|
||||||
|
*
|
||||||
|
* IMPORTANT: When passing Contact[] arrays, they must be sorted by date added
|
||||||
|
* (newest first) for the "Recently Added" section to display correctly.
|
||||||
|
* Use $contactsByDateAdded() instead of $getAllContacts() or $contacts().
|
||||||
|
*
|
||||||
|
* The recentContacts computed property assumes contacts are already sorted
|
||||||
|
* by date added and simply takes the first 3. If contacts are sorted
|
||||||
|
* alphabetically or in another order, the wrong contacts will appear in
|
||||||
|
* "Recently Added".
|
||||||
|
*/
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
entities!: Contact[] | PlanData[];
|
entities!: Contact[] | PlanData[];
|
||||||
|
|
||||||
@@ -307,14 +318,17 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the 3 most recently added contacts (when showing contacts and not searching)
|
* Get the most recently added contacts (when showing contacts and not searching)
|
||||||
|
*
|
||||||
|
* NOTE: This assumes entities are already sorted by date added (newest first).
|
||||||
|
* See the entities prop documentation for details on using $contactsByDateAdded().
|
||||||
*/
|
*/
|
||||||
get recentContacts(): Contact[] {
|
get recentContacts(): Contact[] {
|
||||||
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
// Entities are already sorted by date added (newest first)
|
// Entities are already sorted by date added (newest first)
|
||||||
return (this.entities as Contact[]).slice(0, 3);
|
return (this.entities as Contact[]).slice(0, RECENT_CONTACTS_COUNT);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -325,16 +339,16 @@ export default class EntityGrid extends Vue {
|
|||||||
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
// Skip the first 3 (recent contacts) and sort the rest alphabetically
|
// Skip the first few (recent contacts) and sort the rest alphabetically
|
||||||
// Create a copy to avoid mutating the original array
|
// Create a copy to avoid mutating the original array
|
||||||
const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
|
const remaining = this.entities as Contact[];
|
||||||
const sorted = [...remaining].sort((a: Contact, b: Contact) => {
|
const sorted = [...remaining].sort((a: Contact, b: Contact) => {
|
||||||
// Sort alphabetically by name, falling back to DID if name is missing
|
// Sort alphabetically by name, falling back to DID if name is missing
|
||||||
const nameA = (a.name || a.did).toLowerCase();
|
const nameA = (a.name || a.did).toLowerCase();
|
||||||
const nameB = (b.name || b.did).toLowerCase();
|
const nameB = (b.name || b.did).toLowerCase();
|
||||||
return nameA.localeCompare(nameB);
|
return nameA.localeCompare(nameB);
|
||||||
});
|
});
|
||||||
// Apply infinite scroll: show based on displayedCount (minus the 3 recent)
|
// Apply infinite scroll: show based on displayedCount (minus the recent contacts)
|
||||||
const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
|
const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
|
||||||
return sorted.slice(0, toShow);
|
return sorted.slice(0, toShow);
|
||||||
}
|
}
|
||||||
@@ -531,9 +545,8 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// People: check if more alphabetical contacts available
|
// People: check if more alphabetical contacts available
|
||||||
// Total available = 3 recent + all alphabetical
|
// Total available = recent + all alphabetical
|
||||||
const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
|
const totalAvailable = RECENT_CONTACTS_COUNT + this.entities.length;
|
||||||
const totalAvailable = RECENT_CONTACTS_COUNT + remaining.length;
|
|
||||||
return this.displayedCount < totalAvailable;
|
return this.displayedCount < totalAvailable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
117
src/components/ProjectRepresentativeDialog.vue
Normal file
117
src/components/ProjectRepresentativeDialog.vue
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
<template>
|
||||||
|
<div v-if="visible" class="dialog-overlay">
|
||||||
|
<div class="dialog">
|
||||||
|
<!-- Header -->
|
||||||
|
<h2 class="text-lg font-semibold leading-[1.25] mb-4">
|
||||||
|
Select Representative
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<!-- EntityGrid for contacts -->
|
||||||
|
<EntityGrid
|
||||||
|
:entity-type="'people'"
|
||||||
|
:entities="allContacts"
|
||||||
|
:active-did="activeDid"
|
||||||
|
:all-my-dids="allMyDids"
|
||||||
|
:all-contacts="allContacts"
|
||||||
|
:conflict-checker="() => false"
|
||||||
|
:show-you-entity="false"
|
||||||
|
:show-unnamed-entity="false"
|
||||||
|
:notify="notify"
|
||||||
|
:conflict-context="'representative'"
|
||||||
|
@entity-selected="handleEntitySelected"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- Cancel Button -->
|
||||||
|
<div class="flex gap-2 mt-4">
|
||||||
|
<button
|
||||||
|
class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
|
||||||
|
@click="handleCancel"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
||||||
|
import EntityGrid from "./EntityGrid.vue";
|
||||||
|
import { Contact } from "../db/tables/contacts";
|
||||||
|
import { NotificationIface } from "../constants/app";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ProjectRepresentativeDialog - Dialog for selecting an authorized representative
|
||||||
|
*
|
||||||
|
* Features:
|
||||||
|
* - EntityGrid integration for contact selection
|
||||||
|
* - No special entities (You, Unnamed)
|
||||||
|
* - Immediate assignment on contact selection
|
||||||
|
* - Cancel button to close without selection
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
components: {
|
||||||
|
EntityGrid,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
export default class ProjectRepresentativeDialog extends Vue {
|
||||||
|
/** Whether the dialog is visible */
|
||||||
|
visible = false;
|
||||||
|
|
||||||
|
/** Array of available contacts */
|
||||||
|
@Prop({ required: true })
|
||||||
|
allContacts!: Contact[];
|
||||||
|
|
||||||
|
/** Active user's DID */
|
||||||
|
@Prop({ required: true })
|
||||||
|
activeDid!: string;
|
||||||
|
|
||||||
|
/** All user's DIDs */
|
||||||
|
@Prop({ required: true })
|
||||||
|
allMyDids!: string[];
|
||||||
|
|
||||||
|
/** Notification function from parent component */
|
||||||
|
@Prop()
|
||||||
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle entity selection from EntityGrid
|
||||||
|
* Immediately assigns the selected contact and closes the dialog
|
||||||
|
*/
|
||||||
|
handleEntitySelected(event: { type: "person" | "project"; data: Contact }) {
|
||||||
|
const contact = event.data as Contact;
|
||||||
|
this.emitAssign(contact);
|
||||||
|
this.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle cancel button click
|
||||||
|
*/
|
||||||
|
handleCancel(): void {
|
||||||
|
this.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the dialog
|
||||||
|
*/
|
||||||
|
open(): void {
|
||||||
|
this.visible = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Close the dialog
|
||||||
|
*/
|
||||||
|
close(): void {
|
||||||
|
this.visible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Emit methods using @Emit decorator
|
||||||
|
|
||||||
|
@Emit("assign")
|
||||||
|
emitAssign(contact: Contact): Contact {
|
||||||
|
return contact;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped></style>
|
||||||
@@ -1,781 +0,0 @@
|
|||||||
<template>
|
|
||||||
<section
|
|
||||||
v-if="notificationsSupported"
|
|
||||||
id="sectionDailyNotifications"
|
|
||||||
class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
|
|
||||||
aria-labelledby="dailyNotificationsHeading"
|
|
||||||
>
|
|
||||||
<h2 id="dailyNotificationsHeading" class="mb-2 font-bold">
|
|
||||||
Daily Notifications
|
|
||||||
<button
|
|
||||||
class="text-slate-400 fa-fw cursor-pointer"
|
|
||||||
aria-label="Learn more about native notifications"
|
|
||||||
@click.stop="showNativeNotificationInfo"
|
|
||||||
>
|
|
||||||
<font-awesome icon="circle-question" aria-hidden="true" />
|
|
||||||
</button>
|
|
||||||
</h2>
|
|
||||||
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<div>Daily Notification</div>
|
|
||||||
<!-- Toggle switch -->
|
|
||||||
<div
|
|
||||||
class="relative ml-2 cursor-pointer"
|
|
||||||
role="switch"
|
|
||||||
:aria-checked="nativeNotificationEnabled"
|
|
||||||
:aria-label="
|
|
||||||
nativeNotificationEnabled
|
|
||||||
? 'Disable daily notifications'
|
|
||||||
: 'Enable daily notifications'
|
|
||||||
"
|
|
||||||
tabindex="0"
|
|
||||||
@click="toggleNativeNotification"
|
|
||||||
>
|
|
||||||
<!-- input -->
|
|
||||||
<input
|
|
||||||
:checked="nativeNotificationEnabled"
|
|
||||||
type="checkbox"
|
|
||||||
class="sr-only"
|
|
||||||
tabindex="-1"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
<!-- line -->
|
|
||||||
<div
|
|
||||||
class="block bg-slate-500 w-14 h-8 rounded-full transition"
|
|
||||||
:class="{
|
|
||||||
'bg-blue-600': nativeNotificationEnabled,
|
|
||||||
}"
|
|
||||||
></div>
|
|
||||||
<!-- dot -->
|
|
||||||
<div
|
|
||||||
class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
|
|
||||||
:class="{
|
|
||||||
'left-7 bg-white': nativeNotificationEnabled,
|
|
||||||
}"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Show "Open Settings" button when permissions are denied -->
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
notificationsSupported &&
|
|
||||||
notificationStatus &&
|
|
||||||
notificationStatus.permissions.notifications === 'denied'
|
|
||||||
"
|
|
||||||
class="mt-2"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="w-full px-3 py-2 bg-blue-600 text-white rounded text-sm font-medium"
|
|
||||||
@click="openNotificationSettings"
|
|
||||||
>
|
|
||||||
Open Settings
|
|
||||||
</button>
|
|
||||||
<p class="text-xs text-slate-500 mt-1 text-center">
|
|
||||||
Enable notifications in Settings > App info > Notifications
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Time input section - show when enabled OR when no time is set -->
|
|
||||||
<div
|
|
||||||
v-if="nativeNotificationEnabled || !nativeNotificationTimeStorage"
|
|
||||||
class="mt-2"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
v-if="nativeNotificationEnabled"
|
|
||||||
class="flex items-center justify-between mb-2"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
>Scheduled for:
|
|
||||||
<span v-if="nativeNotificationTime">{{
|
|
||||||
nativeNotificationTime
|
|
||||||
}}</span>
|
|
||||||
<span v-else class="text-slate-500">Not set</span></span
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="text-blue-500 text-sm"
|
|
||||||
@click="editNativeNotificationTime"
|
|
||||||
>
|
|
||||||
{{ showTimeEdit ? "Cancel" : "Edit Time" }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Time input (shown when editing or when no time is set) -->
|
|
||||||
<div v-if="showTimeEdit || !nativeNotificationTimeStorage" class="mt-2">
|
|
||||||
<label class="block text-sm text-slate-600 mb-1">
|
|
||||||
Notification Time
|
|
||||||
</label>
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<input
|
|
||||||
v-model="nativeNotificationTimeStorage"
|
|
||||||
type="time"
|
|
||||||
class="rounded border border-slate-400 px-2 py-2"
|
|
||||||
@change="onTimeChange"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
v-if="showTimeEdit || nativeNotificationTimeStorage"
|
|
||||||
class="px-3 py-2 bg-blue-600 text-white rounded"
|
|
||||||
@click="saveTimeChange"
|
|
||||||
>
|
|
||||||
Save
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
v-if="!nativeNotificationTimeStorage"
|
|
||||||
class="text-xs text-slate-500 mt-1"
|
|
||||||
>
|
|
||||||
Set a time before enabling notifications
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Loading state -->
|
|
||||||
<div v-if="loading" class="mt-2 text-sm text-slate-500">Loading...</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* DailyNotificationSection Component
|
|
||||||
*
|
|
||||||
* A self-contained component for managing daily notification scheduling
|
|
||||||
* in AccountViewView. This component handles platform detection, permission
|
|
||||||
* requests, scheduling, and state management for daily notifications.
|
|
||||||
*
|
|
||||||
* Features:
|
|
||||||
* - Platform capability detection (hides on unsupported platforms)
|
|
||||||
* - Permission request flow
|
|
||||||
* - Schedule/cancel notifications
|
|
||||||
* - Time editing with HTML5 time input
|
|
||||||
* - Settings persistence
|
|
||||||
* - Plugin state synchronization
|
|
||||||
*
|
|
||||||
* @author Generated for TimeSafari Daily Notification Integration
|
|
||||||
* @component
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
|
||||||
import { logger } from "@/utils/logger";
|
|
||||||
import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
|
|
||||||
import type {
|
|
||||||
NotificationStatus,
|
|
||||||
PermissionStatus,
|
|
||||||
} from "@/services/PlatformService";
|
|
||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
|
||||||
import type { NotificationIface } from "@/constants/app";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert 24-hour time format ("09:00") to 12-hour display format ("9:00 AM")
|
|
||||||
*/
|
|
||||||
function formatTimeForDisplay(time24: string): string {
|
|
||||||
if (!time24) return "";
|
|
||||||
const [hours, minutes] = time24.split(":");
|
|
||||||
const hourNum = parseInt(hours);
|
|
||||||
const isPM = hourNum >= 12;
|
|
||||||
const displayHour =
|
|
||||||
hourNum === 0 ? 12 : hourNum > 12 ? hourNum - 12 : hourNum;
|
|
||||||
return `${displayHour}:${minutes} ${isPM ? "PM" : "AM"}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
name: "DailyNotificationSection",
|
|
||||||
mixins: [PlatformServiceMixin],
|
|
||||||
})
|
|
||||||
export default class DailyNotificationSection extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
// Component state
|
|
||||||
notificationsSupported: boolean = false;
|
|
||||||
nativeNotificationEnabled: boolean = false;
|
|
||||||
nativeNotificationTime: string = ""; // Display format: "9:00 AM"
|
|
||||||
nativeNotificationTimeStorage: string = ""; // Plugin format: "09:00"
|
|
||||||
nativeNotificationTitle: string = "Daily Update";
|
|
||||||
nativeNotificationMessage: string = "Your daily notification is ready!";
|
|
||||||
showTimeEdit: boolean = false;
|
|
||||||
loading: boolean = false;
|
|
||||||
notificationStatus: NotificationStatus | null = null;
|
|
||||||
|
|
||||||
// Notify helpers
|
|
||||||
private notify!: ReturnType<typeof createNotifyHelpers>;
|
|
||||||
|
|
||||||
async created(): Promise<void> {
|
|
||||||
this.notify = createNotifyHelpers(this.$notify);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize component state on mount
|
|
||||||
* Checks platform support and syncs with plugin state
|
|
||||||
*
|
|
||||||
* **Token Refresh on Mount:**
|
|
||||||
* - Refreshes native fetcher configuration to ensure plugin has valid token
|
|
||||||
* - This handles cases where app was closed for extended periods
|
|
||||||
* - Token refresh happens automatically without user interaction
|
|
||||||
*
|
|
||||||
* **App Resume Listener:**
|
|
||||||
* - Listens for Capacitor 'resume' event to refresh token when app comes to foreground
|
|
||||||
* - Ensures plugin always has fresh token for background prefetch operations
|
|
||||||
* - Cleaned up in `beforeDestroy()` lifecycle hook
|
|
||||||
*/
|
|
||||||
async mounted(): Promise<void> {
|
|
||||||
await this.initializeState();
|
|
||||||
// Refresh native fetcher configuration on mount
|
|
||||||
// This ensures plugin has valid token even if app was closed for extended periods
|
|
||||||
await this.refreshNativeFetcherConfig();
|
|
||||||
// Listen for app resume events to refresh token when app comes to foreground
|
|
||||||
// This is part of the proactive token refresh strategy
|
|
||||||
document.addEventListener("resume", this.handleAppResume);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cleanup on component destroy
|
|
||||||
*/
|
|
||||||
beforeDestroy(): void {
|
|
||||||
document.removeEventListener("resume", this.handleAppResume);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle app resume event - refresh native fetcher configuration
|
|
||||||
*
|
|
||||||
* This method is called when the app comes to foreground (via Capacitor 'resume' event).
|
|
||||||
* It proactively refreshes the JWT token to ensure the plugin has valid authentication
|
|
||||||
* for background prefetch operations.
|
|
||||||
*
|
|
||||||
* **Why refresh on resume?**
|
|
||||||
* - Tokens expire after 72 hours
|
|
||||||
* - App may have been closed for extended periods
|
|
||||||
* - Refreshing ensures plugin has valid token for next prefetch cycle
|
|
||||||
* - No user interaction required - happens automatically
|
|
||||||
*
|
|
||||||
* @see {@link refreshNativeFetcherConfig} For implementation details
|
|
||||||
*/
|
|
||||||
async handleAppResume(): Promise<void> {
|
|
||||||
logger.debug(
|
|
||||||
"[DailyNotificationSection] App resumed, refreshing native fetcher config",
|
|
||||||
);
|
|
||||||
await this.refreshNativeFetcherConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Refresh native fetcher configuration with fresh JWT token
|
|
||||||
*
|
|
||||||
* This method ensures the daily notification plugin has a valid authentication token
|
|
||||||
* for background prefetch operations. It's called proactively to prevent token expiration
|
|
||||||
* issues during offline periods.
|
|
||||||
*
|
|
||||||
* **Refresh Triggers:**
|
|
||||||
* - Component mount (when notification settings page loads)
|
|
||||||
* - App resume (when app comes to foreground)
|
|
||||||
* - Notification enabled (when user enables daily notifications)
|
|
||||||
*
|
|
||||||
* **Token Refresh Strategy (Hybrid Approach):**
|
|
||||||
* - Tokens are valid for 72 hours (see `accessTokenForBackground`)
|
|
||||||
* - Tokens are refreshed proactively when app is already open
|
|
||||||
* - If token expires while offline, plugin uses cached content
|
|
||||||
* - Next time app opens, token is automatically refreshed
|
|
||||||
*
|
|
||||||
* **Why This Approach?**
|
|
||||||
* - No app wake-up required (tokens refresh when app is already open)
|
|
||||||
* - Works offline (72-hour validity supports extended offline periods)
|
|
||||||
* - Automatic (no user interaction required)
|
|
||||||
* - Includes starred plans (fetcher receives user's starred plans for prefetch)
|
|
||||||
* - Graceful degradation (if refresh fails, cached content still works)
|
|
||||||
*
|
|
||||||
* **Error Handling:**
|
|
||||||
* - Errors are logged but not shown to user (background operation)
|
|
||||||
* - Returns early if notifications not supported or disabled
|
|
||||||
* - Returns early if API server not configured
|
|
||||||
* - Failures don't interrupt user experience
|
|
||||||
*
|
|
||||||
* @returns Promise that resolves when refresh completes (or fails silently)
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* // Called automatically on mount/resume
|
|
||||||
* await this.refreshNativeFetcherConfig();
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @see {@link CapacitorPlatformService.configureNativeFetcher} For token generation
|
|
||||||
* @see {@link accessTokenForBackground} For 72-hour token generation
|
|
||||||
*/
|
|
||||||
async refreshNativeFetcherConfig(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// Early return: Only refresh if notifications are supported and enabled
|
|
||||||
// This prevents unnecessary work when notifications aren't being used
|
|
||||||
if (!this.notificationsSupported || !this.nativeNotificationEnabled) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get settings for API server and starred plans
|
|
||||||
// API server tells plugin where to fetch content from
|
|
||||||
// Starred plans tell plugin which plans to prefetch
|
|
||||||
const settings = await this.$accountSettings();
|
|
||||||
const apiServer = settings.apiServer || "";
|
|
||||||
|
|
||||||
if (!apiServer) {
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] No API server configured, skipping native fetcher refresh",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get starred plans from settings
|
|
||||||
// These are passed to the plugin so it knows which plans to prefetch
|
|
||||||
const starredPlanHandleIds = settings.starredPlanHandleIds || [];
|
|
||||||
|
|
||||||
// Configure native fetcher with fresh token
|
|
||||||
// The jwt parameter is ignored - configureNativeFetcher generates it automatically
|
|
||||||
// This ensures we always have a fresh token with current expiration time
|
|
||||||
await platformService.configureNativeFetcher({
|
|
||||||
apiServer,
|
|
||||||
jwt: "", // Will be generated automatically by configureNativeFetcher
|
|
||||||
starredPlanHandleIds,
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"[DailyNotificationSection] Native fetcher configuration refreshed",
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
// Don't show error to user - this is a background operation
|
|
||||||
// Failures are logged for debugging but don't interrupt user experience
|
|
||||||
// If refresh fails, plugin will use existing token (if still valid) or cached content
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to refresh native fetcher config:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize component state
|
|
||||||
* Checks platform support and syncs with plugin state
|
|
||||||
*/
|
|
||||||
async initializeState(): Promise<void> {
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
logger.debug(
|
|
||||||
"[DailyNotificationSection] Checking notification support...",
|
|
||||||
);
|
|
||||||
|
|
||||||
// Check if notifications are supported on this platform
|
|
||||||
// This also verifies plugin availability (returns null if plugin unavailable)
|
|
||||||
const status = await platformService.getDailyNotificationStatus();
|
|
||||||
if (status === null) {
|
|
||||||
// Notifications not supported or plugin unavailable - don't initialize
|
|
||||||
this.notificationsSupported = false;
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Notifications not supported or plugin unavailable - section will be hidden",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug(
|
|
||||||
"[DailyNotificationSection] Notifications supported, status:",
|
|
||||||
status,
|
|
||||||
);
|
|
||||||
|
|
||||||
this.notificationsSupported = true;
|
|
||||||
this.notificationStatus = status;
|
|
||||||
|
|
||||||
// Plugin state is the source of truth
|
|
||||||
if (status.isScheduled && status.scheduledTime) {
|
|
||||||
// Plugin has a scheduled notification - sync UI to match
|
|
||||||
this.nativeNotificationEnabled = true;
|
|
||||||
this.nativeNotificationTimeStorage = status.scheduledTime;
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(
|
|
||||||
status.scheduledTime,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
// No plugin schedule - UI defaults to disabled
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
this.nativeNotificationTimeStorage = "";
|
|
||||||
this.nativeNotificationTime = "";
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("[DailyNotificationSection] Failed to initialize:", error);
|
|
||||||
this.notificationsSupported = false;
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Toggle notification on/off
|
|
||||||
*/
|
|
||||||
async toggleNativeNotification(): Promise<void> {
|
|
||||||
// Prevent multiple simultaneous toggles
|
|
||||||
if (this.loading) {
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Toggle ignored - operation in progress",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[DailyNotificationSection] Toggling notification: ${this.nativeNotificationEnabled} -> ${!this.nativeNotificationEnabled}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (this.nativeNotificationEnabled) {
|
|
||||||
await this.disableNativeNotification();
|
|
||||||
} else {
|
|
||||||
await this.enableNativeNotification();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enable daily notification
|
|
||||||
*/
|
|
||||||
async enableNativeNotification(): Promise<void> {
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// Check if we have a time set
|
|
||||||
if (!this.nativeNotificationTimeStorage) {
|
|
||||||
this.notify.error(
|
|
||||||
"Please set a notification time first",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
this.loading = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check permissions first - this also verifies plugin availability
|
|
||||||
let permissions: PermissionStatus | null;
|
|
||||||
try {
|
|
||||||
permissions = await platformService.checkNotificationPermissions();
|
|
||||||
logger.info(
|
|
||||||
`[DailyNotificationSection] Permission check result:`,
|
|
||||||
permissions,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
// Plugin may not be available or there's an error
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to check permissions (plugin may be unavailable):",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to check notification permissions. The notification plugin may not be installed.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (permissions === null) {
|
|
||||||
// Platform doesn't support notifications or plugin unavailable
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Notifications not supported or plugin unavailable",
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Notifications are not supported on this platform or the plugin is not installed.",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[DailyNotificationSection] Permission state: ${permissions.notifications}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
// If permissions are explicitly denied, don't try to request again
|
|
||||||
// (this prevents the plugin crash when handling denied permissions)
|
|
||||||
// Android won't show the dialog again if permissions are permanently denied
|
|
||||||
if (permissions.notifications === "denied") {
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Permissions already denied, directing user to settings",
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Notification permissions were denied. Tap 'Open Settings' to enable them.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only request if permissions are in "prompt" state (not denied, not granted)
|
|
||||||
// This ensures we only call requestPermissions when Android will actually show a dialog
|
|
||||||
if (permissions.notifications === "prompt") {
|
|
||||||
logger.info(
|
|
||||||
"[DailyNotificationSection] Permission state is 'prompt', requesting permissions...",
|
|
||||||
);
|
|
||||||
try {
|
|
||||||
const result = await platformService.requestNotificationPermissions();
|
|
||||||
logger.info(
|
|
||||||
`[DailyNotificationSection] Permission request result:`,
|
|
||||||
result,
|
|
||||||
);
|
|
||||||
if (result === null) {
|
|
||||||
// Plugin unavailable or request failed
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Permission request returned null",
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to request notification permissions. The plugin may not be available.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!result.notifications) {
|
|
||||||
// Permission request was denied
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Permission request denied by user",
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Notification permissions are required. Tap 'Open Settings' to enable them.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Permissions granted - continue
|
|
||||||
logger.info(
|
|
||||||
"[DailyNotificationSection] Permissions granted successfully",
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
// Handle permission request errors (including plugin crashes)
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Permission request failed:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to request notification permissions. Tap 'Open Settings' to enable them.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else if (permissions.notifications !== "granted") {
|
|
||||||
// Unexpected state - shouldn't happen, but handle gracefully
|
|
||||||
logger.warn(
|
|
||||||
`[DailyNotificationSection] Unexpected permission state: ${permissions.notifications}`,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to determine notification permission status. Tap 'Open Settings' to check.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
logger.info("[DailyNotificationSection] Permissions already granted");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Permissions are granted - continue with scheduling
|
|
||||||
|
|
||||||
// Schedule notification via PlatformService
|
|
||||||
await platformService.scheduleDailyNotification({
|
|
||||||
time: this.nativeNotificationTimeStorage, // "09:00" in local time
|
|
||||||
title: this.nativeNotificationTitle,
|
|
||||||
body: this.nativeNotificationMessage,
|
|
||||||
sound: true,
|
|
||||||
priority: "high",
|
|
||||||
});
|
|
||||||
|
|
||||||
// Update UI state
|
|
||||||
this.nativeNotificationEnabled = true;
|
|
||||||
|
|
||||||
// Refresh native fetcher configuration with fresh token
|
|
||||||
// This ensures plugin has valid authentication when notifications are first enabled
|
|
||||||
// Token will be valid for 72 hours, supporting offline prefetch operations
|
|
||||||
await this.refreshNativeFetcherConfig();
|
|
||||||
|
|
||||||
this.notify.success(
|
|
||||||
"Daily notification scheduled successfully",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to enable notification:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Failed to schedule notification. Please try again.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Disable daily notification
|
|
||||||
*/
|
|
||||||
async disableNativeNotification(): Promise<void> {
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// Cancel notification via PlatformService
|
|
||||||
await platformService.cancelDailyNotification();
|
|
||||||
|
|
||||||
// Update UI state
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
this.nativeNotificationTime = "";
|
|
||||||
this.nativeNotificationTimeStorage = "";
|
|
||||||
this.showTimeEdit = false;
|
|
||||||
|
|
||||||
this.notify.success("Daily notification disabled", TIMEOUTS.SHORT);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to disable notification:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Failed to disable notification. Please try again.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show/hide time edit input
|
|
||||||
*/
|
|
||||||
editNativeNotificationTime(): void {
|
|
||||||
this.showTimeEdit = !this.showTimeEdit;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle time input change
|
|
||||||
*/
|
|
||||||
onTimeChange(): void {
|
|
||||||
// Time is already in nativeNotificationTimeStorage via v-model
|
|
||||||
// Just update display format
|
|
||||||
if (this.nativeNotificationTimeStorage) {
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(
|
|
||||||
this.nativeNotificationTimeStorage,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save time change and update notification schedule
|
|
||||||
*/
|
|
||||||
async saveTimeChange(): Promise<void> {
|
|
||||||
if (!this.nativeNotificationTimeStorage) {
|
|
||||||
this.notify.error("Please select a time", TIMEOUTS.SHORT);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update display format
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(
|
|
||||||
this.nativeNotificationTimeStorage,
|
|
||||||
);
|
|
||||||
|
|
||||||
// If notification is enabled, update the schedule
|
|
||||||
if (this.nativeNotificationEnabled) {
|
|
||||||
await this.updateNotificationTime(this.nativeNotificationTimeStorage);
|
|
||||||
} else {
|
|
||||||
// Just update local state (time preference stored in component)
|
|
||||||
this.showTimeEdit = false;
|
|
||||||
this.notify.success("Notification time saved", TIMEOUTS.SHORT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update notification time
|
|
||||||
* If notification is enabled, immediately updates the schedule
|
|
||||||
*/
|
|
||||||
async updateNotificationTime(newTime: string): Promise<void> {
|
|
||||||
// newTime is in "HH:mm" format from HTML5 time input
|
|
||||||
if (!this.nativeNotificationEnabled) {
|
|
||||||
// If notification is disabled, just update local state
|
|
||||||
this.nativeNotificationTimeStorage = newTime;
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(newTime);
|
|
||||||
this.showTimeEdit = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Notification is enabled - update the schedule
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// 1. Cancel existing notification
|
|
||||||
await platformService.cancelDailyNotification();
|
|
||||||
|
|
||||||
// 2. Schedule with new time
|
|
||||||
await platformService.scheduleDailyNotification({
|
|
||||||
time: newTime, // "09:00" in local time
|
|
||||||
title: this.nativeNotificationTitle,
|
|
||||||
body: this.nativeNotificationMessage,
|
|
||||||
sound: true,
|
|
||||||
priority: "high",
|
|
||||||
});
|
|
||||||
|
|
||||||
// 3. Update local state
|
|
||||||
this.nativeNotificationTimeStorage = newTime;
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(newTime);
|
|
||||||
|
|
||||||
this.notify.success(
|
|
||||||
"Notification time updated successfully",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
this.showTimeEdit = false;
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to update notification time:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Failed to update notification time. Please try again.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show info dialog about native notifications
|
|
||||||
*/
|
|
||||||
showNativeNotificationInfo(): void {
|
|
||||||
// TODO: Implement info dialog or navigate to help page
|
|
||||||
this.notify.info(
|
|
||||||
"Daily notifications use your device's native notification system. They work even when the app is closed.",
|
|
||||||
TIMEOUTS.STANDARD,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open app notification settings
|
|
||||||
*/
|
|
||||||
async openNotificationSettings(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
const result = await platformService.openAppNotificationSettings();
|
|
||||||
if (result === null) {
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to open settings. Please go to Settings > Apps > TimeSafari > Notifications manually.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.notify.success("Opening notification settings...", TIMEOUTS.SHORT);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to open notification settings:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to open settings. Please go to Settings > Apps > TimeSafari > Notifications manually.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.dot {
|
|
||||||
transition: left 0.2s ease;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -104,71 +104,6 @@ export const accessToken = async (did?: string) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate a longer-lived access token for background operations
|
|
||||||
*
|
|
||||||
* This function creates JWT tokens with extended validity (default 72 hours) for use
|
|
||||||
* in background prefetch operations. The longer expiration period allows the daily
|
|
||||||
* notification plugin to work offline for extended periods without requiring the app
|
|
||||||
* to be in the foreground to refresh tokens.
|
|
||||||
*
|
|
||||||
* **Token Refresh Strategy (Hybrid Approach):**
|
|
||||||
* - Tokens are valid for 72 hours (configurable)
|
|
||||||
* - Tokens are refreshed proactively when:
|
|
||||||
* - App comes to foreground (via Capacitor 'resume' event)
|
|
||||||
* - Component mounts (DailyNotificationSection)
|
|
||||||
* - Notifications are enabled
|
|
||||||
* - If token expires while offline, plugin uses cached content
|
|
||||||
* - Next time app opens, token is automatically refreshed
|
|
||||||
*
|
|
||||||
* **Why 72 Hours?**
|
|
||||||
* - Balances security (read-only prefetch operations) with offline capability
|
|
||||||
* - Reduces need for app to wake itself for token refresh
|
|
||||||
* - Allows plugin to work offline for extended periods (e.g., weekend trips)
|
|
||||||
* - Longer than typical prefetch windows (5 minutes before notification)
|
|
||||||
*
|
|
||||||
* **Security Considerations:**
|
|
||||||
* - Tokens are used only for read-only prefetch operations
|
|
||||||
* - Tokens are stored securely in plugin's Room database
|
|
||||||
* - Tokens are refreshed proactively to minimize exposure window
|
|
||||||
* - No private keys are exposed to native code
|
|
||||||
*
|
|
||||||
* @param {string} did - User DID (Decentralized Identifier) for token issuer
|
|
||||||
* @param {number} expirationMinutes - Optional expiration in minutes (defaults to 72 hours = 4320 minutes)
|
|
||||||
* @return {Promise<string>} JWT token with extended validity, or empty string if no DID provided
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* // Generate token with default 72-hour expiration
|
|
||||||
* const token = await accessTokenForBackground("did:ethr:0x...");
|
|
||||||
*
|
|
||||||
* // Generate token with custom expiration (24 hours)
|
|
||||||
* const token24h = await accessTokenForBackground("did:ethr:0x...", 24 * 60);
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @see {@link accessToken} For short-lived tokens (1 minute) for regular API requests
|
|
||||||
* @see {@link createEndorserJwtForDid} For JWT creation implementation
|
|
||||||
*/
|
|
||||||
export const accessTokenForBackground = async (
|
|
||||||
did?: string,
|
|
||||||
expirationMinutes?: number,
|
|
||||||
): Promise<string> => {
|
|
||||||
if (!did) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use provided expiration or default to 72 hours (4320 minutes)
|
|
||||||
// This allows background prefetch operations to work offline for extended periods
|
|
||||||
const expirationSeconds = expirationMinutes
|
|
||||||
? expirationMinutes * 60
|
|
||||||
: 72 * 60 * 60; // Default 72 hours
|
|
||||||
|
|
||||||
const nowEpoch = Math.floor(Date.now() / 1000);
|
|
||||||
const endEpoch = nowEpoch + expirationSeconds;
|
|
||||||
const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
|
|
||||||
return createEndorserJwtForDid(did, tokenPayload);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extract JWT from various URL formats
|
* Extract JWT from various URL formats
|
||||||
* @param jwtUrlText The URL containing the JWT
|
* @param jwtUrlText The URL containing the JWT
|
||||||
|
|||||||
@@ -1686,10 +1686,7 @@ export async function register(
|
|||||||
"Registration thrown error:",
|
"Registration thrown error:",
|
||||||
errorMessage || JSON.stringify(err),
|
errorMessage || JSON.stringify(err),
|
||||||
);
|
);
|
||||||
return {
|
return { error: errorMessage || "Got a server error when registering." };
|
||||||
error:
|
|
||||||
(errorMessage as string) || "Got a server error when registering.",
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
return { error: "Got a server error when registering." };
|
return { error: "Got a server error when registering." };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,68 +32,6 @@ export interface PlatformCapabilities {
|
|||||||
isNativeApp: boolean;
|
isNativeApp: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Permission status for notifications
|
|
||||||
*/
|
|
||||||
export interface PermissionStatus {
|
|
||||||
/** Notification permission status */
|
|
||||||
notifications: "granted" | "denied" | "prompt";
|
|
||||||
/** Exact alarms permission status (Android only) */
|
|
||||||
exactAlarms?: "granted" | "denied" | "prompt";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Result of permission request
|
|
||||||
*/
|
|
||||||
export interface PermissionResult {
|
|
||||||
/** Whether notification permission was granted */
|
|
||||||
notifications: boolean;
|
|
||||||
/** Whether exact alarms permission was granted (Android only) */
|
|
||||||
exactAlarms?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Status of scheduled daily notifications
|
|
||||||
*/
|
|
||||||
export interface NotificationStatus {
|
|
||||||
/** Whether a notification is currently scheduled */
|
|
||||||
isScheduled: boolean;
|
|
||||||
/** Scheduled time in "HH:mm" format (24-hour) */
|
|
||||||
scheduledTime?: string;
|
|
||||||
/** Last time the notification was triggered (ISO string) */
|
|
||||||
lastTriggered?: string;
|
|
||||||
/** Current permission status */
|
|
||||||
permissions: PermissionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Options for scheduling a daily notification
|
|
||||||
*/
|
|
||||||
export interface ScheduleOptions {
|
|
||||||
/** Time in "HH:mm" format (24-hour) in local time */
|
|
||||||
time: string;
|
|
||||||
/** Notification title */
|
|
||||||
title: string;
|
|
||||||
/** Notification body text */
|
|
||||||
body: string;
|
|
||||||
/** Whether to play sound (default: true) */
|
|
||||||
sound?: boolean;
|
|
||||||
/** Notification priority */
|
|
||||||
priority?: "high" | "normal" | "low";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configuration for native fetcher background operations
|
|
||||||
*/
|
|
||||||
export interface NativeFetcherConfig {
|
|
||||||
/** API server URL */
|
|
||||||
apiServer: string;
|
|
||||||
/** JWT token for authentication */
|
|
||||||
jwt: string;
|
|
||||||
/** Array of starred plan handle IDs */
|
|
||||||
starredPlanHandleIds: string[];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Platform-agnostic interface for handling platform-specific operations.
|
* Platform-agnostic interface for handling platform-specific operations.
|
||||||
* Provides a common API for file system operations, camera interactions,
|
* Provides a common API for file system operations, camera interactions,
|
||||||
@@ -271,58 +209,6 @@ export interface PlatformService {
|
|||||||
*/
|
*/
|
||||||
retrieveSettingsForActiveAccount(): Promise<Record<string, unknown> | null>;
|
retrieveSettingsForActiveAccount(): Promise<Record<string, unknown> | null>;
|
||||||
|
|
||||||
// Daily notification operations
|
|
||||||
/**
|
|
||||||
* Get the status of scheduled daily notifications
|
|
||||||
* @returns Promise resolving to notification status, or null if not supported
|
|
||||||
*/
|
|
||||||
getDailyNotificationStatus(): Promise<NotificationStatus | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check notification permissions
|
|
||||||
* @returns Promise resolving to permission status, or null if not supported
|
|
||||||
*/
|
|
||||||
checkNotificationPermissions(): Promise<PermissionStatus | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request notification permissions
|
|
||||||
* @returns Promise resolving to permission result, or null if not supported
|
|
||||||
*/
|
|
||||||
requestNotificationPermissions(): Promise<PermissionResult | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule a daily notification
|
|
||||||
* @param options - Notification scheduling options
|
|
||||||
* @returns Promise that resolves when scheduled, or rejects if not supported
|
|
||||||
*/
|
|
||||||
scheduleDailyNotification(options: ScheduleOptions): Promise<void>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancel scheduled daily notification
|
|
||||||
* @returns Promise that resolves when cancelled, or rejects if not supported
|
|
||||||
*/
|
|
||||||
cancelDailyNotification(): Promise<void>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure native fetcher for background operations
|
|
||||||
* @param config - Native fetcher configuration
|
|
||||||
* @returns Promise that resolves when configured, or null if not supported
|
|
||||||
*/
|
|
||||||
configureNativeFetcher(config: NativeFetcherConfig): Promise<void | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update starred plans for background fetcher
|
|
||||||
* @param plans - Starred plan IDs
|
|
||||||
* @returns Promise that resolves when updated, or null if not supported
|
|
||||||
*/
|
|
||||||
updateStarredPlans(plans: { planIds: string[] }): Promise<void | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the app's notification settings in the system settings
|
|
||||||
* @returns Promise that resolves when the settings page is opened, or null if not supported
|
|
||||||
*/
|
|
||||||
openAppNotificationSettings(): Promise<void | null>;
|
|
||||||
|
|
||||||
// --- PWA/Web-only methods (optional, only implemented on web) ---
|
// --- PWA/Web-only methods (optional, only implemented on web) ---
|
||||||
/**
|
/**
|
||||||
* Registers the service worker for PWA support (web only)
|
* Registers the service worker for PWA support (web only)
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import {
|
|||||||
CapacitorSQLite,
|
CapacitorSQLite,
|
||||||
DBSQLiteValues,
|
DBSQLiteValues,
|
||||||
} from "@capacitor-community/sqlite";
|
} from "@capacitor-community/sqlite";
|
||||||
import { DailyNotification } from "@timesafari/daily-notification-plugin";
|
|
||||||
|
|
||||||
import { runMigrations } from "@/db-sql/migration";
|
import { runMigrations } from "@/db-sql/migration";
|
||||||
import { QueryExecResult } from "@/interfaces/database";
|
import { QueryExecResult } from "@/interfaces/database";
|
||||||
@@ -21,11 +20,6 @@ import {
|
|||||||
ImageResult,
|
ImageResult,
|
||||||
PlatformService,
|
PlatformService,
|
||||||
PlatformCapabilities,
|
PlatformCapabilities,
|
||||||
NotificationStatus,
|
|
||||||
PermissionStatus,
|
|
||||||
PermissionResult,
|
|
||||||
ScheduleOptions,
|
|
||||||
NativeFetcherConfig,
|
|
||||||
} from "../PlatformService";
|
} from "../PlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import { BaseDatabaseService } from "./BaseDatabaseService";
|
import { BaseDatabaseService } from "./BaseDatabaseService";
|
||||||
@@ -97,92 +91,16 @@ export class CapacitorPlatformService
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Try to create/Open database connection
|
// Create/Open database
|
||||||
try {
|
this.db = await this.sqlite.createConnection(
|
||||||
this.db = await this.sqlite.createConnection(
|
this.dbName,
|
||||||
this.dbName,
|
false,
|
||||||
false,
|
"no-encryption",
|
||||||
"no-encryption",
|
1,
|
||||||
1,
|
false,
|
||||||
false,
|
);
|
||||||
);
|
|
||||||
} catch (createError: unknown) {
|
|
||||||
// If connection already exists, try to retrieve it or handle gracefully
|
|
||||||
const errorMessage =
|
|
||||||
createError instanceof Error
|
|
||||||
? createError.message
|
|
||||||
: String(createError);
|
|
||||||
const errorObj =
|
|
||||||
typeof createError === "object" && createError !== null
|
|
||||||
? (createError as { errorMessage?: string; message?: string })
|
|
||||||
: {};
|
|
||||||
|
|
||||||
const fullErrorMessage =
|
await this.db.open();
|
||||||
errorObj.errorMessage || errorObj.message || errorMessage;
|
|
||||||
|
|
||||||
if (fullErrorMessage.includes("already exists")) {
|
|
||||||
logger.debug(
|
|
||||||
"[CapacitorPlatformService] Connection already exists on native side, attempting to retrieve",
|
|
||||||
);
|
|
||||||
// Check if connection exists in JavaScript Map
|
|
||||||
const isConnResult = await this.sqlite.isConnection(
|
|
||||||
this.dbName,
|
|
||||||
false,
|
|
||||||
);
|
|
||||||
if (isConnResult.result) {
|
|
||||||
// Connection exists in Map, retrieve it
|
|
||||||
this.db = await this.sqlite.retrieveConnection(this.dbName, false);
|
|
||||||
logger.debug(
|
|
||||||
"[CapacitorPlatformService] Successfully retrieved existing connection from Map",
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
// Connection exists on native side but not in JavaScript Map
|
|
||||||
// This can happen when the app is restarted but native connections persist
|
|
||||||
// Try to close the native connection first, then create a new one
|
|
||||||
logger.debug(
|
|
||||||
"[CapacitorPlatformService] Connection exists natively but not in Map, closing and recreating",
|
|
||||||
);
|
|
||||||
try {
|
|
||||||
await this.sqlite.closeConnection(this.dbName, false);
|
|
||||||
} catch (closeError) {
|
|
||||||
// Ignore close errors - connection might not be properly tracked
|
|
||||||
logger.debug(
|
|
||||||
"[CapacitorPlatformService] Error closing connection (may be expected):",
|
|
||||||
closeError,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// Now try to create the connection again
|
|
||||||
this.db = await this.sqlite.createConnection(
|
|
||||||
this.dbName,
|
|
||||||
false,
|
|
||||||
"no-encryption",
|
|
||||||
1,
|
|
||||||
false,
|
|
||||||
);
|
|
||||||
logger.debug(
|
|
||||||
"[CapacitorPlatformService] Successfully created connection after cleanup",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Re-throw if it's a different error
|
|
||||||
throw createError;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open the connection if it's not already open
|
|
||||||
try {
|
|
||||||
await this.db.open();
|
|
||||||
} catch (openError: unknown) {
|
|
||||||
const openErrorMessage =
|
|
||||||
openError instanceof Error ? openError.message : String(openError);
|
|
||||||
// If already open, that's fine - continue
|
|
||||||
if (!openErrorMessage.includes("already open")) {
|
|
||||||
throw openError;
|
|
||||||
}
|
|
||||||
logger.debug(
|
|
||||||
"[CapacitorPlatformService] Database connection already open",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set journal mode to WAL for better performance
|
// Set journal mode to WAL for better performance
|
||||||
// await this.db.execute("PRAGMA journal_mode=WAL;");
|
// await this.db.execute("PRAGMA journal_mode=WAL;");
|
||||||
@@ -1415,426 +1333,6 @@ export class CapacitorPlatformService
|
|||||||
// --- PWA/Web-only methods (no-op for Capacitor) ---
|
// --- PWA/Web-only methods (no-op for Capacitor) ---
|
||||||
public registerServiceWorker(): void {}
|
public registerServiceWorker(): void {}
|
||||||
|
|
||||||
// Daily notification operations
|
|
||||||
/**
|
|
||||||
* Get the status of scheduled daily notifications
|
|
||||||
* @see PlatformService.getDailyNotificationStatus
|
|
||||||
*/
|
|
||||||
async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
|
|
||||||
try {
|
|
||||||
logger.debug(
|
|
||||||
"[CapacitorPlatformService] Getting daily notification status...",
|
|
||||||
);
|
|
||||||
|
|
||||||
const pluginStatus = await DailyNotification.getNotificationStatus();
|
|
||||||
|
|
||||||
// Get permissions separately
|
|
||||||
const permissions = await DailyNotification.checkPermissions();
|
|
||||||
|
|
||||||
// Map plugin PermissionState to our PermissionStatus format
|
|
||||||
const notificationsPermission = permissions.notifications;
|
|
||||||
let notifications: "granted" | "denied" | "prompt";
|
|
||||||
|
|
||||||
if (notificationsPermission === "granted") {
|
|
||||||
notifications = "granted";
|
|
||||||
} else if (notificationsPermission === "denied") {
|
|
||||||
notifications = "denied";
|
|
||||||
} else {
|
|
||||||
notifications = "prompt";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle lastNotificationTime which can be a Promise<number>
|
|
||||||
let lastTriggered: string | undefined;
|
|
||||||
const lastNotificationTime = pluginStatus.lastNotificationTime;
|
|
||||||
if (lastNotificationTime) {
|
|
||||||
const timeValue = await Promise.resolve(lastNotificationTime);
|
|
||||||
if (typeof timeValue === "number") {
|
|
||||||
lastTriggered = new Date(timeValue).toISOString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
isScheduled: pluginStatus.isScheduled ?? false,
|
|
||||||
scheduledTime: pluginStatus.settings?.time,
|
|
||||||
lastTriggered,
|
|
||||||
permissions: {
|
|
||||||
notifications,
|
|
||||||
exactAlarms: undefined, // Plugin doesn't expose this in status
|
|
||||||
},
|
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
const errorMessage =
|
|
||||||
error instanceof Error ? error.message : String(error);
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to get notification status:",
|
|
||||||
errorMessage,
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
logger.warn(
|
|
||||||
"[CapacitorPlatformService] Daily notification section will be hidden - plugin may not be installed or available",
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check notification permissions
|
|
||||||
* @see PlatformService.checkNotificationPermissions
|
|
||||||
*/
|
|
||||||
async checkNotificationPermissions(): Promise<PermissionStatus | null> {
|
|
||||||
try {
|
|
||||||
const permissions = await DailyNotification.checkPermissions();
|
|
||||||
|
|
||||||
// Log the raw permission state for debugging
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Raw permission state from plugin:`,
|
|
||||||
permissions,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Map plugin PermissionState to our PermissionStatus format
|
|
||||||
const notificationsPermission = permissions.notifications;
|
|
||||||
let notifications: "granted" | "denied" | "prompt";
|
|
||||||
|
|
||||||
// Handle all possible PermissionState values
|
|
||||||
if (notificationsPermission === "granted") {
|
|
||||||
notifications = "granted";
|
|
||||||
} else if (
|
|
||||||
notificationsPermission === "denied" ||
|
|
||||||
notificationsPermission === "ephemeral"
|
|
||||||
) {
|
|
||||||
notifications = "denied";
|
|
||||||
} else {
|
|
||||||
// Treat "prompt", "prompt-with-rationale", "unknown", "provisional" as "prompt"
|
|
||||||
// This allows Android to show the permission dialog
|
|
||||||
notifications = "prompt";
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Mapped permission state: ${notifications} (from ${notificationsPermission})`,
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
notifications,
|
|
||||||
exactAlarms: undefined, // Plugin doesn't expose this directly
|
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to check permissions:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request notification permissions
|
|
||||||
* @see PlatformService.requestNotificationPermissions
|
|
||||||
*/
|
|
||||||
async requestNotificationPermissions(): Promise<PermissionResult | null> {
|
|
||||||
try {
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Requesting notification permissions...`,
|
|
||||||
);
|
|
||||||
|
|
||||||
const result = await DailyNotification.requestPermissions();
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Permission request result:`,
|
|
||||||
result,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Map plugin PermissionState to boolean
|
|
||||||
const notificationsGranted = result.notifications === "granted";
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Mapped permission result: ${notificationsGranted} (from ${result.notifications})`,
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
notifications: notificationsGranted,
|
|
||||||
exactAlarms: undefined, // Plugin doesn't expose this directly
|
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to request permissions:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule a daily notification
|
|
||||||
* @see PlatformService.scheduleDailyNotification
|
|
||||||
*/
|
|
||||||
async scheduleDailyNotification(options: ScheduleOptions): Promise<void> {
|
|
||||||
try {
|
|
||||||
await DailyNotification.scheduleDailyNotification({
|
|
||||||
time: options.time,
|
|
||||||
title: options.title,
|
|
||||||
body: options.body,
|
|
||||||
sound: options.sound ?? true,
|
|
||||||
priority: options.priority ?? "high",
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Scheduled daily notification for ${options.time}`,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to schedule notification:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancel scheduled daily notification
|
|
||||||
* @see PlatformService.cancelDailyNotification
|
|
||||||
*/
|
|
||||||
async cancelDailyNotification(): Promise<void> {
|
|
||||||
try {
|
|
||||||
await DailyNotification.cancelAllNotifications();
|
|
||||||
|
|
||||||
logger.info("[CapacitorPlatformService] Cancelled daily notification");
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to cancel notification:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure native fetcher for background operations
|
|
||||||
*
|
|
||||||
* This method configures the daily notification plugin's native content fetcher
|
|
||||||
* with authentication credentials for background prefetch operations. It automatically
|
|
||||||
* retrieves the active DID from the database and generates a fresh JWT token with
|
|
||||||
* 72-hour expiration.
|
|
||||||
*
|
|
||||||
* **Authentication Flow:**
|
|
||||||
* 1. Retrieves active DID from `active_identity` table (single source of truth)
|
|
||||||
* 2. Generates JWT token with 72-hour expiration using `accessTokenForBackground()`
|
|
||||||
* 3. Configures plugin with API server URL, active DID, and JWT token
|
|
||||||
* 4. Plugin stores token in its Room database for background workers
|
|
||||||
*
|
|
||||||
* **Token Management:**
|
|
||||||
* - Tokens are valid for 72 hours (4320 minutes)
|
|
||||||
* - Tokens are refreshed proactively when app comes to foreground
|
|
||||||
* - If token expires while offline, plugin uses cached content
|
|
||||||
* - Token refresh happens automatically via `DailyNotificationSection.refreshNativeFetcherConfig()`
|
|
||||||
*
|
|
||||||
* **Offline-First Design:**
|
|
||||||
* - 72-hour validity supports extended offline periods
|
|
||||||
* - Plugin can prefetch content when online and use cached content when offline
|
|
||||||
* - No app wake-up required for token refresh (happens when app is already open)
|
|
||||||
*
|
|
||||||
* **Error Handling:**
|
|
||||||
* - Returns `null` if active DID not found (no user logged in)
|
|
||||||
* - Returns `null` if JWT generation fails
|
|
||||||
* - Logs errors but doesn't throw (allows graceful degradation)
|
|
||||||
*
|
|
||||||
* @param config - Native fetcher configuration
|
|
||||||
* @param config.apiServer - API server URL (optional, uses default if not provided)
|
|
||||||
* @param config.jwt - JWT token (ignored, generated automatically)
|
|
||||||
* @param config.starredPlanHandleIds - Array of starred plan handle IDs for prefetch
|
|
||||||
* @returns Promise that resolves when configured, or `null` if configuration failed
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* await platformService.configureNativeFetcher({
|
|
||||||
* apiServer: "https://api.endorser.ch",
|
|
||||||
* jwt: "", // Generated automatically
|
|
||||||
* starredPlanHandleIds: ["plan-123", "plan-456"]
|
|
||||||
* });
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @see {@link accessTokenForBackground} For JWT token generation
|
|
||||||
* @see {@link DailyNotificationSection.refreshNativeFetcherConfig} For proactive token refresh
|
|
||||||
* @see PlatformService.configureNativeFetcher
|
|
||||||
*/
|
|
||||||
async configureNativeFetcher(
|
|
||||||
config: NativeFetcherConfig,
|
|
||||||
): Promise<void | null> {
|
|
||||||
try {
|
|
||||||
// Step 1: Get activeDid from database (single source of truth)
|
|
||||||
// This ensures we're using the correct user identity for authentication
|
|
||||||
const activeIdentity = await this.getActiveIdentity();
|
|
||||||
const activeDid = activeIdentity.activeDid;
|
|
||||||
|
|
||||||
if (!activeDid) {
|
|
||||||
logger.warn(
|
|
||||||
"[CapacitorPlatformService] No activeDid found, cannot configure native fetcher",
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 2: Generate JWT token for background operations
|
|
||||||
// Use 72-hour expiration for offline-first prefetch operations
|
|
||||||
// This allows the plugin to work offline for extended periods
|
|
||||||
const { accessTokenForBackground } = await import(
|
|
||||||
"../../libs/crypto/index"
|
|
||||||
);
|
|
||||||
// Use 72 hours (4320 minutes) for background prefetch tokens
|
|
||||||
// This is longer than passkey expiration to support offline scenarios
|
|
||||||
const expirationMinutes = 72 * 60; // 72 hours
|
|
||||||
const jwtToken = await accessTokenForBackground(
|
|
||||||
activeDid,
|
|
||||||
expirationMinutes,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!jwtToken) {
|
|
||||||
logger.error("[CapacitorPlatformService] Failed to generate JWT token");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 3: Get API server from config or use default
|
|
||||||
// This ensures the plugin knows where to fetch content from
|
|
||||||
const apiServer =
|
|
||||||
config.apiServer ||
|
|
||||||
(await import("../../constants/app")).DEFAULT_ENDORSER_API_SERVER;
|
|
||||||
|
|
||||||
// Step 4: Configure plugin with credentials
|
|
||||||
// Plugin stores these in its Room database for background workers
|
|
||||||
await DailyNotification.configureNativeFetcher({
|
|
||||||
apiBaseUrl: apiServer,
|
|
||||||
activeDid,
|
|
||||||
jwtToken,
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info("[CapacitorPlatformService] Configured native fetcher", {
|
|
||||||
activeDid,
|
|
||||||
apiServer,
|
|
||||||
tokenExpirationHours: 72,
|
|
||||||
tokenExpirationMinutes: expirationMinutes,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to configure native fetcher:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update starred plans for background fetcher
|
|
||||||
* @see PlatformService.updateStarredPlans
|
|
||||||
*/
|
|
||||||
async updateStarredPlans(plans: { planIds: string[] }): Promise<void | null> {
|
|
||||||
try {
|
|
||||||
await DailyNotification.updateStarredPlans({
|
|
||||||
planIds: plans.planIds,
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Updated starred plans: ${plans.planIds.length} plans`,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to update starred plans:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the app's notification settings in the system settings
|
|
||||||
* @see PlatformService.openAppNotificationSettings
|
|
||||||
*/
|
|
||||||
async openAppNotificationSettings(): Promise<void | null> {
|
|
||||||
try {
|
|
||||||
const platform = Capacitor.getPlatform();
|
|
||||||
|
|
||||||
if (platform === "android") {
|
|
||||||
// Android: Open app details settings page
|
|
||||||
// From there, users can navigate to "Notifications" section
|
|
||||||
// This is more reliable than trying to open notification settings directly
|
|
||||||
const packageName = "app.timesafari.app"; // Full application ID from build.gradle
|
|
||||||
|
|
||||||
// Use APPLICATION_DETAILS_SETTINGS which opens the app's settings page
|
|
||||||
// Users can then navigate to "Notifications" section
|
|
||||||
// Try multiple URL formats to ensure compatibility
|
|
||||||
const intentUrl1 = `intent:#Intent;action=android.settings.APPLICATION_DETAILS_SETTINGS;data=package:${packageName};end`;
|
|
||||||
const intentUrl2 = `intent://settings/app_detail?package=${packageName}#Intent;scheme=android-app;end`;
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Opening Android app settings for ${packageName}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Log current permission state before opening settings
|
|
||||||
try {
|
|
||||||
const currentPerms = await this.checkNotificationPermissions();
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Current permission state before opening settings:`,
|
|
||||||
currentPerms,
|
|
||||||
);
|
|
||||||
} catch (e) {
|
|
||||||
logger.warn(
|
|
||||||
`[CapacitorPlatformService] Could not check permissions before opening settings:`,
|
|
||||||
e,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try multiple approaches to ensure it works
|
|
||||||
try {
|
|
||||||
// Method 1: Direct window.location.href (most reliable)
|
|
||||||
window.location.href = intentUrl1;
|
|
||||||
|
|
||||||
// Method 2: Fallback with window.open
|
|
||||||
setTimeout(() => {
|
|
||||||
try {
|
|
||||||
window.open(intentUrl1, "_blank");
|
|
||||||
} catch (e) {
|
|
||||||
logger.warn(
|
|
||||||
"[CapacitorPlatformService] window.open fallback failed:",
|
|
||||||
e,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}, 100);
|
|
||||||
|
|
||||||
// Method 3: Alternative format
|
|
||||||
setTimeout(() => {
|
|
||||||
try {
|
|
||||||
window.location.href = intentUrl2;
|
|
||||||
} catch (e) {
|
|
||||||
logger.warn(
|
|
||||||
"[CapacitorPlatformService] Alternative format failed:",
|
|
||||||
e,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}, 200);
|
|
||||||
} catch (e) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to open intent URL:",
|
|
||||||
e,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else if (platform === "ios") {
|
|
||||||
// iOS: Use app settings URL scheme
|
|
||||||
const settingsUrl = `app-settings:`;
|
|
||||||
window.location.href = settingsUrl;
|
|
||||||
|
|
||||||
logger.info("[CapacitorPlatformService] Opening iOS app settings");
|
|
||||||
} else {
|
|
||||||
logger.warn(
|
|
||||||
`[CapacitorPlatformService] Cannot open settings on platform: ${platform}`,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to open app notification settings:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Database utility methods - inherited from BaseDatabaseService
|
// Database utility methods - inherited from BaseDatabaseService
|
||||||
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
||||||
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
||||||
|
|||||||
@@ -22,13 +22,6 @@
|
|||||||
|
|
||||||
import { CapacitorPlatformService } from "./CapacitorPlatformService";
|
import { CapacitorPlatformService } from "./CapacitorPlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import {
|
|
||||||
NotificationStatus,
|
|
||||||
PermissionStatus,
|
|
||||||
PermissionResult,
|
|
||||||
ScheduleOptions,
|
|
||||||
NativeFetcherConfig,
|
|
||||||
} from "../PlatformService";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Electron-specific platform service implementation.
|
* Electron-specific platform service implementation.
|
||||||
@@ -173,88 +166,4 @@ export class ElectronPlatformService extends CapacitorPlatformService {
|
|||||||
|
|
||||||
// --- PWA/Web-only methods (no-op for Electron) ---
|
// --- PWA/Web-only methods (no-op for Electron) ---
|
||||||
public registerServiceWorker(): void {}
|
public registerServiceWorker(): void {}
|
||||||
|
|
||||||
// Daily notification operations
|
|
||||||
// Override CapacitorPlatformService methods to return null/throw errors
|
|
||||||
// since Electron doesn't support native daily notifications
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the status of scheduled daily notifications
|
|
||||||
* @see PlatformService.getDailyNotificationStatus
|
|
||||||
* @returns null - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check notification permissions
|
|
||||||
* @see PlatformService.checkNotificationPermissions
|
|
||||||
* @returns null - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async checkNotificationPermissions(): Promise<PermissionStatus | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request notification permissions
|
|
||||||
* @see PlatformService.requestNotificationPermissions
|
|
||||||
* @returns null - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async requestNotificationPermissions(): Promise<PermissionResult | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule a daily notification
|
|
||||||
* @see PlatformService.scheduleDailyNotification
|
|
||||||
* @throws Error - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async scheduleDailyNotification(_options: ScheduleOptions): Promise<void> {
|
|
||||||
throw new Error(
|
|
||||||
"Daily notifications are not supported on Electron platform",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancel scheduled daily notification
|
|
||||||
* @see PlatformService.cancelDailyNotification
|
|
||||||
* @throws Error - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async cancelDailyNotification(): Promise<void> {
|
|
||||||
throw new Error(
|
|
||||||
"Daily notifications are not supported on Electron platform",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure native fetcher for background operations
|
|
||||||
* @see PlatformService.configureNativeFetcher
|
|
||||||
* @returns null - native fetcher not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async configureNativeFetcher(
|
|
||||||
_config: NativeFetcherConfig,
|
|
||||||
): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update starred plans for background fetcher
|
|
||||||
* @see PlatformService.updateStarredPlans
|
|
||||||
* @returns null - native fetcher not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async updateStarredPlans(_plans: {
|
|
||||||
planIds: string[];
|
|
||||||
}): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the app's notification settings in the system settings
|
|
||||||
* @see PlatformService.openAppNotificationSettings
|
|
||||||
* @returns null - not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async openAppNotificationSettings(): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,6 @@ import {
|
|||||||
ImageResult,
|
ImageResult,
|
||||||
PlatformService,
|
PlatformService,
|
||||||
PlatformCapabilities,
|
PlatformCapabilities,
|
||||||
NotificationStatus,
|
|
||||||
PermissionStatus,
|
|
||||||
PermissionResult,
|
|
||||||
ScheduleOptions,
|
|
||||||
NativeFetcherConfig,
|
|
||||||
} from "../PlatformService";
|
} from "../PlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import { QueryExecResult } from "@/interfaces/database";
|
import { QueryExecResult } from "@/interfaces/database";
|
||||||
@@ -682,81 +677,4 @@ export class WebPlatformService
|
|||||||
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
||||||
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
||||||
// retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
|
// retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
|
||||||
|
|
||||||
// Daily notification operations
|
|
||||||
/**
|
|
||||||
* Get the status of scheduled daily notifications
|
|
||||||
* @see PlatformService.getDailyNotificationStatus
|
|
||||||
* @returns null - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check notification permissions
|
|
||||||
* @see PlatformService.checkNotificationPermissions
|
|
||||||
* @returns null - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async checkNotificationPermissions(): Promise<PermissionStatus | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request notification permissions
|
|
||||||
* @see PlatformService.requestNotificationPermissions
|
|
||||||
* @returns null - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async requestNotificationPermissions(): Promise<PermissionResult | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule a daily notification
|
|
||||||
* @see PlatformService.scheduleDailyNotification
|
|
||||||
* @throws Error - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async scheduleDailyNotification(_options: ScheduleOptions): Promise<void> {
|
|
||||||
throw new Error("Daily notifications are not supported on web platform");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancel scheduled daily notification
|
|
||||||
* @see PlatformService.cancelDailyNotification
|
|
||||||
* @throws Error - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async cancelDailyNotification(): Promise<void> {
|
|
||||||
throw new Error("Daily notifications are not supported on web platform");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure native fetcher for background operations
|
|
||||||
* @see PlatformService.configureNativeFetcher
|
|
||||||
* @returns null - native fetcher not supported on web platform
|
|
||||||
*/
|
|
||||||
async configureNativeFetcher(
|
|
||||||
_config: NativeFetcherConfig,
|
|
||||||
): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update starred plans for background fetcher
|
|
||||||
* @see PlatformService.updateStarredPlans
|
|
||||||
* @returns null - native fetcher not supported on web platform
|
|
||||||
*/
|
|
||||||
async updateStarredPlans(_plans: {
|
|
||||||
planIds: string[];
|
|
||||||
}): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the app's notification settings in the system settings
|
|
||||||
* @see PlatformService.openAppNotificationSettings
|
|
||||||
* @returns null - not supported on web platform
|
|
||||||
*/
|
|
||||||
async openAppNotificationSettings(): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,9 +161,6 @@
|
|||||||
</section>
|
</section>
|
||||||
<PushNotificationPermission ref="pushNotificationPermission" />
|
<PushNotificationPermission ref="pushNotificationPermission" />
|
||||||
|
|
||||||
<!-- Daily Notifications (Native) -->
|
|
||||||
<DailyNotificationSection />
|
|
||||||
|
|
||||||
<!-- User Profile -->
|
<!-- User Profile -->
|
||||||
<section
|
<section
|
||||||
v-if="isRegistered"
|
v-if="isRegistered"
|
||||||
@@ -793,7 +790,6 @@ import IdentitySection from "@/components/IdentitySection.vue";
|
|||||||
import RegistrationNotice from "@/components/RegistrationNotice.vue";
|
import RegistrationNotice from "@/components/RegistrationNotice.vue";
|
||||||
import LocationSearchSection from "@/components/LocationSearchSection.vue";
|
import LocationSearchSection from "@/components/LocationSearchSection.vue";
|
||||||
import UsageLimitsSection from "@/components/UsageLimitsSection.vue";
|
import UsageLimitsSection from "@/components/UsageLimitsSection.vue";
|
||||||
import DailyNotificationSection from "@/components/notifications/DailyNotificationSection.vue";
|
|
||||||
import {
|
import {
|
||||||
AppString,
|
AppString,
|
||||||
DEFAULT_IMAGE_API_SERVER,
|
DEFAULT_IMAGE_API_SERVER,
|
||||||
@@ -862,7 +858,6 @@ interface UserNameDialogRef {
|
|||||||
RegistrationNotice,
|
RegistrationNotice,
|
||||||
LocationSearchSection,
|
LocationSearchSection,
|
||||||
UsageLimitsSection,
|
UsageLimitsSection,
|
||||||
DailyNotificationSection,
|
|
||||||
},
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -60,12 +60,60 @@
|
|||||||
</div>
|
</div>
|
||||||
<ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
|
<ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
|
||||||
|
|
||||||
<input
|
<!-- Authorized Representative Selection -->
|
||||||
v-model="agentDid"
|
<div class="w-full flex items-stretch my-4">
|
||||||
type="text"
|
<div
|
||||||
placeholder="Other Authorized Representative"
|
class="flex items-center gap-2 grow border border-slate-400 border-r-0 last:border-r px-3 py-2 rounded-l last:rounded overflow-hidden cursor-pointer hover:bg-slate-100"
|
||||||
class="mt-4 block w-full rounded border border-slate-400 px-3 py-2"
|
@click="openRepresentativeDialog"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<EntityIcon
|
||||||
|
v-if="selectedRepresentative"
|
||||||
|
:contact="selectedRepresentative"
|
||||||
|
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
||||||
|
/>
|
||||||
|
<font-awesome v-else icon="user" class="text-slate-400" />
|
||||||
|
</div>
|
||||||
|
<div class="overflow-hidden">
|
||||||
|
<div
|
||||||
|
:class="{
|
||||||
|
'text-sm font-semibold': selectedRepresentative,
|
||||||
|
'text-slate-400': !selectedRepresentative,
|
||||||
|
}"
|
||||||
|
class="truncate"
|
||||||
|
>
|
||||||
|
{{
|
||||||
|
selectedRepresentative
|
||||||
|
? selectedRepresentative.name || AppString.NO_CONTACT_NAME
|
||||||
|
: "Assign Authorized Representative…"
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="selectedRepresentative"
|
||||||
|
class="text-xs text-slate-500 truncate"
|
||||||
|
>
|
||||||
|
{{ agentDid }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
v-if="selectedRepresentative"
|
||||||
|
class="text-rose-600 px-3 py-2 border border-slate-400 border-l-0 rounded-r hover:bg-rose-600 hover:text-white hover:border-rose-600"
|
||||||
|
@click="unsetRepresentative"
|
||||||
|
>
|
||||||
|
<font-awesome icon="trash-can" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ProjectRepresentativeDialog
|
||||||
|
ref="representativeDialog"
|
||||||
|
:all-contacts="allContacts"
|
||||||
|
:active-did="activeDid"
|
||||||
|
:all-my-dids="allMyDids"
|
||||||
|
:notify="$notify"
|
||||||
|
@assign="handleRepresentativeAssigned"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<p v-if="shouldShowOwnershipWarning">
|
<p v-if="shouldShowOwnershipWarning">
|
||||||
<span class="text-red-500">Beware!</span>
|
<span class="text-red-500">Beware!</span>
|
||||||
@@ -232,9 +280,12 @@ import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
|
|||||||
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
||||||
import { LeafletMouseEvent } from "leaflet";
|
import { LeafletMouseEvent } from "leaflet";
|
||||||
|
|
||||||
|
import EntityIcon from "../components/EntityIcon.vue";
|
||||||
import ImageMethodDialog from "../components/ImageMethodDialog.vue";
|
import ImageMethodDialog from "../components/ImageMethodDialog.vue";
|
||||||
|
import ProjectRepresentativeDialog from "../components/ProjectRepresentativeDialog.vue";
|
||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
import {
|
import {
|
||||||
|
AppString,
|
||||||
DEFAULT_IMAGE_API_SERVER,
|
DEFAULT_IMAGE_API_SERVER,
|
||||||
DEFAULT_PARTNER_API_SERVER,
|
DEFAULT_PARTNER_API_SERVER,
|
||||||
NotificationIface,
|
NotificationIface,
|
||||||
@@ -268,6 +319,7 @@ import {
|
|||||||
retrieveAccountCount,
|
retrieveAccountCount,
|
||||||
retrieveFullyDecryptedAccount,
|
retrieveFullyDecryptedAccount,
|
||||||
} from "../libs/util";
|
} from "../libs/util";
|
||||||
|
import { Contact } from "../db/tables/contacts";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
EventTemplate,
|
EventTemplate,
|
||||||
@@ -323,7 +375,15 @@ import { logger } from "../utils/logger";
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
|
components: {
|
||||||
|
EntityIcon,
|
||||||
|
ImageMethodDialog,
|
||||||
|
ProjectRepresentativeDialog,
|
||||||
|
LMap,
|
||||||
|
LMarker,
|
||||||
|
LTileLayer,
|
||||||
|
QuickNav,
|
||||||
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class NewEditProjectView extends Vue {
|
export default class NewEditProjectView extends Vue {
|
||||||
@@ -334,6 +394,9 @@ export default class NewEditProjectView extends Vue {
|
|||||||
// Notification helpers
|
// Notification helpers
|
||||||
private notify!: ReturnType<typeof createNotifyHelpers>;
|
private notify!: ReturnType<typeof createNotifyHelpers>;
|
||||||
|
|
||||||
|
// Constants
|
||||||
|
AppString = AppString;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display error notification to user
|
* Display error notification to user
|
||||||
* Provides consistent error messaging with 5-second timeout
|
* Provides consistent error messaging with 5-second timeout
|
||||||
@@ -346,6 +409,8 @@ export default class NewEditProjectView extends Vue {
|
|||||||
// Component state properties
|
// Component state properties
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
agentDid = "";
|
agentDid = "";
|
||||||
|
allContacts: Array<Contact> = [];
|
||||||
|
allMyDids: string[] = [];
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
endDateInput?: string;
|
endDateInput?: string;
|
||||||
endTimeInput?: string;
|
endTimeInput?: string;
|
||||||
@@ -392,16 +457,24 @@ export default class NewEditProjectView extends Vue {
|
|||||||
const activeIdentity = await (this as any).$getActiveIdentity();
|
const activeIdentity = await (this as any).$getActiveIdentity();
|
||||||
this.activeDid = activeIdentity.activeDid || "";
|
this.activeDid = activeIdentity.activeDid || "";
|
||||||
|
|
||||||
|
// Get all user's DIDs
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
this.allMyDids = await (this as any).$getAllAccountDids();
|
||||||
|
|
||||||
|
// Load contacts sorted by date added (newest first) for consistent "Recently Added" display
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
this.allContacts = await (this as any).$contactsByDateAdded();
|
||||||
|
|
||||||
this.apiServer = settings.apiServer || "";
|
this.apiServer = settings.apiServer || "";
|
||||||
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
||||||
|
|
||||||
this.projectId = (this.$route.query["projectId"] as string) || "";
|
this.projectId = (this.$route.query["projectId"] as string) || "";
|
||||||
|
|
||||||
if (this.projectId) {
|
if (this.isSavedProject()) {
|
||||||
if (this.numAccounts === 0) {
|
if (this.numAccounts === 0) {
|
||||||
this.notify.error(NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR.message);
|
this.notify.error(NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR.message);
|
||||||
} else {
|
} else {
|
||||||
this.loadProject(this.activeDid);
|
this.loadProject(this.activeDid, this.projectId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -411,11 +484,9 @@ export default class NewEditProjectView extends Vue {
|
|||||||
* Retrieves project information from the API and populates form fields
|
* Retrieves project information from the API and populates form fields
|
||||||
* @param userDid - User's decentralized identifier
|
* @param userDid - User's decentralized identifier
|
||||||
*/
|
*/
|
||||||
async loadProject(userDid: string) {
|
async loadProject(userDid: string, projectId: string) {
|
||||||
const url =
|
const url =
|
||||||
this.apiServer +
|
this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
|
||||||
"/api/claim/byHandle/" +
|
|
||||||
encodeURIComponent(this.projectId);
|
|
||||||
const headers = await getHeaders(userDid);
|
const headers = await getHeaders(userDid);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -432,6 +503,12 @@ export default class NewEditProjectView extends Vue {
|
|||||||
}
|
}
|
||||||
if (this.fullClaim?.agent?.identifier) {
|
if (this.fullClaim?.agent?.identifier) {
|
||||||
this.agentDid = this.fullClaim.agent.identifier;
|
this.agentDid = this.fullClaim.agent.identifier;
|
||||||
|
if (this.activeDid !== this.projectIssuerDid) {
|
||||||
|
this.agentDid = this.projectIssuerDid;
|
||||||
|
this.notify.warning(
|
||||||
|
"You were previously the agent, so the agent has been set to the previous owner. You can change it.",
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (this.fullClaim.startTime) {
|
if (this.fullClaim.startTime) {
|
||||||
const localDateTime = DateTime.fromISO(
|
const localDateTime = DateTime.fromISO(
|
||||||
@@ -536,7 +613,7 @@ export default class NewEditProjectView extends Vue {
|
|||||||
private async saveProject() {
|
private async saveProject() {
|
||||||
// Make a claim
|
// Make a claim
|
||||||
const vcClaim: PlanActionClaim = this.fullClaim;
|
const vcClaim: PlanActionClaim = this.fullClaim;
|
||||||
if (this.projectId) {
|
if (this.isSavedProject()) {
|
||||||
vcClaim.lastClaimId = this.lastClaimJwtId;
|
vcClaim.lastClaimId = this.lastClaimJwtId;
|
||||||
}
|
}
|
||||||
if (this.agentDid) {
|
if (this.agentDid) {
|
||||||
@@ -870,6 +947,10 @@ export default class NewEditProjectView extends Vue {
|
|||||||
this.longitude = event.latlng.lng;
|
this.longitude = event.latlng.lng;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private isSavedProject(): boolean {
|
||||||
|
return !!this.projectId;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed property for character count display
|
* Computed property for character count display
|
||||||
* Shows current description length and maximum character limit
|
* Shows current description length and maximum character limit
|
||||||
@@ -885,6 +966,7 @@ export default class NewEditProjectView extends Vue {
|
|||||||
*/
|
*/
|
||||||
get shouldShowOwnershipWarning(): boolean {
|
get shouldShowOwnershipWarning(): boolean {
|
||||||
return (
|
return (
|
||||||
|
this.isSavedProject() &&
|
||||||
this.activeDid !== this.projectIssuerDid &&
|
this.activeDid !== this.projectIssuerDid &&
|
||||||
this.agentDid !== this.projectIssuerDid
|
this.agentDid !== this.projectIssuerDid
|
||||||
);
|
);
|
||||||
@@ -961,5 +1043,37 @@ export default class NewEditProjectView extends Vue {
|
|||||||
get shouldShowSpinner(): boolean {
|
get shouldShowSpinner(): boolean {
|
||||||
return !this.isHiddenSpinner;
|
return !this.isHiddenSpinner;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed property for selected representative contact
|
||||||
|
* Derives the contact from agentDid by finding it in allContacts
|
||||||
|
*/
|
||||||
|
get selectedRepresentative(): Contact | null {
|
||||||
|
if (!this.agentDid) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return this.allContacts.find((c) => c.did === this.agentDid) || null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the representative selection dialog
|
||||||
|
*/
|
||||||
|
openRepresentativeDialog(): void {
|
||||||
|
(this.$refs.representativeDialog as ProjectRepresentativeDialog).open();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle representative assignment from dialog
|
||||||
|
*/
|
||||||
|
handleRepresentativeAssigned(contact: Contact): void {
|
||||||
|
this.agentDid = contact.did;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unset the representative and revert to initial state
|
||||||
|
*/
|
||||||
|
unsetRepresentative(): void {
|
||||||
|
this.agentDid = "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,21 +1,4 @@
|
|||||||
import { defineConfig } from "vite";
|
import { defineConfig } from "vite";
|
||||||
import { createBuildConfig } from "./vite.config.common.mts";
|
import { createBuildConfig } from "./vite.config.common.mts";
|
||||||
|
|
||||||
export default defineConfig(async () => {
|
export default defineConfig(async () => createBuildConfig('capacitor'));
|
||||||
const baseConfig = await createBuildConfig('capacitor');
|
|
||||||
|
|
||||||
return {
|
|
||||||
...baseConfig,
|
|
||||||
build: {
|
|
||||||
...baseConfig.build,
|
|
||||||
rollupOptions: {
|
|
||||||
...baseConfig.build?.rollupOptions,
|
|
||||||
// Note: @timesafari/daily-notification-plugin is NOT externalized
|
|
||||||
// because it needs to be bundled for dynamic imports to work in Capacitor WebView
|
|
||||||
output: {
|
|
||||||
...baseConfig.build?.rollupOptions?.output,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
});
|
|
||||||
Reference in New Issue
Block a user