Compare commits
8 Commits
project-re
...
notificati
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a9d9df32e1 | ||
|
|
e655082af6 | ||
|
|
ea2fa30903 | ||
|
|
39dbbb08f7 | ||
|
|
eb21d3c247 | ||
|
|
213f5f0555 | ||
|
|
2db2c39830 | ||
|
|
106cefab51 |
@@ -2,8 +2,9 @@
|
|||||||
globs: **/src/**/*
|
globs: **/src/**/*
|
||||||
alwaysApply: false
|
alwaysApply: false
|
||||||
---
|
---
|
||||||
✅ use system date command to timestamp all documentation with accurate date and
|
✅ use system date command to timestamp all interactions with accurate date and
|
||||||
time
|
time
|
||||||
|
✅ python script files must always have a blank line at their end
|
||||||
✅ remove whitespace at the end of lines
|
✅ remove whitespace at the end of lines
|
||||||
✅ use npm run lint-fix to check for warnings
|
✅ use npm run lint-fix to check for warnings
|
||||||
✅ do not use npm run dev let me handle running and supplying feedback
|
✅ do not use npm run dev let me handle running and supplying feedback
|
||||||
@@ -21,10 +22,12 @@ alwaysApply: false
|
|||||||
|
|
||||||
- [ ] **Timestamp Usage**: Include accurate timestamps in all interactions
|
- [ ] **Timestamp Usage**: Include accurate timestamps in all interactions
|
||||||
- [ ] **Code Quality**: Use npm run lint-fix to check for warnings
|
- [ ] **Code Quality**: Use npm run lint-fix to check for warnings
|
||||||
|
- [ ] **File Standards**: Ensure Python files have blank line at end
|
||||||
- [ ] **Whitespace**: Remove trailing whitespace from all lines
|
- [ ] **Whitespace**: Remove trailing whitespace from all lines
|
||||||
|
|
||||||
### After Development
|
### After Development
|
||||||
|
|
||||||
- [ ] **Linting Check**: Run npm run lint-fix to verify code quality
|
- [ ] **Linting Check**: Run npm run lint-fix to verify code quality
|
||||||
|
- [ ] **File Validation**: Confirm Python files end with blank line
|
||||||
- [ ] **Whitespace Review**: Verify no trailing whitespace remains
|
- [ ] **Whitespace Review**: Verify no trailing whitespace remains
|
||||||
- [ ] **Documentation**: Update relevant documentation with changes
|
- [ ] **Documentation**: Update relevant documentation with changes
|
||||||
|
|||||||
@@ -9,10 +9,6 @@ echo "🔍 Running pre-commit hooks..."
|
|||||||
|
|
||||||
# Run lint-fix first
|
# Run lint-fix first
|
||||||
echo "📝 Running lint-fix..."
|
echo "📝 Running lint-fix..."
|
||||||
|
|
||||||
# Capture git status before lint-fix to detect changes
|
|
||||||
git_status_before=$(git status --porcelain)
|
|
||||||
|
|
||||||
npm run lint-fix || {
|
npm run lint-fix || {
|
||||||
echo
|
echo
|
||||||
echo "❌ Linting failed. Please fix the issues and try again."
|
echo "❌ Linting failed. Please fix the issues and try again."
|
||||||
@@ -22,36 +18,6 @@ npm run lint-fix || {
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Check if lint-fix made any changes
|
|
||||||
git_status_after=$(git status --porcelain)
|
|
||||||
|
|
||||||
if [ "$git_status_before" != "$git_status_after" ]; then
|
|
||||||
echo
|
|
||||||
echo "⚠️ lint-fix made changes to your files!"
|
|
||||||
echo "📋 Changes detected:"
|
|
||||||
git diff --name-only
|
|
||||||
echo
|
|
||||||
echo "❓ What would you like to do?"
|
|
||||||
echo " [c] Continue commit without the new changes"
|
|
||||||
echo " [a] Abort commit (recommended - review and stage the changes)"
|
|
||||||
echo
|
|
||||||
printf "Choose [c/a]: "
|
|
||||||
# The `< /dev/tty` is necessary to make read work in git's non-interactive shell
|
|
||||||
read choice < /dev/tty
|
|
||||||
|
|
||||||
case $choice in
|
|
||||||
[Cc]* )
|
|
||||||
echo "✅ Continuing commit without lint-fix changes..."
|
|
||||||
sleep 3
|
|
||||||
;;
|
|
||||||
[Aa]* | * )
|
|
||||||
echo "🛑 Commit aborted. Please review the changes made by lint-fix."
|
|
||||||
echo "💡 You can stage the changes with 'git add .' and commit again."
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Then run Build Architecture Guard
|
# Then run Build Architecture Guard
|
||||||
|
|
||||||
#echo "🏗️ Running Build Architecture Guard..."
|
#echo "🏗️ Running Build Architecture Guard..."
|
||||||
|
|||||||
@@ -1158,10 +1158,10 @@ If you need to build manually or want to understand the individual steps:
|
|||||||
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, then here
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
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 -
|
cd ios/App && xcrun agvtool new-version 40 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.7;/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
|
||||||
```
|
```
|
||||||
@@ -1318,8 +1318,8 @@ The recommended way to build for Android is using the automated build script:
|
|||||||
##### 1. Bump the version in package.json, then here: android/app/build.gradle
|
##### 1. Bump the version in package.json, then here: android/app/build.gradle
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
perl -p -i -e 's/versionCode .*/versionCode 46/g' android/app/build.gradle
|
perl -p -i -e 's/versionCode .*/versionCode 40/g' android/app/build.gradle
|
||||||
perl -p -i -e 's/versionName .*/versionName "1.1.1"/g' android/app/build.gradle
|
perl -p -i -e 's/versionName .*/versionName "1.0.7"/g' android/app/build.gradle
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 2. Build
|
##### 2. Build
|
||||||
|
|||||||
@@ -5,15 +5,6 @@ All notable changes to this project will be documented in this file.
|
|||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
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.1] - 2025.11.03
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- Meeting onboarding via prompts
|
|
||||||
- Emojis on gift feed
|
|
||||||
- Starred projects with notification
|
|
||||||
|
|
||||||
|
|
||||||
## [1.0.7] - 2025.08.18
|
## [1.0.7] - 2025.08.18
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
@@ -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 46
|
versionCode 41
|
||||||
versionName "1.1.1"
|
versionName "1.0.8"
|
||||||
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.
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
|
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover, user-scalable=no, interactive-widget=overlays-content" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
|
||||||
|
|
||||||
<!-- CORS headers removed to allow images from any domain -->
|
<!-- CORS headers removed to allow images from any domain -->
|
||||||
|
|
||||||
@@ -13,4 +13,4 @@
|
|||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
<script type="module" src="/src/main.ts"></script>
|
<script type="module" src="/src/main.ts"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -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 = 46;
|
CURRENT_PROJECT_VERSION = 41;
|
||||||
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.1;
|
MARKETING_VERSION = 1.0.8;
|
||||||
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 = 46;
|
CURRENT_PROJECT_VERSION = 41;
|
||||||
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.1;
|
MARKETING_VERSION = 1.0.8;
|
||||||
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 = "";
|
||||||
|
|||||||
95
package-lock.json
generated
95
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.2-beta",
|
"version": "1.1.0-beta",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.2-beta",
|
"version": "1.1.0-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",
|
||||||
@@ -27,7 +27,6 @@
|
|||||||
"@ethersproject/hdnode": "^5.7.0",
|
"@ethersproject/hdnode": "^5.7.0",
|
||||||
"@ethersproject/wallet": "^5.8.0",
|
"@ethersproject/wallet": "^5.8.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
||||||
"@fortawesome/free-regular-svg-icons": "^6.7.2",
|
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||||
"@fortawesome/vue-fontawesome": "^3.0.6",
|
"@fortawesome/vue-fontawesome": "^3.0.6",
|
||||||
"@jlongster/sql.js": "^1.6.7",
|
"@jlongster/sql.js": "^1.6.7",
|
||||||
@@ -91,7 +90,6 @@
|
|||||||
"vue": "3.5.13",
|
"vue": "3.5.13",
|
||||||
"vue-axios": "^3.5.2",
|
"vue-axios": "^3.5.2",
|
||||||
"vue-facing-decorator": "3.0.4",
|
"vue-facing-decorator": "3.0.4",
|
||||||
"vue-markdown-render": "^2.2.1",
|
|
||||||
"vue-picture-cropper": "^0.7.0",
|
"vue-picture-cropper": "^0.7.0",
|
||||||
"vue-qrcode-reader": "^5.5.3",
|
"vue-qrcode-reader": "^5.5.3",
|
||||||
"vue-router": "^4.5.0",
|
"vue-router": "^4.5.0",
|
||||||
@@ -108,7 +106,6 @@
|
|||||||
"@types/js-yaml": "^4.0.9",
|
"@types/js-yaml": "^4.0.9",
|
||||||
"@types/leaflet": "^1.9.8",
|
"@types/leaflet": "^1.9.8",
|
||||||
"@types/luxon": "^3.4.2",
|
"@types/luxon": "^3.4.2",
|
||||||
"@types/markdown-it": "^14.1.2",
|
|
||||||
"@types/node": "^20.14.11",
|
"@types/node": "^20.14.11",
|
||||||
"@types/node-fetch": "^2.6.12",
|
"@types/node-fetch": "^2.6.12",
|
||||||
"@types/ramda": "^0.29.11",
|
"@types/ramda": "^0.29.11",
|
||||||
@@ -6789,17 +6786,6 @@
|
|||||||
"node": ">=6"
|
"node": ">=6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@fortawesome/free-regular-svg-icons": {
|
|
||||||
"version": "6.7.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.7.2.tgz",
|
|
||||||
"integrity": "sha512-7Z/ur0gvCMW8G93dXIQOkQqHo2M5HLhYrRVC0//fakJXxcF1VmMPsxnG6Ee8qEylA8b8Q3peQXWMNZ62lYF28g==",
|
|
||||||
"dependencies": {
|
|
||||||
"@fortawesome/fontawesome-common-types": "6.7.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@fortawesome/free-solid-svg-icons": {
|
"node_modules/@fortawesome/free-solid-svg-icons": {
|
||||||
"version": "6.7.2",
|
"version": "6.7.2",
|
||||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.2.tgz",
|
||||||
@@ -10161,12 +10147,6 @@
|
|||||||
"@types/geojson": "*"
|
"@types/geojson": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@types/linkify-it": {
|
|
||||||
"version": "5.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
|
|
||||||
"integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"node_modules/@types/luxon": {
|
"node_modules/@types/luxon": {
|
||||||
"version": "3.7.1",
|
"version": "3.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
|
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
|
||||||
@@ -10174,22 +10154,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/markdown-it": {
|
|
||||||
"version": "14.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
|
|
||||||
"integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@types/linkify-it": "^5",
|
|
||||||
"@types/mdurl": "^2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@types/mdurl": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"node_modules/@types/minimist": {
|
"node_modules/@types/minimist": {
|
||||||
"version": "1.2.5",
|
"version": "1.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
|
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
|
||||||
@@ -32919,61 +32883,6 @@
|
|||||||
"vue": "^3.0.0"
|
"vue": "^3.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vue-markdown-render": {
|
|
||||||
"version": "2.2.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/vue-markdown-render/-/vue-markdown-render-2.2.1.tgz",
|
|
||||||
"integrity": "sha512-XkYnC0PMdbs6Vy6j/gZXSvCuOS0787Se5COwXlepRqiqPiunyCIeTPQAO2XnB4Yl04EOHXwLx5y6IuszMWSgyQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"markdown-it": "^13.0.2"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"vue": "^3.3.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/entities": {
|
|
||||||
"version": "3.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
|
|
||||||
"integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/fb55/entities?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/linkify-it": {
|
|
||||||
"version": "4.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
|
|
||||||
"integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
|
|
||||||
"dependencies": {
|
|
||||||
"uc.micro": "^1.0.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/markdown-it": {
|
|
||||||
"version": "13.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz",
|
|
||||||
"integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==",
|
|
||||||
"dependencies": {
|
|
||||||
"argparse": "^2.0.1",
|
|
||||||
"entities": "~3.0.1",
|
|
||||||
"linkify-it": "^4.0.1",
|
|
||||||
"mdurl": "^1.0.1",
|
|
||||||
"uc.micro": "^1.0.5"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"markdown-it": "bin/markdown-it.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/mdurl": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
|
|
||||||
"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/uc.micro": {
|
|
||||||
"version": "1.0.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
|
|
||||||
"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
|
|
||||||
},
|
|
||||||
"node_modules/vue-picture-cropper": {
|
"node_modules/vue-picture-cropper": {
|
||||||
"version": "0.7.0",
|
"version": "0.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/vue-picture-cropper/-/vue-picture-cropper-0.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/vue-picture-cropper/-/vue-picture-cropper-0.7.0.tgz",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.2-beta",
|
"version": "1.1.0-beta",
|
||||||
"description": "Time Safari Application",
|
"description": "Time Safari Application",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Time Safari Team"
|
"name": "Time Safari Team"
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
"guard": "bash ./scripts/build-arch-guard.sh",
|
"guard": "bash ./scripts/build-arch-guard.sh",
|
||||||
"guard:test": "bash ./scripts/build-arch-guard.sh --staged",
|
"guard:test": "bash ./scripts/build-arch-guard.sh --staged",
|
||||||
"guard:setup": "npm run prepare && echo '✅ Build Architecture Guard is now active!'",
|
"guard:setup": "npm run prepare && echo '✅ Build Architecture Guard is now active!'",
|
||||||
"clean:android": "./scripts/uninstall-android.sh",
|
"clean:android": "./scripts/clean-android.sh",
|
||||||
"clean:ios": "rm -rf ios/App/build ios/App/Pods ios/App/output ios/App/App/public ios/DerivedData ios/capacitor-cordova-ios-plugins ios/App/App/capacitor.config.json ios/App/App/config.xml || true",
|
"clean:ios": "rm -rf ios/App/build ios/App/Pods ios/App/output ios/App/App/public ios/DerivedData ios/capacitor-cordova-ios-plugins ios/App/App/capacitor.config.json ios/App/App/config.xml || true",
|
||||||
"clean:electron": "./scripts/build-electron.sh --clean",
|
"clean:electron": "./scripts/build-electron.sh --clean",
|
||||||
"clean:all": "npm run clean:ios && npm run clean:android && npm run clean:electron",
|
"clean:all": "npm run clean:ios && npm run clean:android && npm run clean:electron",
|
||||||
@@ -136,6 +136,7 @@
|
|||||||
"*.{js,ts,vue,css,json,yml,yaml}": "eslint --fix || true",
|
"*.{js,ts,vue,css,json,yml,yaml}": "eslint --fix || true",
|
||||||
"*.{md,markdown,mdc}": "markdownlint-cli2 --fix"
|
"*.{md,markdown,mdc}": "markdownlint-cli2 --fix"
|
||||||
},
|
},
|
||||||
|
|
||||||
"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",
|
||||||
@@ -156,7 +157,6 @@
|
|||||||
"@ethersproject/hdnode": "^5.7.0",
|
"@ethersproject/hdnode": "^5.7.0",
|
||||||
"@ethersproject/wallet": "^5.8.0",
|
"@ethersproject/wallet": "^5.8.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
||||||
"@fortawesome/free-regular-svg-icons": "^6.7.2",
|
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||||
"@fortawesome/vue-fontawesome": "^3.0.6",
|
"@fortawesome/vue-fontawesome": "^3.0.6",
|
||||||
"@jlongster/sql.js": "^1.6.7",
|
"@jlongster/sql.js": "^1.6.7",
|
||||||
@@ -220,7 +220,6 @@
|
|||||||
"vue": "3.5.13",
|
"vue": "3.5.13",
|
||||||
"vue-axios": "^3.5.2",
|
"vue-axios": "^3.5.2",
|
||||||
"vue-facing-decorator": "3.0.4",
|
"vue-facing-decorator": "3.0.4",
|
||||||
"vue-markdown-render": "^2.2.1",
|
|
||||||
"vue-picture-cropper": "^0.7.0",
|
"vue-picture-cropper": "^0.7.0",
|
||||||
"vue-qrcode-reader": "^5.5.3",
|
"vue-qrcode-reader": "^5.5.3",
|
||||||
"vue-router": "^4.5.0",
|
"vue-router": "^4.5.0",
|
||||||
@@ -237,7 +236,6 @@
|
|||||||
"@types/js-yaml": "^4.0.9",
|
"@types/js-yaml": "^4.0.9",
|
||||||
"@types/leaflet": "^1.9.8",
|
"@types/leaflet": "^1.9.8",
|
||||||
"@types/luxon": "^3.4.2",
|
"@types/luxon": "^3.4.2",
|
||||||
"@types/markdown-it": "^14.1.2",
|
|
||||||
"@types/node": "^20.14.11",
|
"@types/node": "^20.14.11",
|
||||||
"@types/node-fetch": "^2.6.12",
|
"@types/node-fetch": "^2.6.12",
|
||||||
"@types/ramda": "^0.29.11",
|
"@types/ramda": "^0.29.11",
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
# --sync Sync Capacitor only
|
# --sync Sync Capacitor only
|
||||||
# --assets Generate assets only
|
# --assets Generate assets only
|
||||||
# --deploy Deploy APK to connected device
|
# --deploy Deploy APK to connected device
|
||||||
# --uninstall Uninstall app from connected device
|
|
||||||
# -h, --help Show this help message
|
# -h, --help Show this help message
|
||||||
# -v, --verbose Enable verbose logging
|
# -v, --verbose Enable verbose logging
|
||||||
#
|
#
|
||||||
@@ -197,7 +196,6 @@ SYNC_ONLY=false
|
|||||||
ASSETS_ONLY=false
|
ASSETS_ONLY=false
|
||||||
DEPLOY_APP=false
|
DEPLOY_APP=false
|
||||||
AUTO_RUN=false
|
AUTO_RUN=false
|
||||||
UNINSTALL=false
|
|
||||||
CUSTOM_API_IP=""
|
CUSTOM_API_IP=""
|
||||||
|
|
||||||
# Function to parse Android-specific arguments
|
# Function to parse Android-specific arguments
|
||||||
@@ -248,9 +246,6 @@ parse_android_args() {
|
|||||||
--auto-run)
|
--auto-run)
|
||||||
AUTO_RUN=true
|
AUTO_RUN=true
|
||||||
;;
|
;;
|
||||||
--uninstall)
|
|
||||||
UNINSTALL=true
|
|
||||||
;;
|
|
||||||
--api-ip)
|
--api-ip)
|
||||||
if [ $((i + 1)) -lt ${#args[@]} ]; then
|
if [ $((i + 1)) -lt ${#args[@]} ]; then
|
||||||
CUSTOM_API_IP="${args[$((i + 1))]}"
|
CUSTOM_API_IP="${args[$((i + 1))]}"
|
||||||
@@ -296,7 +291,6 @@ print_android_usage() {
|
|||||||
echo " --assets Generate assets only"
|
echo " --assets Generate assets only"
|
||||||
echo " --deploy Deploy APK to connected device"
|
echo " --deploy Deploy APK to connected device"
|
||||||
echo " --auto-run Auto-run app after build"
|
echo " --auto-run Auto-run app after build"
|
||||||
echo " --uninstall Uninstall app from connected device"
|
|
||||||
echo " --api-ip <ip> Custom IP address for claim API (defaults to 10.0.2.2)"
|
echo " --api-ip <ip> Custom IP address for claim API (defaults to 10.0.2.2)"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Common Options:"
|
echo "Common Options:"
|
||||||
@@ -311,7 +305,6 @@ print_android_usage() {
|
|||||||
echo " $0 --clean # Clean only"
|
echo " $0 --clean # Clean only"
|
||||||
echo " $0 --sync # Sync only"
|
echo " $0 --sync # Sync only"
|
||||||
echo " $0 --deploy # Build and deploy to device"
|
echo " $0 --deploy # Build and deploy to device"
|
||||||
echo " $0 --uninstall # Uninstall app from device"
|
|
||||||
echo " $0 --dev # Dev build with default 10.0.2.2"
|
echo " $0 --dev # Dev build with default 10.0.2.2"
|
||||||
echo " $0 --dev --api-ip 192.168.1.100 # Dev build with custom API IP"
|
echo " $0 --dev --api-ip 192.168.1.100 # Dev build with custom API IP"
|
||||||
echo ""
|
echo ""
|
||||||
@@ -358,18 +351,8 @@ fi
|
|||||||
# Setup application directories
|
# Setup application directories
|
||||||
setup_app_directories
|
setup_app_directories
|
||||||
|
|
||||||
# Load environment-specific .env file if it exists
|
# Load environment from .env file if it exists
|
||||||
env_file=".env.$BUILD_MODE"
|
load_env_file ".env"
|
||||||
if [ -f "$env_file" ]; then
|
|
||||||
load_env_file "$env_file"
|
|
||||||
else
|
|
||||||
log_debug "No $env_file file found, using default environment"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Load .env file if it exists (fallback)
|
|
||||||
if [ -f ".env" ]; then
|
|
||||||
load_env_file ".env"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Handle clean-only mode
|
# Handle clean-only mode
|
||||||
if [ "$CLEAN_ONLY" = true ]; then
|
if [ "$CLEAN_ONLY" = true ]; then
|
||||||
@@ -424,13 +407,8 @@ safe_execute "Validating asset configuration" "npm run assets:validate" || {
|
|||||||
log_info "If you encounter build failures, please run 'npm install' first to ensure all dependencies are available."
|
log_info "If you encounter build failures, please run 'npm install' first to ensure all dependencies are available."
|
||||||
}
|
}
|
||||||
|
|
||||||
# Step 2: Uninstall Android app
|
# Step 2: Clean Android app
|
||||||
if [ "$UNINSTALL" = true ]; then
|
safe_execute "Cleaning Android app" "npm run clean:android" || exit 1
|
||||||
log_info "Uninstall: uninstalling app from device"
|
|
||||||
safe_execute "Uninstalling Android app" "./scripts/uninstall-android.sh" || exit 1
|
|
||||||
log_success "Uninstall completed successfully!"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 3: Clean dist directory
|
# Step 3: Clean dist directory
|
||||||
log_info "Cleaning dist directory..."
|
log_info "Cleaning dist directory..."
|
||||||
|
|||||||
@@ -341,19 +341,7 @@ main_electron_build() {
|
|||||||
# Setup environment
|
# Setup environment
|
||||||
setup_build_env "electron" "$BUILD_MODE"
|
setup_build_env "electron" "$BUILD_MODE"
|
||||||
setup_app_directories
|
setup_app_directories
|
||||||
|
load_env_file ".env"
|
||||||
# Load environment-specific .env file if it exists
|
|
||||||
env_file=".env.$BUILD_MODE"
|
|
||||||
if [ -f "$env_file" ]; then
|
|
||||||
load_env_file "$env_file"
|
|
||||||
else
|
|
||||||
log_debug "No $env_file file found, using default environment"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Load .env file if it exists (fallback)
|
|
||||||
if [ -f ".env" ]; then
|
|
||||||
load_env_file ".env"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 1: Clean Electron build artifacts
|
# Step 1: Clean Electron build artifacts
|
||||||
clean_electron_artifacts
|
clean_electron_artifacts
|
||||||
|
|||||||
@@ -324,18 +324,8 @@ fi
|
|||||||
# Setup application directories
|
# Setup application directories
|
||||||
setup_app_directories
|
setup_app_directories
|
||||||
|
|
||||||
# Load environment-specific .env file if it exists
|
# Load environment from .env file if it exists
|
||||||
env_file=".env.$BUILD_MODE"
|
load_env_file ".env"
|
||||||
if [ -f "$env_file" ]; then
|
|
||||||
load_env_file "$env_file"
|
|
||||||
else
|
|
||||||
log_debug "No $env_file file found, using default environment"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Load .env file if it exists (fallback)
|
|
||||||
if [ -f ".env" ]; then
|
|
||||||
load_env_file ".env"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Validate iOS environment
|
# Validate iOS environment
|
||||||
validate_ios_environment
|
validate_ios_environment
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# uninstall-android.sh
|
# clean-android.sh
|
||||||
# Author: Matthew Raymer
|
# Author: Matthew Raymer
|
||||||
# Date: 2025-08-19
|
# Date: 2025-08-19
|
||||||
# Description: Uninstall Android app with timeout protection to prevent hanging
|
# Description: Clean Android app with timeout protection to prevent hanging
|
||||||
# This script safely uninstalls the TimeSafari app from connected Android devices
|
# This script safely uninstalls the TimeSafari app from connected Android devices
|
||||||
# with a 30-second timeout to prevent indefinite hanging.
|
# with a 30-second timeout to prevent indefinite hanging.
|
||||||
|
|
||||||
@@ -7,24 +7,6 @@
|
|||||||
html {
|
html {
|
||||||
font-family: 'Work Sans', ui-sans-serif, system-ui, sans-serif !important;
|
font-family: 'Work Sans', ui-sans-serif, system-ui, sans-serif !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Fix iOS viewport height changes when keyboard appears/disappears */
|
|
||||||
html, body {
|
|
||||||
height: 100%;
|
|
||||||
height: 100vh;
|
|
||||||
height: 100dvh; /* Dynamic viewport height for better mobile support */
|
|
||||||
overflow: hidden; /* Disable all scrolling on html and body */
|
|
||||||
position: fixed; /* Force fixed positioning to prevent viewport changes */
|
|
||||||
width: 100%;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#app {
|
|
||||||
height: 100vh;
|
|
||||||
height: 100dvh;
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@layer components {
|
@layer components {
|
||||||
@@ -38,26 +20,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.dialog {
|
.dialog {
|
||||||
@apply bg-white px-4 py-6 rounded-lg w-full max-w-lg max-h-[calc(100vh-3rem)] overflow-y-auto;
|
@apply bg-white p-4 rounded-lg w-full max-w-lg;
|
||||||
}
|
|
||||||
|
|
||||||
/* Markdown content styling to restore list elements */
|
|
||||||
.markdown-content ul {
|
|
||||||
@apply list-disc list-inside ml-4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.markdown-content ol {
|
|
||||||
@apply list-decimal list-inside ml-4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.markdown-content li {
|
|
||||||
@apply mb-1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.markdown-content ul ul,
|
|
||||||
.markdown-content ol ol,
|
|
||||||
.markdown-content ul ol,
|
|
||||||
.markdown-content ol ul {
|
|
||||||
@apply ml-4 mt-1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -77,95 +77,15 @@
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Emoji Section -->
|
|
||||||
<div
|
|
||||||
v-if="hasEmojis || isRegistered"
|
|
||||||
class="float-right ml-3 mb-1 bg-white rounded border border-slate-300 px-1.5 py-0.5 max-w-[240px]"
|
|
||||||
>
|
|
||||||
<div class="flex items-center justify-between gap-1">
|
|
||||||
<!-- Existing Emojis Display -->
|
|
||||||
<div v-if="hasEmojis" class="flex flex-wrap gap-1">
|
|
||||||
<button
|
|
||||||
v-for="(count, emoji) in record.emojiCount"
|
|
||||||
:key="emoji"
|
|
||||||
class="inline-flex items-center gap-0.5 px-1 py-0.5 text-xs bg-slate-50 hover:bg-slate-100 rounded border border-slate-200 transition-colors cursor-pointer"
|
|
||||||
:class="{
|
|
||||||
'bg-blue-50 border-blue-200': isUserEmojiWithoutLoading(emoji),
|
|
||||||
'opacity-75 cursor-wait': loadingEmojis,
|
|
||||||
}"
|
|
||||||
:title="
|
|
||||||
loadingEmojis
|
|
||||||
? 'Loading...'
|
|
||||||
: !emojisOnActivity?.isResolved
|
|
||||||
? 'Click to load your emojis'
|
|
||||||
: isUserEmojiWithoutLoading(emoji)
|
|
||||||
? 'Click to remove your emoji'
|
|
||||||
: 'Click to add this emoji'
|
|
||||||
"
|
|
||||||
:disabled="!isRegistered"
|
|
||||||
@click="toggleThisEmoji(emoji)"
|
|
||||||
>
|
|
||||||
<!-- Show spinner when loading -->
|
|
||||||
<div v-if="loadingEmojis" class="animate-spin text-xs">
|
|
||||||
<font-awesome icon="spinner" class="fa-spin" />
|
|
||||||
</div>
|
|
||||||
<span v-else class="text-sm leading-none">{{ emoji }}</span>
|
|
||||||
<span class="text-xs text-slate-600 font-medium leading-none">{{
|
|
||||||
count
|
|
||||||
}}</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Add Emoji Button -->
|
|
||||||
<button
|
|
||||||
v-if="isRegistered"
|
|
||||||
class="inline-flex px-1 py-0.5 text-xs bg-slate-100 hover:bg-slate-200 rounded border border-slate-300 transition-colors items-center justify-center ml-2 ml-auto"
|
|
||||||
:title="showEmojiPicker ? 'Close emoji picker' : 'Add emoji'"
|
|
||||||
@click="toggleEmojiPicker"
|
|
||||||
>
|
|
||||||
<span class="px-2 text-sm leading-none">{{
|
|
||||||
showEmojiPicker ? "x" : "😊"
|
|
||||||
}}</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Emoji Picker (placeholder for now) -->
|
|
||||||
<div
|
|
||||||
v-if="showEmojiPicker"
|
|
||||||
class="mt-1 p-1.5 bg-slate-50 rounded border border-slate-300"
|
|
||||||
>
|
|
||||||
<!-- Temporary emoji buttons for testing -->
|
|
||||||
<div class="flex flex-wrap gap-3 mt-1">
|
|
||||||
<button
|
|
||||||
v-for="emoji in QUICK_EMOJIS"
|
|
||||||
:key="emoji"
|
|
||||||
class="p-0.5 hover:bg-slate-200 rounded text-base transition-opacity"
|
|
||||||
:class="{
|
|
||||||
'opacity-75 cursor-wait': loadingEmojis,
|
|
||||||
}"
|
|
||||||
:disabled="loadingEmojis"
|
|
||||||
@click="toggleThisEmoji(emoji)"
|
|
||||||
>
|
|
||||||
<!-- Show spinner when loading -->
|
|
||||||
<div v-if="loadingEmojis" class="animate-spin text-sm">⟳</div>
|
|
||||||
<span v-else>{{ emoji }}</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Description -->
|
<!-- Description -->
|
||||||
<p class="font-medium">
|
<p class="font-medium">
|
||||||
<a class="block cursor-pointer" @click="emitLoadClaim(record.jwtId)">
|
<a class="cursor-pointer" @click="emitLoadClaim(record.jwtId)">
|
||||||
<vue-markdown
|
{{ description }}
|
||||||
:source="truncatedDescription"
|
|
||||||
class="markdown-content"
|
|
||||||
/>
|
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="clear-right relative flex justify-between gap-4 max-w-[40rem] mx-auto mt-4"
|
class="relative flex justify-between gap-4 max-w-[40rem] mx-auto mt-4"
|
||||||
>
|
>
|
||||||
<!-- Source -->
|
<!-- Source -->
|
||||||
<div
|
<div
|
||||||
@@ -328,51 +248,33 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
||||||
import VueMarkdown from "vue-markdown-render";
|
import { GiveRecordWithContactInfo } from "@/interfaces/give";
|
||||||
|
|
||||||
import { logger } from "../utils/logger";
|
|
||||||
import {
|
|
||||||
createAndSubmitClaim,
|
|
||||||
getHeaders,
|
|
||||||
isHiddenDid,
|
|
||||||
} from "../libs/endorserServer";
|
|
||||||
import EntityIcon from "./EntityIcon.vue";
|
import EntityIcon from "./EntityIcon.vue";
|
||||||
|
import { isHiddenDid } from "../libs/endorserServer";
|
||||||
import ProjectIcon from "./ProjectIcon.vue";
|
import ProjectIcon from "./ProjectIcon.vue";
|
||||||
import { createNotifyHelpers, NotifyFunction, TIMEOUTS } from "@/utils/notify";
|
import { createNotifyHelpers, NotifyFunction } from "@/utils/notify";
|
||||||
import {
|
import {
|
||||||
NOTIFY_PERSON_HIDDEN,
|
NOTIFY_PERSON_HIDDEN,
|
||||||
NOTIFY_UNKNOWN_PERSON,
|
NOTIFY_UNKNOWN_PERSON,
|
||||||
} from "@/constants/notifications";
|
} from "@/constants/notifications";
|
||||||
import { EmojiSummaryRecord, GenericVerifiableCredential } from "@/interfaces";
|
import { TIMEOUTS } from "@/utils/notify";
|
||||||
import { GiveRecordWithContactInfo } from "@/interfaces/give";
|
|
||||||
import { PromiseTracker } from "@/libs/util";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
EntityIcon,
|
EntityIcon,
|
||||||
ProjectIcon,
|
ProjectIcon,
|
||||||
VueMarkdown,
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class ActivityListItem extends Vue {
|
export default class ActivityListItem extends Vue {
|
||||||
readonly QUICK_EMOJIS = ["👍", "👏", "❤️", "🎉", "😊", "😆", "🔥"];
|
|
||||||
|
|
||||||
@Prop() record!: GiveRecordWithContactInfo;
|
@Prop() record!: GiveRecordWithContactInfo;
|
||||||
@Prop() lastViewedClaimId?: string;
|
@Prop() lastViewedClaimId?: string;
|
||||||
@Prop() isRegistered!: boolean;
|
@Prop() isRegistered!: boolean;
|
||||||
@Prop() activeDid!: string;
|
@Prop() activeDid!: string;
|
||||||
@Prop() apiServer!: string;
|
|
||||||
|
|
||||||
isHiddenDid = isHiddenDid;
|
isHiddenDid = isHiddenDid;
|
||||||
notify!: ReturnType<typeof createNotifyHelpers>;
|
notify!: ReturnType<typeof createNotifyHelpers>;
|
||||||
$notify!: NotifyFunction;
|
$notify!: NotifyFunction;
|
||||||
|
|
||||||
// Emoji-related data
|
|
||||||
showEmojiPicker = false;
|
|
||||||
loadingEmojis = false; // Track if emojis are currently loading
|
|
||||||
|
|
||||||
emojisOnActivity: PromiseTracker<EmojiSummaryRecord[]> | null = null; // load this only when needed
|
|
||||||
|
|
||||||
created() {
|
created() {
|
||||||
this.notify = createNotifyHelpers(this.$notify);
|
this.notify = createNotifyHelpers(this.$notify);
|
||||||
}
|
}
|
||||||
@@ -401,14 +303,6 @@ export default class ActivityListItem extends Vue {
|
|||||||
return `${claim?.description || ""}`;
|
return `${claim?.description || ""}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
get truncatedDescription(): string {
|
|
||||||
const desc = this.description;
|
|
||||||
if (desc.length <= 300) {
|
|
||||||
return desc;
|
|
||||||
}
|
|
||||||
return desc.substring(0, 300) + "...";
|
|
||||||
}
|
|
||||||
|
|
||||||
private displayAmount(code: string, amt: number) {
|
private displayAmount(code: string, amt: number) {
|
||||||
return `${amt} ${this.currencyShortWordForCode(code, amt === 1)}`;
|
return `${amt} ${this.currencyShortWordForCode(code, amt === 1)}`;
|
||||||
}
|
}
|
||||||
@@ -436,186 +330,5 @@ export default class ActivityListItem extends Vue {
|
|||||||
day: "numeric",
|
day: "numeric",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Emoji-related computed properties and methods
|
|
||||||
get hasEmojis(): boolean {
|
|
||||||
return Object.keys(this.record.emojiCount).length > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
triggerUserEmojiLoad(): PromiseTracker<EmojiSummaryRecord[]> {
|
|
||||||
if (!this.emojisOnActivity) {
|
|
||||||
const promise = new Promise<EmojiSummaryRecord[]>((resolve) => {
|
|
||||||
(async () => {
|
|
||||||
this.axios
|
|
||||||
.get(
|
|
||||||
`${this.apiServer}/api/v2/report/emoji?parentHandleId=${encodeURIComponent(this.record.handleId)}`,
|
|
||||||
{ headers: await getHeaders(this.activeDid) },
|
|
||||||
)
|
|
||||||
.then((response) => {
|
|
||||||
const userEmojiRecords = response.data.data.filter(
|
|
||||||
(e: EmojiSummaryRecord) => e.issuerDid === this.activeDid,
|
|
||||||
);
|
|
||||||
resolve(userEmojiRecords);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
logger.error("Error loading user emojis:", error);
|
|
||||||
resolve([]);
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
});
|
|
||||||
|
|
||||||
this.emojisOnActivity = new PromiseTracker(promise);
|
|
||||||
}
|
|
||||||
return this.emojisOnActivity;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param emoji - The emoji to check.
|
|
||||||
* @returns True if the emoji is in the user's emojis, false otherwise.
|
|
||||||
*
|
|
||||||
* @note This method is quick and synchronous, and can check resolved emojis
|
|
||||||
* without triggering a server request. Returns false if emojis haven't been loaded yet.
|
|
||||||
*/
|
|
||||||
isUserEmojiWithoutLoading(emoji: string): boolean {
|
|
||||||
if (this.emojisOnActivity?.isResolved && this.emojisOnActivity.value) {
|
|
||||||
return this.emojisOnActivity.value.some(
|
|
||||||
(record) => record.text === emoji,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
async toggleEmojiPicker() {
|
|
||||||
this.triggerUserEmojiLoad(); // trigger it, but don't wait for it to complete
|
|
||||||
this.showEmojiPicker = !this.showEmojiPicker;
|
|
||||||
}
|
|
||||||
|
|
||||||
async toggleThisEmoji(emoji: string) {
|
|
||||||
// Start loading indicator
|
|
||||||
this.loadingEmojis = true;
|
|
||||||
this.showEmojiPicker = false; // always close the picker when an emoji is clicked
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.triggerUserEmojiLoad(); // trigger just in case
|
|
||||||
|
|
||||||
const userEmojiList = await this.emojisOnActivity!.promise; // must wait now that they've chosen
|
|
||||||
|
|
||||||
const userHasEmoji: boolean = userEmojiList.some(
|
|
||||||
(record) => record.text === emoji,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (userHasEmoji) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "modal",
|
|
||||||
type: "confirm",
|
|
||||||
title: "Remove Emoji",
|
|
||||||
text: `Do you want to remove your ${emoji} ?`,
|
|
||||||
yesText: "Remove",
|
|
||||||
onYes: async () => {
|
|
||||||
await this.removeEmoji(emoji);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
TIMEOUTS.MODAL,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
// User doesn't have this emoji, add it
|
|
||||||
await this.submitEmoji(emoji);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
// Remove loading indicator
|
|
||||||
this.loadingEmojis = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async submitEmoji(emoji: string) {
|
|
||||||
try {
|
|
||||||
// Create an Emoji claim and send to the server
|
|
||||||
const emojiClaim: GenericVerifiableCredential = {
|
|
||||||
"@context": "https://endorser.ch",
|
|
||||||
"@type": "Emoji",
|
|
||||||
text: emoji,
|
|
||||||
parentItem: { lastClaimId: this.record.jwtId },
|
|
||||||
};
|
|
||||||
const claim = await createAndSubmitClaim(
|
|
||||||
emojiClaim,
|
|
||||||
this.activeDid,
|
|
||||||
this.apiServer,
|
|
||||||
this.axios,
|
|
||||||
);
|
|
||||||
if (claim.success && !claim.embeddedRecordError) {
|
|
||||||
// Update emoji count
|
|
||||||
this.record.emojiCount[emoji] =
|
|
||||||
(this.record.emojiCount[emoji] || 0) + 1;
|
|
||||||
|
|
||||||
// Create a new emoji record (we'll get the actual jwtId from the server response later)
|
|
||||||
const newEmojiRecord: EmojiSummaryRecord = {
|
|
||||||
issuerDid: this.activeDid,
|
|
||||||
jwtId: claim.claimId || "",
|
|
||||||
text: emoji,
|
|
||||||
parentHandleId: this.record.jwtId,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Update user emojis list by creating a new promise with the updated data
|
|
||||||
// (Trigger shouldn't be necessary since all calls should come through a toggle, but just in case someone calls this directly)
|
|
||||||
this.triggerUserEmojiLoad();
|
|
||||||
const currentEmojis = await this.emojisOnActivity!.promise; // must wait now that they've clicked one
|
|
||||||
this.emojisOnActivity = new PromiseTracker(
|
|
||||||
Promise.resolve([...currentEmojis, newEmojiRecord]),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.notify.error("Failed to add emoji.", TIMEOUTS.STANDARD);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error submitting emoji:", error);
|
|
||||||
this.notify.error("Got error adding emoji.", TIMEOUTS.STANDARD);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async removeEmoji(emoji: string) {
|
|
||||||
try {
|
|
||||||
// Create an Emoji claim and send to the server
|
|
||||||
const emojiClaim: GenericVerifiableCredential = {
|
|
||||||
"@context": "https://endorser.ch",
|
|
||||||
"@type": "Emoji",
|
|
||||||
text: emoji,
|
|
||||||
parentItem: { lastClaimId: this.record.jwtId },
|
|
||||||
};
|
|
||||||
const claim = await createAndSubmitClaim(
|
|
||||||
emojiClaim,
|
|
||||||
this.activeDid,
|
|
||||||
this.apiServer,
|
|
||||||
this.axios,
|
|
||||||
);
|
|
||||||
if (claim.success && !claim.embeddedRecordError) {
|
|
||||||
// Update emoji count
|
|
||||||
const newCount = Math.max(0, (this.record.emojiCount[emoji] || 0) - 1);
|
|
||||||
if (newCount === 0) {
|
|
||||||
delete this.record.emojiCount[emoji];
|
|
||||||
} else {
|
|
||||||
this.record.emojiCount[emoji] = newCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update user emojis list by creating a new promise with the updated data
|
|
||||||
// (Trigger shouldn't be necessary since all calls should come through a toggle, but just in case someone calls this directly)
|
|
||||||
this.triggerUserEmojiLoad();
|
|
||||||
const currentEmojis = await this.emojisOnActivity!.promise; // must wait now that they've clicked one
|
|
||||||
this.emojisOnActivity = new PromiseTracker(
|
|
||||||
Promise.resolve(
|
|
||||||
currentEmojis.filter(
|
|
||||||
(record) =>
|
|
||||||
record.issuerDid === this.activeDid && record.text !== emoji,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.notify.error("Failed to remove emoji.", TIMEOUTS.STANDARD);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error removing emoji:", error);
|
|
||||||
this.notify.error("Got error removing emoji.", TIMEOUTS.STANDARD);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,465 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-if="visible" class="dialog-overlay">
|
|
||||||
<div class="dialog">
|
|
||||||
<div class="text-slate-900 text-center">
|
|
||||||
<h3 class="text-lg font-semibold leading-[1.25] mb-2">
|
|
||||||
{{ title }}
|
|
||||||
</h3>
|
|
||||||
<p class="text-sm mb-4">
|
|
||||||
{{ description }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<!-- Member Selection Table -->
|
|
||||||
<div class="mb-4">
|
|
||||||
<table
|
|
||||||
class="w-full border-collapse border border-slate-300 text-sm text-start"
|
|
||||||
>
|
|
||||||
<!-- Select All Header -->
|
|
||||||
<thead v-if="membersData && membersData.length > 0">
|
|
||||||
<tr class="bg-slate-100 font-medium">
|
|
||||||
<th class="border border-slate-300 px-3 py-2">
|
|
||||||
<label class="flex items-center gap-2">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
:checked="isAllSelected"
|
|
||||||
:indeterminate="isIndeterminate"
|
|
||||||
@change="toggleSelectAll"
|
|
||||||
/>
|
|
||||||
Select All
|
|
||||||
</label>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<!-- Empty State -->
|
|
||||||
<tr v-if="!membersData || membersData.length === 0">
|
|
||||||
<td
|
|
||||||
class="border border-slate-300 px-3 py-2 text-center italic text-gray-500"
|
|
||||||
>
|
|
||||||
{{ emptyStateText }}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<!-- Member Rows -->
|
|
||||||
<tr
|
|
||||||
v-for="member in membersData || []"
|
|
||||||
:key="member.member.memberId"
|
|
||||||
>
|
|
||||||
<td class="border border-slate-300 px-3 py-2">
|
|
||||||
<div class="flex items-center justify-between gap-2">
|
|
||||||
<label class="flex items-center gap-2">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
:checked="isMemberSelected(member.did)"
|
|
||||||
@change="toggleMemberSelection(member.did)"
|
|
||||||
/>
|
|
||||||
<div class="">
|
|
||||||
<div class="text-sm font-semibold">
|
|
||||||
{{ member.name || SOMEONE_UNNAMED }}
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="flex items-center gap-0.5 text-xs text-slate-500"
|
|
||||||
>
|
|
||||||
<span class="font-semibold sm:hidden">DID:</span>
|
|
||||||
<span
|
|
||||||
class="w-[35vw] sm:w-auto truncate text-left"
|
|
||||||
style="direction: rtl"
|
|
||||||
>{{ member.did }}</span
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<!-- Contact indicator - only show if they are already a contact -->
|
|
||||||
<font-awesome
|
|
||||||
v-if="member.isContact"
|
|
||||||
icon="user-circle"
|
|
||||||
class="fa-fw ms-auto text-slate-400 cursor-pointer hover:text-slate-600"
|
|
||||||
@click="showContactInfo"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
<!-- Select All Footer -->
|
|
||||||
<tfoot v-if="membersData && membersData.length > 0">
|
|
||||||
<tr class="bg-slate-100 font-medium">
|
|
||||||
<th class="border border-slate-300 px-3 py-2">
|
|
||||||
<label class="flex items-center gap-2">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
:checked="isAllSelected"
|
|
||||||
:indeterminate="isIndeterminate"
|
|
||||||
@change="toggleSelectAll"
|
|
||||||
/>
|
|
||||||
Select All
|
|
||||||
</label>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</tfoot>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Action Buttons -->
|
|
||||||
<div class="space-y-2">
|
|
||||||
<!-- Main Action Button -->
|
|
||||||
<button
|
|
||||||
v-if="membersData && membersData.length > 0"
|
|
||||||
:disabled="!hasSelectedMembers"
|
|
||||||
:class="[
|
|
||||||
'block w-full text-center text-md font-bold uppercase px-2 py-2 rounded-md',
|
|
||||||
hasSelectedMembers
|
|
||||||
? 'bg-blue-600 text-white cursor-pointer'
|
|
||||||
: 'bg-slate-400 text-slate-200 cursor-not-allowed',
|
|
||||||
]"
|
|
||||||
@click="processSelectedMembers"
|
|
||||||
>
|
|
||||||
{{ buttonText }}
|
|
||||||
</button>
|
|
||||||
<!-- Cancel Button -->
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
|
|
||||||
@click="cancel"
|
|
||||||
>
|
|
||||||
Maybe Later
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Vue, Component, Prop } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
|
||||||
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
|
||||||
import { MemberData } from "@/interfaces";
|
|
||||||
import { setVisibilityUtil, getHeaders, register } from "@/libs/endorserServer";
|
|
||||||
import { createNotifyHelpers } from "@/utils/notify";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
mixins: [PlatformServiceMixin],
|
|
||||||
emits: ["close"],
|
|
||||||
})
|
|
||||||
export default class BulkMembersDialog extends Vue {
|
|
||||||
@Prop({ default: "" }) activeDid!: string;
|
|
||||||
@Prop({ default: "" }) apiServer!: string;
|
|
||||||
// isOrganizer: true = organizer mode (admit members), false = member mode (set visibility)
|
|
||||||
@Prop({ required: true }) isOrganizer!: boolean;
|
|
||||||
|
|
||||||
// Vue notification system
|
|
||||||
$notify!: (
|
|
||||||
notification: { group: string; type: string; title: string; text: string },
|
|
||||||
timeout?: number,
|
|
||||||
) => void;
|
|
||||||
|
|
||||||
// Notification system
|
|
||||||
notify!: ReturnType<typeof createNotifyHelpers>;
|
|
||||||
|
|
||||||
// Component state
|
|
||||||
membersData: MemberData[] = [];
|
|
||||||
selectedMembers: string[] = [];
|
|
||||||
visible = false;
|
|
||||||
|
|
||||||
// Constants
|
|
||||||
// In Vue templates, imported constants need to be explicitly made available to the template
|
|
||||||
readonly SOMEONE_UNNAMED = SOMEONE_UNNAMED;
|
|
||||||
|
|
||||||
get hasSelectedMembers() {
|
|
||||||
return this.selectedMembers.length > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
get isAllSelected() {
|
|
||||||
if (!this.membersData || this.membersData.length === 0) return false;
|
|
||||||
return this.membersData.every((member) =>
|
|
||||||
this.selectedMembers.includes(member.did),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
get isIndeterminate() {
|
|
||||||
if (!this.membersData || this.membersData.length === 0) return false;
|
|
||||||
const selectedCount = this.membersData.filter((member) =>
|
|
||||||
this.selectedMembers.includes(member.did),
|
|
||||||
).length;
|
|
||||||
return selectedCount > 0 && selectedCount < this.membersData.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
get title() {
|
|
||||||
return this.isOrganizer
|
|
||||||
? "Admit Pending Members"
|
|
||||||
: "Add Members to Contacts";
|
|
||||||
}
|
|
||||||
|
|
||||||
get description() {
|
|
||||||
return this.isOrganizer
|
|
||||||
? "Would you like to admit these members to the meeting and add them to your contacts?"
|
|
||||||
: "Would you like to add these members to your contacts?";
|
|
||||||
}
|
|
||||||
|
|
||||||
get buttonText() {
|
|
||||||
return this.isOrganizer ? "Admit + Add to Contacts" : "Add to Contacts";
|
|
||||||
}
|
|
||||||
|
|
||||||
get emptyStateText() {
|
|
||||||
return this.isOrganizer
|
|
||||||
? "No pending members to admit"
|
|
||||||
: "No members are not in your contacts";
|
|
||||||
}
|
|
||||||
|
|
||||||
created() {
|
|
||||||
this.notify = createNotifyHelpers(this.$notify);
|
|
||||||
}
|
|
||||||
|
|
||||||
open(members: MemberData[]) {
|
|
||||||
this.visible = true;
|
|
||||||
this.membersData = members;
|
|
||||||
// Select all by default
|
|
||||||
this.selectedMembers = this.membersData.map((member) => member.did);
|
|
||||||
}
|
|
||||||
|
|
||||||
close(notSelectedMemberDids: string[]) {
|
|
||||||
this.visible = false;
|
|
||||||
this.$emit("close", { notSelectedMemberDids: notSelectedMemberDids });
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel() {
|
|
||||||
this.close(this.membersData.map((member) => member.did));
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleSelectAll() {
|
|
||||||
if (!this.membersData || this.membersData.length === 0) return;
|
|
||||||
|
|
||||||
if (this.isAllSelected) {
|
|
||||||
// Deselect all
|
|
||||||
this.selectedMembers = [];
|
|
||||||
} else {
|
|
||||||
// Select all
|
|
||||||
this.selectedMembers = this.membersData.map((member) => member.did);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleMemberSelection(memberDid: string) {
|
|
||||||
const index = this.selectedMembers.indexOf(memberDid);
|
|
||||||
if (index > -1) {
|
|
||||||
this.selectedMembers.splice(index, 1);
|
|
||||||
} else {
|
|
||||||
this.selectedMembers.push(memberDid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isMemberSelected(memberDid: string) {
|
|
||||||
return this.selectedMembers.includes(memberDid);
|
|
||||||
}
|
|
||||||
|
|
||||||
async processSelectedMembers() {
|
|
||||||
try {
|
|
||||||
const selectedMembers: MemberData[] = this.membersData.filter((member) =>
|
|
||||||
this.selectedMembers.includes(member.did),
|
|
||||||
);
|
|
||||||
const notSelectedMembers: MemberData[] = this.membersData.filter(
|
|
||||||
(member) => !this.selectedMembers.includes(member.did),
|
|
||||||
);
|
|
||||||
|
|
||||||
let admittedCount = 0;
|
|
||||||
let contactAddedCount = 0;
|
|
||||||
let errors = 0;
|
|
||||||
|
|
||||||
for (const member of selectedMembers) {
|
|
||||||
try {
|
|
||||||
// Organizer mode: admit and register the member first
|
|
||||||
if (this.isOrganizer) {
|
|
||||||
await this.admitMember(member);
|
|
||||||
await this.registerMember(member);
|
|
||||||
admittedCount++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If they're not a contact yet, add them as a contact
|
|
||||||
if (!member.isContact) {
|
|
||||||
// Organizer mode: set isRegistered to true, member mode: undefined
|
|
||||||
await this.addAsContact(
|
|
||||||
member,
|
|
||||||
this.isOrganizer ? true : undefined,
|
|
||||||
);
|
|
||||||
contactAddedCount++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set their seesMe to true
|
|
||||||
await this.updateContactVisibility(member.did, true);
|
|
||||||
} catch (error) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error(`Error processing member ${member.did}:`, error);
|
|
||||||
// Continue with other members even if one fails
|
|
||||||
errors++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show success notification
|
|
||||||
if (this.isOrganizer) {
|
|
||||||
if (admittedCount > 0) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Members Admitted Successfully",
|
|
||||||
text: `${admittedCount} member${admittedCount === 1 ? "" : "s"} admitted and registered${contactAddedCount === 0 ? "" : admittedCount === contactAddedCount ? " and" : `, ${contactAddedCount}`}${contactAddedCount === 0 ? "" : ` added as contact${contactAddedCount === 1 ? "" : "s"}`}.`,
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (errors > 0) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Failed to fully admit some members. Work with them individually below.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Member mode: show contacts added notification
|
|
||||||
if (contactAddedCount > 0) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Contacts Added Successfully",
|
|
||||||
text: `${contactAddedCount} member${contactAddedCount === 1 ? "" : "s"} added as contact${contactAddedCount === 1 ? "" : "s"}.`,
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.close(notSelectedMembers.map((member) => member.did));
|
|
||||||
} catch (error) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error(
|
|
||||||
`Error ${this.isOrganizer ? "admitting members" : "adding contacts"}:`,
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Some errors occurred. Work with members individually below.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async admitMember(member: {
|
|
||||||
did: string;
|
|
||||||
name: string;
|
|
||||||
member: { memberId: string };
|
|
||||||
}) {
|
|
||||||
try {
|
|
||||||
const headers = await getHeaders(this.activeDid);
|
|
||||||
await this.axios.put(
|
|
||||||
`${this.apiServer}/api/partner/groupOnboardMember/${member.member.memberId}`,
|
|
||||||
{ admitted: true },
|
|
||||||
{ headers },
|
|
||||||
);
|
|
||||||
} catch (err) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error("Error admitting member:", err);
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async registerMember(member: MemberData) {
|
|
||||||
try {
|
|
||||||
const contact: Contact = { did: member.did };
|
|
||||||
const result = await register(
|
|
||||||
this.activeDid,
|
|
||||||
this.apiServer,
|
|
||||||
this.axios,
|
|
||||||
contact,
|
|
||||||
);
|
|
||||||
if (result.success) {
|
|
||||||
if (result.embeddedRecordError) {
|
|
||||||
throw new Error(result.embeddedRecordError);
|
|
||||||
}
|
|
||||||
await this.$updateContact(member.did, { registered: true });
|
|
||||||
} else {
|
|
||||||
throw result;
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error("Error registering member:", err);
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async addAsContact(
|
|
||||||
member: { did: string; name: string },
|
|
||||||
isRegistered?: boolean,
|
|
||||||
) {
|
|
||||||
try {
|
|
||||||
const newContact: Contact = {
|
|
||||||
did: member.did,
|
|
||||||
name: member.name,
|
|
||||||
registered: isRegistered,
|
|
||||||
};
|
|
||||||
|
|
||||||
await this.$insertContact(newContact);
|
|
||||||
} catch (err) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error("Error adding contact:", err);
|
|
||||||
if (err instanceof Error && err.message?.indexOf("already exists") > -1) {
|
|
||||||
// Contact already exists, continue
|
|
||||||
} else {
|
|
||||||
throw err; // Re-throw if it's not a duplicate error
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateContactVisibility(did: string, seesMe: boolean) {
|
|
||||||
try {
|
|
||||||
// Get the contact object
|
|
||||||
const contact = await this.$getContact(did);
|
|
||||||
if (!contact) {
|
|
||||||
throw new Error(`Contact not found for DID: ${did}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use the proper API to set visibility on the server
|
|
||||||
const result = await setVisibilityUtil(
|
|
||||||
this.activeDid,
|
|
||||||
this.apiServer,
|
|
||||||
this.axios,
|
|
||||||
contact,
|
|
||||||
seesMe,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!result.success) {
|
|
||||||
throw new Error(result.error || "Failed to set visibility");
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error("Error updating contact visibility:", err);
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
showContactInfo() {
|
|
||||||
// isOrganizer: true = admit mode, false = visibility mode
|
|
||||||
const message = this.isOrganizer
|
|
||||||
? "This user is already your contact, but they are not yet admitted to the meeting."
|
|
||||||
: "This user is already your contact, but your activities are not visible to them yet.";
|
|
||||||
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "info",
|
|
||||||
title: "Contact Info",
|
|
||||||
text: message,
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
<span class="text-xs truncate">{{ contact.did }}</span>
|
<span class="text-xs truncate">{{ contact.did }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm truncate">
|
<div class="text-sm">
|
||||||
{{ contact.notes }}
|
{{ contact.notes }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
|||||||
>
|
>
|
||||||
<!-- Notification dot - show while the user has not yet backed up their seed phrase -->
|
<!-- Notification dot - show while the user has not yet backed up their seed phrase -->
|
||||||
<font-awesome
|
<font-awesome
|
||||||
v-if="showRedNotificationDot"
|
v-if="!hasBackedUpSeed"
|
||||||
icon="circle"
|
icon="circle"
|
||||||
class="absolute -right-[8px] -top-[8px] text-rose-500 text-[14px] border border-white rounded-full"
|
class="absolute -right-[8px] -top-[8px] text-rose-500 text-[14px] border border-white rounded-full"
|
||||||
></font-awesome>
|
></font-awesome>
|
||||||
@@ -108,7 +108,7 @@ export default class DataExportSection extends Vue {
|
|||||||
* Flag indicating if the user has backed up their seed phrase
|
* Flag indicating if the user has backed up their seed phrase
|
||||||
* Used to control the visibility of the notification dot
|
* Used to control the visibility of the notification dot
|
||||||
*/
|
*/
|
||||||
showRedNotificationDot = false;
|
hasBackedUpSeed = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Notification helper for consistent notification patterns
|
* Notification helper for consistent notification patterns
|
||||||
@@ -240,12 +240,11 @@ export default class DataExportSection extends Vue {
|
|||||||
private async loadSeedBackupStatus(): Promise<void> {
|
private async loadSeedBackupStatus(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
const settings = await this.$accountSettings();
|
const settings = await this.$accountSettings();
|
||||||
this.showRedNotificationDot =
|
this.hasBackedUpSeed = !!settings.hasBackedUpSeed;
|
||||||
!!settings.isRegistered && !settings.hasBackedUpSeed;
|
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
logger.error("Failed to load seed backup status:", err);
|
logger.error("Failed to load seed backup status:", err);
|
||||||
// Default to false (show notification dot) if we can't load the setting
|
// Default to false (show notification dot) if we can't load the setting
|
||||||
this.showRedNotificationDot = false;
|
this.hasBackedUpSeed = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,55 +2,12 @@
|
|||||||
GiftedDialog.vue to provide a reusable grid layout * for displaying people,
|
GiftedDialog.vue to provide a reusable grid layout * for displaying people,
|
||||||
projects, and special entities with selection. * * @author Matthew Raymer */
|
projects, and special entities with selection. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<!-- Quick Search -->
|
<ul :class="gridClasses">
|
||||||
<div id="QuickSearch" class="mb-4 flex items-center text-sm">
|
|
||||||
<input
|
|
||||||
v-model="searchTerm"
|
|
||||||
type="text"
|
|
||||||
placeholder="Search…"
|
|
||||||
class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-1.5 placeholder:italic placeholder:text-slate-400 focus:outline-none"
|
|
||||||
@input="handleSearchInput"
|
|
||||||
@keydown.enter="performSearch"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
v-show="isSearching && searchTerm"
|
|
||||||
class="border-y border-slate-400 ps-2 py-1.5 text-center text-slate-400"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
icon="spinner"
|
|
||||||
class="fa-spin-pulse leading-[1.1]"
|
|
||||||
></font-awesome>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
:disabled="!searchTerm"
|
|
||||||
class="px-2 py-1.5 rounded-r bg-white border border-l-0 border-slate-400 text-slate-400 disabled:cursor-not-allowed"
|
|
||||||
@click="clearSearch"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
:icon="searchTerm ? 'times' : 'magnifying-glass'"
|
|
||||||
class="fa-fw"
|
|
||||||
></font-awesome>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="searchTerm && !isSearching && filteredEntities.length === 0"
|
|
||||||
class="mb-4 text-sm italic text-slate-500 text-center"
|
|
||||||
>
|
|
||||||
“{{ searchTerm }}” doesn't match any
|
|
||||||
{{ entityType === "people" ? "people" : "projects" }}. Try a different
|
|
||||||
search.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul
|
|
||||||
ref="scrollContainer"
|
|
||||||
class="border-t border-slate-300 mb-4 max-h-[60vh] overflow-y-auto"
|
|
||||||
>
|
|
||||||
<!-- Special entities (You, Unnamed) for people grids -->
|
<!-- Special entities (You, Unnamed) for people grids -->
|
||||||
<template v-if="entityType === 'people'">
|
<template v-if="entityType === 'people'">
|
||||||
<!-- "You" entity -->
|
<!-- "You" entity -->
|
||||||
<SpecialEntityCard
|
<SpecialEntityCard
|
||||||
v-if="showYouEntity && !searchTerm.trim()"
|
v-if="showYouEntity"
|
||||||
entity-type="you"
|
entity-type="you"
|
||||||
label="You"
|
label="You"
|
||||||
icon="hand"
|
icon="hand"
|
||||||
@@ -64,7 +21,6 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
|
|
||||||
<!-- "Unnamed" entity -->
|
<!-- "Unnamed" entity -->
|
||||||
<SpecialEntityCard
|
<SpecialEntityCard
|
||||||
v-if="showUnnamedEntity && !searchTerm.trim()"
|
|
||||||
entity-type="unnamed"
|
entity-type="unnamed"
|
||||||
:label="unnamedEntityName"
|
:label="unnamedEntityName"
|
||||||
icon="circle-question"
|
icon="circle-question"
|
||||||
@@ -82,60 +38,16 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
|
|
||||||
<!-- Entity cards (people or projects) -->
|
<!-- Entity cards (people or projects) -->
|
||||||
<template v-if="entityType === 'people'">
|
<template v-if="entityType === 'people'">
|
||||||
<!-- When showing contacts without search: split into recent and alphabetical -->
|
<PersonCard
|
||||||
<template v-if="!searchTerm.trim()">
|
v-for="person in displayedEntities as Contact[]"
|
||||||
<!-- Recently Added Section -->
|
:key="person.did"
|
||||||
<template v-if="recentContacts.length > 0">
|
:person="person"
|
||||||
<li
|
:conflicted="isPersonConflicted(person.did)"
|
||||||
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
:show-time-icon="true"
|
||||||
>
|
:notify="notify"
|
||||||
Recently Added
|
:conflict-context="conflictContext"
|
||||||
</li>
|
@person-selected="handlePersonSelected"
|
||||||
<PersonCard
|
/>
|
||||||
v-for="person in recentContacts"
|
|
||||||
:key="person.did"
|
|
||||||
:person="person"
|
|
||||||
:conflicted="isPersonConflicted(person.did)"
|
|
||||||
:show-time-icon="true"
|
|
||||||
:notify="notify"
|
|
||||||
:conflict-context="conflictContext"
|
|
||||||
@person-selected="handlePersonSelected"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<!-- Alphabetical Section -->
|
|
||||||
<template v-if="alphabeticalContacts.length > 0">
|
|
||||||
<li
|
|
||||||
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
|
||||||
>
|
|
||||||
Everyone
|
|
||||||
</li>
|
|
||||||
<PersonCard
|
|
||||||
v-for="person in alphabeticalContacts"
|
|
||||||
:key="person.did"
|
|
||||||
:person="person"
|
|
||||||
:conflicted="isPersonConflicted(person.did)"
|
|
||||||
:show-time-icon="true"
|
|
||||||
:notify="notify"
|
|
||||||
:conflict-context="conflictContext"
|
|
||||||
@person-selected="handlePersonSelected"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<!-- When searching: show filtered results normally -->
|
|
||||||
<template v-else>
|
|
||||||
<PersonCard
|
|
||||||
v-for="person in displayedEntities as Contact[]"
|
|
||||||
:key="person.did"
|
|
||||||
:person="person"
|
|
||||||
:conflicted="isPersonConflicted(person.did)"
|
|
||||||
:show-time-icon="true"
|
|
||||||
:notify="notify"
|
|
||||||
:conflict-context="conflictContext"
|
|
||||||
@person-selected="handlePersonSelected"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-else-if="entityType === 'projects'">
|
<template v-else-if="entityType === 'projects'">
|
||||||
@@ -151,27 +63,28 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
@project-selected="handleProjectSelected"
|
@project-selected="handleProjectSelected"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<!-- Show All navigation -->
|
||||||
|
<ShowAllCard
|
||||||
|
v-if="shouldShowAll"
|
||||||
|
:entity-type="entityType"
|
||||||
|
:route-name="showAllRoute"
|
||||||
|
:query-params="showAllQueryParams"
|
||||||
|
/>
|
||||||
</ul>
|
</ul>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Prop, Vue, Emit, Watch } from "vue-facing-decorator";
|
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
||||||
import { useInfiniteScroll } from "@vueuse/core";
|
|
||||||
import PersonCard from "./PersonCard.vue";
|
import PersonCard from "./PersonCard.vue";
|
||||||
import ProjectCard from "./ProjectCard.vue";
|
import ProjectCard from "./ProjectCard.vue";
|
||||||
import SpecialEntityCard from "./SpecialEntityCard.vue";
|
import SpecialEntityCard from "./SpecialEntityCard.vue";
|
||||||
|
import ShowAllCard from "./ShowAllCard.vue";
|
||||||
import { Contact } from "../db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
import { PlanData } from "../interfaces/records";
|
import { PlanData } from "../interfaces/records";
|
||||||
import { NotificationIface } from "../constants/app";
|
import { NotificationIface } from "../constants/app";
|
||||||
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
||||||
|
|
||||||
/**
|
|
||||||
* Constants for infinite scroll configuration
|
|
||||||
*/
|
|
||||||
const INITIAL_BATCH_SIZE = 20;
|
|
||||||
const INCREMENT_SIZE = 20;
|
|
||||||
const RECENT_CONTACTS_COUNT = 3;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EntityGrid - Unified grid layout for displaying people or projects
|
* EntityGrid - Unified grid layout for displaying people or projects
|
||||||
*
|
*
|
||||||
@@ -180,6 +93,7 @@ const RECENT_CONTACTS_COUNT = 3;
|
|||||||
* - Special entity integration (You, Unnamed)
|
* - Special entity integration (You, Unnamed)
|
||||||
* - Conflict detection integration
|
* - Conflict detection integration
|
||||||
* - Empty state messaging
|
* - Empty state messaging
|
||||||
|
* - Show All navigation
|
||||||
* - Event delegation for entity selection
|
* - Event delegation for entity selection
|
||||||
* - Warning notifications for conflicted entities
|
* - Warning notifications for conflicted entities
|
||||||
* - Template streamlined with computed CSS properties
|
* - Template streamlined with computed CSS properties
|
||||||
@@ -190,6 +104,7 @@ const RECENT_CONTACTS_COUNT = 3;
|
|||||||
PersonCard,
|
PersonCard,
|
||||||
ProjectCard,
|
ProjectCard,
|
||||||
SpecialEntityCard,
|
SpecialEntityCard,
|
||||||
|
ShowAllCard,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class EntityGrid extends Vue {
|
export default class EntityGrid extends Vue {
|
||||||
@@ -197,32 +112,14 @@ export default class EntityGrid extends Vue {
|
|||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
entityType!: "people" | "projects";
|
entityType!: "people" | "projects";
|
||||||
|
|
||||||
// Search state
|
/** Array of entities to display */
|
||||||
searchTerm = "";
|
|
||||||
isSearching = false;
|
|
||||||
searchTimeout: NodeJS.Timeout | null = null;
|
|
||||||
filteredEntities: Contact[] | PlanData[] = [];
|
|
||||||
|
|
||||||
// Infinite scroll state
|
|
||||||
displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
infiniteScrollReset?: () => void;
|
|
||||||
scrollContainer?: HTMLElement;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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[];
|
||||||
|
|
||||||
|
/** Maximum number of entities to display */
|
||||||
|
@Prop({ default: 10 })
|
||||||
|
maxItems!: number;
|
||||||
|
|
||||||
/** Active user's DID */
|
/** Active user's DID */
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
activeDid!: string;
|
activeDid!: string;
|
||||||
@@ -243,14 +140,18 @@ export default class EntityGrid extends Vue {
|
|||||||
@Prop({ default: true })
|
@Prop({ default: true })
|
||||||
showYouEntity!: boolean;
|
showYouEntity!: boolean;
|
||||||
|
|
||||||
/** Whether to show the "Unnamed" entity for people grids */
|
|
||||||
@Prop({ default: true })
|
|
||||||
showUnnamedEntity!: boolean;
|
|
||||||
|
|
||||||
/** Whether the "You" entity is selectable */
|
/** Whether the "You" entity is selectable */
|
||||||
@Prop({ default: true })
|
@Prop({ default: true })
|
||||||
youSelectable!: boolean;
|
youSelectable!: boolean;
|
||||||
|
|
||||||
|
/** Route name for "Show All" navigation */
|
||||||
|
@Prop({ default: "" })
|
||||||
|
showAllRoute!: string;
|
||||||
|
|
||||||
|
/** Query parameters for "Show All" navigation */
|
||||||
|
@Prop({ default: () => ({}) })
|
||||||
|
showAllQueryParams!: Record<string, string>;
|
||||||
|
|
||||||
/** Notification function from parent component */
|
/** Notification function from parent component */
|
||||||
@Prop()
|
@Prop()
|
||||||
notify?: (notification: NotificationIface, timeout?: number) => void;
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
@@ -259,31 +160,42 @@ export default class EntityGrid extends Vue {
|
|||||||
@Prop({ default: "other party" })
|
@Prop({ default: "other party" })
|
||||||
conflictContext!: string;
|
conflictContext!: string;
|
||||||
|
|
||||||
|
/** Whether to hide the "Show All" navigation */
|
||||||
|
@Prop({ default: false })
|
||||||
|
hideShowAll!: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function to determine which entities to display (allows parent control)
|
* Function to determine which entities to display (allows parent control)
|
||||||
*
|
*
|
||||||
* This function prop allows parent components to customize which entities
|
* This function prop allows parent components to customize which entities
|
||||||
* are displayed in the grid, enabling advanced filtering and sorting.
|
* are displayed in the grid, enabling advanced filtering, sorting, and
|
||||||
* Note: Infinite scroll is disabled when this prop is provided.
|
* display logic beyond the default simple slice behavior.
|
||||||
*
|
*
|
||||||
* @param entities - The full array of entities (Contact[] or PlanData[])
|
* @param entities - The full array of entities (Contact[] or PlanData[])
|
||||||
* @param entityType - The type of entities being displayed ("people" or "projects")
|
* @param entityType - The type of entities being displayed ("people" or "projects")
|
||||||
|
* @param maxItems - The maximum number of items to display (from maxItems prop)
|
||||||
* @returns Filtered/sorted array of entities to display
|
* @returns Filtered/sorted array of entities to display
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* // Custom filtering: only show contacts with profile images
|
* // Custom filtering: only show contacts with profile images
|
||||||
* :display-entities-function="(entities, type) =>
|
* :display-entities-function="(entities, type, max) =>
|
||||||
* entities.filter(e => e.profileImageUrl)"
|
* entities.filter(e => e.profileImageUrl).slice(0, max)"
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* // Custom sorting: sort projects by name
|
* // Custom sorting: sort projects by name
|
||||||
* :display-entities-function="(entities, type) =>
|
* :display-entities-function="(entities, type, max) =>
|
||||||
* entities.sort((a, b) => a.name.localeCompare(b.name))"
|
* entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, max)"
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* // Advanced logic: different limits for different entity types
|
||||||
|
* :display-entities-function="(entities, type, max) =>
|
||||||
|
* type === 'projects' ? entities.slice(0, 5) : entities.slice(0, max)"
|
||||||
*/
|
*/
|
||||||
@Prop({ default: null })
|
@Prop({ default: null })
|
||||||
displayEntitiesFunction?: (
|
displayEntitiesFunction?: (
|
||||||
entities: Contact[] | PlanData[],
|
entities: Contact[] | PlanData[],
|
||||||
entityType: "people" | "projects",
|
entityType: "people" | "projects",
|
||||||
|
maxItems: number,
|
||||||
) => Contact[] | PlanData[];
|
) => Contact[] | PlanData[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -294,63 +206,33 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed entities to display - uses function prop if provided, otherwise uses infinite scroll
|
* Computed CSS classes for the grid layout
|
||||||
* When searching, returns filtered results with infinite scroll applied
|
*/
|
||||||
|
get gridClasses(): string {
|
||||||
|
const baseClasses = "grid gap-x-2 gap-y-4 text-center mb-4";
|
||||||
|
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
return `${baseClasses} grid-cols-3 md:grid-cols-4`;
|
||||||
|
} else {
|
||||||
|
return `${baseClasses} grid-cols-4 sm:grid-cols-5 md:grid-cols-6`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed entities to display - uses function prop if provided, otherwise defaults
|
||||||
*/
|
*/
|
||||||
get displayedEntities(): Contact[] | PlanData[] {
|
get displayedEntities(): Contact[] | PlanData[] {
|
||||||
// If searching, return filtered results with infinite scroll
|
|
||||||
if (this.searchTerm.trim()) {
|
|
||||||
return this.filteredEntities.slice(0, this.displayedCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
// If custom function provided, use it (disables infinite scroll)
|
|
||||||
if (this.displayEntitiesFunction) {
|
if (this.displayEntitiesFunction) {
|
||||||
return this.displayEntitiesFunction(this.entities, this.entityType);
|
return this.displayEntitiesFunction(
|
||||||
|
this.entities,
|
||||||
|
this.entityType,
|
||||||
|
this.maxItems,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default: projects use infinite scroll
|
// Default implementation for backward compatibility
|
||||||
if (this.entityType === "projects") {
|
const maxDisplay = this.entityType === "projects" ? 7 : this.maxItems;
|
||||||
return (this.entities as PlanData[]).slice(0, this.displayedCount);
|
return this.entities.slice(0, maxDisplay);
|
||||||
}
|
|
||||||
|
|
||||||
// People: handled by recentContacts + alphabeticalContacts (both use displayedCount)
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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[] {
|
|
||||||
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
// Entities are already sorted by date added (newest first)
|
|
||||||
return (this.entities as Contact[]).slice(0, RECENT_CONTACTS_COUNT);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the remaining contacts sorted alphabetically (when showing contacts and not searching)
|
|
||||||
* Uses infinite scroll to control how many are displayed
|
|
||||||
*/
|
|
||||||
get alphabeticalContacts(): Contact[] {
|
|
||||||
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
// Skip the first few (recent contacts) and sort the rest alphabetically
|
|
||||||
// Create a copy to avoid mutating the original array
|
|
||||||
const remaining = this.entities as Contact[];
|
|
||||||
const sorted = [...remaining].sort((a: Contact, b: Contact) => {
|
|
||||||
// Sort alphabetically by name, falling back to DID if name is missing
|
|
||||||
const nameA = (a.name || a.did).toLowerCase();
|
|
||||||
const nameB = (b.name || b.did).toLowerCase();
|
|
||||||
return nameA.localeCompare(nameB);
|
|
||||||
});
|
|
||||||
// Apply infinite scroll: show based on displayedCount (minus the recent contacts)
|
|
||||||
const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
|
|
||||||
return sorted.slice(0, toShow);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -364,6 +246,15 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether to show the "Show All" navigation
|
||||||
|
*/
|
||||||
|
get shouldShowAll(): boolean {
|
||||||
|
return (
|
||||||
|
!this.hideShowAll && this.entities.length > 0 && this.showAllRoute !== ""
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether the "You" entity is conflicted
|
* Whether the "You" entity is conflicted
|
||||||
*/
|
*/
|
||||||
@@ -437,143 +328,6 @@ export default class EntityGrid extends Vue {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle search input with debouncing
|
|
||||||
*/
|
|
||||||
handleSearchInput(): void {
|
|
||||||
// Show spinner immediately when user types
|
|
||||||
this.isSearching = true;
|
|
||||||
|
|
||||||
// Clear existing timeout
|
|
||||||
if (this.searchTimeout) {
|
|
||||||
clearTimeout(this.searchTimeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set new timeout for 500ms delay
|
|
||||||
this.searchTimeout = setTimeout(() => {
|
|
||||||
this.performSearch();
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform the actual search
|
|
||||||
*/
|
|
||||||
async performSearch(): Promise<void> {
|
|
||||||
if (!this.searchTerm.trim()) {
|
|
||||||
this.filteredEntities = [];
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.isSearching = true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Simulate async search (in case we need to add API calls later)
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
||||||
|
|
||||||
const searchLower = this.searchTerm.toLowerCase().trim();
|
|
||||||
|
|
||||||
if (this.entityType === "people") {
|
|
||||||
this.filteredEntities = (this.entities as Contact[])
|
|
||||||
.filter((contact: Contact) => {
|
|
||||||
const name = contact.name?.toLowerCase() || "";
|
|
||||||
const did = contact.did.toLowerCase();
|
|
||||||
return name.includes(searchLower) || did.includes(searchLower);
|
|
||||||
})
|
|
||||||
.sort((a: Contact, b: Contact) => {
|
|
||||||
// Sort alphabetically by name, falling back to DID if name is missing
|
|
||||||
const nameA = (a.name || a.did).toLowerCase();
|
|
||||||
const nameB = (b.name || b.did).toLowerCase();
|
|
||||||
return nameA.localeCompare(nameB);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.filteredEntities = (this.entities as PlanData[])
|
|
||||||
.filter((project: PlanData) => {
|
|
||||||
const name = project.name?.toLowerCase() || "";
|
|
||||||
const handleId = project.handleId.toLowerCase();
|
|
||||||
return name.includes(searchLower) || handleId.includes(searchLower);
|
|
||||||
})
|
|
||||||
.sort((a: PlanData, b: PlanData) => {
|
|
||||||
// Sort alphabetically by name
|
|
||||||
return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset displayed count when search completes
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
} finally {
|
|
||||||
this.isSearching = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clear the search
|
|
||||||
*/
|
|
||||||
clearSearch(): void {
|
|
||||||
this.searchTerm = "";
|
|
||||||
this.filteredEntities = [];
|
|
||||||
this.isSearching = false;
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
|
|
||||||
// Clear any pending timeout
|
|
||||||
if (this.searchTimeout) {
|
|
||||||
clearTimeout(this.searchTimeout);
|
|
||||||
this.searchTimeout = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine if more entities can be loaded
|
|
||||||
*/
|
|
||||||
canLoadMore(): boolean {
|
|
||||||
if (this.displayEntitiesFunction) {
|
|
||||||
// Custom function disables infinite scroll
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.searchTerm.trim()) {
|
|
||||||
// Search mode: check filtered entities
|
|
||||||
return this.displayedCount < this.filteredEntities.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.entityType === "projects") {
|
|
||||||
// Projects: check if more available
|
|
||||||
return this.displayedCount < this.entities.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
// People: check if more alphabetical contacts available
|
|
||||||
// Total available = recent + all alphabetical
|
|
||||||
const totalAvailable = RECENT_CONTACTS_COUNT + this.entities.length;
|
|
||||||
return this.displayedCount < totalAvailable;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize infinite scroll on mount
|
|
||||||
*/
|
|
||||||
mounted(): void {
|
|
||||||
this.$nextTick(() => {
|
|
||||||
const container = this.$refs.scrollContainer as HTMLElement;
|
|
||||||
|
|
||||||
if (container) {
|
|
||||||
const { reset } = useInfiniteScroll(
|
|
||||||
container,
|
|
||||||
() => {
|
|
||||||
// Load more: increment displayedCount
|
|
||||||
this.displayedCount += INCREMENT_SIZE;
|
|
||||||
},
|
|
||||||
{
|
|
||||||
distance: 50, // pixels from bottom
|
|
||||||
canLoadMore: () => this.canLoadMore(),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
this.infiniteScrollReset = reset;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit methods using @Emit decorator
|
// Emit methods using @Emit decorator
|
||||||
|
|
||||||
@Emit("entity-selected")
|
@Emit("entity-selected")
|
||||||
@@ -586,33 +340,6 @@ export default class EntityGrid extends Vue {
|
|||||||
} {
|
} {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Watch for changes in search term to reset displayed count
|
|
||||||
*/
|
|
||||||
@Watch("searchTerm")
|
|
||||||
onSearchTermChange(): void {
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Watch for changes in entities prop to reset displayed count
|
|
||||||
*/
|
|
||||||
@Watch("entities")
|
|
||||||
onEntitiesChange(): void {
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cleanup timeouts when component is destroyed
|
|
||||||
*/
|
|
||||||
beforeUnmount(): void {
|
|
||||||
if (this.searchTimeout) {
|
|
||||||
clearTimeout(this.searchTimeout);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,10 @@ from GiftedDialog.vue to handle the complete step 1 * entity selection interface
|
|||||||
with dynamic labeling and grid display. * * Features: * - Dynamic step labeling
|
with dynamic labeling and grid display. * * Features: * - Dynamic step labeling
|
||||||
based on context * - EntityGrid integration for unified entity display * -
|
based on context * - EntityGrid integration for unified entity display * -
|
||||||
Conflict detection and prevention * - Special entity handling (You, Unnamed) * -
|
Conflict detection and prevention * - Special entity handling (You, Unnamed) * -
|
||||||
Cancel functionality * - Event delegation for entity selection * - Warning
|
Show All navigation with context preservation * - Cancel functionality * - Event
|
||||||
notifications for conflicted entities * - Template streamlined with computed CSS
|
delegation for entity selection * - Warning notifications for conflicted
|
||||||
properties * * @author Matthew Raymer */
|
entities * - Template streamlined with computed CSS properties * * @author
|
||||||
|
Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<div id="sectionGiftedGiver">
|
<div id="sectionGiftedGiver">
|
||||||
<label class="block font-bold mb-4">
|
<label class="block font-bold mb-4">
|
||||||
@@ -15,14 +16,18 @@ properties * * @author Matthew Raymer */
|
|||||||
<EntityGrid
|
<EntityGrid
|
||||||
:entity-type="shouldShowProjects ? 'projects' : 'people'"
|
:entity-type="shouldShowProjects ? 'projects' : 'people'"
|
||||||
:entities="shouldShowProjects ? projects : allContacts"
|
:entities="shouldShowProjects ? projects : allContacts"
|
||||||
|
:max-items="10"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="allContacts"
|
:all-contacts="allContacts"
|
||||||
:conflict-checker="conflictChecker"
|
:conflict-checker="conflictChecker"
|
||||||
:show-you-entity="shouldShowYouEntity"
|
:show-you-entity="shouldShowYouEntity"
|
||||||
:you-selectable="youSelectable"
|
:you-selectable="youSelectable"
|
||||||
|
:show-all-route="showAllRoute"
|
||||||
|
:show-all-query-params="showAllQueryParams"
|
||||||
:notify="notify"
|
:notify="notify"
|
||||||
:conflict-context="conflictContext"
|
:conflict-context="conflictContext"
|
||||||
|
:hide-show-all="hideShowAll"
|
||||||
@entity-selected="handleEntitySelected"
|
@entity-selected="handleEntitySelected"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -63,6 +68,7 @@ interface EntitySelectionEvent {
|
|||||||
* - EntityGrid integration for unified entity display
|
* - EntityGrid integration for unified entity display
|
||||||
* - Conflict detection and prevention
|
* - Conflict detection and prevention
|
||||||
* - Special entity handling (You, Unnamed)
|
* - Special entity handling (You, Unnamed)
|
||||||
|
* - Show All navigation with context preservation
|
||||||
* - Cancel functionality
|
* - Cancel functionality
|
||||||
* - Event delegation for entity selection
|
* - Event delegation for entity selection
|
||||||
* - Warning notifications for conflicted entities
|
* - Warning notifications for conflicted entities
|
||||||
@@ -148,6 +154,10 @@ export default class EntitySelectionStep extends Vue {
|
|||||||
@Prop()
|
@Prop()
|
||||||
notify?: (notification: NotificationIface, timeout?: number) => void;
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
|
/** Whether to hide the "Show All" navigation */
|
||||||
|
@Prop({ default: false })
|
||||||
|
hideShowAll!: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CSS classes for the cancel button
|
* CSS classes for the cancel button
|
||||||
*/
|
*/
|
||||||
@@ -212,6 +222,59 @@ export default class EntitySelectionStep extends Vue {
|
|||||||
return !this.conflictChecker(this.activeDid);
|
return !this.conflictChecker(this.activeDid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Route name for "Show All" navigation
|
||||||
|
*/
|
||||||
|
get showAllRoute(): string {
|
||||||
|
if (this.shouldShowProjects) {
|
||||||
|
return "discover";
|
||||||
|
} else if (this.allContacts.length > 0) {
|
||||||
|
return "contact-gift";
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Query parameters for "Show All" navigation
|
||||||
|
*/
|
||||||
|
get showAllQueryParams(): Record<string, string> {
|
||||||
|
const baseParams = {
|
||||||
|
stepType: this.stepType,
|
||||||
|
giverEntityType: this.giverEntityType,
|
||||||
|
recipientEntityType: this.recipientEntityType,
|
||||||
|
// Form field values to preserve
|
||||||
|
description: this.description,
|
||||||
|
amountInput: this.amountInput,
|
||||||
|
unitCode: this.unitCode,
|
||||||
|
offerId: this.offerId,
|
||||||
|
fromProjectId: this.fromProjectId,
|
||||||
|
toProjectId: this.toProjectId,
|
||||||
|
showProjects: this.showProjects.toString(),
|
||||||
|
isFromProjectView: this.isFromProjectView.toString(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (this.shouldShowProjects) {
|
||||||
|
// For project contexts, still pass entity type information
|
||||||
|
return baseParams;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
...baseParams,
|
||||||
|
// Always pass both giver and recipient info for context preservation
|
||||||
|
giverProjectId: this.fromProjectId || "",
|
||||||
|
giverProjectName: this.giver?.name || "",
|
||||||
|
giverProjectImage: this.giver?.image || "",
|
||||||
|
giverProjectHandleId: this.giver?.handleId || "",
|
||||||
|
giverDid: this.giverEntityType === "person" ? this.giver?.did || "" : "",
|
||||||
|
recipientProjectId: this.toProjectId || "",
|
||||||
|
recipientProjectName: this.receiver?.name || "",
|
||||||
|
recipientProjectImage: this.receiver?.image || "",
|
||||||
|
recipientProjectHandleId: this.receiver?.handleId || "",
|
||||||
|
recipientDid:
|
||||||
|
this.recipientEntityType === "person" ? this.receiver?.did || "" : "",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle entity selection from EntityGrid
|
* Handle entity selection from EntityGrid
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -211,6 +211,8 @@ export default class FeedFilters extends Vue {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style>
|
||||||
/* Component-specific styles if needed */
|
#dialogFeedFilters.dialog-overlay {
|
||||||
|
overflow: scroll;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
:unit-code="unitCode"
|
:unit-code="unitCode"
|
||||||
:offer-id="offerId"
|
:offer-id="offerId"
|
||||||
:notify="$notify"
|
:notify="$notify"
|
||||||
|
:hide-show-all="hideShowAll"
|
||||||
@entity-selected="handleEntitySelected"
|
@entity-selected="handleEntitySelected"
|
||||||
@cancel="cancel"
|
@cancel="cancel"
|
||||||
/>
|
/>
|
||||||
@@ -116,6 +117,7 @@ export default class GiftedDialog extends Vue {
|
|||||||
@Prop() fromProjectId = "";
|
@Prop() fromProjectId = "";
|
||||||
@Prop() toProjectId = "";
|
@Prop() toProjectId = "";
|
||||||
@Prop() isFromProjectView = false;
|
@Prop() isFromProjectView = false;
|
||||||
|
@Prop() hideShowAll = false;
|
||||||
@Prop({ default: "person" }) giverEntityType = "person" as
|
@Prop({ default: "person" }) giverEntityType = "person" as
|
||||||
| "person"
|
| "person"
|
||||||
| "project";
|
| "project";
|
||||||
@@ -231,7 +233,7 @@ export default class GiftedDialog extends Vue {
|
|||||||
apiServer: this.apiServer,
|
apiServer: this.apiServer,
|
||||||
});
|
});
|
||||||
|
|
||||||
this.allContacts = await this.$contactsByDateAdded();
|
this.allContacts = await this.$contacts();
|
||||||
|
|
||||||
this.allMyDids = await retrieveAccountDids();
|
this.allMyDids = await retrieveAccountDids();
|
||||||
|
|
||||||
|
|||||||
@@ -293,7 +293,7 @@ const inputImageFileNameRef = ref<Blob>();
|
|||||||
export default class ImageMethodDialog extends Vue {
|
export default class ImageMethodDialog extends Vue {
|
||||||
$notify!: NotifyFunction;
|
$notify!: NotifyFunction;
|
||||||
$router!: Router;
|
$router!: Router;
|
||||||
notify!: ReturnType<typeof createNotifyHelpers>;
|
notify = createNotifyHelpers(this.$notify);
|
||||||
|
|
||||||
/** Active DID for user authentication */
|
/** Active DID for user authentication */
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
@@ -498,9 +498,6 @@ export default class ImageMethodDialog extends Vue {
|
|||||||
* @throws {Error} When settings retrieval fails
|
* @throws {Error} When settings retrieval fails
|
||||||
*/
|
*/
|
||||||
async mounted() {
|
async mounted() {
|
||||||
// Initialize notification helpers
|
|
||||||
this.notify = createNotifyHelpers(this.$notify);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Get activeDid from active_identity table (single source of truth)
|
// Get activeDid from active_identity table (single source of truth)
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
|||||||
@@ -1,255 +1,183 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="space-y-4">
|
||||||
<div class="space-y-4">
|
<!-- Loading State -->
|
||||||
<!-- Loading State -->
|
<div
|
||||||
<div
|
v-if="isLoading"
|
||||||
v-if="isLoading"
|
class="mt-16 text-center text-4xl bg-slate-400 text-white w-14 py-2.5 rounded-full mx-auto"
|
||||||
class="mt-16 text-center text-4xl bg-slate-400 text-white w-14 py-2.5 rounded-full mx-auto"
|
>
|
||||||
>
|
<font-awesome icon="spinner" class="fa-spin-pulse" />
|
||||||
<font-awesome icon="spinner" class="fa-spin-pulse" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Members List -->
|
|
||||||
|
|
||||||
<div v-else>
|
|
||||||
<div class="text-center text-red-600 my-4">
|
|
||||||
{{ decryptionErrorMessage() }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="missingMyself" class="py-4 text-red-600">
|
|
||||||
You are not currently admitted by the organizer.
|
|
||||||
</div>
|
|
||||||
<div v-if="!firstName" class="py-4 text-red-600">
|
|
||||||
Your name is not set, so others may not recognize you. Reload this
|
|
||||||
page to set it.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul class="list-disc text-sm ps-4 space-y-2 mb-4">
|
|
||||||
<li
|
|
||||||
v-if="
|
|
||||||
membersToShow().length > 0 && showOrganizerTools && isOrganizer
|
|
||||||
"
|
|
||||||
>
|
|
||||||
Click
|
|
||||||
<font-awesome icon="circle-plus" class="text-blue-500 text-sm" />
|
|
||||||
/
|
|
||||||
<font-awesome icon="circle-minus" class="text-rose-500 text-sm" />
|
|
||||||
to add/remove them to/from the meeting.
|
|
||||||
</li>
|
|
||||||
<li
|
|
||||||
v-if="
|
|
||||||
membersToShow().length > 0 && getNonContactMembers().length > 0
|
|
||||||
"
|
|
||||||
>
|
|
||||||
Click
|
|
||||||
<font-awesome icon="circle-user" class="text-green-600 text-sm" />
|
|
||||||
to add them to your contacts.
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div class="flex justify-between">
|
|
||||||
<!--
|
|
||||||
always have at least one refresh button even without members in case the organizer
|
|
||||||
changes the password
|
|
||||||
-->
|
|
||||||
<button
|
|
||||||
class="text-sm 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-3 py-1.5 rounded-md"
|
|
||||||
title="Refresh members list now"
|
|
||||||
@click="refreshData(false)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
|
|
||||||
Refresh
|
|
||||||
<span class="text-xs">({{ countdownTimer }}s)</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<ul
|
|
||||||
v-if="membersToShow().length > 0"
|
|
||||||
class="border-t border-slate-300 my-2"
|
|
||||||
>
|
|
||||||
<li
|
|
||||||
v-for="member in membersToShow()"
|
|
||||||
:key="member.member.memberId"
|
|
||||||
:class="[
|
|
||||||
'border-b px-2 sm:px-3 py-1.5',
|
|
||||||
{
|
|
||||||
'bg-blue-50 border-t border-blue-300 -mt-[1px]':
|
|
||||||
!member.member.admitted &&
|
|
||||||
(isOrganizer || member.did === activeDid),
|
|
||||||
},
|
|
||||||
{ 'border-slate-300': member.member.admitted },
|
|
||||||
]"
|
|
||||||
>
|
|
||||||
<div class="flex items-center gap-2 justify-between">
|
|
||||||
<div class="flex items-center gap-1 overflow-hidden">
|
|
||||||
<h3
|
|
||||||
:class="[
|
|
||||||
'font-semibold truncate',
|
|
||||||
{
|
|
||||||
'text-slate-500':
|
|
||||||
!member.member.admitted &&
|
|
||||||
(isOrganizer || member.did === activeDid),
|
|
||||||
},
|
|
||||||
]"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
v-if="member.member.memberId === members[0]?.memberId"
|
|
||||||
icon="crown"
|
|
||||||
class="fa-fw text-amber-400"
|
|
||||||
/>
|
|
||||||
<font-awesome
|
|
||||||
v-if="member.did === activeDid"
|
|
||||||
icon="hand"
|
|
||||||
class="fa-fw text-slate-500"
|
|
||||||
/>
|
|
||||||
<font-awesome
|
|
||||||
v-if="
|
|
||||||
!member.member.admitted &&
|
|
||||||
(isOrganizer || member.did === activeDid)
|
|
||||||
"
|
|
||||||
icon="hourglass-half"
|
|
||||||
class="fa-fw text-slate-400"
|
|
||||||
/>
|
|
||||||
{{ member.name || unnamedMember }}
|
|
||||||
</h3>
|
|
||||||
<div
|
|
||||||
v-if="!getContactFor(member.did) && member.did !== activeDid"
|
|
||||||
class="flex items-center gap-1.5 ml-2 ms-1"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="btn-add-contact ml-2"
|
|
||||||
title="Add as contact"
|
|
||||||
@click="addAsContact(member)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="circle-user" />
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
class="btn-info-contact ml-2"
|
|
||||||
title="Contact Info"
|
|
||||||
@click="
|
|
||||||
informAboutAddingContact(
|
|
||||||
getContactFor(member.did) !== undefined,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<font-awesome icon="circle-info" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="getContactFor(member.did) && member.did !== activeDid"
|
|
||||||
class="flex items-center gap-1.5 ms-1"
|
|
||||||
>
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'contact-edit', params: { did: member.did } }"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
icon="pen"
|
|
||||||
class="text-sm text-blue-500 ml-2 mb-1"
|
|
||||||
/>
|
|
||||||
</router-link>
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'did', params: { did: member.did } }"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
icon="arrow-up-right-from-square"
|
|
||||||
class="text-sm text-blue-500 ml-2 mb-1"
|
|
||||||
/>
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<span
|
|
||||||
v-if="
|
|
||||||
showOrganizerTools && isOrganizer && member.did !== activeDid
|
|
||||||
"
|
|
||||||
class="flex items-center gap-1.5"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
:class="
|
|
||||||
member.member.admitted
|
|
||||||
? 'btn-admission-remove'
|
|
||||||
: 'btn-admission-add'
|
|
||||||
"
|
|
||||||
:title="
|
|
||||||
member.member.admitted ? 'Remove member' : 'Admit member'
|
|
||||||
"
|
|
||||||
@click="checkWhetherContactBeforeAdmitting(member)"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
:icon="
|
|
||||||
member.member.admitted ? 'circle-minus' : 'circle-plus'
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
class="btn-info-admission"
|
|
||||||
title="Admission Info"
|
|
||||||
@click="informAboutAdmission()"
|
|
||||||
>
|
|
||||||
<font-awesome icon="circle-info" />
|
|
||||||
</button>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<p class="text-xs text-gray-600 truncate">
|
|
||||||
{{ member.did }}
|
|
||||||
</p>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div v-if="membersToShow().length > 0" class="flex justify-between">
|
|
||||||
<!--
|
|
||||||
always have at least one refresh button even without members in case the organizer
|
|
||||||
changes the password
|
|
||||||
-->
|
|
||||||
<button
|
|
||||||
class="text-sm 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-3 py-1.5 rounded-md"
|
|
||||||
title="Refresh members list now"
|
|
||||||
@click="refreshData(false)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
|
|
||||||
Refresh
|
|
||||||
<span class="text-xs">({{ countdownTimer }}s)</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p v-if="members.length === 0" class="text-gray-500 py-4">
|
|
||||||
No members have joined this meeting yet
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Bulk Members Dialog for both admitting and setting visibility -->
|
<!-- Members List -->
|
||||||
<BulkMembersDialog
|
|
||||||
ref="bulkMembersDialog"
|
<div v-else>
|
||||||
:active-did="activeDid"
|
<div class="text-center text-red-600 py-4">
|
||||||
:api-server="apiServer"
|
{{ decryptionErrorMessage() }}
|
||||||
:is-organizer="isOrganizer"
|
</div>
|
||||||
@close="closeBulkMembersDialogCallback"
|
|
||||||
/>
|
<div v-if="missingMyself" class="py-4 text-red-600">
|
||||||
|
You are not currently admitted by the organizer.
|
||||||
|
</div>
|
||||||
|
<div v-if="!firstName" class="py-4 text-red-600">
|
||||||
|
Your name is not set, so others may not recognize you. Reload this page
|
||||||
|
to set it.
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<span
|
||||||
|
v-if="membersToShow().length > 0 && showOrganizerTools && isOrganizer"
|
||||||
|
class="inline-flex items-center flex-wrap"
|
||||||
|
>
|
||||||
|
<span class="inline-flex items-center">
|
||||||
|
• Click
|
||||||
|
<span
|
||||||
|
class="mx-2 min-w-[24px] min-h-[24px] w-6 h-6 flex items-center justify-center rounded-full bg-blue-100 text-blue-600"
|
||||||
|
>
|
||||||
|
<font-awesome icon="plus" class="text-sm" />
|
||||||
|
</span>
|
||||||
|
/
|
||||||
|
<span
|
||||||
|
class="mx-2 min-w-[24px] min-h-[24px] w-6 h-6 flex items-center justify-center rounded-full bg-blue-100 text-blue-600"
|
||||||
|
>
|
||||||
|
<font-awesome icon="minus" class="text-sm" />
|
||||||
|
</span>
|
||||||
|
to add/remove them to/from the meeting.
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<span
|
||||||
|
v-if="membersToShow().length > 0"
|
||||||
|
class="inline-flex items-center"
|
||||||
|
>
|
||||||
|
• Click
|
||||||
|
<span
|
||||||
|
class="mx-2 w-8 h-8 flex items-center justify-center rounded-full bg-green-100 text-green-600"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-user" class="text-xl" />
|
||||||
|
</span>
|
||||||
|
to add them to your contacts.
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex justify-center">
|
||||||
|
<!--
|
||||||
|
always have at least one refresh button even without members in case the organizer
|
||||||
|
changes the password
|
||||||
|
-->
|
||||||
|
<button
|
||||||
|
class="btn-action-refresh"
|
||||||
|
title="Refresh members list"
|
||||||
|
@click="fetchMembers"
|
||||||
|
>
|
||||||
|
<font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-for="member in membersToShow()"
|
||||||
|
:key="member.member.memberId"
|
||||||
|
class="mt-2 p-4 bg-gray-50 rounded-lg"
|
||||||
|
>
|
||||||
|
<div class="flex items-center justify-between">
|
||||||
|
<div class="flex items-center">
|
||||||
|
<h3 class="text-lg font-medium">
|
||||||
|
{{ member.name || unnamedMember }}
|
||||||
|
</h3>
|
||||||
|
<div
|
||||||
|
v-if="!getContactFor(member.did) && member.did !== activeDid"
|
||||||
|
class="flex justify-end"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn-add-contact"
|
||||||
|
title="Add as contact"
|
||||||
|
@click="addAsContact(member)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-user" class="text-xl" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
v-if="member.did !== activeDid"
|
||||||
|
class="btn-info-contact"
|
||||||
|
title="Contact info"
|
||||||
|
@click="
|
||||||
|
informAboutAddingContact(
|
||||||
|
getContactFor(member.did) !== undefined,
|
||||||
|
)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-info" class="text-base" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="flex">
|
||||||
|
<span
|
||||||
|
v-if="
|
||||||
|
showOrganizerTools && isOrganizer && member.did !== activeDid
|
||||||
|
"
|
||||||
|
class="flex items-center"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn-admission"
|
||||||
|
:title="
|
||||||
|
member.member.admitted ? 'Remove member' : 'Admit member'
|
||||||
|
"
|
||||||
|
@click="checkWhetherContactBeforeAdmitting(member)"
|
||||||
|
>
|
||||||
|
<font-awesome
|
||||||
|
:icon="member.member.admitted ? 'minus' : 'plus'"
|
||||||
|
class="text-sm"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="btn-info-admission"
|
||||||
|
title="Admission info"
|
||||||
|
@click="informAboutAdmission()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-info" class="text-base" />
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="text-sm text-gray-600 truncate">
|
||||||
|
{{ member.did }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div v-if="membersToShow().length > 0" class="flex justify-center mt-4">
|
||||||
|
<button
|
||||||
|
class="btn-action-refresh"
|
||||||
|
title="Refresh members list"
|
||||||
|
@click="fetchMembers"
|
||||||
|
>
|
||||||
|
<font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p v-if="members.length === 0" class="text-gray-500 py-4">
|
||||||
|
No members have joined this meeting yet
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue, Prop, Emit } from "vue-facing-decorator";
|
import { Component, Vue, Prop, Emit } from "vue-facing-decorator";
|
||||||
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import {
|
|
||||||
NOTIFY_ADD_CONTACT_FIRST,
|
|
||||||
NOTIFY_CONTINUE_WITHOUT_ADDING,
|
|
||||||
} from "@/constants/notifications";
|
|
||||||
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
|
||||||
import {
|
import {
|
||||||
errorStringForLog,
|
errorStringForLog,
|
||||||
getHeaders,
|
getHeaders,
|
||||||
register,
|
register,
|
||||||
serverMessageForUser,
|
serverMessageForUser,
|
||||||
} from "@/libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import { decryptMessage } from "@/libs/crypto";
|
import { decryptMessage } from "../libs/crypto";
|
||||||
import { Contact } from "@/db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
import { MemberData } from "@/interfaces";
|
import * as libsUtil from "../libs/util";
|
||||||
|
import { NotificationIface } from "../constants/app";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||||
import BulkMembersDialog from "./BulkMembersDialog.vue";
|
import {
|
||||||
|
NOTIFY_ADD_CONTACT_FIRST,
|
||||||
|
NOTIFY_CONTINUE_WITHOUT_ADDING,
|
||||||
|
} from "@/constants/notifications";
|
||||||
|
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
||||||
|
|
||||||
interface Member {
|
interface Member {
|
||||||
admitted: boolean;
|
admitted: boolean;
|
||||||
@@ -265,15 +193,13 @@ interface DecryptedMember {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
|
||||||
BulkMembersDialog,
|
|
||||||
},
|
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class MembersList extends Vue {
|
export default class MembersList extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
notify!: ReturnType<typeof createNotifyHelpers>;
|
notify!: ReturnType<typeof createNotifyHelpers>;
|
||||||
|
libsUtil = libsUtil;
|
||||||
|
|
||||||
@Prop({ required: true }) password!: string;
|
@Prop({ required: true }) password!: string;
|
||||||
@Prop({ default: false }) showOrganizerTools!: boolean;
|
@Prop({ default: false }) showOrganizerTools!: boolean;
|
||||||
@@ -284,7 +210,6 @@ export default class MembersList extends Vue {
|
|||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
contacts: Array<Contact> = [];
|
|
||||||
decryptedMembers: DecryptedMember[] = [];
|
decryptedMembers: DecryptedMember[] = [];
|
||||||
firstName = "";
|
firstName = "";
|
||||||
isLoading = true;
|
isLoading = true;
|
||||||
@@ -294,12 +219,7 @@ export default class MembersList extends Vue {
|
|||||||
missingMyself = false;
|
missingMyself = false;
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
|
contacts: Array<Contact> = [];
|
||||||
// Auto-refresh functionality
|
|
||||||
countdownTimer = 10;
|
|
||||||
autoRefreshInterval: NodeJS.Timeout | null = null;
|
|
||||||
lastRefreshTime = 0;
|
|
||||||
previousMemberDidsIgnored: string[] = [];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the unnamed member constant
|
* Get the unnamed member constant
|
||||||
@@ -320,8 +240,8 @@ export default class MembersList extends Vue {
|
|||||||
|
|
||||||
this.apiServer = settings.apiServer || "";
|
this.apiServer = settings.apiServer || "";
|
||||||
this.firstName = settings.firstName || "";
|
this.firstName = settings.firstName || "";
|
||||||
|
await this.fetchMembers();
|
||||||
this.refreshData();
|
await this.loadContacts();
|
||||||
}
|
}
|
||||||
|
|
||||||
async fetchMembers() {
|
async fetchMembers() {
|
||||||
@@ -367,10 +287,7 @@ export default class MembersList extends Vue {
|
|||||||
const content = JSON.parse(decryptedContent);
|
const content = JSON.parse(decryptedContent);
|
||||||
|
|
||||||
this.decryptedMembers.push({
|
this.decryptedMembers.push({
|
||||||
member: {
|
member: member,
|
||||||
...member,
|
|
||||||
admitted: member.admitted !== undefined ? member.admitted : true, // Default to true for non-organizers
|
|
||||||
},
|
|
||||||
name: content.name,
|
name: content.name,
|
||||||
did: content.did,
|
did: content.did,
|
||||||
isRegistered: !!content.isRegistered,
|
isRegistered: !!content.isRegistered,
|
||||||
@@ -412,81 +329,22 @@ export default class MembersList extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
membersToShow(): DecryptedMember[] {
|
membersToShow(): DecryptedMember[] {
|
||||||
let members: DecryptedMember[] = [];
|
|
||||||
|
|
||||||
if (this.isOrganizer) {
|
if (this.isOrganizer) {
|
||||||
if (this.showOrganizerTools) {
|
if (this.showOrganizerTools) {
|
||||||
members = this.decryptedMembers;
|
return this.decryptedMembers;
|
||||||
} else {
|
} else {
|
||||||
members = this.decryptedMembers.filter(
|
return this.decryptedMembers.filter(
|
||||||
(member: DecryptedMember) => member.member.admitted,
|
(member: DecryptedMember) => member.member.admitted,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
// non-organizers only get visible members from server, plus themselves
|
|
||||||
|
|
||||||
// Check if current user is already in the decrypted members list
|
|
||||||
if (
|
|
||||||
!this.decryptedMembers.find((member) => member.did === this.activeDid)
|
|
||||||
) {
|
|
||||||
// this is a stub for this user just in case they are waiting to get in
|
|
||||||
// which is especially useful so they can see their own DID
|
|
||||||
const currentUser: DecryptedMember = {
|
|
||||||
member: {
|
|
||||||
admitted: false,
|
|
||||||
content: "{}",
|
|
||||||
memberId: -1,
|
|
||||||
},
|
|
||||||
name: this.firstName,
|
|
||||||
did: this.activeDid,
|
|
||||||
isRegistered: false,
|
|
||||||
};
|
|
||||||
members = [currentUser, ...this.decryptedMembers];
|
|
||||||
} else {
|
|
||||||
members = this.decryptedMembers;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// non-organizers only get visible members from server
|
||||||
// Sort members according to priority:
|
return this.decryptedMembers;
|
||||||
// 1. Organizer at the top
|
|
||||||
// 2. Current user next
|
|
||||||
// 3. Non-admitted members next
|
|
||||||
// 4. Everyone else after
|
|
||||||
return members.sort((a, b) => {
|
|
||||||
// Check if either member is the organizer (first member in original list)
|
|
||||||
const aIsOrganizer = a.member.memberId === this.members[0]?.memberId;
|
|
||||||
const bIsOrganizer = b.member.memberId === this.members[0]?.memberId;
|
|
||||||
|
|
||||||
// Check if either member is the current user
|
|
||||||
const aIsCurrentUser = a.did === this.activeDid;
|
|
||||||
const bIsCurrentUser = b.did === this.activeDid;
|
|
||||||
|
|
||||||
// Organizer always comes first
|
|
||||||
if (aIsOrganizer && !bIsOrganizer) return -1;
|
|
||||||
if (!aIsOrganizer && bIsOrganizer) return 1;
|
|
||||||
|
|
||||||
// If both are organizers, maintain original order
|
|
||||||
if (aIsOrganizer && bIsOrganizer) return 0;
|
|
||||||
|
|
||||||
// Current user comes second (after organizer)
|
|
||||||
if (aIsCurrentUser && !bIsCurrentUser && !bIsOrganizer) return -1;
|
|
||||||
if (!aIsCurrentUser && bIsCurrentUser && !aIsOrganizer) return 1;
|
|
||||||
|
|
||||||
// If both are current users, maintain original order
|
|
||||||
if (aIsCurrentUser && bIsCurrentUser) return 0;
|
|
||||||
|
|
||||||
// Non-admitted members come before admitted members
|
|
||||||
if (!a.member.admitted && b.member.admitted) return -1;
|
|
||||||
if (a.member.admitted && !b.member.admitted) return 1;
|
|
||||||
|
|
||||||
// If admission status is the same, maintain original order
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
informAboutAdmission() {
|
informAboutAdmission() {
|
||||||
this.notify.info(
|
this.notify.info(
|
||||||
"This is to register people in Time Safari and to admit them to the meeting. A (+) symbol means they are not yet admitted and you can register and admit them. A (-) symbol means you can remove them, but they will stay registered.",
|
"This is to register people in Time Safari and to admit them to the meeting. A '+' symbol means they are not yet admitted and you can register and admit them. A '-' means you can remove them, but they will stay registered.",
|
||||||
TIMEOUTS.VERY_LONG,
|
TIMEOUTS.VERY_LONG,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -505,85 +363,18 @@ export default class MembersList extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async loadContacts() {
|
||||||
|
this.contacts = await this.$getAllContacts();
|
||||||
|
}
|
||||||
|
|
||||||
getContactFor(did: string): Contact | undefined {
|
getContactFor(did: string): Contact | undefined {
|
||||||
return this.contacts.find((contact) => contact.did === did);
|
return this.contacts.find((contact) => contact.did === did);
|
||||||
}
|
}
|
||||||
|
|
||||||
getPendingMembersToAdmit(): MemberData[] {
|
|
||||||
return this.decryptedMembers
|
|
||||||
.filter(
|
|
||||||
(member) => member.did !== this.activeDid && !member.member.admitted,
|
|
||||||
)
|
|
||||||
.map(this.convertDecryptedMemberToMemberData);
|
|
||||||
}
|
|
||||||
|
|
||||||
getNonContactMembers(): MemberData[] {
|
|
||||||
return this.decryptedMembers
|
|
||||||
.filter(
|
|
||||||
(member) =>
|
|
||||||
member.did !== this.activeDid && !this.getContactFor(member.did),
|
|
||||||
)
|
|
||||||
.map(this.convertDecryptedMemberToMemberData);
|
|
||||||
}
|
|
||||||
|
|
||||||
convertDecryptedMemberToMemberData(
|
|
||||||
decryptedMember: DecryptedMember,
|
|
||||||
): MemberData {
|
|
||||||
return {
|
|
||||||
did: decryptedMember.did,
|
|
||||||
name: decryptedMember.name,
|
|
||||||
isContact: !!this.getContactFor(decryptedMember.did),
|
|
||||||
member: {
|
|
||||||
memberId: decryptedMember.member.memberId.toString(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show the bulk members dialog if conditions are met
|
|
||||||
* (admit pending members for organizers, add to contacts for non-organizers)
|
|
||||||
*/
|
|
||||||
async refreshData(bypassPromptIfAllWereIgnored = true) {
|
|
||||||
// Force refresh both contacts and members
|
|
||||||
this.contacts = await this.$getAllContacts();
|
|
||||||
await this.fetchMembers();
|
|
||||||
|
|
||||||
const pendingMembers = this.isOrganizer
|
|
||||||
? this.getPendingMembersToAdmit()
|
|
||||||
: this.getNonContactMembers();
|
|
||||||
if (pendingMembers.length === 0) {
|
|
||||||
this.startAutoRefresh();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (bypassPromptIfAllWereIgnored) {
|
|
||||||
// only show if there are members that have not been ignored
|
|
||||||
const pendingMembersNotIgnored = pendingMembers.filter(
|
|
||||||
(member) => !this.previousMemberDidsIgnored.includes(member.did),
|
|
||||||
);
|
|
||||||
if (pendingMembersNotIgnored.length === 0) {
|
|
||||||
this.startAutoRefresh();
|
|
||||||
// everyone waiting has been ignored
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.stopAutoRefresh();
|
|
||||||
(this.$refs.bulkMembersDialog as BulkMembersDialog).open(pendingMembers);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bulk Members Dialog methods
|
|
||||||
async closeBulkMembersDialogCallback(
|
|
||||||
result: { notSelectedMemberDids: string[] } | undefined,
|
|
||||||
) {
|
|
||||||
this.previousMemberDidsIgnored = result?.notSelectedMemberDids || [];
|
|
||||||
|
|
||||||
await this.refreshData();
|
|
||||||
}
|
|
||||||
|
|
||||||
checkWhetherContactBeforeAdmitting(decrMember: DecryptedMember) {
|
checkWhetherContactBeforeAdmitting(decrMember: DecryptedMember) {
|
||||||
const contact = this.getContactFor(decrMember.did);
|
const contact = this.getContactFor(decrMember.did);
|
||||||
if (!decrMember.member.admitted && !contact) {
|
if (!decrMember.member.admitted && !contact) {
|
||||||
// If not a contact, stop auto-refresh and show confirmation dialog
|
// If not a contact, show confirmation dialog
|
||||||
this.stopAutoRefresh();
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "modal",
|
group: "modal",
|
||||||
@@ -596,7 +387,6 @@ export default class MembersList extends Vue {
|
|||||||
await this.addAsContact(decrMember);
|
await this.addAsContact(decrMember);
|
||||||
// After adding as contact, proceed with admission
|
// After adding as contact, proceed with admission
|
||||||
await this.toggleAdmission(decrMember);
|
await this.toggleAdmission(decrMember);
|
||||||
this.startAutoRefresh();
|
|
||||||
},
|
},
|
||||||
onNo: async () => {
|
onNo: async () => {
|
||||||
// If they choose not to add as contact, show second confirmation
|
// If they choose not to add as contact, show second confirmation
|
||||||
@@ -609,19 +399,14 @@ export default class MembersList extends Vue {
|
|||||||
yesText: NOTIFY_CONTINUE_WITHOUT_ADDING.yesText,
|
yesText: NOTIFY_CONTINUE_WITHOUT_ADDING.yesText,
|
||||||
onYes: async () => {
|
onYes: async () => {
|
||||||
await this.toggleAdmission(decrMember);
|
await this.toggleAdmission(decrMember);
|
||||||
this.startAutoRefresh();
|
|
||||||
},
|
},
|
||||||
onCancel: async () => {
|
onCancel: async () => {
|
||||||
// Do nothing, effectively canceling the operation
|
// Do nothing, effectively canceling the operation
|
||||||
this.startAutoRefresh();
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
TIMEOUTS.MODAL,
|
TIMEOUTS.MODAL,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
onCancel: async () => {
|
|
||||||
this.startAutoRefresh();
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
TIMEOUTS.MODAL,
|
TIMEOUTS.MODAL,
|
||||||
);
|
);
|
||||||
@@ -723,41 +508,6 @@ export default class MembersList extends Vue {
|
|||||||
this.notify.error(message, TIMEOUTS.LONG);
|
this.notify.error(message, TIMEOUTS.LONG);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
startAutoRefresh() {
|
|
||||||
this.stopAutoRefresh();
|
|
||||||
this.lastRefreshTime = Date.now();
|
|
||||||
this.countdownTimer = 10;
|
|
||||||
|
|
||||||
this.autoRefreshInterval = setInterval(() => {
|
|
||||||
const now = Date.now();
|
|
||||||
const timeSinceLastRefresh = (now - this.lastRefreshTime) / 1000;
|
|
||||||
|
|
||||||
if (timeSinceLastRefresh >= 10) {
|
|
||||||
// Time to refresh
|
|
||||||
this.refreshData();
|
|
||||||
this.lastRefreshTime = now;
|
|
||||||
this.countdownTimer = 10;
|
|
||||||
} else {
|
|
||||||
// Update countdown
|
|
||||||
this.countdownTimer = Math.max(
|
|
||||||
0,
|
|
||||||
Math.round(10 - timeSinceLastRefresh),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}, 1000); // Update every second
|
|
||||||
}
|
|
||||||
|
|
||||||
stopAutoRefresh() {
|
|
||||||
if (this.autoRefreshInterval) {
|
|
||||||
clearInterval(this.autoRefreshInterval);
|
|
||||||
this.autoRefreshInterval = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeDestroy() {
|
|
||||||
this.stopAutoRefresh();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -772,26 +522,29 @@ export default class MembersList extends Vue {
|
|||||||
|
|
||||||
.btn-add-contact {
|
.btn-add-contact {
|
||||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||||
@apply text-lg text-green-600 hover:text-green-800
|
@apply ml-2 w-8 h-8 flex items-center justify-center rounded-full
|
||||||
|
bg-green-100 text-green-600 hover:bg-green-200 hover:text-green-800
|
||||||
|
transition-colors;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-info-contact {
|
||||||
|
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||||
|
@apply ml-2 mb-2 w-6 h-6 flex items-center justify-center rounded-full
|
||||||
|
bg-slate-100 text-slate-500 hover:bg-slate-200 hover:text-slate-800
|
||||||
|
transition-colors;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-admission {
|
||||||
|
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||||
|
@apply mr-2 w-6 h-6 flex items-center justify-center rounded-full
|
||||||
|
bg-blue-100 text-blue-600 hover:bg-blue-200 hover:text-blue-800
|
||||||
transition-colors;
|
transition-colors;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-info-contact,
|
|
||||||
.btn-info-admission {
|
.btn-info-admission {
|
||||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||||
@apply text-slate-400 hover:text-slate-600
|
@apply mr-2 mb-2 w-6 h-6 flex items-center justify-center rounded-full
|
||||||
transition-colors;
|
bg-slate-100 text-slate-500 hover:bg-slate-200 hover:text-slate-800
|
||||||
}
|
|
||||||
|
|
||||||
.btn-admission-add {
|
|
||||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
|
||||||
@apply text-lg text-blue-500 hover:text-blue-700
|
|
||||||
transition-colors;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-admission-remove {
|
|
||||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
|
||||||
@apply text-lg text-rose-500 hover:text-rose-700
|
|
||||||
transition-colors;
|
transition-colors;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -3,25 +3,30 @@ GiftedDialog.vue to handle person entity display * with selection states and
|
|||||||
conflict detection. * * @author Matthew Raymer */
|
conflict detection. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<li :class="cardClasses" @click="handleClick">
|
<li :class="cardClasses" @click="handleClick">
|
||||||
<div>
|
<div class="relative w-fit mx-auto">
|
||||||
<EntityIcon
|
<EntityIcon
|
||||||
v-if="person.did"
|
v-if="person.did"
|
||||||
:contact="person"
|
:contact="person"
|
||||||
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
|
||||||
/>
|
/>
|
||||||
<font-awesome
|
<font-awesome
|
||||||
v-else
|
v-else
|
||||||
icon="circle-question"
|
icon="circle-question"
|
||||||
class="text-slate-400 text-5xl mb-1 shrink-0"
|
class="text-slate-400 text-5xl mb-1"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<!-- Time icon overlay for contacts -->
|
||||||
|
<div
|
||||||
|
v-if="person.did && showTimeIcon"
|
||||||
|
class="rounded-full bg-slate-400 absolute bottom-0 right-0 p-1 translate-x-1/3"
|
||||||
|
>
|
||||||
|
<font-awesome icon="clock" class="block text-white text-xs w-[1em]" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="overflow-hidden">
|
<h3 :class="nameClasses">
|
||||||
<h3 :class="nameClasses">
|
{{ displayName }}
|
||||||
{{ displayName }}
|
</h3>
|
||||||
</h3>
|
|
||||||
<p class="text-xs text-slate-500 truncate">{{ person.did }}</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
</li>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -76,32 +81,29 @@ export default class PersonCard extends Vue {
|
|||||||
* Computed CSS classes for the card
|
* Computed CSS classes for the card
|
||||||
*/
|
*/
|
||||||
get cardClasses(): string {
|
get cardClasses(): string {
|
||||||
const baseCardClasses =
|
|
||||||
"flex items-center gap-2 px-2 py-1.5 border-b border-slate-300";
|
|
||||||
|
|
||||||
if (!this.selectable || this.conflicted) {
|
if (!this.selectable || this.conflicted) {
|
||||||
return `${baseCardClasses} *:opacity-50 cursor-not-allowed`;
|
return "opacity-50 cursor-not-allowed";
|
||||||
}
|
}
|
||||||
|
return "cursor-pointer hover:bg-slate-50";
|
||||||
return `${baseCardClasses} cursor-pointer hover:bg-slate-50`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the person name
|
* Computed CSS classes for the person name
|
||||||
*/
|
*/
|
||||||
get nameClasses(): string {
|
get nameClasses(): string {
|
||||||
const baseNameClasses = "text-sm font-semibold truncate";
|
const baseClasses =
|
||||||
|
"text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden";
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseNameClasses} text-slate-500`;
|
return `${baseClasses} text-slate-400`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add italic styling for entities without set names
|
// Add italic styling for entities without set names
|
||||||
if (!this.person.name) {
|
if (!this.person.name) {
|
||||||
return `${baseNameClasses} italic text-slate-500`;
|
return `${baseClasses} italic text-slate-500`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return baseNameClasses;
|
return baseClasses;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,26 +2,25 @@
|
|||||||
GiftedDialog.vue to handle project entity display * with selection states and
|
GiftedDialog.vue to handle project entity display * with selection states and
|
||||||
issuer information. * * @author Matthew Raymer */
|
issuer information. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<li
|
<li class="cursor-pointer" @click="handleClick">
|
||||||
class="flex items-center gap-2 px-2 py-1.5 border-b border-slate-300 hover:bg-slate-50 cursor-pointer"
|
<div class="relative w-fit mx-auto">
|
||||||
@click="handleClick"
|
<ProjectIcon
|
||||||
>
|
:entity-id="project.handleId"
|
||||||
<ProjectIcon
|
:icon-size="48"
|
||||||
:entity-id="project.handleId"
|
:image-url="project.image"
|
||||||
:icon-size="48"
|
class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
|
||||||
:image-url="project.image"
|
/>
|
||||||
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
</div>
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="overflow-hidden">
|
<h3
|
||||||
<h3 class="text-sm font-semibold truncate">
|
class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
|
||||||
{{ project.name || unnamedProject }}
|
>
|
||||||
</h3>
|
{{ project.name || unnamedProject }}
|
||||||
|
</h3>
|
||||||
|
|
||||||
<div class="text-xs text-slate-500 truncate">
|
<div class="text-xs text-slate-500 truncate">
|
||||||
<font-awesome icon="user" class="text-slate-400" />
|
<font-awesome icon="user" class="fa-fw text-slate-400" />
|
||||||
{{ issuerDisplayName }}
|
{{ issuerDisplayName }}
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,117 +0,0 @@
|
|||||||
<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>
|
|
||||||
@@ -14,11 +14,20 @@
|
|||||||
'text-slate-500': selected !== 'Home',
|
'text-slate-500': selected !== 'Home',
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<router-link :to="{ name: 'home' }" class="block text-center py-2 px-1">
|
<router-link
|
||||||
|
:to="{ name: 'home' }"
|
||||||
|
class="relative block text-center py-2 px-1"
|
||||||
|
>
|
||||||
<div class="flex flex-col items-center">
|
<div class="flex flex-col items-center">
|
||||||
<font-awesome icon="house-chimney" class="fa-fw" />
|
<font-awesome icon="house-chimney" class="fa-fw" />
|
||||||
<span class="text-xs mt-1">feed</span>
|
<span class="text-xs mt-1">feed</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Notification dot - show while the user has unread notifications -->
|
||||||
|
<font-awesome
|
||||||
|
icon="circle"
|
||||||
|
class="absolute left-1/2 top-1 translate-x-2 text-rose-500 text-[10px] border border-white rounded-full"
|
||||||
|
></font-awesome>
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
<!-- Search -->
|
<!-- Search -->
|
||||||
@@ -89,7 +98,7 @@
|
|||||||
>
|
>
|
||||||
<router-link
|
<router-link
|
||||||
:to="{ name: 'account' }"
|
:to="{ name: 'account' }"
|
||||||
class="block text-center py-2 px-1"
|
class="relative block text-center py-2 px-1"
|
||||||
>
|
>
|
||||||
<div class="flex flex-col items-center">
|
<div class="flex flex-col items-center">
|
||||||
<font-awesome icon="circle-user" class="fa-fw" />
|
<font-awesome icon="circle-user" class="fa-fw" />
|
||||||
@@ -102,6 +111,12 @@
|
|||||||
-->
|
-->
|
||||||
<span class="text-xs mt-1">profile</span>
|
<span class="text-xs mt-1">profile</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Notification dot - show while the user has not yet backed up their seed phrase -->
|
||||||
|
<font-awesome
|
||||||
|
icon="circle"
|
||||||
|
class="absolute left-1/2 top-1 translate-x-2 text-rose-500 text-[10px] border border-white rounded-full"
|
||||||
|
></font-awesome>
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
66
src/components/ShowAllCard.vue
Normal file
66
src/components/ShowAllCard.vue
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
/** * ShowAllCard.vue - Show All navigation card component * * Extracted from
|
||||||
|
GiftedDialog.vue to handle "Show All" navigation * for both people and projects
|
||||||
|
entity types. * * @author Matthew Raymer */
|
||||||
|
<template>
|
||||||
|
<li class="cursor-pointer">
|
||||||
|
<router-link :to="navigationRoute" class="block text-center">
|
||||||
|
<font-awesome icon="circle-right" class="text-blue-500 text-5xl mb-1" />
|
||||||
|
<h3
|
||||||
|
class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
|
||||||
|
>
|
||||||
|
Show All
|
||||||
|
</h3>
|
||||||
|
</router-link>
|
||||||
|
</li>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { Component, Prop, Vue } from "vue-facing-decorator";
|
||||||
|
import { RouteLocationRaw } from "vue-router";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ShowAllCard - Displays "Show All" navigation for entity grids
|
||||||
|
*
|
||||||
|
* Features:
|
||||||
|
* - Provides navigation to full entity listings
|
||||||
|
* - Supports different routes based on entity type
|
||||||
|
* - Maintains context through query parameters
|
||||||
|
* - Consistent visual styling with other cards
|
||||||
|
*/
|
||||||
|
@Component({ name: "ShowAllCard" })
|
||||||
|
export default class ShowAllCard extends Vue {
|
||||||
|
/** Type of entities being shown */
|
||||||
|
@Prop({ required: true })
|
||||||
|
entityType!: "people" | "projects";
|
||||||
|
|
||||||
|
/** Route name to navigate to */
|
||||||
|
@Prop({ required: true })
|
||||||
|
routeName!: string;
|
||||||
|
|
||||||
|
/** Query parameters to pass to the route */
|
||||||
|
@Prop({ default: () => ({}) })
|
||||||
|
queryParams!: Record<string, string>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed navigation route with query parameters
|
||||||
|
*/
|
||||||
|
get navigationRoute(): RouteLocationRaw {
|
||||||
|
return {
|
||||||
|
name: this.routeName,
|
||||||
|
query: this.queryParams,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
/* Ensure router-link styling is consistent */
|
||||||
|
a {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover .fa-circle-right {
|
||||||
|
transform: scale(1.1);
|
||||||
|
transition: transform 0.2s ease;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -63,24 +63,23 @@ export default class SpecialEntityCard extends Vue {
|
|||||||
conflictContext!: string;
|
conflictContext!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the card
|
* Computed CSS classes for the card container
|
||||||
*/
|
*/
|
||||||
get cardClasses(): string {
|
get cardClasses(): string {
|
||||||
const baseCardClasses =
|
const baseClasses = "block";
|
||||||
"flex items-center gap-2 px-2 py-1.5 border-b border-slate-300";
|
|
||||||
|
|
||||||
if (!this.selectable || this.conflicted) {
|
if (!this.selectable || this.conflicted) {
|
||||||
return `${baseCardClasses} *:opacity-50 cursor-not-allowed`;
|
return `${baseClasses} cursor-not-allowed opacity-50`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return `${baseCardClasses} cursor-pointer hover:bg-slate-50`;
|
return `${baseClasses} cursor-pointer`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the icon
|
* Computed CSS classes for the icon
|
||||||
*/
|
*/
|
||||||
get iconClasses(): string {
|
get iconClasses(): string {
|
||||||
const baseClasses = "text-[2rem]";
|
const baseClasses = "text-5xl mb-1";
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseClasses} text-slate-400`;
|
return `${baseClasses} text-slate-400`;
|
||||||
@@ -102,7 +101,7 @@ export default class SpecialEntityCard extends Vue {
|
|||||||
*/
|
*/
|
||||||
get nameClasses(): string {
|
get nameClasses(): string {
|
||||||
const baseClasses =
|
const baseClasses =
|
||||||
"text-sm font-semibold text-ellipsis whitespace-nowrap overflow-hidden";
|
"text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden";
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseClasses} text-slate-400`;
|
return `${baseClasses} text-slate-400`;
|
||||||
|
|||||||
@@ -1,9 +1,16 @@
|
|||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
v-if="message"
|
class="absolute right-5 top-[max(0.75rem,env(safe-area-inset-top),var(--safe-area-inset-top,0px))]"
|
||||||
class="-mt-6 bg-rose-100 border border-t-0 border-dashed border-rose-600 text-rose-900 text-sm text-center font-semibold rounded-b-md px-3 py-2 mb-3"
|
|
||||||
>
|
>
|
||||||
{{ message }}
|
<span class="align-center text-red-500 mr-2">{{ message }}</span>
|
||||||
|
<span class="ml-2">
|
||||||
|
<router-link
|
||||||
|
:to="{ name: 'help' }"
|
||||||
|
class="text-xs uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 rounded-md ml-1"
|
||||||
|
>
|
||||||
|
Help
|
||||||
|
</router-link>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -20,8 +27,8 @@ import { logger } from "../utils/logger";
|
|||||||
})
|
})
|
||||||
export default class TopMessage extends Vue {
|
export default class TopMessage extends Vue {
|
||||||
// Enhanced PlatformServiceMixin v4.0 provides:
|
// Enhanced PlatformServiceMixin v4.0 provides:
|
||||||
// - Cached database operations: this.$contacts(), this.$accountSettings()
|
// - Cached database operations: this.$contacts(), this.$settings(), this.$accountSettings()
|
||||||
// - Settings shortcuts: this.$saveSettings()
|
// - Settings shortcuts: this.$saveSettings(), this.$saveMySettings()
|
||||||
// - Cache management: this.$refreshSettings(), this.$clearAllCaches()
|
// - Cache management: this.$refreshSettings(), this.$clearAllCaches()
|
||||||
// - Ultra-concise database methods: this.$db(), this.$exec(), this.$query()
|
// - Ultra-concise database methods: this.$db(), this.$exec(), this.$query()
|
||||||
// - All methods use smart caching with TTL for massive performance gains
|
// - All methods use smart caching with TTL for massive performance gains
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<!-- show spinner if loading limits -->
|
<!-- show spinner if loading limits -->
|
||||||
<div
|
<div
|
||||||
v-if="loadingLimits"
|
v-if="loadingLimits"
|
||||||
class="text-slate-500 text-center italic mb-4"
|
class="text-center"
|
||||||
role="status"
|
role="status"
|
||||||
aria-live="polite"
|
aria-live="polite"
|
||||||
>
|
>
|
||||||
@@ -19,10 +19,7 @@
|
|||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
></font-awesome>
|
></font-awesome>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div class="mb-4 text-center">
|
||||||
v-if="limitsMessage"
|
|
||||||
class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
|
|
||||||
>
|
|
||||||
{{ limitsMessage }}
|
{{ limitsMessage }}
|
||||||
</div>
|
</div>
|
||||||
<div v-if="endorserLimits">
|
<div v-if="endorserLimits">
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ export const ACCOUNT_VIEW_CONSTANTS = {
|
|||||||
CANNOT_UPLOAD_IMAGES: "You cannot upload images.",
|
CANNOT_UPLOAD_IMAGES: "You cannot upload images.",
|
||||||
BAD_SERVER_RESPONSE: "Bad server response.",
|
BAD_SERVER_RESPONSE: "Bad server response.",
|
||||||
ERROR_RETRIEVING_LIMITS:
|
ERROR_RETRIEVING_LIMITS:
|
||||||
"No limits were found, so no actions are allowed. You need to get registered.",
|
"No limits were found, so no actions are allowed. You will need to get registered.",
|
||||||
},
|
},
|
||||||
|
|
||||||
// Project assignment errors
|
// Project assignment errors
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export const PASSKEYS_ENABLED =
|
|||||||
export interface NotificationIface {
|
export interface NotificationIface {
|
||||||
group: string; // "alert" | "modal"
|
group: string; // "alert" | "modal"
|
||||||
type: string; // "toast" | "info" | "success" | "warning" | "danger"
|
type: string; // "toast" | "info" | "success" | "warning" | "danger"
|
||||||
title?: string;
|
title: string;
|
||||||
text?: string;
|
text?: string;
|
||||||
callback?: (success: boolean) => Promise<void>; // if this triggered an action
|
callback?: (success: boolean) => Promise<void>; // if this triggered an action
|
||||||
noText?: string;
|
noText?: string;
|
||||||
@@ -68,11 +68,4 @@ export interface NotificationIface {
|
|||||||
onYes?: () => Promise<void>;
|
onYes?: () => Promise<void>;
|
||||||
promptToStopAsking?: boolean;
|
promptToStopAsking?: boolean;
|
||||||
yesText?: string;
|
yesText?: string;
|
||||||
membersData?: Array<{
|
|
||||||
member: { admitted: boolean; content: string; memberId: number };
|
|
||||||
name: string;
|
|
||||||
did: string;
|
|
||||||
isContact: boolean;
|
|
||||||
contact?: { did: string; name?: string; seesMe?: boolean };
|
|
||||||
}>; // For passing member data to visibility dialog
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -510,6 +510,14 @@ export const NOTIFY_REGISTER_CONTACT = {
|
|||||||
text: "Do you want to register them?",
|
text: "Do you want to register them?",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Used in: ContactsView.vue (showOnboardMeetingDialog method - complex modal for onboarding meeting)
|
||||||
|
export const NOTIFY_ONBOARDING_MEETING = {
|
||||||
|
title: "Onboarding Meeting",
|
||||||
|
text: "Would you like to start a new meeting?",
|
||||||
|
yesText: "Start New Meeting",
|
||||||
|
noText: "Join Existing Meeting",
|
||||||
|
};
|
||||||
|
|
||||||
// TestView.vue specific constants
|
// TestView.vue specific constants
|
||||||
// Used in: TestView.vue (executeSql method - SQL error handling)
|
// Used in: TestView.vue (executeSql method - SQL error handling)
|
||||||
export const NOTIFY_SQL_ERROR = {
|
export const NOTIFY_SQL_ERROR = {
|
||||||
|
|||||||
@@ -68,21 +68,13 @@ const MIG_004_SQL = `
|
|||||||
WHERE id = 1
|
WHERE id = 1
|
||||||
AND EXISTS (SELECT 1 FROM settings WHERE id = 1 AND activeDid IS NOT NULL AND activeDid != '');
|
AND EXISTS (SELECT 1 FROM settings WHERE id = 1 AND activeDid IS NOT NULL AND activeDid != '');
|
||||||
|
|
||||||
-- Copy important settings that were set in the MASTER_SETTINGS_KEY to the main identity.
|
|
||||||
-- (We're not doing them all because some were already identity-specific and others aren't as critical.)
|
|
||||||
UPDATE settings
|
|
||||||
SET lastViewedClaimId = (SELECT lastViewedClaimId FROM settings WHERE id = 1),
|
|
||||||
profileImageUrl = (SELECT profileImageUrl FROM settings WHERE id = 1),
|
|
||||||
showShortcutBvc = (SELECT showShortcutBvc FROM settings WHERE id = 1),
|
|
||||||
warnIfProdServer = (SELECT warnIfProdServer FROM settings WHERE id = 1),
|
|
||||||
warnIfTestServer = (SELECT warnIfTestServer FROM settings WHERE id = 1)
|
|
||||||
WHERE id = 2;
|
|
||||||
|
|
||||||
-- CLEANUP: Remove orphaned settings records and clear legacy activeDid values
|
-- CLEANUP: Remove orphaned settings records and clear legacy activeDid values
|
||||||
-- which usually simply deletes the MASTER_SETTINGS_KEY record.
|
|
||||||
-- This completes the migration from settings-based to table-based active identity
|
-- This completes the migration from settings-based to table-based active identity
|
||||||
DELETE FROM settings WHERE accountDid IS NULL;
|
-- Use guarded operations to prevent accidental data loss
|
||||||
UPDATE settings SET activeDid = NULL;
|
DELETE FROM settings WHERE accountDid IS NULL AND id != 1;
|
||||||
|
UPDATE settings SET activeDid = NULL WHERE id = 1 AND EXISTS (
|
||||||
|
SELECT 1 FROM active_identity WHERE id = 1 AND activeDid IS NOT NULL
|
||||||
|
);
|
||||||
`;
|
`;
|
||||||
|
|
||||||
// Each migration can include multiple SQL statements (with semicolons)
|
// Each migration can include multiple SQL statements (with semicolons)
|
||||||
@@ -192,13 +184,6 @@ const MIGRATIONS = [
|
|||||||
name: "004_active_identity_management",
|
name: "004_active_identity_management",
|
||||||
sql: MIG_004_SQL,
|
sql: MIG_004_SQL,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: "005_add_starredPlanHandleIds_to_settings",
|
|
||||||
sql: `
|
|
||||||
ALTER TABLE settings ADD COLUMN starredPlanHandleIds TEXT DEFAULT '[]'; -- JSON string
|
|
||||||
ALTER TABLE settings ADD COLUMN lastAckedStarredPlanChangesJwtId TEXT;
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -234,20 +219,32 @@ export async function runMigrations<T>(
|
|||||||
sqlQuery: (sql: string, params?: unknown[]) => Promise<T>,
|
sqlQuery: (sql: string, params?: unknown[]) => Promise<T>,
|
||||||
extractMigrationNames: (result: T) => Set<string>,
|
extractMigrationNames: (result: T) => Set<string>,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
logger.debug("[Migration] Starting database migrations");
|
// Only log migration start in development
|
||||||
|
const isDevelopment = process.env.VITE_PLATFORM === "development";
|
||||||
|
if (isDevelopment) {
|
||||||
|
logger.debug("[Migration] Starting database migrations");
|
||||||
|
}
|
||||||
|
|
||||||
for (const migration of MIGRATIONS) {
|
for (const migration of MIGRATIONS) {
|
||||||
logger.debug("[Migration] Registering migration:", migration.name);
|
if (isDevelopment) {
|
||||||
|
logger.debug("[Migration] Registering migration:", migration.name);
|
||||||
|
}
|
||||||
registerMigration(migration);
|
registerMigration(migration);
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.debug("[Migration] Running migration service");
|
if (isDevelopment) {
|
||||||
|
logger.debug("[Migration] Running migration service");
|
||||||
|
}
|
||||||
await runMigrationsService(sqlExec, sqlQuery, extractMigrationNames);
|
await runMigrationsService(sqlExec, sqlQuery, extractMigrationNames);
|
||||||
|
|
||||||
logger.debug("[Migration] Database migrations completed");
|
if (isDevelopment) {
|
||||||
|
logger.debug("[Migration] Database migrations completed");
|
||||||
|
}
|
||||||
|
|
||||||
// Bootstrapping: Ensure active account is selected after migrations
|
// Bootstrapping: Ensure active account is selected after migrations
|
||||||
logger.debug("[Migration] Running bootstrapping hooks");
|
if (isDevelopment) {
|
||||||
|
logger.debug("[Migration] Running bootstrapping hooks");
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
// Check if we have accounts but no active selection
|
// Check if we have accounts but no active selection
|
||||||
const accountsResult = await sqlQuery("SELECT COUNT(*) FROM accounts");
|
const accountsResult = await sqlQuery("SELECT COUNT(*) FROM accounts");
|
||||||
@@ -262,14 +259,18 @@ export async function runMigrations<T>(
|
|||||||
activeDid = (extractSingleValue(activeResult) as string) || null;
|
activeDid = (extractSingleValue(activeResult) as string) || null;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Table doesn't exist - migration 004 may not have run yet
|
// Table doesn't exist - migration 004 may not have run yet
|
||||||
logger.debug(
|
if (isDevelopment) {
|
||||||
"[Migration] active_identity table not found - migration may not have run",
|
logger.debug(
|
||||||
);
|
"[Migration] active_identity table not found - migration may not have run",
|
||||||
|
);
|
||||||
|
}
|
||||||
activeDid = null;
|
activeDid = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (accountsCount > 0 && (!activeDid || activeDid === "")) {
|
if (accountsCount > 0 && (!activeDid || activeDid === "")) {
|
||||||
logger.debug("[Migration] Auto-selecting first account as active");
|
if (isDevelopment) {
|
||||||
|
logger.debug("[Migration] Auto-selecting first account as active");
|
||||||
|
}
|
||||||
const firstAccountResult = await sqlQuery(
|
const firstAccountResult = await sqlQuery(
|
||||||
"SELECT did FROM accounts ORDER BY dateCreated, did LIMIT 1",
|
"SELECT did FROM accounts ORDER BY dateCreated, did LIMIT 1",
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -9,6 +9,34 @@ import { logger } from "@/utils/logger";
|
|||||||
import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
|
import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
|
||||||
import { QueryExecResult } from "@/interfaces/database";
|
import { QueryExecResult } from "@/interfaces/database";
|
||||||
|
|
||||||
|
export async function updateDefaultSettings(
|
||||||
|
settingsChanges: Settings,
|
||||||
|
): Promise<boolean> {
|
||||||
|
delete settingsChanges.accountDid; // just in case
|
||||||
|
// ensure there is no "id" that would override the key
|
||||||
|
delete settingsChanges.id;
|
||||||
|
try {
|
||||||
|
const platformService = PlatformServiceFactory.getInstance();
|
||||||
|
const { sql, params } = generateUpdateStatement(
|
||||||
|
settingsChanges,
|
||||||
|
"settings",
|
||||||
|
"id = ?",
|
||||||
|
[MASTER_SETTINGS_KEY],
|
||||||
|
);
|
||||||
|
const result = await platformService.dbExec(sql, params);
|
||||||
|
return result.changes === 1;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error updating default settings:", error);
|
||||||
|
if (error instanceof Error) {
|
||||||
|
throw error; // Re-throw if it's already an Error with a message
|
||||||
|
} else {
|
||||||
|
throw new Error(
|
||||||
|
`Failed to update settings. We recommend you try again or restart the app.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function insertDidSpecificSettings(
|
export async function insertDidSpecificSettings(
|
||||||
did: string,
|
did: string,
|
||||||
settings: Partial<Settings> = {},
|
settings: Partial<Settings> = {},
|
||||||
@@ -63,7 +91,6 @@ export async function updateDidSpecificSettings(
|
|||||||
? mapColumnsToValues(postUpdateResult.columns, postUpdateResult.values)[0]
|
? mapColumnsToValues(postUpdateResult.columns, postUpdateResult.values)[0]
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
// Note that we want to eliminate this check (and fix the above if it doesn't work).
|
|
||||||
// Check if any of the target fields were actually changed
|
// Check if any of the target fields were actually changed
|
||||||
let actuallyUpdated = false;
|
let actuallyUpdated = false;
|
||||||
if (currentRecord && updatedRecord) {
|
if (currentRecord && updatedRecord) {
|
||||||
@@ -130,11 +157,10 @@ export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
|
|||||||
result.columns,
|
result.columns,
|
||||||
result.values,
|
result.values,
|
||||||
)[0] as Settings;
|
)[0] as Settings;
|
||||||
settings.searchBoxes = parseJsonField(settings.searchBoxes, []);
|
if (settings.searchBoxes) {
|
||||||
settings.starredPlanHandleIds = parseJsonField(
|
// @ts-expect-error - the searchBoxes field is a string in the DB
|
||||||
settings.starredPlanHandleIds,
|
settings.searchBoxes = JSON.parse(settings.searchBoxes);
|
||||||
[],
|
}
|
||||||
);
|
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -200,11 +226,10 @@ export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
settings.searchBoxes = parseJsonField(settings.searchBoxes, []);
|
// Handle searchBoxes parsing
|
||||||
settings.starredPlanHandleIds = parseJsonField(
|
if (settings.searchBoxes) {
|
||||||
settings.starredPlanHandleIds,
|
settings.searchBoxes = parseJsonField(settings.searchBoxes, []);
|
||||||
[],
|
}
|
||||||
);
|
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ export type Settings = {
|
|||||||
|
|
||||||
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
|
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
|
||||||
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
|
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
|
||||||
lastAckedStarredPlanChangesJwtId?: string; // the last JWT ID for starred plan changes that they've acknowledged seeing
|
|
||||||
|
|
||||||
// The claim list has a most recent one used in notifications that's separate from the last viewed
|
// The claim list has a most recent one used in notifications that's separate from the last viewed
|
||||||
lastNotifiedClaimId?: string;
|
lastNotifiedClaimId?: string;
|
||||||
@@ -68,18 +67,15 @@ export type Settings = {
|
|||||||
showContactGivesInline?: boolean; // Display contact inline or not
|
showContactGivesInline?: boolean; // Display contact inline or not
|
||||||
showGeneralAdvanced?: boolean; // Show advanced features which don't have their own flag
|
showGeneralAdvanced?: boolean; // Show advanced features which don't have their own flag
|
||||||
showShortcutBvc?: boolean; // Show shortcut for Bountiful Voluntaryist Community actions
|
showShortcutBvc?: boolean; // Show shortcut for Bountiful Voluntaryist Community actions
|
||||||
|
|
||||||
starredPlanHandleIds?: string[]; // Array of starred plan handle IDs
|
|
||||||
vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
|
vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
|
||||||
warnIfProdServer?: boolean; // Warn if using a production server
|
warnIfProdServer?: boolean; // Warn if using a production server
|
||||||
warnIfTestServer?: boolean; // Warn if using a testing server
|
warnIfTestServer?: boolean; // Warn if using a testing server
|
||||||
webPushServer?: string; // Web Push server URL
|
webPushServer?: string; // Web Push server URL
|
||||||
};
|
};
|
||||||
|
|
||||||
// type of settings where the values are JSON strings instead of objects
|
// type of settings where the searchBoxes are JSON strings instead of objects
|
||||||
export type SettingsWithJsonStrings = Settings & {
|
export type SettingsWithJsonStrings = Settings & {
|
||||||
searchBoxes: string;
|
searchBoxes: string;
|
||||||
starredPlanHandleIds: string;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export function checkIsAnyFeedFilterOn(settings: Settings): boolean {
|
export function checkIsAnyFeedFilterOn(settings: Settings): boolean {
|
||||||
@@ -96,11 +92,6 @@ export const SettingsSchema = {
|
|||||||
/**
|
/**
|
||||||
* Constants.
|
* Constants.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* This is deprecated.
|
|
||||||
* It only remains for those with a PWA who have not migrated, but we'll soon remove it.
|
|
||||||
*/
|
|
||||||
export const MASTER_SETTINGS_KEY = "1";
|
export const MASTER_SETTINGS_KEY = "1";
|
||||||
|
|
||||||
export const DEFAULT_PASSKEY_EXPIRATION_MINUTES = 15;
|
export const DEFAULT_PASSKEY_EXPIRATION_MINUTES = 15;
|
||||||
|
|||||||
@@ -14,13 +14,6 @@ export interface AgreeActionClaim extends ClaimObject {
|
|||||||
object: Record<string, unknown>;
|
object: Record<string, unknown>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface EmojiClaim extends ClaimObject {
|
|
||||||
// default context is "https://endorser.ch"
|
|
||||||
"@type": "Emoji";
|
|
||||||
text: string;
|
|
||||||
parentItem: { lastClaimId: string };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note that previous VCs may have additional fields.
|
// Note that previous VCs may have additional fields.
|
||||||
// https://endorser.ch/doc/html/transactions.html#id4
|
// https://endorser.ch/doc/html/transactions.html#id4
|
||||||
export interface GiveActionClaim extends ClaimObject {
|
export interface GiveActionClaim extends ClaimObject {
|
||||||
@@ -79,15 +72,11 @@ export interface PlanActionClaim extends ClaimObject {
|
|||||||
name: string;
|
name: string;
|
||||||
agent?: { identifier: string };
|
agent?: { identifier: string };
|
||||||
description?: string;
|
description?: string;
|
||||||
endTime?: string;
|
|
||||||
identifier?: string;
|
identifier?: string;
|
||||||
image?: string;
|
|
||||||
lastClaimId?: string;
|
lastClaimId?: string;
|
||||||
location?: {
|
location?: {
|
||||||
geo: { "@type": "GeoCoordinates"; latitude: number; longitude: number };
|
geo: { "@type": "GeoCoordinates"; latitude: number; longitude: number };
|
||||||
};
|
};
|
||||||
startTime?: string;
|
|
||||||
url?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AKA Registration & RegisterAction
|
// AKA Registration & RegisterAction
|
||||||
|
|||||||
@@ -70,11 +70,18 @@ export interface AxiosErrorResponse {
|
|||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface UserInfo {
|
||||||
|
did: string;
|
||||||
|
name: string;
|
||||||
|
publicEncKey: string;
|
||||||
|
registered: boolean;
|
||||||
|
profileImageUrl?: string;
|
||||||
|
nextPublicEncKeyHash?: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface CreateAndSubmitClaimResult {
|
export interface CreateAndSubmitClaimResult {
|
||||||
success: boolean;
|
success: boolean;
|
||||||
embeddedRecordError?: string;
|
|
||||||
error?: string;
|
error?: string;
|
||||||
claimId?: string;
|
|
||||||
handleId?: string;
|
handleId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,36 @@
|
|||||||
export * from "./claims";
|
export type {
|
||||||
export * from "./claims-result";
|
// From common.ts
|
||||||
export * from "./common";
|
CreateAndSubmitClaimResult,
|
||||||
export * from "./deepLinks";
|
GenericCredWrapper,
|
||||||
|
GenericVerifiableCredential,
|
||||||
|
KeyMeta,
|
||||||
|
// Exclude types that are also exported from other files
|
||||||
|
// GiveVerifiableCredential,
|
||||||
|
// OfferVerifiableCredential,
|
||||||
|
// RegisterVerifiableCredential,
|
||||||
|
// PlanSummaryRecord,
|
||||||
|
// UserInfo,
|
||||||
|
} from "./common";
|
||||||
|
|
||||||
|
export type {
|
||||||
|
// From claims.ts
|
||||||
|
GiveActionClaim,
|
||||||
|
OfferClaim,
|
||||||
|
RegisterActionClaim,
|
||||||
|
} from "./claims";
|
||||||
|
|
||||||
|
export type {
|
||||||
|
// From records.ts
|
||||||
|
PlanSummaryRecord,
|
||||||
|
} from "./records";
|
||||||
|
|
||||||
|
export type {
|
||||||
|
// From user.ts
|
||||||
|
UserInfo,
|
||||||
|
} from "./user";
|
||||||
|
|
||||||
export * from "./limits";
|
export * from "./limits";
|
||||||
|
export * from "./deepLinks";
|
||||||
|
export * from "./common";
|
||||||
|
export * from "./claims-result";
|
||||||
export * from "./records";
|
export * from "./records";
|
||||||
export * from "./user";
|
|
||||||
|
|||||||
@@ -1,26 +1,13 @@
|
|||||||
import { GiveActionClaim, OfferClaim, PlanActionClaim } from "./claims";
|
import { GiveActionClaim, OfferClaim } from "./claims";
|
||||||
import { GenericCredWrapper } from "./common";
|
|
||||||
|
|
||||||
export interface EmojiSummaryRecord {
|
|
||||||
issuerDid: string;
|
|
||||||
jwtId: string;
|
|
||||||
text: string;
|
|
||||||
parentHandleId: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
// a summary record; the VC is found the fullClaim field
|
// a summary record; the VC is found the fullClaim field
|
||||||
export interface GiveSummaryRecord {
|
export interface GiveSummaryRecord {
|
||||||
[x: string]:
|
[x: string]: PropertyKey | undefined | GiveActionClaim;
|
||||||
| PropertyKey
|
|
||||||
| undefined
|
|
||||||
| GiveActionClaim
|
|
||||||
| Record<string, number>;
|
|
||||||
type?: string;
|
type?: string;
|
||||||
agentDid: string;
|
agentDid: string;
|
||||||
amount: number;
|
amount: number;
|
||||||
amountConfirmed: number;
|
amountConfirmed: number;
|
||||||
description: string;
|
description: string;
|
||||||
emojiCount: Record<string, number>; // Map of emoji character to count
|
|
||||||
fullClaim: GiveActionClaim;
|
fullClaim: GiveActionClaim;
|
||||||
fulfillsHandleId: string;
|
fulfillsHandleId: string;
|
||||||
fulfillsPlanHandleId?: string;
|
fulfillsPlanHandleId?: string;
|
||||||
@@ -74,11 +61,6 @@ export interface PlanSummaryRecord {
|
|||||||
jwtId?: string;
|
jwtId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface PlanSummaryAndPreviousClaim {
|
|
||||||
plan: PlanSummaryRecord;
|
|
||||||
wrappedClaimBefore: GenericCredWrapper<PlanActionClaim>;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents data about a project
|
* Represents data about a project
|
||||||
*
|
*
|
||||||
@@ -105,10 +87,7 @@ export interface PlanData {
|
|||||||
name: string;
|
name: string;
|
||||||
/**
|
/**
|
||||||
* The identifier of the project record -- different from jwtId
|
* The identifier of the project record -- different from jwtId
|
||||||
*
|
* (Maybe we should use the jwtId to iterate through the records instead.)
|
||||||
* This has been used to iterate through plan records, because jwtId ordering doesn't match
|
|
||||||
* chronological create ordering, though it does match most recent edit order (in reverse order).
|
|
||||||
* (It may be worthwhile to order by jwtId instead. It is an indexed field.)
|
|
||||||
**/
|
**/
|
||||||
rowId?: string;
|
rowId?: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,12 +6,3 @@ export interface UserInfo {
|
|||||||
profileImageUrl?: string;
|
profileImageUrl?: string;
|
||||||
nextPublicEncKeyHash?: string;
|
nextPublicEncKeyHash?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MemberData {
|
|
||||||
did: string;
|
|
||||||
name: string;
|
|
||||||
isContact: boolean;
|
|
||||||
member: {
|
|
||||||
memberId: string;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -42,6 +42,9 @@ import {
|
|||||||
PlanActionClaim,
|
PlanActionClaim,
|
||||||
RegisterActionClaim,
|
RegisterActionClaim,
|
||||||
TenureClaim,
|
TenureClaim,
|
||||||
|
} from "../interfaces/claims";
|
||||||
|
|
||||||
|
import {
|
||||||
GenericCredWrapper,
|
GenericCredWrapper,
|
||||||
GenericVerifiableCredential,
|
GenericVerifiableCredential,
|
||||||
AxiosErrorResponse,
|
AxiosErrorResponse,
|
||||||
@@ -52,12 +55,9 @@ import {
|
|||||||
QuantitativeValue,
|
QuantitativeValue,
|
||||||
KeyMetaWithPrivate,
|
KeyMetaWithPrivate,
|
||||||
KeyMetaMaybeWithPrivate,
|
KeyMetaMaybeWithPrivate,
|
||||||
OfferSummaryRecord,
|
} from "../interfaces/common";
|
||||||
OfferToPlanSummaryRecord,
|
import { PlanSummaryRecord } from "../interfaces/records";
|
||||||
PlanSummaryAndPreviousClaim,
|
import { logger } from "../utils/logger";
|
||||||
PlanSummaryRecord,
|
|
||||||
} from "../interfaces";
|
|
||||||
import { logger, safeStringify } from "../utils/logger";
|
|
||||||
import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
|
import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
|
||||||
import { APP_SERVER } from "@/constants/app";
|
import { APP_SERVER } from "@/constants/app";
|
||||||
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
||||||
@@ -362,22 +362,6 @@ export function didInfo(
|
|||||||
return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
|
return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* In some contexts (eg. agent), a blank really is nobody.
|
|
||||||
*/
|
|
||||||
export function didInfoOrNobody(
|
|
||||||
did: string | undefined,
|
|
||||||
activeDid: string | undefined,
|
|
||||||
allMyDids: string[],
|
|
||||||
contacts: Contact[],
|
|
||||||
): string {
|
|
||||||
if (did == null) {
|
|
||||||
return "Nobody";
|
|
||||||
} else {
|
|
||||||
return didInfo(did, activeDid, allMyDids, contacts);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* return text description without any references to "you" as user
|
* return text description without any references to "you" as user
|
||||||
*/
|
*/
|
||||||
@@ -625,7 +609,11 @@ async function performPlanRequest(
|
|||||||
|
|
||||||
return cred;
|
return cred;
|
||||||
} else {
|
} else {
|
||||||
logger.debug(
|
// Use debug level for development to reduce console noise
|
||||||
|
const isDevelopment = process.env.VITE_PLATFORM === "development";
|
||||||
|
const log = isDevelopment ? logger.debug : logger.log;
|
||||||
|
|
||||||
|
log(
|
||||||
"[Plan Loading] ⚠️ Plan cache is empty for handle",
|
"[Plan Loading] ⚠️ Plan cache is empty for handle",
|
||||||
handleId,
|
handleId,
|
||||||
" Got data:",
|
" Got data:",
|
||||||
@@ -697,7 +685,7 @@ export function serverMessageForUser(error: unknown): string | undefined {
|
|||||||
export function errorStringForLog(error: unknown) {
|
export function errorStringForLog(error: unknown) {
|
||||||
let stringifiedError = "" + error;
|
let stringifiedError = "" + error;
|
||||||
try {
|
try {
|
||||||
stringifiedError = safeStringify(error);
|
stringifiedError = JSON.stringify(error);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// can happen with Dexie, eg:
|
// can happen with Dexie, eg:
|
||||||
// TypeError: Converting circular structure to JSON
|
// TypeError: Converting circular structure to JSON
|
||||||
@@ -709,7 +697,7 @@ export function errorStringForLog(error: unknown) {
|
|||||||
|
|
||||||
if (error && typeof error === "object" && "response" in error) {
|
if (error && typeof error === "object" && "response" in error) {
|
||||||
const err = error as AxiosErrorResponse;
|
const err = error as AxiosErrorResponse;
|
||||||
const errorResponseText = safeStringify(err.response);
|
const errorResponseText = JSON.stringify(err.response);
|
||||||
// for some reason, error.response is not included in stringify result (eg. for 400 errors on invite redemptions)
|
// for some reason, error.response is not included in stringify result (eg. for 400 errors on invite redemptions)
|
||||||
if (!R.empty(errorResponseText) && !fullError.includes(errorResponseText)) {
|
if (!R.empty(errorResponseText) && !fullError.includes(errorResponseText)) {
|
||||||
// add error.response stuff
|
// add error.response stuff
|
||||||
@@ -719,7 +707,7 @@ export function errorStringForLog(error: unknown) {
|
|||||||
R.equals(err.config, err.response.config)
|
R.equals(err.config, err.response.config)
|
||||||
) {
|
) {
|
||||||
// but exclude "config" because it's already in there
|
// but exclude "config" because it's already in there
|
||||||
const newErrorResponseText = safeStringify(
|
const newErrorResponseText = JSON.stringify(
|
||||||
R.omit(["config"] as never[], err.response),
|
R.omit(["config"] as never[], err.response),
|
||||||
);
|
);
|
||||||
fullError +=
|
fullError +=
|
||||||
@@ -742,7 +730,7 @@ export async function getNewOffersToUser(
|
|||||||
activeDid: string,
|
activeDid: string,
|
||||||
afterOfferJwtId?: string,
|
afterOfferJwtId?: string,
|
||||||
beforeOfferJwtId?: string,
|
beforeOfferJwtId?: string,
|
||||||
): Promise<{ data: Array<OfferSummaryRecord>; hitLimit: boolean }> {
|
) {
|
||||||
let url = `${apiServer}/api/v2/report/offers?recipientDid=${activeDid}`;
|
let url = `${apiServer}/api/v2/report/offers?recipientDid=${activeDid}`;
|
||||||
if (afterOfferJwtId) {
|
if (afterOfferJwtId) {
|
||||||
url += "&afterId=" + afterOfferJwtId;
|
url += "&afterId=" + afterOfferJwtId;
|
||||||
@@ -764,7 +752,7 @@ export async function getNewOffersToUserProjects(
|
|||||||
activeDid: string,
|
activeDid: string,
|
||||||
afterOfferJwtId?: string,
|
afterOfferJwtId?: string,
|
||||||
beforeOfferJwtId?: string,
|
beforeOfferJwtId?: string,
|
||||||
): Promise<{ data: Array<OfferToPlanSummaryRecord>; hitLimit: boolean }> {
|
) {
|
||||||
let url = `${apiServer}/api/v2/report/offersToPlansOwnedByMe`;
|
let url = `${apiServer}/api/v2/report/offersToPlansOwnedByMe`;
|
||||||
if (afterOfferJwtId) {
|
if (afterOfferJwtId) {
|
||||||
url += "?afterId=" + afterOfferJwtId;
|
url += "?afterId=" + afterOfferJwtId;
|
||||||
@@ -778,46 +766,6 @@ export async function getNewOffersToUserProjects(
|
|||||||
return response.data;
|
return response.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get starred projects that have been updated since the last check
|
|
||||||
*
|
|
||||||
* @param axios - axios instance
|
|
||||||
* @param apiServer - endorser API server URL
|
|
||||||
* @param activeDid - user's DID for authentication
|
|
||||||
* @param starredPlanHandleIds - array of starred project handle IDs
|
|
||||||
* @param afterId - JWT ID to check for changes after (from lastAckedStarredPlanChangesJwtId)
|
|
||||||
* @returns { data: Array<PlanSummaryAndPreviousClaim>, hitLimit: boolean }
|
|
||||||
*/
|
|
||||||
export async function getStarredProjectsWithChanges(
|
|
||||||
axios: Axios,
|
|
||||||
apiServer: string,
|
|
||||||
activeDid: string,
|
|
||||||
starredPlanHandleIds: string[],
|
|
||||||
afterId?: string,
|
|
||||||
): Promise<{ data: Array<PlanSummaryAndPreviousClaim>; hitLimit: boolean }> {
|
|
||||||
if (!starredPlanHandleIds || starredPlanHandleIds.length === 0) {
|
|
||||||
return { data: [], hitLimit: false };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!afterId) {
|
|
||||||
// This doesn't make sense: there should always be some previous one they've seen.
|
|
||||||
// We'll just return blank.
|
|
||||||
return { data: [], hitLimit: false };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use POST method for larger lists of project IDs
|
|
||||||
const url = `${apiServer}/api/v2/report/plansLastUpdatedBetween`;
|
|
||||||
const headers = await getHeaders(activeDid);
|
|
||||||
|
|
||||||
const requestBody = {
|
|
||||||
planIds: starredPlanHandleIds,
|
|
||||||
afterId: afterId,
|
|
||||||
};
|
|
||||||
|
|
||||||
const response = await axios.post(url, requestBody, { headers });
|
|
||||||
return response.data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct GiveAction VC for submission to server
|
* Construct GiveAction VC for submission to server
|
||||||
*
|
*
|
||||||
@@ -1217,12 +1165,7 @@ export async function createAndSubmitClaim(
|
|||||||
timestamp: new Date().toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return { success: true, handleId: response.data?.handleId };
|
||||||
success: true,
|
|
||||||
claimId: response.data?.claimId,
|
|
||||||
handleId: response.data?.handleId,
|
|
||||||
embeddedRecordError: response.data?.embeddedRecordError,
|
|
||||||
};
|
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
// Enhanced error logging with comprehensive context
|
// Enhanced error logging with comprehensive context
|
||||||
const requestId = `claim_error_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
|
const requestId = `claim_error_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
|
||||||
@@ -1657,35 +1600,30 @@ export async function register(
|
|||||||
message?: string;
|
message?: string;
|
||||||
}>(url, { jwtEncoded: vcJwt });
|
}>(url, { jwtEncoded: vcJwt });
|
||||||
|
|
||||||
if (resp.data?.success?.embeddedRecordError) {
|
if (resp.data?.success?.handleId) {
|
||||||
|
return { success: true };
|
||||||
|
} else if (resp.data?.success?.embeddedRecordError) {
|
||||||
let message =
|
let message =
|
||||||
"There was some problem with the registration and so it may not be complete.";
|
"There was some problem with the registration and so it may not be complete.";
|
||||||
if (typeof resp.data.success.embeddedRecordError === "string") {
|
if (typeof resp.data.success.embeddedRecordError === "string") {
|
||||||
message += " " + resp.data.success.embeddedRecordError;
|
message += " " + resp.data.success.embeddedRecordError;
|
||||||
}
|
}
|
||||||
return { error: message };
|
return { error: message };
|
||||||
} else if (resp.data?.success?.handleId) {
|
|
||||||
return { success: true };
|
|
||||||
} else {
|
} else {
|
||||||
logger.error("Registration non-thrown error:", JSON.stringify(resp.data));
|
logger.error("Registration error:", JSON.stringify(resp.data));
|
||||||
return {
|
return { error: "Got a server error when registering." };
|
||||||
error:
|
|
||||||
(resp.data?.error as { message?: string })?.message ||
|
|
||||||
(resp.data?.error as string) ||
|
|
||||||
"Got a server error when registering.",
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
if (error && typeof error === "object") {
|
if (error && typeof error === "object") {
|
||||||
const err = error as AxiosErrorResponse;
|
const err = error as AxiosErrorResponse;
|
||||||
const errorMessage =
|
const errorMessage =
|
||||||
err.response?.data?.error?.message ||
|
err.message ||
|
||||||
err.response?.data?.error ||
|
(err.response?.data &&
|
||||||
err.message;
|
typeof err.response.data === "object" &&
|
||||||
logger.error(
|
"message" in err.response.data
|
||||||
"Registration thrown error:",
|
? (err.response.data as { message: string }).message
|
||||||
errorMessage || JSON.stringify(err),
|
: undefined);
|
||||||
);
|
logger.error("Registration error:", errorMessage || JSON.stringify(err));
|
||||||
return { error: errorMessage || "Got a server error when registering." };
|
return { error: errorMessage || "Got a server error when registering." };
|
||||||
}
|
}
|
||||||
return { error: "Got a server error when registering." };
|
return { error: "Got a server error when registering." };
|
||||||
@@ -1759,19 +1697,49 @@ export async function fetchEndorserRateLimits(
|
|||||||
timestamp: new Date().toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
});
|
});
|
||||||
|
|
||||||
// not wrapped in a 'try' because the error returned is self-explanatory
|
try {
|
||||||
const response = await axios.get(url, { headers } as AxiosRequestConfig);
|
const response = await axios.get(url, { headers } as AxiosRequestConfig);
|
||||||
|
|
||||||
// Log successful registration check
|
// Log successful registration check
|
||||||
logger.debug("[User Registration] User registration check successful:", {
|
logger.debug("[User Registration] User registration check successful:", {
|
||||||
did: issuerDid,
|
did: issuerDid,
|
||||||
server: apiServer,
|
server: apiServer,
|
||||||
status: response.status,
|
status: response.status,
|
||||||
isRegistered: true,
|
isRegistered: true,
|
||||||
timestamp: new Date().toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
});
|
});
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
|
} catch (error) {
|
||||||
|
// Enhanced error logging with user registration context
|
||||||
|
const axiosError = error as {
|
||||||
|
response?: {
|
||||||
|
data?: { error?: { code?: string; message?: string } };
|
||||||
|
status?: number;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
const errorCode = axiosError.response?.data?.error?.code;
|
||||||
|
const errorMessage = axiosError.response?.data?.error?.message;
|
||||||
|
const httpStatus = axiosError.response?.status;
|
||||||
|
|
||||||
|
logger.warn("[User Registration] User not registered on server:", {
|
||||||
|
did: issuerDid,
|
||||||
|
server: apiServer,
|
||||||
|
errorCode: errorCode,
|
||||||
|
errorMessage: errorMessage,
|
||||||
|
httpStatus: httpStatus,
|
||||||
|
needsRegistration: true,
|
||||||
|
timestamp: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
|
||||||
|
// Log the original error for debugging
|
||||||
|
logger.error(
|
||||||
|
`[fetchEndorserRateLimits] Error for DID ${issuerDid}:`,
|
||||||
|
errorStringForLog(error),
|
||||||
|
);
|
||||||
|
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1820,17 +1788,14 @@ export async function fetchImageRateLimits(
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
logger.warn(
|
logger.error("[Image Server] Image rate limits check failed:", {
|
||||||
"[Image Server] Image rate limits check failed, which is expected for users not registered on test server (eg. when only registered on local server).",
|
did: issuerDid,
|
||||||
{
|
server: server,
|
||||||
did: issuerDid,
|
errorCode: axiosError.response?.data?.error?.code,
|
||||||
server: server,
|
errorMessage: axiosError.response?.data?.error?.message,
|
||||||
errorCode: axiosError.response?.data?.error?.code,
|
httpStatus: axiosError.response?.status,
|
||||||
errorMessage: axiosError.response?.data?.error?.message,
|
timestamp: new Date().toISOString(),
|
||||||
httpStatus: axiosError.response?.status,
|
});
|
||||||
timestamp: new Date().toISOString(),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ import {
|
|||||||
faCircle,
|
faCircle,
|
||||||
faCircleCheck,
|
faCircleCheck,
|
||||||
faCircleInfo,
|
faCircleInfo,
|
||||||
faCircleMinus,
|
|
||||||
faCirclePlus,
|
faCirclePlus,
|
||||||
faCircleQuestion,
|
faCircleQuestion,
|
||||||
faCircleRight,
|
faCircleRight,
|
||||||
@@ -38,7 +37,6 @@ import {
|
|||||||
faCoins,
|
faCoins,
|
||||||
faComment,
|
faComment,
|
||||||
faCopy,
|
faCopy,
|
||||||
faCrown,
|
|
||||||
faDollar,
|
faDollar,
|
||||||
faDownload,
|
faDownload,
|
||||||
faEllipsis,
|
faEllipsis,
|
||||||
@@ -60,7 +58,6 @@ import {
|
|||||||
faHand,
|
faHand,
|
||||||
faHandHoldingDollar,
|
faHandHoldingDollar,
|
||||||
faHandHoldingHeart,
|
faHandHoldingHeart,
|
||||||
faHourglassHalf,
|
|
||||||
faHouseChimney,
|
faHouseChimney,
|
||||||
faImage,
|
faImage,
|
||||||
faImagePortrait,
|
faImagePortrait,
|
||||||
@@ -83,13 +80,13 @@ import {
|
|||||||
faQuestion,
|
faQuestion,
|
||||||
faRightFromBracket,
|
faRightFromBracket,
|
||||||
faRotate,
|
faRotate,
|
||||||
|
faScroll,
|
||||||
faShareNodes,
|
faShareNodes,
|
||||||
faSpinner,
|
faSpinner,
|
||||||
faSquare,
|
faSquare,
|
||||||
faSquareCaretDown,
|
faSquareCaretDown,
|
||||||
faSquareCaretUp,
|
faSquareCaretUp,
|
||||||
faSquarePlus,
|
faSquarePlus,
|
||||||
faStar,
|
|
||||||
faThumbtack,
|
faThumbtack,
|
||||||
faTrashCan,
|
faTrashCan,
|
||||||
faTriangleExclamation,
|
faTriangleExclamation,
|
||||||
@@ -98,9 +95,6 @@ import {
|
|||||||
faXmark,
|
faXmark,
|
||||||
} from "@fortawesome/free-solid-svg-icons";
|
} from "@fortawesome/free-solid-svg-icons";
|
||||||
|
|
||||||
// these are referenced differently, eg. ":icon='['far', 'star']'" as in ProjectViewView.vue
|
|
||||||
import { faStar as faStarRegular } from "@fortawesome/free-regular-svg-icons";
|
|
||||||
|
|
||||||
// Initialize Font Awesome library with all required icons
|
// Initialize Font Awesome library with all required icons
|
||||||
library.add(
|
library.add(
|
||||||
faArrowDown,
|
faArrowDown,
|
||||||
@@ -126,7 +120,6 @@ library.add(
|
|||||||
faCircle,
|
faCircle,
|
||||||
faCircleCheck,
|
faCircleCheck,
|
||||||
faCircleInfo,
|
faCircleInfo,
|
||||||
faCircleMinus,
|
|
||||||
faCirclePlus,
|
faCirclePlus,
|
||||||
faCircleQuestion,
|
faCircleQuestion,
|
||||||
faCircleRight,
|
faCircleRight,
|
||||||
@@ -135,7 +128,6 @@ library.add(
|
|||||||
faCoins,
|
faCoins,
|
||||||
faComment,
|
faComment,
|
||||||
faCopy,
|
faCopy,
|
||||||
faCrown,
|
|
||||||
faDollar,
|
faDollar,
|
||||||
faDownload,
|
faDownload,
|
||||||
faEllipsis,
|
faEllipsis,
|
||||||
@@ -157,7 +149,6 @@ library.add(
|
|||||||
faHand,
|
faHand,
|
||||||
faHandHoldingDollar,
|
faHandHoldingDollar,
|
||||||
faHandHoldingHeart,
|
faHandHoldingHeart,
|
||||||
faHourglassHalf,
|
|
||||||
faHouseChimney,
|
faHouseChimney,
|
||||||
faImage,
|
faImage,
|
||||||
faImagePortrait,
|
faImagePortrait,
|
||||||
@@ -178,16 +169,15 @@ library.add(
|
|||||||
faPlus,
|
faPlus,
|
||||||
faQrcode,
|
faQrcode,
|
||||||
faQuestion,
|
faQuestion,
|
||||||
faRightFromBracket,
|
|
||||||
faRotate,
|
faRotate,
|
||||||
|
faScroll,
|
||||||
|
faRightFromBracket,
|
||||||
faShareNodes,
|
faShareNodes,
|
||||||
faSpinner,
|
faSpinner,
|
||||||
faSquare,
|
faSquare,
|
||||||
faSquareCaretDown,
|
faSquareCaretDown,
|
||||||
faSquareCaretUp,
|
faSquareCaretUp,
|
||||||
faSquarePlus,
|
faSquarePlus,
|
||||||
faStar,
|
|
||||||
faStarRegular,
|
|
||||||
faThumbtack,
|
faThumbtack,
|
||||||
faTrashCan,
|
faTrashCan,
|
||||||
faTriangleExclamation,
|
faTriangleExclamation,
|
||||||
|
|||||||
115
src/libs/util.ts
115
src/libs/util.ts
@@ -988,6 +988,11 @@ export async function importFromMnemonic(
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const mne: string = mnemonic.trim().toLowerCase();
|
const mne: string = mnemonic.trim().toLowerCase();
|
||||||
|
|
||||||
|
// Check if this is Test User #0
|
||||||
|
const TEST_USER_0_MNEMONIC =
|
||||||
|
"rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage";
|
||||||
|
const isTestUser0 = mne === TEST_USER_0_MNEMONIC;
|
||||||
|
|
||||||
// Derive address and keys from mnemonic
|
// Derive address and keys from mnemonic
|
||||||
const [address, privateHex, publicHex] = deriveAddress(mne, derivationPath);
|
const [address, privateHex, publicHex] = deriveAddress(mne, derivationPath);
|
||||||
|
|
||||||
@@ -1002,6 +1007,90 @@ export async function importFromMnemonic(
|
|||||||
|
|
||||||
// Save the new identity
|
// Save the new identity
|
||||||
await saveNewIdentity(newId, mne, derivationPath);
|
await saveNewIdentity(newId, mne, derivationPath);
|
||||||
|
|
||||||
|
// Set up Test User #0 specific settings
|
||||||
|
if (isTestUser0) {
|
||||||
|
// Set up Test User #0 specific settings with enhanced error handling
|
||||||
|
const platformService = await getPlatformService();
|
||||||
|
|
||||||
|
try {
|
||||||
|
// First, ensure the DID-specific settings record exists
|
||||||
|
await platformService.insertNewDidIntoSettings(newId.did);
|
||||||
|
|
||||||
|
// Then update with Test User #0 specific settings
|
||||||
|
await platformService.updateDidSpecificSettings(newId.did, {
|
||||||
|
firstName: "User Zero",
|
||||||
|
isRegistered: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Verify the settings were saved correctly
|
||||||
|
const verificationResult = await platformService.dbQuery(
|
||||||
|
"SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
|
||||||
|
[newId.did],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (verificationResult?.values?.length) {
|
||||||
|
const settings = verificationResult.values[0];
|
||||||
|
const firstName = settings[0];
|
||||||
|
const isRegistered = settings[1];
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
"[importFromMnemonic] Test User #0 settings verification",
|
||||||
|
{
|
||||||
|
did: newId.did,
|
||||||
|
firstName,
|
||||||
|
isRegistered,
|
||||||
|
expectedFirstName: "User Zero",
|
||||||
|
expectedIsRegistered: true,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// If settings weren't saved correctly, try individual updates
|
||||||
|
if (firstName !== "User Zero" || isRegistered !== 1) {
|
||||||
|
logger.warn(
|
||||||
|
"[importFromMnemonic] Test User #0 settings not saved correctly, retrying with individual updates",
|
||||||
|
);
|
||||||
|
|
||||||
|
await platformService.dbExec(
|
||||||
|
"UPDATE settings SET firstName = ? WHERE accountDid = ?",
|
||||||
|
["User Zero", newId.did],
|
||||||
|
);
|
||||||
|
|
||||||
|
await platformService.dbExec(
|
||||||
|
"UPDATE settings SET isRegistered = ? WHERE accountDid = ?",
|
||||||
|
[1, newId.did],
|
||||||
|
);
|
||||||
|
|
||||||
|
// Verify again
|
||||||
|
const retryResult = await platformService.dbQuery(
|
||||||
|
"SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
|
||||||
|
[newId.did],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (retryResult?.values?.length) {
|
||||||
|
const retrySettings = retryResult.values[0];
|
||||||
|
logger.debug(
|
||||||
|
"[importFromMnemonic] Test User #0 settings after retry",
|
||||||
|
{
|
||||||
|
firstName: retrySettings[0],
|
||||||
|
isRegistered: retrySettings[1],
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger.error(
|
||||||
|
"[importFromMnemonic] Failed to verify Test User #0 settings - no record found",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(
|
||||||
|
"[importFromMnemonic] Error setting up Test User #0 settings:",
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
// Don't throw - allow the import to continue even if settings fail
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1058,29 +1147,3 @@ export async function checkForDuplicateAccount(
|
|||||||
|
|
||||||
return (existingAccount?.values?.length ?? 0) > 0;
|
return (existingAccount?.values?.length ?? 0) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class PromiseTracker<T> {
|
|
||||||
private _promise: Promise<T>;
|
|
||||||
private _resolved = false;
|
|
||||||
private _value: T | undefined;
|
|
||||||
|
|
||||||
constructor(promise: Promise<T>) {
|
|
||||||
this._promise = promise.then((value) => {
|
|
||||||
this._resolved = true;
|
|
||||||
this._value = value;
|
|
||||||
return value;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
get isResolved(): boolean {
|
|
||||||
return this._resolved;
|
|
||||||
}
|
|
||||||
|
|
||||||
get value(): T | undefined {
|
|
||||||
return this._value;
|
|
||||||
}
|
|
||||||
|
|
||||||
get promise(): Promise<T> {
|
|
||||||
return this._promise;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -285,16 +285,6 @@ const routes: Array<RouteRecordRaw> = [
|
|||||||
name: "user-profile",
|
name: "user-profile",
|
||||||
component: () => import("../views/UserProfileView.vue"),
|
component: () => import("../views/UserProfileView.vue"),
|
||||||
},
|
},
|
||||||
// Catch-all route for 404 errors - must be last
|
|
||||||
{
|
|
||||||
path: "/:pathMatch(.*)*",
|
|
||||||
name: "not-found",
|
|
||||||
component: () => import("../views/NotFoundView.vue"),
|
|
||||||
meta: {
|
|
||||||
title: "Page Not Found",
|
|
||||||
requiresAuth: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
];
|
||||||
|
|
||||||
const isElectron = window.location.protocol === "file:";
|
const isElectron = window.location.protocol === "file:";
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { logger, safeStringify } from "../utils/logger";
|
|||||||
* @remarks
|
* @remarks
|
||||||
* Special handling includes:
|
* Special handling includes:
|
||||||
* - Enhanced logging for Capacitor platform
|
* - Enhanced logging for Capacitor platform
|
||||||
|
* - Rate limit detection and handling
|
||||||
* - Detailed error information logging including:
|
* - Detailed error information logging including:
|
||||||
* - Error message
|
* - Error message
|
||||||
* - HTTP status
|
* - HTTP status
|
||||||
@@ -49,5 +50,11 @@ export const handleApiError = (error: AxiosError, endpoint: string) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Specific handling for rate limits
|
||||||
|
if (error.response?.status === 400) {
|
||||||
|
logger.warn(`[Rate Limit] ${endpoint}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -799,7 +799,7 @@ export async function runMigrations<T>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Only show completion message in development
|
// Only show completion message in development
|
||||||
logger.log(
|
logger.debug(
|
||||||
`🎉 [Migration] Migration process complete! Summary: ${appliedCount} applied, ${skippedCount} skipped`,
|
`🎉 [Migration] Migration process complete! Summary: ${appliedCount} applied, ${skippedCount} skipped`,
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -1,297 +0,0 @@
|
|||||||
/**
|
|
||||||
* @fileoverview Base Database Service for Platform Services
|
|
||||||
* @author Matthew Raymer
|
|
||||||
*
|
|
||||||
* This abstract base class provides common database operations that are
|
|
||||||
* identical across all platform implementations. It eliminates code
|
|
||||||
* duplication and ensures consistency in database operations.
|
|
||||||
*
|
|
||||||
* Key Features:
|
|
||||||
* - Common database utility methods
|
|
||||||
* - Consistent settings management
|
|
||||||
* - Active identity management
|
|
||||||
* - Abstract methods for platform-specific database operations
|
|
||||||
*
|
|
||||||
* Architecture:
|
|
||||||
* - Abstract base class with common implementations
|
|
||||||
* - Platform services extend this class
|
|
||||||
* - Platform-specific database operations remain abstract
|
|
||||||
*
|
|
||||||
* @since 1.1.1-beta
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { logger } from "../../utils/logger";
|
|
||||||
import { QueryExecResult } from "@/interfaces/database";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Abstract base class for platform-specific database services.
|
|
||||||
*
|
|
||||||
* This class provides common database operations that are identical
|
|
||||||
* across all platform implementations (Web, Capacitor, Electron).
|
|
||||||
* Platform-specific services extend this class and implement the
|
|
||||||
* abstract database operation methods.
|
|
||||||
*
|
|
||||||
* Common Operations:
|
|
||||||
* - Settings management (update, retrieve, insert)
|
|
||||||
* - Active identity management
|
|
||||||
* - Database utility methods
|
|
||||||
*
|
|
||||||
* @abstract
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* export class WebPlatformService extends BaseDatabaseService {
|
|
||||||
* async dbQuery(sql: string, params?: unknown[]): Promise<QueryExecResult> {
|
|
||||||
* // Web-specific implementation
|
|
||||||
* }
|
|
||||||
* }
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
export abstract class BaseDatabaseService {
|
|
||||||
/**
|
|
||||||
* Generate an INSERT statement for a model object.
|
|
||||||
*
|
|
||||||
* Creates a parameterized INSERT statement with placeholders for
|
|
||||||
* all properties in the model object. This ensures safe SQL
|
|
||||||
* execution and prevents SQL injection.
|
|
||||||
*
|
|
||||||
* @param model - Object containing the data to insert
|
|
||||||
* @param tableName - Name of the target table
|
|
||||||
* @returns Object containing the SQL statement and parameters
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* const { sql, params } = this.generateInsertStatement(
|
|
||||||
* { name: 'John', age: 30 },
|
|
||||||
* 'users'
|
|
||||||
* );
|
|
||||||
* // sql: "INSERT INTO users (name, age) VALUES (?, ?)"
|
|
||||||
* // params: ['John', 30]
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
generateInsertStatement(
|
|
||||||
model: Record<string, unknown>,
|
|
||||||
tableName: string,
|
|
||||||
): { sql: string; params: unknown[] } {
|
|
||||||
const keys = Object.keys(model);
|
|
||||||
const placeholders = keys.map(() => "?").join(", ");
|
|
||||||
const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
|
|
||||||
const params = keys.map((key) => model[key]);
|
|
||||||
return { sql, params };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update default settings for the currently active account.
|
|
||||||
*
|
|
||||||
* Retrieves the active DID from the active_identity table and updates
|
|
||||||
* the corresponding settings record. This ensures settings are always
|
|
||||||
* updated for the correct account.
|
|
||||||
*
|
|
||||||
* @param settings - Object containing the settings to update
|
|
||||||
* @returns Promise that resolves when settings are updated
|
|
||||||
*
|
|
||||||
* @throws {Error} If no active DID is found or database operation fails
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* await this.updateDefaultSettings({
|
|
||||||
* theme: 'dark',
|
|
||||||
* notifications: true
|
|
||||||
* });
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
async updateDefaultSettings(
|
|
||||||
settings: Record<string, unknown>,
|
|
||||||
): Promise<void> {
|
|
||||||
// Get current active DID and update that identity's settings
|
|
||||||
const activeIdentity = await this.getActiveIdentity();
|
|
||||||
const activeDid = activeIdentity.activeDid;
|
|
||||||
|
|
||||||
if (!activeDid) {
|
|
||||||
logger.warn(
|
|
||||||
"[BaseDatabaseService] No active DID found, cannot update default settings",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const keys = Object.keys(settings);
|
|
||||||
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
|
||||||
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
|
||||||
const params = [...keys.map((key) => settings[key]), activeDid];
|
|
||||||
await this.dbExec(sql, params);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update the active DID in the active_identity table.
|
|
||||||
*
|
|
||||||
* Sets the active DID and updates the lastUpdated timestamp.
|
|
||||||
* This is used when switching between different accounts/identities.
|
|
||||||
*
|
|
||||||
* @param did - The DID to set as active
|
|
||||||
* @returns Promise that resolves when the update is complete
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* await this.updateActiveDid('did:example:123');
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
async updateActiveDid(did: string): Promise<void> {
|
|
||||||
await this.dbExec(
|
|
||||||
"UPDATE active_identity SET activeDid = ?, lastUpdated = datetime('now') WHERE id = 1",
|
|
||||||
[did],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the currently active DID from the active_identity table.
|
|
||||||
*
|
|
||||||
* Retrieves the active DID that represents the currently selected
|
|
||||||
* account/identity. This is used throughout the application to
|
|
||||||
* ensure operations are performed on the correct account.
|
|
||||||
*
|
|
||||||
* @returns Promise resolving to object containing the active DID
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* const { activeDid } = await this.getActiveIdentity();
|
|
||||||
* console.log('Current active DID:', activeDid);
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
async getActiveIdentity(): Promise<{ activeDid: string }> {
|
|
||||||
const result = (await this.dbQuery(
|
|
||||||
"SELECT activeDid FROM active_identity WHERE id = 1",
|
|
||||||
)) as QueryExecResult;
|
|
||||||
return {
|
|
||||||
activeDid: (result?.values?.[0]?.[0] as string) || "",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Insert a new DID into the settings table with default values.
|
|
||||||
*
|
|
||||||
* Creates a new settings record for a DID with default configuration
|
|
||||||
* values. Uses INSERT OR REPLACE to handle cases where settings
|
|
||||||
* already exist for the DID.
|
|
||||||
*
|
|
||||||
* @param did - The DID to create settings for
|
|
||||||
* @returns Promise that resolves when settings are created
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* await this.insertNewDidIntoSettings('did:example:123');
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
async insertNewDidIntoSettings(did: string): Promise<void> {
|
|
||||||
// Import constants dynamically to avoid circular dependencies
|
|
||||||
const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
|
|
||||||
await import("@/constants/app");
|
|
||||||
|
|
||||||
// Use INSERT OR REPLACE to handle case where settings already exist for this DID
|
|
||||||
// This prevents duplicate accountDid entries and ensures data integrity
|
|
||||||
await this.dbExec(
|
|
||||||
"INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
|
|
||||||
[did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update settings for a specific DID.
|
|
||||||
*
|
|
||||||
* Updates settings for a particular DID rather than the active one.
|
|
||||||
* This is useful for bulk operations or when managing multiple accounts.
|
|
||||||
*
|
|
||||||
* @param did - The DID to update settings for
|
|
||||||
* @param settings - Object containing the settings to update
|
|
||||||
* @returns Promise that resolves when settings are updated
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* await this.updateDidSpecificSettings('did:example:123', {
|
|
||||||
* theme: 'light',
|
|
||||||
* notifications: false
|
|
||||||
* });
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
async updateDidSpecificSettings(
|
|
||||||
did: string,
|
|
||||||
settings: Record<string, unknown>,
|
|
||||||
): Promise<void> {
|
|
||||||
const keys = Object.keys(settings);
|
|
||||||
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
|
||||||
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
|
||||||
const params = [...keys.map((key) => settings[key]), did];
|
|
||||||
await this.dbExec(sql, params);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve settings for the currently active account.
|
|
||||||
*
|
|
||||||
* Gets the active DID and retrieves all settings for that account.
|
|
||||||
* Excludes the 'id' column from the returned settings object.
|
|
||||||
*
|
|
||||||
* @returns Promise resolving to settings object or null if no active DID
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* const settings = await this.retrieveSettingsForActiveAccount();
|
|
||||||
* if (settings) {
|
|
||||||
* console.log('Theme:', settings.theme);
|
|
||||||
* console.log('Notifications:', settings.notifications);
|
|
||||||
* }
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
async retrieveSettingsForActiveAccount(): Promise<Record<
|
|
||||||
string,
|
|
||||||
unknown
|
|
||||||
> | null> {
|
|
||||||
// Get current active DID from active_identity table
|
|
||||||
const activeIdentity = await this.getActiveIdentity();
|
|
||||||
const activeDid = activeIdentity.activeDid;
|
|
||||||
|
|
||||||
if (!activeDid) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = (await this.dbQuery(
|
|
||||||
"SELECT * FROM settings WHERE accountDid = ?",
|
|
||||||
[activeDid],
|
|
||||||
)) as QueryExecResult;
|
|
||||||
if (result?.values?.[0]) {
|
|
||||||
// Convert the row to an object
|
|
||||||
const row = result.values[0];
|
|
||||||
const columns = result.columns || [];
|
|
||||||
const settings: Record<string, unknown> = {};
|
|
||||||
|
|
||||||
columns.forEach((column: string, index: number) => {
|
|
||||||
if (column !== "id") {
|
|
||||||
// Exclude the id column
|
|
||||||
settings[column] = row[index];
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return settings;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Abstract methods that must be implemented by platform-specific services
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute a database query (SELECT operations).
|
|
||||||
*
|
|
||||||
* @abstract
|
|
||||||
* @param sql - SQL query string
|
|
||||||
* @param params - Optional parameters for prepared statements
|
|
||||||
* @returns Promise resolving to query results
|
|
||||||
*/
|
|
||||||
abstract dbQuery(sql: string, params?: unknown[]): Promise<unknown>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute a database statement (INSERT, UPDATE, DELETE operations).
|
|
||||||
*
|
|
||||||
* @abstract
|
|
||||||
* @param sql - SQL statement string
|
|
||||||
* @param params - Optional parameters for prepared statements
|
|
||||||
* @returns Promise resolving to execution results
|
|
||||||
*/
|
|
||||||
abstract dbExec(sql: string, params?: unknown[]): Promise<unknown>;
|
|
||||||
}
|
|
||||||
@@ -22,7 +22,6 @@ import {
|
|||||||
PlatformCapabilities,
|
PlatformCapabilities,
|
||||||
} from "../PlatformService";
|
} from "../PlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import { BaseDatabaseService } from "./BaseDatabaseService";
|
|
||||||
|
|
||||||
interface QueuedOperation {
|
interface QueuedOperation {
|
||||||
type: "run" | "query" | "rawQuery";
|
type: "run" | "query" | "rawQuery";
|
||||||
@@ -40,10 +39,7 @@ interface QueuedOperation {
|
|||||||
* - Platform-specific features
|
* - Platform-specific features
|
||||||
* - SQLite database operations
|
* - SQLite database operations
|
||||||
*/
|
*/
|
||||||
export class CapacitorPlatformService
|
export class CapacitorPlatformService implements PlatformService {
|
||||||
extends BaseDatabaseService
|
|
||||||
implements PlatformService
|
|
||||||
{
|
|
||||||
/** Current camera direction */
|
/** Current camera direction */
|
||||||
private currentDirection: CameraDirection = CameraDirection.Rear;
|
private currentDirection: CameraDirection = CameraDirection.Rear;
|
||||||
|
|
||||||
@@ -56,7 +52,6 @@ export class CapacitorPlatformService
|
|||||||
private isProcessingQueue: boolean = false;
|
private isProcessingQueue: boolean = false;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
|
||||||
this.sqlite = new SQLiteConnection(CapacitorSQLite);
|
this.sqlite = new SQLiteConnection(CapacitorSQLite);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1333,8 +1328,79 @@ 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 {}
|
||||||
|
|
||||||
// Database utility methods - inherited from BaseDatabaseService
|
// Database utility methods
|
||||||
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
generateInsertStatement(
|
||||||
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
model: Record<string, unknown>,
|
||||||
// retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
|
tableName: string,
|
||||||
|
): { sql: string; params: unknown[] } {
|
||||||
|
const keys = Object.keys(model);
|
||||||
|
const placeholders = keys.map(() => "?").join(", ");
|
||||||
|
const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
|
||||||
|
const params = keys.map((key) => model[key]);
|
||||||
|
return { sql, params };
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateDefaultSettings(
|
||||||
|
settings: Record<string, unknown>,
|
||||||
|
): Promise<void> {
|
||||||
|
const keys = Object.keys(settings);
|
||||||
|
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
||||||
|
const sql = `UPDATE settings SET ${setClause} WHERE id = 1`;
|
||||||
|
const params = keys.map((key) => settings[key]);
|
||||||
|
await this.dbExec(sql, params);
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateActiveDid(did: string): Promise<void> {
|
||||||
|
await this.dbExec(
|
||||||
|
"UPDATE active_identity SET activeDid = ?, lastUpdated = datetime('now') WHERE id = 1",
|
||||||
|
[did],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async insertNewDidIntoSettings(did: string): Promise<void> {
|
||||||
|
// Import constants dynamically to avoid circular dependencies
|
||||||
|
const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
|
||||||
|
await import("@/constants/app");
|
||||||
|
|
||||||
|
// Use INSERT OR REPLACE to handle case where settings already exist for this DID
|
||||||
|
// This prevents duplicate accountDid entries and ensures data integrity
|
||||||
|
await this.dbExec(
|
||||||
|
"INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
|
||||||
|
[did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateDidSpecificSettings(
|
||||||
|
did: string,
|
||||||
|
settings: Record<string, unknown>,
|
||||||
|
): Promise<void> {
|
||||||
|
const keys = Object.keys(settings);
|
||||||
|
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
||||||
|
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
||||||
|
const params = [...keys.map((key) => settings[key]), did];
|
||||||
|
await this.dbExec(sql, params);
|
||||||
|
}
|
||||||
|
|
||||||
|
async retrieveSettingsForActiveAccount(): Promise<Record<
|
||||||
|
string,
|
||||||
|
unknown
|
||||||
|
> | null> {
|
||||||
|
const result = await this.dbQuery("SELECT * FROM settings WHERE id = 1");
|
||||||
|
if (result?.values?.[0]) {
|
||||||
|
// Convert the row to an object
|
||||||
|
const row = result.values[0];
|
||||||
|
const columns = result.columns || [];
|
||||||
|
const settings: Record<string, unknown> = {};
|
||||||
|
|
||||||
|
columns.forEach((column, index) => {
|
||||||
|
if (column !== "id") {
|
||||||
|
// Exclude the id column
|
||||||
|
settings[column] = row[index];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import {
|
|||||||
} from "../PlatformService";
|
} from "../PlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import { QueryExecResult } from "@/interfaces/database";
|
import { QueryExecResult } from "@/interfaces/database";
|
||||||
import { BaseDatabaseService } from "./BaseDatabaseService";
|
|
||||||
// Dynamic import of initBackend to prevent worker context errors
|
// Dynamic import of initBackend to prevent worker context errors
|
||||||
import type {
|
import type {
|
||||||
WorkerRequest,
|
WorkerRequest,
|
||||||
@@ -30,10 +29,7 @@ import type {
|
|||||||
* Note: File system operations are not available in the web platform
|
* Note: File system operations are not available in the web platform
|
||||||
* due to browser security restrictions. These methods throw appropriate errors.
|
* due to browser security restrictions. These methods throw appropriate errors.
|
||||||
*/
|
*/
|
||||||
export class WebPlatformService
|
export class WebPlatformService implements PlatformService {
|
||||||
extends BaseDatabaseService
|
|
||||||
implements PlatformService
|
|
||||||
{
|
|
||||||
private static instanceCount = 0; // Debug counter
|
private static instanceCount = 0; // Debug counter
|
||||||
private worker: Worker | null = null;
|
private worker: Worker | null = null;
|
||||||
private workerReady = false;
|
private workerReady = false;
|
||||||
@@ -50,16 +46,17 @@ export class WebPlatformService
|
|||||||
private readonly messageTimeout = 30000; // 30 seconds
|
private readonly messageTimeout = 30000; // 30 seconds
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
|
||||||
WebPlatformService.instanceCount++;
|
WebPlatformService.instanceCount++;
|
||||||
|
|
||||||
logger.debug("[WebPlatformService] Initializing web platform service");
|
// Use debug level logging for development mode to reduce console noise
|
||||||
|
const isDevelopment = process.env.VITE_PLATFORM === "development";
|
||||||
|
const log = isDevelopment ? logger.debug : logger.log;
|
||||||
|
|
||||||
|
log("[WebPlatformService] Initializing web platform service");
|
||||||
|
|
||||||
// Only initialize SharedArrayBuffer setup for web platforms
|
// Only initialize SharedArrayBuffer setup for web platforms
|
||||||
if (this.isWorker()) {
|
if (this.isWorker()) {
|
||||||
logger.debug(
|
log("[WebPlatformService] Skipping initBackend call in worker context");
|
||||||
"[WebPlatformService] Skipping initBackend call in worker context",
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -673,8 +670,105 @@ export class WebPlatformService
|
|||||||
// SharedArrayBuffer initialization is handled by initBackend call in initializeWorker
|
// SharedArrayBuffer initialization is handled by initBackend call in initializeWorker
|
||||||
}
|
}
|
||||||
|
|
||||||
// Database utility methods - inherited from BaseDatabaseService
|
// Database utility methods
|
||||||
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
generateInsertStatement(
|
||||||
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
model: Record<string, unknown>,
|
||||||
// retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
|
tableName: string,
|
||||||
|
): { sql: string; params: unknown[] } {
|
||||||
|
const keys = Object.keys(model);
|
||||||
|
const placeholders = keys.map(() => "?").join(", ");
|
||||||
|
const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
|
||||||
|
const params = keys.map((key) => model[key]);
|
||||||
|
return { sql, params };
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateDefaultSettings(
|
||||||
|
settings: Record<string, unknown>,
|
||||||
|
): Promise<void> {
|
||||||
|
// Get current active DID and update that identity's settings
|
||||||
|
const activeIdentity = await this.getActiveIdentity();
|
||||||
|
const activeDid = activeIdentity.activeDid;
|
||||||
|
|
||||||
|
if (!activeDid) {
|
||||||
|
logger.warn(
|
||||||
|
"[WebPlatformService] No active DID found, cannot update default settings",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const keys = Object.keys(settings);
|
||||||
|
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
||||||
|
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
||||||
|
const params = [...keys.map((key) => settings[key]), activeDid];
|
||||||
|
await this.dbExec(sql, params);
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateActiveDid(did: string): Promise<void> {
|
||||||
|
await this.dbExec(
|
||||||
|
"INSERT OR REPLACE INTO active_identity (id, activeDid, lastUpdated) VALUES (1, ?, ?)",
|
||||||
|
[did, new Date().toISOString()],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getActiveIdentity(): Promise<{ activeDid: string }> {
|
||||||
|
const result = await this.dbQuery(
|
||||||
|
"SELECT activeDid FROM active_identity WHERE id = 1",
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
activeDid: (result?.values?.[0]?.[0] as string) || "",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async insertNewDidIntoSettings(did: string): Promise<void> {
|
||||||
|
// Import constants dynamically to avoid circular dependencies
|
||||||
|
const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
|
||||||
|
await import("@/constants/app");
|
||||||
|
|
||||||
|
// Use INSERT OR REPLACE to handle case where settings already exist for this DID
|
||||||
|
// This prevents duplicate accountDid entries and ensures data integrity
|
||||||
|
await this.dbExec(
|
||||||
|
"INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
|
||||||
|
[did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateDidSpecificSettings(
|
||||||
|
did: string,
|
||||||
|
settings: Record<string, unknown>,
|
||||||
|
): Promise<void> {
|
||||||
|
const keys = Object.keys(settings);
|
||||||
|
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
||||||
|
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
||||||
|
const params = [...keys.map((key) => settings[key]), did];
|
||||||
|
// Log update operation for debugging
|
||||||
|
logger.debug(
|
||||||
|
"[WebPlatformService] updateDidSpecificSettings",
|
||||||
|
sql,
|
||||||
|
JSON.stringify(params, null, 2),
|
||||||
|
);
|
||||||
|
await this.dbExec(sql, params);
|
||||||
|
}
|
||||||
|
|
||||||
|
async retrieveSettingsForActiveAccount(): Promise<Record<
|
||||||
|
string,
|
||||||
|
unknown
|
||||||
|
> | null> {
|
||||||
|
const result = await this.dbQuery("SELECT * FROM settings WHERE id = 1");
|
||||||
|
if (result?.values?.[0]) {
|
||||||
|
// Convert the row to an object
|
||||||
|
const row = result.values[0];
|
||||||
|
const columns = result.columns || [];
|
||||||
|
const settings: Record<string, unknown> = {};
|
||||||
|
|
||||||
|
columns.forEach((column, index) => {
|
||||||
|
if (column !== "id") {
|
||||||
|
// Exclude the id column
|
||||||
|
settings[column] = row[index];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
<EntityGrid
|
<EntityGrid
|
||||||
entity-type="people"
|
entity-type="people"
|
||||||
:entities="people"
|
:entities="people"
|
||||||
|
:max-items="5"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="people"
|
:all-contacts="people"
|
||||||
@@ -38,6 +39,7 @@
|
|||||||
<EntityGrid
|
<EntityGrid
|
||||||
entity-type="projects"
|
entity-type="projects"
|
||||||
:entities="projects"
|
:entities="projects"
|
||||||
|
:max-items="3"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="people"
|
:all-contacts="people"
|
||||||
@@ -150,8 +152,11 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
customPeopleFunction = (
|
customPeopleFunction = (
|
||||||
entities: Contact[],
|
entities: Contact[],
|
||||||
_entityType: string,
|
_entityType: string,
|
||||||
|
maxItems: number,
|
||||||
): Contact[] => {
|
): Contact[] => {
|
||||||
return entities.filter((person) => person.profileImageUrl);
|
return entities
|
||||||
|
.filter((person) => person.profileImageUrl)
|
||||||
|
.slice(0, maxItems);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -160,6 +165,7 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
customProjectsFunction = (
|
customProjectsFunction = (
|
||||||
entities: PlanData[],
|
entities: PlanData[],
|
||||||
_entityType: string,
|
_entityType: string,
|
||||||
|
_maxItems: number,
|
||||||
): PlanData[] => {
|
): PlanData[] => {
|
||||||
return entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 3);
|
return entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 3);
|
||||||
};
|
};
|
||||||
@@ -194,16 +200,16 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
*/
|
*/
|
||||||
get displayedPeopleCount(): number {
|
get displayedPeopleCount(): number {
|
||||||
if (this.useCustomFunction) {
|
if (this.useCustomFunction) {
|
||||||
return this.customPeopleFunction(this.people, "people").length;
|
return this.customPeopleFunction(this.people, "people", 5).length;
|
||||||
}
|
}
|
||||||
return Math.min(10, this.people.length); // Initial batch size for infinite scroll
|
return Math.min(5, this.people.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
get displayedProjectsCount(): number {
|
get displayedProjectsCount(): number {
|
||||||
if (this.useCustomFunction) {
|
if (this.useCustomFunction) {
|
||||||
return this.customProjectsFunction(this.projects, "projects").length;
|
return this.customProjectsFunction(this.projects, "projects", 3).length;
|
||||||
}
|
}
|
||||||
return Math.min(10, this.projects.length); // Initial batch size for infinite scroll
|
return Math.min(7, this.projects.length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -85,6 +85,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
@@ -196,10 +197,10 @@ This tests the helper method only - no database interaction`;
|
|||||||
const success = await this.$saveSettings(testSettings);
|
const success = await this.$saveSettings(testSettings);
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
// Now query the raw database to see how it's actually stored.
|
// Now query the raw database to see how it's actually stored
|
||||||
// Note that new users probably have settings with ID of 1 but old migrated users might skip to 2.
|
|
||||||
const rawResult = await this.$dbQuery(
|
const rawResult = await this.$dbQuery(
|
||||||
"SELECT searchBoxes FROM settings limit 1",
|
"SELECT searchBoxes FROM settings WHERE id = ?",
|
||||||
|
[MASTER_SETTINGS_KEY],
|
||||||
);
|
);
|
||||||
|
|
||||||
if (rawResult?.values?.length) {
|
if (rawResult?.values?.length) {
|
||||||
|
|||||||
@@ -301,11 +301,7 @@ export const PlatformServiceMixin = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Convert SQLite JSON strings to objects/arrays
|
// Convert SQLite JSON strings to objects/arrays
|
||||||
if (
|
if (column === "contactMethods" || column === "searchBoxes") {
|
||||||
column === "contactMethods" ||
|
|
||||||
column === "searchBoxes" ||
|
|
||||||
column === "starredPlanHandleIds"
|
|
||||||
) {
|
|
||||||
value = this._parseJsonField(value, []);
|
value = this._parseJsonField(value, []);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -353,14 +349,6 @@ export const PlatformServiceMixin = {
|
|||||||
? JSON.stringify(settings.searchBoxes)
|
? JSON.stringify(settings.searchBoxes)
|
||||||
: String(settings.searchBoxes);
|
: String(settings.searchBoxes);
|
||||||
}
|
}
|
||||||
if (settings.starredPlanHandleIds !== undefined) {
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
(converted as any).starredPlanHandleIds = Array.isArray(
|
|
||||||
settings.starredPlanHandleIds,
|
|
||||||
)
|
|
||||||
? JSON.stringify(settings.starredPlanHandleIds)
|
|
||||||
: String(settings.starredPlanHandleIds);
|
|
||||||
}
|
|
||||||
|
|
||||||
return converted;
|
return converted;
|
||||||
},
|
},
|
||||||
@@ -526,7 +514,7 @@ export const PlatformServiceMixin = {
|
|||||||
* Utility method for retrieving master settings
|
* Utility method for retrieving master settings
|
||||||
* Common pattern used across many components
|
* Common pattern used across many components
|
||||||
*/
|
*/
|
||||||
async _getMasterSettings(
|
async $getMasterSettings(
|
||||||
fallback: Settings | null = null,
|
fallback: Settings | null = null,
|
||||||
): Promise<Settings | null> {
|
): Promise<Settings | null> {
|
||||||
try {
|
try {
|
||||||
@@ -563,12 +551,6 @@ export const PlatformServiceMixin = {
|
|||||||
if (settings.searchBoxes) {
|
if (settings.searchBoxes) {
|
||||||
settings.searchBoxes = this._parseJsonField(settings.searchBoxes, []);
|
settings.searchBoxes = this._parseJsonField(settings.searchBoxes, []);
|
||||||
}
|
}
|
||||||
if (settings.starredPlanHandleIds) {
|
|
||||||
settings.starredPlanHandleIds = this._parseJsonField(
|
|
||||||
settings.starredPlanHandleIds,
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -589,7 +571,7 @@ export const PlatformServiceMixin = {
|
|||||||
): Promise<Settings> {
|
): Promise<Settings> {
|
||||||
try {
|
try {
|
||||||
// Get default settings
|
// Get default settings
|
||||||
const defaultSettings = await this._getMasterSettings(defaultFallback);
|
const defaultSettings = await this.$getMasterSettings(defaultFallback);
|
||||||
|
|
||||||
// If no account DID, return defaults
|
// If no account DID, return defaults
|
||||||
if (!accountDid) {
|
if (!accountDid) {
|
||||||
@@ -635,12 +617,6 @@ export const PlatformServiceMixin = {
|
|||||||
[],
|
[],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (mergedSettings.starredPlanHandleIds) {
|
|
||||||
mergedSettings.starredPlanHandleIds = this._parseJsonField(
|
|
||||||
mergedSettings.starredPlanHandleIds,
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return mergedSettings;
|
return mergedSettings;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -970,20 +946,6 @@ export const PlatformServiceMixin = {
|
|||||||
return this.$normalizeContacts(rawContacts);
|
return this.$normalizeContacts(rawContacts);
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
|
||||||
* Load all contacts sorted by when they were added (by ID)
|
|
||||||
* Always fetches fresh data from database for consistency
|
|
||||||
* Handles JSON string/object duality for contactMethods field
|
|
||||||
* @returns Promise<Contact[]> Array of normalized contact objects sorted by addition date (newest first)
|
|
||||||
*/
|
|
||||||
async $contactsByDateAdded(): Promise<Contact[]> {
|
|
||||||
const rawContacts = (await this.$query(
|
|
||||||
"SELECT * FROM contacts ORDER BY id DESC",
|
|
||||||
)) as ContactMaybeWithJsonStrings[];
|
|
||||||
|
|
||||||
return this.$normalizeContacts(rawContacts);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ultra-concise shortcut for getting number of contacts
|
* Ultra-concise shortcut for getting number of contacts
|
||||||
* @returns Promise<number> Total number of contacts
|
* @returns Promise<number> Total number of contacts
|
||||||
@@ -1008,7 +970,7 @@ export const PlatformServiceMixin = {
|
|||||||
* @returns Fresh settings object from database
|
* @returns Fresh settings object from database
|
||||||
*/
|
*/
|
||||||
async $settings(defaults: Settings = {}): Promise<Settings> {
|
async $settings(defaults: Settings = {}): Promise<Settings> {
|
||||||
const settings = await this._getMasterSettings(defaults);
|
const settings = await this.$getMasterSettings(defaults);
|
||||||
|
|
||||||
if (!settings) {
|
if (!settings) {
|
||||||
return defaults;
|
return defaults;
|
||||||
@@ -1041,7 +1003,7 @@ export const PlatformServiceMixin = {
|
|||||||
): Promise<Settings> {
|
): Promise<Settings> {
|
||||||
try {
|
try {
|
||||||
// Get default settings first
|
// Get default settings first
|
||||||
const defaultSettings = await this._getMasterSettings(defaults);
|
const defaultSettings = await this.$getMasterSettings(defaults);
|
||||||
|
|
||||||
if (!defaultSettings) {
|
if (!defaultSettings) {
|
||||||
return defaults;
|
return defaults;
|
||||||
@@ -1250,11 +1212,6 @@ export const PlatformServiceMixin = {
|
|||||||
* @param changes Settings changes to save
|
* @param changes Settings changes to save
|
||||||
* @returns Promise<boolean> Success status
|
* @returns Promise<boolean> Success status
|
||||||
*/
|
*/
|
||||||
/**
|
|
||||||
* Since this is unused, and since it relies on this.activeDid which isn't guaranteed to exist,
|
|
||||||
* let's take this out for the sake of safety.
|
|
||||||
* Totally remove after start of 2026 (since it would be obvious by then that it's not used).
|
|
||||||
*
|
|
||||||
async $saveMySettings(changes: Partial<Settings>): Promise<boolean> {
|
async $saveMySettings(changes: Partial<Settings>): Promise<boolean> {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
const currentDid = (this as any).activeDid;
|
const currentDid = (this as any).activeDid;
|
||||||
@@ -1264,7 +1221,6 @@ export const PlatformServiceMixin = {
|
|||||||
}
|
}
|
||||||
return await this.$saveUserSettings(currentDid, changes);
|
return await this.$saveUserSettings(currentDid, changes);
|
||||||
},
|
},
|
||||||
**/
|
|
||||||
|
|
||||||
// =================================================
|
// =================================================
|
||||||
// CACHE MANAGEMENT METHODS
|
// CACHE MANAGEMENT METHODS
|
||||||
@@ -1886,7 +1842,7 @@ export const PlatformServiceMixin = {
|
|||||||
async $debugMergedSettings(did: string): Promise<void> {
|
async $debugMergedSettings(did: string): Promise<void> {
|
||||||
try {
|
try {
|
||||||
// Get default settings
|
// Get default settings
|
||||||
const defaultSettings = await this._getMasterSettings({});
|
const defaultSettings = await this.$getMasterSettings({});
|
||||||
logger.debug(
|
logger.debug(
|
||||||
`[PlatformServiceMixin] Default settings:`,
|
`[PlatformServiceMixin] Default settings:`,
|
||||||
defaultSettings,
|
defaultSettings,
|
||||||
@@ -1936,6 +1892,7 @@ export interface IPlatformServiceMixin {
|
|||||||
params?: unknown[],
|
params?: unknown[],
|
||||||
): Promise<SqlValue[] | undefined>;
|
): Promise<SqlValue[] | undefined>;
|
||||||
$dbRawQuery(sql: string, params?: unknown[]): Promise<unknown | undefined>;
|
$dbRawQuery(sql: string, params?: unknown[]): Promise<unknown | undefined>;
|
||||||
|
$getMasterSettings(fallback?: Settings | null): Promise<Settings | null>;
|
||||||
$getMergedSettings(
|
$getMergedSettings(
|
||||||
defaultKey: string,
|
defaultKey: string,
|
||||||
accountDid?: string,
|
accountDid?: string,
|
||||||
@@ -2060,6 +2017,7 @@ declare module "@vue/runtime-core" {
|
|||||||
params?: unknown[],
|
params?: unknown[],
|
||||||
): Promise<unknown[] | undefined>;
|
): Promise<unknown[] | undefined>;
|
||||||
$dbRawQuery(sql: string, params?: unknown[]): Promise<unknown | undefined>;
|
$dbRawQuery(sql: string, params?: unknown[]): Promise<unknown | undefined>;
|
||||||
|
$getMasterSettings(defaults?: Settings | null): Promise<Settings | null>;
|
||||||
$getMergedSettings(
|
$getMergedSettings(
|
||||||
key: string,
|
key: string,
|
||||||
did?: string,
|
did?: string,
|
||||||
@@ -2071,7 +2029,6 @@ declare module "@vue/runtime-core" {
|
|||||||
|
|
||||||
// Specialized shortcuts - contacts cached, settings fresh
|
// Specialized shortcuts - contacts cached, settings fresh
|
||||||
$contacts(): Promise<Contact[]>;
|
$contacts(): Promise<Contact[]>;
|
||||||
$contactsByDateAdded(): Promise<Contact[]>;
|
|
||||||
$contactCount(): Promise<number>;
|
$contactCount(): Promise<number>;
|
||||||
$settings(defaults?: Settings): Promise<Settings>;
|
$settings(defaults?: Settings): Promise<Settings>;
|
||||||
$accountSettings(did?: string, defaults?: Settings): Promise<Settings>;
|
$accountSettings(did?: string, defaults?: Settings): Promise<Settings>;
|
||||||
@@ -2083,8 +2040,7 @@ declare module "@vue/runtime-core" {
|
|||||||
did: string,
|
did: string,
|
||||||
changes: Partial<Settings>,
|
changes: Partial<Settings>,
|
||||||
): Promise<boolean>;
|
): Promise<boolean>;
|
||||||
// @deprecated; see implementation note above
|
$saveMySettings(changes: Partial<Settings>): Promise<boolean>;
|
||||||
// $saveMySettings(changes: Partial<Settings>): Promise<boolean>;
|
|
||||||
|
|
||||||
// Cache management methods
|
// Cache management methods
|
||||||
$refreshSettings(): Promise<Settings>;
|
$refreshSettings(): Promise<Settings>;
|
||||||
|
|||||||
@@ -24,28 +24,10 @@ export function getMemoryLogs(): string[] {
|
|||||||
return [..._memoryLogs];
|
return [..._memoryLogs];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Stringify an object with proper handling of circular references and functions
|
|
||||||
*
|
|
||||||
* Don't use for arrays; map with this over the array.
|
|
||||||
*
|
|
||||||
* @param obj - The object to stringify
|
|
||||||
* @returns The stringified object, plus 'message' and 'stack' for Error objects
|
|
||||||
*/
|
|
||||||
export function safeStringify(obj: unknown) {
|
export function safeStringify(obj: unknown) {
|
||||||
const seen = new WeakSet();
|
const seen = new WeakSet();
|
||||||
|
|
||||||
// since 'message' & 'stack' are not enumerable for errors, let's add those
|
return JSON.stringify(obj, (_key, value) => {
|
||||||
let objToStringify = obj;
|
|
||||||
if (obj instanceof Error) {
|
|
||||||
objToStringify = {
|
|
||||||
...obj,
|
|
||||||
message: obj.message,
|
|
||||||
stack: obj.stack,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return JSON.stringify(objToStringify, (_key, value) => {
|
|
||||||
if (typeof value === "object" && value !== null) {
|
if (typeof value === "object" && value !== null) {
|
||||||
if (seen.has(value)) {
|
if (seen.has(value)) {
|
||||||
return "[Circular]";
|
return "[Circular]";
|
||||||
@@ -196,8 +178,7 @@ export const logger = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Database logging
|
// Database logging
|
||||||
const argsString =
|
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
|
||||||
logToDatabase(message + argsString, "info");
|
logToDatabase(message + argsString, "info");
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -208,8 +189,7 @@ export const logger = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Database logging
|
// Database logging
|
||||||
const argsString =
|
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
|
||||||
logToDatabase(message + argsString, "info");
|
logToDatabase(message + argsString, "info");
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -220,8 +200,7 @@ export const logger = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Database logging
|
// Database logging
|
||||||
const argsString =
|
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
|
||||||
logToDatabase(message + argsString, "warn");
|
logToDatabase(message + argsString, "warn");
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -232,9 +211,9 @@ export const logger = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Database logging
|
// Database logging
|
||||||
const argsString =
|
const messageString = safeStringify(message);
|
||||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
const argsString = args.length > 0 ? safeStringify(args) : "";
|
||||||
logToDatabase(message + argsString, "error");
|
logToDatabase(messageString + argsString, "error");
|
||||||
},
|
},
|
||||||
|
|
||||||
// New database-focused methods (self-contained)
|
// New database-focused methods (self-contained)
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Profile" />
|
<QuickNav selected="Profile" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<main
|
<main
|
||||||
@@ -8,22 +9,10 @@
|
|||||||
role="main"
|
role="main"
|
||||||
aria-label="Account Profile"
|
aria-label="Account Profile"
|
||||||
>
|
>
|
||||||
<TopMessage />
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light">
|
||||||
<!-- Main View Heading -->
|
Your Identity
|
||||||
<div class="flex gap-4 items-center mb-8">
|
</h1>
|
||||||
<h1 id="ViewHeading" class="text-2xl font-bold leading-none">
|
|
||||||
Your Identity
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ID notice -->
|
<!-- ID notice -->
|
||||||
<div
|
<div
|
||||||
@@ -161,6 +150,8 @@
|
|||||||
</section>
|
</section>
|
||||||
<PushNotificationPermission ref="pushNotificationPermission" />
|
<PushNotificationPermission ref="pushNotificationPermission" />
|
||||||
|
|
||||||
|
<LocationSearchSection :search-box="searchBox" />
|
||||||
|
|
||||||
<!-- User Profile -->
|
<!-- User Profile -->
|
||||||
<section
|
<section
|
||||||
v-if="isRegistered"
|
v-if="isRegistered"
|
||||||
@@ -253,8 +244,6 @@
|
|||||||
<div v-else>Saving...</div>
|
<div v-else>Saving...</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<LocationSearchSection :search-box="searchBox" />
|
|
||||||
|
|
||||||
<UsageLimitsSection
|
<UsageLimitsSection
|
||||||
v-if="activeDid"
|
v-if="activeDid"
|
||||||
:loading-limits="loadingLimits"
|
:loading-limits="loadingLimits"
|
||||||
@@ -1075,8 +1064,8 @@ export default class AccountViewView extends Vue {
|
|||||||
this.hideRegisterPromptOnNewContact =
|
this.hideRegisterPromptOnNewContact =
|
||||||
!!settings.hideRegisterPromptOnNewContact;
|
!!settings.hideRegisterPromptOnNewContact;
|
||||||
this.isRegistered = !!settings?.isRegistered;
|
this.isRegistered = !!settings?.isRegistered;
|
||||||
this.isSearchAreasSet =
|
this.isSearchAreasSet = !!settings.searchBoxes;
|
||||||
!!settings.searchBoxes && settings.searchBoxes.length > 0;
|
this.searchBox = settings.searchBoxes?.[0] || null;
|
||||||
this.notifyingNewActivity = !!settings.notifyingNewActivityTime;
|
this.notifyingNewActivity = !!settings.notifyingNewActivityTime;
|
||||||
this.notifyingNewActivityTime = settings.notifyingNewActivityTime || "";
|
this.notifyingNewActivityTime = settings.notifyingNewActivityTime || "";
|
||||||
this.notifyingReminder = !!settings.notifyingReminderTime;
|
this.notifyingReminder = !!settings.notifyingReminderTime;
|
||||||
@@ -1090,7 +1079,6 @@ export default class AccountViewView extends Vue {
|
|||||||
this.passkeyExpirationMinutes =
|
this.passkeyExpirationMinutes =
|
||||||
settings.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES;
|
settings.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES;
|
||||||
this.previousPasskeyExpirationMinutes = this.passkeyExpirationMinutes;
|
this.previousPasskeyExpirationMinutes = this.passkeyExpirationMinutes;
|
||||||
this.searchBox = settings.searchBoxes?.[0] || null;
|
|
||||||
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
||||||
this.showShortcutBvc = !!settings.showShortcutBvc;
|
this.showShortcutBvc = !!settings.showShortcutBvc;
|
||||||
this.warnIfProdServer = !!settings.warnIfProdServer;
|
this.warnIfProdServer = !!settings.warnIfProdServer;
|
||||||
@@ -1466,6 +1454,7 @@ export default class AccountViewView extends Vue {
|
|||||||
this.imageLimits = imageResp.data;
|
this.imageLimits = imageResp.data;
|
||||||
} else {
|
} else {
|
||||||
this.limitsMessage = ACCOUNT_VIEW_CONSTANTS.LIMITS.NO_IMAGE_ACCESS;
|
this.limitsMessage = ACCOUNT_VIEW_CONSTANTS.LIMITS.NO_IMAGE_ACCESS;
|
||||||
|
this.notify.warning(ACCOUNT_VIEW_CONSTANTS.LIMITS.CANNOT_UPLOAD_IMAGES);
|
||||||
}
|
}
|
||||||
|
|
||||||
const endorserResp = await fetchEndorserRateLimits(
|
const endorserResp = await fetchEndorserRateLimits(
|
||||||
@@ -1476,6 +1465,9 @@ export default class AccountViewView extends Vue {
|
|||||||
|
|
||||||
if (endorserResp.status === 200) {
|
if (endorserResp.status === 200) {
|
||||||
this.endorserLimits = endorserResp.data;
|
this.endorserLimits = endorserResp.data;
|
||||||
|
} else {
|
||||||
|
this.limitsMessage = ACCOUNT_VIEW_CONSTANTS.LIMITS.NO_LIMITS_FOUND;
|
||||||
|
this.notify.warning(ACCOUNT_VIEW_CONSTANTS.LIMITS.BAD_SERVER_RESPONSE);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.limitsMessage =
|
this.limitsMessage =
|
||||||
@@ -1488,21 +1480,18 @@ export default class AccountViewView extends Vue {
|
|||||||
status?: number;
|
status?: number;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
logger.warn(
|
logger.error("[Server Limits] Error retrieving limits:", {
|
||||||
"[Server Limits] Error retrieving limits, expected for unregistered users:",
|
error: error instanceof Error ? error.message : String(error),
|
||||||
{
|
did: did,
|
||||||
error: error instanceof Error ? error.message : String(error),
|
apiServer: this.apiServer,
|
||||||
did: did,
|
imageServer: this.DEFAULT_IMAGE_API_SERVER,
|
||||||
apiServer: this.apiServer,
|
partnerApiServer: this.partnerApiServer,
|
||||||
imageServer: this.DEFAULT_IMAGE_API_SERVER,
|
errorCode: axiosError?.response?.data?.error?.code,
|
||||||
partnerApiServer: this.partnerApiServer,
|
errorMessage: axiosError?.response?.data?.error?.message,
|
||||||
errorCode: axiosError?.response?.data?.error?.code,
|
httpStatus: axiosError?.response?.status,
|
||||||
errorMessage: axiosError?.response?.data?.error?.message,
|
needsUserMigration: true,
|
||||||
httpStatus: axiosError?.response?.status,
|
timestamp: new Date().toISOString(),
|
||||||
needsUserMigration: true,
|
});
|
||||||
timestamp: new Date().toISOString(),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
// this.notify.error(this.limitsMessage, TIMEOUTS.STANDARD);
|
// this.notify.error(this.limitsMessage, TIMEOUTS.STANDARD);
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -1,27 +1,19 @@
|
|||||||
<template>
|
<template>
|
||||||
|
<QuickNav />
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Back -->
|
||||||
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
|
</button>
|
||||||
Raw Claim
|
Raw Claim
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex">
|
<div class="flex">
|
||||||
|
|||||||
@@ -2,27 +2,19 @@
|
|||||||
<QuickNav />
|
<QuickNav />
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Back -->
|
||||||
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
aria-label="Go back"
|
||||||
|
@click="$router.go(-1)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
|
</button>
|
||||||
Verifiable Claim Details
|
Verifiable Claim Details
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Details -->
|
<!-- Details -->
|
||||||
@@ -88,25 +80,16 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm overflow-hidden">
|
<div class="text-sm">
|
||||||
<div
|
<div data-testId="description">
|
||||||
data-testId="description"
|
<font-awesome icon="message" class="fa-fw text-slate-400" />
|
||||||
class="flex items-start gap-2 overflow-hidden"
|
{{ claimDescription }}
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
icon="message"
|
|
||||||
class="fa-fw text-slate-400 flex-shrink-0 mt-1"
|
|
||||||
/>
|
|
||||||
<vue-markdown
|
|
||||||
:source="claimDescription"
|
|
||||||
class="markdown-content flex-1 min-w-0"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="overflow-hidden text-ellipsis">
|
<div>
|
||||||
<font-awesome icon="user" class="fa-fw text-slate-400" />
|
<font-awesome icon="user" class="fa-fw text-slate-400" />
|
||||||
{{ didInfo(veriClaim.issuer) }}
|
{{ didInfo(veriClaim.issuer) }}
|
||||||
</div>
|
</div>
|
||||||
<div class="overflow-hidden text-ellipsis">
|
<div>
|
||||||
<font-awesome icon="calendar" class="fa-fw text-slate-400" />
|
<font-awesome icon="calendar" class="fa-fw text-slate-400" />
|
||||||
Recorded
|
Recorded
|
||||||
{{ formattedIssueDate }}
|
{{ formattedIssueDate }}
|
||||||
@@ -550,11 +533,9 @@ import { AxiosError } from "axios";
|
|||||||
import * as yaml from "js-yaml";
|
import * as yaml from "js-yaml";
|
||||||
import * as R from "ramda";
|
import * as R from "ramda";
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import VueMarkdown from "vue-markdown-render";
|
|
||||||
import { Router, RouteLocationNormalizedLoaded } from "vue-router";
|
import { Router, RouteLocationNormalizedLoaded } from "vue-router";
|
||||||
import { copyToClipboard } from "../services/ClipboardService";
|
import { copyToClipboard } from "../services/ClipboardService";
|
||||||
|
import { GenericVerifiableCredential } from "../interfaces";
|
||||||
import { EmojiClaim, GenericVerifiableCredential } from "../interfaces";
|
|
||||||
import GiftedDialog from "../components/GiftedDialog.vue";
|
import GiftedDialog from "../components/GiftedDialog.vue";
|
||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
import { NotificationIface } from "../constants/app";
|
import { NotificationIface } from "../constants/app";
|
||||||
@@ -572,7 +553,7 @@ import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
|||||||
import { APP_SERVER } from "@/constants/app";
|
import { APP_SERVER } from "@/constants/app";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { GiftedDialog, QuickNav, VueMarkdown },
|
components: { GiftedDialog, QuickNav },
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class ClaimView extends Vue {
|
export default class ClaimView extends Vue {
|
||||||
@@ -670,10 +651,6 @@ export default class ClaimView extends Vue {
|
|||||||
return giveClaim.description || "";
|
return giveClaim.description || "";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.veriClaim.claimType === "Emoji") {
|
|
||||||
return (claim as EmojiClaim).text || "";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback for other claim types
|
// Fallback for other claim types
|
||||||
return (claim as { description?: string })?.description || "";
|
return (claim as { description?: string })?.description || "";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,27 +1,18 @@
|
|||||||
<template>
|
<template>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Cancel -->
|
||||||
|
<router-link
|
||||||
|
:to="{ name: 'account' }"
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
><font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</router-link>
|
||||||
|
|
||||||
Confirm Contact
|
Confirm Contact
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<router-link
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
:to="{ name: 'account' }"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p class="text-center text-xl mb-4 font-light">
|
<p class="text-center text-xl mb-4 font-light">
|
||||||
|
|||||||
@@ -1,11 +1,18 @@
|
|||||||
<template>
|
<template>
|
||||||
|
<QuickNav />
|
||||||
|
<TopMessage />
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Breadcrumb -->
|
||||||
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<!-- Sub View Heading -->
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<!-- Back -->
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.go(-1)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
|
</button>
|
||||||
<span
|
<span
|
||||||
v-if="
|
v-if="
|
||||||
libsUtil.isGiveRecordTheUserCanConfirm(
|
libsUtil.isGiveRecordTheUserCanConfirm(
|
||||||
@@ -18,24 +25,8 @@
|
|||||||
>
|
>
|
||||||
Do you agree?
|
Do you agree?
|
||||||
</span>
|
</span>
|
||||||
<span v-else>Confirmation Details</span>
|
<span v-else> Confirmation Details </span>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="giveDetails && !isLoading">
|
<div v-if="giveDetails && !isLoading">
|
||||||
|
|||||||
@@ -2,27 +2,18 @@
|
|||||||
<QuickNav selected="Contacts" />
|
<QuickNav selected="Contacts" />
|
||||||
|
|
||||||
<section class="p-6 pb-24 max-w-3xl mx-auto">
|
<section class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Header -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<router-link
|
||||||
|
:to="{ name: 'contacts' }"
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
|
</router-link>
|
||||||
|
|
||||||
|
<h1 class="text-4xl text-center font-light pt-4">
|
||||||
Transferred with {{ contact?.name }}
|
Transferred with {{ contact?.name }}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<router-link
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
:to="{ name: 'contacts' }"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Info Messages -->
|
<!-- Info Messages -->
|
||||||
@@ -232,7 +223,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
const contact = await this.$getContact(contactDid);
|
const contact = await this.$getContact(contactDid);
|
||||||
this.contact = contact;
|
this.contact = contact;
|
||||||
|
|
||||||
const settings = await this.$accountSettings();
|
const settings = await this.$getMasterSettings();
|
||||||
|
|
||||||
// Get activeDid from active_identity table (single source of truth)
|
// Get activeDid from active_identity table (single source of truth)
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
|||||||
@@ -1,28 +1,19 @@
|
|||||||
<template>
|
<template>
|
||||||
<section id="ContactEdit" class="p-6 max-w-3xl mx-auto">
|
<QuickNav selected="Contacts" />
|
||||||
<TopMessage />
|
<TopMessage />
|
||||||
|
|
||||||
<!-- Sub View Heading -->
|
<section id="ContactEdit" class="p-6 max-w-3xl mx-auto">
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-4xl text-center font-light relative px-7">
|
||||||
|
<!-- Back -->
|
||||||
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.go(-1)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
|
</button>
|
||||||
{{ contact?.name || AppString.NO_CONTACT_NAME }}
|
{{ contact?.name || AppString.NO_CONTACT_NAME }}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Contact Name -->
|
<!-- Contact Name -->
|
||||||
@@ -346,7 +337,9 @@ export default class ContactEditView extends Vue {
|
|||||||
|
|
||||||
// Notify success and redirect
|
// Notify success and redirect
|
||||||
this.notify.success(NOTIFY_CONTACT_SAVED.message, TIMEOUTS.STANDARD);
|
this.notify.success(NOTIFY_CONTACT_SAVED.message, TIMEOUTS.STANDARD);
|
||||||
this.$router.back();
|
(this.$router as Router).push({
|
||||||
|
path: "/did/" + encodeURIComponent(this.contact?.did || ""),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -2,27 +2,17 @@
|
|||||||
<QuickNav selected="Home"></QuickNav>
|
<QuickNav selected="Home"></QuickNav>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-2xl text-center font-semibold relative px-7">
|
||||||
|
<!-- Back -->
|
||||||
|
<router-link
|
||||||
|
:to="{ name: 'home' }"
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
><font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</router-link>
|
||||||
{{ stepType === "giver" ? "Given by..." : "Given to..." }}
|
{{ stepType === "giver" ? "Given by..." : "Given to..." }}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<router-link
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
:to="{ name: 'home' }"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Results List -->
|
<!-- Results List -->
|
||||||
|
|||||||
@@ -1,29 +1,21 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Contacts"></QuickNav>
|
<QuickNav selected="Contacts"></QuickNav>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Back -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1
|
||||||
Contact Import
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
|
Contact Import
|
||||||
|
</h1>
|
||||||
|
|
||||||
<div v-if="checkingImports" class="text-center">
|
<div v-if="checkingImports" class="text-center">
|
||||||
<font-awesome icon="spinner" class="animate-spin" />
|
<font-awesome icon="spinner" class="animate-spin" />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -2,27 +2,26 @@
|
|||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="relative w-[100vw] h-[100vh]">
|
<section id="Content" class="relative w-[100vw] h-[100vh]">
|
||||||
<div :class="mainContentClasses">
|
<div :class="mainContentClasses">
|
||||||
<!-- Sub View Heading -->
|
<div class="mb-4">
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-4">
|
<h1 class="text-xl text-center font-semibold relative">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<!-- Back -->
|
||||||
|
<a
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="handleBack"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<!-- Quick Help -->
|
||||||
|
<a
|
||||||
|
class="text-xl text-center text-blue-500 px-2 py-1 absolute -right-2 -top-1"
|
||||||
|
@click="toastQRCodeHelp()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-question" class="fa-fw" />
|
||||||
|
</a>
|
||||||
|
|
||||||
Share Contact Info
|
Share Contact Info
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="handleBack"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Quick Help -->
|
|
||||||
<a
|
|
||||||
class="block text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
@click="toastQRCodeHelp()"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -236,7 +235,7 @@ export default class ContactQRScanFull extends Vue {
|
|||||||
* Computed property for main content container CSS classes
|
* Computed property for main content container CSS classes
|
||||||
*/
|
*/
|
||||||
get mainContentClasses(): string {
|
get mainContentClasses(): string {
|
||||||
return "p-4 bg-white w-full max-w-[calc((100vh-max(env(safe-area-inset-top),var(--safe-area-inset-top,0px))-max(env(safe-area-inset-bottom),var(--safe-area-inset-bottom,0px)))*0.4)] mx-auto";
|
return "p-6 bg-white w-full max-w-[calc((100vh-max(env(safe-area-inset-top),var(--safe-area-inset-top,0px))-max(env(safe-area-inset-bottom),var(--safe-area-inset-bottom,0px)))*0.4)] mx-auto";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,27 +1,26 @@
|
|||||||
<template>
|
<template>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<div class="mb-2">
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<h1 class="text-2xl text-center font-semibold relative px-7">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<!-- Back -->
|
||||||
|
<a
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="handleBack"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<!-- Quick Help -->
|
||||||
|
<a
|
||||||
|
class="text-2xl text-center text-blue-500 px-2 py-1 absolute -right-2 -top-1"
|
||||||
|
@click="toastQRCodeHelp()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-question" class="fa-fw" />
|
||||||
|
</a>
|
||||||
|
|
||||||
Share Contact Info
|
Share Contact Info
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="handleBack"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Quick Help -->
|
|
||||||
<a
|
|
||||||
class="block text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
@click="toastQRCodeHelp()"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="!givenName" :class="nameWarningClasses">
|
<div v-if="!givenName" :class="nameWarningClasses">
|
||||||
|
|||||||
@@ -1,25 +1,14 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Contacts" />
|
<QuickNav selected="Contacts" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light">
|
||||||
|
Your Contacts
|
||||||
|
</h1>
|
||||||
|
|
||||||
<!-- Main View Heading -->
|
<div class="flex justify-between py-2 mt-8">
|
||||||
<div class="flex gap-4 items-center mb-4">
|
|
||||||
<h1 id="ViewHeading" class="text-2xl font-bold leading-none">
|
|
||||||
Your Contacts
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex justify-between py-2 mt-4">
|
|
||||||
<span />
|
<span />
|
||||||
<span>
|
<span>
|
||||||
<a
|
<a
|
||||||
@@ -171,11 +160,9 @@ import {
|
|||||||
CONTACT_IMPORT_ONE_URL_PATH_TIME_SAFARI,
|
CONTACT_IMPORT_ONE_URL_PATH_TIME_SAFARI,
|
||||||
CONTACT_URL_PATH_ENDORSER_CH_OLD,
|
CONTACT_URL_PATH_ENDORSER_CH_OLD,
|
||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import {
|
import { GiveSummaryRecord } from "@/interfaces/records";
|
||||||
GiveSummaryRecord,
|
import { UserInfo } from "@/interfaces/common";
|
||||||
UserInfo,
|
import { VerifiableCredential } from "@/interfaces/claims-result";
|
||||||
VerifiableCredential,
|
|
||||||
} from "@/interfaces";
|
|
||||||
import * as libsUtil from "../libs/util";
|
import * as libsUtil from "../libs/util";
|
||||||
import {
|
import {
|
||||||
generateSaveAndActivateIdentity,
|
generateSaveAndActivateIdentity,
|
||||||
|
|||||||
@@ -1,31 +1,22 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Contacts" />
|
<QuickNav selected="Contacts" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Breadcrumb -->
|
||||||
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<!-- Sub View Heading -->
|
<h1 id="ViewHeading" class="text-lg text-center font-light relative px-7">
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<!-- Go to 'contacts' instead of just 'back' because they could get here from an edit page
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
(and going back there is annoying). -->
|
||||||
|
<router-link
|
||||||
|
:to="{ name: 'contacts' }"
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</router-link>
|
||||||
Identifier Details
|
Identifier Details
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<button
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="goBack()"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<button
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
@click="goToHelp()"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Identity Details -->
|
<!-- Identity Details -->
|
||||||
@@ -34,7 +25,7 @@
|
|||||||
class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4"
|
class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4"
|
||||||
>
|
>
|
||||||
<div>
|
<div>
|
||||||
<h2 class="text-xl font-semibold overflow-hidden text-ellipsis">
|
<h2 class="text-xl font-semibold">
|
||||||
{{ contactFromDid?.name || "(no name)" }}
|
{{ contactFromDid?.name || "(no name)" }}
|
||||||
<router-link
|
<router-link
|
||||||
:to="{ name: 'contact-edit', params: { did: contactFromDid?.did } }"
|
:to="{ name: 'contact-edit', params: { did: contactFromDid?.did } }"
|
||||||
@@ -476,7 +467,7 @@ export default class DIDView extends Vue {
|
|||||||
* Navigation helper methods
|
* Navigation helper methods
|
||||||
*/
|
*/
|
||||||
goBack() {
|
goBack() {
|
||||||
this.$router.back();
|
this.$router.go(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,15 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<h1>Invalid Deep Link</h1>
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
|
||||||
<h1
|
|
||||||
class="grow text-rose-500 text-xl text-center font-semibold leading-tight"
|
|
||||||
>
|
|
||||||
Invalid Deep Link
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="error-details">
|
<div class="error-details">
|
||||||
<div class="error-message">
|
<div class="error-message">
|
||||||
<h3>Error Details</h3>
|
<h3>Error Details</h3>
|
||||||
@@ -122,6 +114,11 @@ onMounted(() => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
h1 {
|
||||||
|
color: #ff4444;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
h2,
|
h2,
|
||||||
h3 {
|
h3 {
|
||||||
color: #333;
|
color: #333;
|
||||||
|
|||||||
@@ -2,12 +2,9 @@
|
|||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<!-- Sub View Heading -->
|
<h1 class="text-2xl text-center font-semibold relative px-7">
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
Redirecting to Time Safari
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
</h1>
|
||||||
Redirecting to Time Safari
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="destinationUrl" class="space-y-4">
|
<div v-if="destinationUrl" class="space-y-4">
|
||||||
<!-- Platform-specific messaging -->
|
<!-- Platform-specific messaging -->
|
||||||
|
|||||||
@@ -1,22 +1,13 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Discover" />
|
<QuickNav selected="Discover" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light">
|
||||||
<!-- Main View Heading -->
|
Discover Projects & People
|
||||||
<div class="flex gap-4 items-center mb-4">
|
</h1>
|
||||||
<h1 id="ViewHeading" class="text-2xl font-bold leading-none">Discover</h1>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<OnboardingDialog ref="onboardingDialog" />
|
<OnboardingDialog ref="onboardingDialog" />
|
||||||
|
|
||||||
@@ -60,33 +51,6 @@
|
|||||||
<!-- Secondary Tabs -->
|
<!-- Secondary Tabs -->
|
||||||
<div class="text-center text-slate-500 border-b border-slate-300">
|
<div class="text-center text-slate-500 border-b border-slate-300">
|
||||||
<ul class="flex flex-wrap justify-center gap-4 -mb-px">
|
<ul class="flex flex-wrap justify-center gap-4 -mb-px">
|
||||||
<li v-if="isProjectsActive">
|
|
||||||
<a
|
|
||||||
href="#"
|
|
||||||
:class="computedStarredTabStyleClassNames()"
|
|
||||||
@click="
|
|
||||||
projects = [];
|
|
||||||
userProfiles = [];
|
|
||||||
isStarredActive = true;
|
|
||||||
isLocalActive = false;
|
|
||||||
isMappedActive = false;
|
|
||||||
isAnywhereActive = false;
|
|
||||||
isSearchVisible = false;
|
|
||||||
tempSearchBox = null;
|
|
||||||
searchStarred();
|
|
||||||
"
|
|
||||||
>
|
|
||||||
Starred
|
|
||||||
<!-- restore when the links don't jump around for different numbers
|
|
||||||
<span
|
|
||||||
class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
|
|
||||||
v-if="isLocalActive"
|
|
||||||
>
|
|
||||||
{{ localCount > -1 ? localCount : "?" }}
|
|
||||||
</span>
|
|
||||||
-->
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
<li>
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
@@ -94,11 +58,9 @@
|
|||||||
@click="
|
@click="
|
||||||
projects = [];
|
projects = [];
|
||||||
userProfiles = [];
|
userProfiles = [];
|
||||||
isStarredActive = false;
|
|
||||||
isLocalActive = true;
|
isLocalActive = true;
|
||||||
isMappedActive = false;
|
isMappedActive = false;
|
||||||
isAnywhereActive = false;
|
isAnywhereActive = false;
|
||||||
isStarredActive = false;
|
|
||||||
isSearchVisible = true;
|
isSearchVisible = true;
|
||||||
tempSearchBox = null;
|
tempSearchBox = null;
|
||||||
searchLocal();
|
searchLocal();
|
||||||
@@ -122,11 +84,9 @@
|
|||||||
@click="
|
@click="
|
||||||
projects = [];
|
projects = [];
|
||||||
userProfiles = [];
|
userProfiles = [];
|
||||||
isStarredActive = false;
|
|
||||||
isLocalActive = false;
|
isLocalActive = false;
|
||||||
isMappedActive = true;
|
isMappedActive = true;
|
||||||
isAnywhereActive = false;
|
isAnywhereActive = false;
|
||||||
isStarredActive = false;
|
|
||||||
isSearchVisible = false;
|
isSearchVisible = false;
|
||||||
searchTerms = '';
|
searchTerms = '';
|
||||||
tempSearchBox = null;
|
tempSearchBox = null;
|
||||||
@@ -143,11 +103,9 @@
|
|||||||
@click="
|
@click="
|
||||||
projects = [];
|
projects = [];
|
||||||
userProfiles = [];
|
userProfiles = [];
|
||||||
isStarredActive = false;
|
|
||||||
isLocalActive = false;
|
isLocalActive = false;
|
||||||
isMappedActive = false;
|
isMappedActive = false;
|
||||||
isAnywhereActive = true;
|
isAnywhereActive = true;
|
||||||
isStarredActive = false;
|
|
||||||
isSearchVisible = true;
|
isSearchVisible = true;
|
||||||
tempSearchBox = null;
|
tempSearchBox = null;
|
||||||
searchAll();
|
searchAll();
|
||||||
@@ -243,15 +201,6 @@
|
|||||||
>No {{ isProjectsActive ? "projects" : "people" }} were found with
|
>No {{ isProjectsActive ? "projects" : "people" }} were found with
|
||||||
that search.</span
|
that search.</span
|
||||||
>
|
>
|
||||||
<span v-else-if="isStarredActive">
|
|
||||||
<p>
|
|
||||||
You have no starred projects. Star some projects to see them here.
|
|
||||||
</p>
|
|
||||||
<p class="mt-4">
|
|
||||||
When you star projects, you will get a notice on the front page when
|
|
||||||
they change.
|
|
||||||
</p>
|
|
||||||
</span>
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -282,8 +231,8 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grow overflow-hidden">
|
<div class="grow">
|
||||||
<h2 class="text-base font-semibold truncate">
|
<h2 class="text-base font-semibold">
|
||||||
{{ project.name || unnamedProject }}
|
{{ project.name || unnamedProject }}
|
||||||
</h2>
|
</h2>
|
||||||
<div class="text-sm">
|
<div class="text-sm">
|
||||||
@@ -434,12 +383,9 @@ export default class DiscoverView extends Vue {
|
|||||||
allMyDids: Array<string> = [];
|
allMyDids: Array<string> = [];
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
isLoading = false;
|
isLoading = false;
|
||||||
|
|
||||||
isLocalActive = false;
|
isLocalActive = false;
|
||||||
isMappedActive = false;
|
isMappedActive = false;
|
||||||
isAnywhereActive = true;
|
isAnywhereActive = true;
|
||||||
isStarredActive = false;
|
|
||||||
|
|
||||||
isProjectsActive = true;
|
isProjectsActive = true;
|
||||||
isPeopleActive = false;
|
isPeopleActive = false;
|
||||||
isSearchVisible = true;
|
isSearchVisible = true;
|
||||||
@@ -528,8 +474,6 @@ export default class DiscoverView extends Vue {
|
|||||||
leafletObject: L.Map;
|
leafletObject: L.Map;
|
||||||
};
|
};
|
||||||
this.requestTiles(mapRef.leafletObject); // not ideal because I found this from experimentation, not documentation
|
this.requestTiles(mapRef.leafletObject); // not ideal because I found this from experimentation, not documentation
|
||||||
} else if (this.isStarredActive) {
|
|
||||||
await this.searchStarred();
|
|
||||||
} else {
|
} else {
|
||||||
await this.searchAll();
|
await this.searchAll();
|
||||||
}
|
}
|
||||||
@@ -600,60 +544,6 @@ export default class DiscoverView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async searchStarred() {
|
|
||||||
this.resetCounts();
|
|
||||||
|
|
||||||
// Clear any previous results
|
|
||||||
this.projects = [];
|
|
||||||
this.userProfiles = [];
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.isLoading = true;
|
|
||||||
|
|
||||||
// Get starred project IDs from settings
|
|
||||||
const settings = await this.$accountSettings();
|
|
||||||
|
|
||||||
const starredIds = settings.starredPlanHandleIds || [];
|
|
||||||
if (starredIds.length === 0) {
|
|
||||||
// No starred projects
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This could be optimized to only pull those not already in the cache (endorserServer.ts)
|
|
||||||
|
|
||||||
const planHandleIdsJson = JSON.stringify(starredIds);
|
|
||||||
const endpoint =
|
|
||||||
this.apiServer +
|
|
||||||
"/api/v2/report/plans?planHandleIds=" +
|
|
||||||
encodeURIComponent(planHandleIdsJson);
|
|
||||||
const response = await this.axios.get(endpoint, {
|
|
||||||
headers: await getHeaders(this.activeDid),
|
|
||||||
});
|
|
||||||
if (response.status !== 200) {
|
|
||||||
this.notify.error("Failed to load starred projects", TIMEOUTS.SHORT);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const starredPlans: PlanData[] = response.data.data;
|
|
||||||
if (response.data.hitLimit) {
|
|
||||||
// someday we'll have to let them incrementally load the rest
|
|
||||||
this.notify.warning(
|
|
||||||
"Beware: you have so many starred projects that we cannot load them all.",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.projects = starredPlans;
|
|
||||||
} catch (error: unknown) {
|
|
||||||
logger.error("Error loading starred projects:", error);
|
|
||||||
this.notify.error(
|
|
||||||
"Failed to load starred projects. Please try again.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
this.isLoading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async searchLocal(beforeId?: string) {
|
public async searchLocal(beforeId?: string) {
|
||||||
this.resetCounts();
|
this.resetCounts();
|
||||||
|
|
||||||
@@ -747,12 +637,9 @@ export default class DiscoverView extends Vue {
|
|||||||
const latestProject = this.projects[this.projects.length - 1];
|
const latestProject = this.projects[this.projects.length - 1];
|
||||||
if (this.isLocalActive || this.isMappedActive) {
|
if (this.isLocalActive || this.isMappedActive) {
|
||||||
this.searchLocal(latestProject.rowId);
|
this.searchLocal(latestProject.rowId);
|
||||||
} else if (this.isStarredActive) {
|
|
||||||
this.searchStarred();
|
|
||||||
} else if (this.isAnywhereActive) {
|
} else if (this.isAnywhereActive) {
|
||||||
this.searchAll(latestProject.rowId);
|
this.searchAll(latestProject.rowId);
|
||||||
}
|
}
|
||||||
// Note: Starred tab doesn't support pagination since we load all starred projects at once
|
|
||||||
} else if (this.isPeopleActive && this.userProfiles.length > 0) {
|
} else if (this.isPeopleActive && this.userProfiles.length > 0) {
|
||||||
const latestProfile = this.userProfiles[this.userProfiles.length - 1];
|
const latestProfile = this.userProfiles[this.userProfiles.length - 1];
|
||||||
if (this.isLocalActive || this.isMappedActive) {
|
if (this.isLocalActive || this.isMappedActive) {
|
||||||
@@ -892,28 +779,10 @@ export default class DiscoverView extends Vue {
|
|||||||
this.$router.push(route);
|
this.$router.push(route);
|
||||||
}
|
}
|
||||||
|
|
||||||
public computedStarredTabStyleClassNames() {
|
|
||||||
return {
|
|
||||||
"inline-block": true,
|
|
||||||
"py-3": true,
|
|
||||||
"rounded-t-lg": true,
|
|
||||||
"border-b-2": true,
|
|
||||||
|
|
||||||
active: this.isStarredActive,
|
|
||||||
"text-black": this.isStarredActive,
|
|
||||||
"border-black": this.isStarredActive,
|
|
||||||
"font-semibold": this.isStarredActive,
|
|
||||||
|
|
||||||
"text-blue-600": !this.isStarredActive,
|
|
||||||
"border-transparent": !this.isStarredActive,
|
|
||||||
"hover:border-slate-400": !this.isStarredActive,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public computedLocalTabStyleClassNames() {
|
public computedLocalTabStyleClassNames() {
|
||||||
return {
|
return {
|
||||||
"inline-block": true,
|
"inline-block": true,
|
||||||
"py-2": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
|
|
||||||
@@ -931,7 +800,7 @@ export default class DiscoverView extends Vue {
|
|||||||
public computedMappedTabStyleClassNames() {
|
public computedMappedTabStyleClassNames() {
|
||||||
return {
|
return {
|
||||||
"inline-block": true,
|
"inline-block": true,
|
||||||
"py-2": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
|
|
||||||
@@ -949,7 +818,7 @@ export default class DiscoverView extends Vue {
|
|||||||
public computedRemoteTabStyleClassNames() {
|
public computedRemoteTabStyleClassNames() {
|
||||||
return {
|
return {
|
||||||
"inline-block": true,
|
"inline-block": true,
|
||||||
"py-2": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
|
|
||||||
@@ -967,7 +836,7 @@ export default class DiscoverView extends Vue {
|
|||||||
public computedProjectsTabStyleClassNames() {
|
public computedProjectsTabStyleClassNames() {
|
||||||
return {
|
return {
|
||||||
"inline-block": true,
|
"inline-block": true,
|
||||||
"py-2": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
|
|
||||||
@@ -985,7 +854,7 @@ export default class DiscoverView extends Vue {
|
|||||||
public computedPeopleTabStyleClassNames() {
|
public computedPeopleTabStyleClassNames() {
|
||||||
return {
|
return {
|
||||||
"inline-block": true,
|
"inline-block": true,
|
||||||
"py-2": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
|
|
||||||
|
|||||||
@@ -1,33 +1,24 @@
|
|||||||
<template>
|
<template>
|
||||||
|
<QuickNav />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Breadcrumb -->
|
||||||
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<div class="mb-8">
|
<h1 class="text-2xl text-center font-semibold relative px-7 mb-2">
|
||||||
<!-- Sub View Heading -->
|
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-4">
|
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
|
||||||
What Was Given
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Back -->
|
<!-- Back -->
|
||||||
<a
|
<div
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
v-if="!hideBackButton"
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
@click="cancelBack()"
|
@click="cancelBack()"
|
||||||
>
|
>
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
</a>
|
</div>
|
||||||
|
What Was Given
|
||||||
|
</h1>
|
||||||
|
|
||||||
<!-- Help button -->
|
<h2 class="text-lg font-normal text-center overflow-hidden">
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-lg font-normal leading-tight text-center overflow-hidden">
|
|
||||||
<div class="truncate">
|
<div class="truncate">
|
||||||
From
|
From
|
||||||
{{
|
{{
|
||||||
|
|||||||
@@ -3,27 +3,22 @@
|
|||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<!-- Back -->
|
||||||
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
|
<h1
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
Notification Types
|
Notification Types
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- eslint-disable prettier/prettier -->
|
<!-- eslint-disable prettier/prettier -->
|
||||||
|
|||||||
@@ -34,27 +34,22 @@
|
|||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<!-- Back -->
|
||||||
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
|
<h1
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="goBack()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
Notification Help
|
Notification Help
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="goBack()"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- eslint-disable prettier/prettier -->
|
<!-- eslint-disable prettier/prettier -->
|
||||||
@@ -399,7 +394,7 @@ export default class HelpNotificationsView extends Vue {
|
|||||||
notifyingReminderTime = "";
|
notifyingReminderTime = "";
|
||||||
|
|
||||||
// Notification helper system
|
// Notification helper system
|
||||||
notify!: ReturnType<typeof createNotifyHelpers>;
|
notify = createNotifyHelpers(this.$notify);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed property for consistent button styling
|
* Computed property for consistent button styling
|
||||||
@@ -435,9 +430,6 @@ export default class HelpNotificationsView extends Vue {
|
|||||||
* Handles errors gracefully with proper logging without exposing sensitive data.
|
* Handles errors gracefully with proper logging without exposing sensitive data.
|
||||||
*/
|
*/
|
||||||
async mounted() {
|
async mounted() {
|
||||||
// Initialize notification helpers
|
|
||||||
this.notify = createNotifyHelpers(this.$notify);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const registration = await navigator.serviceWorker?.ready;
|
const registration = await navigator.serviceWorker?.ready;
|
||||||
const fullSub = await registration?.pushManager.getSubscription();
|
const fullSub = await registration?.pushManager.getSubscription();
|
||||||
|
|||||||
@@ -3,9 +3,11 @@
|
|||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<!-- Don't include 'back' button since this is shown in a different window. -->
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
Time Safari Onboarding Instructions
|
Time Safari Onboarding Instructions
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -3,25 +3,23 @@
|
|||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
|
||||||
Help
|
|
||||||
<span class="text-xs font-medium text-slate-500 uppercase">{{
|
|
||||||
package.version
|
|
||||||
}}</span>
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Back -->
|
<!-- Back -->
|
||||||
<a
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
<h1
|
||||||
@click="$router.go(-1)"
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
>
|
@click="$router.back()"
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
>
|
||||||
</a>
|
<font-awesome icon="chevron-left" class="fa-fw" />
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Spacer (no Help button) -->
|
<!-- Heading -->
|
||||||
<div class="p-3 pe-3.5 pb-3.5"></div>
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
|
Help
|
||||||
|
<span class="text-xs text-gray-500">{{ package.version }}</span>
|
||||||
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- eslint-disable prettier/prettier max-len -->
|
<!-- eslint-disable prettier/prettier max-len -->
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ Raymer * @version 1.0.0 */
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Home" />
|
<QuickNav selected="Home" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section
|
<section
|
||||||
@@ -13,25 +14,10 @@ Raymer * @version 1.0.0 */
|
|||||||
class="p-6 pb-24 max-w-3xl mx-auto"
|
class="p-6 pb-24 max-w-3xl mx-auto"
|
||||||
:data-active-did="activeDid"
|
:data-active-did="activeDid"
|
||||||
>
|
>
|
||||||
<TopMessage />
|
<h1 id="ViewHeading" class="text-4xl text-center font-light mb-8">
|
||||||
|
{{ AppString.APP_NAME }}
|
||||||
<!-- Main View Heading -->
|
<span class="text-xs text-gray-500">{{ package.version }}</span>
|
||||||
<div class="flex gap-4 items-center mb-4">
|
</h1>
|
||||||
<h1 id="ViewHeading" class="text-2xl font-bold leading-none">
|
|
||||||
{{ AppString.APP_NAME }}
|
|
||||||
<span class="text-xs font-medium text-slate-500 uppercase">{{
|
|
||||||
package.version
|
|
||||||
}}</span>
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<OnboardingDialog ref="onboardingDialog" />
|
<OnboardingDialog ref="onboardingDialog" />
|
||||||
|
|
||||||
@@ -94,53 +80,51 @@ Raymer * @version 1.0.0 */
|
|||||||
</router-link>
|
</router-link>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-8">
|
<!--
|
||||||
<!--
|
They should have an identifier, even if it's an auto-generated one that they'll never use.
|
||||||
They should have an identifier, even if it's an auto-generated one that they'll never use.
|
Identity creation is now handled by router navigation guard.
|
||||||
Identity creation is now handled by router navigation guard.
|
-->
|
||||||
-->
|
<div class="mb-6">
|
||||||
<div class="mb-4">
|
<RegistrationNotice
|
||||||
<RegistrationNotice
|
v-if="!isUserRegistered"
|
||||||
v-if="!isUserRegistered"
|
:passkeys-enabled="PASSKEYS_ENABLED"
|
||||||
:passkeys-enabled="PASSKEYS_ENABLED"
|
:given-name="givenName"
|
||||||
:given-name="givenName"
|
message="To share, someone must register you."
|
||||||
message="To share, someone must register you."
|
/>
|
||||||
/>
|
|
||||||
|
|
||||||
<div v-if="isUserRegistered" id="sectionRecordSomethingGiven">
|
<div v-if="isUserRegistered" id="sectionRecordSomethingGiven">
|
||||||
<!-- Record Quick-Action -->
|
<!-- Record Quick-Action -->
|
||||||
<div class="mb-6">
|
<div class="bg-slate-200 rounded-lg overflow-hidden p-3 pt-2.5">
|
||||||
<div class="flex gap-2 items-center mb-2">
|
<div class="flex gap-2 items-center mb-2">
|
||||||
<h2 class="font-bold">Record something given by:</h2>
|
<h2 class="font-bold">Record something given by:</h2>
|
||||||
<button
|
<button
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
class="block ms-auto text-center text-white bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
||||||
@click="openGiftedPrompts()"
|
@click="openGiftedPrompts()"
|
||||||
>
|
>
|
||||||
<font-awesome
|
<font-awesome
|
||||||
icon="lightbulb"
|
icon="lightbulb"
|
||||||
class="block text-center w-[1em]"
|
class="block text-center text-sm w-[1em]"
|
||||||
/>
|
/>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grid grid-cols-2 gap-2">
|
<div class="grid grid-cols-2 gap-2">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="text-center text-base uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-lg"
|
class="text-center text-base uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-md"
|
||||||
@click="openPersonDialog()"
|
@click="openPersonDialog()"
|
||||||
>
|
>
|
||||||
<font-awesome icon="user" />
|
<font-awesome icon="user" />
|
||||||
Person
|
Person
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="text-center text-base uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-lg"
|
class="text-center text-base uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-md"
|
||||||
@click="openProjectDialog()"
|
@click="openProjectDialog()"
|
||||||
>
|
>
|
||||||
<font-awesome icon="folder-open" />
|
<font-awesome icon="folder-open" />
|
||||||
Project
|
Project
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -152,90 +136,90 @@ Raymer * @version 1.0.0 */
|
|||||||
:recipient-entity-type="'person'"
|
:recipient-entity-type="'person'"
|
||||||
/>
|
/>
|
||||||
<GiftedPrompts ref="giftedPrompts" />
|
<GiftedPrompts ref="giftedPrompts" />
|
||||||
<FeedFilters ref="feedFilters" />
|
|
||||||
|
|
||||||
<!-- Results List -->
|
<!-- Results List -->
|
||||||
<div class="mt-4 mb-4">
|
<div class="mt-4 mb-4">
|
||||||
<div class="flex gap-2 items-center mb-3">
|
<!-- ALTERNATIVE UI: Feed + Notification Tabs -->
|
||||||
<h2 class="font-bold">Latest Activity</h2>
|
<div
|
||||||
|
class="sticky top-0 z-50 grid grid-cols-5 text-xl sm:text-2xl pt-4 pb-1 px-1 -mt-3 -mx-1 mb-4 bg-white rounded-b-[10px]"
|
||||||
|
>
|
||||||
<button
|
<button
|
||||||
v-if="resultsAreFiltered()"
|
class="relative text-center bg-slate-400 text-white px-1 pt-3 pb-2 first:rounded-s-md last:rounded-e-md border-r border-slate-300 last:border-r-0 leading-none"
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
@click="openFeedFilters()"
|
|
||||||
>
|
>
|
||||||
<font-awesome
|
<font-awesome icon="scroll" />
|
||||||
icon="filter"
|
<div class="text-xs sm:text-sm mt-1">activity</div>
|
||||||
class="block text-center w-[1em] translate-y-[0.05em]"
|
|
||||||
/>
|
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
v-else
|
class="relative text-center bg-slate-200 text-slate-500 px-1 pt-3 pb-2 first:rounded-s-md last:rounded-e-md border-r border-slate-300 last:border-r-0 leading-none"
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
@click="openFeedFilters()"
|
|
||||||
>
|
>
|
||||||
<font-awesome
|
<font-awesome icon="hand-holding-heart" />
|
||||||
icon="filter"
|
<div class="text-xs sm:text-sm mt-1">offers</div>
|
||||||
class="block text-center w-[1em] translate-y-[0.05em]"
|
|
||||||
/>
|
<!-- Unread count -->
|
||||||
|
<span
|
||||||
|
class="absolute -top-2 -translate-x-1/2 bg-rose-500 text-white border border-white text-xs font-semibold leading-none rounded-full px-[0.4em] py-[0.15em]"
|
||||||
|
>2</span
|
||||||
|
>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="relative text-center bg-slate-200 text-slate-500 px-1 pt-3 pb-2 first:rounded-s-md last:rounded-e-md border-r border-slate-300 last:border-r-0 leading-none"
|
||||||
|
>
|
||||||
|
<font-awesome icon="folder-open" />
|
||||||
|
<div class="text-xs sm:text-sm mt-1">projects</div>
|
||||||
|
|
||||||
|
<!-- Unread count -->
|
||||||
|
<span
|
||||||
|
class="absolute -top-2 -translate-x-1/2 bg-rose-500 text-white border border-white text-xs font-semibold leading-none rounded-full px-[0.4em] py-[0.15em]"
|
||||||
|
>50+</span
|
||||||
|
>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="relative text-center bg-slate-200 text-slate-500 px-1 pt-3 pb-2 first:rounded-s-md last:rounded-e-md border-r border-slate-300 last:border-r-0 leading-none"
|
||||||
|
>
|
||||||
|
<font-awesome icon="users" />
|
||||||
|
<div class="text-xs sm:text-sm mt-1">people</div>
|
||||||
|
|
||||||
|
<!-- Unread count -->
|
||||||
|
<span
|
||||||
|
class="absolute -top-2 -translate-x-1/2 bg-rose-500 text-white border border-white text-xs font-semibold leading-none rounded-full px-[0.4em] py-[0.15em]"
|
||||||
|
>4</span
|
||||||
|
>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="relative text-center bg-slate-200 text-slate-500 px-1 pt-3 pb-2 first:rounded-s-md last:rounded-e-md border-r border-slate-300 last:border-r-0 leading-none"
|
||||||
|
>
|
||||||
|
<font-awesome icon="image" />
|
||||||
|
<div class="text-xs sm:text-sm mt-1">items</div>
|
||||||
|
|
||||||
|
<!-- Unread count -->
|
||||||
|
<span
|
||||||
|
class="absolute -top-2 -translate-x-1/2 bg-rose-500 text-white border border-white text-xs font-semibold leading-none rounded-full px-[0.4em] py-[0.15em]"
|
||||||
|
>7</span
|
||||||
|
>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div class="flex gap-2 items-center justify-between mb-2 text-sm">
|
||||||
class="border-t p-2 border-slate-300"
|
<h2 class="text-base font-bold">Latest Activity</h2>
|
||||||
@click="goToActivityToUserPage()"
|
<button
|
||||||
>
|
v-if="resultsAreFiltered()"
|
||||||
<div class="flex justify-center gap-2">
|
class="flex items-center justify-end gap-2 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1 rounded"
|
||||||
<div
|
@click="openFeedFilters()"
|
||||||
v-if="numNewOffersToUser"
|
>
|
||||||
class="bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
|
Filter
|
||||||
>
|
<font-awesome icon="filter"></font-awesome>
|
||||||
<span
|
</button>
|
||||||
class="block text-center text-6xl"
|
<button
|
||||||
data-testId="newDirectOffersActivityNumber"
|
v-else
|
||||||
>
|
class="flex items-center justify-end gap-2 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-1 rounded"
|
||||||
{{ numNewOffersToUser }}{{ newOffersToUserHitLimit ? "+" : "" }}
|
@click="openFeedFilters()"
|
||||||
</span>
|
>
|
||||||
<p class="text-center">
|
Filter
|
||||||
new offer{{ numNewOffersToUser === 1 ? "" : "s" }} to you
|
<font-awesome icon="filter"></font-awesome>
|
||||||
</p>
|
</button>
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="numNewOffersToUserProjects"
|
|
||||||
class="bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="block text-center text-6xl"
|
|
||||||
data-testId="newOffersToUserProjectsActivityNumber"
|
|
||||||
>
|
|
||||||
{{ numNewOffersToUserProjects
|
|
||||||
}}{{ newOffersToUserProjectsHitLimit ? "+" : "" }}
|
|
||||||
</span>
|
|
||||||
<p class="text-center">
|
|
||||||
new offer{{ numNewOffersToUserProjects === 1 ? "" : "s" }} to your
|
|
||||||
projects
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="numNewStarredProjectChanges"
|
|
||||||
class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="block text-center text-6xl"
|
|
||||||
data-testId="newStarredProjectChangesActivityNumber"
|
|
||||||
>
|
|
||||||
{{ numNewStarredProjectChanges
|
|
||||||
}}{{ newStarredProjectChangesHitLimit ? "+" : "" }}
|
|
||||||
</span>
|
|
||||||
<p class="text-center">
|
|
||||||
starred project{{ numNewStarredProjectChanges === 1 ? "" : "s" }}
|
|
||||||
with changes
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-end mt-2">
|
|
||||||
<button class="text-blue-500">View All New Activity For You</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
<FeedFilters ref="feedFilters" />
|
||||||
|
|
||||||
<InfiniteScroll @reached-bottom="loadMoreGives">
|
<InfiniteScroll @reached-bottom="loadMoreGives">
|
||||||
<ul id="listLatestActivity" class="space-y-4">
|
<ul id="listLatestActivity" class="space-y-4">
|
||||||
<ActivityListItem
|
<ActivityListItem
|
||||||
@@ -245,7 +229,6 @@ Raymer * @version 1.0.0 */
|
|||||||
:last-viewed-claim-id="feedLastViewedClaimId"
|
:last-viewed-claim-id="feedLastViewedClaimId"
|
||||||
:is-registered="isRegistered"
|
:is-registered="isRegistered"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:api-server="apiServer"
|
|
||||||
@load-claim="onClickLoadClaim"
|
@load-claim="onClickLoadClaim"
|
||||||
@view-image="openImageViewer"
|
@view-image="openImageViewer"
|
||||||
/>
|
/>
|
||||||
@@ -299,7 +282,6 @@ import {
|
|||||||
getHeaders,
|
getHeaders,
|
||||||
getNewOffersToUser,
|
getNewOffersToUser,
|
||||||
getNewOffersToUserProjects,
|
getNewOffersToUserProjects,
|
||||||
getStarredProjectsWithChanges,
|
|
||||||
getPlanFromCache,
|
getPlanFromCache,
|
||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import {
|
import {
|
||||||
@@ -316,7 +298,6 @@ import { NOTIFY_CONTACT_LOADING_ISSUE } from "@/constants/notifications";
|
|||||||
import * as Package from "../../package.json";
|
import * as Package from "../../package.json";
|
||||||
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
||||||
import { errorStringForLog } from "../libs/endorserServer";
|
import { errorStringForLog } from "../libs/endorserServer";
|
||||||
import * as databaseUtil from "../db/databaseUtil";
|
|
||||||
|
|
||||||
// consolidate this with GiveActionClaim in src/interfaces/claims.ts
|
// consolidate this with GiveActionClaim in src/interfaces/claims.ts
|
||||||
interface Claim {
|
interface Claim {
|
||||||
@@ -429,25 +410,11 @@ export default class HomeView extends Vue {
|
|||||||
isRegistered = false;
|
isRegistered = false;
|
||||||
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
|
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
|
||||||
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
|
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
|
||||||
lastAckedStarredPlanChangesJwtId?: string; // the last JWT ID for starred project changes that they've acknowledged seeing
|
|
||||||
newOffersToUserHitLimit: boolean = false;
|
newOffersToUserHitLimit: boolean = false;
|
||||||
newOffersToUserProjectsHitLimit: boolean = false;
|
newOffersToUserProjectsHitLimit: boolean = false;
|
||||||
newStarredProjectChangesHitLimit: boolean = false;
|
|
||||||
numNewOffersToUser: number = 0; // number of new offers-to-user
|
numNewOffersToUser: number = 0; // number of new offers-to-user
|
||||||
numNewOffersToUserProjects: number = 0; // number of new offers-to-user's-projects
|
numNewOffersToUserProjects: number = 0; // number of new offers-to-user's-projects
|
||||||
|
|
||||||
numNewStarredProjectChanges: number = 0; // number of new starred project changes
|
|
||||||
starredPlanHandleIds: Array<string> = []; // list of starred project IDs
|
|
||||||
searchBoxes: Array<{
|
|
||||||
name: string;
|
|
||||||
bbox: BoundingBox;
|
|
||||||
}> = [];
|
|
||||||
showShortcutBvc = false;
|
|
||||||
userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
|
|
||||||
selectedImage = "";
|
|
||||||
isImageViewerOpen = false;
|
|
||||||
showProjectsDialog = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CRITICAL VUE REACTIVITY BUG WORKAROUND
|
* CRITICAL VUE REACTIVITY BUG WORKAROUND
|
||||||
*
|
*
|
||||||
@@ -485,6 +452,16 @@ export default class HomeView extends Vue {
|
|||||||
// return shouldShow;
|
// return shouldShow;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
searchBoxes: Array<{
|
||||||
|
name: string;
|
||||||
|
bbox: BoundingBox;
|
||||||
|
}> = [];
|
||||||
|
showShortcutBvc = false;
|
||||||
|
userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
|
||||||
|
selectedImage = "";
|
||||||
|
isImageViewerOpen = false;
|
||||||
|
showProjectsDialog = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes notification helpers
|
* Initializes notification helpers
|
||||||
*/
|
*/
|
||||||
@@ -535,7 +512,6 @@ export default class HomeView extends Vue {
|
|||||||
this.numNewOffersToUser + this.numNewOffersToUserProjects > 0,
|
this.numNewOffersToUser + this.numNewOffersToUserProjects > 0,
|
||||||
});
|
});
|
||||||
|
|
||||||
await this.loadNewStarredProjectChanges();
|
|
||||||
await this.checkOnboarding();
|
await this.checkOnboarding();
|
||||||
|
|
||||||
logger.debug("[HomeView] mounted() - component lifecycle completed", {
|
logger.debug("[HomeView] mounted() - component lifecycle completed", {
|
||||||
@@ -661,14 +637,8 @@ export default class HomeView extends Vue {
|
|||||||
this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId;
|
this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId;
|
||||||
this.lastAckedOfferToUserProjectsJwtId =
|
this.lastAckedOfferToUserProjectsJwtId =
|
||||||
settings.lastAckedOfferToUserProjectsJwtId;
|
settings.lastAckedOfferToUserProjectsJwtId;
|
||||||
this.lastAckedStarredPlanChangesJwtId =
|
|
||||||
settings.lastAckedStarredPlanChangesJwtId;
|
|
||||||
this.searchBoxes = settings.searchBoxes || [];
|
this.searchBoxes = settings.searchBoxes || [];
|
||||||
this.showShortcutBvc = !!settings.showShortcutBvc;
|
this.showShortcutBvc = !!settings.showShortcutBvc;
|
||||||
this.starredPlanHandleIds = databaseUtil.parseJsonField(
|
|
||||||
settings.starredPlanHandleIds,
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
this.isAnyFeedFilterOn = checkIsAnyFeedFilterOn(settings);
|
this.isAnyFeedFilterOn = checkIsAnyFeedFilterOn(settings);
|
||||||
|
|
||||||
// Check onboarding status
|
// Check onboarding status
|
||||||
@@ -689,9 +659,7 @@ export default class HomeView extends Vue {
|
|||||||
|
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
// Ultra-concise settings update with automatic cache invalidation!
|
// Ultra-concise settings update with automatic cache invalidation!
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
await this.$saveMySettings({ isRegistered: true });
|
||||||
isRegistered: true,
|
|
||||||
});
|
|
||||||
this.isRegistered = true;
|
this.isRegistered = true;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -706,7 +674,7 @@ export default class HomeView extends Vue {
|
|||||||
};
|
};
|
||||||
|
|
||||||
logger.warn(
|
logger.warn(
|
||||||
"[HomeView Settings Trace] ⚠️ Registration check failed, expected for unregistered users.",
|
"[HomeView Settings Trace] ⚠️ Registration check failed",
|
||||||
{
|
{
|
||||||
error: errorMessage,
|
error: errorMessage,
|
||||||
did: this.activeDid,
|
did: this.activeDid,
|
||||||
@@ -749,7 +717,7 @@ export default class HomeView extends Vue {
|
|||||||
* Used for displaying contact info in feed and actions
|
* Used for displaying contact info in feed and actions
|
||||||
*
|
*
|
||||||
* @internal
|
* @internal
|
||||||
* Called by initializeIdentity()
|
* Called by mounted() and initializeIdentity()
|
||||||
*/
|
*/
|
||||||
private async loadContacts() {
|
private async loadContacts() {
|
||||||
this.allContacts = await this.$contacts();
|
this.allContacts = await this.$contacts();
|
||||||
@@ -763,6 +731,7 @@ export default class HomeView extends Vue {
|
|||||||
* Triggers updateAllFeed() to populate activity feed
|
* Triggers updateAllFeed() to populate activity feed
|
||||||
*
|
*
|
||||||
* @internal
|
* @internal
|
||||||
|
* Called by mounted()
|
||||||
*/
|
*/
|
||||||
private async loadFeedData() {
|
private async loadFeedData() {
|
||||||
await this.updateAllFeed();
|
await this.updateAllFeed();
|
||||||
@@ -776,6 +745,7 @@ export default class HomeView extends Vue {
|
|||||||
* - Rate limit status for both
|
* - Rate limit status for both
|
||||||
*
|
*
|
||||||
* @internal
|
* @internal
|
||||||
|
* Called by mounted() and initializeIdentity()
|
||||||
* @requires Active DID
|
* @requires Active DID
|
||||||
*/
|
*/
|
||||||
private async loadNewOffers() {
|
private async loadNewOffers() {
|
||||||
@@ -879,42 +849,6 @@ export default class HomeView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads new changes for starred projects
|
|
||||||
* Updates:
|
|
||||||
* - Number of new starred project changes
|
|
||||||
* - Rate limit status for starred project changes
|
|
||||||
*
|
|
||||||
* @internal
|
|
||||||
* @requires Active DID
|
|
||||||
*/
|
|
||||||
private async loadNewStarredProjectChanges() {
|
|
||||||
if (this.activeDid && this.starredPlanHandleIds.length > 0) {
|
|
||||||
try {
|
|
||||||
const starredProjectChanges = await getStarredProjectsWithChanges(
|
|
||||||
this.axios,
|
|
||||||
this.apiServer,
|
|
||||||
this.activeDid,
|
|
||||||
this.starredPlanHandleIds,
|
|
||||||
this.lastAckedStarredPlanChangesJwtId,
|
|
||||||
);
|
|
||||||
this.numNewStarredProjectChanges = starredProjectChanges.data.length;
|
|
||||||
this.newStarredProjectChangesHitLimit = starredProjectChanges.hitLimit;
|
|
||||||
} catch (error) {
|
|
||||||
// Don't show errors for starred project changes as it's a secondary feature
|
|
||||||
logger.warn(
|
|
||||||
"[HomeView] Failed to load starred project changes:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.numNewStarredProjectChanges = 0;
|
|
||||||
this.newStarredProjectChangesHitLimit = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.numNewStarredProjectChanges = 0;
|
|
||||||
this.newStarredProjectChangesHitLimit = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if user needs onboarding using ultra-concise mixin utilities
|
* Checks if user needs onboarding using ultra-concise mixin utilities
|
||||||
* Opens onboarding dialog if not completed
|
* Opens onboarding dialog if not completed
|
||||||
@@ -1265,7 +1199,6 @@ export default class HomeView extends Vue {
|
|||||||
provider,
|
provider,
|
||||||
fulfillsPlan,
|
fulfillsPlan,
|
||||||
providedByPlan,
|
providedByPlan,
|
||||||
record.emojiCount,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1489,14 +1422,12 @@ export default class HomeView extends Vue {
|
|||||||
provider: Provider | undefined,
|
provider: Provider | undefined,
|
||||||
fulfillsPlan?: FulfillsPlan,
|
fulfillsPlan?: FulfillsPlan,
|
||||||
providedByPlan?: ProvidedByPlan,
|
providedByPlan?: ProvidedByPlan,
|
||||||
emojiCount?: Record<string, number>,
|
|
||||||
): GiveRecordWithContactInfo {
|
): GiveRecordWithContactInfo {
|
||||||
return {
|
return {
|
||||||
...record,
|
...record,
|
||||||
jwtId: record.jwtId,
|
jwtId: record.jwtId,
|
||||||
fullClaim: record.fullClaim,
|
fullClaim: record.fullClaim,
|
||||||
description: record.description || "",
|
description: record.description || "",
|
||||||
emojiCount: emojiCount || {},
|
|
||||||
handleId: record.handleId,
|
handleId: record.handleId,
|
||||||
issuerDid: record.issuerDid,
|
issuerDid: record.issuerDid,
|
||||||
fulfillsPlanHandleId: record.fulfillsPlanHandleId,
|
fulfillsPlanHandleId: record.fulfillsPlanHandleId,
|
||||||
|
|||||||
@@ -1,27 +1,18 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Profile"></QuickNav>
|
<QuickNav selected="Profile"></QuickNav>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Cancel -->
|
||||||
|
<router-link
|
||||||
|
:to="{ name: 'account' }"
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
><font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</router-link>
|
||||||
|
|
||||||
Switch Identity
|
Switch Identity
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<router-link
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
:to="{ name: 'account' }"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Identity List -->
|
<!-- Identity List -->
|
||||||
@@ -315,9 +306,6 @@ export default class IdentitySwitcherView extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.$exec("DELETE FROM accounts WHERE id = ?", [id]);
|
await this.$exec("DELETE FROM accounts WHERE id = ?", [id]);
|
||||||
await this.$exec("DELETE FROM settings WHERE accountDid = ?", [
|
|
||||||
accountDid,
|
|
||||||
]);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Update UI
|
// Update UI
|
||||||
|
|||||||
@@ -1,26 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Cancel -->
|
||||||
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.go(-1)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left"></font-awesome>
|
||||||
|
</button>
|
||||||
Import Existing Identifier
|
Import Existing Identifier
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
<!-- Import Account Form -->
|
<!-- Import Account Form -->
|
||||||
<p class="text-center text-xl mb-4 font-light">
|
<p class="text-center text-xl mb-4 font-light">
|
||||||
|
|||||||
@@ -1,29 +1,20 @@
|
|||||||
<template>
|
<template>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Cancel -->
|
||||||
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.go(-1)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left"></font-awesome>
|
||||||
|
</button>
|
||||||
Derive from Existing Identity
|
Derive from Existing Identity
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Import Account Form -->
|
<!-- Import Account Form -->
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<p class="text-center text-xl mb-4 font-light">
|
<p class="text-center text-xl mb-4 font-light">
|
||||||
Will increment the maximum known derivation path from the existing seed.
|
Will increment the maximum known derivation path from the existing seed.
|
||||||
|
|||||||
@@ -1,32 +1,21 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Contacts" />
|
<QuickNav selected="Invite" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Back -->
|
||||||
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
<!-- Sub View Heading -->
|
<h1
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
@click="$router.back()"
|
||||||
Invitations
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 class="text-4xl text-center font-light">Invitations</h1>
|
||||||
|
|
||||||
<ul class="ml-8 mt-4 list-outside list-disc w-5/6">
|
<ul class="ml-8 mt-4 list-outside list-disc w-5/6">
|
||||||
<li>
|
<li>
|
||||||
Note when sending
|
Note when sending
|
||||||
|
|||||||
@@ -1,32 +1,23 @@
|
|||||||
<!-- This is useful in an environment where the download doesn't work. -->
|
<!-- This is useful in an environment where the download doesn't work. -->
|
||||||
<template>
|
<template>
|
||||||
<QuickNav selected="" />
|
<QuickNav selected="" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Back Button -->
|
||||||
|
<div class="relative px-7">
|
||||||
<!-- Sub View Heading -->
|
<h1
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
class="text-lg text-center font-light px-2 py-1 absolute -left-2 -top-1"
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">Logs</h1>
|
@click="$router.back()"
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
>
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
<font-awesome icon="chevron-left" class="mr-2" />
|
||||||
</a>
|
</h1>
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light mb-6">Logs</h1>
|
||||||
|
|
||||||
<!-- Error Message -->
|
<!-- Error Message -->
|
||||||
<div
|
<div
|
||||||
v-if="error"
|
v-if="error"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -22,27 +22,18 @@
|
|||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Cancel -->
|
||||||
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</button>
|
||||||
Edit Identity
|
Edit Identity
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input
|
<input
|
||||||
|
|||||||
@@ -2,27 +2,19 @@
|
|||||||
<QuickNav selected="Projects"></QuickNav>
|
<QuickNav selected="Projects"></QuickNav>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Cancel -->
|
||||||
|
<!-- Back -->
|
||||||
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</button>
|
||||||
Edit Project Idea
|
Edit Project Idea
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Project Details -->
|
<!-- Project Details -->
|
||||||
@@ -60,60 +52,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
|
<ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
|
||||||
|
|
||||||
<!-- Authorized Representative Selection -->
|
<input
|
||||||
<div class="w-full flex items-stretch my-4">
|
v-model="agentDid"
|
||||||
<div
|
type="text"
|
||||||
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"
|
placeholder="Other Authorized Representative"
|
||||||
@click="openRepresentativeDialog"
|
class="mt-4 block w-full rounded border border-slate-400 px-3 py-2"
|
||||||
>
|
|
||||||
<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>
|
||||||
@@ -280,12 +224,9 @@ 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,
|
||||||
@@ -319,7 +260,6 @@ import {
|
|||||||
retrieveAccountCount,
|
retrieveAccountCount,
|
||||||
retrieveFullyDecryptedAccount,
|
retrieveFullyDecryptedAccount,
|
||||||
} from "../libs/util";
|
} from "../libs/util";
|
||||||
import { Contact } from "../db/tables/contacts";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
EventTemplate,
|
EventTemplate,
|
||||||
@@ -375,15 +315,7 @@ import { logger } from "../utils/logger";
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
|
||||||
EntityIcon,
|
|
||||||
ImageMethodDialog,
|
|
||||||
ProjectRepresentativeDialog,
|
|
||||||
LMap,
|
|
||||||
LMarker,
|
|
||||||
LTileLayer,
|
|
||||||
QuickNav,
|
|
||||||
},
|
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class NewEditProjectView extends Vue {
|
export default class NewEditProjectView extends Vue {
|
||||||
@@ -394,9 +326,6 @@ 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
|
||||||
@@ -409,8 +338,6 @@ 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;
|
||||||
@@ -457,24 +384,16 @@ 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.isSavedProject()) {
|
if (this.projectId) {
|
||||||
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.projectId);
|
this.loadProject(this.activeDid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -484,9 +403,11 @@ 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, projectId: string) {
|
async loadProject(userDid: string) {
|
||||||
const url =
|
const url =
|
||||||
this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
|
this.apiServer +
|
||||||
|
"/api/claim/byHandle/" +
|
||||||
|
encodeURIComponent(this.projectId);
|
||||||
const headers = await getHeaders(userDid);
|
const headers = await getHeaders(userDid);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -503,12 +424,6 @@ 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(
|
||||||
@@ -613,7 +528,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.isSavedProject()) {
|
if (this.projectId) {
|
||||||
vcClaim.lastClaimId = this.lastClaimJwtId;
|
vcClaim.lastClaimId = this.lastClaimJwtId;
|
||||||
}
|
}
|
||||||
if (this.agentDid) {
|
if (this.agentDid) {
|
||||||
@@ -947,10 +862,6 @@ 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
|
||||||
@@ -966,7 +877,6 @@ 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
|
||||||
);
|
);
|
||||||
@@ -1043,37 +953,5 @@ 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>
|
||||||
|
|||||||
@@ -3,27 +3,22 @@
|
|||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<!-- Back -->
|
||||||
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
|
<h1
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
Your Identity
|
Your Identity
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex justify-center py-12">
|
<div class="flex justify-center py-12">
|
||||||
|
|||||||
@@ -1,88 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div
|
|
||||||
class="min-h-screen bg-gray-50 flex flex-col justify-start pt-2 sm:px-6 lg:px-8"
|
|
||||||
>
|
|
||||||
<div class="sm:mx-auto sm:w-full sm:max-w-md">
|
|
||||||
<div class="text-center">
|
|
||||||
<div class="mx-auto h-24 w-24 text-gray-400">
|
|
||||||
<svg
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
>
|
|
||||||
<circle cx="12" cy="12" r="10" stroke-width="1.5" />
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
stroke-width="2"
|
|
||||||
d="M12 8v4m0 4h.01"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<h1 class="mt-4 text-3xl font-extrabold text-gray-900">Not Found</h1>
|
|
||||||
<p class="text-sm text-gray-600">
|
|
||||||
The page you're looking for doesn't exist.
|
|
||||||
</p>
|
|
||||||
<div class="mt-1">
|
|
||||||
<button
|
|
||||||
class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
|
|
||||||
@click="goBack"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
class="-ml-1 mr-2 h-5 w-5"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
stroke-width="2"
|
|
||||||
d="M10 19l-7-7m0 0l7-7m-7 7h18"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
Go Back
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="mt-16">
|
|
||||||
<button
|
|
||||||
class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
|
|
||||||
@click="goHome"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
class="-ml-1 mr-2 h-5 w-5"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
stroke-width="2"
|
|
||||||
d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2
|
|
||||||
2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1
|
|
||||||
1 0 011 1v4a1 1 0 001 1m-6 0h6"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
Go Home
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { useRouter } from "vue-router";
|
|
||||||
|
|
||||||
const router = useRouter();
|
|
||||||
|
|
||||||
const goHome = () => {
|
|
||||||
router.push("/");
|
|
||||||
};
|
|
||||||
|
|
||||||
const goBack = () => {
|
|
||||||
router.go(-1);
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
@@ -1,33 +1,25 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Back -->
|
||||||
|
<div
|
||||||
<!-- Sub View Heading -->
|
v-if="!hideBackButton"
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
class="text-lg text-center font-light relative px-7"
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
>
|
||||||
What Is Offered
|
<h1
|
||||||
</h1>
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="cancelBack()"
|
@click="cancelBack()"
|
||||||
>
|
>
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
</a>
|
</h1>
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 class="text-4xl text-center font-light px-4 mb-4">What Is Offered</h1>
|
||||||
|
|
||||||
<h1 class="text-xl font-bold text-center mb-4">
|
<h1 class="text-xl font-bold text-center mb-4">
|
||||||
<span> Offer to {{ recipientDisplayName }} </span>
|
<span> Offer to {{ recipientDisplayName }} </span>
|
||||||
</h1>
|
</h1>
|
||||||
|
|||||||
@@ -1,26 +1,12 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Contacts" />
|
<QuickNav selected="Contacts" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light mb-8">
|
||||||
<!-- Sub View Heading -->
|
Onboarding Meetings
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
</h1>
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
|
||||||
Onboarding Meetings
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Spacer (no Back button) -->
|
|
||||||
<div class="order-first p-3 pe-3.5 pb-3.5"></div>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Loading State -->
|
<!-- Loading State -->
|
||||||
<div v-if="isLoading" class="flex justify-center items-center py-8">
|
<div v-if="isLoading" class="flex justify-center items-center py-8">
|
||||||
@@ -77,7 +63,7 @@
|
|||||||
v-if="meetings.length === 0 && !isRegistered"
|
v-if="meetings.length === 0 && !isRegistered"
|
||||||
class="text-center text-gray-500 py-8"
|
class="text-center text-gray-500 py-8"
|
||||||
>
|
>
|
||||||
No onboarding meetings are available
|
No onboarding meetings available
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,26 +1,12 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Contacts" />
|
<QuickNav selected="Contacts" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light mb-8">
|
||||||
<!-- Sub View Heading -->
|
Meeting Members
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
</h1>
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
|
||||||
Meeting Members
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Spacer (no Back button) -->
|
|
||||||
<div class="order-first p-3 pe-3.5 pb-3.5"></div>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Loading Animation -->
|
<!-- Loading Animation -->
|
||||||
<div
|
<div
|
||||||
@@ -77,7 +63,6 @@ import {
|
|||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import { generateSaveAndActivateIdentity } from "../libs/util";
|
import { generateSaveAndActivateIdentity } from "../libs/util";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
import { NotificationIface } from "../constants/app";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
@@ -98,7 +83,6 @@ export default class OnboardMeetingMembersView extends Vue {
|
|||||||
projectLink = "";
|
projectLink = "";
|
||||||
$route!: RouteLocationNormalizedLoaded;
|
$route!: RouteLocationNormalizedLoaded;
|
||||||
$router!: Router;
|
$router!: Router;
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
userNameDialog!: InstanceType<typeof UserNameDialog>;
|
userNameDialog!: InstanceType<typeof UserNameDialog>;
|
||||||
|
|
||||||
|
|||||||
@@ -1,26 +1,12 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Contacts" />
|
<QuickNav selected="Contacts" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light">
|
||||||
<!-- Sub View Heading -->
|
Onboarding Meeting
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
</h1>
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
|
||||||
Onboarding Meeting
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Spacer (no Back button) -->
|
|
||||||
<div class="order-first p-3 pe-3.5 pb-3.5"></div>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Existing Meeting Section -->
|
<!-- Existing Meeting Section -->
|
||||||
<div
|
<div
|
||||||
@@ -230,28 +216,26 @@
|
|||||||
class="mt-8 p-4 border rounded-lg bg-white shadow"
|
class="mt-8 p-4 border rounded-lg bg-white shadow"
|
||||||
>
|
>
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<h2 class="font-bold">Meeting Members</h2>
|
<h2 class="text-2xl">Meeting Members</h2>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4">
|
||||||
|
• Page for Members
|
||||||
|
<span
|
||||||
|
class="ml-4 cursor-pointer text-blue-600"
|
||||||
|
title="Click to copy link for members"
|
||||||
|
@click="copyMembersLinkToClipboard"
|
||||||
|
>
|
||||||
|
<font-awesome icon="link" />
|
||||||
|
</span>
|
||||||
|
<a
|
||||||
|
v-if="!!currentMeeting.password"
|
||||||
|
:href="onboardMeetingMembersLink()"
|
||||||
|
class="ml-4 text-blue-600"
|
||||||
|
target="_blank"
|
||||||
|
>
|
||||||
|
<font-awesome icon="external-link" />
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<ul class="list-disc text-sm mt-4 mb-2 ps-4 space-y-2">
|
|
||||||
<li>
|
|
||||||
Page for Members:
|
|
||||||
<span
|
|
||||||
class="ml-4 cursor-pointer text-blue-600"
|
|
||||||
title="Click to copy link for members"
|
|
||||||
@click="copyMembersLinkToClipboard"
|
|
||||||
>
|
|
||||||
<font-awesome icon="link" />
|
|
||||||
</span>
|
|
||||||
<a
|
|
||||||
v-if="!!currentMeeting.password"
|
|
||||||
:href="onboardMeetingMembersLink()"
|
|
||||||
class="ml-4 text-blue-600"
|
|
||||||
target="_blank"
|
|
||||||
>
|
|
||||||
<font-awesome icon="external-link" />
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<MembersList
|
<MembersList
|
||||||
:password="currentMeeting.password || ''"
|
:password="currentMeeting.password || ''"
|
||||||
@@ -473,7 +457,6 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const password: string = this.newOrUpdatedMeetingInputs.password;
|
|
||||||
|
|
||||||
// create content with user's name & DID encrypted with password
|
// create content with user's name & DID encrypted with password
|
||||||
const content = {
|
const content = {
|
||||||
@@ -483,7 +466,7 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
};
|
};
|
||||||
const encryptedContent = await encryptMessage(
|
const encryptedContent = await encryptMessage(
|
||||||
JSON.stringify(content),
|
JSON.stringify(content),
|
||||||
password,
|
this.newOrUpdatedMeetingInputs.password,
|
||||||
);
|
);
|
||||||
|
|
||||||
const headers = await getHeaders(this.activeDid);
|
const headers = await getHeaders(this.activeDid);
|
||||||
@@ -506,11 +489,6 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
|
|
||||||
this.newOrUpdatedMeetingInputs = null;
|
this.newOrUpdatedMeetingInputs = null;
|
||||||
this.notify.success(NOTIFY_MEETING_CREATED.message, TIMEOUTS.STANDARD);
|
this.notify.success(NOTIFY_MEETING_CREATED.message, TIMEOUTS.STANDARD);
|
||||||
// redirect to the same page with the password parameter set
|
|
||||||
this.$router.push({
|
|
||||||
name: "onboard-meeting-setup",
|
|
||||||
query: { password: password },
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
throw { response: response };
|
throw { response: response };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,58 +1,40 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Breadcrumb -->
|
||||||
|
<div id="ViewBreadcrumb">
|
||||||
<div class="mb-4">
|
<div>
|
||||||
<!-- Sub View Heading -->
|
<h1 class="text-center text-lg font-light relative px-7">
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-4">
|
<!-- Back -->
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<button
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</button>
|
||||||
Project Idea
|
Project Idea
|
||||||
</h1>
|
</h1>
|
||||||
|
<h2 class="text-center text-xl font-semibold">
|
||||||
<!-- Back -->
|
{{ name }}
|
||||||
<a
|
<button
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
v-if="activeDid === issuer || activeDid === agentDid"
|
||||||
@click="$router.go(-1)"
|
title="Edit"
|
||||||
>
|
data-testId="editClaimButton"
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
@click="onEditClick()"
|
||||||
</a>
|
>
|
||||||
|
<font-awesome icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
|
||||||
<!-- Help button -->
|
</button>
|
||||||
<router-link
|
<button title="Copy Link to Project" @click="onCopyLinkClick()">
|
||||||
:to="{ name: 'help' }"
|
<font-awesome
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
icon="link"
|
||||||
>
|
class="text-sm text-slate-500 ml-2 mb-1"
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
/>
|
||||||
</router-link>
|
</button>
|
||||||
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
<h2 class="text-center text-lg font-normal overflow-hidden text-ellipsis">
|
|
||||||
{{ name }}
|
|
||||||
<button
|
|
||||||
v-if="activeDid === issuer || activeDid === agentDid"
|
|
||||||
title="Edit"
|
|
||||||
data-testId="editClaimButton"
|
|
||||||
@click="onEditClick()"
|
|
||||||
>
|
|
||||||
<font-awesome icon="pen" class="text-sm text-blue-500 ml-2" />
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
:title="
|
|
||||||
isStarred
|
|
||||||
? 'Remove from starred projects'
|
|
||||||
: 'Add to starred projects'
|
|
||||||
"
|
|
||||||
@click="toggleStar()"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
:icon="isStarred ? 'star' : ['far', 'star']"
|
|
||||||
:class="isStarred ? 'text-yellow-500' : 'text-slate-500'"
|
|
||||||
class="text-sm ml-2"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
</h2>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Project Details -->
|
<!-- Project Details -->
|
||||||
@@ -76,13 +58,13 @@
|
|||||||
icon="user"
|
icon="user"
|
||||||
class="fa-fw text-slate-400"
|
class="fa-fw text-slate-400"
|
||||||
></font-awesome>
|
></font-awesome>
|
||||||
<span class="truncate max-w-[calc(100%-2rem)] ml-1">
|
<span class="truncate inline-block max-w-[calc(100%-2rem)]">
|
||||||
{{ issuerInfoObject?.displayName }}
|
{{ issuerInfoObject?.displayName }}
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span
|
<span
|
||||||
v-if="!serverUtil.isHiddenDid(issuer)"
|
v-if="!serverUtil.isHiddenDid(issuer)"
|
||||||
class="inline-flex items-center ml-1"
|
class="inline-flex items-center"
|
||||||
>
|
>
|
||||||
<router-link
|
<router-link
|
||||||
:to="{
|
:to="{
|
||||||
@@ -157,30 +139,26 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="text-sm text-slate-500">
|
<div class="text-sm text-slate-500">
|
||||||
<div v-if="!expanded" class="overflow-hidden text-ellipsis">
|
<div v-if="!expanded">
|
||||||
<vue-markdown
|
{{ truncatedDesc }}
|
||||||
:source="truncatedDesc"
|
|
||||||
class="mb-4 markdown-content"
|
|
||||||
/>
|
|
||||||
<a
|
<a
|
||||||
v-if="description.length >= truncateLength"
|
v-if="description.length >= truncateLength"
|
||||||
class="mt-4 uppercase text-xs font-semibold text-blue-700 cursor-pointer"
|
class="uppercase text-xs font-semibold text-slate-700"
|
||||||
@click="expandText"
|
@click="expandText"
|
||||||
>... Read More</a
|
>... Read More</a
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="overflow-hidden text-ellipsis">
|
<div v-else>
|
||||||
<vue-markdown :source="description" class="mb-4 markdown-content" />
|
{{ description }}
|
||||||
<a
|
<a
|
||||||
v-if="description.length >= truncateLength"
|
class="uppercase text-xs font-semibold text-slate-700"
|
||||||
class="mt-4 uppercase text-xs font-semibold text-blue-700 cursor-pointer"
|
|
||||||
@click="collapseText"
|
@click="collapseText"
|
||||||
>- Read Less</a
|
>- Read Less</a
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<a class="cursor-pointer" @click="onClickLoadClaim(jwtId)">
|
<a class="cursor-pointer" @click="onClickLoadClaim(projectId)">
|
||||||
<font-awesome icon="file-lines" class="pl-2 pt-1 text-blue-500" />
|
<font-awesome icon="file-lines" class="pl-2 pt-1 text-blue-500" />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -308,15 +286,15 @@
|
|||||||
/>{{ offer.amount }}
|
/>{{ offer.amount }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div v-if="offer.objectDescription" class="text-slate-500">
|
||||||
v-if="offer.objectDescription"
|
|
||||||
class="text-slate-500 overflow-hidden text-ellipsis"
|
|
||||||
>
|
|
||||||
<font-awesome icon="comment" class="fa-fw text-slate-400" />
|
<font-awesome icon="comment" class="fa-fw text-slate-400" />
|
||||||
{{ offer.objectDescription }}
|
{{ offer.objectDescription }}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-between">
|
<div class="flex justify-between">
|
||||||
<a class="cursor-pointer" @click="onClickLoadClaim(offer.jwtId)">
|
<a
|
||||||
|
class="cursor-pointer"
|
||||||
|
@click="onClickLoadClaim(offer.jwtId as string)"
|
||||||
|
>
|
||||||
<font-awesome
|
<font-awesome
|
||||||
icon="file-lines"
|
icon="file-lines"
|
||||||
class="pl-2 pt-1 text-blue-500"
|
class="pl-2 pt-1 text-blue-500"
|
||||||
@@ -453,10 +431,7 @@
|
|||||||
<font-awesome icon="calendar" class="fa-fw text-slate-400" />
|
<font-awesome icon="calendar" class="fa-fw text-slate-400" />
|
||||||
{{ give.issuedAt?.substring(0, 10) }}
|
{{ give.issuedAt?.substring(0, 10) }}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div v-if="give.description" class="text-slate-500">
|
||||||
v-if="give.description"
|
|
||||||
class="text-slate-500 overflow-hidden text-ellipsis"
|
|
||||||
>
|
|
||||||
<font-awesome icon="comment" class="fa-fw text-slate-400" />
|
<font-awesome icon="comment" class="fa-fw text-slate-400" />
|
||||||
{{ give.description }}
|
{{ give.description }}
|
||||||
</div>
|
</div>
|
||||||
@@ -563,10 +538,7 @@
|
|||||||
<font-awesome icon="calendar" class="fa-fw text-slate-400" />
|
<font-awesome icon="calendar" class="fa-fw text-slate-400" />
|
||||||
{{ give.issuedAt?.substring(0, 10) }}
|
{{ give.issuedAt?.substring(0, 10) }}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div v-if="give.description" class="text-slate-500">
|
||||||
v-if="give.description"
|
|
||||||
class="text-slate-500 overflow-hidden text-ellipsis"
|
|
||||||
>
|
|
||||||
<font-awesome icon="comment" class="fa-fw text-slate-400" />
|
<font-awesome icon="comment" class="fa-fw text-slate-400" />
|
||||||
{{ give.description }}
|
{{ give.description }}
|
||||||
</div>
|
</div>
|
||||||
@@ -620,9 +592,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { AxiosError } from "axios";
|
import { AxiosError } from "axios";
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import VueMarkdown from "vue-markdown-render";
|
|
||||||
import { Router } from "vue-router";
|
import { Router } from "vue-router";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
GenericVerifiableCredential,
|
GenericVerifiableCredential,
|
||||||
GenericCredWrapper,
|
GenericCredWrapper,
|
||||||
@@ -633,25 +603,25 @@ import {
|
|||||||
PlanSummaryRecord,
|
PlanSummaryRecord,
|
||||||
} from "../interfaces";
|
} from "../interfaces";
|
||||||
import GiftedDialog from "../components/GiftedDialog.vue";
|
import GiftedDialog from "../components/GiftedDialog.vue";
|
||||||
import HiddenDidDialog from "../components/HiddenDidDialog.vue";
|
|
||||||
import OfferDialog from "../components/OfferDialog.vue";
|
import OfferDialog from "../components/OfferDialog.vue";
|
||||||
import TopMessage from "../components/TopMessage.vue";
|
import TopMessage from "../components/TopMessage.vue";
|
||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
import EntityIcon from "../components/EntityIcon.vue";
|
import EntityIcon from "../components/EntityIcon.vue";
|
||||||
import ProjectIcon from "../components/ProjectIcon.vue";
|
import ProjectIcon from "../components/ProjectIcon.vue";
|
||||||
import { APP_SERVER, NotificationIface } from "../constants/app";
|
import { NotificationIface } from "../constants/app";
|
||||||
import { UNNAMED_PROJECT } from "../constants/entities";
|
// Removed legacy logging import - migrated to PlatformServiceMixin
|
||||||
import { NOTIFY_CONFIRM_CLAIM } from "../constants/notifications";
|
|
||||||
import * as databaseUtil from "../db/databaseUtil";
|
|
||||||
import { Contact } from "../db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
import * as libsUtil from "../libs/util";
|
import * as libsUtil from "../libs/util";
|
||||||
import * as serverUtil from "../libs/endorserServer";
|
import * as serverUtil from "../libs/endorserServer";
|
||||||
import { retrieveAccountDids } from "../libs/util";
|
import { retrieveAccountDids } from "../libs/util";
|
||||||
import { copyToClipboard } from "../services/ClipboardService";
|
import HiddenDidDialog from "../components/HiddenDidDialog.vue";
|
||||||
import { logger } from "../utils/logger";
|
import { logger } from "../utils/logger";
|
||||||
|
import { copyToClipboard } from "../services/ClipboardService";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||||
|
import { NOTIFY_CONFIRM_CLAIM } from "@/constants/notifications";
|
||||||
|
import { APP_SERVER } from "@/constants/app";
|
||||||
|
import { UNNAMED_PROJECT } from "@/constants/entities";
|
||||||
/**
|
/**
|
||||||
* Project View Component
|
* Project View Component
|
||||||
* @author Matthew Raymer
|
* @author Matthew Raymer
|
||||||
@@ -693,7 +663,6 @@ import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
|||||||
ProjectIcon,
|
ProjectIcon,
|
||||||
QuickNav,
|
QuickNav,
|
||||||
TopMessage,
|
TopMessage,
|
||||||
VueMarkdown,
|
|
||||||
},
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
@@ -749,8 +718,6 @@ export default class ProjectViewView extends Vue {
|
|||||||
givesProvidedByHitLimit = false;
|
givesProvidedByHitLimit = false;
|
||||||
givesTotalsByUnit: Array<{ unit: string; amount: number }> = [];
|
givesTotalsByUnit: Array<{ unit: string; amount: number }> = [];
|
||||||
imageUrl = "";
|
imageUrl = "";
|
||||||
/** Whether this project is starred by the user */
|
|
||||||
isStarred = false;
|
|
||||||
/** Project issuer DID */
|
/** Project issuer DID */
|
||||||
issuer = "";
|
issuer = "";
|
||||||
/** Cached issuer information */
|
/** Cached issuer information */
|
||||||
@@ -761,8 +728,6 @@ export default class ProjectViewView extends Vue {
|
|||||||
} | null = null;
|
} | null = null;
|
||||||
/** DIDs that can see issuer information */
|
/** DIDs that can see issuer information */
|
||||||
issuerVisibleToDids: Array<string> = [];
|
issuerVisibleToDids: Array<string> = [];
|
||||||
/** Project JWT ID */
|
|
||||||
jwtId = "";
|
|
||||||
/** Project location data */
|
/** Project location data */
|
||||||
latitude = 0;
|
latitude = 0;
|
||||||
loadingTotals = false;
|
loadingTotals = false;
|
||||||
@@ -791,7 +756,7 @@ export default class ProjectViewView extends Vue {
|
|||||||
totalsExpanded = false;
|
totalsExpanded = false;
|
||||||
truncatedDesc = "";
|
truncatedDesc = "";
|
||||||
/** Truncation length */
|
/** Truncation length */
|
||||||
truncateLength = 200;
|
truncateLength = 40;
|
||||||
|
|
||||||
// Utility References
|
// Utility References
|
||||||
libsUtil = libsUtil;
|
libsUtil = libsUtil;
|
||||||
@@ -845,12 +810,6 @@ export default class ProjectViewView extends Vue {
|
|||||||
}
|
}
|
||||||
this.loadProject(this.projectId, this.activeDid);
|
this.loadProject(this.projectId, this.activeDid);
|
||||||
this.loadTotals();
|
this.loadTotals();
|
||||||
|
|
||||||
// Check if this project is starred when settings are loaded
|
|
||||||
if (this.projectId && settings.starredPlanHandleIds) {
|
|
||||||
const starredIds = settings.starredPlanHandleIds || [];
|
|
||||||
this.isStarred = starredIds.includes(this.projectId);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -927,9 +886,8 @@ export default class ProjectViewView extends Vue {
|
|||||||
this.allContacts,
|
this.allContacts,
|
||||||
);
|
);
|
||||||
this.issuerVisibleToDids = resp.data.issuerVisibleToDids || [];
|
this.issuerVisibleToDids = resp.data.issuerVisibleToDids || [];
|
||||||
this.jwtId = resp.data.id;
|
|
||||||
this.name = resp.data.claim?.name || "(no name)";
|
this.name = resp.data.claim?.name || "(no name)";
|
||||||
this.description = resp.data.claim?.description || "";
|
this.description = resp.data.claim?.description || "(no description)";
|
||||||
this.truncatedDesc = this.description.slice(0, this.truncateLength);
|
this.truncatedDesc = this.description.slice(0, this.truncateLength);
|
||||||
this.latitude = resp.data.claim?.location?.geo?.latitude || 0;
|
this.latitude = resp.data.claim?.location?.geo?.latitude || 0;
|
||||||
this.longitude = resp.data.claim?.location?.geo?.longitude || 0;
|
this.longitude = resp.data.claim?.location?.geo?.longitude || 0;
|
||||||
@@ -1519,67 +1477,5 @@ export default class ProjectViewView extends Vue {
|
|||||||
this.givesTotalsByUnit.find((total) => total.unit === "HUR")?.amount || 0
|
this.givesTotalsByUnit.find((total) => total.unit === "HUR")?.amount || 0
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Toggle the starred status of the current project
|
|
||||||
*/
|
|
||||||
async toggleStar() {
|
|
||||||
if (!this.projectId) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const settings = await this.$accountSettings();
|
|
||||||
const starredIds = settings.starredPlanHandleIds || [];
|
|
||||||
if (!this.isStarred) {
|
|
||||||
// Add to starred projects
|
|
||||||
if (!starredIds.includes(this.projectId)) {
|
|
||||||
const newStarredIds = [...starredIds, this.projectId];
|
|
||||||
const newIdsParam = JSON.stringify(newStarredIds);
|
|
||||||
const result = await databaseUtil.updateDidSpecificSettings(
|
|
||||||
this.activeDid,
|
|
||||||
// @ts-expect-error until we use SettingsWithJsonString properly
|
|
||||||
{ starredPlanHandleIds: newIdsParam },
|
|
||||||
);
|
|
||||||
if (result) {
|
|
||||||
this.isStarred = true;
|
|
||||||
} else {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
logger.error("Got a bad result from SQL update to star a project.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!settings.lastAckedStarredPlanChangesJwtId) {
|
|
||||||
await databaseUtil.updateDidSpecificSettings(this.activeDid, {
|
|
||||||
lastAckedStarredPlanChangesJwtId: this.jwtId,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Remove from starred projects
|
|
||||||
|
|
||||||
const updatedIds = starredIds.filter((id) => id !== this.projectId);
|
|
||||||
const newIdsParam = JSON.stringify(updatedIds);
|
|
||||||
const result = await databaseUtil.updateDidSpecificSettings(
|
|
||||||
this.activeDid,
|
|
||||||
// @ts-expect-error until we use SettingsWithJsonString properly
|
|
||||||
{ starredPlanHandleIds: newIdsParam },
|
|
||||||
);
|
|
||||||
if (result) {
|
|
||||||
this.isStarred = false;
|
|
||||||
} else {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
logger.error("Got a bad result from SQL update to unstar a project.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error toggling star status:", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Failed to update starred status. Please try again.",
|
|
||||||
},
|
|
||||||
3000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,28 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Projects" />
|
<QuickNav selected="Projects" />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light">
|
||||||
<!-- Main View Heading -->
|
Your Project Ideas
|
||||||
<div class="flex gap-4 items-center mb-4">
|
</h1>
|
||||||
<h1 id="ViewHeading" class="text-2xl font-bold leading-none">
|
|
||||||
Your Ideas
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<OnboardingDialog ref="onboardingDialog" />
|
<OnboardingDialog ref="onboardingDialog" />
|
||||||
|
|
||||||
<!-- Result Tabs -->
|
<!-- Result Tabs -->
|
||||||
<div class="text-center text-slate-500 border-b border-slate-300 mt-4">
|
<div class="text-center text-slate-500 border-b border-slate-300 mt-8">
|
||||||
<ul class="flex flex-wrap justify-center gap-4 -mb-px">
|
<ul class="flex flex-wrap justify-center gap-4 -mb-px">
|
||||||
<li>
|
<li>
|
||||||
<a
|
<a
|
||||||
@@ -118,8 +107,8 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="overflow-hidden">
|
<div>
|
||||||
<div class="text-sm truncate">
|
<div>
|
||||||
To
|
To
|
||||||
{{
|
{{
|
||||||
offer.fulfillsPlanHandleId
|
offer.fulfillsPlanHandleId
|
||||||
@@ -132,7 +121,7 @@
|
|||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
<div class="truncate">
|
<div>
|
||||||
{{ offer.objectDescription }}
|
{{ offer.objectDescription }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -254,7 +243,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grow overflow-hidden">
|
<div class="grow overflow-hidden">
|
||||||
<h2 class="text-base font-semibold truncate">
|
<h2 class="text-base font-semibold">
|
||||||
{{ project.name || unnamedProject }}
|
{{ project.name || unnamedProject }}
|
||||||
</h2>
|
</h2>
|
||||||
<div class="text-sm truncate">
|
<div class="text-sm truncate">
|
||||||
@@ -657,7 +646,7 @@ export default class ProjectsView extends Vue {
|
|||||||
get offerTabClasses() {
|
get offerTabClasses() {
|
||||||
return {
|
return {
|
||||||
"inline-block": true,
|
"inline-block": true,
|
||||||
"py-2": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
active: this.showOffers,
|
active: this.showOffers,
|
||||||
@@ -675,7 +664,7 @@ export default class ProjectsView extends Vue {
|
|||||||
* @returns String with CSS classes for the floating new project button
|
* @returns String with CSS classes for the floating new project button
|
||||||
*/
|
*/
|
||||||
get newProjectButtonClasses() {
|
get newProjectButtonClasses() {
|
||||||
return "fixed right-6 top-14 text-center text-4xl leading-none bg-green-600 text-white w-14 py-2.5 rounded-full";
|
return "fixed right-6 top-24 text-center text-4xl leading-none bg-green-600 text-white w-14 py-2.5 rounded-full";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -717,7 +706,7 @@ export default class ProjectsView extends Vue {
|
|||||||
get projectTabClasses() {
|
get projectTabClasses() {
|
||||||
return {
|
return {
|
||||||
"inline-block": true,
|
"inline-block": true,
|
||||||
"py-2": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
active: this.showProjects,
|
active: this.showProjects,
|
||||||
|
|||||||
@@ -1,33 +1,24 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Back -->
|
||||||
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
<!-- Sub View Heading -->
|
<h1
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
|
||||||
Beginning of BVC Saturday Meeting
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="goBack()"
|
@click="goBack()"
|
||||||
>
|
>
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
</a>
|
</h1>
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-4">
|
||||||
|
Beginning of BVC Saturday Meeting
|
||||||
|
</h1>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h2 class="text-2xl m-2">You're Here</h2>
|
<h2 class="text-2xl m-2">You're Here</h2>
|
||||||
<div class="m-2 flex">
|
<div class="m-2 flex">
|
||||||
@@ -108,7 +99,7 @@ export default class QuickActionBvcBeginView extends Vue {
|
|||||||
$router!: Router;
|
$router!: Router;
|
||||||
|
|
||||||
// Notification helper system
|
// Notification helper system
|
||||||
private notify!: ReturnType<typeof createNotifyHelpers>;
|
private notify = createNotifyHelpers(this.$notify);
|
||||||
|
|
||||||
attended = true;
|
attended = true;
|
||||||
gaveTime = true;
|
gaveTime = true;
|
||||||
@@ -120,9 +111,6 @@ export default class QuickActionBvcBeginView extends Vue {
|
|||||||
* Uses America/Denver timezone for Bountiful location
|
* Uses America/Denver timezone for Bountiful location
|
||||||
*/
|
*/
|
||||||
async mounted() {
|
async mounted() {
|
||||||
// Initialize notification helpers
|
|
||||||
this.notify = createNotifyHelpers(this.$notify);
|
|
||||||
|
|
||||||
logger.debug(
|
logger.debug(
|
||||||
"[QuickActionBvcBeginView] Mounted - calculating meeting date",
|
"[QuickActionBvcBeginView] Mounted - calculating meeting date",
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,33 +1,21 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Back -->
|
||||||
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
<!-- Sub View Heading -->
|
<h1 :class="backButtonClasses" @click="$router.back()">
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
|
||||||
End of BVC Saturday Meeting
|
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-4">
|
||||||
|
End of BVC Saturday Meeting
|
||||||
|
</h1>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h2 class="text-2xl m-2">Confirm</h2>
|
<h2 class="text-2xl m-2">Confirm</h2>
|
||||||
<div v-if="loadingConfirms" class="flex justify-center">
|
<div v-if="loadingConfirms" class="flex justify-center">
|
||||||
|
|||||||
@@ -1,33 +1,24 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav />
|
||||||
|
<TopMessage />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<TopMessage />
|
<!-- Back -->
|
||||||
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
<!-- Sub View Heading -->
|
<h1
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
@click="$router.back()"
|
||||||
Bountiful Voluntaryist Community Actions
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-4">
|
||||||
|
Bountiful Voluntaryist Community Actions
|
||||||
|
</h1>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<router-link
|
<router-link
|
||||||
:to="{ name: 'quick-action-bvc-begin' }"
|
:to="{ name: 'quick-action-bvc-begin' }"
|
||||||
|
|||||||
@@ -2,27 +2,17 @@
|
|||||||
<QuickNav selected="Home"></QuickNav>
|
<QuickNav selected="Home"></QuickNav>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Back -->
|
||||||
|
<font-awesome
|
||||||
|
icon="chevron-left"
|
||||||
|
class="fa-fw text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
/>
|
||||||
Offers to Your Projects
|
Offers to Your Projects
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="newOffersToUserProjects.length === 0">
|
<div v-if="newOffersToUserProjects.length === 0">
|
||||||
@@ -42,20 +32,20 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<InfiniteScroll @reached-bottom="loadMoreOffersToUserProjects">
|
<InfiniteScroll @reached-bottom="loadMoreOffersToUserProjects">
|
||||||
<ul data-testId="listRecentOffersToUserProjects">
|
<ul
|
||||||
|
data-testId="listRecentOffersToUserProjects"
|
||||||
|
class="border-t border-slate-300"
|
||||||
|
>
|
||||||
<li
|
<li
|
||||||
v-for="offer in newOffersToUserProjects"
|
v-for="offer in newOffersToUserProjects"
|
||||||
:key="offer.jwtId"
|
:key="offer.jwtId"
|
||||||
class="mt-4 relative group"
|
class="mt-4 relative group"
|
||||||
>
|
>
|
||||||
<!-- Last viewed separator -->
|
|
||||||
<div
|
<div
|
||||||
v-if="offer.jwtId == lastAckedOfferToUserProjectsJwtId"
|
v-if="offer.jwtId == lastAckedOfferToUserProjectsJwtId"
|
||||||
class="border-b border-dashed border-slate-300 text-orange-400 mt-4 mb-6 font-bold text-sm"
|
class="border-b border-slate-300 text-orange-400 pb-2 mb-2 font-bold text-sm"
|
||||||
>
|
>
|
||||||
<span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
|
You've already seen all the following
|
||||||
You've already seen all the following
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span>{{
|
<span>{{
|
||||||
@@ -157,14 +147,6 @@ export default class RecentOffersToUserView extends Vue {
|
|||||||
this.newOffersToUserProjects = offersToUserProjectsData.data;
|
this.newOffersToUserProjects = offersToUserProjectsData.data;
|
||||||
this.newOffersToUserProjectsAtEnd = !offersToUserProjectsData.hitLimit;
|
this.newOffersToUserProjectsAtEnd = !offersToUserProjectsData.hitLimit;
|
||||||
|
|
||||||
// Mark offers as read after data is loaded
|
|
||||||
if (this.newOffersToUserProjects.length > 0) {
|
|
||||||
await this.$updateSettings({
|
|
||||||
lastAckedOfferToUserProjectsJwtId:
|
|
||||||
this.newOffersToUserProjects[0].jwtId,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
logger.error("Error retrieving settings & contacts:", err);
|
logger.error("Error retrieving settings & contacts:", err);
|
||||||
|
|||||||
@@ -2,27 +2,17 @@
|
|||||||
<QuickNav selected="Home"></QuickNav>
|
<QuickNav selected="Home"></QuickNav>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Back -->
|
||||||
|
<font-awesome
|
||||||
|
icon="chevron-left"
|
||||||
|
class="fa-fw text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="$router.back()"
|
||||||
|
/>
|
||||||
Offers to You
|
Offers to You
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="newOffersToUser.length === 0">
|
<div v-if="newOffersToUser.length === 0">
|
||||||
@@ -37,20 +27,20 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<InfiniteScroll @reached-bottom="loadMoreOffersToUser">
|
<InfiniteScroll @reached-bottom="loadMoreOffersToUser">
|
||||||
<ul data-testId="listRecentOffersToUser">
|
<ul
|
||||||
|
data-testId="listRecentOffersToUser"
|
||||||
|
class="border-t border-slate-300"
|
||||||
|
>
|
||||||
<li
|
<li
|
||||||
v-for="offer in newOffersToUser"
|
v-for="offer in newOffersToUser"
|
||||||
:key="offer.jwtId"
|
:key="offer.jwtId"
|
||||||
class="mt-4 relative group"
|
class="mt-4 relative group"
|
||||||
>
|
>
|
||||||
<!-- Last viewed separator -->
|
|
||||||
<div
|
<div
|
||||||
v-if="offer.jwtId == lastAckedOfferToUserJwtId"
|
v-if="offer.jwtId == lastAckedOfferToUserJwtId"
|
||||||
class="border-b border-dashed border-slate-300 text-orange-400 mt-4 mb-6 font-bold text-sm"
|
class="border-b border-slate-300 text-orange-400 pb-2 mb-2 font-bold text-sm"
|
||||||
>
|
>
|
||||||
<span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
|
You've already seen all the following
|
||||||
You've already seen all the following
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span>{{
|
<span>{{
|
||||||
@@ -148,13 +138,6 @@ export default class RecentOffersToUserView extends Vue {
|
|||||||
this.newOffersToUser = offersToUserData.data;
|
this.newOffersToUser = offersToUserData.data;
|
||||||
this.newOffersToUserAtEnd = !offersToUserData.hitLimit;
|
this.newOffersToUserAtEnd = !offersToUserData.hitLimit;
|
||||||
|
|
||||||
// Mark offers as read after data is loaded
|
|
||||||
if (this.newOffersToUser.length > 0) {
|
|
||||||
await this.$updateSettings({
|
|
||||||
lastAckedOfferToUserJwtId: this.newOffersToUser[0].jwtId,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
logger.error("Error retrieving settings & contacts:", err);
|
logger.error("Error retrieving settings & contacts:", err);
|
||||||
|
|||||||
@@ -1,27 +1,24 @@
|
|||||||
<template>
|
<template>
|
||||||
|
<QuickNav />
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
||||||
<!-- Sub View Heading -->
|
<!-- Breadcrumb -->
|
||||||
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
|
<div class="mb-8">
|
||||||
<h1 class="grow text-xl text-center font-semibold leading-tight">
|
<!-- Back -->
|
||||||
|
<div class="text-lg text-center font-light relative px-7">
|
||||||
|
<h1
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
@click="goBack"
|
||||||
|
>
|
||||||
|
<font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Heading -->
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
Area for Nearby Search
|
Area for Nearby Search
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Back -->
|
|
||||||
<a
|
|
||||||
class="order-first text-lg text-center leading-none p-1"
|
|
||||||
@click="goBack()"
|
|
||||||
>
|
|
||||||
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<!-- Help button -->
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
|
||||||
>
|
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
|
||||||
</router-link>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="px-2 py-4">
|
<div class="px-2 py-4">
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user