+
+
diff --git a/src/views/ImportAccountView.vue b/src/views/ImportAccountView.vue
index e3ffdf2da..e185c97a8 100644
--- a/src/views/ImportAccountView.vue
+++ b/src/views/ImportAccountView.vue
@@ -56,19 +56,21 @@
Settings
-
+
Troubleshoot your notification setup.
+
+
+ Set Search Area…
+
+
+
+
+ Topics of Interest
+
+
+
+ Separate topics with a comma.
+
- = [];
+ giveRecords: Array = [];
numAccounts = 0;
async beforeCreate() {
@@ -197,7 +197,7 @@ export default class ContactAmountssView extends Vue {
async loadGives(activeDid: string, contact: Contact) {
try {
const identity = await this.getIdentity(this.activeDid);
- let result: Array = [];
+ let result: Array = [];
const url =
this.apiServer +
"/api/v2/report/gives?agentDid=" +
@@ -252,7 +252,7 @@ export default class ContactAmountssView extends Vue {
);
}
- const sortedResult: Array = R.sort(
+ const sortedResult: Array = R.sort(
(a, b) =>
new Date(b.issuedAt).getTime() - new Date(a.issuedAt).getTime(),
result,
@@ -271,7 +271,7 @@ export default class ContactAmountssView extends Vue {
}
}
- async confirm(record: GiveServerRecord) {
+ async confirm(record: GiveSummaryRecord) {
// Make claim
// I use clone here because otherwise it gets a Proxy object.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/views/ContactScanView.vue b/src/views/ContactScanView.vue
index 9ca3b0bf1..7a8a87d9a 100644
--- a/src/views/ContactScanView.vue
+++ b/src/views/ContactScanView.vue
@@ -65,17 +65,19 @@
/>
,
confirmed: Record,
unconfirmed: Record,
@@ -510,18 +511,6 @@ export default class ContactsView extends Vue {
}
}
- showHintsForOnboarding() {
- this.$notify(
- {
- group: "alert",
- type: "info",
- title: "Onboard Someone",
- text: libsUtil.ONBOARD_MESSAGE,
- },
- -1,
- );
- }
-
async onClickNewContact(): Promise {
if (!this.contactInput) {
this.$notify(
@@ -531,7 +520,7 @@ export default class ContactsView extends Vue {
title: "No Contact",
text: "There was no contact info to add.",
},
- -1,
+ 3000,
);
return;
}
@@ -559,7 +548,7 @@ export default class ContactsView extends Vue {
title: "Contacts Added",
text: "Each contact was added. Nothing was sent to the server.",
},
- -1, // keeping it up so that the "visibility" message is seen
+ 3000, // keeping it up so that the "visibility" message is seen
);
} catch (e) {
this.$notify(
@@ -664,7 +653,7 @@ export default class ContactsView extends Vue {
title: "No Contact Info",
text: "The contact info could not be parsed.",
},
- -1,
+ 3000,
);
return;
} else {
@@ -686,7 +675,7 @@ export default class ContactsView extends Vue {
title: "Incomplete Contact",
text: "Cannot add a contact without a DID.",
},
- -1,
+ 5000,
);
return;
}
@@ -698,7 +687,7 @@ export default class ContactsView extends Vue {
title: "Invalid DID",
text: "The DID is not valid. It must begin with 'did:'",
},
- -1,
+ 5000,
);
return;
}
@@ -737,7 +726,7 @@ export default class ContactsView extends Vue {
title: "Contact Added",
text: addedMessage,
},
- -1, // keeping it up so that the "visibility" message is seen
+ 3000,
);
})
.catch((err) => {
@@ -853,7 +842,7 @@ export default class ContactsView extends Vue {
title: "Registration Still Unknown",
text: message,
},
- -1,
+ 5000,
);
} else if (resp.data?.success?.handleId) {
contact.registered = true;
@@ -892,7 +881,7 @@ export default class ContactsView extends Vue {
title: "Registration Error",
text: userMessage,
},
- -1,
+ 5000,
);
}
}
@@ -933,7 +922,7 @@ export default class ContactsView extends Vue {
(visibility ? "" : "not ") +
"see your activity.",
},
- -1,
+ 3000,
);
}
contact.seesMe = visibility;
@@ -953,7 +942,7 @@ export default class ContactsView extends Vue {
title: "Error Setting Visibility",
text: message,
},
- -1,
+ 5000,
);
}
} catch (err) {
@@ -965,7 +954,7 @@ export default class ContactsView extends Vue {
title: "Error Setting Visibility",
text: "Check connectivity and try again.",
},
- -1,
+ 5000,
);
}
}
@@ -997,7 +986,7 @@ export default class ContactsView extends Vue {
(visibility ? "" : "not ") +
"see your activity.",
},
- -1,
+ 3000,
);
} else {
console.error("Got bad server response checking visibility:", resp);
@@ -1009,7 +998,7 @@ export default class ContactsView extends Vue {
title: "Error Checking Visibility",
text: message,
},
- -1,
+ 5000,
);
}
} catch (err) {
@@ -1021,7 +1010,7 @@ export default class ContactsView extends Vue {
title: "Error Checking Visibility",
text: "Check connectivity and try again.",
},
- -1,
+ 3000,
);
}
}
@@ -1069,7 +1058,7 @@ export default class ContactsView extends Vue {
title: "Input Error",
text: "This is not a valid number of hours: " + this.hourInput,
},
- -1,
+ 3000,
);
} else if (parseFloat(this.hourInput) == 0 && !this.hourDescriptionInput) {
this.$notify(
@@ -1079,7 +1068,7 @@ export default class ContactsView extends Vue {
title: "Input Error",
text: "Giving no hours or description does nothing.",
},
- -1,
+ 3000,
);
} else if (!identity) {
this.$notify(
@@ -1089,7 +1078,7 @@ export default class ContactsView extends Vue {
title: "Status Error",
text: "No identifier is available.",
},
- -1,
+ 3000,
);
} else {
// ask to confirm amount
@@ -1218,7 +1207,7 @@ export default class ContactsView extends Vue {
title: "Error Sending Give",
text: userMessage,
},
- -1,
+ 5000,
);
}
}
diff --git a/src/views/GiftedDetails.vue b/src/views/GiftedDetails.vue
index 0d3c16726..5b911aefe 100644
--- a/src/views/GiftedDetails.vue
+++ b/src/views/GiftedDetails.vue
@@ -92,19 +92,26 @@
+
+
+
+
+
diff --git a/src/views/HelpView.vue b/src/views/HelpView.vue
index b822b7f43..60a7b4897 100644
--- a/src/views/HelpView.vue
+++ b/src/views/HelpView.vue
@@ -39,22 +39,22 @@
and network.
To start scanning, go
here.
@@ -198,9 +198,7 @@
- Usage Limits
+ Usage Limits
Checking…
-
Download Settings & Contacts
@@ -221,7 +245,7 @@
If no download happened yet, click again here to download now.
@@ -503,7 +527,7 @@
Data Export
+ Data Export
-
-
+
diff --git a/src/views/ContactAmountsView.vue b/src/views/ContactAmountsView.vue
index a6fc0ff98..1d3654ab7 100644
--- a/src/views/ContactAmountsView.vue
+++ b/src/views/ContactAmountsView.vue
@@ -119,7 +119,7 @@ import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
import { accessToken, SimpleSigner } from "@/libs/crypto";
import {
AgreeVerifiableCredential,
- GiveServerRecord,
+ GiveSummaryRecord,
GiveVerifiableCredential,
SCHEMA_ORG_CONTEXT,
} from "@/libs/endorserServer";
@@ -131,7 +131,7 @@ export default class ContactAmountssView extends Vue {
activeDid = "";
apiServer = "";
contact: Contact | null = null;
- giveRecords: Array
+
+
+
-
-
+
diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue
index 5cf644d4d..f7391ec47 100644
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -10,7 +10,8 @@
Onboarding Guide
@@ -302,7 +303,7 @@ import {
import {
CONTACT_CSV_HEADER,
CONTACT_URL_PREFIX,
- GiveServerRecord,
+ GiveSummaryRecord,
GiveVerifiableCredential,
isDid,
RegisterVerifiableCredential,
@@ -409,7 +410,7 @@ export default class ContactsView extends Vue {
}
const handleResponse = (
- resp: { status: number; data: { data: GiveServerRecord[] } },
+ resp: { status: number; data: { data: GiveSummaryRecord[] } },
descriptions: Record
+
+
+
Sign & Send to publish to the world
+
+
+
+
@@ -288,27 +295,6 @@ export default class GiftedDetails extends Vue {
}
async confirm() {
- 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() {
if (!this.activeDid) {
this.$notify(
{
@@ -317,12 +303,23 @@ export default class GiftedDetails extends Vue {
title: "Error",
text: "You must select an identifier before you can record a give.",
},
- -1,
+ 2000,
);
return;
}
-
- if (!this.description && !this.amountInput) {
+ 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",
@@ -332,11 +329,33 @@ export default class GiftedDetails extends Vue {
this.libsUtil.UNIT_LONG[this.unitCode]
}.`,
},
- -1,
+ 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(
@@ -424,5 +443,17 @@ export default class GiftedDetails extends Vue {
result.response?.data?.error?.message
);
}
+
+ explainData() {
+ this.$notify(
+ {
+ group: "alert",
+ type: "success",
+ title: "Data Sharing",
+ text: libsUtil.PRIVACY_MESSAGE,
+ },
+ -1,
+ );
+ }
}
diff --git a/src/views/HelpNotificationsView.vue b/src/views/HelpNotificationsView.vue
index 3314dc2c6..313e88b6a 100644
--- a/src/views/HelpNotificationsView.vue
+++ b/src/views/HelpNotificationsView.vue
@@ -301,12 +301,13 @@ import { sendTestThroughPushServer } from "@/libs/util";
export default class HelpNotificationsView extends Vue {
$notify!: (notification: NotificationIface, timeout?: number) => void;
- subscription: PushSubscription | null = null;
+ subscriptionJSON?: PushSubscriptionJSON;
async mounted() {
try {
const registration = await navigator.serviceWorker.ready;
- this.subscription = await registration.pushManager.getSubscription();
+ const fullSub = await registration.pushManager.getSubscription();
+ this.subscriptionJSON = fullSub?.toJSON();
} catch (error) {
console.error("Mount error:", error);
}
@@ -315,13 +316,13 @@ export default class HelpNotificationsView extends Vue {
alertWebPushSubscription() {
console.log(
"Web push subscription:",
- JSON.parse(JSON.stringify(this.subscription)), // gives more info than plain console logging
+ JSON.parse(JSON.stringify(this.subscriptionJSON)), // gives more info than plain console logging
);
- alert(JSON.stringify(this.subscription));
+ alert(JSON.stringify(this.subscriptionJSON));
}
async sendTestWebPushMessage(skipFilter: boolean = false) {
- if (!this.subscription) {
+ if (!this.subscriptionJSON) {
this.$notify(
{
group: "alert",
@@ -336,7 +337,7 @@ export default class HelpNotificationsView extends Vue {
}
try {
- await sendTestThroughPushServer(this.subscription, skipFilter);
+ await sendTestThroughPushServer(this.subscriptionJSON, skipFilter);
this.$notify(
{
diff --git a/src/views/HelpOnboardingView.vue b/src/views/HelpOnboardingView.vue
new file mode 100644
index 000000000..e6c6b116d
--- /dev/null
+++ b/src/views/HelpOnboardingView.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+ + Time Safari Onboarding Instructions +
+
+
+
+ Install
+
+
+
+ + 1) Have them visit TimeSafari.app in a browser, preferably Chrome or Safari. +
++ 2) Have them "Install" the site to their desktop. +
+Add Contact & Register
+
+
+
+ + 3) Have them follow their yellow prompts. +
+
+ 4) Add them to your contacts
+ 5) Register them
+ 6) Add yourself to their contacts
Enable Notifications
+
+
+
+
+ 7) Enable notifications from
Discuss Backups
+
+
+
+
+ 8) Exporting backups
- You can show giving and also offer help to ideas, based on others' - willingness to help out, too. You can record your own ideas and invite - others to collaborate. + You highlight giving and also offer help to ideas -- which could be + conditional on others' willingness to help, too. + You can record your own ideas and invite others to collaborate.
This app uses the power of cryptography to build a reputation, recording activity that you can share at your discretion. You put some activity - public, but your sensitive information is not shared with anyone, - including our services. This is in contrast to Meta and Google, who hold - your data and allow you use it. Those services are useful, but they have - the control; this app gives you the control. + public, but these services don't share your ID with others without explicit consent. + This is in contrast to Meta and Google, who hold + your data and allow you use it while they manage sharing... + those services are useful but they have the control, whereas this app gives you the control.
How do I get started?
- You need someone to register you -- usually the person who told you
+ You need someone to register you, like the person who told you
about this app, on the Contacts
How do I add someone else?
- +
- Chrome: - clear here + Clear at chrome://settings/content/all and also clear under dev tools Application
-
@@ -378,7 +376,6 @@ import { Component, Vue } from "vue-facing-decorator";
import * as Package from "../../package.json";
import QuickNav from "@/components/QuickNav.vue";
import { NotificationIface } from "@/constants/app";
-import { ONBOARD_MESSAGE } from "@/libs/util";
@Component({ components: { QuickNav } })
export default class Help extends Vue {
@@ -386,17 +383,5 @@ export default class Help extends Vue {
package = Package;
commitHash = import.meta.env.VITE_GIT_HASH;
-
- showOnboardInfo() {
- this.$notify(
- {
- group: "alert",
- type: "info",
- title: "Onboard Someone",
- text: ONBOARD_MESSAGE,
- },
- -1,
- );
- }
}
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index fb5b030f4..66511dbd8 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -118,7 +118,9 @@
Record Something Given By:
-
+
-
@@ -172,10 +174,29 @@
showGivenToUser="true"
/>
+ -+Latest Activity
++Latest Activity
+ +-
@@ -238,11 +258,17 @@
Loading…
++ No claims match your filters. +
+ -
@@ -238,11 +258,17 @@
-
-
+
diff --git a/src/views/ImportDerivedAccountView.vue b/src/views/ImportDerivedAccountView.vue
index 1505620e3..09dbb51c2 100644
--- a/src/views/ImportDerivedAccountView.vue
+++ b/src/views/ImportDerivedAccountView.vue
@@ -49,19 +49,21 @@
+
+
+
-
-
+
diff --git a/src/views/NewEditAccountView.vue b/src/views/NewEditAccountView.vue
index a3f1435ea..cae8c7d68 100644
--- a/src/views/NewEditAccountView.vue
+++ b/src/views/NewEditAccountView.vue
@@ -22,21 +22,23 @@
/>
+
+
+
-
-
-
+
diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue
index cceaaafb2..b2392b222 100644
--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -73,16 +73,17 @@
/>
-
+
+
+
+
-
-
+
-
@@ -265,6 +268,8 @@ export default class NewEditProjectView extends Vue {
vcClaim.agent = {
identifier: this.agentDid,
};
+ } else {
+ delete vcClaim.agent;
}
if (this.includeLocation) {
vcClaim.location = {
@@ -274,6 +279,8 @@ export default class NewEditProjectView extends Vue {
longitude: this.longitude,
},
};
+ } else {
+ delete vcClaim.location;
}
// Make a payload for the claim
const vcPayload = {
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index 1968953db..b46024587 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -98,7 +98,7 @@
+
+
For your security, choose a location nearby but not exactly at the place. -
Record a contribution from:
-
+
-
-
+ --+ @@ -360,11 +362,11 @@ import { accessToken } from "@/libs/crypto"; import * as libsUtil from "@/libs/util"; import { BLANK_GENERIC_SERVER_RECORD, - GenericServerRecord, + GenericCredWrapper, GiverInputInfo, - GiveServerRecord, - OfferServerRecord, - PlanServerRecord, + GiveSummaryRecord, + OfferSummaryRecord, + PlanSummaryRecord, } from "@/libs/endorserServer"; import * as serverUtil from "@/libs/endorserServer"; @@ -388,14 +390,14 @@ export default class ProjectViewView extends Vue { apiServer = ""; description = ""; expanded = false; - fulfilledByThis: PlanServerRecord | null = null; - fulfillersToThis: Array = []; - givesToThis: Array = []; + fulfilledByThis: PlanSummaryRecord | null = null; + fulfillersToThis: Array = []; + givesToThis: Array = []; issuer = ""; latitude = 0; longitude = 0; name = ""; - offersToThis: Array = []; + offersToThis: Array = []; projectId = localStorage.getItem("projectId") || ""; // handle ID showDidCopy = false; timeSince = ""; @@ -718,8 +720,8 @@ export default class ProjectViewView extends Vue { this.$router.push(route); } - checkIsFulfillable(offer: OfferServerRecord) { - const offerRecord: GenericServerRecord = { + checkIsFulfillable(offer: OfferSummaryRecord) { + const offerRecord: GenericCredWrapper = { ...BLANK_GENERIC_SERVER_RECORD, claim: offer.fullClaim, claimType: "Offer", @@ -728,8 +730,8 @@ export default class ProjectViewView extends Vue { return libsUtil.canFulfillOffer(offerRecord); } - onClickFulfillGiveToOffer(offer: OfferServerRecord) { - const offerRecord: GenericServerRecord = { + onClickFulfillGiveToOffer(offer: OfferSummaryRecord) { + const offerRecord: GenericCredWrapper = { ...BLANK_GENERIC_SERVER_RECORD, claim: offer.fullClaim, issuer: offer.offeredByDid, @@ -768,8 +770,8 @@ export default class ProjectViewView extends Vue { } } - checkIsConfirmable(give: GiveServerRecord) { - const giveDetails: GenericServerRecord = { + checkIsConfirmable(give: GiveSummaryRecord) { + const giveDetails: GenericCredWrapper = { ...BLANK_GENERIC_SERVER_RECORD, claim: give.fullClaim, claimType: "GiveAction", @@ -779,7 +781,7 @@ export default class ProjectViewView extends Vue { } // similar code is found in ClaimView - async confirmClaim(give: GiveServerRecord) { + 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( diff --git a/src/views/ProjectsView.vue b/src/views/ProjectsView.vue index 48c7a718f..2639a5bef 100644 --- a/src/views/ProjectsView.vue +++ b/src/views/ProjectsView.vue @@ -167,7 +167,7 @@ @@ -223,7 +223,7 @@ import InfiniteScroll from "@/components/InfiniteScroll.vue"; import QuickNav from "@/components/QuickNav.vue"; import ProjectIcon from "@/components/ProjectIcon.vue"; import TopMessage from "@/components/TopMessage.vue"; -import { OfferServerRecord, PlanData } from "@/libs/endorserServer"; +import { OfferSummaryRecord, PlanData } from "@/libs/endorserServer"; import EntityIcon from "@/components/EntityIcon.vue"; @Component({ @@ -237,7 +237,7 @@ export default class ProjectsView extends Vue { currentIid: IIdentifier; isLoading = false; numAccounts = 0; - offers: OfferServerRecord[] = []; + offers: OfferSummaryRecord[] = []; showOffers = true; showProjects = false; diff --git a/src/views/QuickActionBvcEndView.vue b/src/views/QuickActionBvcEndView.vue index ba0dc770b..d21ca96a5 100644 --- a/src/views/QuickActionBvcEndView.vue +++ b/src/views/QuickActionBvcEndView.vue @@ -60,7 +60,7 @@ }} @@ -146,7 +146,7 @@ import { createAndSubmitConfirmation, createAndSubmitGive, ErrorResult, - GenericServerRecord, + GenericCredWrapper, GenericVerifiableCredential, } from "@/libs/endorserServer"; import * as libsUtil from "@/libs/util"; @@ -166,7 +166,7 @@ export default class QuickActionBvcBeginView extends Vue { allMyDids: Array = []; apiServer = ""; claimCountWithHidden = 0; - claimsToConfirm: GenericServerRecord[] = []; + claimsToConfirm: GenericCredWrapper[] = []; claimsToConfirmSelected: string[] = []; description = "breakfast"; loadingConfirms = true; @@ -228,7 +228,7 @@ export default class QuickActionBvcBeginView extends Vue { } await response.json().then((data) => { const dataByOthers = R.reject( - (claim: GenericServerRecord) => claim.issuer === this.activeDid, + (claim: GenericCredWrapper) => claim.issuer === this.activeDid, data, ); const dataByOthersWithoutHidden = R.reject( diff --git a/src/views/SearchAreaView.vue b/src/views/SearchAreaView.vue index 4b3a7501e..e5f5e307d 100644 --- a/src/views/SearchAreaView.vue +++ b/src/views/SearchAreaView.vue @@ -64,10 +64,11 @@ +@@ -208,9 +209,9 @@ export default class DiscoverView extends Vue { group: "alert", type: "success", title: "Saved", - text: "That has been saved in your preferences.", + text: "That has been saved in your preferences. You can now filter by it on your home screen feed.", }, - -1, + 7000, ); this.$router.back(); } catch (err) { @@ -246,6 +247,7 @@ export default class DiscoverView extends Vue { await db.open(); db.settings.update(MASTER_SETTINGS_KEY, { searchBoxes: [], + filterFeedByNearby: false, }); this.searchBox = null; this.localCenterLat = 0; diff --git a/src/views/StartView.vue b/src/views/StartView.vue index e73256ff1..04558e378 100644 --- a/src/views/StartView.vue +++ b/src/views/StartView.vue @@ -23,36 +23,40 @@ -- Do you want a new identifier of your own? -
-- If you haven't used this before, click "Yes" to generate a new - identifier. -
-- Only click "No" if you have a seed of 12 or 24 words generated - elsewhere. -
- - Yes, generate one - - - No, I have a seed - - - Derive new address from existing seed - +++ Do you want a new identifier of your own? +
++ If you haven't used this before, click "Yes" to generate a new + identifier. +
++ Only click "No" if you have a seed of 12 or 24 words generated + elsewhere. +
+ + Yes, generate one + + +