Compare commits
2 Commits
333ac773f6
...
remove-old
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e25e5d5ff6 | ||
|
|
8452af7abc |
@@ -1,7 +0,0 @@
|
|||||||
|
|
||||||
# I tried setting values here and using `vue-cli-service build --mode development`
|
|
||||||
# but it didn't create some things in "dist":
|
|
||||||
# - the "css" directory with the CSS extracted from Vue files
|
|
||||||
# - the sw_scripts-combined* files
|
|
||||||
#
|
|
||||||
# ¯\_(ツ)_/¯
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
# Only the variables that start with VITE_ are seen in the application process.env in Vue.
|
|
||||||
VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01GXYPFF7FA03NXKPYY142PY4H
|
|
||||||
VITE_DEFAULT_ENDORSER_API_SERVER=https://api.endorser.ch
|
|
||||||
VITE_DEFAULT_IMAGE_API_SERVER=https://image-api.timesafari.app
|
|
||||||
@@ -2,7 +2,6 @@ module.exports = {
|
|||||||
root: true,
|
root: true,
|
||||||
env: {
|
env: {
|
||||||
node: true,
|
node: true,
|
||||||
es2022: true,
|
|
||||||
},
|
},
|
||||||
extends: [
|
extends: [
|
||||||
"plugin:vue/vue3-essential",
|
"plugin:vue/vue3-essential",
|
||||||
@@ -10,9 +9,9 @@ module.exports = {
|
|||||||
"@vue/typescript/recommended",
|
"@vue/typescript/recommended",
|
||||||
"plugin:prettier/recommended",
|
"plugin:prettier/recommended",
|
||||||
],
|
],
|
||||||
// parserOptions: {
|
parserOptions: {
|
||||||
// ecmaVersion: 2020,
|
ecmaVersion: 2020,
|
||||||
// },
|
},
|
||||||
rules: {
|
rules: {
|
||||||
"no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
|
"no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
|
||||||
"no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
|
"no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
|
||||||
|
|||||||
3
.gitignore
vendored
@@ -2,11 +2,8 @@
|
|||||||
node_modules
|
node_modules
|
||||||
/dist
|
/dist
|
||||||
signature.bin
|
signature.bin
|
||||||
# generated during `npm run build`
|
|
||||||
sw_scripts-combined.js
|
|
||||||
*.pem
|
*.pem
|
||||||
verified.txt
|
verified.txt
|
||||||
myenv
|
|
||||||
|
|
||||||
*~
|
*~
|
||||||
# local env files
|
# local env files
|
||||||
|
|||||||
187
CHANGELOG.md
@@ -1,187 +0,0 @@
|
|||||||
# Changelog
|
|
||||||
|
|
||||||
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/),
|
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
||||||
|
|
||||||
## [Unreleased]
|
|
||||||
### Changed in DB or environment
|
|
||||||
- Nothing
|
|
||||||
|
|
||||||
|
|
||||||
## [0.3.6] - 2024.03.24 - 3a07e31d6313ab95711265562d9023c42916e141
|
|
||||||
### Added
|
|
||||||
- Button to mirror photo during video
|
|
||||||
- More detailed onboarding help screen
|
|
||||||
- Public-data blurb
|
|
||||||
### Changed in DB or environment
|
|
||||||
- Nothing
|
|
||||||
|
|
||||||
|
|
||||||
## [0.3.5] - 2024.03.23 - 28754bdfb1e11aa221dd49a5dce4219b69cf6a9d
|
|
||||||
### Added
|
|
||||||
- Photo on gift records
|
|
||||||
### Fixed
|
|
||||||
- Environment variable for BVC meetings project
|
|
||||||
- Environment variables and build enhancements for test vs prod
|
|
||||||
### Changed in DB or environment
|
|
||||||
- New environment variable for image API server
|
|
||||||
- Test that a new browser session will get the right default APIs.
|
|
||||||
- Test that a new browser session will send the right BVC meetings project.
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.17] - 2024.03.01 - 3612ea42240c5e1b7d7eff29a39ff18f1b869b36
|
|
||||||
### Added
|
|
||||||
- Shortcut page for Bountiful Voluntaryist Community
|
|
||||||
### Changed
|
|
||||||
- More readable, targeted summaries in home-page feed items
|
|
||||||
### Changed in DB
|
|
||||||
- Nothing
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.14] - 2024.02.14 - 5f9edea1167dbfb64e16648764eed8c09b24eaeb
|
|
||||||
### Changed
|
|
||||||
- Combine all service worker scripts into a single file.
|
|
||||||
### Changed in DB
|
|
||||||
- Nothing
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.13] - 2024.02.07
|
|
||||||
### Added
|
|
||||||
- Display of user's offers
|
|
||||||
- Check for valid DIDs
|
|
||||||
### Fixed
|
|
||||||
- Name display on give prompt
|
|
||||||
- Non-numbers on number input & autocapitalize on URL input
|
|
||||||
### Changed in DB
|
|
||||||
- Nothing
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.12] - 2024.02.01
|
|
||||||
### Added
|
|
||||||
- Prompts for gratitude
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.11] - 2024.01.28
|
|
||||||
### Added
|
|
||||||
- Actions to share claim data with contacts
|
|
||||||
- Bulk CSV import from Endorser Mobile export
|
|
||||||
- Dates on give summaries
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.10] - 2024.01.18 - 667e1e8890b42de59cd939caca1a01c7a7a702be
|
|
||||||
### Added
|
|
||||||
- Person identicons for contacts
|
|
||||||
- Confirmation & delivery directly from project page
|
|
||||||
- Offer dialog now allows units
|
|
||||||
- Links from claim detail page to the fulfilled project or offer
|
|
||||||
- Link to project from home feed
|
|
||||||
- Copy to clipboard in more places
|
|
||||||
### Fixed
|
|
||||||
- "More Contacts" for give on project page now links correctly.
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.9] - 2024.01.15 - e5e702f8a5a53a6efbed48d35f0bc3cee63024a0
|
|
||||||
### Fixed
|
|
||||||
- Set visibility for new contact.
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.8] - 2024.01.14
|
|
||||||
### Added
|
|
||||||
- Automatic ID creation from home page
|
|
||||||
- Agent who can also edit a project
|
|
||||||
### Fixed
|
|
||||||
- Cannot declare anonymous gift
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.7] - 2024.01.12
|
|
||||||
### Added
|
|
||||||
- Give to fulfill a particular offer
|
|
||||||
- Give as part of a trade as opposed to a donation
|
|
||||||
- Error notifications on import
|
|
||||||
### Changed
|
|
||||||
- Library security updates
|
|
||||||
- Visibility of actions & confirmations on claim page
|
|
||||||
### Fixed
|
|
||||||
- Name of offerer
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.2] - 2024.01.05
|
|
||||||
### Added
|
|
||||||
- Check for notification capability on front screen
|
|
||||||
- Contact next-public-key-hash in manual textual input
|
|
||||||
- Confirmation for contact visibility change
|
|
||||||
- YAML rendering of full claim details
|
|
||||||
- Hints for onboarding on the contact screen
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.0] - 2024.01.04
|
|
||||||
### Added
|
|
||||||
- Contact next-public-key-hash
|
|
||||||
- Icon for Android
|
|
||||||
- More thorough messaging and testing for notifications
|
|
||||||
|
|
||||||
|
|
||||||
## [0.1.9] - 2024.01.01
|
|
||||||
### Added
|
|
||||||
- Import for contacts and settings
|
|
||||||
- Second download button for DuckDuckGo
|
|
||||||
### Changed
|
|
||||||
- Removed some keys from Dexie's IndexedDB declarations
|
|
||||||
|
|
||||||
|
|
||||||
## [0.1.8] - 2023.12.27- d26d1d360152a7d0e559b68486e85b72b88bd9ff
|
|
||||||
### Added
|
|
||||||
- DB logging for service-worker events
|
|
||||||
- Help page for notifications
|
|
||||||
- Test notification & web-push triggers inside app
|
|
||||||
- Check that the app is installed
|
|
||||||
### Fixed
|
|
||||||
- Project issuer display name
|
|
||||||
|
|
||||||
|
|
||||||
## [0.1.7] - 2023.12.19 - 91c6c7c11c71f96006cc876fc946f1f98a274ba2
|
|
||||||
### Changed
|
|
||||||
- Icons
|
|
||||||
### Fixed
|
|
||||||
- Notification switch now shows message
|
|
||||||
- Prod/test server warning message at top of page
|
|
||||||
|
|
||||||
|
|
||||||
## [0.1.6] - 2023.12.17 - b445b1234fbfcf6b37d695373f259aab0eda1118
|
|
||||||
### Added
|
|
||||||
- Infinite scroll on home page
|
|
||||||
### Changed
|
|
||||||
- UI improvements
|
|
||||||
- Show web-push subscription info
|
|
||||||
- Icon
|
|
||||||
|
|
||||||
|
|
||||||
## [0.1.5] - 2023.12.09 - 9c36bb509a9bae9bb3306d3bd9eeb144b67aa8ad
|
|
||||||
### Added
|
|
||||||
- Web push notifications (though not finalized)
|
|
||||||
- Credentials details page
|
|
||||||
- See more data without an ID
|
|
||||||
- Change units of a give
|
|
||||||
|
|
||||||
|
|
||||||
## [0.1.4] - 2023.11.20 - 7311d36726f3667ec4c68f241f91d404273ad4db
|
|
||||||
### Added
|
|
||||||
- Offer on a project
|
|
||||||
### Changed
|
|
||||||
- Automatically set as visible when importing a contact
|
|
||||||
|
|
||||||
|
|
||||||
## [0.1.3] - 2023.11.08 - 910f57ec7d2e50803ae3d04f4b927e0f5219fbde
|
|
||||||
### Added
|
|
||||||
- Contact name editing
|
|
||||||
### Changed
|
|
||||||
- Don't show actions on front page if not registered.
|
|
||||||
### Removed
|
|
||||||
- Home page Notiwind test buttons
|
|
||||||
|
|
||||||
|
|
||||||
## [0.1.2] - 2023.11.01 - 7f6c93802911a030a89fe3706e18b5c17151e5bb
|
|
||||||
### Added
|
|
||||||
- Basics: create ID, record a give, declare a project, search, and get notifications.
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
# Contributing
|
|
||||||
|
|
||||||
Welcome! We are happy to have your help with this project.
|
|
||||||
|
|
||||||
Note that all contributions will be under our
|
|
||||||
[license, modeled after SQLite](https://github.com/trentlarson/endorser-ch/blob/master/LICENSE).
|
|
||||||
279
README.md
@@ -1,29 +1,21 @@
|
|||||||
# TimeSafari.app - Crowd-Funder for Time - PWA
|
# kickstart-for-time-pwa
|
||||||
|
|
||||||
[Time Safari](https://timesafari.org/) allows people to ease into collaboration: start with expressions of gratitude
|
|
||||||
and expand to crowd-fund with time & money, then record and see the impact of contributions.
|
|
||||||
|
|
||||||
## Roadmap
|
|
||||||
|
|
||||||
See [project.task.yaml](project.task.yaml) for current priorities.
|
|
||||||
(Numbers at the beginning of lines are estimated hours. See [taskyaml.org](https://taskyaml.org/) for details.)
|
|
||||||
|
|
||||||
## Setup
|
|
||||||
|
|
||||||
We have pkgx.dev set up in package.json, so you can use `dev` to set up the dev environment.
|
|
||||||
|
|
||||||
|
## Project setup
|
||||||
```
|
```
|
||||||
npm install
|
npm install
|
||||||
```
|
```
|
||||||
|
|
||||||
### Compiles and hot-reloads for development
|
### Compiles and hot-reloads for development
|
||||||
```
|
```
|
||||||
npm run dev
|
npm run serve
|
||||||
```
|
```
|
||||||
|
|
||||||
### Builds the production app
|
### Compiles and minifies for production
|
||||||
|
|
||||||
|
If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
|
||||||
|
|
||||||
```
|
```
|
||||||
npm run serve
|
npm run build
|
||||||
```
|
```
|
||||||
|
|
||||||
### Lints and fixes files
|
### Lints and fixes files
|
||||||
@@ -31,151 +23,190 @@ npm run serve
|
|||||||
npm run lint
|
npm run lint
|
||||||
```
|
```
|
||||||
|
|
||||||
### Compiles and minifies for production
|
### Test key contents
|
||||||
|
|
||||||
* If there are DB changes: before updating the test server, open browser(s) with current version to test DB migrations.
|
See [this page](openssl_signing_console.rst)
|
||||||
|
|
||||||
* `npx prettier --write ./sw_scripts/`
|
|
||||||
|
|
||||||
* Update the project.task.yaml & CHANGELOG.md & the version in package.json, run `npm install`.
|
|
||||||
|
|
||||||
* Record what version is currently on production.
|
|
||||||
|
|
||||||
* Run the correct build
|
|
||||||
|
|
||||||
* Test
|
|
||||||
```
|
|
||||||
# (See .env.development for more details.)
|
|
||||||
# The test BVC_MEETUPS_PROJECT_CLAIM_ID does not resolve as a URL because it's only in the test DB and the prod redirect won't redirect there.
|
|
||||||
VITE_TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app npm run build
|
|
||||||
```
|
|
||||||
|
|
||||||
* Production
|
|
||||||
```
|
|
||||||
# This picks up values from .env.production
|
|
||||||
npm run build
|
|
||||||
```
|
|
||||||
|
|
||||||
* Get on the server and back up 3 DBs and the time-safari folder.
|
|
||||||
|
|
||||||
* `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari`
|
|
||||||
|
|
||||||
* Commit changes. Record the new hash in the changelog. Edit package.json to increment version & add "-beta", `npm install`, and commit. Also record what version is on production.
|
|
||||||
|
|
||||||
* [Tag with the new version.](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Tests
|
|
||||||
|
|
||||||
### Register new user on test server
|
### Register new user on test server
|
||||||
|
|
||||||
|
New users require registration. This can be done with a claim payload like this
|
||||||
|
by an existing user:
|
||||||
|
|
||||||
|
```
|
||||||
|
const vcClaim = {
|
||||||
|
"@context": "https://schema.org",
|
||||||
|
"@type": "RegisterAction",
|
||||||
|
agent: { identifier: identity0.did },
|
||||||
|
object: SERVICE_ID,
|
||||||
|
participant: { identifier: newIdentity.did },
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
On the test server, User #0 has rights to register others, so you can start
|
On the test server, User #0 has rights to register others, so you can start
|
||||||
playing by importing that user and registering others. Import the keys for the test User
|
playing one of two ways:
|
||||||
`did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F` by importing this seed phrase:
|
|
||||||
`rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
|
- Import the keys for the test User `did:ethr:0x000Ee5654b9742f6Fe18ea970e32b97ee2247B51` by importing this seed phrase:
|
||||||
(Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
|
`seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control`
|
||||||
|
(Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
|
||||||
|
|
||||||
|
- Alternatively, register someone else under User #0 automatically:
|
||||||
|
|
||||||
|
* In the `src/views/AccountViewView.vue` file, uncomment the lines referring to "testServerRegisterUser".
|
||||||
|
|
||||||
|
* Visit the `/account` page.
|
||||||
|
|
||||||
### Create multiple identifiers
|
### Create multiple identifiers
|
||||||
|
|
||||||
Under the "Your Identity" screen, click "Advanced", click "Switch Identity / No Identity", then "Add Another Identity...".
|
Go to /start and create or import a new one. Then switch identifiers on the bottom of the Your Identity page.
|
||||||
|
|
||||||
### Create keys with alternate tools
|
### Create keys with alternate tools
|
||||||
|
|
||||||
[This page](openssl_signing_console.rst) is a tool to create a JWT from a locally-generated keypair.
|
See [this page](openssl_signing_console.rst)
|
||||||
|
|
||||||
### Web-push
|
### Customize Vue configuration
|
||||||
|
See [Configuration Reference](https://cli.vuejs.org/config/).
|
||||||
|
|
||||||
For your own web-push tests, change the push server URL in Advanced settings on the account page, and install Time Safari & push server on the same domain.
|
|
||||||
|
|
||||||
### Icons
|
## Scenarios
|
||||||
|
|
||||||
To add an icon, add to main.ts and reference with `fa` element and `icon` attribute with the hyphenated name.
|
- Create a new identity as prompted. Go to "Your Identity" screen and copy the ID to the clipboard.
|
||||||
|
|
||||||
### Manual walk-through test
|
- Go back to /start and import test User `did:ethr:0x000Ee5654b9742f6Fe18ea970e32b97ee2247B51` with this this seed phrase:
|
||||||
|
`seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control`
|
||||||
|
(Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
|
||||||
|
|
||||||
- If there were any DB changes, check that you're on the old version and reload the page and ensure you can still act.
|
- Go to "Your Contacts" screen and add the ID you copied to the clipboard, and hit "+" to add them.
|
||||||
- Use a mobile user as well as a desktop user.
|
|
||||||
- Backup seed & data & get a CSV dump from Endorser Mobile.
|
|
||||||
- Check that the version is updated.
|
|
||||||
- Clear the browser data & add identity & import Time Safari contacts and then CSV contacts.
|
|
||||||
- Make sure that it's using the test API (under Identity in 'Advanced').
|
|
||||||
- Clear the browser data again. (See "Reset" below.)
|
|
||||||
- Go to the account page before visiting the home page to see that there is no ID.
|
|
||||||
- On the home page:
|
|
||||||
- Check that it generated an ID.
|
|
||||||
- Check the feed without names.
|
|
||||||
- Copy the contact URL.
|
|
||||||
- On each page, verify the messaging, and that they cannot take action.
|
|
||||||
- On the discovery page, check that they can see projects, and set a search area to see projects nearby.
|
|
||||||
- On the contacts page, check that they can add User #0 even without their own ID.
|
|
||||||
- As User #0 in another browser on the test API, add a give & a project.
|
|
||||||
- `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
|
|
||||||
- With the new user on the home page, see the feed that shows User #0 in network but without the name.
|
|
||||||
- As the new user on the contacts page, add User #0 as a contact.
|
|
||||||
- On the home page, see the feed that shows User #0 with a name.
|
|
||||||
- Switch back to the generated identifier.
|
|
||||||
- On the account page, check that they see messages on limits.
|
|
||||||
- As User #0, register the ID.
|
|
||||||
- As the new user on the home page, check that they can now record a gift, and record an offer & delivery.
|
|
||||||
- On the contacts page, check that they cannot register someone else yet.
|
|
||||||
- Walk through the functions on each page.
|
|
||||||
- Set and run notifications.
|
|
||||||
- Export & import, both seed and contacts & settings.
|
|
||||||
- Choose location on the search map.
|
|
||||||
- Offer, deliver a give, and confirm. Create a third user and test connections.
|
|
||||||
- Switch to "no identifier" to see that things look OK without any ID.
|
|
||||||
|
|
||||||
### Clear/Reset data & restart
|
- Click on the "Registration Unknown" button and register that person to be able to make claims as them.
|
||||||
|
|
||||||
* Clear cache for site. (In Chrome, go to `chrome://settings/cookies` and "all site data and permissions"; in Firefox, go to `about:preferences` and search for "cache" then "Manage Data", and also manually remove the IndexedDB data if the DBs still show.)
|
### Clear data & restart
|
||||||
* Clear notification permission. (In Chrome, go to `chrome://settings/content/notifications`; in Firefox, go to `about:preferences` and search for "notifications".)
|
|
||||||
* Unregister service worker. (In Chrome, go to `chrome://serviceworker-internals`; in Firefox, go to `about:serviceworkers`.)
|
|
||||||
* Clear Cache Storage manually, possibly deleting the DB. (In Chrome, in dev tools under Application; in Firefox, in dev tools under Storage.)
|
|
||||||
|
|
||||||
(If you find more, add them to the HelpNotificationsView.vue file.)
|
Clear cache for localhost, then go to http://localhost:8080/start
|
||||||
|
(because it'll generate a new one automatically if you start on the `/account` page).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Troubleshooting
|
## Dependencies
|
||||||
|
|
||||||
* A problem with `GET http://localhost:8080/web-push/vapid` means the py-push-server is not running
|
|
||||||
(and notifications won't work for a local app without special routing from the browser's web push service provider, anyway).
|
|
||||||
|
|
||||||
* Red errors everywhere with a console message like this:
|
|
||||||
`Error: An ID is chosen but there are no keys for it so it cannot be used to talk with the service`
|
|
||||||
... has happened on account switching when the current account was erased (or maybe replaced -- once I had a duplicate and I don't know how).
|
|
||||||
|
|
||||||
* The error `DEXIE ENCRYPT ADDON: Could not decrypt message!` or
|
|
||||||
`Encryption key has changed` means that the encryption key is wrong,
|
|
||||||
sometimes seen after clearing storage for testing; you can make it happen by clearing localStorage.
|
|
||||||
Maybe only part of the storage was cleared out. Unless you got a copy of that password, you'll
|
|
||||||
have to erase storage and reload the identifier.
|
|
||||||
|
|
||||||
|
See https://tea.xyz
|
||||||
|
|
||||||
|
| Project | Version |
|
||||||
|
| ---------- | --------- |
|
||||||
|
| nodejs.org | ^16.0.0 |
|
||||||
|
| npmjs.com | ^8.0.0 |
|
||||||
|
|
||||||
## Other
|
## Other
|
||||||
|
|
||||||
### Reference Material
|
### Reference Material
|
||||||
|
|
||||||
* Notifications can be type of `toast` (self-dismiss), `info`, `success`, `warning`, and `danger`.
|
```
|
||||||
They are done via [notiwind](https://www.npmjs.com/package/notiwind) and set up in App.vue.
|
// reference material from https://github.com/trentlarson/endorser-mobile/blob/8dc8e0353e0cc80ffa7ed89ded15c8b0da92726b/src/utility/idUtility.ts#L83
|
||||||
|
|
||||||
* [Customize Vue configuration](https://cli.vuejs.org/config/).
|
// Import an existing ID
|
||||||
|
export const importAndStoreIdentifier = async (mnemonic: string, mnemonicPassword: string, toLowercase: boolean, previousIdentifiers: Array<IIdentifier>) => {
|
||||||
|
|
||||||
* If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
|
// just to get rid of variability that might cause an error
|
||||||
|
mnemonic = mnemonic.trim().toLowerCase()
|
||||||
|
|
||||||
|
/**
|
||||||
|
// an approach I pieced together
|
||||||
|
// requires: yarn add elliptic
|
||||||
|
// ... plus:
|
||||||
|
// const EC = require('elliptic').ec
|
||||||
|
// const secp256k1 = new EC('secp256k1')
|
||||||
|
//
|
||||||
|
const keyHex: string = bip39.mnemonicToEntropy(mnemonic)
|
||||||
|
// returns a KeyPair from the elliptic.ec library
|
||||||
|
const keyPair = secp256k1.keyFromPrivate(keyHex, 'hex')
|
||||||
|
// this code is from did-provider-eth createIdentifier
|
||||||
|
const privateHex = keyPair.getPrivate('hex')
|
||||||
|
const publicHex = keyPair.getPublic('hex')
|
||||||
|
const address = didJwt.toEthereumAddress(publicHex)
|
||||||
|
**/
|
||||||
|
|
||||||
### Kudos
|
/**
|
||||||
|
// from https://github.com/uport-project/veramo/discussions/346#discussioncomment-302234
|
||||||
|
// ... which almost works but the didJwt.toEthereumAddress is wrong
|
||||||
|
// requires: yarn add bip32
|
||||||
|
// ... plus: import * as bip32 from 'bip32'
|
||||||
|
//
|
||||||
|
const seed: Buffer = await bip39.mnemonicToSeed(mnemonic)
|
||||||
|
const root = bip32.fromSeed(seed)
|
||||||
|
const node = root.derivePath(UPORT_ROOT_DERIVATION_PATH)
|
||||||
|
const privateHex = node.privateKey.toString("hex")
|
||||||
|
const publicHex = node.publicKey.toString("hex")
|
||||||
|
const address = didJwt.toEthereumAddress('0x' + publicHex)
|
||||||
|
**/
|
||||||
|
|
||||||
|
/**
|
||||||
|
// from https://github.com/uport-project/veramo/discussions/346#discussioncomment-302234
|
||||||
|
// requires: yarn add @ethersproject/hdnode
|
||||||
|
// ... plus: import { HDNode } from '@ethersproject/hdnode'
|
||||||
|
**/
|
||||||
|
const hdnode: HDNode = HDNode.fromMnemonic(mnemonic)
|
||||||
|
const rootNode: HDNode = hdnode.derivePath(UPORT_ROOT_DERIVATION_PATH)
|
||||||
|
const privateHex = rootNode.privateKey.substring(2) // original starts with '0x'
|
||||||
|
const publicHex = rootNode.publicKey.substring(2) // original starts with '0x'
|
||||||
|
let address = rootNode.address
|
||||||
|
|
||||||
|
const prevIds = previousIdentifiers || [];
|
||||||
|
|
||||||
|
if (toLowercase) {
|
||||||
|
const foundEqual = R.find(
|
||||||
|
(id) => utility.rawAddressOfDid(id.did) === address,
|
||||||
|
prevIds
|
||||||
|
)
|
||||||
|
if (foundEqual) {
|
||||||
|
// They're trying to create a lowercase version of one that exists in normal case.
|
||||||
|
// (We really should notify the user.)
|
||||||
|
appStore.dispatch(appSlice.actions.addLog({log: true, msg: "Will create a normal-case version of the DID since a regular version exists."}))
|
||||||
|
} else {
|
||||||
|
address = address.toLowerCase()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// They're not trying to convert to lowercase.
|
||||||
|
const foundLower = R.find((id) =>
|
||||||
|
utility.rawAddressOfDid(id.did) === address.toLowerCase(),
|
||||||
|
prevIds
|
||||||
|
)
|
||||||
|
if (foundLower) {
|
||||||
|
// They're trying to create a normal case version of one that exists in lowercase.
|
||||||
|
// (We really should notify the user.)
|
||||||
|
appStore.dispatch(appSlice.actions.addLog({log: true, msg: "Will create a lowercase version of the DID since a lowercase version exists."}))
|
||||||
|
address = address.toLowerCase()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... derived keys and address..."}))
|
||||||
|
|
||||||
|
const newId = newIdentifier(address, publicHex, privateHex, UPORT_ROOT_DERIVATION_PATH)
|
||||||
|
appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... created new ID..."}))
|
||||||
|
|
||||||
|
// awaiting because otherwise the UI may not see that a mnemonic was created
|
||||||
|
const savedId = await storeIdentifier(newId, mnemonic, mnemonicPassword)
|
||||||
|
appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... stored new ID..."}))
|
||||||
|
return savedId
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a totally new ID
|
||||||
|
export const createAndStoreIdentifier = async (mnemonicPassword) => {
|
||||||
|
|
||||||
|
// This doesn't give us the entropy/seed.
|
||||||
|
//const id = await agent.didManagerCreate()
|
||||||
|
|
||||||
|
const entropy = crypto.randomBytes(32)
|
||||||
|
const mnemonic = bip39.entropyToMnemonic(entropy)
|
||||||
|
appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... generated mnemonic..."}))
|
||||||
|
|
||||||
|
return importAndStoreIdentifier(mnemonic, mnemonicPassword, false, [])
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Kudos
|
||||||
|
|
||||||
Gifts make the world go 'round!
|
Gifts make the world go 'round!
|
||||||
|
|
||||||
* [WebStorm by JetBrains](https://www.jetbrains.com/webstorm/) for the free open-source license
|
|
||||||
* [Máximo Fernández](https://medium.com/@maxfarenas) for the 3D [code](https://github.com/maxfer03/vue-three-ns) and [explanatory post](https://medium.com/nicasource/building-an-interactive-web-portfolio-with-vue-three-js-part-three-implementing-three-js-452cb375ef80)
|
* [Máximo Fernández](https://medium.com/@maxfarenas) for the 3D [code](https://github.com/maxfer03/vue-three-ns) and [explanatory post](https://medium.com/nicasource/building-an-interactive-web-portfolio-with-vue-three-js-part-three-implementing-three-js-452cb375ef80)
|
||||||
* [Many tools & libraries](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/src/branch/master/package.json#L10) such as Nodejs.org, IntelliJ Idea, Veramo.io, Vuejs.org, threejs.org
|
* [Many tools & libraries]() such as Nodejs.org, IntelliJ Idea, Veramo.io, Vuejs.org, threejs.org
|
||||||
* [Bush 3D model](https://sketchfab.com/3d-models/lupine-plant-bf30f1110c174d4baedda0ed63778439)
|
* [Bush 3D model](https://sketchfab.com/3d-models/lupine-plant-bf30f1110c174d4baedda0ed63778439)
|
||||||
* [Forest floor image](https://www.goodfreephotos.com/albums/textures/leafy-autumn-forest-floor.jpg)
|
* [Forest floor image](https://www.goodfreephotos.com/albums/textures/leafy-autumn-forest-floor.jpg)
|
||||||
* Time Safari logo assisted by [DALL-E in ChatGPT](https://chat.openai.com/g/g-2fkFE8rbu-dall-e)
|
|
||||||
* [DiceBear](https://www.dicebear.com/licenses/) and [Avataaars](https://www.dicebear.com/styles/avataaars/#details) for human-looking identicons
|
|
||||||
* Some gratitude prompts thanks to [Develop Good Habits](https://www.developgoodhabits.com/gratitude-journal-prompts/)
|
|
||||||
|
|||||||
3
babel.config.js
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
module.exports = {
|
||||||
|
presets: ["@vue/cli-plugin-babel/preset"],
|
||||||
|
};
|
||||||
17
index.html
@@ -1,17 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
|
||||||
<link rel="icon" href="/favicon.ico">
|
|
||||||
<title>TimeSafari</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<noscript>
|
|
||||||
<strong>We're sorry but TimeSafari doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
|
|
||||||
</noscript>
|
|
||||||
<div id="app"></div>
|
|
||||||
<script type="module" src="/src/main.ts"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,11 +1,8 @@
|
|||||||
JWT Creation & Verification
|
Prerequisites:
|
||||||
|
|
||||||
To run this in a script, see ./openssl_signing_console.sh
|
jq
|
||||||
|
|
||||||
Prerequisites: openssl, jq
|
You can create a JWT using a library or by encoding the header and payload base64Url and signing it with a secret using a ES256K algorithm. Here is an example of how you can create a JWT using the jq and openssl command line utilities:
|
||||||
|
|
||||||
You can create a JWT using a library or by encoding the header and payload base64Url and signing it with a secret using
|
|
||||||
a ES256K algorithm. Here is an example of how you can create a JWT using the jq and openssl command line utilities:
|
|
||||||
|
|
||||||
Here is an example of how you can use openssl to sign a JWT with the ES256K algorithm:
|
Here is an example of how you can use openssl to sign a JWT with the ES256K algorithm:
|
||||||
|
|
||||||
@@ -18,22 +15,20 @@ openssl ec -in private.pem -pubout -out public.pem
|
|||||||
|
|
||||||
header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'
|
header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'
|
||||||
|
|
||||||
Next, create a payload object as a JSON object containing the claims you want to include in the JWT.
|
Next, create a payload object as a JSON object containing the claims you want to include in the JWT. For example schema.org :
|
||||||
For example schema.org :
|
|
||||||
|
|
||||||
payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'
|
payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'
|
||||||
|
|
||||||
Encode the header and payload objects as base64Url strings. You can use the jq command line utility to do this:
|
Encode the header and payload objects as base64Url strings. You can use the jq command line utility to do this:
|
||||||
|
|
||||||
header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
|
header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n')
|
||||||
payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
|
payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n')
|
||||||
|
|
||||||
Concatenate the encoded header, payload, and a secret to create the signing input:
|
Concatenate the encoded header, payload, and a secret to create the signing input:
|
||||||
|
|
||||||
signing_input="$header_b64.$payload_b64"
|
signing_input="$header_b64.$payload_b64"
|
||||||
|
|
||||||
Create the signature by signing the signing input with a ES256K algorithm and your secret.
|
Create the signature by signing the signing input with a ES256K algorithm and your secret. You can use the openssl command line utility to do this:
|
||||||
You can use the openssl command line utility to do this:
|
|
||||||
|
|
||||||
signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem)
|
signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem)
|
||||||
|
|
||||||
@@ -48,7 +43,7 @@ Authorization: Bearer $jwt
|
|||||||
|
|
||||||
To verify the JWT, you can use the openssl utility with the public key:
|
To verify the JWT, you can use the openssl utility with the public key:
|
||||||
|
|
||||||
echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature")
|
openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature") "$signing_input"
|
||||||
|
|
||||||
|
This will verify the signature and output Verified OK if the signature is valid. If the signature is not valid, it will output an error.
|
||||||
|
|
||||||
This will verify the signature and output "Verified OK" if the signature is valid.
|
|
||||||
If the signature is not valid, it will give an error response and output "Verification failure".
|
|
||||||
|
|||||||
@@ -1,39 +1,25 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Generate a JWT, with signature verified using OpenSSL
|
|
||||||
#
|
|
||||||
# Prerequisites: openssl, jq
|
|
||||||
#
|
|
||||||
# Usage: source ./openssl_signing_console.sh
|
|
||||||
#
|
|
||||||
# For a more complete explanation, see ./openssl_signing_console.rst
|
|
||||||
|
|
||||||
|
|
||||||
# Generate a key and extract the public part
|
|
||||||
openssl ecparam -name secp256k1 -genkey -noout -out private.pem
|
openssl ecparam -name secp256k1 -genkey -noout -out private.pem
|
||||||
openssl ec -in private.pem -pubout -out public.pem
|
openssl ec -in private.pem -pubout -out public.pem
|
||||||
|
|
||||||
# Use test data
|
|
||||||
header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'
|
header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'
|
||||||
|
|
||||||
payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'
|
payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'
|
||||||
|
|
||||||
header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
|
header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n')
|
||||||
payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
|
payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n')
|
||||||
|
|
||||||
signing_input="$header_b64.$payload_b64"
|
signing_input="$header_b64.$payload_b64"
|
||||||
|
|
||||||
signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem | openssl base64 -e)
|
echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem -out signature.bin
|
||||||
|
|
||||||
echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature" | openssl base64 -d)
|
# Read binary signature from file and encode it to Base64 URL-Safe format
|
||||||
|
signature_b64=$(base64 -w 0 < signature.bin | tr -d '=' | tr '+' '-' | tr '/' '_')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Read binary signature and encode it to Base64 URL-Safe format
|
|
||||||
signature_b64=$(echo -n "$signature" | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
|
|
||||||
|
|
||||||
# Construct the JWT
|
# Construct the JWT
|
||||||
jwt="$signing_input.$signature_b64"
|
jwt="$signing_input.$signature_b64"
|
||||||
|
|
||||||
echo Resulting JWT: $jwt
|
openssl dgst -sha256 -verify public.pem -signature signature.bin -out verified.txt <(echo -n "$signing_input")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
19886
package-lock.json
generated
118
package.json
@@ -1,91 +1,83 @@
|
|||||||
{
|
{
|
||||||
"name": "TimeSafari",
|
"name": "kickstart-for-time-pwa",
|
||||||
"version": "0.3.7-beta",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"serve": "vue-cli-service serve",
|
||||||
"serve": "vite preview",
|
"build": "vue-cli-service build",
|
||||||
"build": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && vite build",
|
"lint": "vue-cli-service lint"
|
||||||
"lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
|
|
||||||
"lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@dicebear/collection": "^5.4.1",
|
|
||||||
"@dicebear/core": "^5.4.1",
|
|
||||||
"@ethersproject/hdnode": "^5.7.0",
|
"@ethersproject/hdnode": "^5.7.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
"@fortawesome/fontawesome-svg-core": "^6.4.2",
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
"@fortawesome/free-solid-svg-icons": "^6.4.2",
|
||||||
"@fortawesome/vue-fontawesome": "^3.0.6",
|
"@fortawesome/vue-fontawesome": "^3.0.3",
|
||||||
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
||||||
"@tweenjs/tween.js": "^21.1.1",
|
"@tweenjs/tween.js": "^21.0.0",
|
||||||
"@types/js-yaml": "^4.0.9",
|
"@veramo/core": "^5.4.1",
|
||||||
"@types/luxon": "^3.4.2",
|
"@veramo/credential-w3c": "^5.4.1",
|
||||||
"@veramo/core": "^5.6.0",
|
"@veramo/data-store": "^5.4.1",
|
||||||
"@veramo/credential-w3c": "^5.6.0",
|
"@veramo/did-manager": "^5.4.1",
|
||||||
"@veramo/data-store": "^5.6.0",
|
"@veramo/did-provider-ethr": "^5.4.1",
|
||||||
"@veramo/did-manager": "^5.6.0",
|
"@veramo/did-resolver": "^5.4.1",
|
||||||
"@veramo/did-provider-ethr": "^5.6.0",
|
"@veramo/key-manager": "^5.4.1",
|
||||||
"@veramo/did-resolver": "^5.6.0",
|
"@vueuse/core": "^10.4.1",
|
||||||
"@veramo/key-manager": "^5.6.0",
|
|
||||||
"@vueuse/core": "^10.9.0",
|
|
||||||
"@zxing/text-encoding": "^0.9.0",
|
"@zxing/text-encoding": "^0.9.0",
|
||||||
"axios": "^1.6.8",
|
"axios": "^1.5.0",
|
||||||
|
"buffer": "^6.0.3",
|
||||||
"class-transformer": "^0.5.1",
|
"class-transformer": "^0.5.1",
|
||||||
"dexie": "^3.2.7",
|
"core-js": "^3.32.1",
|
||||||
"dexie-export-import": "^4.1.1",
|
"dexie": "^3.2.4",
|
||||||
"did-jwt": "^7.4.7",
|
"dexie-export-import": "^4.0.7",
|
||||||
"ethereum-cryptography": "^2.1.3",
|
"did-jwt": "^7.2.6",
|
||||||
|
"ethereum-cryptography": "^2.1.2",
|
||||||
"ethereumjs-util": "^7.1.5",
|
"ethereumjs-util": "^7.1.5",
|
||||||
"ethr-did-resolver": "^8.1.2",
|
"ethr-did-resolver": "^8.1.2",
|
||||||
"git-describe": "^4.1.1",
|
|
||||||
"jdenticon": "^3.2.0",
|
"jdenticon": "^3.2.0",
|
||||||
"js-generate-password": "^0.1.9",
|
"js-generate-password": "^0.1.9",
|
||||||
"js-yaml": "^4.1.0",
|
"localstorage-slim": "^2.4.0",
|
||||||
"localstorage-slim": "^2.7.0",
|
"luxon": "^3.4.2",
|
||||||
"lru-cache": "^10.2.0",
|
"merkletreejs": "^0.3.10",
|
||||||
"luxon": "^3.4.4",
|
"moment": "^2.29.4",
|
||||||
"merkletreejs": "^0.3.11",
|
|
||||||
"moment": "^2.30.1",
|
|
||||||
"notiwind": "^2.0.2",
|
"notiwind": "^2.0.2",
|
||||||
"papaparse": "^5.4.1",
|
"papaparse": "^5.4.1",
|
||||||
"pina": "^0.20.2204228",
|
"pina": "^0.20.2204228",
|
||||||
"pinia-plugin-persistedstate": "^3.2.1",
|
"pinia-plugin-persistedstate": "^3.2.0",
|
||||||
"qr-code-generator-vue3": "^1.4.21",
|
"qr-code-generator-vue3": "^1.4.21",
|
||||||
"ramda": "^0.29.1",
|
"ramda": "^0.29.0",
|
||||||
"readable-stream": "^4.5.2",
|
"readable-stream": "^4.4.2",
|
||||||
"reflect-metadata": "^0.1.14",
|
"reflect-metadata": "^0.1.13",
|
||||||
"register-service-worker": "^1.7.2",
|
"register-service-worker": "^1.7.2",
|
||||||
"simple-vue-camera": "^1.1.3",
|
"three": "^0.155.0",
|
||||||
"three": "^0.156.1",
|
"vue": "^3.3.4",
|
||||||
"ua-parser-js": "^1.0.37",
|
|
||||||
"util": "^0.12.5",
|
|
||||||
"vue": "^3.4.21",
|
|
||||||
"vue-axios": "^3.5.2",
|
"vue-axios": "^3.5.2",
|
||||||
"vue-facing-decorator": "^3.0.4",
|
"vue-facing-decorator": "^3.0.2",
|
||||||
"vue-qrcode-reader": "^5.5.3",
|
"vue-router": "^4.2.4",
|
||||||
"vue-router": "^4.3.0",
|
|
||||||
"web-did-resolver": "^2.0.27"
|
"web-did-resolver": "^2.0.27"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/leaflet": "^1.9.8",
|
"@types/ramda": "^0.29.3",
|
||||||
"@types/ramda": "^0.29.11",
|
|
||||||
"@types/three": "^0.155.1",
|
"@types/three": "^0.155.1",
|
||||||
"@types/ua-parser-js": "^0.7.39",
|
"@typescript-eslint/eslint-plugin": "^6.5.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
"@typescript-eslint/parser": "^6.5.0",
|
||||||
"@typescript-eslint/parser": "^6.21.0",
|
|
||||||
"@vitejs/plugin-vue": "^5.0.4",
|
|
||||||
"@vue-leaflet/vue-leaflet": "^0.10.1",
|
"@vue-leaflet/vue-leaflet": "^0.10.1",
|
||||||
|
"@vue/cli-plugin-babel": "~5.0.8",
|
||||||
|
"@vue/cli-plugin-eslint": "~5.0.8",
|
||||||
|
"@vue/cli-plugin-pwa": "~5.0.8",
|
||||||
|
"@vue/cli-plugin-router": "~5.0.8",
|
||||||
|
"@vue/cli-plugin-typescript": "~5.0.8",
|
||||||
|
"@vue/cli-plugin-vuex": "~5.0.8",
|
||||||
|
"@vue/cli-service": "~5.0.8",
|
||||||
"@vue/eslint-config-typescript": "^11.0.3",
|
"@vue/eslint-config-typescript": "^11.0.3",
|
||||||
"autoprefixer": "^10.4.19",
|
"autoprefixer": "^10.4.15",
|
||||||
"eslint": "^8.57.0",
|
"eslint": "^8.48.0",
|
||||||
"eslint-config-prettier": "^9.1.0",
|
"eslint-config-prettier": "^9.0.0",
|
||||||
"eslint-plugin-prettier": "^5.1.3",
|
"eslint-plugin-prettier": "^5.0.0",
|
||||||
"eslint-plugin-vue": "^9.23.0",
|
"eslint-plugin-vue": "^9.17.0",
|
||||||
"leaflet": "^1.9.4",
|
"leaflet": "^1.9.4",
|
||||||
"postcss": "^8.4.38",
|
"postcss": "^8.4.29",
|
||||||
"prettier": "^3.2.5",
|
"prettier": "^3.0.3",
|
||||||
"tailwindcss": "^3.4.1",
|
"tailwindcss": "^3.3.3",
|
||||||
"typescript": "~5.2.2",
|
"typescript": "~5.2.2"
|
||||||
"vite": "^5.2.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,117 +1,51 @@
|
|||||||
|
|
||||||
tasks :
|
tasks:
|
||||||
|
- test alerts on all pages -- or refactor to new "notify" (since AlertMessage refactoring may require a change, et. ContactQRScanShowView)
|
||||||
|
- .2 bug - on contacts view, click on "to" & "from" and nothing happens
|
||||||
|
- 40 notifications :
|
||||||
|
- push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
|
||||||
|
|
||||||
- fix the notification link to the app
|
- 01 add my bounding box(es) of interest for searches on Nearby part of Discovery page
|
||||||
- 01 change scanning flow - allow them to stay on the QR/scanning screen after scanning someone
|
- .5 search by a bounding box(s) of interest for local projects (see API by clicking on "Nearby")
|
||||||
|
- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:matthew
|
||||||
|
|
||||||
- 24 contextual tutorials https://docs.google.com/document/d/11C_K3RM0rgo0onih20KFhcIzukZyq_CRWqaWX5om_kM/edit#heading=h.iwiwcydou5hw
|
- 08 Scan QR code to import into contacts assignee:matthew
|
||||||
|
- SEE: https://github.com/gruhn/vue-qrcode-reader
|
||||||
|
|
||||||
- 24 Move to Vite assignee:jason
|
- 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished assignee:matthew assignee-group:ui
|
||||||
|
|
||||||
- feeds - add "remote" filter, if they choose 'visible' then warn that they won't see any others, cache list & don't reload front page on change
|
- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s) assignee-group:ui
|
||||||
|
- SEE: https://github.com/emmanuelsw/notiwind assignee:jose assignee-group:ui
|
||||||
|
|
||||||
- .1 add shortcut from project (etc?) to the public project page in a browser
|
- Home Feed & Quick Give screen :
|
||||||
- .1 add KindSpring link to ideas
|
- 01 save the feed-viewed status in settings storage ("afterQuery")
|
||||||
- .1 on feed, don't show "to someone anonymous" if it's to a project
|
- 01 quick action - send action, maybe choose via canvas tool
|
||||||
- 16 save data backups in Google
|
- SEE: https://github.com/konvajs/vue-konva
|
||||||
- 16 generate and use passkeys for identities
|
|
||||||
- .5 show "give" buttons (eg. from anonymous) even if they can't give, greyed out, and give them a warning and instructions
|
|
||||||
- .2 when adding a claim on home screen, push that claim to the top of the list
|
|
||||||
|
|
||||||
- .2 fix give dialog from "more contacts" off home page to allow giving to this user
|
- 24 Move to Vite assignee:matthew
|
||||||
- .5 stop from seeing an error on the first page when browser doesn't support service workers (which I've seen on iPhone; visible in Firefox private window)
|
|
||||||
- .2 don't show a warning on a totally new project when the authorized agent is set
|
|
||||||
- .2 anchor hash into BTC
|
|
||||||
- .2 list the "show more" contacts alphabetically
|
|
||||||
- .5 add back the explicit wait for browser subscription timing problems?
|
|
||||||
|
|
||||||
- .5 make Time Safari a share_target for images
|
- .5 include the hash of the latest commit, and maybe a version
|
||||||
|
- .5 add link to further project / people when a project pays ahead
|
||||||
- 08 add image on profile
|
- .5 add project ID to the URL, to make a project publicly-accessible
|
||||||
|
- .5 remove edit from project page for projects owned by others
|
||||||
- 01 ask to detect location & record it in settings
|
- .5 fix where user 0 sees no txns from user 1 on contacts page but sees them on list page
|
||||||
- 01 if personal location is set, show potential local affiliations
|
- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist assignee-group:ui
|
||||||
- 02 refactor the buttons for chosing a search location so that the actions are clear assignee-group:ui
|
- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?) assignee:jose assignee-group:ui
|
||||||
|
- .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
|
||||||
- 24 compelling UI for credential presentations
|
- .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
|
||||||
- discover who in my network has activity on a project
|
|
||||||
|
|
||||||
- 24 compelling UI for statistics (eg. World?)
|
|
||||||
|
|
||||||
- 01 in the feed, group by project or contact or topic or time/$ (via BC); new projects, offers, search area, etc assignee-group:ui
|
|
||||||
- 01 separate not-on-platform vs totally anonymous; terminology "unidentified"?
|
|
||||||
- .2 add links between projects assignee-group:ui
|
|
||||||
- 24 make the contact browsing on the front page something that invites more action
|
|
||||||
|
|
||||||
- .5 change server plan & project endpoints to use jwtId as identifier rather than rowid
|
|
||||||
- 16 edit offers & gives, or revoke allowing re-creation
|
|
||||||
- .1 When available in the server, give message for 'nonAmountGiven' on offers on ProjectsView page.
|
|
||||||
- .1 Add help instructions for "Encryption key has changed" error. (It is a problem if localStorage is cleared, but the contacts & settings remain and they have to restore their seeds.)
|
|
||||||
- .1 show better error when user with no ID goes to the "My Project" page
|
|
||||||
- 01 in front page prompt for ideas for gratitude :
|
|
||||||
- randomize (not show in order)
|
|
||||||
- checkboxes - show non-person-oriented messages, show only contacts, show only projects
|
|
||||||
|
|
||||||
- .5 add a notice on the front page if their notifications are off
|
|
||||||
- 08 allow user to add a time when they want their daily notification
|
|
||||||
|
|
||||||
- .5 prompt for the name directly when they visit the QR scan page
|
|
||||||
- 01 mark a project as inactive
|
|
||||||
- 01 add share button for sending a message to confirmers when we can't see the claim (like the "visible" links)
|
|
||||||
- .5 add TimeSafari as a shareable app https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
|
|
||||||
- .5 choose a project's alternative agent ("authorized representative") via a contact chooser (not just copy-paste a DID)
|
|
||||||
- .5 find out why clicking quickly back-and-forth onto the "my project" page often shows error "You need an identifier to load your projects." (easier to reproduce on desktop?)
|
|
||||||
- .5 bug - it didn't show the "fulfills offer" on the claim detail page for a give that had one - https://test.timesafari.app/claim/01HMFWRPA3PD6Q9EYFKX3MC41J
|
|
||||||
- 01 replace all "confirm" prompts with nicer modal
|
|
||||||
- .1 hide project-create button on project page if not registered
|
|
||||||
- .1 hide offer & give buttons on project list page if not registered
|
|
||||||
- .1 add cursor-pointer on the icons for giving on the project page, and on the list of projects on the discover page
|
|
||||||
- .2 record when InfiniteScroll hits the end of the list and don't trigger any more loads (feed, project list, give & offer lists)
|
|
||||||
|
|
||||||
- bug (that is hard to reproduce) - got blank screen and errors on iPhone with no bottom tabs
|
|
||||||
- bug - turning notifications on from the help screen did not stay, though account screen toggle did stay (From Jason on iPhone.)
|
|
||||||
- refactor - supply the projectId to the OfferDialog just like we do with the GiftedDialog offerId (in the "open" method, maybe as well as an attribute)
|
|
||||||
- the confirm button on each give on the ProjectViewView page doesn't have all the context of the ClaimView page, so it can show sometimes inappropriately; consider consolidation
|
|
||||||
- make the "give" on contact screen work like other give (allowing donation vs current blank)
|
|
||||||
- .2 on ClaimView, the "ask someone" should refer to "visible" IDs, or to confirmations only if confirmations are visible
|
|
||||||
- message "send them to this page" on ClaimView should be a link (for installed app)
|
|
||||||
- When we update a version, desktop browser users have seen nothing happen after clicking on the contact page QR and on the account page "Help"; errors show in the console. Reload fixed it. If this happens on mobile, ask the user to reload.
|
|
||||||
|
|
||||||
- 01 show my VCs - most interesting, or via search
|
|
||||||
- 04 allow user to download & prove chains of VCs, mine + ones I can see about me from others
|
|
||||||
|
|
||||||
- revenue to support server operation
|
|
||||||
|
|
||||||
- .1 copy button for seed
|
|
||||||
- .5 If notifications are not enabled, add message to front page with link/button to enable
|
|
||||||
- make server endpoint for full English description of limits
|
|
||||||
- create a help-desk document & add screenshots
|
|
||||||
|
|
||||||
- .1 update "offer" units to have same functionality as "give" units
|
|
||||||
- .5 add a link to any 'give' records that fulfill an offer on ClaimView
|
|
||||||
- 01 on home page, prompt for install check in addition to "supports notifications" check (since they won't get notified if Chrome is closed)
|
|
||||||
- 01 on Mac (& Windows?) desktop, add a help blurb so that they can find it again (since it doesn't show in Application list)
|
|
||||||
- bug (that is hard to reproduce) - got error adding on Firefox user #0 as contact for themselves
|
|
||||||
- bug (that is hard to reproduce) - in Chrome, install app then delete app and try from Chrome browser and see log errors "Uncaught TypeError: self.appendDailyLog is not a function"
|
|
||||||
- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent
|
|
||||||
- 04 remove 'rowid' references (that are sqlite-specific); may involve server
|
|
||||||
- 04 look at other examples for better onboarding UI, eg friend.tech
|
|
||||||
- .5 Add inactive flag / end date, start date to project
|
|
||||||
- .3 check that Android shows "back" buttons on screens without bottom tray
|
|
||||||
- .1 Make give description text box into something that expands as they type?
|
|
||||||
- .2 Show a warning if both giver and recipient are the same (but still allow?)
|
|
||||||
- .5 Shrink the buttons on project pages so they don't expand to the width of the screen assignee-group:ui
|
|
||||||
- .5 Display a more appealing confirmation on the map when erasing the marker
|
|
||||||
- .5 remove references to localStorage for projectId (now that it's pulling from the path)
|
|
||||||
- switch some checks for activeDid to check for isRegistered
|
|
||||||
- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
|
- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
|
||||||
- .5 fix cert generation on server (since it didn't happen automatically for Nov 30)
|
|
||||||
- warn if they're using the web (android only?)
|
- Discuss whether the remaining tasks are worthwhile before MVP release.
|
||||||
https://developer.mozilla.org/en-US/docs/Web/API/Navigator/getInstalledRelatedApps
|
|
||||||
https://web.dev/articles/get-installed-related-apps
|
- 04 allow user to download claims, mine + ones I can see about me from others
|
||||||
- .5 fix the "onboarding help" list of instructions so that it always formats right (currently doesn't show numbers aligned on Google Pixel 6a, iPhone 11 Pro, iPhone 12 mini)
|
- .5 change the derivation path, and regenerate test IDs
|
||||||
- .5 make the "onboarding help" it so that it doesn't cover the QR icon on the contacts page
|
- 02 allow user to create new DIDs from the same seed phrase (ie. increment derivation path)
|
||||||
- .5 fix masked icon (because some of the top-right of the binoculars is cut off)
|
- .5 on ProjectView page, show immediate feedback when a gift is given (on list?) -- and consider the same for Home & Contacts pages assignee-group:ui
|
||||||
|
- .5 customize favicon assignee-group:ui
|
||||||
|
- .5 Do we want to combine first name & last name?
|
||||||
|
- .2 Show a warning if both giver and recipient are the same (but still allow?) assignee-group:ui
|
||||||
|
- 01 Would it look better to shrink the buttons on many pages so they don't expand to the width of the screen? assignee-group:ui
|
||||||
|
- .5 Display a more appealing confirmation on the map when erasing the marker assignee-group:ui
|
||||||
|
|
||||||
- contacts v+ :
|
- contacts v+ :
|
||||||
- 01 Import all the non-sensitive data (ie. contacts & settings).
|
- 01 Import all the non-sensitive data (ie. contacts & settings).
|
||||||
@@ -120,27 +54,20 @@ tasks :
|
|||||||
|
|
||||||
- stats v1 :
|
- stats v1 :
|
||||||
- 01 show numeric stats
|
- 01 show numeric stats
|
||||||
- 04 show different graphic for projects vs people (gnome?) on world
|
|
||||||
- 01 link to world for specific stats
|
- 01 link to world for specific stats
|
||||||
- .5 don't load another instance of a bush if it already exists
|
- .5 don't load another instance of a bush if it already exists
|
||||||
- maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
|
- maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
|
||||||
- 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)
|
- 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)
|
||||||
|
|
||||||
- .5 show seed phrase in a QR code for transfer to another device
|
- Release Minimum Viable Product :
|
||||||
- .5 on DiscoverView, switch to a filter UI (eg. just from friend)
|
- 08 thorough testing for errors & edge cases
|
||||||
- .5 don't show "Offer" on project screen if they aren't registered
|
- Turn off stats-world or ensure it's usable (eg. cannot zoom out too far and lose world, cannot screenshot).
|
||||||
- 01 especially for iOS, check for new version & update, eg. https://stackoverflow.com/questions/52221805/any-way-yet-to-auto-update-or-just-clear-the-cache-on-a-pwa-on-ios
|
- Add disclaimers.
|
||||||
|
- Switch default server to the public server.
|
||||||
- 24 allow a person record with interests, including location; purpose? contact methods? enhance other connections the same? (suggestion from Philippines) assignee-group:ui
|
- Deploy to a server.
|
||||||
- 24 brief introduction slides https://docs.google.com/document/d/11C_K3RM0rgo0onih20KFhcIzukZyq_CRWqaWX5om_kM/edit#heading=h.iwiwcydou5hw
|
- Ensure public server has limits that work for group adoption.
|
||||||
- 12 feedback https://docs.google.com/document/d/11C_K3RM0rgo0onih20KFhcIzukZyq_CRWqaWX5om_kM/edit#heading=h.iwiwcydou5hw
|
- Test PWA features on Android and iOS.
|
||||||
|
blocks: ref:https://raw.githubusercontent.com/trentlarson/lives-of-gifts/master/project.yaml#kickstarter%20for%20time
|
||||||
- 32 accept images for projects
|
|
||||||
- 32 accept images for contacts
|
|
||||||
- import project interactions from GitHub/GitLab and manage signing
|
|
||||||
|
|
||||||
- show total time offered to & fulfilled to a project
|
|
||||||
- show total time offered by & fulfilled by a contact
|
|
||||||
|
|
||||||
- linking between projects or plans :
|
- linking between projects or plans :
|
||||||
- show total time given to & from a project
|
- show total time given to & from a project
|
||||||
@@ -148,8 +75,6 @@ tasks :
|
|||||||
- for subtasks: fulfills (is it really the same?), feeds, contributes to, supplies, boosts, advances
|
- for subtasks: fulfills (is it really the same?), feeds, contributes to, supplies, boosts, advances
|
||||||
- for blocking: blocks, precedes, comes before, is sought by -- vs follows, seeks, builds on ("contributes to" isn't specific enough, "succeeds" has different, possibly confusing meaning)
|
- for blocking: blocks, precedes, comes before, is sought by -- vs follows, seeks, builds on ("contributes to" isn't specific enough, "succeeds" has different, possibly confusing meaning)
|
||||||
|
|
||||||
- .5 Replace Gifted/Give in ContactsView with GiftedDialog
|
|
||||||
|
|
||||||
- Stats :
|
- Stats :
|
||||||
- 01 point out user's location on the world
|
- 01 point out user's location on the world
|
||||||
- 01 present a credential selected from the stats
|
- 01 present a credential selected from the stats
|
||||||
@@ -158,26 +83,25 @@ tasks :
|
|||||||
- badge for amount given/offered to your project
|
- badge for amount given/offered to your project
|
||||||
- set a goal of given/offers
|
- set a goal of given/offers
|
||||||
|
|
||||||
- automated tests, eg. pup-test or cypress
|
- automated tests, eg. cypress
|
||||||
|
|
||||||
- Notifications (wake on the phone, push notifications)
|
- Notifications (wake on the phone, push notifications)
|
||||||
- 02 change push server so that the web-push/subscribe call sets up a thread for the 10-seconds-later push notification, but returns immediately to the callee
|
|
||||||
- pull instead of push, maybe via scheduled runs
|
|
||||||
- have a notification pop-up on Mac screen
|
|
||||||
|
|
||||||
- 16 Connect with phone contacts - this may be a whole different app, because we want a quick link A) to the same phone contact and B) from the phone contact app
|
- Connect with phone contacts
|
||||||
|
|
||||||
- Support KERI AIDs
|
- Multiple identities
|
||||||
- Support Peer DIDs
|
|
||||||
- Support messaging through DIDComm
|
|
||||||
- Write to or read from a different ledger (eg. private ACDC, EAS & attest.sh)
|
|
||||||
|
|
||||||
- 01 On nearby search, if user starts changing their box but cancels and goes back to the map it is zoomed far out. Fix to fit the box better.
|
- Peer DID
|
||||||
|
|
||||||
- allow some gives even if they aren't registered - maybe someday as a gift to the world, but we really want this to be built via personal connections -- and that allows spam
|
- DIDComm
|
||||||
- .1 When Chrome shows compatibility https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
|
|
||||||
then change the canShare check in this app to check the real canShare() method.
|
|
||||||
|
|
||||||
log :
|
- Write to or read from a different ledger (eg. private ACDC, attest.sh)
|
||||||
|
|
||||||
|
- Do we want split first name & last name?
|
||||||
|
|
||||||
|
- 40 notifications v+ :
|
||||||
|
- pull, w/ scheduled runs
|
||||||
|
|
||||||
|
log:
|
||||||
- videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29
|
- videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29
|
||||||
- project lists, contact totals & actions, multiple identifiers, stats-world, activity feed, rename of this project file (use "--follow --") milestone:2 done:2023-06-27
|
- project lists, contact totals & actions, multiple identifiers, stats-world, activity feed, rename of this project file (use "--follow --") milestone:2 done:2023-06-27
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 463 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 150 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 799 B |
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 215 B |
17
public/index.html
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||||
|
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||||
|
<title><%= htmlWebpackPlugin.options.title %></title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<noscript>
|
||||||
|
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
|
||||||
|
</noscript>
|
||||||
|
<div id="app"></div>
|
||||||
|
<!-- built files will be auto injected -->
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
579
src/App.vue
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<router-view />
|
<router-view />
|
||||||
|
|
||||||
<!-- Messages in the upper-right - https://github.com/emmanuelsw/notiwind -->
|
<!-- https://github.com/emmanuelsw/notiwind -->
|
||||||
<NotificationGroup group="alert">
|
<NotificationGroup group="alert">
|
||||||
<div
|
<div
|
||||||
class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
|
class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
|
||||||
@@ -129,7 +129,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</NotificationGroup>
|
</NotificationGroup>
|
||||||
|
|
||||||
<!-- These are general-purpose messages - except there are some for turning app notifications on and off. -->
|
|
||||||
<NotificationGroup group="modal">
|
<NotificationGroup group="modal">
|
||||||
<div class="fixed z-[100] top-0 inset-x-0 w-full">
|
<div class="fixed z-[100] top-0 inset-x-0 w-full">
|
||||||
<Notification
|
<Notification
|
||||||
@@ -149,39 +148,6 @@
|
|||||||
class="w-full"
|
class="w-full"
|
||||||
role="alert"
|
role="alert"
|
||||||
>
|
>
|
||||||
<!-- type "confirm" will post a message and, with onYes function, show a "Yes" button to call that function -->
|
|
||||||
<div
|
|
||||||
v-if="notification.type === 'confirm'"
|
|
||||||
class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
|
|
||||||
>
|
|
||||||
<div class="w-full px-6 py-6 text-slate-900 text-center">
|
|
||||||
<p class="text-lg mb-4">
|
|
||||||
{{ notification.title }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<button
|
|
||||||
v-if="notification.onYes"
|
|
||||||
@click="
|
|
||||||
notification.onYes();
|
|
||||||
close(notification.id);
|
|
||||||
"
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
|
|
||||||
>
|
|
||||||
Yes
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="close(notification.id)"
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
|
|
||||||
>
|
|
||||||
{{ notification.onYes ? "Cancel" : "Close" }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
<div
|
||||||
v-if="notification.type === 'notification-permission'"
|
v-if="notification.type === 'notification-permission'"
|
||||||
class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
|
class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
|
||||||
@@ -190,121 +156,28 @@
|
|||||||
class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
|
class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
|
||||||
>
|
>
|
||||||
<div class="w-full px-6 py-6 text-slate-900 text-center">
|
<div class="w-full px-6 py-6 text-slate-900 text-center">
|
||||||
<p v-if="serviceWorkerReady" class="text-lg mb-4">
|
<p class="text-lg mb-4">
|
||||||
Would you like to be notified of new activity once a day?
|
Would you like to turn on notifications for this app?
|
||||||
</p>
|
|
||||||
<p v-else class="text-lg mb-4">
|
|
||||||
Waiting for system initialization, which may take up to 10
|
|
||||||
seconds...
|
|
||||||
<fa icon="spinner" spin />
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div v-if="serviceWorkerReady">
|
<button
|
||||||
<span class="flex flex-row justify-center">
|
class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
|
||||||
<span class="mt-2">Yes, tell me at: </span>
|
>
|
||||||
<input
|
Turn on Notifications
|
||||||
type="number"
|
</button>
|
||||||
class="rounded-l border border-r-0 border-slate-400 ml-2 mt-2 px-2 py-2 text-center w-20"
|
<div class="grid grid-cols-2 gap-2">
|
||||||
v-model="hourInput"
|
|
||||||
/>
|
|
||||||
<span
|
|
||||||
class="rounded-r border border-slate-400 bg-slate-200 text-center text-blue-500 mt-2 px-2 py-2 w-20"
|
|
||||||
@click="hourAm = !hourAm"
|
|
||||||
>
|
|
||||||
<span v-if="hourAm"> AM <fa icon="chevron-down" /> </span>
|
|
||||||
<span v-else> PM <fa icon="chevron-up" /> </span>
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
<button
|
<button
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white mt-2 px-2 py-2 rounded-md"
|
@click="close(notification.id)"
|
||||||
@click="
|
class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
|
||||||
() => {
|
|
||||||
if (checkHour()) {
|
|
||||||
close(notification.id);
|
|
||||||
turnOnNotifications();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"
|
|
||||||
>
|
>
|
||||||
Turn on Daily Message
|
Maybe Later
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md"
|
||||||
|
>
|
||||||
|
Never
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
|
||||||
@click="close(notification.id)"
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white mt-4 px-2 py-2 rounded-md"
|
|
||||||
>
|
|
||||||
No, Not Now
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="notification.type === 'notification-mute'"
|
|
||||||
class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
|
|
||||||
>
|
|
||||||
<div class="w-full px-6 py-6 text-slate-900 text-center">
|
|
||||||
<p class="text-lg mb-4">Mute app notifications:</p>
|
|
||||||
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
|
|
||||||
>
|
|
||||||
For 1 Hour
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
|
|
||||||
>
|
|
||||||
For 8 Hours
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
|
|
||||||
>
|
|
||||||
For 24 Hours
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
|
|
||||||
>
|
|
||||||
Until I turn it back on
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
@click="close(notification.id)"
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="notification.type === 'notification-off'"
|
|
||||||
class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
|
|
||||||
>
|
|
||||||
<div class="w-full px-6 py-6 text-slate-900 text-center">
|
|
||||||
<p class="text-lg mb-4">
|
|
||||||
Would you like to <b>turn off</b> notifications for this app?
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
close(notification.id);
|
|
||||||
turnOffNotifications();
|
|
||||||
"
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md mb-2"
|
|
||||||
>
|
|
||||||
Turn Off Notifications
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
@click="close(notification.id)"
|
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
|
|
||||||
>
|
|
||||||
Leave it On
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -316,420 +189,4 @@
|
|||||||
|
|
||||||
<style></style>
|
<style></style>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts"></script>
|
||||||
import axios from "axios";
|
|
||||||
import { Vue, Component } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
|
|
||||||
interface ServiceWorkerMessage {
|
|
||||||
type: string;
|
|
||||||
data: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ServiceWorkerResponse {
|
|
||||||
// Define the properties and their types
|
|
||||||
success: boolean;
|
|
||||||
message?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Example interface for error
|
|
||||||
interface ErrorResponse {
|
|
||||||
message: string;
|
|
||||||
// Other properties as needed
|
|
||||||
}
|
|
||||||
|
|
||||||
interface VapidResponse {
|
|
||||||
data: {
|
|
||||||
vapidKey: string;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
interface PushSubscriptionWithTime extends PushSubscriptionJSON {
|
|
||||||
notifyTime: { utcHour: number };
|
|
||||||
}
|
|
||||||
|
|
||||||
import { DEFAULT_PUSH_SERVER, NotificationIface } from "@/constants/app";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
|
||||||
import { sendTestThroughPushServer } from "@/libs/util";
|
|
||||||
|
|
||||||
@Component
|
|
||||||
export default class App extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
b64 = "";
|
|
||||||
hourAm = true;
|
|
||||||
hourInput = "8";
|
|
||||||
serviceWorkerReady = true;
|
|
||||||
|
|
||||||
async mounted() {
|
|
||||||
try {
|
|
||||||
await db.open();
|
|
||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
|
||||||
let pushUrl = DEFAULT_PUSH_SERVER;
|
|
||||||
if (settings?.webPushServer) {
|
|
||||||
pushUrl = settings.webPushServer;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pushUrl.startsWith("http://localhost")) {
|
|
||||||
console.log("Not checking for VAPID in this local environment.");
|
|
||||||
} else {
|
|
||||||
await axios
|
|
||||||
.get(pushUrl + "/web-push/vapid")
|
|
||||||
.then((response: VapidResponse) => {
|
|
||||||
this.b64 = response.data?.vapidKey || "";
|
|
||||||
console.log("Got vapid key:", this.b64);
|
|
||||||
navigator.serviceWorker.addEventListener("controllerchange", () => {
|
|
||||||
console.log("New service worker is now controlling the page");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
if (!this.b64) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error Setting Notifications",
|
|
||||||
text: "Could not set notifications.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
if (window.location.host.startsWith("localhost")) {
|
|
||||||
console.log("Ignoring the error getting VAPID for local development.");
|
|
||||||
} else {
|
|
||||||
console.error("Got an error initializing notifications:", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error Setting Notifications",
|
|
||||||
text: "Got an error setting notifications.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// there may be a long pause here on first initialization
|
|
||||||
navigator.serviceWorker?.ready.then(() => {
|
|
||||||
this.serviceWorkerReady = true;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private sendMessageToServiceWorker(
|
|
||||||
message: ServiceWorkerMessage,
|
|
||||||
): Promise<unknown> {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
if (navigator.serviceWorker.controller) {
|
|
||||||
const messageChannel = new MessageChannel();
|
|
||||||
|
|
||||||
messageChannel.port1.onmessage = (event: MessageEvent) => {
|
|
||||||
if (event.data.error) {
|
|
||||||
reject(event.data.error as ErrorResponse);
|
|
||||||
} else {
|
|
||||||
resolve(event.data as ServiceWorkerResponse);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
navigator.serviceWorker.controller.postMessage(message, [
|
|
||||||
messageChannel.port2,
|
|
||||||
]);
|
|
||||||
} else {
|
|
||||||
reject("Service worker controller not available");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private askPermission(): Promise<NotificationPermission> {
|
|
||||||
console.log("Requesting permission for notifications:", navigator);
|
|
||||||
if (!("serviceWorker" in navigator && navigator.serviceWorker.controller)) {
|
|
||||||
return Promise.reject("Service worker not available.");
|
|
||||||
}
|
|
||||||
|
|
||||||
const secret = localStorage.getItem("secret");
|
|
||||||
if (!secret) {
|
|
||||||
return Promise.reject("No secret found.");
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.sendSecretToServiceWorker(secret)
|
|
||||||
.then(() => this.checkNotificationSupport())
|
|
||||||
.then(() => this.requestNotificationPermission())
|
|
||||||
.catch((error) => Promise.reject(error));
|
|
||||||
}
|
|
||||||
|
|
||||||
private sendSecretToServiceWorker(secret: string): Promise<void> {
|
|
||||||
const message: ServiceWorkerMessage = {
|
|
||||||
type: "SEND_LOCAL_DATA",
|
|
||||||
data: secret,
|
|
||||||
};
|
|
||||||
|
|
||||||
return this.sendMessageToServiceWorker(message).then((response) => {
|
|
||||||
console.log("Response from service worker:", response);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private checkNotificationSupport(): Promise<void> {
|
|
||||||
if (!("Notification" in window)) {
|
|
||||||
alert("This browser does not support notifications.");
|
|
||||||
return Promise.reject("This browser does not support notifications.");
|
|
||||||
}
|
|
||||||
if (Notification.permission === "granted") {
|
|
||||||
return Promise.resolve();
|
|
||||||
}
|
|
||||||
return Promise.resolve();
|
|
||||||
}
|
|
||||||
|
|
||||||
private requestNotificationPermission(): Promise<NotificationPermission> {
|
|
||||||
return Notification.requestPermission().then((permission) => {
|
|
||||||
if (permission !== "granted") {
|
|
||||||
alert(
|
|
||||||
"Allow this app permission to make notifications for personal reminders." +
|
|
||||||
" You can adjust them at any time in your settings.",
|
|
||||||
);
|
|
||||||
throw new Error("We weren't granted permission.");
|
|
||||||
}
|
|
||||||
return permission;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// this allows us to show an error without closing the dialog
|
|
||||||
checkHour() {
|
|
||||||
if (!libsUtil.isNumeric(this.hourInput)) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Not a Number",
|
|
||||||
text: "The time must be an hour number.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
const hourNum = libsUtil.numberOrZero(this.hourInput);
|
|
||||||
if (!Number.isInteger(hourNum)) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Not a Whole Number",
|
|
||||||
text: "The time must be a whole hour number.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (hourNum < 1 || 12 < hourNum) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Not a Whole Number",
|
|
||||||
text: "The time must be an hour between 1 and 12.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async turnOnNotifications() {
|
|
||||||
return this.askPermission()
|
|
||||||
.then((permission) => {
|
|
||||||
console.log("Permission granted:", permission);
|
|
||||||
|
|
||||||
// Call the function and handle promises
|
|
||||||
this.subscribeToPush()
|
|
||||||
.then(() => {
|
|
||||||
console.log("Subscribed successfully.");
|
|
||||||
return navigator.serviceWorker?.ready;
|
|
||||||
})
|
|
||||||
.then((registration) => {
|
|
||||||
return registration.pushManager.getSubscription();
|
|
||||||
})
|
|
||||||
.then(async (subscription) => {
|
|
||||||
if (subscription) {
|
|
||||||
await this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "info",
|
|
||||||
title: "Notification Setup Underway",
|
|
||||||
text: "Setting up notifications for interesting activity, which takes about 10 seconds. If you don't see a final confirmation, check the 'Troubleshoot' page.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
// we already checked that this is a valid hour number
|
|
||||||
const rawHourNum = libsUtil.numberOrZero(this.hourInput);
|
|
||||||
const adjHourNum = rawHourNum + (this.hourAm ? 0 : 12);
|
|
||||||
const hourNum = adjHourNum % 24;
|
|
||||||
const utcHour =
|
|
||||||
hourNum + Math.round(new Date().getTimezoneOffset() / 60);
|
|
||||||
const finalUtcHour = (utcHour + (utcHour < 0 ? 24 : 0)) % 24;
|
|
||||||
|
|
||||||
const subscriptionWithTime: PushSubscriptionWithTime = {
|
|
||||||
notifyTime: { utcHour: finalUtcHour },
|
|
||||||
...subscription.toJSON(),
|
|
||||||
};
|
|
||||||
await this.sendSubscriptionToServer(subscriptionWithTime);
|
|
||||||
return subscriptionWithTime;
|
|
||||||
} else {
|
|
||||||
throw new Error("Subscription object is not available.");
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.then(async (subscription: PushSubscriptionWithTime) => {
|
|
||||||
console.log(
|
|
||||||
"Subscription data sent to server and all finished successfully.",
|
|
||||||
);
|
|
||||||
await sendTestThroughPushServer(subscription, true);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Notifications Turned On",
|
|
||||||
text: "Notifications are on. You should see at least one on your device; if not, check the 'Troubleshoot' page.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error(
|
|
||||||
"Subscription or server communication failed:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
alert(
|
|
||||||
"Subscription or server communication failed. Try again in a while.",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error(
|
|
||||||
"An error occurred setting notification permissions:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
alert("Some error occurred setting notification permissions.");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private urlBase64ToUint8Array(base64String: string): Uint8Array {
|
|
||||||
const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
|
|
||||||
const base64 = (base64String + padding)
|
|
||||||
.replace(/-/g, "+")
|
|
||||||
.replace(/_/g, "/");
|
|
||||||
const rawData = window.atob(base64);
|
|
||||||
const outputArray = new Uint8Array(rawData.length);
|
|
||||||
|
|
||||||
for (let i = 0; i < rawData.length; ++i) {
|
|
||||||
outputArray[i] = rawData.charCodeAt(i);
|
|
||||||
}
|
|
||||||
return outputArray;
|
|
||||||
}
|
|
||||||
|
|
||||||
private subscribeToPush(): Promise<void> {
|
|
||||||
return new Promise<void>((resolve, reject) => {
|
|
||||||
if (!("serviceWorker" in navigator && "PushManager" in window)) {
|
|
||||||
const errorMsg = "Push messaging is not supported";
|
|
||||||
console.warn(errorMsg);
|
|
||||||
return reject(new Error(errorMsg));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Notification.permission !== "granted") {
|
|
||||||
const errorMsg = "Notification permission not granted";
|
|
||||||
console.warn(errorMsg);
|
|
||||||
return reject(new Error(errorMsg));
|
|
||||||
}
|
|
||||||
|
|
||||||
const applicationServerKey = this.urlBase64ToUint8Array(this.b64);
|
|
||||||
const options: PushSubscriptionOptions = {
|
|
||||||
userVisibleOnly: true,
|
|
||||||
applicationServerKey: applicationServerKey,
|
|
||||||
};
|
|
||||||
|
|
||||||
navigator.serviceWorker.ready
|
|
||||||
.then((registration) => {
|
|
||||||
return registration.pushManager.subscribe(options);
|
|
||||||
})
|
|
||||||
.then((subscription) => {
|
|
||||||
console.log("Push subscription successful:", subscription);
|
|
||||||
resolve();
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error("Push subscription failed:", error, options);
|
|
||||||
|
|
||||||
// Inform the user about the issue
|
|
||||||
alert(
|
|
||||||
"We encountered an issue setting up push notifications. " +
|
|
||||||
"If you wish to revoke notification permissions, please do so in your browser settings.",
|
|
||||||
);
|
|
||||||
|
|
||||||
reject(error);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private sendSubscriptionToServer(
|
|
||||||
subscription: PushSubscriptionWithTime,
|
|
||||||
): Promise<void> {
|
|
||||||
console.log("About to send subscription...", subscription);
|
|
||||||
return fetch("/web-push/subscribe", {
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
body: JSON.stringify(subscription),
|
|
||||||
}).then((response) => {
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error("Failed to send subscription to server");
|
|
||||||
}
|
|
||||||
console.log("Subscription sent to server successfully.");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async turnOffNotifications() {
|
|
||||||
let subscription;
|
|
||||||
const pushProviderSuccess = await navigator.serviceWorker?.ready
|
|
||||||
.then((registration) => {
|
|
||||||
return registration.pushManager.getSubscription();
|
|
||||||
})
|
|
||||||
.then((subscript) => {
|
|
||||||
subscription = subscript;
|
|
||||||
if (subscription) {
|
|
||||||
return subscription.unsubscribe();
|
|
||||||
} else {
|
|
||||||
console.log("Subscription object is not available.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error("Push provider server communication failed:", error);
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
|
|
||||||
const pushServerSuccess = await fetch("/web-push/unsubscribe", {
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
body: JSON.stringify(subscription),
|
|
||||||
})
|
|
||||||
.then((response) => {
|
|
||||||
return response.ok;
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error("Push server communication failed:", error);
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
|
|
||||||
alert(
|
|
||||||
"Notifications are off. Push provider unsubscribe " +
|
|
||||||
(pushProviderSuccess ? "succeeded" : "failed") +
|
|
||||||
(pushProviderSuccess === pushServerSuccess ? " and" : " but") +
|
|
||||||
" push server unsubscribe " +
|
|
||||||
(pushServerSuccess ? "succeeded" : "failed") +
|
|
||||||
".",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
|
|
||||||
<rect width="64" height="64" fill="#ffffff"></rect>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 5.2 KiB |
@@ -1,3 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" enable-background="new 0 0 50 50">
|
|
||||||
<path d="M30.3 13.7L25 8.4l-5.3 5.3-1.4-1.4L25 5.6l6.7 6.7z"/><path d="M24 7h2v21h-2z"/><path d="M35 40H15c-1.7 0-3-1.3-3-3V19c0-1.7 1.3-3 3-3h7v2h-7c-.6 0-1 .4-1 1v18c0 .6.4 1 1 1h20c.6 0 1-.4 1-1V19c0-.6-.4-1-1-1h-7v-2h7c1.7 0 3 1.3 3 3v18c0 1.7-1.3 3-3 3z"/>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 5.1 KiB |
@@ -1,27 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
|
||||||
<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
||||||
width="64px" height="64px" viewBox="5.5 -3.5 64 64" enable-background="new 5.5 -3.5 64 64" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<circle fill="#FFFFFF" cx="37.785" cy="28.501" r="28.836"/>
|
|
||||||
<path d="M37.441-3.5c8.951,0,16.572,3.125,22.857,9.372c3.008,3.009,5.295,6.448,6.857,10.314
|
|
||||||
c1.561,3.867,2.344,7.971,2.344,12.314c0,4.381-0.773,8.486-2.314,12.313c-1.543,3.828-3.82,7.21-6.828,10.143
|
|
||||||
c-3.123,3.085-6.666,5.448-10.629,7.086c-3.961,1.638-8.057,2.457-12.285,2.457s-8.276-0.808-12.143-2.429
|
|
||||||
c-3.866-1.618-7.333-3.961-10.4-7.027c-3.067-3.066-5.4-6.524-7-10.372S5.5,32.767,5.5,28.5c0-4.229,0.809-8.295,2.428-12.2
|
|
||||||
c1.619-3.905,3.972-7.4,7.057-10.486C21.08-0.394,28.565-3.5,37.441-3.5z M37.557,2.272c-7.314,0-13.467,2.553-18.458,7.657
|
|
||||||
c-2.515,2.553-4.448,5.419-5.8,8.6c-1.354,3.181-2.029,6.505-2.029,9.972c0,3.429,0.675,6.734,2.029,9.913
|
|
||||||
c1.353,3.183,3.285,6.021,5.8,8.516c2.514,2.496,5.351,4.399,8.515,5.715c3.161,1.314,6.476,1.971,9.943,1.971
|
|
||||||
c3.428,0,6.75-0.665,9.973-1.999c3.219-1.335,6.121-3.257,8.713-5.771c4.99-4.876,7.484-10.99,7.484-18.344
|
|
||||||
c0-3.543-0.648-6.895-1.943-10.057c-1.293-3.162-3.18-5.98-5.654-8.458C50.984,4.844,44.795,2.272,37.557,2.272z M37.156,23.187
|
|
||||||
l-4.287,2.229c-0.458-0.951-1.019-1.619-1.685-2c-0.667-0.38-1.286-0.571-1.858-0.571c-2.856,0-4.286,1.885-4.286,5.657
|
|
||||||
c0,1.714,0.362,3.084,1.085,4.113c0.724,1.029,1.791,1.544,3.201,1.544c1.867,0,3.181-0.915,3.944-2.743l3.942,2
|
|
||||||
c-0.838,1.563-2,2.791-3.486,3.686c-1.484,0.896-3.123,1.343-4.914,1.343c-2.857,0-5.163-0.875-6.915-2.629
|
|
||||||
c-1.752-1.752-2.628-4.19-2.628-7.313c0-3.048,0.886-5.466,2.657-7.257c1.771-1.79,4.009-2.686,6.715-2.686
|
|
||||||
C32.604,18.558,35.441,20.101,37.156,23.187z M55.613,23.187l-4.229,2.229c-0.457-0.951-1.02-1.619-1.686-2
|
|
||||||
c-0.668-0.38-1.307-0.571-1.914-0.571c-2.857,0-4.287,1.885-4.287,5.657c0,1.714,0.363,3.084,1.086,4.113
|
|
||||||
c0.723,1.029,1.789,1.544,3.201,1.544c1.865,0,3.18-0.915,3.941-2.743l4,2c-0.875,1.563-2.057,2.791-3.541,3.686
|
|
||||||
c-1.486,0.896-3.105,1.343-4.857,1.343c-2.896,0-5.209-0.875-6.941-2.629c-1.736-1.752-2.602-4.19-2.602-7.313
|
|
||||||
c0-3.048,0.885-5.466,2.658-7.257c1.77-1.79,4.008-2.686,6.713-2.686C51.117,18.558,53.938,20.101,55.613,23.187z"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 2.5 KiB |
@@ -1,24 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
|
||||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
||||||
width="64px" height="64px" viewBox="-0.5 0.5 64 64" enable-background="new -0.5 0.5 64 64" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<circle fill="#FFFFFF" cx="31.325" cy="32.873" r="30.096"/>
|
|
||||||
<path id="text2809_1_" d="M31.5,14.08c-10.565,0-13.222,9.969-13.222,18.42c0,8.452,2.656,18.42,13.222,18.42
|
|
||||||
c10.564,0,13.221-9.968,13.221-18.42C44.721,24.049,42.064,14.08,31.5,14.08z M31.5,21.026c0.429,0,0.82,0.066,1.188,0.157
|
|
||||||
c0.761,0.656,1.133,1.561,0.403,2.823l-7.036,12.93c-0.216-1.636-0.247-3.24-0.247-4.437C25.808,28.777,26.066,21.026,31.5,21.026z
|
|
||||||
M36.766,26.987c0.373,1.984,0.426,4.056,0.426,5.513c0,3.723-0.258,11.475-5.69,11.475c-0.428,0-0.822-0.045-1.188-0.136
|
|
||||||
c-0.07-0.021-0.134-0.043-0.202-0.067c-0.112-0.032-0.23-0.068-0.336-0.11c-1.21-0.515-1.972-1.446-0.874-3.093L36.766,26.987z"/>
|
|
||||||
<path id="path2815_1_" d="M31.433,0.5c-8.877,0-16.359,3.09-22.454,9.3c-3.087,3.087-5.443,6.607-7.082,10.532
|
|
||||||
C0.297,24.219-0.5,28.271-0.5,32.5c0,4.268,0.797,8.32,2.397,12.168c1.6,3.85,3.921,7.312,6.969,10.396
|
|
||||||
c3.085,3.049,6.549,5.399,10.398,7.037c3.886,1.602,7.939,2.398,12.169,2.398c4.229,0,8.34-0.826,12.303-2.465
|
|
||||||
c3.962-1.639,7.496-3.994,10.621-7.081c3.011-2.933,5.289-6.297,6.812-10.106C62.73,41,63.5,36.883,63.5,32.5
|
|
||||||
c0-4.343-0.77-8.454-2.33-12.303c-1.562-3.885-3.848-7.32-6.857-10.33C48.025,3.619,40.385,0.5,31.433,0.5z M31.567,6.259
|
|
||||||
c7.238,0,13.412,2.566,18.554,7.709c2.477,2.477,4.375,5.31,5.67,8.471c1.296,3.162,1.949,6.518,1.949,10.061
|
|
||||||
c0,7.354-2.516,13.454-7.506,18.33c-2.592,2.516-5.502,4.447-8.74,5.781c-3.2,1.334-6.498,1.994-9.927,1.994
|
|
||||||
c-3.468,0-6.788-0.653-9.949-1.948c-3.163-1.334-6.001-3.238-8.516-5.716c-2.515-2.514-4.455-5.353-5.826-8.516
|
|
||||||
c-1.333-3.199-2.017-6.498-2.017-9.927c0-3.467,0.684-6.787,2.017-9.949c1.371-3.2,3.312-6.074,5.826-8.628
|
|
||||||
C18.092,8.818,24.252,6.259,31.567,6.259z"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 94 KiB |
|
Before Width: | Height: | Size: 142 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 6.7 KiB |
@@ -1,8 +1,9 @@
|
|||||||
@import url('https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&display=swap');
|
|
||||||
@tailwind base;
|
@tailwind base;
|
||||||
@tailwind components;
|
@tailwind components;
|
||||||
@tailwind utilities;
|
@tailwind utilities;
|
||||||
|
|
||||||
|
@import url('https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&display=swap');
|
||||||
|
|
||||||
@layer base {
|
@layer base {
|
||||||
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;
|
||||||
|
|||||||
47
src/components/AlertMessage.vue
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<template>
|
||||||
|
<div v-bind:class="computedAlertClassNames()">
|
||||||
|
<button
|
||||||
|
class="close-button bg-amber-400 w-8 leading-loose rounded-full absolute top-2 right-2"
|
||||||
|
@click="onClickClose()"
|
||||||
|
>
|
||||||
|
<fa icon="xmark"></fa>
|
||||||
|
</button>
|
||||||
|
<h4 class="font-bold pr-5">{{ alertTitle }}</h4>
|
||||||
|
<p>{{ alertMessage }}</p>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { Component, Prop, Vue } from "vue-facing-decorator";
|
||||||
|
|
||||||
|
@Component
|
||||||
|
export default class AlertMessage extends Vue {
|
||||||
|
@Prop alertTitle = "";
|
||||||
|
@Prop alertMessage = "";
|
||||||
|
isAlertVisible = this.alertMessage;
|
||||||
|
|
||||||
|
public onClickClose() {
|
||||||
|
this.isAlertVisible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public computedAlertClassNames() {
|
||||||
|
return {
|
||||||
|
hidden: !this.isAlertVisible,
|
||||||
|
"dismissable-alert": true,
|
||||||
|
"bg-amber-200": true,
|
||||||
|
"p-5": true,
|
||||||
|
rounded: true,
|
||||||
|
"drop-shadow-lg": true,
|
||||||
|
fixed: true,
|
||||||
|
"top-3": true,
|
||||||
|
"inset-x-3": true,
|
||||||
|
"transition-transform": true,
|
||||||
|
"ease-in": true,
|
||||||
|
"duration-300": true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<!-- Add "scoped" attribute to limit CSS to this component only -->
|
||||||
|
<style scoped></style>
|
||||||
@@ -1,23 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<div v-html="generateIcon()" class="w-fit"></div>
|
<div v-html="generateIdenticon()" class="w-fit"></div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { createAvatar, StyleOptions } from "@dicebear/core";
|
|
||||||
import { avataaars } from "@dicebear/collection";
|
|
||||||
import { Vue, Component, Prop } from "vue-facing-decorator";
|
import { Vue, Component, Prop } from "vue-facing-decorator";
|
||||||
|
import { toSvg } from "jdenticon";
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
export default class EntityIcon extends Vue {
|
export default class EntityIcon extends Vue {
|
||||||
@Prop entityId = "";
|
@Prop entityId = "";
|
||||||
@Prop iconSize = 0;
|
@Prop iconSize = "";
|
||||||
|
|
||||||
generateIcon() {
|
generateIdenticon() {
|
||||||
const options: StyleOptions<object> = {
|
const svgString = toSvg(this.entityId, this.iconSize);
|
||||||
seed: this.entityId || "",
|
|
||||||
size: this.iconSize,
|
|
||||||
};
|
|
||||||
const avatar = createAvatar(avataaars, options);
|
|
||||||
const svgString = avatar.toString();
|
|
||||||
return svgString;
|
return svgString;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,219 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-if="visible" id="dialogFeedFilters" class="dialog-overlay">
|
|
||||||
<div class="dialog">
|
|
||||||
<h1 class="text-xl font-bold text-center mb-4">Feed Filters</h1>
|
|
||||||
|
|
||||||
<p class="mb-4 font-bold">Show only activities that…</p>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-1 gap-2">
|
|
||||||
<div
|
|
||||||
class="flex items-center justify-between cursor-pointer"
|
|
||||||
@click="toggleHasVisibleDid()"
|
|
||||||
>
|
|
||||||
<!-- label -->
|
|
||||||
<div>Include someone visible to me</div>
|
|
||||||
<!-- toggle -->
|
|
||||||
<div class="relative ml-2">
|
|
||||||
<!-- input -->
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
v-model="hasVisibleDid"
|
|
||||||
name="toggleFilterFromMyContacts"
|
|
||||||
class="sr-only"
|
|
||||||
/>
|
|
||||||
<!-- line -->
|
|
||||||
<div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
|
|
||||||
<!-- dot -->
|
|
||||||
<div
|
|
||||||
class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<em>or</em>
|
|
||||||
|
|
||||||
<div
|
|
||||||
class="flex items-center justify-between cursor-pointer"
|
|
||||||
@click="
|
|
||||||
hasSearchBox
|
|
||||||
? toggleNearby()
|
|
||||||
: $router.push({ name: 'search-area' })
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<!-- label -->
|
|
||||||
<div>Are nearby</div>
|
|
||||||
<!-- toggle -->
|
|
||||||
<div v-if="hasSearchBox" class="relative ml-2">
|
|
||||||
<!-- input -->
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
v-model="isNearby"
|
|
||||||
name="toggleFilterNearby"
|
|
||||||
class="sr-only"
|
|
||||||
/>
|
|
||||||
<!-- line -->
|
|
||||||
<div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
|
|
||||||
<!-- dot -->
|
|
||||||
<div
|
|
||||||
class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
<div v-else class="relative ml-2">
|
|
||||||
<button class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500">
|
|
||||||
Select Location
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-3 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-1.5 py-2 rounded-md"
|
|
||||||
@click="setAll()"
|
|
||||||
>
|
|
||||||
Set All
|
|
||||||
</button>
|
|
||||||
<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-1.5 py-2 rounded-md"
|
|
||||||
@click="clearAll()"
|
|
||||||
>
|
|
||||||
Clear All
|
|
||||||
</button>
|
|
||||||
<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-1.5 py-2 rounded-md"
|
|
||||||
@click="done()"
|
|
||||||
>
|
|
||||||
Done
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Vue, Component } from "vue-facing-decorator";
|
|
||||||
import {
|
|
||||||
LMap,
|
|
||||||
LMarker,
|
|
||||||
LRectangle,
|
|
||||||
LTileLayer,
|
|
||||||
} from "@vue-leaflet/vue-leaflet";
|
|
||||||
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
components: {
|
|
||||||
LRectangle,
|
|
||||||
LMap,
|
|
||||||
LMarker,
|
|
||||||
LTileLayer,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class FeedFilters extends Vue {
|
|
||||||
onCloseIfChanged = () => {};
|
|
||||||
hasSearchBox = false;
|
|
||||||
hasVisibleDid = false;
|
|
||||||
isNearby = false;
|
|
||||||
settingChanged = false;
|
|
||||||
visible = false;
|
|
||||||
|
|
||||||
async open(onCloseIfChanged: () => void) {
|
|
||||||
this.onCloseIfChanged = onCloseIfChanged;
|
|
||||||
|
|
||||||
await db.open();
|
|
||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
|
||||||
this.hasVisibleDid = !!settings?.filterFeedByVisible;
|
|
||||||
this.isNearby = !!settings?.filterFeedByNearby;
|
|
||||||
if (settings?.searchBoxes && settings.searchBoxes.length > 0) {
|
|
||||||
this.hasSearchBox = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.settingChanged = false;
|
|
||||||
this.visible = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleHasVisibleDid() {
|
|
||||||
this.settingChanged = true;
|
|
||||||
this.hasVisibleDid = !this.hasVisibleDid;
|
|
||||||
db.settings.update(MASTER_SETTINGS_KEY, {
|
|
||||||
filterFeedByVisible: this.hasVisibleDid,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleNearby() {
|
|
||||||
this.settingChanged = true;
|
|
||||||
this.isNearby = !this.isNearby;
|
|
||||||
db.settings.update(MASTER_SETTINGS_KEY, {
|
|
||||||
filterFeedByNearby: this.isNearby,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async clearAll() {
|
|
||||||
if (this.hasVisibleDid || this.isNearby) {
|
|
||||||
this.settingChanged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
db.settings.update(MASTER_SETTINGS_KEY, {
|
|
||||||
filterFeedByNearby: false,
|
|
||||||
filterFeedByVisible: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.hasVisibleDid = false;
|
|
||||||
this.isNearby = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
async setAll() {
|
|
||||||
if (!this.hasVisibleDid || !this.isNearby) {
|
|
||||||
this.settingChanged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
db.settings.update(MASTER_SETTINGS_KEY, {
|
|
||||||
filterFeedByNearby: true,
|
|
||||||
filterFeedByVisible: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.hasVisibleDid = true;
|
|
||||||
this.isNearby = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
close() {
|
|
||||||
if (this.settingChanged) {
|
|
||||||
this.onCloseIfChanged();
|
|
||||||
}
|
|
||||||
this.visible = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
done() {
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.dialog-overlay {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
background-color: rgba(0, 0, 0, 0.5);
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
#dialogFeedFilters.dialog-overlay {
|
|
||||||
z-index: 99999;
|
|
||||||
overflow: scroll;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dialog {
|
|
||||||
background-color: white;
|
|
||||||
padding: 1rem;
|
|
||||||
border-radius: 0.5rem;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 500px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<div v-if="visible" class="dialog-overlay">
|
<div v-if="visible" class="dialog-overlay">
|
||||||
<div class="dialog">
|
<div class="dialog">
|
||||||
<h1 class="text-xl font-bold text-center mb-4">
|
<h1 class="text-xl font-bold text-center mb-4">
|
||||||
{{ message }} {{ giver?.name || "somebody not named" }}
|
{{ message }} {{ giver?.name || "somebody not specified" }}
|
||||||
</h1>
|
</h1>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -10,23 +10,21 @@
|
|||||||
placeholder="What was received"
|
placeholder="What was received"
|
||||||
v-model="description"
|
v-model="description"
|
||||||
/>
|
/>
|
||||||
<div class="flex flex-row justify-center">
|
<div class="flex flex-row mb-6">
|
||||||
<span
|
<span
|
||||||
class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
|
class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center px-2 py-2"
|
||||||
@click="changeUnitCode()"
|
>Hours</span
|
||||||
>
|
>
|
||||||
{{ libsUtil.UNIT_SHORT[unitCode] }}
|
|
||||||
</span>
|
|
||||||
<div
|
<div
|
||||||
class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
|
class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
|
||||||
@click="amountInput === '0' ? null : decrement()"
|
@click="decrement()"
|
||||||
>
|
>
|
||||||
<fa icon="chevron-left" />
|
<fa icon="chevron-left" />
|
||||||
</div>
|
</div>
|
||||||
<input
|
<input
|
||||||
type="number"
|
type="text"
|
||||||
class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
|
class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
|
||||||
v-model="amountInput"
|
v-model="hours"
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
|
class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
|
||||||
@@ -35,341 +33,74 @@
|
|||||||
<fa icon="chevron-right" />
|
<fa icon="chevron-right" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-4 flex justify-center">
|
<p class="text-center mb-2 italic">Sign & Send to publish to the world</p>
|
||||||
<span>
|
<button
|
||||||
<router-link
|
class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
:to="{
|
@click="confirm"
|
||||||
name: 'gifted-details',
|
>
|
||||||
query: {
|
Sign & Send
|
||||||
amountInput,
|
</button>
|
||||||
description,
|
<button
|
||||||
giverDid: giver?.did,
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
giverName: giver?.name,
|
@click="cancel"
|
||||||
message,
|
>
|
||||||
offerId,
|
Cancel
|
||||||
projectId,
|
</button>
|
||||||
unitCode,
|
|
||||||
},
|
|
||||||
}"
|
|
||||||
class="text-blue-500"
|
|
||||||
>
|
|
||||||
Photo, ...
|
|
||||||
</router-link>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<p class="text-center mb-2 mt-6 italic">
|
|
||||||
Sign & Send to publish to the world
|
|
||||||
<fa
|
|
||||||
icon="circle-info"
|
|
||||||
class="pl-2 text-blue-500 cursor-pointer"
|
|
||||||
@click="explainData()"
|
|
||||||
/>
|
|
||||||
</p>
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
|
|
||||||
@click="confirm"
|
|
||||||
>
|
|
||||||
Sign & Send
|
|
||||||
</button>
|
|
||||||
<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-1.5 py-2 rounded-md"
|
|
||||||
@click="cancel"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Vue, Component, Prop } from "vue-facing-decorator";
|
import { Vue, Component, Prop, Emit } from "vue-facing-decorator";
|
||||||
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import {
|
|
||||||
createAndSubmitGive,
|
|
||||||
didInfo,
|
|
||||||
GiverInputInfo,
|
|
||||||
} from "@/libs/endorserServer";
|
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
export default class GiftedDialog extends Vue {
|
export default class GiftedDialog extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
@Prop message = "";
|
@Prop message = "";
|
||||||
@Prop projectId = "";
|
|
||||||
@Prop showGivenToUser = false;
|
|
||||||
|
|
||||||
activeDid = "";
|
giver = null;
|
||||||
allContacts: Array<Contact> = [];
|
|
||||||
allMyDids: Array<string> = [];
|
|
||||||
apiServer = "";
|
|
||||||
|
|
||||||
amountInput = "0";
|
|
||||||
description = "";
|
description = "";
|
||||||
givenToUser = false;
|
hours = "0";
|
||||||
giver?: GiverInputInfo; // undefined means no identified giver agent
|
|
||||||
isTrade = false;
|
|
||||||
offerId = "";
|
|
||||||
unitCode = "HUR";
|
|
||||||
visible = false;
|
visible = false;
|
||||||
|
|
||||||
libsUtil = libsUtil;
|
open(giver) {
|
||||||
|
// giver: GiverInputInfo
|
||||||
async open(giver?: GiverInputInfo, offerId?: string) {
|
this.giver = giver;
|
||||||
this.description = "";
|
|
||||||
this.giver = giver || {};
|
|
||||||
// if we show "given to user" selection, default checkbox to true
|
|
||||||
this.givenToUser = this.showGivenToUser;
|
|
||||||
this.amountInput = "0";
|
|
||||||
this.offerId = offerId || "";
|
|
||||||
|
|
||||||
try {
|
|
||||||
await db.open();
|
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
|
||||||
this.apiServer = settings?.apiServer || "";
|
|
||||||
this.activeDid = settings?.activeDid || "";
|
|
||||||
|
|
||||||
this.allContacts = await db.contacts.toArray();
|
|
||||||
|
|
||||||
await accountsDB.open();
|
|
||||||
const allAccounts = await accountsDB.accounts.toArray();
|
|
||||||
this.allMyDids = allAccounts.map((acc) => acc.did);
|
|
||||||
|
|
||||||
if (!this.giver.name) {
|
|
||||||
this.giver.name = didInfo(
|
|
||||||
this.giver.did,
|
|
||||||
this.activeDid,
|
|
||||||
this.allMyDids,
|
|
||||||
this.allContacts,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (err: any) {
|
|
||||||
console.error("Error retrieving settings from database:", err);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: err.message || "There was an error retrieving your settings.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.visible = true;
|
this.visible = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
close() {
|
close() {
|
||||||
// close the dialog but don't change values (since it might be submitting info)
|
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
changeUnitCode() {
|
|
||||||
const units = Object.keys(this.libsUtil.UNIT_SHORT);
|
|
||||||
const index = units.indexOf(this.unitCode);
|
|
||||||
this.unitCode = units[(index + 1) % units.length];
|
|
||||||
}
|
|
||||||
|
|
||||||
increment() {
|
increment() {
|
||||||
this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
|
this.hours = `${(parseFloat(this.hours) || 0) + 1}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
decrement() {
|
decrement() {
|
||||||
this.amountInput = `${Math.max(
|
this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
|
||||||
0,
|
|
||||||
(parseFloat(this.amountInput) || 1) - 1,
|
|
||||||
)}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cancel() {
|
@Emit("dialog-result")
|
||||||
|
confirm() {
|
||||||
|
const result = {
|
||||||
|
action: "confirm",
|
||||||
|
giver: this.giver,
|
||||||
|
hours: parseFloat(this.hours),
|
||||||
|
description: this.description,
|
||||||
|
};
|
||||||
this.close();
|
this.close();
|
||||||
this.eraseValues();
|
|
||||||
}
|
|
||||||
|
|
||||||
eraseValues() {
|
|
||||||
this.description = "";
|
this.description = "";
|
||||||
this.giver = undefined;
|
this.giver = null;
|
||||||
this.givenToUser = this.showGivenToUser;
|
this.hours = "0";
|
||||||
this.amountInput = "0";
|
|
||||||
this.unitCode = "HUR";
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
async confirm() {
|
@Emit("dialog-result")
|
||||||
if (!this.activeDid) {
|
cancel() {
|
||||||
this.$notify(
|
const result = { action: "cancel" };
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "You must select an identifier before you can record a give.",
|
|
||||||
},
|
|
||||||
3000,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (parseFloat(this.amountInput) < 0) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
text: "You may not send a negative number.",
|
|
||||||
title: "",
|
|
||||||
},
|
|
||||||
2000,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!this.description && !parseFloat(this.amountInput)) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: `You must enter a description or some number of ${
|
|
||||||
this.libsUtil.UNIT_LONG[this.unitCode]
|
|
||||||
}.`,
|
|
||||||
},
|
|
||||||
2000,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.close();
|
this.close();
|
||||||
this.$notify(
|
return result;
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "toast",
|
|
||||||
text: "Recording the give...",
|
|
||||||
title: "",
|
|
||||||
},
|
|
||||||
1000,
|
|
||||||
);
|
|
||||||
// this is asynchronous, but we don't need to wait for it to complete
|
|
||||||
await this.recordGive(
|
|
||||||
(this.giver?.did as string) || null,
|
|
||||||
this.description,
|
|
||||||
parseFloat(this.amountInput),
|
|
||||||
this.unitCode,
|
|
||||||
).then(() => {
|
|
||||||
this.eraseValues();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param giverDid may be null
|
|
||||||
* @param description may be an empty string
|
|
||||||
* @param amountInput may be 0
|
|
||||||
* @param unitCode may be omitted, defaults to "HUR"
|
|
||||||
*/
|
|
||||||
public async recordGive(
|
|
||||||
giverDid: string | null,
|
|
||||||
description: string,
|
|
||||||
amountInput: number,
|
|
||||||
unitCode: string = "HUR",
|
|
||||||
) {
|
|
||||||
try {
|
|
||||||
const identity = await libsUtil.getIdentity(this.activeDid);
|
|
||||||
const result = await createAndSubmitGive(
|
|
||||||
this.axios,
|
|
||||||
this.apiServer,
|
|
||||||
identity,
|
|
||||||
giverDid,
|
|
||||||
this.givenToUser ? this.activeDid : undefined,
|
|
||||||
description,
|
|
||||||
amountInput,
|
|
||||||
unitCode,
|
|
||||||
this.projectId,
|
|
||||||
this.offerId,
|
|
||||||
this.isTrade,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (
|
|
||||||
result.type === "error" ||
|
|
||||||
this.isGiveCreationError(result.response)
|
|
||||||
) {
|
|
||||||
const errorMessage = this.getGiveCreationErrorMessage(result);
|
|
||||||
console.error("Error with give creation result:", result);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: errorMessage || "There was an error creating the give.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Success",
|
|
||||||
text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
|
|
||||||
},
|
|
||||||
7000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error("Error with give recordation caught:", error);
|
|
||||||
const message =
|
|
||||||
error.userMessage ||
|
|
||||||
error.response?.data?.error?.message ||
|
|
||||||
"There was an error recording the give.";
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: message,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper functions for readability
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param result response "data" from the server
|
|
||||||
* @returns true if the result indicates an error
|
|
||||||
*/
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
isGiveCreationError(result: any) {
|
|
||||||
return result.status !== 201 || result.data?.error;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
|
|
||||||
* @returns best guess at an error message
|
|
||||||
*/
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
getGiveCreationErrorMessage(result: any) {
|
|
||||||
return (
|
|
||||||
result.error?.userMessage ||
|
|
||||||
result.error?.error ||
|
|
||||||
result.response?.data?.error?.message
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
explainData() {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Data Sharing",
|
|
||||||
text: libsUtil.PRIVACY_MESSAGE,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,368 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-if="visible" class="dialog-overlay z-[60]">
|
|
||||||
<div class="dialog relative">
|
|
||||||
<div class="text-lg text-center font-light relative z-50">
|
|
||||||
<div
|
|
||||||
id="ViewHeading"
|
|
||||||
class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-2 bg-black/50 text-white leading-none"
|
|
||||||
>
|
|
||||||
<span v-if="uploading"> Uploading... </span>
|
|
||||||
<span v-else-if="blob"> Look Good? </span>
|
|
||||||
<span v-else> Say "Cheese"! </span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
class="text-lg text-center p-2 leading-none absolute right-0 top-0 text-white"
|
|
||||||
@click="close()"
|
|
||||||
>
|
|
||||||
<fa icon="xmark" class="w-[1em]"></fa>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="uploading" class="flex justify-center">
|
|
||||||
<fa icon="spinner" class="fa-spin fa-3x text-center block" />
|
|
||||||
</div>
|
|
||||||
<div v-else-if="blob">
|
|
||||||
<div
|
|
||||||
class="flex justify-center gap-2 absolute bottom-[1rem] left-[1rem] right-[1rem] bg-black/50 px-4 py-2"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
@click="uploadImage"
|
|
||||||
class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white font-bold py-2 px-4 rounded-md"
|
|
||||||
>
|
|
||||||
<span>Upload</span>
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
@click="retryImage"
|
|
||||||
class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white font-bold py-2 px-4 rounded-md"
|
|
||||||
>
|
|
||||||
<span>Retry</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<img :src="URL.createObjectURL(blob)" class="mt-2 rounded" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-else ref="cameraContainer">
|
|
||||||
<!--
|
|
||||||
Camera "resolution" doesn't change how it shows on screen but rather stretches the result, eg the following which just stretches it vertically:
|
|
||||||
:resolution="{ width: 375, height: 812 }"
|
|
||||||
-->
|
|
||||||
<camera
|
|
||||||
facingMode="environment"
|
|
||||||
autoplay
|
|
||||||
ref="camera"
|
|
||||||
@started="cameraStarted()"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="absolute portrait:bottom-0 portrait:left-0 portrait:right-0 portrait:pb-2 landscape:right-0 landscape:top-0 landscape:bottom-0 landscape:pr-4 flex landscape:flex-row justify-center items-center"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
@click="takeImage()"
|
|
||||||
class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
|
|
||||||
>
|
|
||||||
<fa icon="camera" class="w-[1em]"></fa>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="absolute portrait:bottom-2 portrait:right-16 landscape:right-0 landscape:bottom-16 landscape:pr-4 flex justify-center items-center"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
@click="swapMirrorClass()"
|
|
||||||
class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
|
|
||||||
>
|
|
||||||
<fa icon="left-right" class="w-[1em]"></fa>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div v-if="numDevices > 1" class="absolute bottom-2 right-4">
|
|
||||||
<button
|
|
||||||
@click="switchCamera()"
|
|
||||||
class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
|
|
||||||
>
|
|
||||||
<fa icon="rotate" class="w-[1em]"></fa>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</camera>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import axios from "axios";
|
|
||||||
import Camera from "simple-vue-camera";
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
|
|
||||||
import { getIdentity } from "@/libs/util";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
|
||||||
import { accessToken } from "@/libs/crypto";
|
|
||||||
|
|
||||||
@Component({ components: { Camera } })
|
|
||||||
export default class GiftedPhotoDialog extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDeviceNumber = 0;
|
|
||||||
activeDid = "";
|
|
||||||
blob: Blob | null = null;
|
|
||||||
mirror = false;
|
|
||||||
numDevices = 0;
|
|
||||||
setImage: (arg: string) => void = () => {};
|
|
||||||
uploading = false;
|
|
||||||
visible = false;
|
|
||||||
|
|
||||||
URL = window.URL || window.webkitURL;
|
|
||||||
|
|
||||||
async mounted() {
|
|
||||||
try {
|
|
||||||
await db.open();
|
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
|
||||||
this.activeDid = settings?.activeDid || "";
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (err: any) {
|
|
||||||
console.error("Error retrieving settings from database:", err);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: err.message || "There was an error retrieving your settings.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
open(setImageFn: (arg: string) => void) {
|
|
||||||
this.visible = true;
|
|
||||||
const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
|
|
||||||
if (bottomNav) {
|
|
||||||
bottomNav.style.display = "none";
|
|
||||||
}
|
|
||||||
this.setImage = setImageFn;
|
|
||||||
}
|
|
||||||
|
|
||||||
close() {
|
|
||||||
this.visible = false;
|
|
||||||
const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
|
|
||||||
if (bottomNav) {
|
|
||||||
bottomNav.style.display = "";
|
|
||||||
}
|
|
||||||
this.blob = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async cameraStarted() {
|
|
||||||
const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
|
|
||||||
if (cameraComponent) {
|
|
||||||
this.numDevices = (await cameraComponent.devices(["videoinput"])).length;
|
|
||||||
this.mirror = cameraComponent.facingMode === "user";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async switchCamera() {
|
|
||||||
const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
|
|
||||||
this.activeDeviceNumber = (this.activeDeviceNumber + 1) % this.numDevices;
|
|
||||||
const devices = await cameraComponent?.devices(["videoinput"]);
|
|
||||||
cameraComponent?.changeCamera(devices[this.activeDeviceNumber].deviceId);
|
|
||||||
}
|
|
||||||
|
|
||||||
async takeImage(/* payload: MouseEvent */) {
|
|
||||||
const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This logic to set the image height & width correctly.
|
|
||||||
* Without it, the portrait orientation ends up with an image that is stretched horizontally.
|
|
||||||
* Note that it's the same with raw browser Javascript; see the "drawImage" example below.
|
|
||||||
* Now that I've done it, I can't explain why it works.
|
|
||||||
*/
|
|
||||||
let imageHeight = cameraComponent?.resolution?.height;
|
|
||||||
let imageWidth = cameraComponent?.resolution?.width;
|
|
||||||
const initialImageRatio = imageWidth / imageHeight;
|
|
||||||
const windowRatio = window.innerWidth / window.innerHeight;
|
|
||||||
if (initialImageRatio > 1 && windowRatio < 1) {
|
|
||||||
// the image is wider than it is tall, and the window is taller than it is wide
|
|
||||||
// For some reason, mobile in portrait orientation renders a horizontally-stretched image.
|
|
||||||
// We're gonna force it opposite.
|
|
||||||
imageHeight = cameraComponent?.resolution?.width;
|
|
||||||
imageWidth = cameraComponent?.resolution?.height;
|
|
||||||
} else if (initialImageRatio < 1 && windowRatio > 1) {
|
|
||||||
// the image is taller than it is wide, and the window is wider than it is tall
|
|
||||||
// Haven't seen this happen, but we'll do it just in case.
|
|
||||||
imageHeight = cameraComponent?.resolution?.width;
|
|
||||||
imageWidth = cameraComponent?.resolution?.height;
|
|
||||||
}
|
|
||||||
const newImageRatio = imageWidth / imageHeight;
|
|
||||||
if (newImageRatio < windowRatio) {
|
|
||||||
// the image is a taller ratio than the window, so fit the height first
|
|
||||||
imageHeight = window.innerHeight / 2;
|
|
||||||
imageWidth = imageHeight * newImageRatio;
|
|
||||||
} else {
|
|
||||||
// the image is a wider ratio than the window, so fit the width first
|
|
||||||
imageWidth = window.innerWidth / 2;
|
|
||||||
imageHeight = imageWidth / newImageRatio;
|
|
||||||
}
|
|
||||||
|
|
||||||
// The resolution is only necessary because of that mobile portrait-orientation case.
|
|
||||||
// The mobile emulation in a browser shows something stretched vertically, but real devices work fine.
|
|
||||||
this.blob = await cameraComponent?.snapshot({
|
|
||||||
height: imageHeight,
|
|
||||||
width: imageWidth,
|
|
||||||
}); // png is default; if that changes, change extension in formData.append
|
|
||||||
if (!this.blob) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was an error taking the picture. Please try again.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async retryImage() {
|
|
||||||
this.blob = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/****
|
|
||||||
|
|
||||||
Here's an approach to photo capture without a library. It has similar quirks.
|
|
||||||
Now that we've fixed styling for simple-vue-camera, it's not critical to refactor. Maybe someday.
|
|
||||||
|
|
||||||
<button id="start-camera" @click="cameraClicked">Start Camera</button>
|
|
||||||
<video id="video" width="320" height="240" autoplay></video>
|
|
||||||
<button id="snap-photo" @click="photoSnapped">Snap Photo</button>
|
|
||||||
<canvas id="canvas" width="320" height="240"></canvas>
|
|
||||||
|
|
||||||
async cameraClicked() {
|
|
||||||
const video = document.querySelector("#video");
|
|
||||||
const stream = await navigator.mediaDevices.getUserMedia({
|
|
||||||
video: true,
|
|
||||||
audio: false,
|
|
||||||
});
|
|
||||||
if (video instanceof HTMLVideoElement) {
|
|
||||||
video.srcObject = stream;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
photoSnapped() {
|
|
||||||
const video = document.querySelector("#video");
|
|
||||||
const canvas = document.querySelector("#canvas");
|
|
||||||
if (
|
|
||||||
canvas instanceof HTMLCanvasElement &&
|
|
||||||
video instanceof HTMLVideoElement
|
|
||||||
) {
|
|
||||||
canvas
|
|
||||||
?.getContext("2d")
|
|
||||||
?.drawImage(video, 0, 0, canvas.width, canvas.height);
|
|
||||||
// ... or set the blob:
|
|
||||||
// canvas?.toBlob(
|
|
||||||
// (blob) => {
|
|
||||||
// this.blob = blob;
|
|
||||||
// },
|
|
||||||
// "image/jpeg",
|
|
||||||
// 1,
|
|
||||||
// );
|
|
||||||
|
|
||||||
// data url of the image
|
|
||||||
const image_data_url = canvas?.toDataURL("image/jpeg");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
****/
|
|
||||||
|
|
||||||
async uploadImage() {
|
|
||||||
this.uploading = true;
|
|
||||||
const identifier = await getIdentity(this.activeDid);
|
|
||||||
const token = await accessToken(identifier);
|
|
||||||
const headers = {
|
|
||||||
Authorization: "Bearer " + token,
|
|
||||||
};
|
|
||||||
const formData = new FormData();
|
|
||||||
if (!this.blob) {
|
|
||||||
// yeah, this should never happen, but it helps with subsequent type checking
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was an error finding the picture. Please try again.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
this.uploading = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
formData.append("image", this.blob, "snapshot.png"); // png is set in snapshot()
|
|
||||||
formData.append("claimType", "GiveAction");
|
|
||||||
try {
|
|
||||||
const response = await axios.post(
|
|
||||||
DEFAULT_IMAGE_API_SERVER + "/image",
|
|
||||||
formData,
|
|
||||||
{ headers },
|
|
||||||
);
|
|
||||||
this.uploading = false;
|
|
||||||
|
|
||||||
this.visible = false;
|
|
||||||
this.blob = null;
|
|
||||||
this.setImage(response.data.url as string);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error uploading the image", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was an error saving the picture. Please try again.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
this.uploading = false;
|
|
||||||
this.blob = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
swapMirrorClass() {
|
|
||||||
this.mirror = !this.mirror;
|
|
||||||
if (this.mirror) {
|
|
||||||
(this.$refs.cameraContainer as HTMLElement).classList.add("mirror-video");
|
|
||||||
} else {
|
|
||||||
(this.$refs.cameraContainer as HTMLElement).classList.remove(
|
|
||||||
"mirror-video",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.dialog-overlay {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
background-color: rgba(0, 0, 0, 0.5);
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dialog {
|
|
||||||
background-color: white;
|
|
||||||
padding: 1rem;
|
|
||||||
border-radius: 0.5rem;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 700px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mirror-video {
|
|
||||||
transform: scaleX(-1);
|
|
||||||
-webkit-transform: scaleX(-1); /* For Safari */
|
|
||||||
-moz-transform: scaleX(-1); /* For Firefox */
|
|
||||||
-ms-transform: scaleX(-1); /* For IE */
|
|
||||||
-o-transform: scaleX(-1); /* For Opera */
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,242 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-if="visible" class="dialog-overlay">
|
|
||||||
<div class="dialog">
|
|
||||||
<h1 class="text-xl font-bold text-center mb-4 relative">
|
|
||||||
Here's one:
|
|
||||||
<div
|
|
||||||
class="text-lg text-center p-2 leading-none absolute right-0 -top-1"
|
|
||||||
@click="cancel"
|
|
||||||
>
|
|
||||||
<fa icon="xmark" class="w-[1em]"></fa>
|
|
||||||
</div>
|
|
||||||
</h1>
|
|
||||||
<span class="flex justify-between">
|
|
||||||
<span
|
|
||||||
class="rounded-l border border-slate-400 bg-slate-200 px-4 py-2 flex"
|
|
||||||
@click="prevIdea()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="m-auto" />
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<div class="m-2">
|
|
||||||
<span v-if="currentIdeaIndex < IDEAS.length">
|
|
||||||
<p class="text-center text-lg font-bold">
|
|
||||||
{{ IDEAS[currentIdeaIndex] }}
|
|
||||||
</p>
|
|
||||||
</span>
|
|
||||||
<div v-if="currentIdeaIndex == IDEAS.length + 0">
|
|
||||||
<p class="text-center">
|
|
||||||
<span
|
|
||||||
v-if="currentContact == null"
|
|
||||||
class="text-orange-500 text-lg font-bold"
|
|
||||||
>
|
|
||||||
That's all your contacts.
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
<span class="text-lg font-bold">
|
|
||||||
Did {{ currentContact.name || AppString.NO_CONTACT_NAME }}
|
|
||||||
<br />
|
|
||||||
or someone near them do anything – maybe a while ago?
|
|
||||||
</span>
|
|
||||||
<span class="flex justify-between">
|
|
||||||
<span />
|
|
||||||
<button
|
|
||||||
class="text-center 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-1.5 py-2 rounded-md mt-4"
|
|
||||||
@click="nextIdeaPastContacts()"
|
|
||||||
>
|
|
||||||
Skip Contacts <fa icon="forward" />
|
|
||||||
</button>
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<span
|
|
||||||
class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2 flex"
|
|
||||||
@click="nextIdea()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-right" class="m-auto" />
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
<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-1.5 py-2 rounded-md mt-4"
|
|
||||||
@click="cancel"
|
|
||||||
>
|
|
||||||
That's it!
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Vue, Component } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import { AppString, NotificationIface } from "@/constants/app";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
|
||||||
|
|
||||||
@Component
|
|
||||||
export default class GivenPrompts extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
IDEAS = [
|
|
||||||
"Did anyone fix food for you?",
|
|
||||||
"Did a family member do something for you?",
|
|
||||||
"Did anyone give you a compliment?",
|
|
||||||
"Who is someone you can always rely on, and how did they demonstrate that?",
|
|
||||||
"Did you see anyone give to someone else?",
|
|
||||||
"Is there someone who you have never met who has helped you somehow?",
|
|
||||||
"How did an artist or musician or author inspire you?",
|
|
||||||
"What inspiration did you get from someone who handled tragedy well?",
|
|
||||||
"Did some organization give something worth respect?",
|
|
||||||
"Who last gave you a good laugh?",
|
|
||||||
"Do you recall anything that was given to you while you were young?",
|
|
||||||
"Did someone forgive you or overlook a mistake?",
|
|
||||||
"Do you know of a way an ancestor contributed to your life?",
|
|
||||||
"Did anyone give you help at work?",
|
|
||||||
"How did a teacher or mentor or great example help you?",
|
|
||||||
];
|
|
||||||
OTHER_PROMPTS = 1;
|
|
||||||
CONTACT_PROMPT_INDEX = this.IDEAS.length; // expected after other prompts
|
|
||||||
|
|
||||||
currentContact: Contact | undefined = undefined;
|
|
||||||
currentIdeaIndex = 0;
|
|
||||||
numContacts = 0;
|
|
||||||
shownContactDbIndices: number[] = [];
|
|
||||||
visible = false;
|
|
||||||
|
|
||||||
AppString = AppString;
|
|
||||||
|
|
||||||
async open() {
|
|
||||||
this.visible = true;
|
|
||||||
|
|
||||||
await db.open();
|
|
||||||
this.numContacts = await db.contacts.count();
|
|
||||||
}
|
|
||||||
|
|
||||||
close() {
|
|
||||||
// close the dialog but don't change values (just in case some actions are added later)
|
|
||||||
this.visible = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the next idea.
|
|
||||||
* If it is a contact prompt, loop through.
|
|
||||||
*/
|
|
||||||
async nextIdea() {
|
|
||||||
// if we're incrementing to the contact prompt
|
|
||||||
// or if we're at the contact prompt and there was a previous contact...
|
|
||||||
if (
|
|
||||||
this.currentIdeaIndex == this.CONTACT_PROMPT_INDEX - 1 ||
|
|
||||||
(this.currentIdeaIndex == this.CONTACT_PROMPT_INDEX &&
|
|
||||||
this.shownContactDbIndices.length < this.numContacts)
|
|
||||||
) {
|
|
||||||
this.currentIdeaIndex = this.CONTACT_PROMPT_INDEX;
|
|
||||||
this.findNextUnshownContact();
|
|
||||||
} else {
|
|
||||||
// we're not at the contact prompt (or we ran out), so increment the idea index
|
|
||||||
this.currentIdeaIndex =
|
|
||||||
(this.currentIdeaIndex + 1) % (this.IDEAS.length + this.OTHER_PROMPTS);
|
|
||||||
// ... and clear out any other prompt info
|
|
||||||
this.currentContact = undefined;
|
|
||||||
this.shownContactDbIndices = [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
prevIdea() {
|
|
||||||
if (
|
|
||||||
this.currentIdeaIndex ==
|
|
||||||
(this.CONTACT_PROMPT_INDEX + 1) %
|
|
||||||
(this.IDEAS.length + this.OTHER_PROMPTS) ||
|
|
||||||
(this.currentIdeaIndex == this.CONTACT_PROMPT_INDEX &&
|
|
||||||
this.shownContactDbIndices.length < this.numContacts)
|
|
||||||
) {
|
|
||||||
this.currentIdeaIndex = this.CONTACT_PROMPT_INDEX;
|
|
||||||
this.findNextUnshownContact();
|
|
||||||
} else {
|
|
||||||
// we're not at the contact prompt (or we ran out), so increment the idea index
|
|
||||||
this.currentIdeaIndex--;
|
|
||||||
if (this.currentIdeaIndex < 0) {
|
|
||||||
this.currentIdeaIndex = this.IDEAS.length - 1 + this.OTHER_PROMPTS;
|
|
||||||
}
|
|
||||||
// ... and clear out any other prompt info
|
|
||||||
this.currentContact = undefined;
|
|
||||||
this.shownContactDbIndices = [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
nextIdeaPastContacts() {
|
|
||||||
this.currentIdeaIndex = 0;
|
|
||||||
this.currentContact = undefined;
|
|
||||||
this.shownContactDbIndices = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
async findNextUnshownContact() {
|
|
||||||
// get a random contact
|
|
||||||
if (this.shownContactDbIndices.length === this.numContacts) {
|
|
||||||
// no more contacts to show
|
|
||||||
this.currentContact = undefined;
|
|
||||||
} else {
|
|
||||||
// get a random contact that hasn't been shown yet
|
|
||||||
let someContactDbIndex = Math.floor(Math.random() * this.numContacts);
|
|
||||||
// and guarantee that one is found by walking past shown contacts
|
|
||||||
let shownContactIndex =
|
|
||||||
this.shownContactDbIndices.indexOf(someContactDbIndex);
|
|
||||||
while (shownContactIndex !== -1) {
|
|
||||||
// increment both indices until we find a spot where "shown" skips a spot
|
|
||||||
shownContactIndex = (shownContactIndex + 1) % this.numContacts;
|
|
||||||
someContactDbIndex = (someContactDbIndex + 1) % this.numContacts;
|
|
||||||
if (
|
|
||||||
this.shownContactDbIndices[shownContactIndex] !== someContactDbIndex
|
|
||||||
) {
|
|
||||||
// we found a contact that hasn't been shown yet
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
// continue
|
|
||||||
// ... and there must be at least one because shownContactDbIndices length < numContacts
|
|
||||||
}
|
|
||||||
this.shownContactDbIndices.push(someContactDbIndex);
|
|
||||||
this.shownContactDbIndices.sort();
|
|
||||||
|
|
||||||
// get the contact at that offset
|
|
||||||
await db.open();
|
|
||||||
this.currentContact = await db.contacts
|
|
||||||
.offset(someContactDbIndex)
|
|
||||||
.first();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel() {
|
|
||||||
this.currentContact = undefined;
|
|
||||||
this.currentIdeaIndex = 0;
|
|
||||||
this.numContacts = 0;
|
|
||||||
this.shownContactDbIndices = [];
|
|
||||||
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.dialog-overlay {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
background-color: rgba(0, 0, 0, 0.5);
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dialog {
|
|
||||||
background-color: white;
|
|
||||||
padding: 1rem;
|
|
||||||
border-radius: 0.5rem;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 500px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,320 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-if="visible" class="dialog-overlay">
|
|
||||||
<div class="dialog">
|
|
||||||
<h1 class="text-xl font-bold text-center mb-4">Offer Help</h1>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
|
|
||||||
placeholder="Description, prerequisites, terms, etc."
|
|
||||||
v-model="description"
|
|
||||||
/>
|
|
||||||
<div class="flex flex-row mt-2">
|
|
||||||
<span
|
|
||||||
class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center text-blue-500 px-2 py-2"
|
|
||||||
@click="changeUnitCode()"
|
|
||||||
>
|
|
||||||
{{ libsUtil.UNIT_SHORT[amountUnitCode] }}
|
|
||||||
</span>
|
|
||||||
<div
|
|
||||||
class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
|
|
||||||
@click="decrement()"
|
|
||||||
v-if="amountInput !== '0'"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" />
|
|
||||||
</div>
|
|
||||||
<input
|
|
||||||
type="number"
|
|
||||||
class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
|
|
||||||
v-model="amountInput"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
|
|
||||||
@click="increment()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-right" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex flex-row mt-2">
|
|
||||||
<span
|
|
||||||
class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
|
|
||||||
>
|
|
||||||
Expiration
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
class="w-full border border-slate-400 px-2 py-2 rounded-r"
|
|
||||||
:placeholder="'Date, eg. ' + new Date().toISOString().slice(0, 10)"
|
|
||||||
v-model="expirationDateInput"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<p class="text-center mt-6 mb-2 italic">
|
|
||||||
Sign & Send to publish to the world
|
|
||||||
</p>
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
|
|
||||||
@click="confirm"
|
|
||||||
>
|
|
||||||
Sign & Send
|
|
||||||
</button>
|
|
||||||
<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-1.5 py-2 rounded-md"
|
|
||||||
@click="cancel"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Vue, Component, Prop } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { createAndSubmitOffer } from "@/libs/endorserServer";
|
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
|
||||||
|
|
||||||
@Component
|
|
||||||
export default class OfferDialog extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
@Prop message = "";
|
|
||||||
@Prop projectId = "";
|
|
||||||
|
|
||||||
activeDid = "";
|
|
||||||
apiServer = "";
|
|
||||||
|
|
||||||
amountInput = "0";
|
|
||||||
amountUnitCode = "HUR";
|
|
||||||
description = "";
|
|
||||||
expirationDateInput = "";
|
|
||||||
visible = false;
|
|
||||||
|
|
||||||
libsUtil = libsUtil;
|
|
||||||
|
|
||||||
async open() {
|
|
||||||
try {
|
|
||||||
await db.open();
|
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
|
||||||
this.apiServer = settings?.apiServer || "";
|
|
||||||
this.activeDid = settings?.activeDid || "";
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (err: any) {
|
|
||||||
console.error("Error retrieving settings from database:", err);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: err.message || "There was an error retrieving your settings.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.visible = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
close() {
|
|
||||||
// close the dialog but don't change values (since it might be submitting info)
|
|
||||||
this.visible = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
changeUnitCode() {
|
|
||||||
const units = Object.keys(this.libsUtil.UNIT_SHORT);
|
|
||||||
const index = units.indexOf(this.amountUnitCode);
|
|
||||||
this.amountUnitCode = units[(index + 1) % units.length];
|
|
||||||
}
|
|
||||||
|
|
||||||
increment() {
|
|
||||||
this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
decrement() {
|
|
||||||
this.amountInput = `${Math.max(
|
|
||||||
0,
|
|
||||||
(parseFloat(this.amountInput) || 1) - 1,
|
|
||||||
)}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel() {
|
|
||||||
this.close();
|
|
||||||
this.eraseValues();
|
|
||||||
}
|
|
||||||
|
|
||||||
eraseValues() {
|
|
||||||
this.description = "";
|
|
||||||
this.amountInput = "0";
|
|
||||||
this.amountUnitCode = "HUR";
|
|
||||||
}
|
|
||||||
|
|
||||||
async confirm() {
|
|
||||||
this.close();
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "toast",
|
|
||||||
text: "Recording the offer...",
|
|
||||||
title: "",
|
|
||||||
},
|
|
||||||
1000,
|
|
||||||
);
|
|
||||||
// this is asynchronous, but we don't need to wait for it to complete
|
|
||||||
this.recordOffer(
|
|
||||||
this.description,
|
|
||||||
parseFloat(this.amountInput),
|
|
||||||
this.amountUnitCode,
|
|
||||||
this.expirationDateInput,
|
|
||||||
).then(() => {
|
|
||||||
this.description = "";
|
|
||||||
this.amountInput = "0";
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param description may be an empty string
|
|
||||||
* @param hours may be 0
|
|
||||||
* @param unitCode may be omitted, defaults to "HUR"
|
|
||||||
*/
|
|
||||||
public async recordOffer(
|
|
||||||
description: string,
|
|
||||||
amount: number,
|
|
||||||
unitCode: string = "HUR",
|
|
||||||
expirationDateInput?: string,
|
|
||||||
) {
|
|
||||||
if (!this.activeDid) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "You must select an identifier before you can record an offer.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!description && !amount) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: `You must enter a description or some number of ${this.libsUtil.UNIT_LONG[unitCode]}.`,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const identity = await libsUtil.getIdentity(this.activeDid);
|
|
||||||
const result = await createAndSubmitOffer(
|
|
||||||
this.axios,
|
|
||||||
this.apiServer,
|
|
||||||
identity,
|
|
||||||
description,
|
|
||||||
amount,
|
|
||||||
unitCode,
|
|
||||||
expirationDateInput,
|
|
||||||
this.projectId,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (
|
|
||||||
result.type === "error" ||
|
|
||||||
this.isOfferCreationError(result.response)
|
|
||||||
) {
|
|
||||||
const errorMessage = this.getOfferCreationErrorMessage(result);
|
|
||||||
console.error("Error with offer creation result:", result);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: errorMessage || "There was an error creating the offer.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Success",
|
|
||||||
text: "That offer was recorded.",
|
|
||||||
},
|
|
||||||
10000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error("Error with offer recordation caught:", error);
|
|
||||||
const message =
|
|
||||||
error.userMessage ||
|
|
||||||
error.response?.data?.error?.message ||
|
|
||||||
"There was an error recording the offer.";
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: message,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper functions for readability
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param result response "data" from the server
|
|
||||||
* @returns true if the result indicates an error
|
|
||||||
*/
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
isOfferCreationError(result: any) {
|
|
||||||
return result.status !== 201 || result.data?.error;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
|
|
||||||
* @returns best guess at an error message
|
|
||||||
*/
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
getOfferCreationErrorMessage(result: any) {
|
|
||||||
return (
|
|
||||||
result.error?.userMessage ||
|
|
||||||
result.error?.error ||
|
|
||||||
result.response?.data?.error?.message
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.dialog-overlay {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
background-color: rgba(0, 0, 0, 0.5);
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dialog {
|
|
||||||
background-color: white;
|
|
||||||
padding: 1rem;
|
|
||||||
border-radius: 0.5rem;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 500px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-html="generateIdenticon()" class="w-fit"></div>
|
|
||||||
</template>
|
|
||||||
<script lang="ts">
|
|
||||||
import { toSvg } from "jdenticon";
|
|
||||||
import { Vue, Component, Prop } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
const BLANK_CONFIG = {
|
|
||||||
lightness: {
|
|
||||||
color: [1.0, 1.0],
|
|
||||||
grayscale: [1.0, 1.0],
|
|
||||||
},
|
|
||||||
saturation: {
|
|
||||||
color: 0.0,
|
|
||||||
grayscale: 0.0,
|
|
||||||
},
|
|
||||||
backColor: "#0000",
|
|
||||||
};
|
|
||||||
|
|
||||||
@Component
|
|
||||||
export default class ProjectIcon extends Vue {
|
|
||||||
@Prop entityId = "";
|
|
||||||
@Prop iconSize = 0;
|
|
||||||
|
|
||||||
generateIdenticon() {
|
|
||||||
const config = this.entityId ? undefined : BLANK_CONFIG;
|
|
||||||
const svgString = toSvg(this.entityId, this.iconSize, config);
|
|
||||||
return svgString;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
<style scoped></style>
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<!-- QUICK NAV -->
|
<!-- QUICK NAV -->
|
||||||
<nav id="QuickNav" class="fixed bottom-0 left-0 right-0 bg-slate-200 z-50">
|
<nav id="QuickNav" class="fixed bottom-0 left-0 right-0 bg-slate-200 z-50">
|
||||||
<ul class="flex text-2xl p-2 gap-2 max-w-3xl mx-auto">
|
<ul class="flex text-2xl p-2 gap-2">
|
||||||
<!-- Home Feed -->
|
<!-- Home Feed -->
|
||||||
<li
|
<li
|
||||||
:class="{
|
:class="{
|
||||||
|
|||||||
@@ -1,52 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="text-center text-red-500">{{ message }}</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Vue, Prop } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import { AppString, NotificationIface } from "@/constants/app";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
|
||||||
|
|
||||||
@Component
|
|
||||||
export default class TopMessage extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
@Prop selected = "";
|
|
||||||
|
|
||||||
message = "";
|
|
||||||
|
|
||||||
async mounted() {
|
|
||||||
try {
|
|
||||||
await db.open();
|
|
||||||
|
|
||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
|
||||||
if (
|
|
||||||
settings?.warnIfTestServer &&
|
|
||||||
settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER
|
|
||||||
) {
|
|
||||||
const didPrefix = settings.activeDid?.slice(11, 15);
|
|
||||||
this.message = "You're linked to a non-prod server, user " + didPrefix;
|
|
||||||
} else if (
|
|
||||||
settings?.warnIfProdServer &&
|
|
||||||
settings.apiServer === AppString.PROD_ENDORSER_API_SERVER
|
|
||||||
) {
|
|
||||||
const didPrefix = settings.activeDid?.slice(11, 15);
|
|
||||||
this.message =
|
|
||||||
"You're linked to the production server, user " + didPrefix;
|
|
||||||
}
|
|
||||||
} catch (err: unknown) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error Detecting Server",
|
|
||||||
text: JSON.stringify(err),
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,43 +1,12 @@
|
|||||||
/**
|
/**
|
||||||
* Generic strings that could be used throughout the app.
|
* Generic strings that could be used throughout the app.
|
||||||
*
|
|
||||||
* See also ../libs/veramo/setup.ts
|
|
||||||
*/
|
*/
|
||||||
export enum AppString {
|
export enum AppString {
|
||||||
|
APP_NAME = "Kick-Start with Time",
|
||||||
|
|
||||||
PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
|
PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
|
||||||
TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
|
TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
|
||||||
LOCAL_ENDORSER_API_SERVER = "http://localhost:3000",
|
LOCAL_ENDORSER_API_SERVER = "http://localhost:3000",
|
||||||
|
|
||||||
PROD_PUSH_SERVER = "https://timesafari.app",
|
DEFAULT_ENDORSER_API_SERVER = TEST_ENDORSER_API_SERVER,
|
||||||
TEST1_PUSH_SERVER = "https://test.timesafari.app",
|
|
||||||
TEST2_PUSH_SERVER = "https://timesafari-pwa.anomalistlabs.com",
|
|
||||||
|
|
||||||
PROD_IMAGE_API_SERVER = "https://image-api.timesafari.app",
|
|
||||||
TEST_IMAGE_API_SERVER = "https://test-image-api.timesafari.app",
|
|
||||||
LOCAL_IMAGE_API_SERVER = "http://localhost:3001",
|
|
||||||
|
|
||||||
NO_CONTACT_NAME = "(no name)",
|
|
||||||
}
|
|
||||||
|
|
||||||
export const DEFAULT_ENDORSER_API_SERVER =
|
|
||||||
import.meta.env.VITE_DEFAULT_ENDORSER_API_SERVER ||
|
|
||||||
AppString.TEST_ENDORSER_API_SERVER;
|
|
||||||
|
|
||||||
export const DEFAULT_IMAGE_API_SERVER =
|
|
||||||
import.meta.env.VITE_DEFAULT_IMAGE_API_SERVER ||
|
|
||||||
AppString.TEST_IMAGE_API_SERVER;
|
|
||||||
|
|
||||||
export const DEFAULT_PUSH_SERVER =
|
|
||||||
window.location.protocol + "//" + window.location.host;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The possible values for "group" and "type" are in App.vue.
|
|
||||||
* From the notiwind package
|
|
||||||
*/
|
|
||||||
export interface NotificationIface {
|
|
||||||
group: string; // "alert" | "modal"
|
|
||||||
type: string; // "toast" | "info" | "success" | "warning" | "danger"
|
|
||||||
title: string;
|
|
||||||
text: string;
|
|
||||||
onYes?: () => Promise<void>;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,57 +1,69 @@
|
|||||||
import BaseDexie, { Table } from "dexie";
|
import BaseDexie, { Table } from "dexie";
|
||||||
import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
|
import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
|
||||||
import { Account, AccountsSchema } from "./tables/accounts";
|
import { Account, AccountsSchema } from "./tables/accounts";
|
||||||
import { Contact, ContactSchema } from "./tables/contacts";
|
import { Contact, ContactsSchema } from "./tables/contacts";
|
||||||
import { Log, LogSchema } from "./tables/logs";
|
|
||||||
import {
|
import {
|
||||||
MASTER_SETTINGS_KEY,
|
MASTER_SETTINGS_KEY,
|
||||||
Settings,
|
Settings,
|
||||||
SettingsSchema,
|
SettingsSchema,
|
||||||
} from "./tables/settings";
|
} from "./tables/settings";
|
||||||
import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
|
import { AppString } from "@/constants/app";
|
||||||
|
|
||||||
|
// a separate DB because the seed is super-sensitive data
|
||||||
|
type SensitiveTables = {
|
||||||
|
accounts: Table<Account>;
|
||||||
|
};
|
||||||
|
|
||||||
// Define types for tables that hold sensitive and non-sensitive data
|
|
||||||
type SensitiveTables = { accounts: Table<Account> };
|
|
||||||
type NonsensitiveTables = {
|
type NonsensitiveTables = {
|
||||||
contacts: Table<Contact>;
|
contacts: Table<Contact>;
|
||||||
logs: Table<Log>;
|
|
||||||
settings: Table<Settings>;
|
settings: Table<Settings>;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Using 'unknown' instead of 'any' for stricter typing and to avoid TypeScript warnings
|
/**
|
||||||
|
* In order to make the next line be acceptable, the program needs to have its linter suppress a rule:
|
||||||
|
* https://typescript-eslint.io/rules/no-unnecessary-type-constraint/
|
||||||
|
*
|
||||||
|
* and change *any* to *unknown*
|
||||||
|
*
|
||||||
|
* https://9to5answer.com/how-to-bypass-warning-unexpected-any-specify-a-different-type-typescript-eslint-no-explicit-any
|
||||||
|
*/
|
||||||
export type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
|
export type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
|
||||||
|
export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
|
||||||
|
const SensitiveSchemas = Object.assign({}, AccountsSchema);
|
||||||
|
|
||||||
export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
|
export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
|
||||||
BaseDexie & T;
|
BaseDexie & T;
|
||||||
|
|
||||||
// Initialize Dexie databases for sensitive and non-sensitive data
|
|
||||||
export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
|
|
||||||
const SensitiveSchemas = { ...AccountsSchema };
|
|
||||||
|
|
||||||
export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
|
export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
|
||||||
const NonsensitiveSchemas = {
|
const NonsensitiveSchemas = Object.assign({}, ContactsSchema, SettingsSchema);
|
||||||
...ContactSchema,
|
|
||||||
...LogSchema,
|
|
||||||
...SettingsSchema,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Manage the encryption key. If not present in localStorage, create and store it.
|
/**
|
||||||
|
* Needed to enable a special webpack setting to allow *await* below:
|
||||||
|
* https://stackoverflow.com/questions/72474803/error-the-top-level-await-experiment-is-not-enabled-set-experiments-toplevelaw
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create password and place password in localStorage.
|
||||||
|
*
|
||||||
|
* It's good practice to keep the data encrypted at rest, so we'll do that even
|
||||||
|
* if the secret is stored right next to the app.
|
||||||
|
*/
|
||||||
const secret =
|
const secret =
|
||||||
localStorage.getItem("secret") || Encryption.createRandomEncryptionKey();
|
localStorage.getItem("secret") || Encryption.createRandomEncryptionKey();
|
||||||
if (!localStorage.getItem("secret")) localStorage.setItem("secret", secret);
|
|
||||||
|
|
||||||
// Apply encryption to the sensitive database using the secret key
|
if (localStorage.getItem("secret") == null) {
|
||||||
|
localStorage.setItem("secret", secret);
|
||||||
|
}
|
||||||
|
|
||||||
encrypted(accountsDB, { secretKey: secret });
|
encrypted(accountsDB, { secretKey: secret });
|
||||||
|
|
||||||
// Define the schema for our databases
|
|
||||||
accountsDB.version(1).stores(SensitiveSchemas);
|
accountsDB.version(1).stores(SensitiveSchemas);
|
||||||
// v1 was contacts & settings
|
|
||||||
// v2 added logs
|
|
||||||
db.version(2).stores(NonsensitiveSchemas);
|
|
||||||
|
|
||||||
// Event handler to initialize the non-sensitive database with default settings
|
db.version(1).stores(NonsensitiveSchemas);
|
||||||
db.on("populate", () => {
|
|
||||||
|
// initialize, a la https://dexie.org/docs/Tutorial/Design#the-populate-event
|
||||||
|
db.on("populate", function () {
|
||||||
|
// ensure there's an initial entry for settings
|
||||||
db.settings.add({
|
db.settings.add({
|
||||||
id: MASTER_SETTINGS_KEY,
|
id: MASTER_SETTINGS_KEY,
|
||||||
apiServer: DEFAULT_ENDORSER_API_SERVER,
|
apiServer: AppString.DEFAULT_ENDORSER_API_SERVER,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,50 +1,17 @@
|
|||||||
/**
|
|
||||||
* Represents an account stored in the database.
|
|
||||||
*/
|
|
||||||
export type Account = {
|
export type Account = {
|
||||||
/**
|
id?: number; // auto-generated by Dexie
|
||||||
* Auto-generated ID by Dexie.
|
|
||||||
*/
|
|
||||||
id?: number;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The date the account was created.
|
|
||||||
*/
|
|
||||||
dateCreated: string;
|
dateCreated: string;
|
||||||
|
|
||||||
/**
|
|
||||||
* The derivation path for the account.
|
|
||||||
*/
|
|
||||||
derivationPath: string;
|
derivationPath: string;
|
||||||
|
|
||||||
/**
|
|
||||||
* Decentralized Identifier (DID) for the account.
|
|
||||||
*/
|
|
||||||
did: string;
|
did: string;
|
||||||
|
// stringified JSON containing underlying key material of type IIdentifier
|
||||||
/**
|
// https://github.com/uport-project/veramo/blob/next/packages/core-types/src/types/IIdentifier.ts
|
||||||
* Stringified JSON containing underlying key material.
|
|
||||||
* Based on the IIdentifier type from Veramo.
|
|
||||||
* @see {@link https://github.com/uport-project/veramo/blob/next/packages/core-types/src/types/IIdentifier.ts}
|
|
||||||
*/
|
|
||||||
identity: string;
|
identity: string;
|
||||||
|
|
||||||
/**
|
|
||||||
* The public key in hexadecimal format.
|
|
||||||
*/
|
|
||||||
publicKeyHex: string;
|
publicKeyHex: string;
|
||||||
|
|
||||||
/**
|
|
||||||
* The mnemonic passphrase for the account.
|
|
||||||
*/
|
|
||||||
mnemonic: string;
|
mnemonic: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
// mark encrypted field by starting with a $ character
|
||||||
* Schema for the accounts table in the database.
|
// see https://github.com/PVermeer/dexie-addon-suite-monorepo/tree/master/packages/dexie-encrypted-addon
|
||||||
* Fields starting with a $ character are encrypted.
|
|
||||||
* @see {@link https://github.com/PVermeer/dexie-addon-suite-monorepo/tree/master/packages/dexie-encrypted-addon}
|
|
||||||
*/
|
|
||||||
export const AccountsSchema = {
|
export const AccountsSchema = {
|
||||||
accounts:
|
accounts:
|
||||||
"++id, dateCreated, derivationPath, did, $identity, $mnemonic, publicKeyHex",
|
"++id, dateCreated, derivationPath, did, $identity, $mnemonic, publicKeyHex",
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
export interface Contact {
|
export interface Contact {
|
||||||
did: string;
|
did: string;
|
||||||
name?: string;
|
name?: string;
|
||||||
nextPubKeyHashB64?: string; // base64-encoded SHA256 hash of next public key
|
|
||||||
publicKeyBase64?: string;
|
publicKeyBase64?: string;
|
||||||
seesMe?: boolean;
|
seesMe?: boolean;
|
||||||
registered?: boolean;
|
registered?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ContactSchema = {
|
export const ContactsSchema = {
|
||||||
contacts: "&did, name", // no need to key by other things
|
contacts: "++did, name, publicKeyBase64, registered, seesMe",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
export interface Log {
|
|
||||||
date: string;
|
|
||||||
message: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const LogSchema = {
|
|
||||||
// Currently keyed by "date" because A) today's log data is what we need so we append, and
|
|
||||||
// B) we don't want it to grow so we remove everything if this is the first entry today.
|
|
||||||
// See safari-notifications.js logMessage for the associated logic.
|
|
||||||
logs: "date", // definitely don't key by the potentially large message field
|
|
||||||
};
|
|
||||||
@@ -1,59 +1,17 @@
|
|||||||
/**
|
// a singleton
|
||||||
* BoundingBox type describes the geographical bounding box coordinates.
|
|
||||||
*/
|
|
||||||
export type BoundingBox = {
|
|
||||||
eastLong: number; // Eastern longitude
|
|
||||||
maxLat: number; // Maximum (Northernmost) latitude
|
|
||||||
minLat: number; // Minimum (Southernmost) latitude
|
|
||||||
westLong: number; // Western longitude
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Settings type encompasses user-specific configuration details.
|
|
||||||
*/
|
|
||||||
export type Settings = {
|
export type Settings = {
|
||||||
id: number; // Only one entry, keyed with MASTER_SETTINGS_KEY
|
id: number; // there's only one entry: MASTER_SETTINGS_KEY
|
||||||
|
|
||||||
activeDid?: string; // Active Decentralized ID
|
activeDid?: string;
|
||||||
apiServer?: string; // API server URL
|
apiServer?: string;
|
||||||
|
firstName?: string;
|
||||||
filterFeedByNearby?: boolean; // filter by nearby
|
lastName?: string;
|
||||||
filterFeedByVisible?: boolean; // filter by visible users ie. anyone not hidden
|
lastViewedClaimId?: string;
|
||||||
|
showContactGivesInline?: boolean;
|
||||||
firstName?: string; // User's first name
|
|
||||||
isRegistered?: boolean;
|
|
||||||
lastName?: string; // deprecated - put all names in firstName
|
|
||||||
lastNotifiedClaimId?: string; // Last notified claim ID
|
|
||||||
lastViewedClaimId?: string; // Last viewed claim ID
|
|
||||||
reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
|
|
||||||
reminderOn?: boolean; // Toggle to enable or disable reminders
|
|
||||||
|
|
||||||
// Array of named search boxes defined by bounding boxes
|
|
||||||
searchBoxes?: Array<{
|
|
||||||
name: string;
|
|
||||||
bbox: BoundingBox;
|
|
||||||
}>;
|
|
||||||
|
|
||||||
showContactGivesInline?: boolean; // Display contact inline or not
|
|
||||||
showShortcutBvc?: boolean; // Show shortcut for BVC actions
|
|
||||||
vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
|
|
||||||
warnIfProdServer?: boolean; // Warn if using a production server
|
|
||||||
warnIfTestServer?: boolean; // Warn if using a testing server
|
|
||||||
webPushServer?: string; // Web Push server URL
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export function isAnyFeedFilterOn(settings: Settings): boolean {
|
|
||||||
return !!(settings.filterFeedByNearby || settings.filterFeedByVisible);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schema for the Settings table in the database.
|
|
||||||
*/
|
|
||||||
export const SettingsSchema = {
|
export const SettingsSchema = {
|
||||||
settings: "id",
|
settings: "id",
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Constants.
|
|
||||||
*/
|
|
||||||
export const MASTER_SETTINGS_KEY = 1;
|
export const MASTER_SETTINGS_KEY = 1;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { IIdentifier } from "@veramo/core";
|
import { IIdentifier } from "@veramo/core";
|
||||||
|
import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
|
||||||
import { getRandomBytesSync } from "ethereum-cryptography/random";
|
import { getRandomBytesSync } from "ethereum-cryptography/random";
|
||||||
import { entropyToMnemonic } from "ethereum-cryptography/bip39";
|
import { entropyToMnemonic } from "ethereum-cryptography/bip39";
|
||||||
import { wordlist } from "ethereum-cryptography/bip39/wordlists/english";
|
import { wordlist } from "ethereum-cryptography/bip39/wordlists/english";
|
||||||
@@ -6,10 +7,7 @@ import { HDNode } from "@ethersproject/hdnode";
|
|||||||
import * as didJwt from "did-jwt";
|
import * as didJwt from "did-jwt";
|
||||||
import * as u8a from "uint8arrays";
|
import * as u8a from "uint8arrays";
|
||||||
|
|
||||||
import { ENDORSER_JWT_URL_LOCATION } from "@/libs/endorserServer";
|
export const DEFAULT_ROOT_DERIVATION_PATH = "m/76798669'/0'/0'/0'";
|
||||||
import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
|
|
||||||
|
|
||||||
export const DEFAULT_ROOT_DERIVATION_PATH = "m/84737769'/0'/0'/0'";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@@ -113,7 +111,7 @@ export const sign = async (privateKeyHex: string) => {
|
|||||||
* The SimpleSigner returns a configured function for signing data.
|
* The SimpleSigner returns a configured function for signing data.
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* const signer = SimpleSigner(import.meta.env.PRIVATE_KEY)
|
* const signer = SimpleSigner(process.env.PRIVATE_KEY)
|
||||||
* signer(data, (err, signature) => {
|
* signer(data, (err, signature) => {
|
||||||
* ...
|
* ...
|
||||||
* })
|
* })
|
||||||
@@ -152,40 +150,3 @@ export function fromJose(signature: string): {
|
|||||||
export function bytesToHex(b: Uint8Array): string {
|
export function bytesToHex(b: Uint8Array): string {
|
||||||
return u8a.toString(b, "base16");
|
return u8a.toString(b, "base16");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
@return results of uportJwtPayload:
|
|
||||||
{ iat: number, iss: string (DID), own: { name, publicEncKey (base64-encoded key) } }
|
|
||||||
|
|
||||||
Note that similar code is also contained in time-safari
|
|
||||||
*/
|
|
||||||
export const getContactPayloadFromJwtUrl = (jwtUrlText: string) => {
|
|
||||||
let jwtText = jwtUrlText;
|
|
||||||
const endorserContextLoc = jwtText.indexOf(ENDORSER_JWT_URL_LOCATION);
|
|
||||||
if (endorserContextLoc > -1) {
|
|
||||||
jwtText = jwtText.substring(
|
|
||||||
endorserContextLoc + ENDORSER_JWT_URL_LOCATION.length,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// JWT format: { header, payload, signature, data }
|
|
||||||
const jwt = didJwt.decodeJWT(jwtText);
|
|
||||||
|
|
||||||
return jwt.payload;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const nextDerivationPath = (origDerivPath: string) => {
|
|
||||||
let lastStr = origDerivPath.split("/").slice(-1)[0];
|
|
||||||
if (lastStr.endsWith("'")) {
|
|
||||||
lastStr = lastStr.slice(0, -1);
|
|
||||||
}
|
|
||||||
const lastNum = parseInt(lastStr, 10);
|
|
||||||
const newLastNum = lastNum + 1;
|
|
||||||
const newLastStr = newLastNum.toString() + (lastStr.endsWith("'") ? "'" : "");
|
|
||||||
const newDerivPath = origDerivPath
|
|
||||||
.split("/")
|
|
||||||
.slice(0, -1)
|
|
||||||
.concat([newLastStr])
|
|
||||||
.join("/");
|
|
||||||
return newDerivPath;
|
|
||||||
};
|
|
||||||
|
|||||||
276
src/libs/util.ts
@@ -1,276 +0,0 @@
|
|||||||
// many of these are also found in endorser-mobile utility.ts
|
|
||||||
|
|
||||||
import axios, { AxiosResponse } from "axios";
|
|
||||||
import { IIdentifier } from "@veramo/core";
|
|
||||||
import { useClipboard } from "@vueuse/core";
|
|
||||||
|
|
||||||
import { DEFAULT_PUSH_SERVER } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { Account } from "@/db/tables/accounts";
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
|
||||||
import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
|
|
||||||
import { GenericCredWrapper, containsHiddenDid } from "@/libs/endorserServer";
|
|
||||||
import * as serverUtil from "@/libs/endorserServer";
|
|
||||||
|
|
||||||
export const PRIVACY_MESSAGE =
|
|
||||||
"The data you send be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to those you allow.";
|
|
||||||
|
|
||||||
/* eslint-disable prettier/prettier */
|
|
||||||
export const UNIT_SHORT: Record<string, string> = {
|
|
||||||
"BTC": "BTC",
|
|
||||||
"ETH": "ETH",
|
|
||||||
"HUR": "Hours",
|
|
||||||
"USD": "US $",
|
|
||||||
};
|
|
||||||
/* eslint-enable prettier/prettier */
|
|
||||||
|
|
||||||
/* eslint-disable prettier/prettier */
|
|
||||||
export const UNIT_LONG: Record<string, string> = {
|
|
||||||
"BTC": "Bitcoin",
|
|
||||||
"ETH": "Ethereum",
|
|
||||||
"HUR": "hours",
|
|
||||||
"USD": "dollars",
|
|
||||||
};
|
|
||||||
/* eslint-enable prettier/prettier */
|
|
||||||
|
|
||||||
const UNIT_CODES: Record<string, Record<string, string>> = {
|
|
||||||
BTC: {
|
|
||||||
name: "Bitcoin",
|
|
||||||
faIcon: "bitcoin-sign",
|
|
||||||
},
|
|
||||||
HUR: {
|
|
||||||
name: "hours",
|
|
||||||
faIcon: "clock",
|
|
||||||
},
|
|
||||||
USD: {
|
|
||||||
name: "US Dollars",
|
|
||||||
faIcon: "dollar",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export function iconForUnitCode(unitCode: string) {
|
|
||||||
return UNIT_CODES[unitCode]?.faIcon || "question";
|
|
||||||
}
|
|
||||||
|
|
||||||
// from https://stackoverflow.com/a/175787/845494
|
|
||||||
// ... though it appears even this isn't precisely right so keep doing "|| 0" or something in sensitive places
|
|
||||||
//
|
|
||||||
export function isNumeric(str: string): boolean {
|
|
||||||
// This ignore commentary is because typescript complains when you pass a string to isNaN.
|
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
||||||
// @ts-ignore
|
|
||||||
return !isNaN(str) && !isNaN(parseFloat(str));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function numberOrZero(str: string): number {
|
|
||||||
return isNumeric(str) ? +str : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const isGlobalUri = (uri: string) => {
|
|
||||||
return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
|
|
||||||
};
|
|
||||||
|
|
||||||
export const giveIsConfirmable = (veriClaim: GenericCredWrapper) => {
|
|
||||||
return veriClaim.claimType === "GiveAction";
|
|
||||||
};
|
|
||||||
|
|
||||||
export const doCopyTwoSecRedo = (text: string, fn: () => void) => {
|
|
||||||
fn();
|
|
||||||
useClipboard()
|
|
||||||
.copy(text)
|
|
||||||
.then(() => setTimeout(fn, 2000));
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns true if the user can confirm the claim
|
|
||||||
* @param veriClaim is expected to have fields: claim, claimType, and issuer
|
|
||||||
*/
|
|
||||||
export const isGiveRecordTheUserCanConfirm = (
|
|
||||||
veriClaim: GenericCredWrapper,
|
|
||||||
activeDid: string,
|
|
||||||
confirmerIdList: string[] = [],
|
|
||||||
) => {
|
|
||||||
return (
|
|
||||||
giveIsConfirmable(veriClaim) &&
|
|
||||||
!confirmerIdList.includes(activeDid) &&
|
|
||||||
veriClaim.issuer !== activeDid &&
|
|
||||||
!containsHiddenDid(veriClaim.claim)
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns the DID of the person who offered, or undefined if hidden
|
|
||||||
* @param veriClaim is expected to have fields: claim and issuer
|
|
||||||
*/
|
|
||||||
export const offerGiverDid: (arg0: GenericCredWrapper) => string | undefined = (
|
|
||||||
veriClaim,
|
|
||||||
) => {
|
|
||||||
let giver;
|
|
||||||
if (
|
|
||||||
veriClaim.claim.offeredBy?.identifier &&
|
|
||||||
!serverUtil.isHiddenDid(veriClaim.claim.offeredBy.identifier as string)
|
|
||||||
) {
|
|
||||||
giver = veriClaim.claim.offeredBy.identifier;
|
|
||||||
} else if (veriClaim.issuer && !serverUtil.isHiddenDid(veriClaim.issuer)) {
|
|
||||||
giver = veriClaim.issuer;
|
|
||||||
}
|
|
||||||
return giver;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns true if the user can fulfill the offer
|
|
||||||
* @param veriClaim is expected to have fields: claim, claimType, and issuer
|
|
||||||
*/
|
|
||||||
export const canFulfillOffer = (veriClaim: GenericCredWrapper) => {
|
|
||||||
return !!(veriClaim.claimType === "Offer" && offerGiverDid(veriClaim));
|
|
||||||
};
|
|
||||||
|
|
||||||
// return object with paths and arrays of DIDs for any keys ending in "VisibleToDid"
|
|
||||||
export function findAllVisibleToDids(
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
input: any,
|
|
||||||
humanReadable = false,
|
|
||||||
): Record<string, Array<string>> {
|
|
||||||
if (Array.isArray(input)) {
|
|
||||||
const result: Record<string, Array<string>> = {};
|
|
||||||
for (let i = 0; i < input.length; i++) {
|
|
||||||
const inside = findAllVisibleToDids(input[i], humanReadable);
|
|
||||||
for (const key in inside) {
|
|
||||||
const pathKey = humanReadable
|
|
||||||
? "#" + (i + 1) + " " + key
|
|
||||||
: "[" + i + "]" + key;
|
|
||||||
result[pathKey] = inside[key];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
} else if (input instanceof Object) {
|
|
||||||
// regular map (non-array) object
|
|
||||||
const result: Record<string, Array<string>> = {};
|
|
||||||
for (const key in input) {
|
|
||||||
if (key.endsWith("VisibleToDids")) {
|
|
||||||
const newKey = key.slice(0, -"VisibleToDids".length);
|
|
||||||
const pathKey = humanReadable ? newKey : "." + newKey;
|
|
||||||
result[pathKey] = input[key];
|
|
||||||
} else {
|
|
||||||
const inside = findAllVisibleToDids(input[key], humanReadable);
|
|
||||||
for (const insideKey in inside) {
|
|
||||||
const pathKey = humanReadable
|
|
||||||
? key + "'s " + insideKey
|
|
||||||
: "." + key + insideKey;
|
|
||||||
result[pathKey] = inside[insideKey];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
} else {
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test findAllVisibleToDids
|
|
||||||
*
|
|
||||||
|
|
||||||
pkgx +deno.land sh
|
|
||||||
|
|
||||||
deno
|
|
||||||
|
|
||||||
import * as R from 'ramda';
|
|
||||||
//import { findAllVisibleToDids } from './src/libs/util'; // doesn't work because other dependencies fail so gotta copy-and-paste function
|
|
||||||
|
|
||||||
console.log(R.equals(findAllVisibleToDids(null), {}));
|
|
||||||
console.log(R.equals(findAllVisibleToDids(9), {}));
|
|
||||||
console.log(R.equals(findAllVisibleToDids([]), {}));
|
|
||||||
console.log(R.equals(findAllVisibleToDids({}), {}));
|
|
||||||
console.log(R.equals(findAllVisibleToDids({ issuer: "abc" }), {}));
|
|
||||||
console.log(R.equals(findAllVisibleToDids({ issuerVisibleToDids: ["abc"] }), { ".issuer": ["abc"] }));
|
|
||||||
console.log(R.equals(findAllVisibleToDids([{ issuerVisibleToDids: ["abc"] }]), { "[0].issuer": ["abc"] }));
|
|
||||||
console.log(R.equals(findAllVisibleToDids(["xyz", { fluff: { issuerVisibleToDids: ["abc"] } }]), { "[1].fluff.issuer": ["abc"] }));
|
|
||||||
console.log(R.equals(findAllVisibleToDids(["xyz", { fluff: { issuerVisibleToDids: ["abc"] }, stuff: [ { did: "HIDDEN", agentDidVisibleToDids: ["def", "ghi"] } ] }]), { "[1].fluff.issuer": ["abc"], "[1].stuff[0].agentDid": ["def", "ghi"] }));
|
|
||||||
|
|
||||||
*
|
|
||||||
**/
|
|
||||||
|
|
||||||
export const getIdentity = async (activeDid: string): Promise<IIdentifier> => {
|
|
||||||
await accountsDB.open();
|
|
||||||
const account = (await accountsDB.accounts
|
|
||||||
.where("did")
|
|
||||||
.equals(activeDid)
|
|
||||||
.first()) as Account;
|
|
||||||
const identity = JSON.parse(account?.identity || "null");
|
|
||||||
|
|
||||||
if (!identity) {
|
|
||||||
throw new Error(
|
|
||||||
`Attempted to load Offer records for DID ${activeDid} but no identifier was found`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return identity;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generates a new identity, saves it to the database, and sets it as the active identity.
|
|
||||||
* @return {Promise<string>} with the DID of the new identity
|
|
||||||
*/
|
|
||||||
export const generateSaveAndActivateIdentity = async (): Promise<string> => {
|
|
||||||
const mnemonic = generateSeed();
|
|
||||||
// address is 0x... ETH address, without "did:eth:"
|
|
||||||
const [address, privateHex, publicHex, derivationPath] =
|
|
||||||
deriveAddress(mnemonic);
|
|
||||||
|
|
||||||
const newId = newIdentifier(address, publicHex, privateHex, derivationPath);
|
|
||||||
const identity = JSON.stringify(newId);
|
|
||||||
|
|
||||||
await accountsDB.open();
|
|
||||||
await accountsDB.accounts.add({
|
|
||||||
dateCreated: new Date().toISOString(),
|
|
||||||
derivationPath: derivationPath,
|
|
||||||
did: newId.did,
|
|
||||||
identity: identity,
|
|
||||||
mnemonic: mnemonic,
|
|
||||||
publicKeyHex: newId.keys[0].publicKeyHex,
|
|
||||||
});
|
|
||||||
|
|
||||||
await db.settings.update(MASTER_SETTINGS_KEY, {
|
|
||||||
activeDid: newId.did,
|
|
||||||
});
|
|
||||||
|
|
||||||
return newId.did;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const sendTestThroughPushServer = async (
|
|
||||||
subscriptionJSON: PushSubscriptionJSON,
|
|
||||||
skipFilter: boolean,
|
|
||||||
): Promise<AxiosResponse> => {
|
|
||||||
await db.open();
|
|
||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
|
||||||
let pushUrl: string = DEFAULT_PUSH_SERVER as string;
|
|
||||||
if (settings?.webPushServer) {
|
|
||||||
pushUrl = settings.webPushServer;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is a special value that tells the service worker to send a direct notification to the device, skipping filters.
|
|
||||||
// This is shared with the service worker and should be a constant. Look for the same name in additional-scripts.js
|
|
||||||
// Use something other than "Daily Update" https://gitea.anomalistdesign.com/trent_larson/py-push-server/src/commit/3c0e196c11bc98060ec5934e99e7dbd591b5da4d/app.py#L213
|
|
||||||
const DIRECT_PUSH_TITLE = "DIRECT_NOTIFICATION";
|
|
||||||
|
|
||||||
const newPayload = {
|
|
||||||
// eslint-disable-next-line prettier/prettier
|
|
||||||
message: `Test, where you will see this message ${ skipFilter ? "un" : "" }filtered.`,
|
|
||||||
title: skipFilter ? DIRECT_PUSH_TITLE : "Your Web Push",
|
|
||||||
...subscriptionJSON,
|
|
||||||
};
|
|
||||||
console.log("Sending a test web push message:", newPayload);
|
|
||||||
const payloadStr = JSON.stringify(newPayload);
|
|
||||||
const response = await axios.post(
|
|
||||||
pushUrl + "/web-push/send-test",
|
|
||||||
payloadStr,
|
|
||||||
{
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
console.log("Got response from web push server:", response);
|
|
||||||
return response;
|
|
||||||
};
|
|
||||||
@@ -1,7 +1,151 @@
|
|||||||
// see also ../constants/app.ts and
|
// Created from the setup in https://veramo.io/docs/guides/react_native
|
||||||
|
|
||||||
|
// Core interfaces
|
||||||
|
/* import {
|
||||||
|
createAgent,
|
||||||
|
IDIDManager,
|
||||||
|
IResolver,
|
||||||
|
IDataStore,
|
||||||
|
IKeyManager,
|
||||||
|
} from "@veramo/core";
|
||||||
|
*/
|
||||||
|
// Core identity manager plugin
|
||||||
|
//import { DIDManager } from "@veramo/did-manager";
|
||||||
|
|
||||||
|
// Ethr did identity provider
|
||||||
|
//import { EthrDIDProvider } from "@veramo/did-provider-ethr";
|
||||||
|
|
||||||
|
// Core key manager plugin
|
||||||
|
//import { KeyManager } from "@veramo/key-manager";
|
||||||
|
|
||||||
|
// Custom key management system for RN
|
||||||
|
//import { KeyManagementSystem } from '@veramo/kms-local-react-native'
|
||||||
|
|
||||||
|
// Custom resolver
|
||||||
|
// Custom resolvers
|
||||||
|
//import { DIDResolverPlugin } from "@veramo/did-resolver";
|
||||||
|
/* import { Resolver } from "did-resolver";
|
||||||
|
import { getResolver as ethrDidResolver } from "ethr-did-resolver";
|
||||||
|
import { getResolver as webDidResolver } from "web-did-resolver";
|
||||||
|
*/
|
||||||
|
// for VCs and VPs https://veramo.io/docs/api/credential-w3c
|
||||||
|
//import { CredentialIssuer } from '@veramo/credential-w3c'
|
||||||
|
|
||||||
|
// Storage plugin using TypeOrm
|
||||||
|
/* import {
|
||||||
|
Entities,
|
||||||
|
KeyStore,
|
||||||
|
DIDStore,
|
||||||
|
IDataStoreORM,
|
||||||
|
} from "@veramo/data-store";
|
||||||
|
*/
|
||||||
|
// TypeORM is installed with @veramo/typeorm
|
||||||
|
//import { createConnection } from 'typeorm'
|
||||||
|
|
||||||
|
//import * as R from "ramda";
|
||||||
|
|
||||||
|
/*
|
||||||
|
import { Contact } from '../entity/contact'
|
||||||
|
import { Settings } from '../entity/settings'
|
||||||
|
import { PrivateData } from '../entity/privateData'
|
||||||
|
|
||||||
|
import { Initial1616938713828 } from '../migration/1616938713828-initial'
|
||||||
|
import { SettingsContacts1616967972293 } from '../migration/1616967972293-settings-contacts'
|
||||||
|
import { EncryptedSeed1637856484788 } from '../migration/1637856484788-EncryptedSeed'
|
||||||
|
import { HomeScreenConfig1639947962124 } from '../migration/1639947962124-HomeScreenConfig'
|
||||||
|
import { HandlePublicKeys1652142819353 } from '../migration/1652142819353-HandlePublicKeys'
|
||||||
|
import { LastClaimsSeen1656811846836 } from '../migration/1656811846836-LastClaimsSeen'
|
||||||
|
import { ContactRegistered1662256903367 }from '../migration/1662256903367-ContactRegistered'
|
||||||
|
import { PrivateData1663080623479 } from '../migration/1663080623479-PrivateData'
|
||||||
|
|
||||||
|
const ALL_ENTITIES = Entities.concat([Contact, Settings, PrivateData])
|
||||||
|
|
||||||
|
// Create react native DB connection configured by ormconfig.js
|
||||||
|
|
||||||
|
export const dbConnection = createConnection({
|
||||||
|
database: 'endorser-mobile.sqlite',
|
||||||
|
entities: ALL_ENTITIES,
|
||||||
|
location: 'default',
|
||||||
|
logging: ['error', 'info', 'warn'],
|
||||||
|
migrations: [ Initial1616938713828, SettingsContacts1616967972293, EncryptedSeed1637856484788, HomeScreenConfig1639947962124, HandlePublicKeys1652142819353, LastClaimsSeen1656811846836, ContactRegistered1662256903367, PrivateData1663080623479 ],
|
||||||
|
migrationsRun: true,
|
||||||
|
type: 'react-native',
|
||||||
|
})
|
||||||
|
*/
|
||||||
function didProviderName(netName: string) {
|
function didProviderName(netName: string) {
|
||||||
return "did:ethr" + (netName === "mainnet" ? "" : ":" + netName);
|
return "did:ethr" + (netName === "mainnet" ? "" : ":" + netName);
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DEFAULT_DID_PROVIDER_NAME = didProviderName("mainnet");
|
//const NETWORK_NAMES = ["mainnet", "rinkeby"];
|
||||||
|
|
||||||
|
const DEFAULT_DID_PROVIDER_NETWORK_NAME = "mainnet";
|
||||||
|
|
||||||
|
export const DEFAULT_DID_PROVIDER_NAME = didProviderName(
|
||||||
|
DEFAULT_DID_PROVIDER_NETWORK_NAME,
|
||||||
|
);
|
||||||
|
|
||||||
|
export const HANDY_APP = false;
|
||||||
|
|
||||||
|
// this is used as the object in RegisterAction claims
|
||||||
|
export const SERVICE_ID = "endorser.ch";
|
||||||
|
|
||||||
|
//const INFURA_PROJECT_ID = "INFURA_PROJECT_ID";
|
||||||
|
/*
|
||||||
|
const providers = {}
|
||||||
|
NETWORK_NAMES.forEach((networkName) => {
|
||||||
|
providers[didProviderName(networkName)] = new EthrDIDProvider({
|
||||||
|
defaultKms: 'local',
|
||||||
|
network: networkName,
|
||||||
|
rpcUrl: 'https://' + networkName + '.infura.io/v3/' + INFURA_PROJECT_ID,
|
||||||
|
gas: 1000001,
|
||||||
|
ttl: 60 * 60 * 24 * 30 * 12 + 1,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
const didManager = new DIDManager({
|
||||||
|
store: new DIDStore(dbConnection),
|
||||||
|
defaultProvider: DEFAULT_DID_PROVIDER_NAME,
|
||||||
|
providers: providers,
|
||||||
|
})
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* const basicDidResolvers = NETWORK_NAMES.map((networkName) => [
|
||||||
|
networkName,
|
||||||
|
new Resolver({
|
||||||
|
ethr: ethrDidResolver({
|
||||||
|
networks: [
|
||||||
|
{
|
||||||
|
name: networkName,
|
||||||
|
rpcUrl:
|
||||||
|
"https://" + networkName + ".infura.io/v3/" + INFURA_PROJECT_ID,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}).ethr,
|
||||||
|
web: webDidResolver().web,
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const basicResolverMap = R.fromPairs(basicDidResolvers)
|
||||||
|
|
||||||
|
export const DEFAULT_BASIC_RESOLVER = basicResolverMap[DEFAULT_DID_PROVIDER_NETWORK_NAME]
|
||||||
|
|
||||||
|
const agentDidResolvers = NETWORK_NAMES.map((networkName) => {
|
||||||
|
return new DIDResolverPlugin({
|
||||||
|
resolver: basicResolverMap[networkName],
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
let allPlugins = [
|
||||||
|
new CredentialIssuer(),
|
||||||
|
new KeyManager({
|
||||||
|
store: new KeyStore(dbConnection),
|
||||||
|
kms: {
|
||||||
|
local: new KeyManagementSystem(),
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
didManager,
|
||||||
|
].concat(agentDidResolvers)
|
||||||
|
*/
|
||||||
|
|
||||||
|
//export const agent = createAgent<IDIDManager & IKeyManager & IDataStore & IDataStoreORM & IResolver>({ plugins: allPlugins })
|
||||||
|
|||||||
36
src/main.ts
@@ -13,17 +13,10 @@ import { library } from "@fortawesome/fontawesome-svg-core";
|
|||||||
import {
|
import {
|
||||||
faArrowLeft,
|
faArrowLeft,
|
||||||
faArrowRight,
|
faArrowRight,
|
||||||
faArrowUpRightFromSquare,
|
|
||||||
faBan,
|
|
||||||
faBitcoinSign,
|
|
||||||
faBurst,
|
faBurst,
|
||||||
faCalendar,
|
faCalendar,
|
||||||
faCamera,
|
|
||||||
faCheck,
|
|
||||||
faChevronDown,
|
|
||||||
faChevronLeft,
|
faChevronLeft,
|
||||||
faChevronRight,
|
faChevronRight,
|
||||||
faChevronUp,
|
|
||||||
faCircle,
|
faCircle,
|
||||||
faCircleCheck,
|
faCircleCheck,
|
||||||
faCircleInfo,
|
faCircleInfo,
|
||||||
@@ -33,39 +26,29 @@ import {
|
|||||||
faCoins,
|
faCoins,
|
||||||
faComment,
|
faComment,
|
||||||
faCopy,
|
faCopy,
|
||||||
faDollar,
|
|
||||||
faEllipsisVertical,
|
faEllipsisVertical,
|
||||||
faEye,
|
faEye,
|
||||||
faEyeSlash,
|
faEyeSlash,
|
||||||
faFileLines,
|
faFileLines,
|
||||||
faFloppyDisk,
|
faFloppyDisk,
|
||||||
faFolderOpen,
|
faFolderOpen,
|
||||||
faForward,
|
|
||||||
faGift,
|
faGift,
|
||||||
faGlobe,
|
|
||||||
faHammer,
|
|
||||||
faHand,
|
faHand,
|
||||||
faHandHoldingHeart,
|
|
||||||
faHouseChimney,
|
faHouseChimney,
|
||||||
faLeftRight,
|
|
||||||
faLocationDot,
|
faLocationDot,
|
||||||
faLongArrowAltLeft,
|
faLongArrowAltLeft,
|
||||||
faLongArrowAltRight,
|
faLongArrowAltRight,
|
||||||
faMagnifyingGlass,
|
faMagnifyingGlass,
|
||||||
faMessage,
|
|
||||||
faMinus,
|
|
||||||
faPen,
|
faPen,
|
||||||
faPersonCircleCheck,
|
faPersonCircleCheck,
|
||||||
faPersonCircleQuestion,
|
faPersonCircleQuestion,
|
||||||
faPlus,
|
faPlus,
|
||||||
faQuestion,
|
|
||||||
faQrcode,
|
faQrcode,
|
||||||
faRotate,
|
faRotate,
|
||||||
faShareNodes,
|
faShareNodes,
|
||||||
faSpinner,
|
faSpinner,
|
||||||
faSquareCaretDown,
|
faSquareCaretDown,
|
||||||
faSquareCaretUp,
|
faSquareCaretUp,
|
||||||
faSquarePlus,
|
|
||||||
faTrashCan,
|
faTrashCan,
|
||||||
faTriangleExclamation,
|
faTriangleExclamation,
|
||||||
faUser,
|
faUser,
|
||||||
@@ -76,17 +59,10 @@ import {
|
|||||||
library.add(
|
library.add(
|
||||||
faArrowLeft,
|
faArrowLeft,
|
||||||
faArrowRight,
|
faArrowRight,
|
||||||
faArrowUpRightFromSquare,
|
|
||||||
faBan,
|
|
||||||
faBitcoinSign,
|
|
||||||
faBurst,
|
faBurst,
|
||||||
faCalendar,
|
faCalendar,
|
||||||
faCamera,
|
|
||||||
faCheck,
|
|
||||||
faChevronDown,
|
|
||||||
faChevronLeft,
|
faChevronLeft,
|
||||||
faChevronRight,
|
faChevronRight,
|
||||||
faChevronUp,
|
|
||||||
faCircle,
|
faCircle,
|
||||||
faCircleCheck,
|
faCircleCheck,
|
||||||
faCircleInfo,
|
faCircleInfo,
|
||||||
@@ -96,39 +72,29 @@ library.add(
|
|||||||
faCoins,
|
faCoins,
|
||||||
faComment,
|
faComment,
|
||||||
faCopy,
|
faCopy,
|
||||||
faDollar,
|
|
||||||
faEllipsisVertical,
|
faEllipsisVertical,
|
||||||
faEye,
|
faEye,
|
||||||
faEyeSlash,
|
faEyeSlash,
|
||||||
faFileLines,
|
faFileLines,
|
||||||
faFloppyDisk,
|
faFloppyDisk,
|
||||||
faFolderOpen,
|
faFolderOpen,
|
||||||
faForward,
|
|
||||||
faGift,
|
faGift,
|
||||||
faGlobe,
|
|
||||||
faHammer,
|
|
||||||
faHand,
|
faHand,
|
||||||
faHandHoldingHeart,
|
|
||||||
faHouseChimney,
|
faHouseChimney,
|
||||||
faLeftRight,
|
|
||||||
faLocationDot,
|
faLocationDot,
|
||||||
faLongArrowAltLeft,
|
faLongArrowAltLeft,
|
||||||
faLongArrowAltRight,
|
faLongArrowAltRight,
|
||||||
faMagnifyingGlass,
|
faMagnifyingGlass,
|
||||||
faMessage,
|
|
||||||
faMinus,
|
|
||||||
faPen,
|
faPen,
|
||||||
faPersonCircleCheck,
|
faPersonCircleCheck,
|
||||||
faPersonCircleQuestion,
|
faPersonCircleQuestion,
|
||||||
faPlus,
|
faPlus,
|
||||||
faQrcode,
|
faQrcode,
|
||||||
faQuestion,
|
|
||||||
faRotate,
|
faRotate,
|
||||||
faShareNodes,
|
faShareNodes,
|
||||||
faSpinner,
|
faSpinner,
|
||||||
faSquareCaretDown,
|
faSquareCaretDown,
|
||||||
faSquareCaretUp,
|
faSquareCaretUp,
|
||||||
faSquarePlus,
|
|
||||||
faTrashCan,
|
faTrashCan,
|
||||||
faTriangleExclamation,
|
faTriangleExclamation,
|
||||||
faUser,
|
faUser,
|
||||||
@@ -137,11 +103,9 @@ library.add(
|
|||||||
);
|
);
|
||||||
|
|
||||||
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
||||||
import Camera from "simple-vue-camera";
|
|
||||||
|
|
||||||
createApp(App)
|
createApp(App)
|
||||||
.component("fa", FontAwesomeIcon)
|
.component("fa", FontAwesomeIcon)
|
||||||
.component("camera", Camera)
|
|
||||||
.use(createPinia())
|
.use(createPinia())
|
||||||
.use(VueAxios, axios)
|
.use(VueAxios, axios)
|
||||||
.use(router)
|
.use(router)
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
import { register } from "register-service-worker";
|
import { register } from "register-service-worker";
|
||||||
|
|
||||||
if (import.meta.env.NODE_ENV === "production") {
|
if (process.env.NODE_ENV === "production") {
|
||||||
register("/sw_scripts-combined.js", {
|
register(`${process.env.BASE_URL}service-worker.js`, {
|
||||||
ready() {
|
ready() {
|
||||||
console.log(
|
console.log(
|
||||||
"App is being served from cache by a service worker.\n" +
|
"App is being served from cache by a service worker.\n" +
|
||||||
|
|||||||
@@ -1,11 +1,5 @@
|
|||||||
import {
|
import { createRouter, createWebHistory, RouteRecordRaw } from "vue-router";
|
||||||
createRouter,
|
import { accountsDB } from "@/db";
|
||||||
createWebHistory,
|
|
||||||
NavigationGuardNext,
|
|
||||||
RouteLocationNormalized,
|
|
||||||
RouteRecordRaw,
|
|
||||||
} from "vue-router";
|
|
||||||
import { accountsDB } from "@/db/index";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@@ -13,11 +7,7 @@ import { accountsDB } from "@/db/index";
|
|||||||
* @param from :RouteLocationNormalized
|
* @param from :RouteLocationNormalized
|
||||||
* @param next :NavigationGuardNext
|
* @param next :NavigationGuardNext
|
||||||
*/
|
*/
|
||||||
const enterOrStart = async (
|
const enterOrStart = async (to, from, next) => {
|
||||||
to: RouteLocationNormalized,
|
|
||||||
from: RouteLocationNormalized,
|
|
||||||
next: NavigationGuardNext,
|
|
||||||
) => {
|
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const num_accounts = await accountsDB.accounts.count();
|
const num_accounts = await accountsDB.accounts.count();
|
||||||
if (num_accounts > 0) {
|
if (num_accounts > 0) {
|
||||||
@@ -29,170 +19,178 @@ const enterOrStart = async (
|
|||||||
|
|
||||||
const routes: Array<RouteRecordRaw> = [
|
const routes: Array<RouteRecordRaw> = [
|
||||||
{
|
{
|
||||||
path: "/account",
|
path: "/",
|
||||||
name: "account",
|
name: "home",
|
||||||
component: () => import("../views/AccountViewView.vue"),
|
component: () =>
|
||||||
|
import(/* webpackChunkName: "home" */ "../views/HomeView.vue"),
|
||||||
|
beforeEnter: enterOrStart,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/claim/:id?",
|
path: "/account",
|
||||||
name: "claim",
|
name: "account",
|
||||||
component: () => import("../views/ClaimView.vue"),
|
component: () =>
|
||||||
|
import(/* webpackChunkName: "account" */ "../views/AccountViewView.vue"),
|
||||||
|
beforeEnter: enterOrStart,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/confirm-contact",
|
path: "/confirm-contact",
|
||||||
name: "confirm-contact",
|
name: "confirm-contact",
|
||||||
component: () => import("../views/ConfirmContactView.vue"),
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "confirm-contact" */ "../views/ConfirmContactView.vue"
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/contact-amounts",
|
path: "/contact-amounts",
|
||||||
name: "contact-amounts",
|
name: "contact-amounts",
|
||||||
component: () => import("../views/ContactAmountsView.vue"),
|
component: () =>
|
||||||
},
|
import(
|
||||||
{
|
/* webpackChunkName: "contact-amounts" */ "../views/ContactAmountsView.vue"
|
||||||
path: "/contact-gives",
|
),
|
||||||
name: "contact-gives",
|
|
||||||
component: () => import("../views/ContactGiftingView.vue"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/contact-qr",
|
path: "/contact-qr",
|
||||||
name: "contact-qr",
|
name: "contact-qr",
|
||||||
component: () => import("../views/ContactQRScanShowView.vue"),
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "contact-qr" */ "../views/ContactQRScanShowView.vue"
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/contacts",
|
path: "/contacts",
|
||||||
name: "contacts",
|
name: "contacts",
|
||||||
component: () => import("../views/ContactsView.vue"),
|
component: () =>
|
||||||
},
|
import(/* webpackChunkName: "contacts" */ "../views/ContactsView.vue"),
|
||||||
{
|
|
||||||
path: "/discover",
|
|
||||||
name: "discover",
|
|
||||||
component: () => import("../views/DiscoverView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/gifted-details",
|
|
||||||
name: "gifted-details",
|
|
||||||
component: () => import("../views/GiftedDetails.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/help",
|
|
||||||
name: "help",
|
|
||||||
component: () => import("../views/HelpView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/help-notifications",
|
|
||||||
name: "help-notifications",
|
|
||||||
component: () => import("../views/HelpNotificationsView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/help-onboarding",
|
|
||||||
name: "help-onboarding",
|
|
||||||
component: () => import("../views/HelpOnboardingView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/",
|
|
||||||
name: "home",
|
|
||||||
component: () => import("../views/HomeView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/identity-switcher",
|
|
||||||
name: "identity-switcher",
|
|
||||||
component: () => import("../views/IdentitySwitcherView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/import-account",
|
|
||||||
name: "import-account",
|
|
||||||
component: () => import("../views/ImportAccountView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/import-derive",
|
|
||||||
name: "import-derive",
|
|
||||||
component: () => import("../views/ImportDerivedAccountView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/new-edit-account",
|
|
||||||
name: "new-edit-account",
|
|
||||||
component: () => import("../views/NewEditAccountView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/new-edit-project",
|
|
||||||
name: "new-edit-project",
|
|
||||||
component: () => import("../views/NewEditProjectView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/new-identifier",
|
|
||||||
name: "new-identifier",
|
|
||||||
component: () => import("../views/NewIdentifierView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/project/:id?",
|
|
||||||
name: "project",
|
|
||||||
component: () => import("../views/ProjectViewView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/projects",
|
|
||||||
name: "projects",
|
|
||||||
component: () => import("../views/ProjectsView.vue"),
|
|
||||||
beforeEnter: enterOrStart,
|
beforeEnter: enterOrStart,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: "/quick-action-bvc",
|
|
||||||
name: "quick-action-bvc",
|
|
||||||
component: () => import("../views/QuickActionBvcView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/quick-action-bvc-begin",
|
|
||||||
name: "quick-action-bvc-begin",
|
|
||||||
component: () => import("../views/QuickActionBvcBeginView.vue"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/quick-action-bvc-end",
|
|
||||||
name: "quick-action-bvc-end",
|
|
||||||
component: () => import("../views/QuickActionBvcEndView.vue"),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: "/scan-contact",
|
path: "/scan-contact",
|
||||||
name: "scan-contact",
|
name: "scan-contact",
|
||||||
component: () => import("../views/ContactScanView.vue"),
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/search-area",
|
path: "/discover",
|
||||||
name: "search-area",
|
name: "discover",
|
||||||
component: () => import("../views/SearchAreaView.vue"),
|
component: () =>
|
||||||
|
import(/* webpackChunkName: "discover" */ "../views/DiscoverView.vue"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/help",
|
||||||
|
name: "help",
|
||||||
|
component: () =>
|
||||||
|
import(/* webpackChunkName: "help" */ "../views/HelpView.vue"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/import-account",
|
||||||
|
name: "import-account",
|
||||||
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "import-account" */ "../views/ImportAccountView.vue"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/import-derive",
|
||||||
|
name: "import-derive",
|
||||||
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "import-derive" */ "../views/ImportDerivedAccountView.vue"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/new-edit-account",
|
||||||
|
name: "new-edit-account",
|
||||||
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "new-edit-account" */ "../views/NewEditAccountView.vue"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/new-edit-commitment",
|
||||||
|
name: "new-edit-commitment",
|
||||||
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "new-edit-commitment" */ "../views/NewEditCommitmentView.vue"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/new-edit-project",
|
||||||
|
name: "new-edit-project",
|
||||||
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "new-edit-project" */ "../views/NewEditProjectView.vue"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/new-identifier",
|
||||||
|
name: "new-identifier",
|
||||||
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "new-identifier" */ "../views/NewIdentifierView.vue"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/identity-switcher",
|
||||||
|
name: "identity-switcher",
|
||||||
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/project",
|
||||||
|
name: "project",
|
||||||
|
component: () =>
|
||||||
|
import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/projects",
|
||||||
|
name: "projects",
|
||||||
|
component: () =>
|
||||||
|
import(/* webpackChunkName: "projects" */ "../views/ProjectsView.vue"),
|
||||||
|
beforeEnter: enterOrStart,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/seed-backup",
|
path: "/seed-backup",
|
||||||
name: "seed-backup",
|
name: "seed-backup",
|
||||||
component: () => import("../views/SeedBackupView.vue"),
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "seed-backup" */ "../views/SeedBackupView.vue"
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/start",
|
path: "/start",
|
||||||
name: "start",
|
name: "start",
|
||||||
component: () => import("../views/StartView.vue"),
|
component: () =>
|
||||||
|
import(/* webpackChunkName: "start" */ "../views/StartView.vue"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/statistics",
|
path: "/statistics",
|
||||||
name: "statistics",
|
name: "statistics",
|
||||||
component: () => import("../views/StatisticsView.vue"),
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "statistics" */ "../views/StatisticsView.vue"
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/test",
|
path: "/contact-gives",
|
||||||
name: "test",
|
name: "contact-gives",
|
||||||
component: () => import("../views/TestView.vue"),
|
component: () =>
|
||||||
|
import(
|
||||||
|
/* webpackChunkName: "statistics" */ "../views/ContactGiftingView.vue"
|
||||||
|
),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
/** @type {*} */
|
/** @type {*} */
|
||||||
const router = createRouter({
|
const router = createRouter({
|
||||||
history: createWebHistory(import.meta.env.BASE_URL),
|
history: createWebHistory(process.env.BASE_URL),
|
||||||
routes,
|
routes,
|
||||||
});
|
});
|
||||||
|
|
||||||
const errorHandler = (
|
const errorHandler = (error, to, from) => {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
error: any,
|
|
||||||
to: RouteLocationNormalized,
|
|
||||||
from: RouteLocationNormalized,
|
|
||||||
) => {
|
|
||||||
// Handle the error here
|
// Handle the error here
|
||||||
console.error("Caught in top level error handler:", error, to, from);
|
console.error("Caught in top level error handler:", error, to, from);
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import axios from "axios";
|
|||||||
import * as didJwt from "did-jwt";
|
import * as didJwt from "did-jwt";
|
||||||
import { AppString } from "@/constants/app";
|
import { AppString } from "@/constants/app";
|
||||||
import { db } from "../db";
|
import { db } from "../db";
|
||||||
import { SERVICE_ID } from "../libs/endorserServer";
|
import { SERVICE_ID } from "../libs/veramo/setup";
|
||||||
import { deriveAddress, newIdentifier } from "../libs/crypto";
|
import { deriveAddress, newIdentifier } from "../libs/crypto";
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
|
|
||||||
|
|||||||
2185
src/util.d.ts
vendored
@@ -1,813 +0,0 @@
|
|||||||
<template>
|
|
||||||
<QuickNav />
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- Breadcrumb -->
|
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
|
||||||
<!-- Back -->
|
|
||||||
<button
|
|
||||||
@click="$router.go(-1)"
|
|
||||||
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</button>
|
|
||||||
Verifiable Claim Details
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Details -->
|
|
||||||
<div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
|
|
||||||
<div class="block flex gap-4 overflow-hidden">
|
|
||||||
<div class="overflow-hidden">
|
|
||||||
<h2 class="text-md font-bold">
|
|
||||||
{{ capitalizeAndInsertSpacesBeforeCaps(veriClaim.claimType) }}
|
|
||||||
</h2>
|
|
||||||
<div class="text-sm">
|
|
||||||
<div>
|
|
||||||
{{ veriClaim.id }}
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
libsUtil.doCopyTwoSecRedo(
|
|
||||||
veriClaim.id as string,
|
|
||||||
() => (showIdCopy = !showIdCopy),
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="ml-2 mr-2"
|
|
||||||
>
|
|
||||||
<fa icon="copy" class="text-slate-400 fa-fw"></fa>
|
|
||||||
</button>
|
|
||||||
<span v-show="showIdCopy">Copied ID</span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<fa icon="message" class="fa-fw text-slate-400"></fa>
|
|
||||||
{{ veriClaim.claim?.description }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<fa icon="user" class="fa-fw text-slate-400"></fa>
|
|
||||||
{{ veriClaim.issuer }}
|
|
||||||
<span v-if="!serverUtil.isEmptyOrHiddenDid(veriClaim.issuer)">
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
libsUtil.doCopyTwoSecRedo(
|
|
||||||
veriClaim.issuer as string,
|
|
||||||
() => (showDidCopy = !showDidCopy),
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="ml-2 mr-2"
|
|
||||||
>
|
|
||||||
<fa icon="copy" class="text-slate-400 fa-fw"></fa>
|
|
||||||
</button>
|
|
||||||
<span v-show="showDidCopy">Copied DID</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<fa icon="calendar" class="fa-fw text-slate-400"></fa>
|
|
||||||
{{ veriClaim.issuedAt?.replace(/T/, " ").replace(/Z/, " UTC") }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Fullfills Links -->
|
|
||||||
|
|
||||||
<!-- fullfills links for a give -->
|
|
||||||
<div v-if="detailsForGive?.fulfillsPlanHandleId">
|
|
||||||
<router-link
|
|
||||||
:to="
|
|
||||||
'/project/' +
|
|
||||||
encodeURIComponent(detailsForGive?.fulfillsPlanHandleId)
|
|
||||||
"
|
|
||||||
class="text-blue-500 mt-2"
|
|
||||||
>
|
|
||||||
Fulfills a bigger plan...
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
<!-- if there's another, it's probably fulfilling an offer, too -->
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
detailsForGive?.fulfillsType &&
|
|
||||||
detailsForGive?.fulfillsType !== 'PlanAction' &&
|
|
||||||
detailsForGive?.fulfillsHandleId
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<!-- router-link to /claim/ only changes URL path -->
|
|
||||||
<a
|
|
||||||
@click="
|
|
||||||
showDifferentClaimPage(detailsForGive?.fulfillsHandleId)
|
|
||||||
"
|
|
||||||
class="text-blue-500 mt-4"
|
|
||||||
>
|
|
||||||
Fulfills
|
|
||||||
{{
|
|
||||||
capitalizeAndInsertSpacesBeforeCaps(
|
|
||||||
detailsForGive.fulfillsType,
|
|
||||||
)
|
|
||||||
}}...
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- fullfills links for an offer -->
|
|
||||||
<div v-if="detailsForOffer?.fulfillsPlanHandleId">
|
|
||||||
<router-link
|
|
||||||
:to="
|
|
||||||
'/project/' +
|
|
||||||
encodeURIComponent(detailsForOffer?.fulfillsPlanHandleId)
|
|
||||||
"
|
|
||||||
class="text-blue-500 mt-4"
|
|
||||||
>
|
|
||||||
Offered to a bigger plan...
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="columns-3">
|
|
||||||
<button
|
|
||||||
class="col-span-1 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
|
|
||||||
v-if="
|
|
||||||
libsUtil.isGiveRecordTheUserCanConfirm(
|
|
||||||
veriClaim,
|
|
||||||
activeDid,
|
|
||||||
confirmerIdList,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
@click="confirmClaim()"
|
|
||||||
>
|
|
||||||
Confirm
|
|
||||||
<fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
v-if="libsUtil.canFulfillOffer(veriClaim)"
|
|
||||||
@click="openFulfillGiftDialog()"
|
|
||||||
class="col-span-1 block w-fit text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
|
|
||||||
>
|
|
||||||
Affirm Delivery
|
|
||||||
<fa icon="hand-holding-heart" class="ml-2 text-white cursor-pointer" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<GiftedDialog ref="customGiveDialog" message="Offer fulfilled by" />
|
|
||||||
|
|
||||||
<div v-if="libsUtil.giveIsConfirmable(veriClaim)">
|
|
||||||
<h2 class="font-bold uppercase text-xl mt-8 mb-2">Confirmations</h2>
|
|
||||||
|
|
||||||
<span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
|
|
||||||
<span v-else-if="totalConfirmers() === 1">
|
|
||||||
One person has confirmed this.
|
|
||||||
</span>
|
|
||||||
<span v-else> {{ totalConfirmers() }} people have confirmed this. </span>
|
|
||||||
|
|
||||||
<div v-if="totalConfirmers() > 0">
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
confirmerIdList.length === 0 && confsVisibleToIdList.length === 0
|
|
||||||
"
|
|
||||||
>
|
|
||||||
Nobody that you know confirmed this claim, nor do they have any
|
|
||||||
confirmers in their network.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="confirmerIdList.length === 0 && confsVisibleToIdList.length > 0"
|
|
||||||
>
|
|
||||||
<!-- Only show if this person has links to confirmers (below). -->
|
|
||||||
Nobody that you know has issued or confirmed this claim.
|
|
||||||
</div>
|
|
||||||
<div v-if="confirmerIdList.length > 0">
|
|
||||||
The following people have issued or confirmed this claim.
|
|
||||||
<ul class="ml-4">
|
|
||||||
<li
|
|
||||||
v-for="confirmerId in confirmerIdList"
|
|
||||||
:key="confirmerId"
|
|
||||||
class="list-disc ml-4"
|
|
||||||
>
|
|
||||||
<div class="flex gap-4">
|
|
||||||
<div class="grow overflow-hidden">
|
|
||||||
<div class="text-sm">
|
|
||||||
{{ didInfo(confirmerId) }}
|
|
||||||
<span v-if="!serverUtil.isEmptyOrHiddenDid(confirmerId)">
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
copyToClipboard(
|
|
||||||
'The DID of ' + confirmerId,
|
|
||||||
confirmerId,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<fa icon="copy" class="text-slate-400 fa-fw" />
|
|
||||||
</button>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Never need to show this message:
|
|
||||||
"Nobody that you know can see someone who has confirmed this claim."
|
|
||||||
|
|
||||||
If there is nobody in the confirmerIdList then we'll show the combined "nobody" message.
|
|
||||||
If there is somebody in the confirmerIdList then that's all they need to show.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Now show anyone linked to confirmers. -->
|
|
||||||
<div v-if="confsVisibleToIdList.length > 0">
|
|
||||||
The following people can connect you with people who have issued or
|
|
||||||
confirmed this claim.
|
|
||||||
<ul class="ml-4">
|
|
||||||
<li
|
|
||||||
v-for="confsVisibleTo in confsVisibleToIdList"
|
|
||||||
:key="confsVisibleTo"
|
|
||||||
class="list-disc ml-4"
|
|
||||||
>
|
|
||||||
<div class="flex gap-4">
|
|
||||||
<div class="grow overflow-hidden">
|
|
||||||
<div class="text-sm">
|
|
||||||
{{ didInfo(confsVisibleTo) }}
|
|
||||||
<span v-if="!serverUtil.isEmptyOrHiddenDid(confsVisibleTo)">
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
copyToClipboard(
|
|
||||||
'The DID of ' + confsVisibleTo,
|
|
||||||
confsVisibleTo,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<fa icon="copy" class="text-slate-400 fa-fw" />
|
|
||||||
</button>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- explain if user cannot confirm -->
|
|
||||||
<!-- Note that these conditions are mirrored in userCanConfirm(). -->
|
|
||||||
<div v-if="confirmerIdList.includes(activeDid)">
|
|
||||||
You have confirmed this claim.
|
|
||||||
</div>
|
|
||||||
<div v-else-if="veriClaim.issuer == activeDid">
|
|
||||||
You cannot confirm this because you issued this claim, so you already
|
|
||||||
count as confirming it.
|
|
||||||
</div>
|
|
||||||
<div v-else-if="serverUtil.containsHiddenDid(veriClaim.claim)">
|
|
||||||
You cannot confirm this because it contains hidden identifiers.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h2 class="font-bold uppercase text-xl mt-8 mb-2">
|
|
||||||
{{ serverUtil.containsHiddenDid(veriClaim) ? "Visible " : "" }}Details
|
|
||||||
</h2>
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
serverUtil.containsHiddenDid(veriClaim) &&
|
|
||||||
R.isEmpty(veriClaimDidsVisible)
|
|
||||||
"
|
|
||||||
class="mb-2"
|
|
||||||
>
|
|
||||||
Some of the details are not visible to you; they show as "HIDDEN". They
|
|
||||||
are not visible to any of your direct contacts, either.
|
|
||||||
<span v-if="canShare">
|
|
||||||
If you'd like to ask any of your contacts to take a look and see if
|
|
||||||
their contacts can see more details,
|
|
||||||
<a @click="onClickShareClaim()" class="text-blue-500"
|
|
||||||
>click to send them this info</a
|
|
||||||
>
|
|
||||||
and see if they are willing to make an introduction.
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
If you'd like to ask any of your contacts to take a look and see if
|
|
||||||
their contacts can see more details,
|
|
||||||
<a
|
|
||||||
@click="copyToClipboard('Location', windowLocation)"
|
|
||||||
class="text-blue-500"
|
|
||||||
>share this page with them</a
|
|
||||||
>
|
|
||||||
and see if they are willing to make an introduction.
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="!R.isEmpty(veriClaimDidsVisible)">
|
|
||||||
Some of the details are not visible to you but they are visible to some
|
|
||||||
of your contacts.
|
|
||||||
<span v-if="canShare">
|
|
||||||
If you'd like an introduction,
|
|
||||||
<a @click="onClickShareClaim()" class="text-blue-500"
|
|
||||||
>click to share the information with them and ask if they'll tell
|
|
||||||
you more about the participants.</a
|
|
||||||
>
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
If you'd like an introduction,
|
|
||||||
<a
|
|
||||||
@click="copyToClipboard('Location', windowLocation)"
|
|
||||||
class="text-blue-500"
|
|
||||||
>share this page with them and ask if they'll tell you more about
|
|
||||||
about the participants.</a
|
|
||||||
>
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-for="(visibleDidPath, index) of Object.keys(veriClaimDidsVisible)"
|
|
||||||
:key="index"
|
|
||||||
class="list-disc p-4"
|
|
||||||
>
|
|
||||||
<div class="text-sm">
|
|
||||||
<fa icon="minus" class="fa-fw"></fa>
|
|
||||||
The {{ visibleDidPath }} is visible to:
|
|
||||||
</div>
|
|
||||||
<div class="ml-12 p-1">
|
|
||||||
<ul>
|
|
||||||
<li
|
|
||||||
v-for="(visDid, idx2) of veriClaimDidsVisible[visibleDidPath]"
|
|
||||||
:key="idx2"
|
|
||||||
class="list-disc"
|
|
||||||
>
|
|
||||||
<div class="text-sm mt-2">
|
|
||||||
<span>
|
|
||||||
{{ didInfo(visDid) }}
|
|
||||||
<span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
|
|
||||||
<button
|
|
||||||
@click="copyToClipboard('The DID of ' + visDid, visDid)"
|
|
||||||
>
|
|
||||||
<fa icon="copy" class="text-slate-400 fa-fw" />
|
|
||||||
</button>
|
|
||||||
</span>
|
|
||||||
<span v-if="veriClaim.publicUrls?.[visDid]"
|
|
||||||
>, found at
|
|
||||||
<fa icon="globe" class="fa-fw text-slate-400"></fa
|
|
||||||
> <a
|
|
||||||
:href="veriClaim.publicUrls?.[visDid]"
|
|
||||||
class="text-blue-500"
|
|
||||||
>{{
|
|
||||||
veriClaim.publicUrls[visDid].substring(
|
|
||||||
veriClaim.publicUrls[visDid].indexOf("//") + 2,
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
</a>
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
|
|
||||||
<pre
|
|
||||||
class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
|
|
||||||
>{{ veriClaimDump }}</pre
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="font-bold uppercase text-xl mt-8 mb-2">Full Claim</h2>
|
|
||||||
<p class="mb-4">
|
|
||||||
The full claim includes the claim as it was originally issued, including
|
|
||||||
the signature (ie. the proof of issuance by that person).
|
|
||||||
</p>
|
|
||||||
<div v-if="!fullClaim">
|
|
||||||
<p v-if="fullClaimMessage" class="mb-4">
|
|
||||||
{{ fullClaimMessage }}
|
|
||||||
</p>
|
|
||||||
<button
|
|
||||||
v-else
|
|
||||||
class="block w-full text-center text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2"
|
|
||||||
@click="showFullClaim(veriClaim.id as string)"
|
|
||||||
>
|
|
||||||
Load Full Claim Details
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div v-else>
|
|
||||||
<pre>{{ fullClaimDump }}</pre>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<a
|
|
||||||
:href="apiServer + '/api/claim/' + veriClaim.id"
|
|
||||||
target="_blank"
|
|
||||||
class="block w-full text-center text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2"
|
|
||||||
>
|
|
||||||
View on the Public Server
|
|
||||||
</a>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { AxiosError, RawAxiosRequestHeaders } from "axios";
|
|
||||||
import * as yaml from "js-yaml";
|
|
||||||
import * as R from "ramda";
|
|
||||||
import { IIdentifier } from "@veramo/core";
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
import { useClipboard } from "@vueuse/core";
|
|
||||||
|
|
||||||
import GiftedDialog from "@/components/GiftedDialog.vue";
|
|
||||||
import OfferDialog from "@/components/OfferDialog.vue";
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
|
||||||
import { accessToken } from "@/libs/crypto";
|
|
||||||
import * as serverUtil from "@/libs/endorserServer";
|
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import EntityIcon from "@/components/EntityIcon.vue";
|
|
||||||
import { Account } from "@/db/tables/accounts";
|
|
||||||
import { GiverInputInfo } from "@/libs/endorserServer";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
|
|
||||||
})
|
|
||||||
export default class ClaimView extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
accountIdentityStr: string = "null";
|
|
||||||
activeDid = "";
|
|
||||||
allMyDids: Array<string> = [];
|
|
||||||
allContacts: Array<Contact> = [];
|
|
||||||
apiServer = "";
|
|
||||||
|
|
||||||
canShare = false;
|
|
||||||
confirmerIdList: string[] = []; // list of DIDs that have confirmed this claim excluding the issuer
|
|
||||||
confsVisibleErrorMessage = "";
|
|
||||||
confsVisibleToIdList: string[] = []; // list of DIDs that can see any confirmer
|
|
||||||
detailsForGive = null;
|
|
||||||
detailsForOffer = null;
|
|
||||||
fullClaim = null;
|
|
||||||
fullClaimDump = "";
|
|
||||||
fullClaimMessage = "";
|
|
||||||
numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
|
|
||||||
showDidCopy = false;
|
|
||||||
showIdCopy = false;
|
|
||||||
veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
|
|
||||||
veriClaimDump = "";
|
|
||||||
veriClaimDidsVisible = {};
|
|
||||||
windowLocation = window.location.href;
|
|
||||||
|
|
||||||
R = R;
|
|
||||||
yaml = yaml;
|
|
||||||
libsUtil = libsUtil;
|
|
||||||
serverUtil = serverUtil;
|
|
||||||
|
|
||||||
resetThisValues() {
|
|
||||||
this.confirmerIdList = [];
|
|
||||||
this.confsVisibleErrorMessage = "";
|
|
||||||
this.confsVisibleToIdList = [];
|
|
||||||
this.detailsForGive = null;
|
|
||||||
this.detailsForOffer = null;
|
|
||||||
this.fullClaim = null;
|
|
||||||
this.fullClaimDump = "";
|
|
||||||
this.fullClaimMessage = "";
|
|
||||||
this.numConfsNotVisible = 0;
|
|
||||||
this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
|
|
||||||
this.veriClaimDump = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
async created() {
|
|
||||||
await db.open();
|
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
|
||||||
this.activeDid = settings?.activeDid || "";
|
|
||||||
this.apiServer = settings?.apiServer || "";
|
|
||||||
this.allContacts = await db.contacts.toArray();
|
|
||||||
|
|
||||||
await accountsDB.open();
|
|
||||||
const accounts = accountsDB.accounts;
|
|
||||||
const accountsArr = await accounts?.toArray();
|
|
||||||
this.allMyDids = accountsArr.map((acc) => acc.did);
|
|
||||||
const account = accountsArr.find((acc) => acc.did === this.activeDid);
|
|
||||||
this.accountIdentityStr = account?.identity || "null";
|
|
||||||
const identity = JSON.parse(this.accountIdentityStr);
|
|
||||||
|
|
||||||
const pathParam = window.location.pathname.substring("/claim/".length);
|
|
||||||
let claimId;
|
|
||||||
if (pathParam) {
|
|
||||||
claimId = decodeURIComponent(pathParam);
|
|
||||||
await this.loadClaim(claimId, identity);
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "No claim ID was provided.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// When Chrome compatibility is fixed https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
|
|
||||||
// then use this truer check: navigator.canShare && navigator.canShare()
|
|
||||||
this.canShare = !!navigator.share;
|
|
||||||
}
|
|
||||||
|
|
||||||
// insert a space before any capital letters except the initial letter
|
|
||||||
// (and capitalize initial letter, just in case)
|
|
||||||
capitalizeAndInsertSpacesBeforeCaps(text: string) {
|
|
||||||
return !text
|
|
||||||
? ""
|
|
||||||
: text[0].toUpperCase() + text.substr(1).replace(/([A-Z])/g, " $1");
|
|
||||||
}
|
|
||||||
|
|
||||||
totalConfirmers() {
|
|
||||||
return (
|
|
||||||
this.numConfsNotVisible +
|
|
||||||
this.confirmerIdList.length +
|
|
||||||
this.confsVisibleToIdList.length
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async getIdentity(activeDid: string): Promise<IIdentifier> {
|
|
||||||
await accountsDB.open();
|
|
||||||
const account = (await accountsDB.accounts
|
|
||||||
.where("did")
|
|
||||||
.equals(activeDid)
|
|
||||||
.first()) as Account;
|
|
||||||
const identity = JSON.parse(account?.identity || "null");
|
|
||||||
|
|
||||||
if (!identity) {
|
|
||||||
throw new Error(
|
|
||||||
"Attempted to load project records with no identifier available.",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return identity;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async getHeaders(identity: IIdentifier) {
|
|
||||||
const headers: RawAxiosRequestHeaders = {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
};
|
|
||||||
if (identity) {
|
|
||||||
const token = await accessToken(identity);
|
|
||||||
headers["Authorization"] = "Bearer " + token;
|
|
||||||
}
|
|
||||||
return headers;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Isn't there a better way to make this available to the template?
|
|
||||||
didInfo(did: string) {
|
|
||||||
return serverUtil.didInfo(
|
|
||||||
did,
|
|
||||||
this.activeDid,
|
|
||||||
this.allMyDids,
|
|
||||||
this.allContacts,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async loadClaim(claimId: string, identity: IIdentifier) {
|
|
||||||
const urlPath = libsUtil.isGlobalUri(claimId)
|
|
||||||
? "/api/claim/byHandle/"
|
|
||||||
: "/api/claim/";
|
|
||||||
const url = this.apiServer + urlPath + encodeURIComponent(claimId);
|
|
||||||
const headers = await this.getHeaders(identity);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const resp = await this.axios.get(url, { headers });
|
|
||||||
if (resp.status === 200) {
|
|
||||||
this.veriClaim = resp.data;
|
|
||||||
this.veriClaimDump = yaml.dump(this.veriClaim);
|
|
||||||
this.veriClaimDidsVisible = libsUtil.findAllVisibleToDids(
|
|
||||||
this.veriClaim,
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
// actually, axios typically throws an error so we never get here
|
|
||||||
console.error("Error getting claim:", resp);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was a problem retrieving that claim.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// retrieve more details on Give, Offer, or Plan
|
|
||||||
if (this.veriClaim.claimType === "GiveAction") {
|
|
||||||
const giveUrl =
|
|
||||||
this.apiServer +
|
|
||||||
"/api/v2/report/gives?handleId=" +
|
|
||||||
encodeURIComponent(this.veriClaim.handleId as string);
|
|
||||||
const giveHeaders = await this.getHeaders(identity);
|
|
||||||
const giveResp = await this.axios.get(giveUrl, {
|
|
||||||
headers: giveHeaders,
|
|
||||||
});
|
|
||||||
if (giveResp.status === 200) {
|
|
||||||
this.detailsForGive = giveResp.data.data[0];
|
|
||||||
} else {
|
|
||||||
console.error("Error getting detailed give info:", giveResp);
|
|
||||||
}
|
|
||||||
} else if (this.veriClaim.claimType === "Offer") {
|
|
||||||
const offerUrl =
|
|
||||||
this.apiServer +
|
|
||||||
"/api/v2/report/offers?handleId=" +
|
|
||||||
encodeURIComponent(this.veriClaim.handleId as string);
|
|
||||||
const offerHeaders = await this.getHeaders(identity);
|
|
||||||
const offerResp = await this.axios.get(offerUrl, {
|
|
||||||
headers: offerHeaders,
|
|
||||||
});
|
|
||||||
if (offerResp.status === 200) {
|
|
||||||
this.detailsForOffer = offerResp.data.data[0];
|
|
||||||
} else {
|
|
||||||
console.error("Error getting detailed offer info:", offerResp);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// retrieve the list of confirmers
|
|
||||||
const confirmUrl =
|
|
||||||
this.apiServer +
|
|
||||||
"/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
|
|
||||||
encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
|
|
||||||
const confirmHeaders = await this.getHeaders(identity);
|
|
||||||
const response = await this.axios.get(confirmUrl, {
|
|
||||||
headers: confirmHeaders,
|
|
||||||
});
|
|
||||||
if (response.status === 200) {
|
|
||||||
const resultList1 = response.data.result || [];
|
|
||||||
const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
|
|
||||||
const resultList3 = R.reject(
|
|
||||||
(did: string) => did === this.veriClaim.issuer,
|
|
||||||
resultList2,
|
|
||||||
);
|
|
||||||
this.confirmerIdList = resultList3;
|
|
||||||
this.numConfsNotVisible = resultList1.length - resultList2.length;
|
|
||||||
if (resultList3.length === resultList2.length) {
|
|
||||||
// the issuer was not in the "visible" list so they must be hidden
|
|
||||||
// so subtract them from the non-visible confirmers count
|
|
||||||
this.numConfsNotVisible = this.numConfsNotVisible - 1;
|
|
||||||
}
|
|
||||||
this.confsVisibleToIdList =
|
|
||||||
response.data.result.resultVisibleToDids || [];
|
|
||||||
} else {
|
|
||||||
this.confsVisibleErrorMessage =
|
|
||||||
"Had problems retrieving confirmations.";
|
|
||||||
}
|
|
||||||
} catch (error: unknown) {
|
|
||||||
const serverError = error as AxiosError;
|
|
||||||
console.error("Error retrieving claim:", serverError);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Something went wrong retrieving claim data.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async showFullClaim(claimId: string) {
|
|
||||||
await accountsDB.open();
|
|
||||||
const accounts = accountsDB.accounts;
|
|
||||||
const accountsArr: Account[] = await accounts?.toArray();
|
|
||||||
const account = accountsArr.find((acc) => acc.did === this.activeDid);
|
|
||||||
const identity = JSON.parse(account?.identity || "null");
|
|
||||||
|
|
||||||
const url =
|
|
||||||
this.apiServer + "/api/claim/full/" + encodeURIComponent(claimId);
|
|
||||||
const headers = await this.getHeaders(identity);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const resp = await this.axios.get(url, { headers });
|
|
||||||
if (resp.status === 200) {
|
|
||||||
this.fullClaim = resp.data;
|
|
||||||
this.fullClaimDump = yaml.dump(this.fullClaim);
|
|
||||||
} else {
|
|
||||||
// actually, axios typically throws an error so we never get here
|
|
||||||
console.error("Error getting full claim:", resp);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was a problem getting that claim. See logs for more info.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} catch (error: unknown) {
|
|
||||||
console.error("Error retrieving full claim:", error);
|
|
||||||
const serverError = error as AxiosError;
|
|
||||||
if (serverError.response?.status === 403) {
|
|
||||||
this.fullClaimMessage =
|
|
||||||
"You are not authorized to view the full contents of this claim." +
|
|
||||||
" To see all the details, ask the issuer to allow you to see their claims." +
|
|
||||||
" If you cannot see the issuer's DID, ask someone in the Confirmations section above." +
|
|
||||||
" If there are no connections, you will have to ask people in your" +
|
|
||||||
" network for their help, some other way; send them to this page and" +
|
|
||||||
" see if they can make a connection for you.";
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Something went wrong retrieving that claim. See logs for more info.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// similar code is found in ProjectViewView
|
|
||||||
async confirmClaim() {
|
|
||||||
if (confirm("Do you personally confirm that this is true?")) {
|
|
||||||
// similar logic is found in endorser-mobile
|
|
||||||
const goodClaim = serverUtil.removeSchemaContext(
|
|
||||||
serverUtil.removeVisibleToDids(
|
|
||||||
serverUtil.addLastClaimOrHandleAsIdIfMissing(
|
|
||||||
this.veriClaim.claim,
|
|
||||||
this.veriClaim.id,
|
|
||||||
this.veriClaim.handleId,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
const confirmationClaim: serverUtil.GenericVerifiableCredential = {
|
|
||||||
"@context": "https://schema.org",
|
|
||||||
"@type": "AgreeAction",
|
|
||||||
object: goodClaim,
|
|
||||||
};
|
|
||||||
const result = await serverUtil.createAndSubmitClaim(
|
|
||||||
confirmationClaim,
|
|
||||||
await this.getIdentity(this.activeDid),
|
|
||||||
this.apiServer,
|
|
||||||
this.axios,
|
|
||||||
);
|
|
||||||
if (result.type === "success") {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Success",
|
|
||||||
text: "Confirmation submitted.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
console.error("Got error submitting the confirmation:", result);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was a problem submitting the confirmation. See logs for more info.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
showDifferentClaimPage(claimId: string) {
|
|
||||||
const route = {
|
|
||||||
path: "/claim/" + encodeURIComponent(claimId),
|
|
||||||
};
|
|
||||||
this.$router.push(route).then(async () => {
|
|
||||||
this.resetThisValues();
|
|
||||||
await this.loadClaim(claimId, JSON.parse(this.accountIdentityStr));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
openFulfillGiftDialog() {
|
|
||||||
const giver: GiverInputInfo = {
|
|
||||||
did: libsUtil.offerGiverDid(this.veriClaim),
|
|
||||||
};
|
|
||||||
(this.$refs.customGiveDialog as GiftedDialog).open(
|
|
||||||
giver,
|
|
||||||
this.veriClaim.handleId,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
copyToClipboard(name: string, text: string) {
|
|
||||||
useClipboard()
|
|
||||||
.copy(text)
|
|
||||||
.then(() => {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "toast",
|
|
||||||
title: "Copied",
|
|
||||||
text: (name || "That") + " was copied to the clipboard.",
|
|
||||||
},
|
|
||||||
2000,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
onClickShareClaim() {
|
|
||||||
window.navigator.share({
|
|
||||||
title: "Help Connect Me",
|
|
||||||
text: "I'm trying to find the full details of this claim. Can you help me?",
|
|
||||||
url: this.windowLocation,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<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">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -30,19 +30,17 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-8">
|
<div class="mt-8">
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
<input
|
||||||
<input
|
type="submit"
|
||||||
type="submit"
|
class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
|
value="Add Contact"
|
||||||
value="Add Contact"
|
/>
|
||||||
/>
|
<button
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
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-1.5 py-2 rounded-md"
|
>
|
||||||
>
|
Cancel
|
||||||
Cancel
|
</button>
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,12 +1,9 @@
|
|||||||
<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">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
id="ViewBreadcrumb"
|
|
||||||
class="text-lg text-center font-light relative px-7"
|
|
||||||
>
|
|
||||||
<!-- Back -->
|
<!-- Back -->
|
||||||
<router-link
|
<router-link
|
||||||
:to="{ name: 'contacts' }"
|
:to="{ name: 'contacts' }"
|
||||||
@@ -14,24 +11,16 @@
|
|||||||
><fa icon="chevron-left" class="fa-fw"></fa
|
><fa icon="chevron-left" class="fa-fw"></fa
|
||||||
></router-link>
|
></router-link>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
|
|
||||||
Transferred with {{ contact?.name }}
|
|
||||||
</h1>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
|
Given with {{ contact?.name }}
|
||||||
|
</h1>
|
||||||
<div class="flex justify-around">
|
<div class="flex justify-around">
|
||||||
<span />
|
<span />
|
||||||
<span class="justify-around">(Only 50 most recent)</span>
|
<span class="justify-around">(Only 50 most recent)</span>
|
||||||
<span />
|
<span />
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-around">
|
|
||||||
<span />
|
|
||||||
<span class="justify-around">
|
|
||||||
(This does not include claims by them if they're not visible to you.)
|
|
||||||
</span>
|
|
||||||
<span />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Results List -->
|
<!-- Results List -->
|
||||||
<table
|
<table
|
||||||
@@ -105,33 +94,29 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { AxiosError } from "axios";
|
|
||||||
import * as didJwt from "did-jwt";
|
|
||||||
import * as R from "ramda";
|
import * as R from "ramda";
|
||||||
import { IIdentifier } from "@veramo/core";
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { NotificationIface } from "@/constants/app";
|
import { accountsDB, db } from "@/db";
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
import { Contact } from "@/db/tables/contacts";
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
import { accessToken, SimpleSigner } from "@/libs/crypto";
|
import { accessToken, SimpleSigner } from "@/libs/crypto";
|
||||||
import {
|
import {
|
||||||
AgreeVerifiableCredential,
|
AgreeVerifiableCredential,
|
||||||
GiveSummaryRecord,
|
GiveServerRecord,
|
||||||
GiveVerifiableCredential,
|
GiveVerifiableCredential,
|
||||||
SCHEMA_ORG_CONTEXT,
|
SCHEMA_ORG_CONTEXT,
|
||||||
} from "@/libs/endorserServer";
|
} from "@/libs/endorserServer";
|
||||||
|
import * as didJwt from "did-jwt";
|
||||||
|
import { AxiosError } from "axios";
|
||||||
|
import QuickNav from "@/components/QuickNav";
|
||||||
|
|
||||||
@Component({ components: { QuickNav } })
|
@Component({ components: { QuickNav } })
|
||||||
export default class ContactAmountssView extends Vue {
|
export default class ContactsView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
contact: Contact | null = null;
|
contact: Contact | null = null;
|
||||||
giveRecords: Array<GiveSummaryRecord> = [];
|
giveRecords: Array<GiveServerRecord> = [];
|
||||||
numAccounts = 0;
|
numAccounts = 0;
|
||||||
|
|
||||||
async beforeCreate() {
|
async beforeCreate() {
|
||||||
@@ -139,7 +124,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
this.numAccounts = await accountsDB.accounts.count();
|
this.numAccounts = await accountsDB.accounts.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getIdentity(activeDid: string) {
|
public async getIdentity(activeDid) {
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const account = await accountsDB.accounts
|
const account = await accountsDB.accounts
|
||||||
.where("did")
|
.where("did")
|
||||||
@@ -149,13 +134,13 @@ export default class ContactAmountssView extends Vue {
|
|||||||
|
|
||||||
if (!identity) {
|
if (!identity) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
"Attempted to load Give records with no identifier available.",
|
"Attempted to load Give records with no identity available.",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return identity;
|
return identity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getHeaders(identity: IIdentifier) {
|
public async getHeaders(identity) {
|
||||||
const token = await accessToken(identity);
|
const token = await accessToken(identity);
|
||||||
const headers = {
|
const headers = {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
@@ -177,9 +162,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
if (this.activeDid && this.contact) {
|
if (this.activeDid && this.contact) {
|
||||||
this.loadGives(this.activeDid, this.contact);
|
this.loadGives(this.activeDid, this.contact);
|
||||||
}
|
}
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
} catch (err) {
|
||||||
} catch (err: any) {
|
|
||||||
console.error("Error retrieving settings or gives.", err);
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
@@ -187,7 +170,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
title: "Error",
|
title: "Error",
|
||||||
text:
|
text:
|
||||||
err.userMessage ||
|
err.userMessage ||
|
||||||
"There was an error retrieving your settings or contacts or gives.",
|
"There was an error retrieving the latest sweet, sweet action.",
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
@@ -197,7 +180,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
async loadGives(activeDid: string, contact: Contact) {
|
async loadGives(activeDid: string, contact: Contact) {
|
||||||
try {
|
try {
|
||||||
const identity = await this.getIdentity(this.activeDid);
|
const identity = await this.getIdentity(this.activeDid);
|
||||||
let result: Array<GiveSummaryRecord> = [];
|
let result = [];
|
||||||
const url =
|
const url =
|
||||||
this.apiServer +
|
this.apiServer +
|
||||||
"/api/v2/report/gives?agentDid=" +
|
"/api/v2/report/gives?agentDid=" +
|
||||||
@@ -252,7 +235,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const sortedResult: Array<GiveSummaryRecord> = R.sort(
|
const sortedResult: Array<GiveServerRecord> = R.sort(
|
||||||
(a, b) =>
|
(a, b) =>
|
||||||
new Date(b.issuedAt).getTime() - new Date(a.issuedAt).getTime(),
|
new Date(b.issuedAt).getTime() - new Date(a.issuedAt).getTime(),
|
||||||
result,
|
result,
|
||||||
@@ -271,7 +254,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async confirm(record: GiveSummaryRecord) {
|
async confirm(record: GiveServerRecord) {
|
||||||
// Make claim
|
// Make claim
|
||||||
// I use clone here because otherwise it gets a Proxy object.
|
// I use clone here because otherwise it gets a Proxy object.
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
@@ -364,10 +347,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
/*
|
/* Tooltip from https://www.w3schools.com/css/css_tooltip.asp */
|
||||||
Tooltip, generated on "title" attributes on "fa" icons
|
|
||||||
Kudos to https://www.w3schools.com/css/css_tooltip.asp
|
|
||||||
*/
|
|
||||||
/* Tooltip container */
|
/* Tooltip container */
|
||||||
.tooltip {
|
.tooltip {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<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">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -16,23 +16,27 @@
|
|||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Quick Search -->
|
||||||
|
|
||||||
|
<!-- Initial Loading Animation -->
|
||||||
|
|
||||||
<!-- Results List -->
|
<!-- Results List -->
|
||||||
<ul class="border-t border-slate-300">
|
<ul class="border-t border-slate-300">
|
||||||
<li class="border-b border-slate-300 py-3">
|
<li class="border-b border-slate-300 py-3">
|
||||||
<h2 class="text-base flex gap-4 items-center">
|
<h2 class="text-base flex gap-4 items-center">
|
||||||
<span class="grow">
|
<span class="grow italic text-slate-500"
|
||||||
<img
|
><EntityIcon
|
||||||
src="../assets/blank-square.svg"
|
entityId="Anonymous"
|
||||||
width="32"
|
:iconSize="32"
|
||||||
class="inline-block align-middle border border-slate-300 rounded-md mr-1"
|
class="opacity-50 inline-block align-middle border border-dashed border-slate-400 bg-slate-200 rounded-md mr-1"
|
||||||
/>
|
></EntityIcon>
|
||||||
Anonymous/Unnamed
|
Anonymous
|
||||||
</span>
|
</span>
|
||||||
<span class="text-right">
|
<span class="text-right">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@click="openDialog()"
|
@click="openDialog()"
|
||||||
class="block w-full text-center text-sm 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-1.5 rounded-md"
|
class="block w-full text-center text-sm uppercase bg-blue-600 text-white px-3 py-1.5 rounded-md"
|
||||||
>
|
>
|
||||||
<fa icon="gift" class="fa-fw"></fa>
|
<fa icon="gift" class="fa-fw"></fa>
|
||||||
</button>
|
</button>
|
||||||
@@ -45,19 +49,19 @@
|
|||||||
class="border-b border-slate-300 py-3"
|
class="border-b border-slate-300 py-3"
|
||||||
>
|
>
|
||||||
<h2 class="text-base flex gap-4 items-center">
|
<h2 class="text-base flex gap-4 items-center">
|
||||||
<span class="grow font-semibold">
|
<span class="grow font-semibold"
|
||||||
<EntityIcon
|
><EntityIcon
|
||||||
:entityId="contact.did"
|
:entityId="contact.did"
|
||||||
:iconSize="32"
|
:iconSize="32"
|
||||||
class="inline-block align-middle border border-slate-300 rounded-md mr-1"
|
class="inline-block align-middle border border-slate-300 rounded-md mr-1"
|
||||||
/>
|
></EntityIcon>
|
||||||
{{ contact.name || "(no name)" }}
|
{{ contact.name || "(no name)" }}
|
||||||
</span>
|
</span>
|
||||||
<span class="text-right">
|
<span class="text-right">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@click="openDialog(contact)"
|
@click="openDialog(contact)"
|
||||||
class="block w-full text-center text-sm 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-1.5 rounded-md"
|
class="block w-full text-center text-sm uppercase bg-blue-600 text-white px-3 py-1.5 rounded-md"
|
||||||
>
|
>
|
||||||
<fa icon="gift" class="fa-fw"></fa>
|
<fa icon="gift" class="fa-fw"></fa>
|
||||||
</button>
|
</button>
|
||||||
@@ -68,89 +72,61 @@
|
|||||||
|
|
||||||
<GiftedDialog
|
<GiftedDialog
|
||||||
ref="customDialog"
|
ref="customDialog"
|
||||||
|
@dialog-result="handleDialogResult"
|
||||||
message="Received from"
|
message="Received from"
|
||||||
:projectId="projectId"
|
>
|
||||||
/>
|
</GiftedDialog>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { IIdentifier } from "@veramo/core";
|
|
||||||
|
|
||||||
import GiftedDialog from "@/components/GiftedDialog.vue";
|
import GiftedDialog from "@/components/GiftedDialog.vue";
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import { db, accountsDB } from "@/db";
|
||||||
import EntityIcon from "@/components/EntityIcon.vue";
|
import { AccountsSchema } from "@/db/tables/accounts";
|
||||||
import { NotificationIface } from "@/constants/app";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
import { db, accountsDB } from "@/db/index";
|
|
||||||
import { Account, AccountsSchema } from "@/db/tables/accounts";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
|
||||||
import { accessToken } from "@/libs/crypto";
|
import { accessToken } from "@/libs/crypto";
|
||||||
import { GiverInputInfo } from "@/libs/endorserServer";
|
import { createAndSubmitGive } from "@/libs/endorserServer";
|
||||||
|
import { Account } from "@/db/tables/accounts";
|
||||||
|
import { Contact } from "@/db/tables/contacts";
|
||||||
|
import QuickNav from "@/components/QuickNav";
|
||||||
|
import EntityIcon from "@/components/EntityIcon";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { GiftedDialog, QuickNav, EntityIcon },
|
components: { GiftedDialog, QuickNav, EntityIcon },
|
||||||
})
|
})
|
||||||
export default class ContactGiftingView extends Vue {
|
export default class HomeView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
|
allAccounts: Array<Account> = [];
|
||||||
allContacts: Array<Contact> = [];
|
allContacts: Array<Contact> = [];
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
accounts: typeof AccountsSchema;
|
isHiddenSpinner = true;
|
||||||
|
accounts: AccountsSchema;
|
||||||
numAccounts = 0;
|
numAccounts = 0;
|
||||||
projectId = localStorage.getItem("projectId") || "";
|
|
||||||
|
|
||||||
async beforeCreate() {
|
async beforeCreate() {
|
||||||
accountsDB.open();
|
accountsDB.open();
|
||||||
this.numAccounts = await accountsDB.accounts.count();
|
this.accounts = accountsDB.accounts;
|
||||||
|
this.numAccounts = await this.accounts.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
async created() {
|
public async getIdentity(activeDid) {
|
||||||
try {
|
|
||||||
await db.open();
|
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
|
||||||
this.apiServer = settings?.apiServer || "";
|
|
||||||
this.activeDid = settings?.activeDid || "";
|
|
||||||
this.allContacts = await db.contacts.orderBy("name").toArray();
|
|
||||||
|
|
||||||
localStorage.removeItem("projectId");
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (err: any) {
|
|
||||||
console.error("Error retrieving settings & contacts:", err);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text:
|
|
||||||
err.message ||
|
|
||||||
"There was an error retrieving your settings or contacts.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async getIdentity(activeDid: string) {
|
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const account = (await accountsDB.accounts
|
const account = await accountsDB.accounts
|
||||||
.where("did")
|
.where("did")
|
||||||
.equals(activeDid)
|
.equals(activeDid)
|
||||||
.first()) as Account;
|
.first();
|
||||||
const identity = JSON.parse(account?.identity || "null");
|
const identity = JSON.parse(account?.identity || "null");
|
||||||
|
|
||||||
if (!identity) {
|
if (!identity) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
"Attempted to load Give records with no identifier available.",
|
"Attempted to load Give records with no identity available.",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return identity;
|
return identity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getHeaders(identity: IIdentifier) {
|
public async getHeaders(identity) {
|
||||||
const token = await accessToken(identity);
|
const token = await accessToken(identity);
|
||||||
const headers = {
|
const headers = {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
@@ -159,8 +135,165 @@ export default class ContactGiftingView extends Vue {
|
|||||||
return headers;
|
return headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
openDialog(giver: GiverInputInfo) {
|
async created() {
|
||||||
(this.$refs.customDialog as GiftedDialog).open(giver);
|
try {
|
||||||
|
await accountsDB.open();
|
||||||
|
this.allAccounts = await accountsDB.accounts.toArray();
|
||||||
|
await db.open();
|
||||||
|
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
||||||
|
this.apiServer = settings?.apiServer || "";
|
||||||
|
this.activeDid = settings?.activeDid || "";
|
||||||
|
this.allContacts = await db.contacts.toArray();
|
||||||
|
this.feedLastViewedId = settings?.lastViewedClaimId;
|
||||||
|
this.updateAllFeed();
|
||||||
|
} catch (err) {
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text:
|
||||||
|
err.userMessage ||
|
||||||
|
"There was an error retrieving the latest sweet, sweet action.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async buildHeaders() {
|
||||||
|
const headers = { "Content-Type": "application/json" };
|
||||||
|
|
||||||
|
if (this.activeDid) {
|
||||||
|
await accountsDB.open();
|
||||||
|
const allAccounts = await accountsDB.accounts.toArray();
|
||||||
|
const account = allAccounts.find((acc) => acc.did === this.activeDid);
|
||||||
|
const identity = JSON.parse(account?.identity || "null");
|
||||||
|
|
||||||
|
if (!identity) {
|
||||||
|
throw new Error(
|
||||||
|
"An ID is chosen but there are no keys for it so it cannot be used to talk with the service.",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
headers["Authorization"] = "Bearer " + (await accessToken(identity));
|
||||||
|
} else {
|
||||||
|
// it's OK without auth... we just won't get any identifiers
|
||||||
|
}
|
||||||
|
return headers;
|
||||||
|
}
|
||||||
|
|
||||||
|
openDialog(giver) {
|
||||||
|
this.$refs.customDialog.open(giver);
|
||||||
|
}
|
||||||
|
|
||||||
|
handleDialogResult(result) {
|
||||||
|
if (result.action === "confirm") {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
this.recordGive(result.contact?.did, result.description, result.hours);
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// action was "cancel" so do nothing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param giverDid may be null
|
||||||
|
* @param description may be an empty string
|
||||||
|
* @param hours may be 0
|
||||||
|
*/
|
||||||
|
public async recordGive(giverDid, description, hours) {
|
||||||
|
if (!this.activeDid) {
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: "You must select an identity before you can record a give.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!description && !hours) {
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: "You must enter a description or some number of hours.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const identity = await this.getIdentity(this.activeDid);
|
||||||
|
const result = await createAndSubmitGive(
|
||||||
|
this.axios,
|
||||||
|
this.apiServer,
|
||||||
|
identity,
|
||||||
|
giverDid,
|
||||||
|
this.activeDid,
|
||||||
|
description,
|
||||||
|
hours,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (isGiveCreationError(result)) {
|
||||||
|
const errorMessage = getGiveCreationErrorMessage(result);
|
||||||
|
console.log("Error with give result:", result);
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: errorMessage || "There was an error recording the give.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "success",
|
||||||
|
title: "Success",
|
||||||
|
text: "That gift was recorded.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.log("Error with give caught:", error);
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text:
|
||||||
|
getGiveErrorMessage(error) ||
|
||||||
|
"There was an error recording the give.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper functions for readability
|
||||||
|
|
||||||
|
isGiveCreationError(result) {
|
||||||
|
return result.status !== 201 || result.data?.error;
|
||||||
|
}
|
||||||
|
|
||||||
|
getGiveCreationErrorMessage(result) {
|
||||||
|
return result.data?.error?.message;
|
||||||
|
}
|
||||||
|
|
||||||
|
getGiveErrorMessage(error) {
|
||||||
|
return error.userMessage || error.response?.data?.error?.message;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,111 +1,51 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Profile"></QuickNav>
|
<QuickNav selected="Profile"></QuickNav>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- Breadcrumb -->
|
<!-- Heading -->
|
||||||
<div class="mb-8">
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
<!-- Back -->
|
Your Contact Info
|
||||||
<div class="text-lg text-center font-light relative px-7">
|
</h1>
|
||||||
<h1
|
|
||||||
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
|
||||||
@click="$router.back()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
<!--
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
|
Play with display options: https://qr-code-styling.com/
|
||||||
Your Contact Info
|
See docs: https://www.npmjs.com/package/qr-code-generator-vue3
|
||||||
</h1>
|
-->
|
||||||
<p
|
<QRCodeVue3
|
||||||
v-if="!givenName"
|
:value="this.qrValue"
|
||||||
class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
|
:cornersSquareOptions="{ type: 'extra-rounded' }"
|
||||||
>
|
:dotsOptions="{ type: 'square' }"
|
||||||
<span class="text-red">Beware!</span>
|
class="flex justify-center"
|
||||||
You aren't sharing your name, so quickly
|
/>
|
||||||
<router-link
|
|
||||||
:to="{ name: 'new-edit-account' }"
|
|
||||||
class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 rounded-md"
|
|
||||||
>
|
|
||||||
click here to set it for them.
|
|
||||||
</router-link>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div @click="onCopyToClipboard()" v-if="activeDid" class="text-center">
|
|
||||||
<!--
|
|
||||||
Play with display options: https://qr-code-styling.com/
|
|
||||||
See docs: https://www.npmjs.com/package/qr-code-generator-vue3
|
|
||||||
-->
|
|
||||||
<QRCodeVue3
|
|
||||||
:value="this.qrValue"
|
|
||||||
:cornersSquareOptions="{ type: 'extra-rounded' }"
|
|
||||||
:dotsOptions="{ type: 'square' }"
|
|
||||||
class="flex justify-center"
|
|
||||||
/>
|
|
||||||
<span> Click QR to copy your contact URL to your clipboard. </span>
|
|
||||||
</div>
|
|
||||||
<div class="text-center" v-else>
|
|
||||||
You have no identitifiers yet, so
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'start' }"
|
|
||||||
class="bg-blue-500 text-white px-1.5 py-1 rounded-md"
|
|
||||||
>
|
|
||||||
create your identifier.
|
|
||||||
</router-link>
|
|
||||||
<br />
|
|
||||||
If you don't that first, these contacts won't see your activity.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="text-center">
|
|
||||||
<h1 class="text-4xl text-center font-light pt-6">Scan Contact Info</h1>
|
|
||||||
<qrcode-stream @detect="onScanDetect" @error="onScanError" />
|
|
||||||
<span>
|
|
||||||
If you do not see a scanning camera window here, check your camera
|
|
||||||
permissions.
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import * as didJwt from "did-jwt";
|
|
||||||
import { sha256 } from "ethereum-cryptography/sha256.js";
|
|
||||||
import QRCodeVue3 from "qr-code-generator-vue3";
|
import QRCodeVue3 from "qr-code-generator-vue3";
|
||||||
import * as R from "ramda";
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { QrcodeStream } from "vue-qrcode-reader";
|
import { accountsDB, db } from "@/db";
|
||||||
import { useClipboard } from "@vueuse/core";
|
|
||||||
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
import { deriveAddress, nextDerivationPath, SimpleSigner } from "@/libs/crypto";
|
import * as R from "ramda";
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import { SimpleSigner } from "@/libs/crypto";
|
||||||
|
import * as didJwt from "did-jwt";
|
||||||
|
import QuickNav from "@/components/QuickNav";
|
||||||
import { Account } from "@/db/tables/accounts";
|
import { Account } from "@/db/tables/accounts";
|
||||||
import {
|
|
||||||
CONTACT_URL_PREFIX,
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||||
ENDORSER_JWT_URL_LOCATION,
|
const Buffer = require("buffer/").Buffer;
|
||||||
} from "@/libs/endorserServer";
|
|
||||||
import { Buffer } from "buffer/";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
QrcodeStream,
|
|
||||||
QRCodeVue3,
|
QRCodeVue3,
|
||||||
QuickNav,
|
QuickNav,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class ContactQRScanShow extends Vue {
|
export default class ContactQRScanShow extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
givenName = "";
|
|
||||||
qrValue = "";
|
qrValue = "";
|
||||||
|
|
||||||
public async getIdentity(activeDid: string) {
|
public async getIdentity(activeDid) {
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const accounts = await accountsDB.accounts.toArray();
|
const accounts = await accountsDB.accounts.toArray();
|
||||||
const account: Account | undefined = R.find(
|
const account: Account | undefined = R.find(
|
||||||
@@ -116,7 +56,7 @@ export default class ContactQRScanShow extends Vue {
|
|||||||
|
|
||||||
if (!identity) {
|
if (!identity) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
"Attempted to show contact info with no identifier available.",
|
"Attempted to load Give records with no identity available.",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return identity;
|
return identity;
|
||||||
@@ -127,32 +67,30 @@ export default class ContactQRScanShow extends Vue {
|
|||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
||||||
this.activeDid = settings?.activeDid || "";
|
this.activeDid = settings?.activeDid || "";
|
||||||
this.apiServer = settings?.apiServer || "";
|
this.apiServer = settings?.apiServer || "";
|
||||||
this.givenName = settings?.firstName || "";
|
|
||||||
|
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const accounts = await accountsDB.accounts.toArray();
|
const accounts = await accountsDB.accounts.toArray();
|
||||||
const account = R.find((acc) => acc.did === this.activeDid, accounts);
|
const account = R.find((acc) => acc.did === this.activeDid, accounts);
|
||||||
if (account) {
|
if (!account) {
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "warning",
|
||||||
|
title: "",
|
||||||
|
text: "You have no identity yet.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
const identity = await this.getIdentity(this.activeDid);
|
const identity = await this.getIdentity(this.activeDid);
|
||||||
const publicKeyHex = identity.keys[0].publicKeyHex;
|
const publicKeyHex = identity.keys[0].publicKeyHex;
|
||||||
const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
|
const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
|
||||||
|
|
||||||
const newDerivPath = nextDerivationPath(account.derivationPath);
|
|
||||||
const nextPublicHex = deriveAddress(account.mnemonic, newDerivPath)[2];
|
|
||||||
const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
|
|
||||||
const nextPublicEncKeyHash = sha256(nextPublicEncKey);
|
|
||||||
const nextPublicEncKeyHashBase64 =
|
|
||||||
Buffer.from(nextPublicEncKeyHash).toString("base64");
|
|
||||||
|
|
||||||
const contactInfo = {
|
const contactInfo = {
|
||||||
iat: Date.now(),
|
iat: Date.now(),
|
||||||
iss: this.activeDid,
|
iss: this.activeDid,
|
||||||
own: {
|
own: {
|
||||||
name:
|
name: (settings?.firstName || "") + " " + (settings?.lastName || ""),
|
||||||
(settings?.firstName || "") +
|
|
||||||
(settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
|
|
||||||
publicEncKey,
|
publicEncKey,
|
||||||
nextPublicEncKeyHash: nextPublicEncKeyHashBase64,
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -165,63 +103,9 @@ export default class ContactQRScanShow extends Vue {
|
|||||||
issuer: identity.did,
|
issuer: identity.did,
|
||||||
signer: signer,
|
signer: signer,
|
||||||
});
|
});
|
||||||
const viewPrefix = CONTACT_URL_PREFIX + ENDORSER_JWT_URL_LOCATION;
|
const viewPrefix = "https://endorser.ch/contact?jwt=";
|
||||||
this.qrValue = viewPrefix + vcJwt;
|
this.qrValue = viewPrefix + vcJwt;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param content is the result of a QR scan, an array with one item with a rawValue property
|
|
||||||
*/
|
|
||||||
// Unfortunately, there are not typescript definitions for the qrcode-stream component yet.
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
onScanDetect(content: any) {
|
|
||||||
if (content[0]?.rawValue) {
|
|
||||||
localStorage.setItem("contactEndorserUrl", content[0].rawValue);
|
|
||||||
this.$router.push({ name: "contacts" });
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "warning",
|
|
||||||
title: "Invalid Contact QR Code",
|
|
||||||
text: "No QR code detected with contact information.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
onScanError(error: any) {
|
|
||||||
console.error("Scan was invalid:", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "warning",
|
|
||||||
title: "Invalid Scan",
|
|
||||||
text: "The scan was invalid.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
onCopyToClipboard() {
|
|
||||||
useClipboard()
|
|
||||||
.copy(this.qrValue)
|
|
||||||
.then(() => {
|
|
||||||
console.log("Contact URL:", this.qrValue);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "toast",
|
|
||||||
title: "Copied",
|
|
||||||
text: "Contact URL was copied to clipboard.",
|
|
||||||
},
|
|
||||||
2000,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -65,19 +65,17 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="mt-8">
|
<div class="mt-8">
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
<input
|
||||||
<input
|
type="submit"
|
||||||
type="submit"
|
class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
|
value="Look Up Contact"
|
||||||
value="Look Up Contact"
|
/>
|
||||||
/>
|
<button
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
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-1.5 py-2 rounded-md"
|
>
|
||||||
>
|
Cancel
|
||||||
Cancel
|
</button>
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Discover"></QuickNav>
|
<QuickNav selected="Discover"></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">
|
||||||
<!-- Heading -->
|
<!-- Heading -->
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
Discover
|
Discover
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Quick Search -->
|
<!-- Quick Search -->
|
||||||
<div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="searchSelected()">
|
<div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="search()">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
v-model="searchTerms"
|
v-model="searchTerms"
|
||||||
@@ -18,7 +17,7 @@
|
|||||||
class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
|
class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
@click="searchSelected()"
|
@click="search()"
|
||||||
class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
|
class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
|
||||||
>
|
>
|
||||||
<fa icon="magnifying-glass" class="fa-fw"></fa>
|
<fa icon="magnifying-glass" class="fa-fw"></fa>
|
||||||
@@ -33,8 +32,6 @@
|
|||||||
href="#"
|
href="#"
|
||||||
@click="
|
@click="
|
||||||
projects = [];
|
projects = [];
|
||||||
isLocalActive = true;
|
|
||||||
isRemoteActive = false;
|
|
||||||
searchLocal();
|
searchLocal();
|
||||||
"
|
"
|
||||||
v-bind:class="computedLocalTabClassNames()"
|
v-bind:class="computedLocalTabClassNames()"
|
||||||
@@ -42,46 +39,29 @@
|
|||||||
Nearby
|
Nearby
|
||||||
<span
|
<span
|
||||||
class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
|
class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
|
||||||
v-if="isLocalActive"
|
>{{ localCount }}</span
|
||||||
>
|
>
|
||||||
{{ localCount > -1 ? localCount : "?" }}
|
|
||||||
</span>
|
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
|
v-bind:class="computedRemoteTabClassNames()"
|
||||||
@click="
|
@click="
|
||||||
projects = [];
|
projects = [];
|
||||||
isRemoteActive = true;
|
search();
|
||||||
isLocalActive = false;
|
|
||||||
searchAll();
|
|
||||||
"
|
"
|
||||||
v-bind:class="computedRemoteTabClassNames()"
|
|
||||||
>
|
>
|
||||||
Anywhere
|
Remote
|
||||||
<span
|
<span
|
||||||
class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
|
class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
|
||||||
v-if="isRemoteActive"
|
>{{ remoteCount }}</span
|
||||||
>
|
>
|
||||||
{{ remoteCount > -1 ? remoteCount : "?" }}
|
|
||||||
</span>
|
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="isLocalActive">
|
|
||||||
<div>
|
|
||||||
<button
|
|
||||||
class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
|
|
||||||
@click="$router.push({ name: 'search-area' })"
|
|
||||||
>
|
|
||||||
Select a {{ searchBox ? "Different" : "" }} Location for Nearby Search
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Loading Animation -->
|
<!-- Loading Animation -->
|
||||||
<div
|
<div
|
||||||
class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
|
class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
|
||||||
@@ -103,11 +83,11 @@
|
|||||||
class="block py-4 flex gap-4"
|
class="block py-4 flex gap-4"
|
||||||
>
|
>
|
||||||
<div class="w-12">
|
<div class="w-12">
|
||||||
<ProjectIcon
|
<EntityIcon
|
||||||
:entityId="project.handleId"
|
:entityId="project.handleId"
|
||||||
:iconSize="48"
|
:iconSize="48"
|
||||||
class="block border border-slate-300 rounded-md"
|
class="block border border-slate-300 rounded-md"
|
||||||
></ProjectIcon>
|
></EntityIcon>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grow">
|
<div class="grow">
|
||||||
@@ -129,42 +109,30 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import { accountsDB, db } from "@/db";
|
||||||
import InfiniteScroll from "@/components/InfiniteScroll.vue";
|
|
||||||
import EntityIcon from "@/components/EntityIcon.vue";
|
|
||||||
import ProjectIcon from "@/components/ProjectIcon.vue";
|
|
||||||
import TopMessage from "@/components/TopMessage.vue";
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
import { Contact } from "@/db/tables/contacts";
|
||||||
import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
import { accessToken } from "@/libs/crypto";
|
import { accessToken } from "@/libs/crypto";
|
||||||
import { didInfo, PlanData } from "@/libs/endorserServer";
|
import { didInfo } from "@/libs/endorserServer";
|
||||||
|
import QuickNav from "@/components/QuickNav";
|
||||||
|
import InfiniteScroll from "@/components/InfiniteScroll";
|
||||||
|
import EntityIcon from "@/components/EntityIcon";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: { QuickNav, InfiniteScroll, EntityIcon },
|
||||||
EntityIcon,
|
|
||||||
InfiniteScroll,
|
|
||||||
ProjectIcon,
|
|
||||||
QuickNav,
|
|
||||||
TopMessage,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
export default class DiscoverView extends Vue {
|
export default class DiscoverView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
allContacts: Array<Contact> = [];
|
allContacts: Array<Contact> = [];
|
||||||
allMyDids: Array<string> = [];
|
allMyDids: Array<string> = [];
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
searchTerms = "";
|
searchTerms = "";
|
||||||
projects: PlanData[] = [];
|
projects: ProjectData[] = [];
|
||||||
isLoading = false;
|
|
||||||
isLocalActive = true;
|
isLocalActive = true;
|
||||||
isRemoteActive = false;
|
isRemoteActive = false;
|
||||||
localCount = -1;
|
localCount = 0;
|
||||||
remoteCount = -1;
|
remoteCount = 0;
|
||||||
searchBox: { name: string; bbox: BoundingBox } | null = null;
|
isLoading = false;
|
||||||
|
|
||||||
// make this function available to the Vue template
|
// make this function available to the Vue template
|
||||||
didInfo = didInfo;
|
didInfo = didInfo;
|
||||||
@@ -172,42 +140,19 @@ export default class DiscoverView extends Vue {
|
|||||||
async mounted() {
|
async mounted() {
|
||||||
await db.open();
|
await db.open();
|
||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
||||||
this.activeDid = (settings?.activeDid as string) || "";
|
this.activeDid = settings?.activeDid || "";
|
||||||
this.apiServer = (settings?.apiServer as string) || "";
|
this.apiServer = settings?.apiServer || "";
|
||||||
this.searchBox = settings?.searchBoxes?.[0] || null;
|
|
||||||
|
|
||||||
this.allContacts = await db.contacts.toArray();
|
this.allContacts = await db.contacts.toArray();
|
||||||
|
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const allAccounts = await accountsDB.accounts.toArray();
|
const allAccounts = await accountsDB.accounts.toArray();
|
||||||
this.allMyDids = allAccounts.map((acc) => acc.did);
|
this.allMyDids = allAccounts.map((acc) => acc.did);
|
||||||
|
|
||||||
if (this.searchBox) {
|
this.searchLocal();
|
||||||
await this.searchLocal();
|
|
||||||
} else {
|
|
||||||
this.isLocalActive = false;
|
|
||||||
this.isRemoteActive = true;
|
|
||||||
await this.searchAll();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public resetCounts() {
|
public async buildHeaders() {
|
||||||
this.localCount = -1;
|
const headers = { "Content-Type": "application/json" };
|
||||||
this.remoteCount = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async searchSelected() {
|
|
||||||
if (this.isLocalActive) {
|
|
||||||
await this.searchLocal();
|
|
||||||
} else {
|
|
||||||
await this.searchAll();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async buildHeaders(): Promise<HeadersInit> {
|
|
||||||
const headers: HeadersInit = {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
};
|
|
||||||
|
|
||||||
if (this.activeDid) {
|
if (this.activeDid) {
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
@@ -217,7 +162,7 @@ export default class DiscoverView extends Vue {
|
|||||||
|
|
||||||
if (!identity) {
|
if (!identity) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
"An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
|
"An ID is chosen but there are no keys for it so it cannot be used to talk with the service.",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,20 +173,16 @@ export default class DiscoverView extends Vue {
|
|||||||
return headers;
|
return headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async searchAll(beforeId?: string) {
|
public async search(beforeId?: string) {
|
||||||
this.resetCounts();
|
|
||||||
|
|
||||||
if (!beforeId) {
|
|
||||||
// this was an initial search so clear any previous results
|
|
||||||
this.projects = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms);
|
let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms);
|
||||||
|
|
||||||
if (beforeId) {
|
if (beforeId) {
|
||||||
queryParams = queryParams + `&beforeId=${beforeId}`;
|
queryParams = queryParams + `&beforeId=${beforeId}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.isRemoteActive = true;
|
||||||
|
this.isLocalActive = false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.isLoading = true;
|
this.isLoading = true;
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
@@ -254,13 +195,12 @@ export default class DiscoverView extends Vue {
|
|||||||
|
|
||||||
if (response.status !== 200) {
|
if (response.status !== 200) {
|
||||||
const details = await response.text();
|
const details = await response.text();
|
||||||
console.error("Problem with full search:", details);
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Error",
|
title: "Error",
|
||||||
text: `There was a problem accessing the server. Try again later.`,
|
text: `There was a problem accessing the server. Please try again later. (${details})`,
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
@@ -270,19 +210,18 @@ export default class DiscoverView extends Vue {
|
|||||||
|
|
||||||
const results = await response.json();
|
const results = await response.json();
|
||||||
|
|
||||||
const plans: PlanData[] = results.data;
|
const plans: ProjectData[] = results.data;
|
||||||
if (plans) {
|
if (plans) {
|
||||||
for (const plan of plans) {
|
for (const plan of plans) {
|
||||||
const { name, description, handleId, issuerDid, rowid } = plan;
|
const { name, description, handleId, rowid, issuerDid } = plan;
|
||||||
this.projects.push({ name, description, handleId, issuerDid, rowid });
|
this.projects.push({ name, description, handleId, rowid, issuerDid });
|
||||||
}
|
}
|
||||||
this.remoteCount = this.projects.length;
|
this.remoteCount = this.projects.length;
|
||||||
} else {
|
} else {
|
||||||
throw JSON.stringify(results);
|
throw JSON.stringify(results);
|
||||||
}
|
}
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
} catch (e) {
|
||||||
} catch (e: any) {
|
console.log("Error with feed load:", e);
|
||||||
console.error("Error with feed load:", e);
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
@@ -298,27 +237,14 @@ export default class DiscoverView extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async searchLocal(beforeId?: string) {
|
public async searchLocal(beforeId?: string) {
|
||||||
this.resetCounts();
|
|
||||||
|
|
||||||
if (!this.searchBox) {
|
|
||||||
this.projects = [];
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!beforeId) {
|
|
||||||
// this was an initial search so clear any previous results
|
|
||||||
this.projects = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
const claimContents =
|
const claimContents =
|
||||||
"claimContents=" + encodeURIComponent(this.searchTerms);
|
"claimContents=" + encodeURIComponent(this.searchTerms);
|
||||||
|
|
||||||
let queryParams = [
|
let queryParams = [
|
||||||
claimContents,
|
claimContents,
|
||||||
"minLocLat=" + this.searchBox.bbox.minLat,
|
"minLocLat=40.901000",
|
||||||
"maxLocLat=" + this.searchBox.bbox.maxLat,
|
"maxLocLat=40.904000",
|
||||||
"westLocLon=" + this.searchBox.bbox.westLong,
|
"westLocLon=-111.914000",
|
||||||
"eastLocLon=" + this.searchBox.bbox.eastLong,
|
"eastLocLon=-111.909000",
|
||||||
].join("&");
|
].join("&");
|
||||||
|
|
||||||
if (beforeId) {
|
if (beforeId) {
|
||||||
@@ -327,6 +253,8 @@ export default class DiscoverView extends Vue {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
this.isLoading = true;
|
this.isLoading = true;
|
||||||
|
this.isLocalActive = true;
|
||||||
|
this.isRemoteActive = false;
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
|
this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
|
||||||
{
|
{
|
||||||
@@ -337,13 +265,12 @@ export default class DiscoverView extends Vue {
|
|||||||
|
|
||||||
if (response.status !== 200) {
|
if (response.status !== 200) {
|
||||||
const details = await response.text();
|
const details = await response.text();
|
||||||
console.error("Problem with nearby search:", details);
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Error",
|
title: "Error",
|
||||||
text: "There was a problem accessing the server. Try again later.",
|
text: `There was a problem accessing the server. Please try again later. (${details})`,
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
@@ -354,16 +281,12 @@ export default class DiscoverView extends Vue {
|
|||||||
|
|
||||||
if (results.data) {
|
if (results.data) {
|
||||||
if (beforeId) {
|
if (beforeId) {
|
||||||
const plans: PlanData[] = results.data;
|
const plans: ProjectData[] = results.data;
|
||||||
for (const plan of plans) {
|
for (const plan of plans) {
|
||||||
const { name, description, handleId, issuerDid, rowid } = plan;
|
const { name, description, handleId = plan.handleId, rowid } = plan;
|
||||||
this.projects.push({
|
if (beforeId !== plan["rowid"]) {
|
||||||
name,
|
this.projects.push({ name, description, handleId, rowid });
|
||||||
description,
|
}
|
||||||
handleId,
|
|
||||||
issuerDid,
|
|
||||||
rowid,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.projects = results.data;
|
this.projects = results.data;
|
||||||
@@ -372,9 +295,8 @@ export default class DiscoverView extends Vue {
|
|||||||
} else {
|
} else {
|
||||||
throw JSON.stringify(results);
|
throw JSON.stringify(results);
|
||||||
}
|
}
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
} catch (e) {
|
||||||
} catch (e: any) {
|
console.log("Error with feed load:", e);
|
||||||
console.error("Error with feed load:", e);
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
@@ -399,7 +321,7 @@ export default class DiscoverView extends Vue {
|
|||||||
if (this.isLocalActive) {
|
if (this.isLocalActive) {
|
||||||
this.searchLocal(latestProject["rowid"]);
|
this.searchLocal(latestProject["rowid"]);
|
||||||
} else if (this.isRemoteActive) {
|
} else if (this.isRemoteActive) {
|
||||||
this.searchAll(latestProject["rowid"]);
|
this.search(latestProject["rowid"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -411,7 +333,7 @@ export default class DiscoverView extends Vue {
|
|||||||
onClickLoadProject(id: string) {
|
onClickLoadProject(id: string) {
|
||||||
localStorage.setItem("projectId", id);
|
localStorage.setItem("projectId", id);
|
||||||
const route = {
|
const route = {
|
||||||
path: "/project/" + encodeURIComponent(id),
|
name: "project",
|
||||||
};
|
};
|
||||||
this.$router.push(route);
|
this.$router.push(route);
|
||||||
}
|
}
|
||||||
@@ -422,15 +344,13 @@ export default class DiscoverView extends Vue {
|
|||||||
"py-3": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
|
|
||||||
active: this.isLocalActive,
|
active: this.isLocalActive,
|
||||||
"text-black": this.isLocalActive,
|
"text-blue-600": this.isLocalActive,
|
||||||
"border-black": this.isLocalActive,
|
"border-blue-600": this.isLocalActive,
|
||||||
"font-semibold": this.isLocalActive,
|
"font-semibold": this.isLocalActive,
|
||||||
|
|
||||||
"text-blue-600": !this.isLocalActive,
|
|
||||||
"border-transparent": !this.isLocalActive,
|
"border-transparent": !this.isLocalActive,
|
||||||
"hover:border-slate-400": !this.isLocalActive,
|
"hover:text-slate-600": !this.isLocalActive,
|
||||||
|
"hover:border-slate-300": !this.isLocalActive,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -440,15 +360,13 @@ export default class DiscoverView extends Vue {
|
|||||||
"py-3": true,
|
"py-3": true,
|
||||||
"rounded-t-lg": true,
|
"rounded-t-lg": true,
|
||||||
"border-b-2": true,
|
"border-b-2": true,
|
||||||
|
|
||||||
active: this.isRemoteActive,
|
active: this.isRemoteActive,
|
||||||
"text-black": this.isRemoteActive,
|
"text-blue-600": this.isRemoteActive,
|
||||||
"border-black": this.isRemoteActive,
|
"border-blue-600": this.isRemoteActive,
|
||||||
"font-semibold": this.isRemoteActive,
|
"font-semibold": this.isRemoteActive,
|
||||||
|
|
||||||
"text-blue-600": !this.isRemoteActive,
|
|
||||||
"border-transparent": !this.isRemoteActive,
|
"border-transparent": !this.isRemoteActive,
|
||||||
"hover:border-slate-400": !this.isRemoteActive,
|
"hover:text-slate-600": !this.isRemoteActive,
|
||||||
|
"hover:border-slate-300": !this.isRemoteActive,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,459 +0,0 @@
|
|||||||
<template>
|
|
||||||
<QuickNav />
|
|
||||||
<TopMessage />
|
|
||||||
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- 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="cancel()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 class="text-4xl text-center font-light px-4 mb-4">What Was Given</h1>
|
|
||||||
|
|
||||||
<h1 class="text-xl font-bold text-center mb-4">
|
|
||||||
{{ message }} {{ giverName || "somebody not named" }}
|
|
||||||
</h1>
|
|
||||||
<textarea
|
|
||||||
class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
|
|
||||||
placeholder="What was received"
|
|
||||||
v-model="description"
|
|
||||||
/>
|
|
||||||
<div class="flex flex-row justify-center">
|
|
||||||
<span
|
|
||||||
class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
|
|
||||||
@click="changeUnitCode()"
|
|
||||||
>
|
|
||||||
{{ libsUtil.UNIT_SHORT[unitCode] }}
|
|
||||||
</span>
|
|
||||||
<div
|
|
||||||
class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
|
|
||||||
@click="amountInput === '0' ? null : decrement()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" />
|
|
||||||
</div>
|
|
||||||
<input
|
|
||||||
type="number"
|
|
||||||
class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
|
|
||||||
v-model="amountInput"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
|
|
||||||
@click="increment()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-right" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex justify-center mt-4">
|
|
||||||
<span v-if="imageUrl" class="flex justify-between">
|
|
||||||
<a :href="imageUrl" target="_blank" class="text-blue-500 ml-4">
|
|
||||||
<img :src="imageUrl" class="h-24 rounded-xl" />
|
|
||||||
</a>
|
|
||||||
<fa
|
|
||||||
icon="trash-can"
|
|
||||||
@click="confirmDeleteImage"
|
|
||||||
class="text-red-500 fa-fw ml-8 mt-10"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
<fa
|
|
||||||
icon="camera"
|
|
||||||
class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
|
|
||||||
@click="openPhotoDialog"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<GiftedPhotoDialog ref="photoDialog" />
|
|
||||||
|
|
||||||
<div v-if="projectId" class="mt-4">
|
|
||||||
<fa
|
|
||||||
icon="check"
|
|
||||||
class="bg-slate-500 text-white h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
|
|
||||||
/>
|
|
||||||
<label class="text-sm">This is given to a project</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="!projectId" class="mt-4">
|
|
||||||
<input type="checkbox" class="h-6 w-6 mr-2" v-model="givenToUser" />
|
|
||||||
<label class="text-sm">Given to you</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mt-4">
|
|
||||||
<input type="checkbox" class="h-6 w-6 mr-2" v-model="isTrade" />
|
|
||||||
<label class="text-sm">Trade (not a gift)</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p class="text-center mb-2 mt-6 italic">
|
|
||||||
Sign & Send to publish to the world
|
|
||||||
<fa
|
|
||||||
icon="circle-info"
|
|
||||||
class="pl-2 text-blue-500 cursor-pointer"
|
|
||||||
@click="explainData()"
|
|
||||||
/>
|
|
||||||
</p>
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
|
|
||||||
@click="confirm"
|
|
||||||
>
|
|
||||||
Sign & Send
|
|
||||||
</button>
|
|
||||||
<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-1.5 py-2 rounded-md"
|
|
||||||
@click="cancel"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import TopMessage from "@/components/TopMessage.vue";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
|
||||||
import { createAndSubmitGive } from "@/libs/endorserServer";
|
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
import { accessToken } from "@/libs/crypto";
|
|
||||||
import GiftedDialog from "@/components/GiftedDialog.vue";
|
|
||||||
import GiftedPhotoDialog from "@/components/GiftedPhotoDialog.vue";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
components: {
|
|
||||||
GiftedDialog,
|
|
||||||
GiftedPhotoDialog,
|
|
||||||
QuickNav,
|
|
||||||
TopMessage,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class GiftedDetails extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDid = "";
|
|
||||||
apiServer = "";
|
|
||||||
|
|
||||||
amountInput = "0";
|
|
||||||
description = "";
|
|
||||||
givenToUser = false;
|
|
||||||
giverDid: string | undefined;
|
|
||||||
giverName = "";
|
|
||||||
imageUrl = "";
|
|
||||||
isTrade = false;
|
|
||||||
message = "";
|
|
||||||
offerId = "";
|
|
||||||
projectId = "";
|
|
||||||
unitCode = "HUR";
|
|
||||||
|
|
||||||
libsUtil = libsUtil;
|
|
||||||
|
|
||||||
async mounted() {
|
|
||||||
this.amountInput = this.$route.query.amountInput as string;
|
|
||||||
this.description = this.$route.query.description as string;
|
|
||||||
this.giverDid = this.$route.query.giverDid as string;
|
|
||||||
this.giverName = this.$route.query.giverName as string;
|
|
||||||
this.message = this.$route.query.message as string;
|
|
||||||
this.offerId = this.$route.query.offerId as string;
|
|
||||||
this.projectId = this.$route.query.projectId as string;
|
|
||||||
this.unitCode = this.$route.query.unitCode as string;
|
|
||||||
|
|
||||||
this.imageUrl = localStorage.getItem("imageUrl") || "";
|
|
||||||
|
|
||||||
this.givenToUser = !this.projectId;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await db.open();
|
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
|
||||||
this.apiServer = settings?.apiServer || "";
|
|
||||||
this.activeDid = settings?.activeDid || "";
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (err: any) {
|
|
||||||
console.error("Error retrieving settings from database:", err);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: err.message || "There was an error retrieving your settings.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
changeUnitCode() {
|
|
||||||
const units = Object.keys(this.libsUtil.UNIT_SHORT);
|
|
||||||
const index = units.indexOf(this.unitCode);
|
|
||||||
this.unitCode = units[(index + 1) % units.length];
|
|
||||||
}
|
|
||||||
|
|
||||||
increment() {
|
|
||||||
this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
decrement() {
|
|
||||||
this.amountInput = `${Math.max(
|
|
||||||
0,
|
|
||||||
(parseFloat(this.amountInput) || 1) - 1,
|
|
||||||
)}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel() {
|
|
||||||
this.deleteImage(); // not awaiting, so they'll go back immediately
|
|
||||||
this.$router.back();
|
|
||||||
}
|
|
||||||
|
|
||||||
openPhotoDialog() {
|
|
||||||
(this.$refs.photoDialog as GiftedPhotoDialog).open((imgUrl) => {
|
|
||||||
this.imageUrl = imgUrl;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
confirmDeleteImage() {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "modal",
|
|
||||||
type: "confirm",
|
|
||||||
title: "Are you sure you want to delete the image?",
|
|
||||||
text: "",
|
|
||||||
onYes: this.deleteImage,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async deleteImage() {
|
|
||||||
if (!this.imageUrl) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
const identity = await libsUtil.getIdentity(this.activeDid);
|
|
||||||
const token = await accessToken(identity);
|
|
||||||
const response = await this.axios.delete(
|
|
||||||
DEFAULT_IMAGE_API_SERVER +
|
|
||||||
"/image/" +
|
|
||||||
encodeURIComponent(this.imageUrl),
|
|
||||||
{
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${token}`,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
if (response.status === 204) {
|
|
||||||
// don't bother with a notification
|
|
||||||
// (either they'll simply continue or they're canceling and going back)
|
|
||||||
} else {
|
|
||||||
console.error("Non-success deleting image:", response);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was a problem deleting the image.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
// keep the imageUrl in localStorage so the user can try again if they want
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
localStorage.removeItem("imageUrl");
|
|
||||||
this.imageUrl = "";
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error deleting image:", error);
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
if ((error as any).response.status === 404) {
|
|
||||||
console.log("The image was already deleted:", error);
|
|
||||||
|
|
||||||
localStorage.removeItem("imageUrl");
|
|
||||||
this.imageUrl = "";
|
|
||||||
|
|
||||||
// it already doesn't exist so we won't say anything to the user
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was an error deleting the image.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async confirm() {
|
|
||||||
if (!this.activeDid) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "You must select an identifier before you can record a give.",
|
|
||||||
},
|
|
||||||
2000,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (parseFloat(this.amountInput) < 0) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
text: "You may not send a negative number.",
|
|
||||||
title: "",
|
|
||||||
},
|
|
||||||
2000,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!this.description && !parseFloat(this.amountInput)) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: `You must enter a description or some number of ${
|
|
||||||
this.libsUtil.UNIT_LONG[this.unitCode]
|
|
||||||
}.`,
|
|
||||||
},
|
|
||||||
2000,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "toast",
|
|
||||||
text: "Recording the give...",
|
|
||||||
title: "",
|
|
||||||
},
|
|
||||||
1000,
|
|
||||||
);
|
|
||||||
|
|
||||||
// this is asynchronous, but we don't need to wait for it to complete
|
|
||||||
await this.recordGive();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param giverDid may be null
|
|
||||||
* @param description may be an empty string
|
|
||||||
* @param amountInput may be 0
|
|
||||||
* @param unitCode may be omitted, defaults to "HUR"
|
|
||||||
*/
|
|
||||||
public async recordGive() {
|
|
||||||
try {
|
|
||||||
const identity = await libsUtil.getIdentity(this.activeDid);
|
|
||||||
const result = await createAndSubmitGive(
|
|
||||||
this.axios,
|
|
||||||
this.apiServer,
|
|
||||||
identity,
|
|
||||||
this.giverDid,
|
|
||||||
this.givenToUser ? this.activeDid : undefined,
|
|
||||||
this.description,
|
|
||||||
parseFloat(this.amountInput),
|
|
||||||
this.unitCode,
|
|
||||||
this.projectId,
|
|
||||||
this.offerId,
|
|
||||||
this.isTrade,
|
|
||||||
this.imageUrl,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (
|
|
||||||
result.type === "error" ||
|
|
||||||
this.isGiveCreationError(result.response)
|
|
||||||
) {
|
|
||||||
const errorMessage = this.getGiveCreationErrorMessage(result);
|
|
||||||
console.error("Error with give creation result:", result);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: errorMessage || "There was an error creating the give.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Success",
|
|
||||||
text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
localStorage.removeItem("imageUrl");
|
|
||||||
this.$router.back();
|
|
||||||
}
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error("Error with give recordation caught:", error);
|
|
||||||
const message =
|
|
||||||
error.userMessage ||
|
|
||||||
error.response?.data?.error?.message ||
|
|
||||||
"There was an error recording the give.";
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: message,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper functions for readability
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param result response "data" from the server
|
|
||||||
* @returns true if the result indicates an error
|
|
||||||
*/
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
isGiveCreationError(result: any) {
|
|
||||||
return result.status !== 201 || result.data?.error;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
|
|
||||||
* @returns best guess at an error message
|
|
||||||
*/
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
getGiveCreationErrorMessage(result: any) {
|
|
||||||
return (
|
|
||||||
result.error?.userMessage ||
|
|
||||||
result.error?.error ||
|
|
||||||
result.response?.data?.error?.message
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
explainData() {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Data Sharing",
|
|
||||||
text: libsUtil.PRIVACY_MESSAGE,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,412 +0,0 @@
|
|||||||
<template>
|
|
||||||
<QuickNav />
|
|
||||||
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- Breadcrumb -->
|
|
||||||
<div class="mb-8">
|
|
||||||
<!-- 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()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
|
||||||
Notification Help
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- eslint-disable prettier/prettier -->
|
|
||||||
<div>
|
|
||||||
<p>Here are ways to test notifications and get them working.</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">Full Test</h2>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
If this works then you're all set.
|
|
||||||
<button
|
|
||||||
@click="sendTestWebPushMessage(true)"
|
|
||||||
class="block w-full text-center text-md 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-1.5 py-2 rounded-md mb-2"
|
|
||||||
>
|
|
||||||
Send Yourself a Test Web Push Message (Through Push Server but
|
|
||||||
Skipping Client Filter)
|
|
||||||
</button>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">
|
|
||||||
If this app doesn't support notifications...
|
|
||||||
<!-- Note that that exact verbiage shows in a message elsewhere. -->
|
|
||||||
</h2>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
To be notified of interesting updates, install this app on your device
|
|
||||||
(as opposed to using it inside the browser app). In Chrome, it may prompt
|
|
||||||
you, and you can also look for the "Install" command in the browser
|
|
||||||
settings; on the the desktop, look for this icon in the address bar:
|
|
||||||
<img
|
|
||||||
src="../assets/help/chrome-install-pwa.png"
|
|
||||||
alt="Chrome 'install' icon"
|
|
||||||
class="ml-4"
|
|
||||||
/>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">
|
|
||||||
If you must enable notifications...
|
|
||||||
<!-- Note that that exact verbiage shows in a message elsewhere. -->
|
|
||||||
</h2>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
<button class="text-blue-500" @click="showNotificationChoice()">
|
|
||||||
Click here.
|
|
||||||
</button>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">
|
|
||||||
If you're waiting for system initialization...
|
|
||||||
<!-- Note that that exact verbiage shows in a message elsewhere. -->
|
|
||||||
</h2>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
... and it never stops, then there is a problem with the underlying
|
|
||||||
service worker or push server mechanism in your browser. Your best bet
|
|
||||||
is to follow the "Reinstall" steps below or use a different browser.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">Check App Permissions</h2>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
In Apple iOS, check "Settings" -> "Notifications", look for the Time
|
|
||||||
Safari app (or the browser you're using), and make sure notifications
|
|
||||||
are enabled.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
In Android, hold on to the app icon, then select "App Info", then
|
|
||||||
"Notifications" and make sure they're enabled. If it's still a problem
|
|
||||||
then go further:
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
If you installed the app with Chrome, make sure there are no other
|
|
||||||
tabs with it open. Here are some ways to clear caches that can mess
|
|
||||||
things up (and note that this clears out data from the installed app
|
|
||||||
-- which is good to do while the app is installed):
|
|
||||||
</p>
|
|
||||||
<ul>
|
|
||||||
<li class="list-disc ml-4">
|
|
||||||
Go to Chrome "App Info", then "Storage & Cache" and "Clear Storage".
|
|
||||||
</li>
|
|
||||||
<li class="list-disc ml-4">
|
|
||||||
Go to Chrome "Settings", then "Privacy and Security" and "Clear
|
|
||||||
"Clear browsing data", then "Cookies and site data". Make sure the
|
|
||||||
"Time Range" at the top shows "All time".
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
On a Mac, go to "Settings" and check "Notifications".
|
|
||||||
<img
|
|
||||||
src="../assets/help/mac-installed-app-settings.png"
|
|
||||||
alt="Mac app settings"
|
|
||||||
class="ml-4"
|
|
||||||
/>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">Check Browser Permissions</h2>
|
|
||||||
<div>
|
|
||||||
<p>In Apple iOS, check Settings -> Notifications.</p>
|
|
||||||
<p>In Android, check Settings -> Notifications.</p>
|
|
||||||
|
|
||||||
You can find more details about compatibility
|
|
||||||
<a
|
|
||||||
href="https://developer.mozilla.org/en-US/docs/Web/API/Push_API#browser_compatibility"
|
|
||||||
class="text-blue-500"
|
|
||||||
target="_blank"
|
|
||||||
>
|
|
||||||
here <fa icon="arrow-up-right-from-square" class="fa-fw" />
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">
|
|
||||||
Check Operating System (OS) Permissions
|
|
||||||
</h2>
|
|
||||||
<div class="px-2">
|
|
||||||
<div>
|
|
||||||
<h3 class="text-lg font-semibold">Mobile Phone - Apple iOS</h3>
|
|
||||||
<div>
|
|
||||||
Notifications require iOS 16.4 or higher. To check your iOS version,
|
|
||||||
go to Settings > General > About > Software Version.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h3 class="text-lg font-semibold">Mobile Phone - Google Android</h3>
|
|
||||||
<div>
|
|
||||||
We recommend Chrome. It must be version 42 or higher. Check your
|
|
||||||
version under Settings -> About Chrome.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h3 class="text-lg font-semibold">Desktop - Mac</h3>
|
|
||||||
<div>
|
|
||||||
<span>
|
|
||||||
See "System Settings" -> "Notifications" and make sure it is
|
|
||||||
enabled for the browser you're using. Note that these
|
|
||||||
notifications require Mac OS 13; see your macOS version under
|
|
||||||
Apple -> "About This Mac".
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h3 class="text-lg font-semibold">Desktop - Windows</h3>
|
|
||||||
In Windows, check "Settings" -> "Notifications".
|
|
||||||
<img
|
|
||||||
src="../assets/help/windows-system-enable-notifications.png"
|
|
||||||
alt="Windows system settings"
|
|
||||||
class="ml-4"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
You can find more details about compatibility
|
|
||||||
<a
|
|
||||||
href="https://developer.mozilla.org/en-US/docs/Web/API/Push_API#browser_compatibility"
|
|
||||||
class="text-blue-500"
|
|
||||||
target="_blank"
|
|
||||||
>
|
|
||||||
here <fa icon="arrow-up-right-from-square" class="fa-fw" />
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">Reinstall</h2>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
If all else fails, uninstall the app, ensure all the browser tabs with
|
|
||||||
it are closed, and clear out caches and storage.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Of course, you'll want to back up all your data first -- all seeds as
|
|
||||||
well as the contacts & settings -- on the Account
|
|
||||||
<fa icon="circle-user" /> page.
|
|
||||||
</p>
|
|
||||||
<ul class="ml-4 list-disc">
|
|
||||||
<li>
|
|
||||||
Clear cache.
|
|
||||||
<ul>
|
|
||||||
<li>
|
|
||||||
In mobile, look for the browser app settings. This is true even
|
|
||||||
for an installed app: go to the browser which you used to
|
|
||||||
initially visit timesafari.app, because those settings affect
|
|
||||||
the app. Look for "Delete browsing data" in the "Settings",
|
|
||||||
under "Privacy and Security".
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
In Chrome, go to `chrome://settings/cookies` and "all site data
|
|
||||||
and permissions" for timesafari.app; in Firefox, go to
|
|
||||||
`about:preferences` and search for "cache" then "Manage Data"
|
|
||||||
for timesafari.app. Also manually remove the IndexedDB data if
|
|
||||||
the DBs still show.)
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Clear notification permission. (In Chrome, go to
|
|
||||||
`chrome://settings/content/notifications`; in Firefox, go to
|
|
||||||
`about:preferences` and search for "notifications".)
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Unregister service worker. (In Chrome, go to
|
|
||||||
`chrome://serviceworker-internals/`; in Firefox, go to
|
|
||||||
`about:serviceworkers`.)
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Clear "Cache Storage". (In Chrome, in dev tools under "Application";
|
|
||||||
in Firefox, in dev tools under "Storage".)
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<p>Then reinstall the app.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mt-4">Tests</h2>
|
|
||||||
<button
|
|
||||||
@click="showTestNotification()"
|
|
||||||
class="block w-full text-center text-md 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-1.5 py-2 rounded-md mt-4 mb-2"
|
|
||||||
>
|
|
||||||
Send Test Notification Directly to Device (Not Through Push Server)
|
|
||||||
</button>
|
|
||||||
<p>
|
|
||||||
If that didn't show a notification on your device, the problem is that
|
|
||||||
your browser or your operating system are not allowing notifications
|
|
||||||
through. See "Check App Permissions" and "Check Browser Permissions" and
|
|
||||||
"Check Operating System (OS) Permissions" above.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="alertWebPushSubscription()"
|
|
||||||
class="block w-full text-center text-md 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-1.5 py-2 rounded-md mt-4 mb-2"
|
|
||||||
>
|
|
||||||
Show Web Push Subscription Info
|
|
||||||
</button>
|
|
||||||
<p>
|
|
||||||
If that showed "null" then the notification is not active.
|
|
||||||
<button class="text-blue-500" @click="showNotificationChoice()">
|
|
||||||
Click here.
|
|
||||||
</button>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="sendTestWebPushMessage(true)"
|
|
||||||
class="block w-full text-center text-md 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-1.5 py-2 rounded-md mt-4 mb-2"
|
|
||||||
>
|
|
||||||
Send Yourself a Test Web Push Message (Through Push Server but Skipping
|
|
||||||
Client Filter)
|
|
||||||
</button>
|
|
||||||
<p>
|
|
||||||
If that didn't show a notification on your device, there is a problem
|
|
||||||
getting to the push server. Disable notifications and then enable them
|
|
||||||
again.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="sendTestWebPushMessage()"
|
|
||||||
class="block w-full text-center text-md 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-1.5 py-2 rounded-md mt-4 mb-2"
|
|
||||||
>
|
|
||||||
Send Yourself a Test Web Push Message (Through Push Server and Client
|
|
||||||
Filter)
|
|
||||||
</button>
|
|
||||||
<p>
|
|
||||||
If you don't see a message, it could be that there is nothing new for
|
|
||||||
you to see. If the previous test worked, then things should work fine.
|
|
||||||
If you notice a full 24 hours where you get no notification and you know
|
|
||||||
that there are new items that should show, gather as many details as
|
|
||||||
possible and go to the bottom of
|
|
||||||
<router-link to="help" class="text-blue-500"> this page </router-link>
|
|
||||||
for ways to contact us.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<!-- eslint-enable -->
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { sendTestThroughPushServer } from "@/libs/util";
|
|
||||||
|
|
||||||
@Component({ components: { QuickNav } })
|
|
||||||
export default class HelpNotificationsView extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
subscriptionJSON?: PushSubscriptionJSON;
|
|
||||||
|
|
||||||
async mounted() {
|
|
||||||
try {
|
|
||||||
const registration = await navigator.serviceWorker.ready;
|
|
||||||
const fullSub = await registration.pushManager.getSubscription();
|
|
||||||
this.subscriptionJSON = fullSub?.toJSON();
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Mount error:", error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
alertWebPushSubscription() {
|
|
||||||
console.log(
|
|
||||||
"Web push subscription:",
|
|
||||||
JSON.parse(JSON.stringify(this.subscriptionJSON)), // gives more info than plain console logging
|
|
||||||
);
|
|
||||||
alert(JSON.stringify(this.subscriptionJSON));
|
|
||||||
}
|
|
||||||
|
|
||||||
async sendTestWebPushMessage(skipFilter: boolean = false) {
|
|
||||||
if (!this.subscriptionJSON) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Not Subscribed",
|
|
||||||
// Note that this exact verbiage shows in help text.
|
|
||||||
text: "You must enable notifications before testing the web push.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
await sendTestThroughPushServer(this.subscriptionJSON, skipFilter);
|
|
||||||
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Test Web Push Sent",
|
|
||||||
text:
|
|
||||||
"Check your device for the test web push message" +
|
|
||||||
(skipFilter ? "." : " if there are new items in your feed."),
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Got an error sending test notification:", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error Sending Test",
|
|
||||||
text: "Got an error sending the test web push notification.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
showTestNotification() {
|
|
||||||
const TEST_NOTIFICATION_TITLE = "It Worked";
|
|
||||||
navigator.serviceWorker.ready
|
|
||||||
.then((registration) => {
|
|
||||||
return registration.showNotification(TEST_NOTIFICATION_TITLE, {
|
|
||||||
body: "This is your test notification.",
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.then(() => {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Sent",
|
|
||||||
text: `A notification was triggered, so one should show on your device entitled '${TEST_NOTIFICATION_TITLE}'.`,
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error("Got a notification error:", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Failed",
|
|
||||||
text: "Got an error sending a notification.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
showNotificationChoice() {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "modal",
|
|
||||||
type: "notification-permission",
|
|
||||||
title: "", // unused, only here to satisfy type check
|
|
||||||
text: "", // unused, only here to satisfy type check
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
<template>
|
|
||||||
<!-- Don't include nav buttons since this is shown in a different window. -->
|
|
||||||
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- Breadcrumb -->
|
|
||||||
<div class="mb-8">
|
|
||||||
<!-- 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
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- eslint-disable prettier/prettier -->
|
|
||||||
<div class="ml-4">
|
|
||||||
<h1 class="font-bold text-xl">Install</h1>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
1) Have them visit TimeSafari.app in a browser, preferably Chrome or Safari.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
2) Have them "Install" the site to their desktop.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h1 class="font-bold text-xl">Add Contact & Register</h1>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
3) Have them follow their yellow prompts.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
4) Add them to your contacts <fa icon="users" />
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
5) Register them <fa icon="person-circle-question" />
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
6) Add yourself to their contacts <fa icon="users" />
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h1 class="font-bold text-xl">Enable Notifications</h1>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
7) Enable notifications from <fa icon="circle-user" />
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h1 class="font-bold text-xl">Discuss Backups</h1>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
8) Exporting backups <fa icon="circle-user" /> are important if they lose their phone --- especially for the Identifier Seed!
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<!-- eslint enable -->
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
|
|
||||||
@Component({ components: { QuickNav } })
|
|
||||||
export default class Help extends Vue {}
|
|
||||||
</script>
|
|
||||||
@@ -1,101 +1,54 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav selected="Profile"></QuickNav>
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- Breadcrumb -->
|
<!-- Heading -->
|
||||||
<div class="mb-8">
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
<!-- Back -->
|
Help
|
||||||
<div class="text-lg text-center font-light relative px-7">
|
</h1>
|
||||||
<h1
|
|
||||||
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
|
||||||
@click="$router.back()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw" />
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
|
||||||
Help
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- eslint-disable prettier/prettier -->
|
|
||||||
<div>
|
<div>
|
||||||
<p>
|
<p>
|
||||||
This app is a window into data that you and your friends own, focused on
|
This app is a window into data that you and your friends own, focused on
|
||||||
gifts and collaboration.
|
gifts and collaboration.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">What is the idea here?</h2>
|
<h2 class="text-xl font-semibold">What is the philosophy here?</h2>
|
||||||
<p>
|
<p>
|
||||||
We are building networks of people who want to grow a giving society.
|
We are building networks of people who want to grow a gifting society.
|
||||||
First of all, you can see what people have given, and also recognize
|
First of all, you can record ways you've seen people give, and that
|
||||||
gifts you've seen, in a way that leaves a permanent record -- one that
|
leaves a permanent record -- one that came from you, and the recipient
|
||||||
came from you, and the recipient can prove it was for them. This is
|
can prove it was for them. This is personally gratifying, but it extends
|
||||||
personally gratifying, but it extends to broader work: volunteers get
|
to broader work: volunteers can get confirmation of activity and
|
||||||
confirmation of activity, and selectively show off their contributions
|
selectively show off their contributions and network.
|
||||||
and network.
|
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
You highlight giving and also offer help to ideas -- which could be
|
You can also record projects and plans and invite others to collaborate.
|
||||||
conditional on others' willingness to help, too.
|
Soon you'll be able to see when others are interested and see how much
|
||||||
You can record your own ideas and invite others to collaborate.
|
they're willing to contribute, even if there are conditions.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
This app uses the power of cryptography to build a reputation, recording
|
This app uses the power of cryptography to build a reputation, recording
|
||||||
activity that you can share at your discretion. You put some activity
|
activity that you can share at your discretion. You put some activity
|
||||||
public, but these services don't share your ID with others without explicit consent.
|
public, but your sensitive information is not shared with anyone,
|
||||||
This is in contrast to Meta and Google, who hold
|
including our services. This is in contrast to Meta and Google, who hold
|
||||||
your data and allow you use it while they manage sharing...
|
your data and allow you use it. Those services are useful, but they have
|
||||||
those services are useful but they have the control, whereas this app gives you the control.
|
the control; this app gives you the control.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">How do I get started?</h2>
|
<h2 class="text-xl font-semibold">How do I take my first action?</h2>
|
||||||
<p>
|
<p>
|
||||||
You need someone to register you, like the person who told you
|
You need someone to register you -- usually the person who told you
|
||||||
about this app, on the Contacts
|
about this app, on the Contacts
|
||||||
<fa icon="users" class="fa-fw" /> page. After they register you, you can
|
<fa icon="circle-user" class="fa-fw" /> page. After they register you,
|
||||||
select any contact on the home page (or "anonymous") and record your
|
and after you have contacts, you can select any contact on the home page
|
||||||
appreciation for... whatever. The main goal is to record what people
|
and record your appreciation for... whatever. That is a claim recorded
|
||||||
have given you, to grow giving economies. Each claim is recorded on a
|
on a custom ledger. The day after being registered, you'll be able to
|
||||||
custom ledger. The day after being registered, you'll be able to able to
|
|
||||||
register others; later, you can create projects, too.
|
register others; later, you can create projects, too.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
Note that there are rate limits to how many others you can register,
|
Note that there are limits to how many each person can register, so you
|
||||||
so it may take some time to register everyone you want. Take your time...
|
may have to wait.
|
||||||
make it an opportunity to get to know their projects, and show your own.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">
|
|
||||||
I had an identifier, but I reinstalled and I got a new one automatically.
|
|
||||||
How do I restore my old one?
|
|
||||||
</h2>
|
|
||||||
<p>
|
|
||||||
Go
|
|
||||||
<router-link class="text-blue-500" to="/import-account">import your identifier</router-link>.
|
|
||||||
If you don't want the old one, click "Advanced" and check the box to erase it.
|
|
||||||
(The erase option only shows if you have exactly one identifier.
|
|
||||||
For more in-depth surgery, you'll have to erase data from the browser or reinstall.)
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">How do I add someone else?</h2>
|
|
||||||
<p>
|
|
||||||
<a href="/help-onboarding" target="_blank" class="text-blue-500">
|
|
||||||
Click here to show an alert with the steps.
|
|
||||||
</a>
|
|
||||||
To start scanning, go
|
|
||||||
<router-link class="text-blue-500" to="/contact-qr">here.</router-link>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
If they are not nearby to scan QR codes, tell them to copy their ID from
|
|
||||||
their Identity <fa icon="circle-user" class="fa-fw" /> page, which
|
|
||||||
typically starts with "did:ethr:...", and send it to you. Go to the
|
|
||||||
Contacts <fa icon="users" class="fa-fw" /> page and enter that into the
|
|
||||||
top form. To add a name, put a comma and then their name; to add their
|
|
||||||
public key, put another comma followed by the key.
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">How do I backup all my data?</h2>
|
<h2 class="text-xl font-semibold">How do I backup all my data?</h2>
|
||||||
@@ -108,7 +61,7 @@
|
|||||||
<h2 class="text-xl font-semibold">
|
<h2 class="text-xl font-semibold">
|
||||||
How do I backup my identifier (secret) data?
|
How do I backup my identifier (secret) data?
|
||||||
</h2>
|
</h2>
|
||||||
<ul class="list-disc list-outside ml-4">
|
<ul class="list-disc list-inside">
|
||||||
<li>
|
<li>
|
||||||
Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page.
|
Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page.
|
||||||
</li>
|
</li>
|
||||||
@@ -124,7 +77,7 @@
|
|||||||
<h2 class="text-xl font-semibold">
|
<h2 class="text-xl font-semibold">
|
||||||
How do I backup my other (non-identifier-secret) data?
|
How do I backup my other (non-identifier-secret) data?
|
||||||
</h2>
|
</h2>
|
||||||
<ul class="list-disc list-outside ml-4">
|
<ul class="list-disc list-inside">
|
||||||
<li>
|
<li>
|
||||||
Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page.
|
Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page.
|
||||||
</li>
|
</li>
|
||||||
@@ -138,7 +91,7 @@
|
|||||||
|
|
||||||
<h2 class="text-xl font-semibold">How do I restore my data?</h2>
|
<h2 class="text-xl font-semibold">How do I restore my data?</h2>
|
||||||
<p>
|
<p>
|
||||||
There are two steps to restore your data: the identity secrets, then the
|
There are two parts to restore your data: the identity secrets and the
|
||||||
other data such as settings, contacts, etc.
|
other data such as settings, contacts, etc.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@@ -146,7 +99,7 @@
|
|||||||
<h2 class="text-xl font-semibold">
|
<h2 class="text-xl font-semibold">
|
||||||
How do I restore my identifier (secret) data?
|
How do I restore my identifier (secret) data?
|
||||||
</h2>
|
</h2>
|
||||||
<ul class="list-disc list-outside ml-4">
|
<ul class="list-disc list-inside">
|
||||||
<li>
|
<li>
|
||||||
<router-link class="text-blue-500" to="/import-account">
|
<router-link class="text-blue-500" to="/import-account">
|
||||||
Go to the import page
|
Go to the import page
|
||||||
@@ -158,230 +111,80 @@
|
|||||||
<h2 class="text-xl font-semibold">
|
<h2 class="text-xl font-semibold">
|
||||||
How do I restore my other (non-identifier-secret) data?
|
How do I restore my other (non-identifier-secret) data?
|
||||||
</h2>
|
</h2>
|
||||||
<ul class="list-disc list-outside ml-4">
|
<ul class="list-disc list-inside">
|
||||||
<li>
|
<li>Make sure you have your backup file (above), then contact us.</li>
|
||||||
Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page,
|
|
||||||
click Advanced, and follow the instructions for the Contacts & Settings Database "Import".
|
|
||||||
</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<h2 class="text-xl font-semibold">
|
||||||
|
How do I add someone to my contacts?
|
||||||
|
</h2>
|
||||||
|
<p>
|
||||||
|
Tell them to copy their ID, which typically starts with "did:ethr:...",
|
||||||
|
and send it to you. Go to the Contacts
|
||||||
|
<fa icon="circle-user" class="fa-fw" /> page and enter that into the top
|
||||||
|
form. You may add a name by adding a comma followed by their name; you
|
||||||
|
may also add their public key by adding another comma followed by the
|
||||||
|
key.
|
||||||
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">How do I create another identity?</h2>
|
<h2 class="text-xl font-semibold">How do I create another identity?</h2>
|
||||||
<p>
|
<p>
|
||||||
Before doing this, note that it is an advanced feature that affects
|
Go
|
||||||
functionality (eg. the words "Alt ID" next to results, backup features)
|
|
||||||
so beware. You can
|
|
||||||
<router-link to="start" class="text-blue-500">
|
<router-link to="start" class="text-blue-500">
|
||||||
create another identity here.
|
create another identity here.
|
||||||
</router-link>
|
</router-link>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">How do I erase my data?</h2>
|
|
||||||
<p>
|
|
||||||
Before doing this, note the two kinds of data to backup: identity data,
|
|
||||||
and other data for contacts and settings (see instructions above).
|
|
||||||
</p>
|
|
||||||
<ul>
|
|
||||||
<li class="list-disc list-outside ml-4">
|
|
||||||
Mobile
|
|
||||||
<ul>
|
|
||||||
<li class="list-disc list-outside ml-4">
|
|
||||||
Chrome: Settings -> Privacy and Security -> Clear Browsing Data
|
|
||||||
</li>
|
|
||||||
<li class="list-disc list-outside ml-4">
|
|
||||||
DuckDuckGo: long hold -> Clear Data (takes effect immediately)
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<li class="list-disc list-outside ml-4">
|
|
||||||
Desktop
|
|
||||||
<ul>
|
|
||||||
<li class="list-disc list-outside ml-4">
|
|
||||||
Chrome:
|
|
||||||
Clear at chrome://settings/content/all and
|
|
||||||
also clear under dev tools Application
|
|
||||||
</li>
|
|
||||||
<li class="list-disc list-outside ml-4">
|
|
||||||
Firefox: <a href="about:preferences">go here</a>, Manage Data,
|
|
||||||
find timesafari.app and select, hit Remove Selected, then Save
|
|
||||||
Changes
|
|
||||||
</li>
|
|
||||||
<li class="list-disc list-outside ml-4">
|
|
||||||
Safari: Settings -> Privacy -> Manage Website Data, search for
|
|
||||||
timesafari.app and select, hit Remove Selected, then Done.
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<p>To erase your data from our servers, contact us (below).</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">
|
|
||||||
How do I get higher limits?
|
|
||||||
</h2>
|
|
||||||
<p>
|
|
||||||
Let's talk. Contact us (below).
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">
|
|
||||||
How do I access even more functionality?
|
|
||||||
</h2>
|
|
||||||
<p>
|
|
||||||
There is an "Advanced" section at the bottom of the Account
|
|
||||||
<fa icon="circle-user" /> page.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
There is a even more functionality in a mobile app (and more
|
|
||||||
documentation) at
|
|
||||||
<a href="https://endorser.ch" class="text-blue-500">
|
|
||||||
EndorserSearch.com
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">
|
<h2 class="text-xl font-semibold">
|
||||||
I know there is a record from someone, so why can't I see that info?
|
I know there is a record from someone, so why can't I see that info?
|
||||||
</h2>
|
</h2>
|
||||||
<p>
|
<p>
|
||||||
If you don't see anything associated with a person, this is typically
|
If you don't see anything associated with a person, this is typically
|
||||||
because they have not given you permission to see their information. Ask
|
because they have not given you permission to see their information. Ask
|
||||||
them to add you to their contact list, and ask specifically to make sure
|
them to add you to their contact list and make sure the eye next to your
|
||||||
the eye next to your name is open like this
|
name is open like this
|
||||||
<fa icon="eye" class="fa-fw" /> and not closed like this
|
<fa icon="eye" class="fa-fw" /> and not closed like this
|
||||||
<fa icon="eye-slash" class="fa-fw" />.
|
<fa icon="eye-slash" class="fa-fw" />.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
Sometimes the reason you don't see something is because the search
|
Sometimes the reason you don't see something is because the search time
|
||||||
results are limited. Go to the bottom and make sure to load all the data
|
is limited. Go to the bottom and make sure to load all the data on a
|
||||||
on a list. If you still don't see it, try a search or view on a
|
list. If you still don't see it, try a search or view on a different
|
||||||
different page.
|
page.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">
|
<h2 class="text-xl font-semibold">What is your privacy policy?</h2>
|
||||||
Where do I get help with notifications?
|
|
||||||
</h2>
|
|
||||||
<p>
|
<p>
|
||||||
<router-link class="text-blue-500" to="/help-notifications"
|
See
|
||||||
>Here.</router-link
|
|
||||||
>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">
|
|
||||||
My app is misbehaving, like showing me a blank screen or failing to show a feed.
|
|
||||||
What can I do?
|
|
||||||
</h2>
|
|
||||||
<p>
|
|
||||||
First, note that clearing the cache will clear all your identity and contact info,
|
|
||||||
so we recommend doing other things first (unless you know you have your backups ready).
|
|
||||||
</p>
|
|
||||||
<ul class="list-disc list-outside ml-4">
|
|
||||||
<li>
|
|
||||||
Drag down on the screen to refresh it; do that multiple times, because
|
|
||||||
it sometimes takes multiple tries for the app to refresh to the current version.
|
|
||||||
You can see the version information at the bottom of this page; the best
|
|
||||||
way to determine the current version is to open this page in an incognito
|
|
||||||
browser window and look at the version there.
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Close all tabs that have Time Safari open; it can be difficult to find them all,
|
|
||||||
and you may have to close all your tabs. In addition, it may be running as an
|
|
||||||
installed app, so look for any Time Safari app that may be running outside a browser.
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
It can help to reregister the service worker:
|
|
||||||
<ul>
|
|
||||||
<li>
|
|
||||||
In Chrome, open a tab to
|
|
||||||
"chrome://serviceworker-internals",
|
|
||||||
find "timesafari.app", and click "Unregister".</li>
|
|
||||||
<li>
|
|
||||||
In Firefox,
|
|
||||||
open a tab to "about:serviceworkers",
|
|
||||||
find "timesafari.app", and click "Unregister".
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="https://duckduckgo.com/?q=unregister+service+worker" class="text-blue-500">Search</a>
|
|
||||||
for instructions for other browsers.</li>
|
|
||||||
</ul>
|
|
||||||
Then reload Time Safari.
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Restart your device.
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
If you still have problems, you can clear the cache (see "erase my data" above)
|
|
||||||
and even uninstall and reinstall the app
|
|
||||||
-- just be sure to have your backups ready or be
|
|
||||||
prepared to restart with a new identity and recreate your network.
|
|
||||||
Nobody else has access to your identity or contact information because
|
|
||||||
this app is designed to give you full control over your data.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">What are the terms & conditions and the privacy policy?</h2>
|
|
||||||
<p style="display:inline; align-items: center">
|
|
||||||
This work is public domain, governed by
|
|
||||||
<a href="http://creativecommons.org/publicdomain/zero/1.0?ref=chooser-v1" target="_blank" rel="license noopener noreferrer">
|
|
||||||
<span class="text-blue-500 mr-1">CC0 1.0</span>
|
|
||||||
<img
|
|
||||||
src="../assets/help/creative-commons-circle.svg"
|
|
||||||
alt="CC circle"
|
|
||||||
width="20"
|
|
||||||
class="display: inline"
|
|
||||||
/>
|
|
||||||
<img
|
|
||||||
src="../assets/help/creative-commons-zero.svg"
|
|
||||||
alt="CC zero"
|
|
||||||
width="20"
|
|
||||||
style="display: inline"
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
<br />
|
|
||||||
For notifications, this service stores push token data; that can be revoked at any time
|
|
||||||
by disabling notifications on the Account <fa icon="circle-user" class="fa-fw" /> page.
|
|
||||||
<br />
|
|
||||||
For all other claim data,
|
|
||||||
<a href="https://endorser.ch/privacy-policy" class="text-blue-500">
|
<a href="https://endorser.ch/privacy-policy" class="text-blue-500">
|
||||||
the Endorser Service has this Privacy Policy.
|
the Endorser Service Privacy Policy.
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">Where can I read more?</h2>
|
|
||||||
<p>
|
|
||||||
This is part of the
|
|
||||||
<a href="https://livesofgiving.org" class="text-blue-500">
|
|
||||||
Lives of Giving
|
|
||||||
</a>
|
|
||||||
initiative.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">What app version is this?</h2>
|
<h2 class="text-xl font-semibold">What app version is this?</h2>
|
||||||
<p>{{ package.version }} ({{ commitHash }})</p>
|
<p>
|
||||||
|
{{ package.version }}
|
||||||
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">
|
<h2 class="text-xl font-semibold">
|
||||||
For any other questions, including removing your data:
|
For any other questions, including remove your data:
|
||||||
</h2>
|
</h2>
|
||||||
<p>
|
<p>
|
||||||
Contact us at
|
Contact us through
|
||||||
<a href="mailto:info@TimeSafari.app" class="text-blue-500"
|
<a href="https://communitycred.org">CommunityCred.org</a>.
|
||||||
>info@TimeSafari.app</a
|
|
||||||
>
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<!-- eslint enable -->
|
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import * as Package from "../../package.json";
|
import * as Package from "../../package.json";
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { NotificationIface } from "@/constants/app";
|
import QuickNav from "@/components/QuickNav";
|
||||||
|
|
||||||
@Component({ components: { QuickNav } })
|
@Component({ components: { QuickNav } })
|
||||||
export default class Help extends Vue {
|
export default class Help extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
package = Package;
|
package = Package;
|
||||||
commitHash = import.meta.env.VITE_GIT_HASH;
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<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">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -18,23 +18,16 @@
|
|||||||
<!-- Identity List -->
|
<!-- Identity List -->
|
||||||
|
|
||||||
<!-- Current Identity - Display First! -->
|
<!-- Current Identity - Display First! -->
|
||||||
<div
|
<div class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-4">
|
||||||
v-if="activeDid && !activeDidInIdentities"
|
<fa icon="circle-check" class="fa-fw text-blue-600 text-xl mr-3"></fa>
|
||||||
class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-4"
|
<span class="overflow-hidden">
|
||||||
>
|
<h2 class="text-xl font-semibold mb-0">
|
||||||
<fa icon="circle-check" class="fa-fw text-red-600 text-xl mr-3"></fa>
|
{{ firstName }} {{ lastName }}
|
||||||
<div class="text-sm text-slate-500">
|
</h2>
|
||||||
<div class="overflow-hidden truncate">
|
<div class="text-sm text-slate-500 truncate">
|
||||||
<b>ID:</b> <code>{{ activeDid }}</code>
|
<b>ID:</b> <code>{{ activeDid }}</code>
|
||||||
</div>
|
</div>
|
||||||
<b
|
</span>
|
||||||
>There is a data corruption error: this identity is selected but it is
|
|
||||||
not in storage. You cannot send any more claims with this identity
|
|
||||||
until you import the seed again. This may require reinstalling the
|
|
||||||
app; if you know how, you can also clear out the TimeSafariAccounts
|
|
||||||
IndexedDB. Be sure to back up all your Settings & Contacts first.</b
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Other Identity/ies -->
|
<!-- Other Identity/ies -->
|
||||||
@@ -45,12 +38,7 @@
|
|||||||
:key="ident.did"
|
:key="ident.did"
|
||||||
@click="switchAccount(ident.did)"
|
@click="switchAccount(ident.did)"
|
||||||
>
|
>
|
||||||
<fa
|
<fa icon="circle" class="fa-fw text-slate-400 text-xl mr-3"></fa>
|
||||||
v-if="ident.did === activeDid"
|
|
||||||
icon="circle-check"
|
|
||||||
class="fa-fw text-blue-600 text-xl mr-3"
|
|
||||||
/>
|
|
||||||
<fa v-else icon="circle" class="fa-fw text-slate-400 text-xl mr-3" />
|
|
||||||
<span class="overflow-hidden">
|
<span class="overflow-hidden">
|
||||||
<h2 class="text-xl font-semibold mb-0"></h2>
|
<h2 class="text-xl font-semibold mb-0"></h2>
|
||||||
<div class="text-sm text-slate-500 truncate">
|
<div class="text-sm text-slate-500 truncate">
|
||||||
@@ -61,17 +49,15 @@
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<!-- Actions -->
|
<!-- Actions -->
|
||||||
<!-- id used by puppeteer test script -->
|
|
||||||
<router-link
|
<router-link
|
||||||
id="start-link"
|
|
||||||
:to="{ name: 'start' }"
|
:to="{ name: 'start' }"
|
||||||
class="block text-center text-lg font-bold 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-2 py-3 rounded-md mb-2"
|
class="block text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
>
|
>
|
||||||
Add Another Identity…
|
Add Another Identity…
|
||||||
</router-link>
|
</router-link>
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
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-1.5 py-2 rounded-md mb-8"
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-8"
|
||||||
@click="switchAccount('0')"
|
@click="switchAccount('0')"
|
||||||
>
|
>
|
||||||
No Identity
|
No Identity
|
||||||
@@ -80,67 +66,101 @@
|
|||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
|
import { AppString } from "@/constants/app";
|
||||||
import { AppString, NotificationIface } from "@/constants/app";
|
import { db, accountsDB } from "@/db";
|
||||||
import { db, accountsDB } from "@/db/index";
|
|
||||||
import { AccountsSchema } from "@/db/tables/accounts";
|
import { AccountsSchema } from "@/db/tables/accounts";
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import QuickNav from "@/components/QuickNav";
|
||||||
|
|
||||||
@Component({ components: { QuickNav } })
|
@Component({ components: { QuickNav } })
|
||||||
export default class IdentitySwitcherView extends Vue {
|
export default class IdentitySwitcherView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
Constants = AppString;
|
Constants = AppString;
|
||||||
public accounts: typeof AccountsSchema;
|
public accounts: AccountsSchema;
|
||||||
public activeDid = "";
|
public activeDid;
|
||||||
public activeDidInIdentities = false;
|
public firstName;
|
||||||
public apiServer = "";
|
public lastName;
|
||||||
public apiServerInput = "";
|
public otherIdentities = [];
|
||||||
public otherIdentities: Array<{ did: string }> = [];
|
|
||||||
public showContactGives = false;
|
public async getIdentity(activeDid) {
|
||||||
|
await accountsDB.open();
|
||||||
|
const account = await accountsDB.accounts
|
||||||
|
.where("did")
|
||||||
|
.equals(activeDid)
|
||||||
|
.first();
|
||||||
|
const identity = JSON.parse(account?.identity || "null");
|
||||||
|
return identity;
|
||||||
|
}
|
||||||
|
|
||||||
async created() {
|
async created() {
|
||||||
try {
|
try {
|
||||||
await db.open();
|
await db.open();
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
||||||
this.activeDid = settings?.activeDid || "";
|
this.activeDid = settings?.activeDid || "";
|
||||||
this.apiServer = settings?.apiServer || "";
|
this.apiServer = settings?.apiServer || "";
|
||||||
this.apiServerInput = settings?.apiServer || "";
|
this.apiServerInput = settings?.apiServer || "";
|
||||||
|
this.firstName = settings?.firstName || "No";
|
||||||
|
this.lastName = settings?.lastName || "Name";
|
||||||
this.showContactGives = !!settings?.showContactGivesInline;
|
this.showContactGives = !!settings?.showContactGivesInline;
|
||||||
|
|
||||||
|
const identity = await this.getIdentity(this.activeDid);
|
||||||
|
|
||||||
|
if (identity) {
|
||||||
|
db.settings.update(MASTER_SETTINGS_KEY, {
|
||||||
|
activeDid: identity.did,
|
||||||
|
});
|
||||||
|
}
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const accounts = await accountsDB.accounts.toArray();
|
const accounts = await accountsDB.accounts.toArray();
|
||||||
for (let n = 0; n < accounts.length; n++) {
|
for (let n = 0; n < accounts.length; n++) {
|
||||||
const did = JSON.parse(accounts[n].identity)["did"];
|
const did = JSON.parse(accounts[n].identity)["did"];
|
||||||
this.otherIdentities.push({ did: did });
|
if (did && this.activeDid !== did) {
|
||||||
if (did && this.activeDid === did) {
|
this.otherIdentities.push({ did: did });
|
||||||
this.activeDidInIdentities = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.$notify(
|
if (
|
||||||
{
|
err.message ===
|
||||||
group: "alert",
|
"Attempted to load account records with no identity available."
|
||||||
type: "danger",
|
) {
|
||||||
title: "Error Loading Accounts",
|
this.limitsMessage = "No identity.";
|
||||||
text: "Clear your cache and start over (after data backup).",
|
this.loadingLimits = false;
|
||||||
},
|
} else {
|
||||||
-1,
|
this.$notify(
|
||||||
);
|
{
|
||||||
console.error("Telling user to clear cache at page create because:", err);
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error Creating Account",
|
||||||
|
text: "Clear your cache and start over (after data backup).",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
console.error(
|
||||||
|
"Telling user to clear cache at page create because:",
|
||||||
|
err,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async switchAccount(did?: string) {
|
async switchAccount(did: string) {
|
||||||
// 0 means none
|
// 0 means none
|
||||||
if (did === "0") {
|
if (did === "0") {
|
||||||
did = undefined;
|
did = undefined;
|
||||||
}
|
}
|
||||||
await db.open();
|
await db.open();
|
||||||
await db.settings.update(MASTER_SETTINGS_KEY, {
|
db.settings.update(MASTER_SETTINGS_KEY, {
|
||||||
activeDid: did,
|
activeDid: did,
|
||||||
});
|
});
|
||||||
|
this.activeDid = did;
|
||||||
|
this.otherIdentities = [];
|
||||||
|
await accountsDB.open();
|
||||||
|
const accounts = await accountsDB.accounts.toArray();
|
||||||
|
for (let n = 0; n < accounts.length; n++) {
|
||||||
|
const did = JSON.parse(accounts[n].identity)["did"];
|
||||||
|
if (did && this.activeDid !== did) {
|
||||||
|
this.otherIdentities.push({ did: did });
|
||||||
|
}
|
||||||
|
}
|
||||||
this.$router.push({ name: "account" });
|
this.$router.push({ name: "account" });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -10,22 +10,20 @@
|
|||||||
>
|
>
|
||||||
<fa icon="chevron-left"></fa>
|
<fa icon="chevron-left"></fa>
|
||||||
</button>
|
</button>
|
||||||
Import Existing Identifier
|
Import Existing Identity
|
||||||
</h1>
|
</h1>
|
||||||
</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">
|
||||||
Enter your seed phrase below to import your identifier on this device.
|
Enter your seed phrase below to import your identity on this device.
|
||||||
</p>
|
</p>
|
||||||
<!-- id used by puppeteer test script -->
|
|
||||||
<input
|
<input
|
||||||
id="seed-input"
|
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="Seed Phrase"
|
placeholder="Seed Phrase"
|
||||||
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
||||||
v-model="mnemonic"
|
v-model="mnemonic"
|
||||||
/>
|
/>
|
||||||
|
{{ mnemonic }}
|
||||||
<h3
|
<h3
|
||||||
class="text-sm uppercase font-semibold mb-3"
|
class="text-sm uppercase font-semibold mb-3"
|
||||||
@click="showAdvanced = !showAdvanced"
|
@click="showAdvanced = !showAdvanced"
|
||||||
@@ -36,86 +34,62 @@
|
|||||||
Enter a custom derivation path
|
Enter a custom derivation path
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
|
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
||||||
v-model="derivationPath"
|
v-model="derivationPath"
|
||||||
/>
|
/>
|
||||||
<span class="ml-4">
|
For previous uPort or Endorser users,
|
||||||
For previous uPort or Endorser users,
|
<a @click="derivationPath = UPORT_DERIVATION_PATH" class="text-blue-500">
|
||||||
<a
|
click here to use that value.
|
||||||
@click="derivationPath = UPORT_DERIVATION_PATH"
|
</a>
|
||||||
class="text-blue-500"
|
|
||||||
>
|
|
||||||
click here to use that value.
|
|
||||||
</a>
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<div class="mt-4" v-if="numAccounts == 1">
|
|
||||||
<input type="checkbox" class="mr-2" v-model="shouldErase" />
|
|
||||||
<label>Erase the previous identifier.</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-8">
|
<div class="mt-8">
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
<button
|
||||||
<button
|
@click="from_mnemonic()"
|
||||||
@click="fromMnemonic()"
|
class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
|
>
|
||||||
>
|
Import
|
||||||
Import
|
</button>
|
||||||
</button>
|
<button
|
||||||
<button
|
@click="onCancelClick()"
|
||||||
@click="onCancelClick()"
|
type="button"
|
||||||
type="button"
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
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-1.5 py-2 rounded-md"
|
>
|
||||||
>
|
Cancel
|
||||||
Cancel
|
</button>
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
|
||||||
import {
|
import {
|
||||||
DEFAULT_ROOT_DERIVATION_PATH,
|
DEFAULT_ROOT_DERIVATION_PATH,
|
||||||
deriveAddress,
|
deriveAddress,
|
||||||
newIdentifier,
|
newIdentifier,
|
||||||
} from "@/libs/crypto";
|
} from "../libs/crypto";
|
||||||
|
import { accountsDB, db } from "@/db";
|
||||||
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {},
|
components: {},
|
||||||
})
|
})
|
||||||
export default class ImportAccountView extends Vue {
|
export default class ImportAccountView extends Vue {
|
||||||
UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'"; // for legacy imports, likely never used
|
UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'";
|
||||||
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
mnemonic = "";
|
mnemonic = "";
|
||||||
address = "";
|
address = "";
|
||||||
numAccounts = 0;
|
|
||||||
privateHex = "";
|
privateHex = "";
|
||||||
publicHex = "";
|
publicHex = "";
|
||||||
derivationPath = DEFAULT_ROOT_DERIVATION_PATH;
|
derivationPath = DEFAULT_ROOT_DERIVATION_PATH;
|
||||||
showAdvanced = false;
|
showAdvanced = false;
|
||||||
shouldErase = false;
|
|
||||||
|
|
||||||
async created() {
|
|
||||||
await accountsDB.open();
|
|
||||||
this.numAccounts = await accountsDB.accounts.count();
|
|
||||||
}
|
|
||||||
|
|
||||||
public onCancelClick() {
|
public onCancelClick() {
|
||||||
this.$router.back();
|
this.$router.back();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async fromMnemonic() {
|
public async from_mnemonic() {
|
||||||
const mne: string = this.mnemonic.trim().toLowerCase();
|
const mne: string = this.mnemonic.trim().toLowerCase();
|
||||||
try {
|
if (this.mnemonic.trim().length > 0) {
|
||||||
[this.address, this.privateHex, this.publicHex] = deriveAddress(
|
[this.address, this.privateHex, this.publicHex] = deriveAddress(
|
||||||
mne,
|
mne,
|
||||||
this.derivationPath,
|
this.derivationPath,
|
||||||
@@ -128,48 +102,25 @@ export default class ImportAccountView extends Vue {
|
|||||||
this.derivationPath,
|
this.derivationPath,
|
||||||
);
|
);
|
||||||
|
|
||||||
await accountsDB.open();
|
try {
|
||||||
if (this.shouldErase) {
|
await accountsDB.open();
|
||||||
await accountsDB.accounts.clear();
|
await accountsDB.accounts.add({
|
||||||
}
|
dateCreated: new Date().toISOString(),
|
||||||
await accountsDB.accounts.add({
|
derivationPath: this.derivationPath,
|
||||||
dateCreated: new Date().toISOString(),
|
did: newId.did,
|
||||||
derivationPath: this.derivationPath,
|
identity: JSON.stringify(newId),
|
||||||
did: newId.did,
|
mnemonic: mne,
|
||||||
identity: JSON.stringify(newId),
|
publicKeyHex: newId.keys[0].publicKeyHex,
|
||||||
mnemonic: mne,
|
});
|
||||||
publicKeyHex: newId.keys[0].publicKeyHex,
|
|
||||||
});
|
|
||||||
|
|
||||||
// record that as the active DID
|
// record that as the active DID
|
||||||
await db.open();
|
await db.open();
|
||||||
db.settings.update(MASTER_SETTINGS_KEY, {
|
db.settings.update(MASTER_SETTINGS_KEY, {
|
||||||
activeDid: newId.did,
|
activeDid: newId.did,
|
||||||
});
|
});
|
||||||
this.$router.push({ name: "account" });
|
this.$router.push({ name: "account" });
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
} catch (err) {
|
||||||
} catch (err: any) {
|
console.error("Error saving mnemonic & updating settings:", err);
|
||||||
console.error("Error saving mnemonic & updating settings:", err);
|
|
||||||
if (err == "Error: invalid mnemonic") {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Invalid Mnemonic",
|
|
||||||
text: "Please check your mnemonic and try again.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Got an error creating that identifier.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -49,21 +49,19 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-8">
|
<div class="mt-8">
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
<button
|
||||||
<button
|
@click="incrementDerivation()"
|
||||||
@click="incrementDerivation()"
|
class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
|
>
|
||||||
>
|
Increment and Import
|
||||||
Increment and Import
|
</button>
|
||||||
</button>
|
<button
|
||||||
<button
|
@click="onCancelClick()"
|
||||||
@click="onCancelClick()"
|
type="button"
|
||||||
type="button"
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
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-1.5 py-2 rounded-md"
|
>
|
||||||
>
|
Cancel
|
||||||
Cancel
|
</button>
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
@@ -74,9 +72,8 @@ import {
|
|||||||
DEFAULT_ROOT_DERIVATION_PATH,
|
DEFAULT_ROOT_DERIVATION_PATH,
|
||||||
deriveAddress,
|
deriveAddress,
|
||||||
newIdentifier,
|
newIdentifier,
|
||||||
nextDerivationPath,
|
|
||||||
} from "../libs/crypto";
|
} from "../libs/crypto";
|
||||||
import { accountsDB, db } from "@/db/index";
|
import { accountsDB, db } from "@/db";
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@@ -90,9 +87,9 @@ export default class ImportAccountView extends Vue {
|
|||||||
async mounted() {
|
async mounted() {
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const accounts = await accountsDB.accounts.toArray();
|
const accounts = await accountsDB.accounts.toArray();
|
||||||
const seedDids: Record<string, Array<string>> = {};
|
const seedDids = {};
|
||||||
accounts.forEach((account) => {
|
accounts.forEach((account) => {
|
||||||
const prevDids: Array<string> = seedDids[account.mnemonic] || [];
|
const prevDids = seedDids[account.mnemonic] || [];
|
||||||
seedDids[account.mnemonic] = prevDids.concat([account.did]);
|
seedDids[account.mnemonic] = prevDids.concat([account.did]);
|
||||||
});
|
});
|
||||||
this.didArrays = Object.values(seedDids);
|
this.didArrays = Object.values(seedDids);
|
||||||
@@ -110,9 +107,9 @@ export default class ImportAccountView extends Vue {
|
|||||||
public async incrementDerivation() {
|
public async incrementDerivation() {
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
// find the maximum derivation path for the selected DIDs
|
// find the maximum derivation path for the selected DIDs
|
||||||
const selectedArray: Array<string> =
|
const selectedArray: Array<string> = this.didArrays.find(
|
||||||
this.didArrays.find((dids) => dids[0] === this.selectedArrayFirstDid) ||
|
(dids) => dids[0] === this.selectedArrayFirstDid,
|
||||||
[];
|
);
|
||||||
const allMatchingAccounts = await accountsDB.accounts
|
const allMatchingAccounts = await accountsDB.accounts
|
||||||
.where("did")
|
.where("did")
|
||||||
.anyOf(...selectedArray)
|
.anyOf(...selectedArray)
|
||||||
@@ -124,7 +121,17 @@ export default class ImportAccountView extends Vue {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
// increment the last number in that max derivation path
|
// increment the last number in that max derivation path
|
||||||
const newDerivPath = nextDerivationPath(accountWithMaxDeriv.derivationPath);
|
let lastStr = accountWithMaxDeriv.derivationPath.split("/").slice(-1)[0];
|
||||||
|
if (lastStr.endsWith("'")) {
|
||||||
|
lastStr = lastStr.slice(0, -1);
|
||||||
|
}
|
||||||
|
const lastNum = parseInt(lastStr, 10);
|
||||||
|
const newLastNum = lastNum + 1;
|
||||||
|
const newDerivPath = accountWithMaxDeriv.derivationPath
|
||||||
|
.split("/")
|
||||||
|
.slice(0, -1)
|
||||||
|
.concat([newLastNum.toString() + "'"])
|
||||||
|
.join("/");
|
||||||
|
|
||||||
const mne: string = accountWithMaxDeriv.mnemonic;
|
const mne: string = accountWithMaxDeriv.mnemonic;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -10,67 +10,77 @@
|
|||||||
>
|
>
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
<fa icon="chevron-left" class="fa-fw"></fa>
|
||||||
</button>
|
</button>
|
||||||
Edit Identity
|
[New/Edit] Identity
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="Name"
|
placeholder="First Name"
|
||||||
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
||||||
v-model="givenName"
|
v-model="firstName"
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="Last Name"
|
||||||
|
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
||||||
|
v-model="lastName"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="mt-8">
|
<div class="mt-8">
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
<button
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md mb-2"
|
@click="onClickSaveChanges()"
|
||||||
@click="onClickSaveChanges()"
|
>
|
||||||
>
|
Save Changes
|
||||||
Save Changes
|
</button>
|
||||||
</button>
|
<!-- SHOW ME instead while processing saving changes -->
|
||||||
<!-- SHOW ME instead while processing saving changes -->
|
<button
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
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-1.5 py-2 rounded-md"
|
@click="onClickCancel()"
|
||||||
@click="onClickCancel()"
|
>
|
||||||
>
|
Cancel
|
||||||
Cancel
|
</button>
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { db } from "@/db/index";
|
import { db } from "@/db";
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {},
|
components: {},
|
||||||
})
|
})
|
||||||
export default class NewEditAccountView extends Vue {
|
export default class NewEditAccountView extends Vue {
|
||||||
givenName = "";
|
firstName =
|
||||||
|
localStorage.getItem("firstName") === null
|
||||||
|
? "--"
|
||||||
|
: localStorage.getItem("firstName");
|
||||||
|
lastName =
|
||||||
|
localStorage.getItem("lastName") === null
|
||||||
|
? "--"
|
||||||
|
: localStorage.getItem("lastName");
|
||||||
|
|
||||||
// 'created' hook runs when the Vue instance is first created
|
// 'created' hook runs when the Vue instance is first created
|
||||||
async created() {
|
async created() {
|
||||||
await db.open();
|
await db.open();
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
||||||
this.givenName =
|
this.firstName = settings?.firstName || "";
|
||||||
(settings?.firstName || "") +
|
this.lastName = settings?.lastName || "";
|
||||||
(settings?.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onClickSaveChanges() {
|
onClickSaveChanges() {
|
||||||
db.settings.update(MASTER_SETTINGS_KEY, {
|
db.settings.update(MASTER_SETTINGS_KEY, {
|
||||||
firstName: this.givenName,
|
firstName: this.firstName,
|
||||||
lastName: "", // deprecated, pre v 0.1.3
|
lastName: this.lastName,
|
||||||
});
|
});
|
||||||
localStorage.setItem("firstName", this.givenName as string);
|
localStorage.setItem("firstName", this.firstName as string);
|
||||||
localStorage.setItem("lastName", ""); // deprecated, pre v 0.1.3
|
localStorage.setItem("lastName", this.lastName as string);
|
||||||
this.$router.back();
|
this.$router.push({ name: "account" });
|
||||||
}
|
}
|
||||||
|
|
||||||
onClickCancel() {
|
onClickCancel() {
|
||||||
|
|||||||
67
src/views/NewEditCommitmentView.vue
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
<template>
|
||||||
|
<!-- CONTENT -->
|
||||||
|
<section id="Content" class="p-6 pb-24">
|
||||||
|
<!-- Breadcrumb -->
|
||||||
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
|
<!-- Cancel -->
|
||||||
|
<router-link
|
||||||
|
:to="{ name: 'project' }"
|
||||||
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
|
><fa icon="chevron-left" class="fa-fw"></fa>
|
||||||
|
</router-link>
|
||||||
|
|
||||||
|
Make Commitment
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Project Details -->
|
||||||
|
|
||||||
|
<select class="block w-full rounded border border-slate-400 mb-4 px-3 py-2">
|
||||||
|
<option disabled>Choose a commitment type…</option>
|
||||||
|
<option selected>Time</option>
|
||||||
|
<option>Cryptocurrency</option>
|
||||||
|
<option>Money</option>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<!-- Time amount -->
|
||||||
|
<div class="mb-4 flex items-stretch">
|
||||||
|
<input
|
||||||
|
type="number"
|
||||||
|
placeholder="0.0"
|
||||||
|
class="block w-full rounded-l border border-slate-400 px-3 py-2"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
class="px-4 py-2 rounded-r bg-slate-200 border border-l-0 border-slate-400"
|
||||||
|
>hours</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Crypto amount -->
|
||||||
|
|
||||||
|
<!-- Money amount -->
|
||||||
|
|
||||||
|
<div class="mt-8">
|
||||||
|
<input
|
||||||
|
type="submit"
|
||||||
|
class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
|
value="Commit"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
|
>
|
||||||
|
Maybe Later
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
components: {},
|
||||||
|
})
|
||||||
|
export default class NewEditCommitmentView extends Vue {}
|
||||||
|
</script>
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<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">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -11,7 +10,7 @@
|
|||||||
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
||||||
><fa icon="chevron-left" class="fa-fw"></fa
|
><fa icon="chevron-left" class="fa-fw"></fa
|
||||||
></router-link>
|
></router-link>
|
||||||
Edit Idea
|
[New/Edit] Plan
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -24,66 +23,36 @@
|
|||||||
|
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="Idea Name"
|
placeholder="Project Name"
|
||||||
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
||||||
v-model="fullClaim.name"
|
v-model="projectName"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
placeholder="Other Authorized Representative"
|
|
||||||
class="block w-full rounded border border-slate-400 px-3 py-2"
|
|
||||||
v-model="agentDid"
|
|
||||||
/>
|
|
||||||
<div class="mb-4">
|
|
||||||
<p v-if="activeDid != projectIssuerDid && agentDid != projectIssuerDid">
|
|
||||||
<span class="text-red-500">Beware!</span>
|
|
||||||
If you save this, the original project owner will no longer be able to
|
|
||||||
edit it.
|
|
||||||
<button @click="agentDid = projectIssuerDid" class="text-blue-500">
|
|
||||||
Click here to make the original owner an authorized representative.
|
|
||||||
</button>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<textarea
|
<textarea
|
||||||
placeholder="Description"
|
placeholder="Description"
|
||||||
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
||||||
rows="5"
|
rows="5"
|
||||||
v-model="fullClaim.description"
|
v-model="description"
|
||||||
maxlength="5000"
|
maxlength="500"
|
||||||
></textarea>
|
></textarea>
|
||||||
<div class="text-xs text-slate-500 italic -mt-3 mb-4">
|
<div class="text-xs text-slate-500 italic -mt-3 mb-4">
|
||||||
{{ fullClaim.description?.length }}/5000 max. characters
|
{{ description.length }}/500 max. characters
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input
|
|
||||||
v-model="fullClaim.url"
|
|
||||||
placeholder="Website"
|
|
||||||
autocapitalize="none"
|
|
||||||
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="flex items-center mb-4">
|
<div class="flex items-center mb-4">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
class="mr-2"
|
class="mr-2"
|
||||||
v-model="includeLocation"
|
v-model="includeLocation"
|
||||||
@click="includeLocation = !includeLocation"
|
@change="includeLocation = true"
|
||||||
/>
|
/>
|
||||||
<label for="includeLocation">Include Location</label>
|
<label for="includeLocation">Include Location</label>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="includeLocation" class="mb-4 aspect-video">
|
<div v-if="includeLocation" style="height: 600px; width: 800px">
|
||||||
<p class="text-sm mb-2 text-slate-500">
|
|
||||||
For your security, choose a location nearby but not exactly at the
|
|
||||||
place.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<l-map
|
<l-map
|
||||||
ref="map"
|
ref="map"
|
||||||
v-model:zoom="zoom"
|
v-model:zoom="zoom"
|
||||||
:center="[0, 0]"
|
:center="[0, 0]"
|
||||||
class="!z-40 rounded-md"
|
|
||||||
@click="
|
@click="
|
||||||
(event) => {
|
(event) => {
|
||||||
latitude = event.latlng.lat;
|
latitude = event.latlng.lat;
|
||||||
@@ -97,7 +66,7 @@
|
|||||||
name="OpenStreetMap"
|
name="OpenStreetMap"
|
||||||
/>
|
/>
|
||||||
<l-marker
|
<l-marker
|
||||||
v-if="latitude && longitude"
|
v-if="latitude || longitude"
|
||||||
:lat-lng="[latitude, longitude]"
|
:lat-lng="[latitude, longitude]"
|
||||||
@click="maybeEraseLatLong()"
|
@click="maybeEraseLatLong()"
|
||||||
/>
|
/>
|
||||||
@@ -105,30 +74,28 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-8">
|
<div class="mt-8">
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
<button
|
||||||
<button
|
:disabled="isHiddenSave"
|
||||||
:disabled="isHiddenSave"
|
class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
|
||||||
class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md mb-2"
|
@click="onSaveProjectClick()"
|
||||||
@click="onSaveProjectClick()"
|
>
|
||||||
>
|
<!-- SHOW if in idle state -->
|
||||||
<!-- SHOW if in idle state -->
|
<span :class="{ hidden: isHiddenSave }">Save Project</span>
|
||||||
<span :class="{ hidden: isHiddenSave }">Save Project</span>
|
|
||||||
|
|
||||||
<!-- SHOW if in saving state; DISABLE button while in saving state -->
|
<!-- SHOW if in saving state; DISABLE button while in saving state -->
|
||||||
<span :class="{ hidden: isHiddenSpinner }">
|
<span :class="{ hidden: isHiddenSpinner }">
|
||||||
<!-- icon no worky? -->
|
<!-- icon no worky? -->
|
||||||
<i class="fa-solid fa-spinner fa-spin-pulse"></i>
|
<i class="fa-solid fa-spinner fa-spin-pulse"></i>
|
||||||
Saving...</span
|
Saving…</span
|
||||||
>
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="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-1.5 py-2 rounded-md"
|
|
||||||
@click="onCancelClick()"
|
|
||||||
>
|
>
|
||||||
Cancel
|
</button>
|
||||||
</button>
|
<button
|
||||||
</div>
|
type="button"
|
||||||
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
|
@click="onCancelClick()"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
@@ -140,40 +107,25 @@ import * as didJwt from "did-jwt";
|
|||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
|
import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import { accountsDB, db } from "@/db";
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
import { accessToken, SimpleSigner } from "@/libs/crypto";
|
import { accessToken, SimpleSigner } from "@/libs/crypto";
|
||||||
import { useAppStore } from "@/store/app";
|
import { useAppStore } from "@/store/app";
|
||||||
import { IIdentifier } from "@veramo/core";
|
import { IIdentifier } from "@veramo/core";
|
||||||
import { PlanVerifiableCredential } from "@/libs/endorserServer";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { LMap, LMarker, LTileLayer, QuickNav },
|
components: { LMap, LMarker, LTileLayer },
|
||||||
})
|
})
|
||||||
export default class NewEditProjectView extends Vue {
|
export default class NewEditProjectView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
agentDid = "";
|
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
|
description = "";
|
||||||
errorMessage = "";
|
errorMessage = "";
|
||||||
fullClaim: PlanVerifiableCredential = {
|
|
||||||
"@context": "https://schema.org",
|
|
||||||
"@type": "PlanAction",
|
|
||||||
name: "",
|
|
||||||
description: "",
|
|
||||||
}; // this default is only to avoid errors before plan is loaded
|
|
||||||
includeLocation = false;
|
includeLocation = false;
|
||||||
isHiddenSave = false;
|
|
||||||
isHiddenSpinner = true;
|
|
||||||
lastClaimJwtId = "";
|
|
||||||
latitude = 0;
|
latitude = 0;
|
||||||
longitude = 0;
|
longitude = 0;
|
||||||
numAccounts = 0;
|
numAccounts = 0;
|
||||||
projectId = localStorage.getItem("projectId") || "";
|
projectName = "";
|
||||||
projectIssuerDid = "";
|
|
||||||
zoom = 2;
|
zoom = 2;
|
||||||
|
|
||||||
async beforeCreate() {
|
async beforeCreate() {
|
||||||
@@ -181,23 +133,23 @@ export default class NewEditProjectView extends Vue {
|
|||||||
this.numAccounts = await accountsDB.accounts.count();
|
this.numAccounts = await accountsDB.accounts.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getIdentity(activeDid: string) {
|
public async getIdentity(activeDid) {
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const account = await accountsDB.accounts
|
const account = await accountsDB.accounts
|
||||||
.where("did")
|
.where("did")
|
||||||
.equals(activeDid)
|
.equals(activeDid)
|
||||||
.first();
|
.first();
|
||||||
const identity = JSON.parse((account?.identity as string) || "null");
|
const identity = JSON.parse(account?.identity || "null");
|
||||||
|
|
||||||
if (!identity) {
|
if (!identity) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
"Attempted to load project records with no identifier available.",
|
"Attempted to load project records with no identity available.",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return identity;
|
return identity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getHeaders(identity: IIdentifier) {
|
public async getHeaders(identity) {
|
||||||
const token = await accessToken(identity);
|
const token = await accessToken(identity);
|
||||||
const headers = {
|
const headers = {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
@@ -206,11 +158,15 @@ export default class NewEditProjectView extends Vue {
|
|||||||
return headers;
|
return headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
projectId = localStorage.getItem("projectId") || "";
|
||||||
|
isHiddenSave = false;
|
||||||
|
isHiddenSpinner = true;
|
||||||
|
|
||||||
async created() {
|
async created() {
|
||||||
await db.open();
|
await db.open();
|
||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
||||||
this.activeDid = (settings?.activeDid as string) || "";
|
this.activeDid = settings?.activeDid || "";
|
||||||
this.apiServer = (settings?.apiServer as string) || "";
|
this.apiServer = settings?.apiServer || "";
|
||||||
|
|
||||||
if (this.projectId) {
|
if (this.projectId) {
|
||||||
if (this.numAccounts === 0) {
|
if (this.numAccounts === 0) {
|
||||||
@@ -219,15 +175,15 @@ export default class NewEditProjectView extends Vue {
|
|||||||
const identity = await this.getIdentity(this.activeDid);
|
const identity = await this.getIdentity(this.activeDid);
|
||||||
if (!identity) {
|
if (!identity) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
"An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
|
"An ID is chosen but there are no keys for it so it cannot be used to talk with the service.",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
this.loadProject(identity);
|
this.LoadProject(identity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadProject(identity: IIdentifier) {
|
async LoadProject(identity: IIdentifier) {
|
||||||
const url =
|
const url =
|
||||||
this.apiServer +
|
this.apiServer +
|
||||||
"/api/claim/byHandle/" +
|
"/api/claim/byHandle/" +
|
||||||
@@ -241,35 +197,26 @@ export default class NewEditProjectView extends Vue {
|
|||||||
try {
|
try {
|
||||||
const resp = await this.axios.get(url, { headers });
|
const resp = await this.axios.get(url, { headers });
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
this.projectIssuerDid = resp.data.issuer;
|
const claim = resp.data.claim;
|
||||||
this.fullClaim = resp.data.claim;
|
this.projectName = claim.name;
|
||||||
this.lastClaimJwtId = resp.data.id;
|
this.description = claim.description;
|
||||||
if (this.fullClaim?.location) {
|
|
||||||
this.includeLocation = true;
|
|
||||||
this.latitude = this.fullClaim.location.geo.latitude;
|
|
||||||
this.longitude = this.fullClaim.location.geo.longitude;
|
|
||||||
}
|
|
||||||
if (this.fullClaim?.agent?.identifier) {
|
|
||||||
this.agentDid = this.fullClaim.agent.identifier;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Got error retrieving that project", error);
|
console.error("Got error retrieving that project", error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async saveProject(identity: IIdentifier) {
|
private async SaveProject(identity: IIdentifier) {
|
||||||
// Make a claim
|
// Make a claim
|
||||||
const vcClaim: PlanVerifiableCredential = this.fullClaim;
|
const vcClaim: VerifiableCredential = {
|
||||||
|
"@context": "https://schema.org",
|
||||||
|
"@type": "PlanAction",
|
||||||
|
name: this.projectName,
|
||||||
|
description: this.description,
|
||||||
|
identifier: this.projectId || undefined,
|
||||||
|
};
|
||||||
if (this.projectId) {
|
if (this.projectId) {
|
||||||
vcClaim.lastClaimId = this.lastClaimJwtId;
|
vcClaim.identifier = this.projectId;
|
||||||
}
|
|
||||||
if (this.agentDid) {
|
|
||||||
vcClaim.agent = {
|
|
||||||
identifier: this.agentDid,
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
delete vcClaim.agent;
|
|
||||||
}
|
}
|
||||||
if (this.includeLocation) {
|
if (this.includeLocation) {
|
||||||
vcClaim.location = {
|
vcClaim.location = {
|
||||||
@@ -279,8 +226,6 @@ export default class NewEditProjectView extends Vue {
|
|||||||
longitude: this.longitude,
|
longitude: this.longitude,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
} else {
|
|
||||||
delete vcClaim.location;
|
|
||||||
}
|
}
|
||||||
// Make a payload for the claim
|
// Make a payload for the claim
|
||||||
const vcPayload = {
|
const vcPayload = {
|
||||||
@@ -314,40 +259,33 @@ export default class NewEditProjectView extends Vue {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const resp = await this.axios.post(url, payload, { headers });
|
const resp = await this.axios.post(url, payload, { headers });
|
||||||
if (resp.data?.success?.handleId) {
|
// handleId is new in server v release-1.6.0; remove fullIri when that
|
||||||
|
// version shows up here: https://api.endorser.ch/api-docs/
|
||||||
|
if (resp.data?.success?.handleId || resp.data?.success?.fullIri) {
|
||||||
this.errorMessage = "";
|
this.errorMessage = "";
|
||||||
|
// handleId is new in server v release-1.6.0; remove fullIri when that
|
||||||
useAppStore()
|
// version shows up here: https://api.endorser.ch/api-docs/
|
||||||
.setProjectId(resp.data.success.handleId)
|
useAppStore().setProjectId(
|
||||||
.then(() => {
|
resp.data.success.handleId || resp.data.success.fullIri,
|
||||||
this.$router.push({ name: "project" });
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
console.error(
|
|
||||||
"Got unexpected 'data' inside response from server",
|
|
||||||
resp,
|
|
||||||
);
|
);
|
||||||
this.$notify(
|
setTimeout(
|
||||||
{
|
function (that: Vue) {
|
||||||
group: "alert",
|
const route = {
|
||||||
type: "danger",
|
name: "project",
|
||||||
title: "Error Saving Idea",
|
};
|
||||||
text: "Server did not save the idea. Try again.",
|
that.$router.push(route);
|
||||||
},
|
},
|
||||||
-1,
|
2000,
|
||||||
|
this,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
let userMessage = "There was an error saving the project.";
|
let userMessage = "There was an error saving the project.";
|
||||||
const serverError = error as AxiosError<{
|
const serverError = error as AxiosError;
|
||||||
error?: { message?: string };
|
|
||||||
}>;
|
|
||||||
if (serverError) {
|
if (serverError) {
|
||||||
console.error("Got error from server", serverError);
|
|
||||||
if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
|
if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
|
||||||
userMessage =
|
console.log(serverError);
|
||||||
(serverError.response?.data?.error?.message as string) ||
|
userMessage = serverError.response.data.error.message; // This is info for the user.
|
||||||
userMessage;
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
@@ -397,7 +335,7 @@ export default class NewEditProjectView extends Vue {
|
|||||||
console.error("Error: there is no account.");
|
console.error("Error: there is no account.");
|
||||||
} else {
|
} else {
|
||||||
const identity = await this.getIdentity(this.activeDid);
|
const identity = await this.getIdentity(this.activeDid);
|
||||||
this.saveProject(identity);
|
this.SaveProject(identity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,25 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav selected="Profile"></QuickNav>
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- Breadcrumb -->
|
<!-- Heading -->
|
||||||
<div class="mb-8">
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
<!-- Back -->
|
Your Identity
|
||||||
<div class="text-lg text-center font-light relative px-7">
|
</h1>
|
||||||
<h1
|
|
||||||
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
|
||||||
@click="$router.back()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
|
||||||
Your Identity
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex justify-center py-12">
|
<div class="flex justify-center py-12">
|
||||||
<span />
|
<span />
|
||||||
@@ -54,18 +40,41 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import "dexie-export-import";
|
import "dexie-export-import";
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { generateSaveAndActivateIdentity } from "@/libs/util";
|
import { accountsDB, db } from "@/db";
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
|
||||||
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
|
import QuickNav from "@/components/QuickNav";
|
||||||
|
|
||||||
@Component({ components: { QuickNav } })
|
@Component({ components: { QuickNav } })
|
||||||
export default class NewIdentifierView extends Vue {
|
export default class AccountViewView extends Vue {
|
||||||
loading = true;
|
loading = true;
|
||||||
|
|
||||||
async mounted() {
|
async mounted() {
|
||||||
await generateSaveAndActivateIdentity();
|
const mnemonic = generateSeed();
|
||||||
|
// address is 0x... ETH address, without "did:eth:"
|
||||||
|
const [address, privateHex, publicHex, derivationPath] =
|
||||||
|
deriveAddress(mnemonic);
|
||||||
|
|
||||||
|
const newId = newIdentifier(address, publicHex, privateHex, derivationPath);
|
||||||
|
const identity = JSON.stringify(newId);
|
||||||
|
|
||||||
|
await accountsDB.open();
|
||||||
|
await accountsDB.accounts.add({
|
||||||
|
dateCreated: new Date().toISOString(),
|
||||||
|
derivationPath: derivationPath,
|
||||||
|
did: newId.did,
|
||||||
|
identity: identity,
|
||||||
|
mnemonic: mnemonic,
|
||||||
|
publicKeyHex: newId.keys[0].publicKeyHex,
|
||||||
|
});
|
||||||
|
|
||||||
|
await db.settings.update(MASTER_SETTINGS_KEY, {
|
||||||
|
activeDid: newId.did,
|
||||||
|
});
|
||||||
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.$router.push({ name: "home" });
|
this.$router.push({ name: "account" });
|
||||||
}, 1000);
|
}, 1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav selected="Projects"></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">
|
||||||
<!-- Breadcrumb -->
|
<!-- Breadcrumb -->
|
||||||
<div id="ViewBreadcrumb" class="mb-8">
|
<div id="ViewBreadcrumb" class="mb-8">
|
||||||
<h1 class="text-lg text-center font-light relative px-7">
|
<h1 class="text-lg text-center font-light relative px-7">
|
||||||
@@ -14,7 +12,7 @@
|
|||||||
>
|
>
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
<fa icon="chevron-left" class="fa-fw"></fa>
|
||||||
</button>
|
</button>
|
||||||
Idea
|
View Plan
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -23,11 +21,11 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="block pb-4 flex gap-4">
|
<div class="block pb-4 flex gap-4">
|
||||||
<div class="flex-none w-16 pt-1">
|
<div class="flex-none w-16 pt-1">
|
||||||
<ProjectIcon
|
<EntityIcon
|
||||||
:entityId="projectId"
|
:entityId="projectId"
|
||||||
:iconSize="64"
|
:iconSize="64"
|
||||||
class="block border border-slate-300 rounded-md"
|
class="block border border-slate-300 rounded-md"
|
||||||
></ProjectIcon>
|
></EntityIcon>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="overflow-hidden">
|
<div class="overflow-hidden">
|
||||||
@@ -35,25 +33,9 @@
|
|||||||
<div class="text-sm mb-3">
|
<div class="text-sm mb-3">
|
||||||
<div class="truncate">
|
<div class="truncate">
|
||||||
<fa icon="user" class="fa-fw text-slate-400"></fa>
|
<fa icon="user" class="fa-fw text-slate-400"></fa>
|
||||||
{{
|
{{ issuer }}
|
||||||
serverUtil.didInfo(issuer, activeDid, allMyDids, allContacts)
|
|
||||||
}}
|
|
||||||
<span v-if="!serverUtil.isEmptyOrHiddenDid(issuer)">
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
libsUtil.doCopyTwoSecRedo(
|
|
||||||
issuer,
|
|
||||||
() => (showDidCopy = !showDidCopy),
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="ml-2 mr-2"
|
|
||||||
>
|
|
||||||
<fa icon="copy" class="text-slate-400 fa-fw"></fa>
|
|
||||||
</button>
|
|
||||||
<span v-show="showDidCopy">Copied DID</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<div v-if="timeSince">
|
<div>
|
||||||
<fa icon="calendar" class="fa-fw text-slate-400"></fa>
|
<fa icon="calendar" class="fa-fw text-slate-400"></fa>
|
||||||
{{ timeSince }}
|
{{ timeSince }}
|
||||||
</div>
|
</div>
|
||||||
@@ -63,14 +45,8 @@
|
|||||||
:href="getOpenStreetMapUrl()"
|
:href="getOpenStreetMapUrl()"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
class="underline"
|
class="underline"
|
||||||
>Map View
|
>
|
||||||
<fa icon="arrow-up-right-from-square" class="fa-fw" />
|
Map View
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<div v-if="url">
|
|
||||||
<fa icon="globe" class="fa-fw text-slate-400"></fa>
|
|
||||||
<a :href="addScheme(url)" target="_blank" class="underline"
|
|
||||||
>{{ domainForWebsite(this.url) }}
|
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -80,11 +56,8 @@
|
|||||||
<div class="text-sm text-slate-500">
|
<div class="text-sm text-slate-500">
|
||||||
<div v-if="!expanded">
|
<div v-if="!expanded">
|
||||||
{{ truncatedDesc }}
|
{{ truncatedDesc }}
|
||||||
<a
|
<a v-if="description.length >= truncateLength" @click="expandText"
|
||||||
v-if="description.length >= truncateLength"
|
>Read More</a
|
||||||
@click="expandText"
|
|
||||||
class="uppercase text-xs font-semibold text-slate-700"
|
|
||||||
>... Read More</a
|
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
@@ -92,80 +65,56 @@
|
|||||||
<a
|
<a
|
||||||
@click="collapseText"
|
@click="collapseText"
|
||||||
class="uppercase text-xs font-semibold text-slate-700"
|
class="uppercase text-xs font-semibold text-slate-700"
|
||||||
>- Read Less</a
|
>Read Less</a
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<a @click="onClickLoadClaim(projectId)" class="cursor-pointer">
|
|
||||||
<fa icon="file-lines" class="pl-2 pt-1 text-blue-500" />
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-if="activeDid === issuer || activeDid === agentDid"
|
v-if="issuer == activeDid"
|
||||||
type="button"
|
type="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-1.5 py-2 rounded-md"
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
@click="onEditClick()"
|
@click="onEditClick()"
|
||||||
>
|
>
|
||||||
Edit
|
Edit
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="activeDid" class="mb-4">
|
<div>
|
||||||
<div class="text-center">
|
<div v-if="activeDid" class="text-center">
|
||||||
<button
|
<button
|
||||||
@click="openOfferDialog()"
|
@click="openDialog({ name: 'you', did: activeDid })"
|
||||||
class="block w-full text-lg font-bold 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-2 py-3 rounded-md"
|
class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
|
||||||
>
|
>
|
||||||
Offer (maybe with conditions)...
|
I gave…
|
||||||
</button>
|
</button>
|
||||||
|
<p class="mt-2 mb-4 text-center">Or, record a gift from:</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<p v-if="!activeDid" class="mt-2 mb-4">Record a gift from:</p>
|
||||||
<OfferDialog ref="customOfferDialog" :projectId="this.projectId" />
|
|
||||||
|
|
||||||
<div v-if="activeDid">
|
<ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
|
||||||
<GiftedDialog
|
<li @click="openDialog()">
|
||||||
ref="customGiveDialog"
|
<EntityIcon
|
||||||
message="Received from"
|
:entityId="Anonymous"
|
||||||
:projectId="this.projectId"
|
:iconSize="64"
|
||||||
>
|
|
||||||
</GiftedDialog>
|
|
||||||
<div class="text-center">
|
|
||||||
<p class="mt-2 mb-4 text-center">Record a contribution from:</p>
|
|
||||||
</div>
|
|
||||||
<ul
|
|
||||||
class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5"
|
|
||||||
>
|
|
||||||
<li @click="openGiftDialog({ name: 'you', did: activeDid })">
|
|
||||||
<fa icon="hand" class="fa-fw text-slate-400 text-5xl" />
|
|
||||||
<h3
|
|
||||||
class="mt-5 text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
|
|
||||||
>
|
|
||||||
You
|
|
||||||
</h3>
|
|
||||||
</li>
|
|
||||||
<li @click="openGiftDialog()">
|
|
||||||
<img
|
|
||||||
src="../assets/blank-square.svg"
|
|
||||||
class="mx-auto border border-slate-300 rounded-md mb-1"
|
class="mx-auto border border-slate-300 rounded-md mb-1"
|
||||||
/>
|
></EntityIcon>
|
||||||
<h3
|
<h3
|
||||||
class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
|
class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
|
||||||
>
|
>
|
||||||
Anonymous/Unnamed
|
Anonymous
|
||||||
</h3>
|
</h3>
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
v-for="contact in allContacts.slice(0, 6)"
|
v-for="contact in allContacts"
|
||||||
:key="contact.did"
|
:key="contact.did"
|
||||||
@click="openGiftDialog(contact)"
|
@click="openDialog(contact)"
|
||||||
>
|
>
|
||||||
<EntityIcon
|
<EntityIcon
|
||||||
:entityId="contact.did"
|
:entityId="contact.did"
|
||||||
:iconSize="64"
|
:iconSize="64"
|
||||||
class="mx-auto border border-slate-300 rounded-md mb-1"
|
class="mx-auto border border-slate-300 rounded-md mb-1"
|
||||||
/>
|
></EntityIcon>
|
||||||
<h3
|
<h3
|
||||||
class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
|
class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
|
||||||
>
|
>
|
||||||
@@ -175,88 +124,23 @@
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
|
<!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
|
||||||
<a
|
<router-link
|
||||||
v-if="allContacts.length >= 7"
|
v-if="allContacts.length > 7"
|
||||||
@click="onClickAllContactsGifting()"
|
:to="{ name: 'contact-gives' }"
|
||||||
class="block text-center text-md font-bold 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-3 rounded-md"
|
class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
|
||||||
>
|
>
|
||||||
Show More Contacts…
|
Show More Contacts…
|
||||||
</a>
|
</router-link>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Gifts to & from this -->
|
<!-- Gifts to & from this -->
|
||||||
<div class="grid items-start grid-cols-1 sm:grid-cols-3 gap-4">
|
<div class="grid items-start grid-cols-1 sm:grid-cols-2 gap-4">
|
||||||
<div class="bg-slate-100 px-4 py-3 rounded-md">
|
<div class="bg-slate-100 px-4 py-3 rounded-md">
|
||||||
<h3 class="text-sm uppercase font-semibold mb-3">
|
<h3 class="text-sm uppercase font-semibold mb-3">
|
||||||
Offered To This Idea
|
Given to this Project
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<div v-if="offersToThis.length === 0">
|
<ul class="text-sm border-t border-slate-300">
|
||||||
(None yet. Wanna
|
|
||||||
<span @click="openOfferDialog()" class="cursor-pointer text-blue-500"
|
|
||||||
>offer something... especially if others join you</span
|
|
||||||
>?)
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul v-else class="text-sm border-t border-slate-300">
|
|
||||||
<li
|
|
||||||
v-for="offer in offersToThis"
|
|
||||||
:key="offer.id"
|
|
||||||
class="py-1.5 border-b border-slate-300"
|
|
||||||
>
|
|
||||||
<div class="flex justify-between gap-4">
|
|
||||||
<span>
|
|
||||||
<fa icon="user" class="fa-fw text-slate-400"></fa>
|
|
||||||
{{
|
|
||||||
serverUtil.didInfo(
|
|
||||||
offer.offeredByDid,
|
|
||||||
activeDid,
|
|
||||||
allMyDids,
|
|
||||||
allContacts,
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
</span>
|
|
||||||
<span v-if="offer.amount" class="whitespace-nowrap">
|
|
||||||
<fa
|
|
||||||
:icon="libsUtil.iconForUnitCode(offer.unit)"
|
|
||||||
class="fa-fw text-slate-400"
|
|
||||||
/>{{ offer.amount }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div v-if="offer.objectDescription" class="text-slate-500">
|
|
||||||
<fa icon="comment" class="fa-fw text-slate-400" />
|
|
||||||
{{ offer.objectDescription }}
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-between">
|
|
||||||
<a
|
|
||||||
@click="onClickLoadClaim(offer.jwtId as string)"
|
|
||||||
class="cursor-pointer"
|
|
||||||
>
|
|
||||||
<fa icon="file-lines" class="pl-2 pt-1 text-blue-500" />
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
v-if="checkIsFulfillable(offer)"
|
|
||||||
@click="onClickFulfillGiveToOffer(offer)"
|
|
||||||
>
|
|
||||||
<fa
|
|
||||||
icon="hand-holding-heart"
|
|
||||||
class="text-blue-500 cursor-pointer"
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="bg-slate-100 px-4 py-3 rounded-md">
|
|
||||||
<h3 class="text-sm uppercase font-semibold mb-3">Given To This Idea</h3>
|
|
||||||
|
|
||||||
<div v-if="givesToThis.length === 0">
|
|
||||||
(None yet. If you've seen something, say something by clicking a
|
|
||||||
contact above.)
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul v-else class="text-sm border-t border-slate-300">
|
|
||||||
<li
|
<li
|
||||||
v-for="give in givesToThis"
|
v-for="give in givesToThis"
|
||||||
:key="give.id"
|
:key="give.id"
|
||||||
@@ -265,180 +149,141 @@
|
|||||||
<div class="flex justify-between gap-4">
|
<div class="flex justify-between gap-4">
|
||||||
<span
|
<span
|
||||||
><fa icon="user" class="fa-fw text-slate-400"></fa>
|
><fa icon="user" class="fa-fw text-slate-400"></fa>
|
||||||
{{
|
{{ didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
|
||||||
serverUtil.didInfo(
|
|
||||||
give.agentDid,
|
|
||||||
activeDid,
|
|
||||||
allMyDids,
|
|
||||||
allContacts,
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
</span>
|
</span>
|
||||||
<span v-if="give.amount" class="whitespace-nowrap">
|
<span v-if="give.amount"
|
||||||
<fa
|
><fa icon="coins" class="fa-fw text-slate-400"></fa>
|
||||||
:icon="libsUtil.iconForUnitCode(give.unit)"
|
{{ give.amount }}
|
||||||
class="fa-fw text-slate-400"
|
|
||||||
/>{{ give.amount }}
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-slate-500">
|
|
||||||
<fa icon="calendar" class="fa-fw text-slate-400" />
|
|
||||||
{{ give.issuedAt?.substring(0, 10) }}
|
|
||||||
</div>
|
|
||||||
<div v-if="give.description" class="text-slate-500">
|
<div v-if="give.description" class="text-slate-500">
|
||||||
<fa icon="comment" class="fa-fw text-slate-400" />
|
<fa icon="comment" class="fa-fw text-slate-400"></fa>
|
||||||
{{ give.description }}
|
{{ give.description }}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-between">
|
|
||||||
<a @click="onClickLoadClaim(give.jwtId)">
|
|
||||||
<fa icon="file-lines" class="text-blue-500 cursor-pointer" />
|
|
||||||
</a>
|
|
||||||
<a v-if="checkIsConfirmable(give)" @click="confirmClaim(give)">
|
|
||||||
<fa icon="circle-check" class="text-blue-500 cursor-pointer" />
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grid items-start grid-cols-1 gap-4">
|
<div class="bg-slate-100 px-4 py-3 rounded-md">
|
||||||
<div
|
<h3 class="text-sm uppercase font-semibold mb-3">
|
||||||
v-if="fulfillersToThis.length > 0"
|
…and from this Project
|
||||||
class="bg-slate-100 px-4 py-3 rounded-md"
|
</h3>
|
||||||
>
|
|
||||||
<h3 class="text-sm uppercase font-semibold mb-3">
|
|
||||||
Contributions To This Idea
|
|
||||||
</h3>
|
|
||||||
<!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
|
|
||||||
<div class="text-center">
|
|
||||||
<div v-for="plan in fulfillersToThis" :key="plan.handleId">
|
|
||||||
<button
|
|
||||||
@click="onClickLoadProject(plan.handleId)"
|
|
||||||
class="text-blue-500"
|
|
||||||
>
|
|
||||||
{{ plan.name }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
|
<ul class="text-sm border-t border-slate-300">
|
||||||
<h3 class="text-sm uppercase font-semibold mb-3">
|
<li
|
||||||
Contributions From This Idea
|
v-for="give in givesByThis"
|
||||||
</h3>
|
:key="give.id"
|
||||||
<!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
|
class="py-1.5 border-b border-slate-300"
|
||||||
<div class="text-center">
|
>
|
||||||
<button
|
<div class="flex justify-between gap-4">
|
||||||
@click="onClickLoadProject(fulfilledByThis.handleId)"
|
<span
|
||||||
class="text-blue-500"
|
><fa icon="user" class="fa-fw text-slate-400"></fa>
|
||||||
>
|
{{ didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
|
||||||
{{ fulfilledByThis.name }}
|
</span>
|
||||||
</button>
|
<span v-if="give.amount"
|
||||||
</div>
|
><fa icon="coins" class="fa-fw text-slate-400"></fa>
|
||||||
</div>
|
{{ give.amount }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div v-if="give.description" class="text-slate-500">
|
||||||
|
<fa icon="comment" class="fa-fw text-slate-400"></fa>
|
||||||
|
{{ give.description }}
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<GiftedDialog
|
||||||
|
ref="customDialog"
|
||||||
|
@dialog-result="handleDialogResult"
|
||||||
|
message="Received from"
|
||||||
|
>
|
||||||
|
</GiftedDialog>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { AxiosError, RawAxiosRequestHeaders } from "axios";
|
import { AxiosError } from "axios";
|
||||||
import * as moment from "moment";
|
import * as moment from "moment";
|
||||||
import { IIdentifier } from "@veramo/core";
|
import { IIdentifier } from "@veramo/core";
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
|
|
||||||
import GiftedDialog from "@/components/GiftedDialog.vue";
|
import GiftedDialog from "@/components/GiftedDialog.vue";
|
||||||
import OfferDialog from "@/components/OfferDialog.vue";
|
import { accountsDB, db } from "@/db";
|
||||||
import TopMessage from "@/components/TopMessage.vue";
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import EntityIcon from "@/components/EntityIcon.vue";
|
|
||||||
import ProjectIcon from "@/components/ProjectIcon.vue";
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { Account } from "@/db/tables/accounts";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
import { Contact } from "@/db/tables/contacts";
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
import { accessToken } from "@/libs/crypto";
|
import { accessToken } from "@/libs/crypto";
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
import {
|
import {
|
||||||
BLANK_GENERIC_SERVER_RECORD,
|
createAndSubmitGive,
|
||||||
GenericCredWrapper,
|
didInfo,
|
||||||
GiverInputInfo,
|
GiveServerRecord,
|
||||||
GiveSummaryRecord,
|
|
||||||
OfferSummaryRecord,
|
|
||||||
PlanSummaryRecord,
|
|
||||||
} from "@/libs/endorserServer";
|
} from "@/libs/endorserServer";
|
||||||
import * as serverUtil from "@/libs/endorserServer";
|
import QuickNav from "@/components/QuickNav";
|
||||||
|
import EntityIcon from "@/components/EntityIcon";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: { GiftedDialog, QuickNav, EntityIcon },
|
||||||
EntityIcon,
|
|
||||||
GiftedDialog,
|
|
||||||
OfferDialog,
|
|
||||||
ProjectIcon,
|
|
||||||
QuickNav,
|
|
||||||
TopMessage,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
export default class ProjectViewView extends Vue {
|
export default class ProjectViewView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
agentDid = "";
|
|
||||||
allMyDids: Array<string> = [];
|
allMyDids: Array<string> = [];
|
||||||
allContacts: Array<Contact> = [];
|
allContacts: Array<Contact> = [];
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
description = "";
|
description = "";
|
||||||
expanded = false;
|
expanded = false;
|
||||||
fulfilledByThis: PlanSummaryRecord | null = null;
|
givesToThis: Array<GiveServerRecord> = [];
|
||||||
fulfillersToThis: Array<PlanSummaryRecord> = [];
|
givesByThis: Array<GiveServerRecord> = [];
|
||||||
givesToThis: Array<GiveSummaryRecord> = [];
|
|
||||||
issuer = "";
|
|
||||||
latitude = 0;
|
latitude = 0;
|
||||||
longitude = 0;
|
longitude = 0;
|
||||||
name = "";
|
name = "";
|
||||||
offersToThis: Array<OfferSummaryRecord> = [];
|
issuer = "";
|
||||||
projectId = localStorage.getItem("projectId") || ""; // handle ID
|
projectId = localStorage.getItem("projectId") || ""; // handle ID
|
||||||
showDidCopy = false;
|
|
||||||
timeSince = "";
|
timeSince = "";
|
||||||
truncatedDesc = "";
|
truncatedDesc = "";
|
||||||
truncateLength = 40;
|
truncateLength = 40;
|
||||||
url = "";
|
|
||||||
|
|
||||||
libsUtil = libsUtil;
|
|
||||||
serverUtil = serverUtil;
|
|
||||||
|
|
||||||
async created() {
|
async created() {
|
||||||
await db.open();
|
await db.open();
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
||||||
this.activeDid = settings?.activeDid || "";
|
this.activeDid = settings?.activeDid || "";
|
||||||
this.apiServer = settings?.apiServer || "";
|
this.apiServer = settings?.apiServer || "";
|
||||||
this.allContacts = await db.contacts.toArray();
|
this.allContacts = await db.contacts.toArray();
|
||||||
|
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const accounts = accountsDB.accounts;
|
const accounts = accountsDB.accounts;
|
||||||
const accountsArr: Account[] = await accounts?.toArray();
|
const accountsArr = await accounts?.toArray();
|
||||||
this.allMyDids = accountsArr.map((acc) => acc.did);
|
this.allMyDids = accountsArr.map((acc) => acc.did);
|
||||||
const account = accountsArr.find((acc) => acc.did === this.activeDid);
|
const account = accountsArr?.find((acc) => acc.did === this.activeDid);
|
||||||
const identity = JSON.parse(account?.identity || "null");
|
const identity = JSON.parse(account?.identity || "null");
|
||||||
|
this.LoadProject(identity);
|
||||||
const pathParam = window.location.pathname.substring("/project/".length);
|
|
||||||
if (pathParam) {
|
|
||||||
this.projectId = decodeURIComponent(pathParam);
|
|
||||||
}
|
|
||||||
this.loadProject(this.projectId, identity);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getIdentity(activeDid: string) {
|
public async getIdentity(activeDid) {
|
||||||
await accountsDB.open();
|
await accountsDB.open();
|
||||||
const account = (await accountsDB.accounts
|
const account = await accountsDB.accounts
|
||||||
.where("did")
|
.where("did")
|
||||||
.equals(activeDid)
|
.equals(activeDid)
|
||||||
.first()) as Account;
|
.first();
|
||||||
const identity = JSON.parse(account?.identity || "null");
|
const identity = JSON.parse(account?.identity || "null");
|
||||||
|
|
||||||
|
if (!identity) {
|
||||||
|
throw new Error(
|
||||||
|
"Attempted to load project records with no identity available.",
|
||||||
|
);
|
||||||
|
}
|
||||||
return identity;
|
return identity;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async getHeaders(identity) {
|
||||||
|
const token = await accessToken(identity);
|
||||||
|
const headers = {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Authorization: "Bearer " + token,
|
||||||
|
};
|
||||||
|
return headers;
|
||||||
|
}
|
||||||
|
|
||||||
onEditClick() {
|
onEditClick() {
|
||||||
localStorage.setItem("projectId", this.projectId as string);
|
localStorage.setItem("projectId", this.projectId as string);
|
||||||
const route = {
|
const route = {
|
||||||
@@ -448,6 +293,10 @@ export default class ProjectViewView extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Isn't there a better way to make this available to the template?
|
// Isn't there a better way to make this available to the template?
|
||||||
|
didInfo(did, activeDid, dids, contacts) {
|
||||||
|
return didInfo(did, activeDid, dids, contacts);
|
||||||
|
}
|
||||||
|
|
||||||
expandText() {
|
expandText() {
|
||||||
this.expanded = true;
|
this.expanded = true;
|
||||||
}
|
}
|
||||||
@@ -456,12 +305,12 @@ export default class ProjectViewView extends Vue {
|
|||||||
this.expanded = false;
|
this.expanded = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadProject(projectId: string, identity: IIdentifier) {
|
async LoadProject(identity: IIdentifier) {
|
||||||
this.projectId = projectId;
|
|
||||||
|
|
||||||
const url =
|
const url =
|
||||||
this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
|
this.apiServer +
|
||||||
const headers: RawAxiosRequestHeaders = {
|
"/api/claim/byHandle/" +
|
||||||
|
encodeURIComponent(this.projectId);
|
||||||
|
const headers = {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
};
|
};
|
||||||
if (identity) {
|
if (identity) {
|
||||||
@@ -478,29 +327,25 @@ export default class ProjectViewView extends Vue {
|
|||||||
const now = moment.now();
|
const now = moment.now();
|
||||||
this.timeSince = moment.utc(now).to(eventDate);
|
this.timeSince = moment.utc(now).to(eventDate);
|
||||||
}
|
}
|
||||||
this.agentDid = resp.data.claim?.agent?.identifier;
|
|
||||||
this.issuer = resp.data.issuer;
|
this.issuer = resp.data.issuer;
|
||||||
this.name = resp.data.claim?.name || "(no name)";
|
this.name = resp.data.claim?.name || "(no name)";
|
||||||
this.description = resp.data.claim?.description || "(no 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;
|
||||||
this.url = resp.data.claim?.url || "";
|
} else if (resp.status === 404) {
|
||||||
} else {
|
// actually, axios throws an error so we never get here
|
||||||
// actually, axios throws an error on 404 so we probably never get here
|
|
||||||
console.error("Error getting project:", resp);
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Error",
|
title: "Error",
|
||||||
text: "There was a problem getting that project. See logs for more info.",
|
text: "That project does not exist.",
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
console.error("Error retrieving project:", error);
|
|
||||||
const serverError = error as AxiosError;
|
const serverError = error as AxiosError;
|
||||||
if (serverError.response?.status === 404) {
|
if (serverError.response?.status === 404) {
|
||||||
this.$notify(
|
this.$notify(
|
||||||
@@ -522,13 +367,14 @@ export default class ProjectViewView extends Vue {
|
|||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
|
console.error("Error retrieving project:", serverError.message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const givesInUrl =
|
const givesInUrl =
|
||||||
this.apiServer +
|
this.apiServer +
|
||||||
"/api/v2/report/givesToPlans?planIds=" +
|
"/api/v2/report/givesForPlans?planIds=" +
|
||||||
encodeURIComponent(JSON.stringify([projectId]));
|
encodeURIComponent(JSON.stringify([this.projectId]));
|
||||||
try {
|
try {
|
||||||
const resp = await this.axios.get(givesInUrl, { headers });
|
const resp = await this.axios.get(givesInUrl, { headers });
|
||||||
if (resp.status === 200 && resp.data.data) {
|
if (resp.status === 200 && resp.data.data) {
|
||||||
@@ -561,21 +407,21 @@ export default class ProjectViewView extends Vue {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const offersToUrl =
|
const givesOutUrl =
|
||||||
this.apiServer +
|
this.apiServer +
|
||||||
"/api/v2/report/offersToPlans?planIds=" +
|
"/api/v2/report/givesProvidedBy?providerId=" +
|
||||||
encodeURIComponent(JSON.stringify([projectId]));
|
encodeURIComponent(this.projectId);
|
||||||
try {
|
try {
|
||||||
const resp = await this.axios.get(offersToUrl, { headers });
|
const resp = await this.axios.get(givesOutUrl, { headers });
|
||||||
if (resp.status === 200 && resp.data.data) {
|
if (resp.status === 200 && resp.data.data) {
|
||||||
this.offersToThis = resp.data.data;
|
this.givesByThis = resp.data.data;
|
||||||
} else {
|
} else {
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Error",
|
title: "Error",
|
||||||
text: "Failed to retrieve offers to this project.",
|
text: "Failed to retrieve gives by this project.",
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
@@ -587,100 +433,19 @@ export default class ProjectViewView extends Vue {
|
|||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Error",
|
title: "Error",
|
||||||
text: "Something went wrong retrieving offers to this project.",
|
text: "Something went wrong retrieving gives by project.",
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
console.error(
|
console.error(
|
||||||
"Error retrieving offers to this project:",
|
"Error retrieving gives by this project:",
|
||||||
serverError.message,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const fulfilledByUrl =
|
|
||||||
this.apiServer +
|
|
||||||
"/api/v2/report/planFulfilledByPlan?planHandleId=" +
|
|
||||||
encodeURIComponent(projectId);
|
|
||||||
try {
|
|
||||||
const resp = await this.axios.get(fulfilledByUrl, { headers });
|
|
||||||
if (resp.status === 200) {
|
|
||||||
this.fulfilledByThis = resp.data.data;
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Failed to retrieve plans fulfilled by this project.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} catch (error: unknown) {
|
|
||||||
const serverError = error as AxiosError;
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Something went wrong retrieving plans fulfilled by this project.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
console.error(
|
|
||||||
"Error retrieving plans fulfilled by this project:",
|
|
||||||
serverError.message,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const fulfillersToUrl =
|
|
||||||
this.apiServer +
|
|
||||||
"/api/v2/report/planFulfillersToPlan?planHandleId=" +
|
|
||||||
encodeURIComponent(projectId);
|
|
||||||
try {
|
|
||||||
const resp = await this.axios.get(fulfillersToUrl, { headers });
|
|
||||||
if (resp.status === 200) {
|
|
||||||
this.fulfillersToThis = resp.data.data;
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Failed to retrieve plan fulfillers to this project.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} catch (error: unknown) {
|
|
||||||
const serverError = error as AxiosError;
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Something went wrong retrieving plan fulfillers to this project.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
console.error(
|
|
||||||
"Error retrieving plan fulfillers to this project:",
|
|
||||||
serverError.message,
|
serverError.message,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
openDialog(contact) {
|
||||||
* Handle clicking on a project entry found in the list
|
this.$refs.customDialog.open(contact);
|
||||||
* @param id of the project
|
|
||||||
**/
|
|
||||||
async onClickLoadProject(projectId: string) {
|
|
||||||
localStorage.setItem("projectId", projectId);
|
|
||||||
const route = {
|
|
||||||
path: "/project/" + encodeURIComponent(projectId),
|
|
||||||
};
|
|
||||||
this.$router.push(route);
|
|
||||||
this.loadProject(projectId, await this.getIdentity(this.activeDid));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getOpenStreetMapUrl() {
|
getOpenStreetMapUrl() {
|
||||||
@@ -697,138 +462,101 @@ export default class ProjectViewView extends Vue {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
openGiftDialog(contact?: GiverInputInfo) {
|
handleDialogResult(result) {
|
||||||
(this.$refs.customGiveDialog as GiftedDialog).open(contact);
|
if (result.action === "confirm") {
|
||||||
}
|
return new Promise((resolve) => {
|
||||||
|
this.recordGive(result.contact?.did, result.description, result.hours);
|
||||||
openOfferDialog() {
|
resolve();
|
||||||
(this.$refs.customOfferDialog as OfferDialog).open();
|
});
|
||||||
}
|
} else {
|
||||||
|
// action was not "confirm" so do nothing
|
||||||
onClickAllContactsGifting() {
|
|
||||||
localStorage.setItem("projectId", this.projectId);
|
|
||||||
const route = {
|
|
||||||
name: "contact-gives",
|
|
||||||
};
|
|
||||||
this.$router.push(route);
|
|
||||||
}
|
|
||||||
|
|
||||||
onClickLoadClaim(jwtId: string) {
|
|
||||||
const route = {
|
|
||||||
path: "/claim/" + encodeURIComponent(jwtId),
|
|
||||||
};
|
|
||||||
this.$router.push(route);
|
|
||||||
}
|
|
||||||
|
|
||||||
checkIsFulfillable(offer: OfferSummaryRecord) {
|
|
||||||
const offerRecord: GenericCredWrapper = {
|
|
||||||
...BLANK_GENERIC_SERVER_RECORD,
|
|
||||||
claim: offer.fullClaim,
|
|
||||||
claimType: "Offer",
|
|
||||||
issuer: offer.offeredByDid,
|
|
||||||
};
|
|
||||||
return libsUtil.canFulfillOffer(offerRecord);
|
|
||||||
}
|
|
||||||
|
|
||||||
onClickFulfillGiveToOffer(offer: OfferSummaryRecord) {
|
|
||||||
const offerRecord: GenericCredWrapper = {
|
|
||||||
...BLANK_GENERIC_SERVER_RECORD,
|
|
||||||
claim: offer.fullClaim,
|
|
||||||
issuer: offer.offeredByDid,
|
|
||||||
};
|
|
||||||
const giver: GiverInputInfo = {
|
|
||||||
did: libsUtil.offerGiverDid(offerRecord),
|
|
||||||
};
|
|
||||||
(this.$refs.customGiveDialog as GiftedDialog).open(giver, offer.handleId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// return an HTTPS URL if it's not a global URL
|
|
||||||
addScheme(url: string) {
|
|
||||||
if (!libsUtil.isGlobalUri(url)) {
|
|
||||||
return "https://" + url;
|
|
||||||
}
|
}
|
||||||
return url;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// return just the domain for display, if possible
|
/**
|
||||||
domainForWebsite(url: string) {
|
*
|
||||||
|
* @param giverDid may be null
|
||||||
|
* @param description may be an empty string
|
||||||
|
* @param hours may be 0
|
||||||
|
*/
|
||||||
|
async recordGive(giverDid, description, hours) {
|
||||||
|
if (!this.activeDid) {
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: "You must select an identity before you can record a give.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!description && !hours) {
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: "You must enter a description or some number of hours.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const hostname = new URL(url).hostname;
|
const identity = await this.getIdentity(this.activeDid);
|
||||||
if (!hostname) {
|
const result = await createAndSubmitGive(
|
||||||
// happens for non-http URLs
|
|
||||||
return url;
|
|
||||||
} else if (url.endsWith(hostname)) {
|
|
||||||
// it's just the domain
|
|
||||||
return hostname;
|
|
||||||
} else {
|
|
||||||
// there's more, but don't bother displaying the whole thing
|
|
||||||
return hostname + "...";
|
|
||||||
}
|
|
||||||
} catch (error: unknown) {
|
|
||||||
// must not be a valid URL
|
|
||||||
return url;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
checkIsConfirmable(give: GiveSummaryRecord) {
|
|
||||||
const giveDetails: GenericCredWrapper = {
|
|
||||||
...BLANK_GENERIC_SERVER_RECORD,
|
|
||||||
claim: give.fullClaim,
|
|
||||||
claimType: "GiveAction",
|
|
||||||
issuer: give.agentDid,
|
|
||||||
};
|
|
||||||
return libsUtil.isGiveRecordTheUserCanConfirm(giveDetails, this.activeDid);
|
|
||||||
}
|
|
||||||
|
|
||||||
// similar code is found in ClaimView
|
|
||||||
async confirmClaim(give: GiveSummaryRecord) {
|
|
||||||
if (confirm("Do you personally confirm that this is true?")) {
|
|
||||||
// similar logic is found in endorser-mobile
|
|
||||||
const goodClaim = serverUtil.removeSchemaContext(
|
|
||||||
serverUtil.removeVisibleToDids(
|
|
||||||
serverUtil.addLastClaimOrHandleAsIdIfMissing(
|
|
||||||
give.fullClaim,
|
|
||||||
give.jwtId,
|
|
||||||
give.handleId,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
const confirmationClaim: serverUtil.GenericVerifiableCredential = {
|
|
||||||
"@context": "https://schema.org",
|
|
||||||
"@type": "AgreeAction",
|
|
||||||
object: goodClaim,
|
|
||||||
};
|
|
||||||
const result = await serverUtil.createAndSubmitClaim(
|
|
||||||
confirmationClaim,
|
|
||||||
await this.getIdentity(this.activeDid),
|
|
||||||
this.apiServer,
|
|
||||||
this.axios,
|
this.axios,
|
||||||
|
this.apiServer,
|
||||||
|
identity,
|
||||||
|
giverDid,
|
||||||
|
this.activeDid,
|
||||||
|
description,
|
||||||
|
hours,
|
||||||
|
this.projectId,
|
||||||
);
|
);
|
||||||
if (result.type === "success") {
|
|
||||||
this.$notify(
|
if (result.status !== 201 || result.data?.error) {
|
||||||
{
|
console.log("Error with give result:", result);
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Success",
|
|
||||||
text: "Confirmation submitted.",
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
console.error("Got error submitting the confirmation:", result);
|
|
||||||
const message =
|
|
||||||
(result.error?.error as string) ||
|
|
||||||
"There was a problem submitting the confirmation. See logs for more info.";
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Error",
|
title: "Error",
|
||||||
text: message,
|
text:
|
||||||
|
result.data?.error?.message ||
|
||||||
|
"There was an error recording the give.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "success",
|
||||||
|
title: "Success",
|
||||||
|
text: "That gift was recorded.",
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.log("Error with give caught:", e);
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text:
|
||||||
|
e.userMessage ||
|
||||||
|
e.response?.data?.error?.message ||
|
||||||
|
"There was an error recording the give.",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,51 +1,13 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Projects"></QuickNav>
|
<QuickNav selected="Projects"></QuickNav>
|
||||||
<TopMessage />
|
<section id="Content" class="p-6 pb-24">
|
||||||
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- Heading -->
|
<!-- Heading -->
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
Your Ideas
|
Your Plans
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<!-- Result Tabs -->
|
|
||||||
<div class="text-center text-slate-500 border-b border-slate-300">
|
|
||||||
<ul class="flex flex-wrap justify-center gap-4 -mb-px">
|
|
||||||
<li>
|
|
||||||
<a
|
|
||||||
href="#"
|
|
||||||
@click="
|
|
||||||
offers = [];
|
|
||||||
projects = [];
|
|
||||||
showOffers = true;
|
|
||||||
showProjects = false;
|
|
||||||
loadOffers();
|
|
||||||
"
|
|
||||||
v-bind:class="computedOfferTabClassNames()"
|
|
||||||
>
|
|
||||||
Offers
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a
|
|
||||||
href="#"
|
|
||||||
@click="
|
|
||||||
offers = [];
|
|
||||||
projects = [];
|
|
||||||
showOffers = false;
|
|
||||||
showProjects = true;
|
|
||||||
loadProjects();
|
|
||||||
"
|
|
||||||
v-bind:class="computedProjectTabClassNames()"
|
|
||||||
>
|
|
||||||
Projects
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Quick Search -->
|
<!-- Quick Search -->
|
||||||
<!--
|
|
||||||
<div id="QuickSearch" class="mb-4 flex">
|
<div id="QuickSearch" class="mb-4 flex">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -58,11 +20,9 @@
|
|||||||
<fa icon="magnifying-glass" class="fa-fw"></fa>
|
<fa icon="magnifying-glass" class="fa-fw"></fa>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- New Project -->
|
<!-- New Project -->
|
||||||
<button
|
<button
|
||||||
v-if="showProjects"
|
|
||||||
class="fixed right-6 bottom-24 text-center text-4xl leading-none bg-blue-600 text-white w-14 py-2.5 rounded-full"
|
class="fixed right-6 bottom-24 text-center text-4xl leading-none bg-blue-600 text-white w-14 py-2.5 rounded-full"
|
||||||
@click="onClickNewProject()"
|
@click="onClickNewProject()"
|
||||||
>
|
>
|
||||||
@@ -77,108 +37,8 @@
|
|||||||
<fa icon="spinner" class="fa-spin-pulse"></fa>
|
<fa icon="spinner" class="fa-spin-pulse"></fa>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Offer Results List -->
|
<!-- Results List -->
|
||||||
<InfiniteScroll v-if="showOffers" @reached-bottom="loadMoreOfferData">
|
<InfiniteScroll @reached-bottom="loadMoreData">
|
||||||
<ul class="border-t border-slate-300">
|
|
||||||
<li
|
|
||||||
class="border-b border-slate-300"
|
|
||||||
v-for="offer in offers"
|
|
||||||
:key="offer.handleId"
|
|
||||||
>
|
|
||||||
<div class="block py-4 flex gap-4">
|
|
||||||
<div v-if="offer.fulfillsPlanHandleId" class="flex-none w-12">
|
|
||||||
<ProjectIcon
|
|
||||||
:entityId="offer.fulfillsPlanHandleId"
|
|
||||||
:iconSize="48"
|
|
||||||
class="inline-block align-middle border border-slate-300 rounded-md"
|
|
||||||
></ProjectIcon>
|
|
||||||
</div>
|
|
||||||
<div v-if="offer.recipientDid" class="flex-none w-12">
|
|
||||||
<EntityIcon
|
|
||||||
:entityId="offer.recipientDid"
|
|
||||||
:iconSize="48"
|
|
||||||
class="inline-block align-middle border border-slate-300 rounded-md"
|
|
||||||
></EntityIcon>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<div>
|
|
||||||
{{ offer.objectDescription }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<span class="text-sm">
|
|
||||||
<span v-if="offer.amount">
|
|
||||||
<fa
|
|
||||||
:icon="libsUtil.iconForUnitCode(offer.unit)"
|
|
||||||
class="fa-fw text-slate-400"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<span v-if="offer.amountGiven >= offer.amount">
|
|
||||||
<fa icon="check-circle" class="fa-fw text-green-500" />
|
|
||||||
All {{ offer.amount }} given
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
<fa
|
|
||||||
icon="triangle-exclamation"
|
|
||||||
class="fa-fw text-yellow-500"
|
|
||||||
/>
|
|
||||||
{{ offer.amountGiven ? "" : "All" }}
|
|
||||||
{{ offer.amount - (offer.amountGiven || 0) }} remaining
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<span v-if="offer.amountGiven > 0">
|
|
||||||
<span class="text-sm text-slate-400">
|
|
||||||
({{ offer.amountGiven }} given,
|
|
||||||
<span
|
|
||||||
v-if="offer.amountGivenConfirmed >= offer.amountGiven"
|
|
||||||
>
|
|
||||||
<!-- no need for green icon; unnecessary if there's already a green, confusing if there's a yellow -->
|
|
||||||
all
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
<!-- only show icon if there's not already a warning -->
|
|
||||||
<fa
|
|
||||||
v-if="offer.amountGiven >= offer.amount"
|
|
||||||
icon="triangle-exclamation"
|
|
||||||
class="fa-fw text-yellow-300"
|
|
||||||
/>
|
|
||||||
{{ offer.amountGivenConfirmed || 0 }}
|
|
||||||
</span>
|
|
||||||
of that is confirmed)
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
<!-- Non-amount offer -->
|
|
||||||
<span v-if="offer.nonAmountGivenConfirmed">
|
|
||||||
<fa icon="check-circle" class="fa-fw text-green-500" />
|
|
||||||
{{ offer.nonAmountGivenConfirmed }}
|
|
||||||
{{ offer.nonAmountGivenConfirmed == 1 ? "give" : "gives" }}
|
|
||||||
are confirmed.
|
|
||||||
</span>
|
|
||||||
<span v-else>
|
|
||||||
<fa
|
|
||||||
icon="triangle-exclamation"
|
|
||||||
class="fa-fw text-yellow-500"
|
|
||||||
/>
|
|
||||||
<span class="text-sm">Not confirmed by anyone</span>
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<a @click="onClickLoadClaim(offer.jwtId)">
|
|
||||||
<fa
|
|
||||||
icon="file-lines"
|
|
||||||
class="pl-2 text-blue-500 cursor-pointer"
|
|
||||||
></fa>
|
|
||||||
</a>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</InfiniteScroll>
|
|
||||||
<!-- Project Results List -->
|
|
||||||
<InfiniteScroll v-if="showProjects" @reached-bottom="loadMoreProjectData">
|
|
||||||
<ul class="border-t border-slate-300">
|
<ul class="border-t border-slate-300">
|
||||||
<li
|
<li
|
||||||
class="border-b border-slate-300"
|
class="border-b border-slate-300"
|
||||||
@@ -190,11 +50,11 @@
|
|||||||
class="block py-4 flex gap-4"
|
class="block py-4 flex gap-4"
|
||||||
>
|
>
|
||||||
<div class="flex-none w-12">
|
<div class="flex-none w-12">
|
||||||
<ProjectIcon
|
<EntityIcon
|
||||||
:entityId="project.handleId"
|
:entityId="project.handleId"
|
||||||
:iconSize="48"
|
:iconSize="48"
|
||||||
class="inline-block align-middle border border-slate-300 rounded-md"
|
class="inline-block align-middle border border-slate-300 rounded-md"
|
||||||
></ProjectIcon>
|
></EntityIcon>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grow overflow-hidden">
|
<div class="grow overflow-hidden">
|
||||||
@@ -212,36 +72,119 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
|
import { accountsDB, db } from "@/db";
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
import { accessToken } from "@/libs/crypto";
|
import { accessToken } from "@/libs/crypto";
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
import { IIdentifier } from "@veramo/core";
|
import { IIdentifier } from "@veramo/core";
|
||||||
import InfiniteScroll from "@/components/InfiniteScroll.vue";
|
import InfiniteScroll from "@/components/InfiniteScroll";
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import QuickNav from "@/components/QuickNav";
|
||||||
import ProjectIcon from "@/components/ProjectIcon.vue";
|
import EntityIcon from "@/components/EntityIcon";
|
||||||
import TopMessage from "@/components/TopMessage.vue";
|
|
||||||
import { OfferSummaryRecord, PlanData } from "@/libs/endorserServer";
|
|
||||||
import EntityIcon from "@/components/EntityIcon.vue";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { EntityIcon, InfiniteScroll, QuickNav, ProjectIcon, TopMessage },
|
components: { InfiniteScroll, QuickNav, EntityIcon },
|
||||||
})
|
})
|
||||||
export default class ProjectsView extends Vue {
|
export default class ProjectsView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
projects: PlanData[] = [];
|
projects: ProjectData[] = [];
|
||||||
currentIid: IIdentifier;
|
current: IIdentifier;
|
||||||
isLoading = false;
|
isLoading = false;
|
||||||
numAccounts = 0;
|
numAccounts = 0;
|
||||||
offers: OfferSummaryRecord[] = [];
|
|
||||||
showOffers = true;
|
|
||||||
showProjects = false;
|
|
||||||
|
|
||||||
libsUtil = libsUtil;
|
async beforeCreate() {
|
||||||
|
await accountsDB.open();
|
||||||
|
this.numAccounts = await accountsDB.accounts.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Core project data loader
|
||||||
|
* @param url the url used to fetch the data
|
||||||
|
* @param token Authorization token
|
||||||
|
**/
|
||||||
|
async dataLoader(url: string, token: string) {
|
||||||
|
const headers: { [key: string]: string } = {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
this.isLoading = true;
|
||||||
|
const resp = await this.axios.get(url, { headers });
|
||||||
|
if (resp.status === 200 || !resp.data.data) {
|
||||||
|
const plans: ProjectData[] = resp.data.data;
|
||||||
|
for (const plan of plans) {
|
||||||
|
const { name, description, handleId = plan.fullIri, rowid } = plan;
|
||||||
|
this.projects.push({ name, description, handleId, rowid });
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log("Bad server response & data:", resp.status, resp.data);
|
||||||
|
throw Error("Failed to get projects from the server.");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Got error loading projects:", error.message);
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: "Got an error loading projects: " + error.message,
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
this.isLoading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Data loader used by infinite scroller
|
||||||
|
* @param payload is the flag from the InfiniteScroll indicating if it should load
|
||||||
|
**/
|
||||||
|
async loadMoreData(payload: boolean) {
|
||||||
|
if (this.projects.length > 0 && payload) {
|
||||||
|
const latestProject = this.projects[this.projects.length - 1];
|
||||||
|
const url = `${this.apiServer}/api/v2/report/plansByIssuer?beforeId=${latestProject.rowid}`;
|
||||||
|
const token = await accessToken(this.current);
|
||||||
|
await this.dataLoader(url, token);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle clicking on a project entry found in the list
|
||||||
|
* @param id of the project
|
||||||
|
**/
|
||||||
|
onClickLoadProject(id: string) {
|
||||||
|
localStorage.setItem("projectId", id);
|
||||||
|
const route = {
|
||||||
|
name: "project",
|
||||||
|
};
|
||||||
|
this.$router.push(route);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load projects initially
|
||||||
|
* @param identity of the user
|
||||||
|
**/
|
||||||
|
async LoadProjects(identity: IIdentifier) {
|
||||||
|
const url = `${this.apiServer}/api/v2/report/plansByIssuer`;
|
||||||
|
const token: string = await accessToken(identity);
|
||||||
|
await this.dataLoader(url, token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async getIdentity(activeDid) {
|
||||||
|
await accountsDB.open();
|
||||||
|
const account = await accountsDB.accounts
|
||||||
|
.where("did")
|
||||||
|
.equals(activeDid)
|
||||||
|
.first();
|
||||||
|
const identity = JSON.parse(account?.identity || "null");
|
||||||
|
|
||||||
|
if (!identity) {
|
||||||
|
throw new Error(
|
||||||
|
"Attempted to load project records with no identity available.",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return identity;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 'created' hook runs when the Vue instance is first created
|
* 'created' hook runs when the Vue instance is first created
|
||||||
@@ -250,11 +193,9 @@ export default class ProjectsView extends Vue {
|
|||||||
try {
|
try {
|
||||||
await db.open();
|
await db.open();
|
||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
||||||
const activeDid: string = (settings?.activeDid as string) || "";
|
const activeDid = settings?.activeDid || "";
|
||||||
this.apiServer = (settings?.apiServer as string) || "";
|
this.apiServer = settings?.apiServer || "";
|
||||||
|
|
||||||
await accountsDB.open();
|
|
||||||
this.numAccounts = await accountsDB.accounts.count();
|
|
||||||
if (this.numAccounts === 0) {
|
if (this.numAccounts === 0) {
|
||||||
console.error("No accounts found.");
|
console.error("No accounts found.");
|
||||||
this.$notify(
|
this.$notify(
|
||||||
@@ -262,16 +203,17 @@ export default class ProjectsView extends Vue {
|
|||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Error",
|
title: "Error",
|
||||||
text: "You need an identifier to load your projects.",
|
text: "You need an identity to load your projects.",
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
this.currentIid = await this.getIdentity(activeDid);
|
const identity = await this.getIdentity(activeDid);
|
||||||
await this.loadOffers();
|
this.current = identity;
|
||||||
|
this.LoadProjects(identity);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Error initializing:", err);
|
console.log("Error initializing:", err);
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
@@ -284,113 +226,6 @@ export default class ProjectsView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Core project data loader
|
|
||||||
* @param url the url used to fetch the data
|
|
||||||
* @param token Authorization token
|
|
||||||
**/
|
|
||||||
async projectDataLoader(url: string, token: string) {
|
|
||||||
const headers: { [key: string]: string } = {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
Authorization: `Bearer ${token}`,
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.isLoading = true;
|
|
||||||
const resp = await this.axios.get(url, { headers });
|
|
||||||
if (resp.status === 200 || !resp.data.data) {
|
|
||||||
const plans: PlanData[] = resp.data.data;
|
|
||||||
for (const plan of plans) {
|
|
||||||
const { name, description, handleId, issuerDid, rowid } = plan;
|
|
||||||
this.projects.push({ name, description, handleId, issuerDid, rowid });
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.error(
|
|
||||||
"Bad server response & data for plans:",
|
|
||||||
resp.status,
|
|
||||||
resp.data,
|
|
||||||
);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Failed to get projects from the server. Try again later.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error("Got error loading plans:", error.message || error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Got an error loading projects.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
this.isLoading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Data loader used by infinite scroller
|
|
||||||
* @param payload is the flag from the InfiniteScroll indicating if it should load
|
|
||||||
**/
|
|
||||||
async loadMoreProjectData(payload: boolean) {
|
|
||||||
if (this.projects.length > 0 && payload) {
|
|
||||||
const latestProject = this.projects[this.projects.length - 1];
|
|
||||||
await this.loadProjects(
|
|
||||||
this.currentIid,
|
|
||||||
`beforeId=${latestProject.rowid}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load projects initially
|
|
||||||
* @param identifier of the user
|
|
||||||
* @param urlExtra additional url parameters in a string
|
|
||||||
**/
|
|
||||||
async loadProjects(identifier?: IIdentifier, urlExtra: string = "") {
|
|
||||||
const identity = identifier || this.currentIid;
|
|
||||||
const url = `${this.apiServer}/api/v2/report/plansByIssuer?${urlExtra}`;
|
|
||||||
const token: string = await accessToken(identity);
|
|
||||||
await this.projectDataLoader(url, token);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async getIdentity(activeDid: string): Promise<IIdentifier> {
|
|
||||||
await accountsDB.open();
|
|
||||||
const account = await accountsDB.accounts
|
|
||||||
.where("did")
|
|
||||||
.equals(activeDid)
|
|
||||||
.first();
|
|
||||||
const identity = JSON.parse((account?.identity as string) || "null");
|
|
||||||
|
|
||||||
if (!identity) {
|
|
||||||
throw new Error(
|
|
||||||
"Attempted to load project records with no identifier available.",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return identity;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle clicking on a project entry found in the list
|
|
||||||
* @param id of the project
|
|
||||||
**/
|
|
||||||
onClickLoadProject(id: string) {
|
|
||||||
localStorage.setItem("projectId", id);
|
|
||||||
const route = {
|
|
||||||
path: "/project/" + encodeURIComponent(id),
|
|
||||||
};
|
|
||||||
this.$router.push(route);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handling clicking on the new project button
|
* Handling clicking on the new project button
|
||||||
**/
|
**/
|
||||||
@@ -401,120 +236,5 @@ export default class ProjectsView extends Vue {
|
|||||||
};
|
};
|
||||||
this.$router.push(route);
|
this.$router.push(route);
|
||||||
}
|
}
|
||||||
|
|
||||||
onClickLoadClaim(jwtId: string) {
|
|
||||||
const route = {
|
|
||||||
path: "/claim/" + encodeURIComponent(jwtId),
|
|
||||||
};
|
|
||||||
this.$router.push(route);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Core offer data loader
|
|
||||||
* @param url the url used to fetch the data
|
|
||||||
* @param token Authorization token
|
|
||||||
**/
|
|
||||||
async offerDataLoader(url: string, token: string) {
|
|
||||||
const headers: { [key: string]: string } = {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
Authorization: `Bearer ${token}`,
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.isLoading = true;
|
|
||||||
const resp = await this.axios.get(url, { headers });
|
|
||||||
if (resp.status === 200 || !resp.data.data) {
|
|
||||||
this.offers = this.offers.concat(resp.data.data);
|
|
||||||
} else {
|
|
||||||
console.error(
|
|
||||||
"Bad server response & data for offers:",
|
|
||||||
resp.status,
|
|
||||||
resp.data,
|
|
||||||
);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Failed to get offers from the server. Try again later.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error("Got error loading offers:", error.message || error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Got an error loading offers.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
this.isLoading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Data loader used by infinite scroller
|
|
||||||
* @param payload is the flag from the InfiniteScroll indicating if it should load
|
|
||||||
**/
|
|
||||||
async loadMoreOfferData(payload: boolean) {
|
|
||||||
if (this.offers.length > 0 && payload) {
|
|
||||||
const latestOffer = this.offers[this.offers.length - 1];
|
|
||||||
await this.loadOffers(this.currentIid, `&beforeId=${latestOffer.jwtId}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load offers initially
|
|
||||||
* @param identifier of the user
|
|
||||||
* @param urlExtra additional url parameters in a string
|
|
||||||
**/
|
|
||||||
async loadOffers(identifier?: IIdentifier, urlExtra: string = "") {
|
|
||||||
const identity = identifier || this.currentIid;
|
|
||||||
const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${identity.did}${urlExtra}`;
|
|
||||||
const token: string = await accessToken(identity);
|
|
||||||
await this.offerDataLoader(url, token);
|
|
||||||
}
|
|
||||||
|
|
||||||
public computedOfferTabClassNames() {
|
|
||||||
return {
|
|
||||||
"inline-block": true,
|
|
||||||
"py-3": true,
|
|
||||||
"rounded-t-lg": true,
|
|
||||||
"border-b-2": true,
|
|
||||||
|
|
||||||
active: this.showOffers,
|
|
||||||
"text-black": this.showOffers,
|
|
||||||
"border-black": this.showOffers,
|
|
||||||
"font-semibold": this.showOffers,
|
|
||||||
|
|
||||||
"text-blue-600": !this.showOffers,
|
|
||||||
"border-transparent": !this.showOffers,
|
|
||||||
"hover:border-slate-400": !this.showOffers,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public computedProjectTabClassNames() {
|
|
||||||
return {
|
|
||||||
"inline-block": true,
|
|
||||||
"py-3": true,
|
|
||||||
"rounded-t-lg": true,
|
|
||||||
"border-b-2": true,
|
|
||||||
|
|
||||||
active: this.showProjects,
|
|
||||||
"text-black": this.showProjects,
|
|
||||||
"border-black": this.showProjects,
|
|
||||||
"font-semibold": this.showProjects,
|
|
||||||
|
|
||||||
"text-blue-600": !this.showProjects,
|
|
||||||
"border-transparent": !this.showProjects,
|
|
||||||
"hover:border-slate-400": !this.showProjects,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,220 +0,0 @@
|
|||||||
<template>
|
|
||||||
<QuickNav />
|
|
||||||
<TopMessage />
|
|
||||||
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- 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()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-4">
|
|
||||||
Beginning of BVC Saturday Meeting
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h2 class="text-2xl m-2">You're Here</h2>
|
|
||||||
<div class="m-2 flex">
|
|
||||||
<input type="checkbox" v-model="attended" class="h-6 w-6" />
|
|
||||||
<span class="pb-2 pl-2 pr-2">Attended</span>
|
|
||||||
</div>
|
|
||||||
<div class="m-2 flex">
|
|
||||||
<input type="checkbox" v-model="gaveTime" class="h-6 w-6" />
|
|
||||||
<span class="pb-2 pl-2 pr-2">Spent Time</span>
|
|
||||||
<span v-if="gaveTime">
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
placeholder="How much time"
|
|
||||||
v-model="hoursStr"
|
|
||||||
size="1"
|
|
||||||
class="border border-slate-400 h-6 px-2"
|
|
||||||
/>
|
|
||||||
hour(s)
|
|
||||||
</span>
|
|
||||||
<!-- This is to match input height to avoid shifting when hiding & showing. -->
|
|
||||||
<span v-else class="h-6" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="attended || (gaveTime && hoursStr && hoursStr != '0')"
|
|
||||||
class="flex justify-center mt-4"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
@click="record()"
|
|
||||||
class="block text-center text-md font-bold 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-3 rounded-md w-56"
|
|
||||||
>
|
|
||||||
Sign & Send
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div v-else class="flex justify-center mt-4">
|
|
||||||
<button
|
|
||||||
class="block text-center text-md font-bold 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-3 rounded-md w-56"
|
|
||||||
>
|
|
||||||
Select Your Actions
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import axios from "axios";
|
|
||||||
import { DateTime } from "luxon";
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import TopMessage from "@/components/TopMessage.vue";
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
import {
|
|
||||||
BVC_MEETUPS_PROJECT_CLAIM_ID,
|
|
||||||
bvcMeetingJoinClaim,
|
|
||||||
createAndSubmitClaim,
|
|
||||||
createAndSubmitGive,
|
|
||||||
} from "@/libs/endorserServer";
|
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
components: {
|
|
||||||
QuickNav,
|
|
||||||
TopMessage,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class QuickActionBvcBeginView extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
attended = true;
|
|
||||||
gaveTime = true;
|
|
||||||
hoursStr = "1";
|
|
||||||
todayOrPreviousStartDate = "";
|
|
||||||
|
|
||||||
async mounted() {
|
|
||||||
let currentOrPreviousSat = DateTime.now().setZone("America/Denver");
|
|
||||||
if (currentOrPreviousSat.weekday < 6) {
|
|
||||||
// it's not Saturday or Sunday,
|
|
||||||
// so move back one week before setting to the Saturday
|
|
||||||
currentOrPreviousSat = currentOrPreviousSat.minus({ week: 1 });
|
|
||||||
}
|
|
||||||
const eventStartDateObj = currentOrPreviousSat
|
|
||||||
.set({ weekday: 6 })
|
|
||||||
.set({ hour: 9 })
|
|
||||||
.startOf("hour");
|
|
||||||
|
|
||||||
// Hack, but full ISO pushes the length to 340 which crashes verifyJWT!
|
|
||||||
this.todayOrPreviousStartDate =
|
|
||||||
eventStartDateObj.toISO({
|
|
||||||
suppressMilliseconds: true,
|
|
||||||
}) || "";
|
|
||||||
}
|
|
||||||
|
|
||||||
async record() {
|
|
||||||
await db.open();
|
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
|
||||||
const activeDid = settings?.activeDid || "";
|
|
||||||
const apiServer = settings?.apiServer || "";
|
|
||||||
|
|
||||||
try {
|
|
||||||
const hoursNum = libsUtil.numberOrZero(this.hoursStr);
|
|
||||||
const identity = await libsUtil.getIdentity(activeDid);
|
|
||||||
|
|
||||||
// first send the claim for time given
|
|
||||||
let timeSuccess = false;
|
|
||||||
if (this.gaveTime && hoursNum > 0) {
|
|
||||||
const timeResult = await createAndSubmitGive(
|
|
||||||
axios,
|
|
||||||
apiServer,
|
|
||||||
identity,
|
|
||||||
activeDid,
|
|
||||||
undefined,
|
|
||||||
undefined,
|
|
||||||
hoursNum,
|
|
||||||
"HUR",
|
|
||||||
BVC_MEETUPS_PROJECT_CLAIM_ID,
|
|
||||||
);
|
|
||||||
if (timeResult.type === "success") {
|
|
||||||
timeSuccess = true;
|
|
||||||
} else {
|
|
||||||
console.error("Error sending time:", timeResult);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text:
|
|
||||||
timeResult?.error?.userMessage ||
|
|
||||||
"There was an error sending the time.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// now send the claim for attendance
|
|
||||||
let attendedSuccess = false;
|
|
||||||
if (this.attended) {
|
|
||||||
const attendResult = await createAndSubmitClaim(
|
|
||||||
bvcMeetingJoinClaim(activeDid, this.todayOrPreviousStartDate),
|
|
||||||
identity,
|
|
||||||
apiServer,
|
|
||||||
axios,
|
|
||||||
);
|
|
||||||
if (attendResult.type === "success") {
|
|
||||||
attendedSuccess = true;
|
|
||||||
} else {
|
|
||||||
console.error("Error sending attendance:", attendResult);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text:
|
|
||||||
attendResult?.error?.userMessage ||
|
|
||||||
"There was an error sending the attendance.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (timeSuccess || attendedSuccess) {
|
|
||||||
const actions =
|
|
||||||
timeSuccess && attendedSuccess
|
|
||||||
? "Your attendance and time have been recorded."
|
|
||||||
: timeSuccess
|
|
||||||
? "Your time has been recorded."
|
|
||||||
: "Your attendance has been recorded.";
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Success",
|
|
||||||
text: actions,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error("Error sending claims.", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: error.userMessage || "There was an error sending claims.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,377 +0,0 @@
|
|||||||
<template>
|
|
||||||
<QuickNav />
|
|
||||||
<TopMessage />
|
|
||||||
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- 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()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-4">
|
|
||||||
End of BVC Saturday Meeting
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h2 class="text-2xl m-2">Confirm</h2>
|
|
||||||
<div v-if="loadingConfirms" class="flex justify-center">
|
|
||||||
<fa icon="spinner" class="animate-spin" />
|
|
||||||
</div>
|
|
||||||
<div v-else-if="claimsToConfirm.length === 0">
|
|
||||||
There are no claims yet today for you to confirm.
|
|
||||||
</div>
|
|
||||||
<ul class="border-t border-slate-300 m-2">
|
|
||||||
<li
|
|
||||||
class="border-b border-slate-300 py-2"
|
|
||||||
v-for="record in claimsToConfirm"
|
|
||||||
:key="record.id"
|
|
||||||
>
|
|
||||||
<div class="grid grid-cols-12">
|
|
||||||
<span class="col-span-11 justify-self-start">
|
|
||||||
<span>
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
:checked="claimsToConfirmSelected.includes(record.id)"
|
|
||||||
@click="
|
|
||||||
claimsToConfirmSelected.includes(record.id)
|
|
||||||
? claimsToConfirmSelected.splice(
|
|
||||||
claimsToConfirmSelected.indexOf(record.id),
|
|
||||||
1,
|
|
||||||
)
|
|
||||||
: claimsToConfirmSelected.push(record.id)
|
|
||||||
"
|
|
||||||
class="mr-2 h-6 w-6"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
{{
|
|
||||||
claimSpecialDescription(
|
|
||||||
record,
|
|
||||||
activeDid,
|
|
||||||
allMyDids,
|
|
||||||
allContacts,
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
<a @click="onClickLoadClaim(record.id)">
|
|
||||||
<fa
|
|
||||||
icon="file-lines"
|
|
||||||
class="pl-2 text-blue-500 cursor-pointer"
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div v-if="claimCountWithHidden > 0" class="border-b border-slate-300 pb-2">
|
|
||||||
<span>
|
|
||||||
{{
|
|
||||||
claimCountWithHidden === 1
|
|
||||||
? "There is 1 other claim with hidden details,"
|
|
||||||
: `There are ${claimCountWithHidden} other claims with hidden details,`
|
|
||||||
}}
|
|
||||||
so if you expected but do not see details from someone then ask them to
|
|
||||||
check that their activity is visible to you on their Contacts
|
|
||||||
<fa icon="users" class="text-slate-500" />
|
|
||||||
page.
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h2 class="text-2xl m-2">Anything else?</h2>
|
|
||||||
<div class="m-2 flex">
|
|
||||||
<input type="checkbox" v-model="someoneGave" class="h-6 w-6" />
|
|
||||||
<span class="pb-2 pl-2 pr-2">Someone else gave</span>
|
|
||||||
<span v-if="someoneGave">
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
v-model="description"
|
|
||||||
size="20"
|
|
||||||
class="border border-slate-400 h-6 px-2"
|
|
||||||
/>
|
|
||||||
<br />
|
|
||||||
(Everyone likes personalized messages! 😁)
|
|
||||||
</span>
|
|
||||||
<!-- This is to match input height to avoid shifting when hiding & showing. -->
|
|
||||||
<span v-else class="h-6">...</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="claimsToConfirmSelected.length || (someoneGave && description)"
|
|
||||||
class="flex justify-center mt-4"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
@click="record()"
|
|
||||||
class="block text-center text-md font-bold 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-3 rounded-md w-56"
|
|
||||||
>
|
|
||||||
Sign & Send
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div v-else class="flex justify-center mt-4">
|
|
||||||
<button
|
|
||||||
class="block text-center text-md font-bold 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-3 rounded-md w-56"
|
|
||||||
>
|
|
||||||
Choose What To Confirm
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import axios from "axios";
|
|
||||||
import { DateTime } from "luxon";
|
|
||||||
import * as R from "ramda";
|
|
||||||
import { IIdentifier } from "@veramo/core";
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import TopMessage from "@/components/TopMessage.vue";
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { Account } from "@/db/tables/accounts";
|
|
||||||
import { Contact } from "@/db/tables/contacts";
|
|
||||||
import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
|
|
||||||
import { accessToken } from "@/libs/crypto";
|
|
||||||
import {
|
|
||||||
BVC_MEETUPS_PROJECT_CLAIM_ID,
|
|
||||||
claimSpecialDescription,
|
|
||||||
containsHiddenDid,
|
|
||||||
createAndSubmitConfirmation,
|
|
||||||
createAndSubmitGive,
|
|
||||||
ErrorResult,
|
|
||||||
GenericCredWrapper,
|
|
||||||
GenericVerifiableCredential,
|
|
||||||
} from "@/libs/endorserServer";
|
|
||||||
import * as libsUtil from "@/libs/util";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
methods: { claimSpecialDescription },
|
|
||||||
components: {
|
|
||||||
QuickNav,
|
|
||||||
TopMessage,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class QuickActionBvcBeginView extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
activeDid = "";
|
|
||||||
allContacts: Array<Contact> = [];
|
|
||||||
allMyDids: Array<string> = [];
|
|
||||||
apiServer = "";
|
|
||||||
claimCountWithHidden = 0;
|
|
||||||
claimsToConfirm: GenericCredWrapper[] = [];
|
|
||||||
claimsToConfirmSelected: string[] = [];
|
|
||||||
description = "breakfast";
|
|
||||||
loadingConfirms = true;
|
|
||||||
someoneGave = false;
|
|
||||||
|
|
||||||
async created() {
|
|
||||||
await db.open();
|
|
||||||
const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
|
|
||||||
this.apiServer = settings?.apiServer || "";
|
|
||||||
this.activeDid = settings?.activeDid || "";
|
|
||||||
this.allContacts = await db.contacts.toArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
async mounted() {
|
|
||||||
this.loadingConfirms = true;
|
|
||||||
let currentOrPreviousSat = DateTime.now().setZone("America/Denver");
|
|
||||||
if (currentOrPreviousSat.weekday < 6) {
|
|
||||||
// it's not Saturday or Sunday,
|
|
||||||
// so move back one week before setting to the Saturday
|
|
||||||
currentOrPreviousSat = currentOrPreviousSat.minus({ week: 1 });
|
|
||||||
}
|
|
||||||
const eventStartDateObj = currentOrPreviousSat
|
|
||||||
.set({ weekday: 6 })
|
|
||||||
.set({ hour: 9 })
|
|
||||||
.startOf("hour");
|
|
||||||
|
|
||||||
// Hack, but full ISO pushes the length to 340 which crashes verifyJWT!
|
|
||||||
const todayOrPreviousStartDate =
|
|
||||||
eventStartDateObj.toISO({
|
|
||||||
suppressMilliseconds: true,
|
|
||||||
}) || "";
|
|
||||||
|
|
||||||
await accountsDB.open();
|
|
||||||
const allAccounts = await accountsDB.accounts.toArray();
|
|
||||||
this.allMyDids = allAccounts.map((acc) => acc.did);
|
|
||||||
const account: Account | undefined = await accountsDB.accounts
|
|
||||||
.where("did")
|
|
||||||
.equals(this.activeDid)
|
|
||||||
.first();
|
|
||||||
const identity: IIdentifier = JSON.parse(
|
|
||||||
(account?.identity as string) || "null",
|
|
||||||
);
|
|
||||||
const headers = {
|
|
||||||
Authorization: "Bearer " + (await accessToken(identity)),
|
|
||||||
};
|
|
||||||
try {
|
|
||||||
const response = await fetch(
|
|
||||||
this.apiServer +
|
|
||||||
"/api/claim/?" +
|
|
||||||
"issuedAt_greaterThanOrEqualTo=" +
|
|
||||||
encodeURIComponent(todayOrPreviousStartDate) +
|
|
||||||
"&excludeConfirmations=true",
|
|
||||||
{ headers },
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
console.log("Bad response", response);
|
|
||||||
throw new Error("Bad response when retrieving claims.");
|
|
||||||
}
|
|
||||||
await response.json().then((data) => {
|
|
||||||
const dataByOthers = R.reject(
|
|
||||||
(claim: GenericCredWrapper) => claim.issuer === this.activeDid,
|
|
||||||
data,
|
|
||||||
);
|
|
||||||
const dataByOthersWithoutHidden = R.reject(
|
|
||||||
containsHiddenDid,
|
|
||||||
dataByOthers,
|
|
||||||
);
|
|
||||||
this.claimsToConfirm = dataByOthersWithoutHidden;
|
|
||||||
this.claimCountWithHidden =
|
|
||||||
dataByOthers.length - dataByOthersWithoutHidden.length;
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error:", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "There was an error retrieving today's claims to confirm.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
this.loadingConfirms = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
onClickLoadClaim(jwtId: string) {
|
|
||||||
const route = {
|
|
||||||
path: "/claim/" + encodeURIComponent(jwtId),
|
|
||||||
};
|
|
||||||
this.$router.push(route);
|
|
||||||
}
|
|
||||||
|
|
||||||
async record() {
|
|
||||||
try {
|
|
||||||
const identity = await libsUtil.getIdentity(this.activeDid);
|
|
||||||
|
|
||||||
// in parallel, make a confirmation for each selected claim and send them all to the server
|
|
||||||
const confirmResults = await Promise.allSettled(
|
|
||||||
this.claimsToConfirmSelected.map(async (jwtId) => {
|
|
||||||
const record = this.claimsToConfirm.find(
|
|
||||||
(claim) => claim.id === jwtId,
|
|
||||||
);
|
|
||||||
if (!record) {
|
|
||||||
return { type: "error", error: "Record not found." };
|
|
||||||
}
|
|
||||||
const identity = await libsUtil.getIdentity(this.activeDid);
|
|
||||||
return createAndSubmitConfirmation(
|
|
||||||
identity,
|
|
||||||
record.claim as GenericVerifiableCredential,
|
|
||||||
record.id,
|
|
||||||
record.handleId,
|
|
||||||
this.apiServer,
|
|
||||||
axios,
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
// check for any rejected confirmations
|
|
||||||
const confirmsSucceeded = confirmResults.filter(
|
|
||||||
(result) =>
|
|
||||||
result.status === "fulfilled" && result.value.type === "success",
|
|
||||||
);
|
|
||||||
if (confirmsSucceeded.length < this.claimsToConfirmSelected.length) {
|
|
||||||
console.error("Error sending confirmations:", confirmResults);
|
|
||||||
const howMany = confirmsSucceeded.length === 0 ? "all" : "some";
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: `There was an error sending ${howMany} of the confirmations.`,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// now send the give for the description
|
|
||||||
let giveSucceeded = false;
|
|
||||||
if (this.someoneGave) {
|
|
||||||
const giveResult = await createAndSubmitGive(
|
|
||||||
axios,
|
|
||||||
this.apiServer,
|
|
||||||
identity,
|
|
||||||
undefined,
|
|
||||||
this.activeDid,
|
|
||||||
this.description,
|
|
||||||
undefined,
|
|
||||||
undefined,
|
|
||||||
BVC_MEETUPS_PROJECT_CLAIM_ID,
|
|
||||||
);
|
|
||||||
giveSucceeded = giveResult.type === "success";
|
|
||||||
if (!giveSucceeded) {
|
|
||||||
console.error("Error sending give:", giveResult);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text:
|
|
||||||
(giveResult as ErrorResult)?.error?.userMessage ||
|
|
||||||
"There was an error sending that give.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (confirmsSucceeded.length > 0 || giveSucceeded) {
|
|
||||||
const confirms =
|
|
||||||
confirmsSucceeded.length === 1 ? "confirmation" : "confirmations";
|
|
||||||
const actions =
|
|
||||||
confirmsSucceeded.length > 0 && giveSucceeded
|
|
||||||
? `Your ${confirms} and that give have been recorded.`
|
|
||||||
: giveSucceeded
|
|
||||||
? "That give has been recorded."
|
|
||||||
: "Your " +
|
|
||||||
confirms +
|
|
||||||
" " +
|
|
||||||
(confirmsSucceeded.length === 1 ? "has" : "have") +
|
|
||||||
" been recorded.";
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Success",
|
|
||||||
text: actions,
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
} catch (error: any) {
|
|
||||||
console.error("Error sending claims.", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: error.userMessage || "There was an error sending claims.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
<template>
|
|
||||||
<QuickNav />
|
|
||||||
<TopMessage />
|
|
||||||
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- 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()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-4">
|
|
||||||
Bountiful Voluntaryist Community Actions
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'quick-action-bvc-begin' }"
|
|
||||||
class="block text-center text-md font-bold 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 mt-2 px-2 py-3 rounded-md"
|
|
||||||
>
|
|
||||||
Beginning of Meeting
|
|
||||||
</router-link>
|
|
||||||
<router-link
|
|
||||||
:to="{ name: 'quick-action-bvc-end' }"
|
|
||||||
class="block text-center text-md font-bold 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 mt-2 px-2 py-3 rounded-md"
|
|
||||||
>
|
|
||||||
End of Meeting
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import TopMessage from "@/components/TopMessage.vue";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
components: {
|
|
||||||
QuickNav,
|
|
||||||
TopMessage,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class QuickActionBvcView extends Vue {}
|
|
||||||
</script>
|
|
||||||
@@ -1,282 +0,0 @@
|
|||||||
<template>
|
|
||||||
<QuickNav />
|
|
||||||
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- Breadcrumb -->
|
|
||||||
<div class="mb-8">
|
|
||||||
<!-- 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()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
|
||||||
Area for Nearby Search
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="px-2 py-4">
|
|
||||||
This location is only stored on your device. It is used to show you more
|
|
||||||
appropriate projects but is not stored on any servers.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<button v-if="!searchBox && !isNewMarkerSet" class="m-4 px-4 py-2">
|
|
||||||
Click to Choose a Location for Nearby Search
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
v-if="isNewMarkerSet"
|
|
||||||
class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
|
|
||||||
@click="storeSearchBox"
|
|
||||||
>
|
|
||||||
Store This Location for Nearby Search
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
v-if="searchBox"
|
|
||||||
class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
|
|
||||||
@click="forgetSearchBox"
|
|
||||||
>
|
|
||||||
Delete Stored Location
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
v-if="searchBox"
|
|
||||||
class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
|
|
||||||
@click="resetLatLong"
|
|
||||||
>
|
|
||||||
Reset Marker
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
v-if="isNewMarkerSet"
|
|
||||||
class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
|
|
||||||
@click="isNewMarkerSet = false"
|
|
||||||
>
|
|
||||||
Erase Marker
|
|
||||||
</button>
|
|
||||||
<div v-if="isNewMarkerSet">
|
|
||||||
Click on the pin to erase it. Click anywhere else to set a different
|
|
||||||
different corner.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-4 aspect-video">
|
|
||||||
<l-map
|
|
||||||
ref="map"
|
|
||||||
:center="[localCenterLat, localCenterLong]"
|
|
||||||
class="!z-40 rounded-md"
|
|
||||||
v-model:zoom="localZoom"
|
|
||||||
@click="setMapPoint"
|
|
||||||
>
|
|
||||||
<l-tile-layer
|
|
||||||
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
|
|
||||||
layer-type="base"
|
|
||||||
name="OpenStreetMap"
|
|
||||||
/>
|
|
||||||
<l-marker
|
|
||||||
v-if="isNewMarkerSet"
|
|
||||||
:lat-lng="[localCenterLat, localCenterLong]"
|
|
||||||
@click="isNewMarkerSet = false"
|
|
||||||
/>
|
|
||||||
<l-rectangle
|
|
||||||
v-if="isNewMarkerSet"
|
|
||||||
:bounds="[
|
|
||||||
[localCenterLat - localLatDiff, localCenterLong - localLongDiff],
|
|
||||||
[localCenterLat + localLatDiff, localCenterLong + localLongDiff],
|
|
||||||
]"
|
|
||||||
:weight="1"
|
|
||||||
/>
|
|
||||||
</l-map>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { LeafletMouseEvent } from "leaflet";
|
|
||||||
import "leaflet/dist/leaflet.css";
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
import {
|
|
||||||
LMap,
|
|
||||||
LMarker,
|
|
||||||
LRectangle,
|
|
||||||
LTileLayer,
|
|
||||||
} from "@vue-leaflet/vue-leaflet";
|
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { db } from "@/db/index";
|
|
||||||
import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
|
||||||
|
|
||||||
const DEFAULT_LAT_LONG_DIFF = 0.01;
|
|
||||||
const WORLD_ZOOM = 2;
|
|
||||||
const DEFAULT_ZOOM = 2;
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
components: {
|
|
||||||
QuickNav,
|
|
||||||
LRectangle,
|
|
||||||
LMap,
|
|
||||||
LMarker,
|
|
||||||
LTileLayer,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class DiscoverView extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
isChoosingSearchBox = false;
|
|
||||||
isNewMarkerSet = false;
|
|
||||||
|
|
||||||
// "local" vars are for the currently selected map box
|
|
||||||
localCenterLat = 0;
|
|
||||||
localCenterLong = 0;
|
|
||||||
localLatDiff = DEFAULT_LAT_LONG_DIFF;
|
|
||||||
localLongDiff = DEFAULT_LAT_LONG_DIFF;
|
|
||||||
localZoom = DEFAULT_ZOOM;
|
|
||||||
|
|
||||||
// searchBox reflects what is stored in the database
|
|
||||||
searchBox: { name: string; bbox: BoundingBox } | null = null;
|
|
||||||
|
|
||||||
async mounted() {
|
|
||||||
await db.open();
|
|
||||||
const settings = await db.settings.get(MASTER_SETTINGS_KEY);
|
|
||||||
this.searchBox = settings?.searchBoxes?.[0] || null;
|
|
||||||
this.resetLatLong();
|
|
||||||
}
|
|
||||||
|
|
||||||
setMapPoint(event: LeafletMouseEvent) {
|
|
||||||
if (this.isNewMarkerSet) {
|
|
||||||
this.localLatDiff = Math.abs(event.latlng.lat - this.localCenterLat);
|
|
||||||
this.localLongDiff = Math.abs(event.latlng.lng - this.localCenterLong);
|
|
||||||
} else {
|
|
||||||
// marker is not set
|
|
||||||
this.localCenterLat = event.latlng.lat;
|
|
||||||
this.localCenterLong = event.latlng.lng;
|
|
||||||
|
|
||||||
let latDiff = DEFAULT_LAT_LONG_DIFF;
|
|
||||||
let longDiff = DEFAULT_LAT_LONG_DIFF;
|
|
||||||
// Guess at a size for the bounding box.
|
|
||||||
// This doesn't seem like the right approach but it's the only way I can find to get the screen bounds.
|
|
||||||
const bounds = event.target.boxZoom?._map?.getBounds();
|
|
||||||
if (bounds) {
|
|
||||||
latDiff = Math.abs(bounds._northEast.lat - bounds._southWest.lat) / 8;
|
|
||||||
longDiff = Math.abs(bounds._northEast.lng - bounds._southWest.lng) / 8;
|
|
||||||
}
|
|
||||||
this.localLatDiff = latDiff;
|
|
||||||
this.localLongDiff = longDiff;
|
|
||||||
this.isNewMarkerSet = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public resetLatLong() {
|
|
||||||
if (this.searchBox?.bbox) {
|
|
||||||
const bbox = this.searchBox.bbox;
|
|
||||||
this.localCenterLat = (bbox.maxLat + bbox.minLat) / 2;
|
|
||||||
this.localCenterLong = (bbox.eastLong + bbox.westLong) / 2;
|
|
||||||
this.localLatDiff = (bbox.maxLat - bbox.minLat) / 2;
|
|
||||||
this.localLongDiff = (bbox.eastLong - bbox.westLong) / 2;
|
|
||||||
this.localZoom = WORLD_ZOOM;
|
|
||||||
this.isNewMarkerSet = true;
|
|
||||||
} else {
|
|
||||||
this.isNewMarkerSet = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async storeSearchBox() {
|
|
||||||
if (this.localCenterLong || this.localCenterLat) {
|
|
||||||
try {
|
|
||||||
const newSearchBox = {
|
|
||||||
name: "Local",
|
|
||||||
bbox: {
|
|
||||||
eastLong: this.localCenterLong + this.localLongDiff,
|
|
||||||
maxLat: this.localCenterLat + this.localLatDiff,
|
|
||||||
minLat: this.localCenterLat - this.localLatDiff,
|
|
||||||
westLong: this.localCenterLong - this.localLongDiff,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
await db.open();
|
|
||||||
db.settings.update(MASTER_SETTINGS_KEY, {
|
|
||||||
searchBoxes: [newSearchBox],
|
|
||||||
});
|
|
||||||
this.searchBox = newSearchBox;
|
|
||||||
this.isChoosingSearchBox = false;
|
|
||||||
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Saved",
|
|
||||||
text: "That has been saved in your preferences. You can now filter by it on your home screen feed.",
|
|
||||||
},
|
|
||||||
7000,
|
|
||||||
);
|
|
||||||
this.$router.back();
|
|
||||||
} catch (err) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error Updating Search Settings",
|
|
||||||
text: "Try going to a different page and then coming back.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
console.error(
|
|
||||||
"Telling user to retry the location search setting because:",
|
|
||||||
err,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "warning",
|
|
||||||
title: "No Location Selected",
|
|
||||||
text: "Select a location on the map.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async forgetSearchBox() {
|
|
||||||
try {
|
|
||||||
await db.open();
|
|
||||||
db.settings.update(MASTER_SETTINGS_KEY, {
|
|
||||||
searchBoxes: [],
|
|
||||||
filterFeedByNearby: false,
|
|
||||||
});
|
|
||||||
this.searchBox = null;
|
|
||||||
this.localCenterLat = 0;
|
|
||||||
this.localCenterLong = 0;
|
|
||||||
this.localLatDiff = DEFAULT_LAT_LONG_DIFF;
|
|
||||||
this.localLongDiff = DEFAULT_LAT_LONG_DIFF;
|
|
||||||
this.localZoom = DEFAULT_ZOOM;
|
|
||||||
this.isChoosingSearchBox = false;
|
|
||||||
this.isNewMarkerSet = false;
|
|
||||||
} catch (err) {
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error Updating Search Settings",
|
|
||||||
text: "Try going to a different page and then coming back.",
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
);
|
|
||||||
console.error(
|
|
||||||
"Telling user to retry the location search setting because:",
|
|
||||||
err,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public cancelSearchBoxSelect() {
|
|
||||||
this.isChoosingSearchBox = false;
|
|
||||||
this.localZoom = WORLD_ZOOM;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,17 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav selected="Profile" />
|
<QuickNav selected="Profile"></QuickNav>
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- 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()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
<!-- Heading -->
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
Seed Backup
|
Seed Backup
|
||||||
@@ -22,7 +12,7 @@
|
|||||||
<span>
|
<span>
|
||||||
<router-link
|
<router-link
|
||||||
:to="{ name: 'help' }"
|
: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"
|
class="text-xs uppercase bg-blue-500 text-white px-1.5 py-1 rounded-md ml-1"
|
||||||
>
|
>
|
||||||
Help
|
Help
|
||||||
</router-link>
|
</router-link>
|
||||||
@@ -39,16 +29,16 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p v-if="numAccounts > 1">
|
<p v-if="numAccounts > 1">
|
||||||
<b class="text-orange-600">Note:</b> You have more than one identifier
|
<b class="text-orange-600">Note:</b> You have more than one identity
|
||||||
stored in this browser. If they are all based on the same seed as the
|
stored in this browser. If they are all based on the same seed as the
|
||||||
current identifier, this one backup is sufficient; however, if you have
|
current identity, this one backup is sufficient; however, if you have
|
||||||
different seeds for other identifiers, you will have to back them up
|
different seeds for other identities, you will have to back them up
|
||||||
separately.
|
separately.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div class="bg-slate-100 rounded-md overflow-hidden p-4 mb-4">
|
<div class="bg-slate-100 rounded-md overflow-hidden p-4 mb-4">
|
||||||
<button
|
<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-1.5 py-2 rounded-md"
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
|
||||||
@click="showSeedPhrase"
|
@click="showSeedPhrase"
|
||||||
>
|
>
|
||||||
Reveal my Seed Phrase
|
Reveal my Seed Phrase
|
||||||
@@ -59,28 +49,20 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>You do not have an active identifier.</div>
|
<div v-else>You do not have an active identity.</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
|
import { accountsDB, db } from "@/db";
|
||||||
import * as R from "ramda";
|
import * as R from "ramda";
|
||||||
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
import { accountsDB, db } from "@/db/index";
|
|
||||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
|
import QuickNav from "@/components/QuickNav";
|
||||||
interface Account {
|
|
||||||
mnemonic: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({ components: { QuickNav } })
|
@Component({ components: { QuickNav } })
|
||||||
export default class SeedBackupView extends Vue {
|
export default class SeedBackupView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
activeAccount = null;
|
||||||
|
|
||||||
activeAccount: Account | null | undefined = null;
|
|
||||||
numAccounts = 0;
|
numAccounts = 0;
|
||||||
showSeed = false;
|
showSeed = false;
|
||||||
|
|
||||||
@@ -95,8 +77,8 @@ export default class SeedBackupView extends Vue {
|
|||||||
const accounts = await accountsDB.accounts.toArray();
|
const accounts = await accountsDB.accounts.toArray();
|
||||||
this.numAccounts = accounts.length;
|
this.numAccounts = accounts.length;
|
||||||
this.activeAccount = R.find((acc) => acc.did === activeDid, accounts);
|
this.activeAccount = R.find((acc) => acc.did === activeDid, accounts);
|
||||||
} catch (err: unknown) {
|
} catch (err) {
|
||||||
console.error("Got an error loading an identifier:", err);
|
console.error("Got an error loading an identity:", err);
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
|
|||||||
@@ -3,67 +3,41 @@
|
|||||||
id="Content"
|
id="Content"
|
||||||
class="p-6 pb-24 min-h-screen flex flex-col justify-center"
|
class="p-6 pb-24 min-h-screen flex flex-col justify-center"
|
||||||
>
|
>
|
||||||
<!-- Breadcrumb -->
|
<!-- Heading -->
|
||||||
<div>
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
<!-- Back -->
|
Start Here
|
||||||
<div class="text-lg text-center font-light relative px-7">
|
</h1>
|
||||||
<h1
|
|
||||||
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
|
||||||
@click="$router.back()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
<div class="mt-8">
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
<p class="text-center text-xl mb-4 font-light">
|
||||||
Start Here
|
Do you have an identity to import?
|
||||||
</h1>
|
</p>
|
||||||
</div>
|
<a
|
||||||
|
@click="onClickYes()"
|
||||||
<!-- id used by puppeteer test script -->
|
class="block w-full text-center text-lg uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
|
||||||
<div id="start-question" class="mt-8">
|
>
|
||||||
<div class="max-w-3xl mx-auto">
|
No
|
||||||
<p class="text-center text-xl font-light">
|
</a>
|
||||||
Do you want a new identifier of your own?
|
<a
|
||||||
</p>
|
@click="onClickNo()"
|
||||||
<p class="text-center font-light">
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
|
||||||
If you haven't used this before, click "Yes" to generate a new
|
>
|
||||||
identifier.
|
Yes
|
||||||
</p>
|
</a>
|
||||||
<p class="text-center mb-4 font-light">
|
<a
|
||||||
Only click "No" if you have a seed of 12 or 24 words generated
|
v-if="numAccounts > 0"
|
||||||
elsewhere.
|
@click="onClickDerive()"
|
||||||
</p>
|
class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
|
||||||
<a
|
>
|
||||||
@click="onClickYes()"
|
Derive New Address from Seed Imported Previously
|
||||||
class="block w-full text-center text-lg 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-2 py-3 rounded-md mb-2"
|
</a>
|
||||||
>
|
|
||||||
Yes, generate one
|
|
||||||
</a>
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
|
||||||
<a
|
|
||||||
@click="onClickNo()"
|
|
||||||
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-1.5 py-2 rounded-md"
|
|
||||||
>
|
|
||||||
No, I have a seed
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
v-if="numAccounts > 0"
|
|
||||||
@click="onClickDerive()"
|
|
||||||
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-1.5 py-2 rounded-md"
|
|
||||||
>
|
|
||||||
Derive new address from existing seed
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { accountsDB } from "@/db/index";
|
import { accountsDB } from "@/db";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {},
|
components: {},
|
||||||
|
|||||||
@@ -1,29 +1,15 @@
|
|||||||
<template>
|
<template>
|
||||||
<QuickNav />
|
<QuickNav selected="Profile"></QuickNav>
|
||||||
|
|
||||||
<!-- CONTENT -->
|
<!-- CONTENT -->
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
<section id="Content" class="p-6 pb-24">
|
||||||
<!-- Breadcrumb -->
|
<!-- Heading -->
|
||||||
<div class="mb-8">
|
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
||||||
<!-- Back -->
|
Achievements & Statistics
|
||||||
<div class="text-lg text-center font-light relative px-7">
|
</h1>
|
||||||
<h1
|
|
||||||
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
|
|
||||||
@click="$router.back()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
|
||||||
Achievements & Statistics
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
Here is a view of the activity you can see.
|
Here is a view of the activity you can see.
|
||||||
<ul class="list-disc outside ml-4">
|
<ul class="list-disc list-inside">
|
||||||
<li>Each identity and claim has a unique position.</li>
|
<li>Each identity and claim has a unique position.</li>
|
||||||
<!-- eslint-disable prettier/prettier --><!-- If we format prettier then there is extra space at the start of the line. -->
|
<!-- eslint-disable prettier/prettier --><!-- If we format prettier then there is extra space at the start of the line. -->
|
||||||
<li>Each will show at their time of appearance relative to all others.</li>
|
<li>Each will show at their time of appearance relative to all others.</li>
|
||||||
@@ -46,32 +32,20 @@
|
|||||||
{{ worldProperties.animationDurationSeconds }} seconds
|
{{ worldProperties.animationDurationSeconds }} seconds
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button class="float-right text-blue-600" @click="captureGraphics()">Screenshot</button>
|
<button class="float-right" @click="captureGraphics()">Screenshot</button>
|
||||||
<div id="scene-container" class="h-screen"></div>
|
<div id="scene-container" class="h-screen"></div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { SVGRenderer } from "three/examples/jsm/renderers/SVGRenderer.js";
|
import { SVGRenderer } from "three/addons/renderers/SVGRenderer.js";
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
|
|
||||||
import { World } from "@/components/World/World.js";
|
import { World } from "@/components/World/World.js";
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
import QuickNav from "@/components/QuickNav";
|
||||||
import { NotificationIface } from "@/constants/app";
|
|
||||||
|
|
||||||
interface RendererSVGType {
|
|
||||||
domElement: Element;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Dictionary<T> {
|
|
||||||
[key: string]: T;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({ components: { World, QuickNav } })
|
@Component({ components: { World, QuickNav } })
|
||||||
export default class StatisticsView extends Vue {
|
export default class StatisticsView extends Vue {
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
world: World;
|
world: World;
|
||||||
worldProperties: Dictionary<number> = {};
|
worldProperties: WorldProperties = {};
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
try {
|
try {
|
||||||
@@ -79,14 +53,14 @@ export default class StatisticsView extends Vue {
|
|||||||
const newWorld = new World(container, this);
|
const newWorld = new World(container, this);
|
||||||
newWorld.start();
|
newWorld.start();
|
||||||
this.world = newWorld;
|
this.world = newWorld;
|
||||||
} catch (err: unknown) {
|
} catch (err) {
|
||||||
const error = err as Error;
|
console.log(err);
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Mounting Error",
|
title: "Mounting Error",
|
||||||
text: error.message,
|
text: err.message,
|
||||||
},
|
},
|
||||||
-1,
|
-1,
|
||||||
);
|
);
|
||||||
@@ -104,12 +78,12 @@ export default class StatisticsView extends Vue {
|
|||||||
ExportToSVG(rendererSVG, "test.svg");
|
ExportToSVG(rendererSVG, "test.svg");
|
||||||
}
|
}
|
||||||
|
|
||||||
public setWorldProperty(propertyName: string, propertyValue: number) {
|
public setWorldProperty(propertyName, propertyValue) {
|
||||||
this.worldProperties[propertyName] = propertyValue;
|
this.worldProperties[propertyName] = propertyValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function ExportToSVG(rendererSVG: RendererSVGType, filename: string) {
|
function ExportToSVG(rendererSVG, filename) {
|
||||||
const XMLS = new XMLSerializer();
|
const XMLS = new XMLSerializer();
|
||||||
const svgfile = XMLS.serializeToString(rendererSVG.domElement);
|
const svgfile = XMLS.serializeToString(rendererSVG.domElement);
|
||||||
const svgData = svgfile;
|
const svgData = svgfile;
|
||||||
|
|||||||
@@ -1,165 +0,0 @@
|
|||||||
<template>
|
|
||||||
<QuickNav />
|
|
||||||
|
|
||||||
<!-- CONTENT -->
|
|
||||||
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
|
|
||||||
<!-- Breadcrumb -->
|
|
||||||
<div class="mb-8">
|
|
||||||
<!-- 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()"
|
|
||||||
>
|
|
||||||
<fa icon="chevron-left" class="fa-fw"></fa>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Heading -->
|
|
||||||
<h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
|
|
||||||
Test
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-8">
|
|
||||||
<h2 class="text-xl font-bold mb-4">Notiwind Alert Test Suite</h2>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: 'alert',
|
|
||||||
type: 'toast',
|
|
||||||
text: 'I\'m a toast. Without a timeout, I\'m stuck.',
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="font-bold uppercase bg-slate-900 text-white px-3 py-2 rounded-md mr-2"
|
|
||||||
>
|
|
||||||
Toast
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: 'alert',
|
|
||||||
type: 'info',
|
|
||||||
title: 'Information Alert',
|
|
||||||
text: 'Just wanted you to know.',
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
|
|
||||||
>
|
|
||||||
Info
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: 'alert',
|
|
||||||
type: 'success',
|
|
||||||
title: 'Success Alert',
|
|
||||||
text: 'Congratulations!',
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="font-bold uppercase bg-emerald-600 text-white px-3 py-2 rounded-md mr-2"
|
|
||||||
>
|
|
||||||
Success
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: 'alert',
|
|
||||||
type: 'warning',
|
|
||||||
title: 'Warning Alert',
|
|
||||||
text: 'You might wanna look at this.',
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="font-bold uppercase bg-amber-600 text-white px-3 py-2 rounded-md mr-2"
|
|
||||||
>
|
|
||||||
Warning
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: 'alert',
|
|
||||||
type: 'danger',
|
|
||||||
title: 'Danger Alert',
|
|
||||||
text: 'Something terrible has happened!',
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="font-bold uppercase bg-rose-600 text-white px-3 py-2 rounded-md mr-2"
|
|
||||||
>
|
|
||||||
Danger
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: 'modal',
|
|
||||||
type: 'notification-permission',
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
|
|
||||||
>
|
|
||||||
Notif ON
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: 'modal',
|
|
||||||
type: 'notification-mute',
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
|
|
||||||
>
|
|
||||||
Notif MUTE
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
@click="
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: 'modal',
|
|
||||||
type: 'notification-off',
|
|
||||||
},
|
|
||||||
-1,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
|
|
||||||
>
|
|
||||||
Notif OFF
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
import QuickNav from "@/components/QuickNav.vue";
|
|
||||||
|
|
||||||
@Component({ components: { QuickNav } })
|
|
||||||
export default class Help extends Vue {}
|
|
||||||
</script>
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/**
|
|
||||||
* We've seen cases where the functions inside safari-notifications.js are not found.
|
|
||||||
* This is our attempt to ensure that all the functions are available.
|
|
||||||
*/
|
|
||||||
|
|
||||||
const fs = require("fs");
|
|
||||||
const path = require("path");
|
|
||||||
|
|
||||||
const swScriptsDir = path.resolve(__dirname, "sw_scripts");
|
|
||||||
const outputFile = path.resolve(__dirname, "sw_scripts-combined.js");
|
|
||||||
|
|
||||||
// Read all files in the sw_scripts directory
|
|
||||||
fs.readdir(swScriptsDir, (err, files) => {
|
|
||||||
if (err) {
|
|
||||||
console.error("Error reading directory:", err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Combine files content into one script
|
|
||||||
const combinedContent = files
|
|
||||||
.filter((file) => path.extname(file) === ".js")
|
|
||||||
.map((file) => fs.readFileSync(path.join(swScriptsDir, file), "utf8"))
|
|
||||||
.join("\n");
|
|
||||||
|
|
||||||
// Write the combined content to the output file
|
|
||||||
fs.writeFileSync(outputFile, combinedContent, "utf8");
|
|
||||||
|
|
||||||
console.log("Service worker files combined.");
|
|
||||||
});
|
|
||||||