|
|
@ -43,6 +43,7 @@ |
|
|
|
|
|
|
|
|
<div class="flex justify-between" v-if="showGiveNumbers"> |
|
|
<div class="flex justify-between" v-if="showGiveNumbers"> |
|
|
<div class="w-full text-right"> |
|
|
<div class="w-full text-right"> |
|
|
|
|
|
<!-- |
|
|
Hours to Add: |
|
|
Hours to Add: |
|
|
<input |
|
|
<input |
|
|
class="border rounded border-slate-400 w-24 text-right" |
|
|
class="border rounded border-slate-400 w-24 text-right" |
|
|
@ -57,30 +58,29 @@ |
|
|
placeholder="Description" |
|
|
placeholder="Description" |
|
|
v-model="hourDescriptionInput" |
|
|
v-model="hourDescriptionInput" |
|
|
/> |
|
|
/> |
|
|
<br /> |
|
|
--> |
|
|
|
|
|
In the following, only the most recent hours are included. To see more, |
|
|
|
|
|
click |
|
|
|
|
|
<span |
|
|
|
|
|
class="text-sm 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 py-1 rounded-md" |
|
|
|
|
|
> |
|
|
|
|
|
<fa icon="file-lines" class="fa-fw" /> |
|
|
|
|
|
</span> |
|
|
<br /> |
|
|
<br /> |
|
|
<button |
|
|
<button |
|
|
href="" |
|
|
href="" |
|
|
class="text-center text-md text-white px-1.5 py-2 rounded-md mb-6" |
|
|
class="text-center text-md text-white px-1.5 py-2 rounded-md mt-1" |
|
|
v-bind:class="showGiveAmountsClassNames()" |
|
|
v-bind:class="showGiveAmountsClassNames()" |
|
|
@click="toggleShowGiveTotals()" |
|
|
@click="toggleShowGiveTotals()" |
|
|
> |
|
|
> |
|
|
{{ |
|
|
{{ |
|
|
showGiveTotals |
|
|
showGiveTotals |
|
|
? "Total" |
|
|
? "Showing Total" |
|
|
: showGiveConfirmed |
|
|
: showGiveConfirmed |
|
|
? "Confirmed" |
|
|
? "Confirmed" |
|
|
: "Unconfirmed" |
|
|
: "Unconfirmed" |
|
|
}} |
|
|
}} |
|
|
</button> |
|
|
</button> |
|
|
<br /> |
|
|
|
|
|
(Only most recent hours included. To see more, click |
|
|
|
|
|
<span |
|
|
|
|
|
class="text-sm 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 py-1 rounded-md" |
|
|
|
|
|
> |
|
|
|
|
|
<fa icon="file-lines" class="fa-fw" /> |
|
|
|
|
|
</span> |
|
|
|
|
|
) |
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
@ -189,10 +189,11 @@ |
|
|
> |
|
|
> |
|
|
<button |
|
|
<button |
|
|
class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-l-md" |
|
|
class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-l-md" |
|
|
@click="onClickAddGive(activeDid, contact.did)" |
|
|
@click="showGiftedDialog(activeDid, contact.did)" |
|
|
:title="givenByMeDescriptions[contact.did] || ''" |
|
|
:title="givenByMeDescriptions[contact.did] || ''" |
|
|
> |
|
|
> |
|
|
To: |
|
|
To: |
|
|
|
|
|
<br /> |
|
|
{{ |
|
|
{{ |
|
|
/* eslint-disable prettier/prettier */ |
|
|
/* eslint-disable prettier/prettier */ |
|
|
this.showGiveTotals |
|
|
this.showGiveTotals |
|
|
@ -203,15 +204,17 @@ |
|
|
: (givenByMeUnconfirmed[contact.did] || 0) |
|
|
: (givenByMeUnconfirmed[contact.did] || 0) |
|
|
/* eslint-enable prettier/prettier */ |
|
|
/* eslint-enable prettier/prettier */ |
|
|
}} |
|
|
}} |
|
|
|
|
|
<br /> |
|
|
<fa icon="plus" /> |
|
|
<fa icon="plus" /> |
|
|
</button> |
|
|
</button> |
|
|
|
|
|
|
|
|
<button |
|
|
<button |
|
|
class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white -ml-1.5 px-2 py-1.5 rounded-r-md border-l" |
|
|
class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white -ml-1.5 px-2 py-1.5 rounded-r-md border-l" |
|
|
@click="onClickAddGive(contact.did, activeDid)" |
|
|
@click="showGiftedDialog(contact.did, this.activeDid)" |
|
|
:title="givenToMeDescriptions[contact.did] || ''" |
|
|
:title="givenToMeDescriptions[contact.did] || ''" |
|
|
> |
|
|
> |
|
|
From: |
|
|
From: |
|
|
|
|
|
<br /> |
|
|
{{ |
|
|
{{ |
|
|
/* eslint-disable prettier/prettier */ |
|
|
/* eslint-disable prettier/prettier */ |
|
|
this.showGiveTotals |
|
|
this.showGiveTotals |
|
|
@ -222,6 +225,7 @@ |
|
|
: (givenToMeUnconfirmed[contact.did] || 0) |
|
|
: (givenToMeUnconfirmed[contact.did] || 0) |
|
|
/* eslint-enable prettier/prettier */ |
|
|
/* eslint-enable prettier/prettier */ |
|
|
}} |
|
|
}} |
|
|
|
|
|
<br /> |
|
|
<fa icon="plus" /> |
|
|
<fa icon="plus" /> |
|
|
</button> |
|
|
</button> |
|
|
|
|
|
|
|
|
@ -237,7 +241,7 @@ |
|
|
name: 'contact-amounts', |
|
|
name: 'contact-amounts', |
|
|
query: { contactDid: contact.did }, |
|
|
query: { contactDid: contact.did }, |
|
|
}" |
|
|
}" |
|
|
class="text-sm bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-md" |
|
|
class="text-sm bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-md border border-slate-400" |
|
|
title="See more given activity" |
|
|
title="See more given activity" |
|
|
> |
|
|
> |
|
|
<fa icon="file-lines" class="fa-fw" /> |
|
|
<fa icon="file-lines" class="fa-fw" /> |
|
|
@ -249,6 +253,7 @@ |
|
|
</ul> |
|
|
</ul> |
|
|
<p v-else>There are no contacts.</p> |
|
|
<p v-else>There are no contacts.</p> |
|
|
|
|
|
|
|
|
|
|
|
<GiftedDialog ref="customGivenDialog" /> |
|
|
<OfferDialog ref="customOfferDialog" /> |
|
|
<OfferDialog ref="customOfferDialog" /> |
|
|
|
|
|
|
|
|
<div v-if="showLargeIdenticon" class="fixed z-[100] top-0 inset-x-0 w-full"> |
|
|
<div v-if="showLargeIdenticon" class="fixed z-[100] top-0 inset-x-0 w-full"> |
|
|
@ -313,8 +318,8 @@ import { |
|
|
import { |
|
|
import { |
|
|
CONTACT_CSV_HEADER, |
|
|
CONTACT_CSV_HEADER, |
|
|
CONTACT_URL_PREFIX, |
|
|
CONTACT_URL_PREFIX, |
|
|
|
|
|
GiverReceiverInputInfo, |
|
|
GiveSummaryRecord, |
|
|
GiveSummaryRecord, |
|
|
GiveVerifiableCredential, |
|
|
|
|
|
isDid, |
|
|
isDid, |
|
|
RegisterVerifiableCredential, |
|
|
RegisterVerifiableCredential, |
|
|
SERVICE_ID, |
|
|
SERVICE_ID, |
|
|
@ -322,13 +327,14 @@ import { |
|
|
import * as libsUtil from "@/libs/util"; |
|
|
import * as libsUtil from "@/libs/util"; |
|
|
import QuickNav from "@/components/QuickNav.vue"; |
|
|
import QuickNav from "@/components/QuickNav.vue"; |
|
|
import EntityIcon from "@/components/EntityIcon.vue"; |
|
|
import EntityIcon from "@/components/EntityIcon.vue"; |
|
|
|
|
|
import GiftedDialog from "@/components/GiftedDialog.vue"; |
|
|
import OfferDialog from "@/components/OfferDialog.vue"; |
|
|
import OfferDialog from "@/components/OfferDialog.vue"; |
|
|
import { Account } from "@/db/tables/accounts"; |
|
|
import { Account } from "@/db/tables/accounts"; |
|
|
|
|
|
|
|
|
import { Buffer } from "buffer/"; |
|
|
import { Buffer } from "buffer/"; |
|
|
|
|
|
|
|
|
@Component({ |
|
|
@Component({ |
|
|
components: { EntityIcon, OfferDialog, QuickNav }, |
|
|
components: { GiftedDialog, EntityIcon, OfferDialog, QuickNav }, |
|
|
}) |
|
|
}) |
|
|
export default class ContactsView extends Vue { |
|
|
export default class ContactsView extends Vue { |
|
|
$notify!: (notification: NotificationIface, timeout?: number) => void; |
|
|
$notify!: (notification: NotificationIface, timeout?: number) => void; |
|
|
@ -352,8 +358,6 @@ export default class ContactsView extends Vue { |
|
|
givenToMeConfirmed: Record<string, number> = {}; |
|
|
givenToMeConfirmed: Record<string, number> = {}; |
|
|
// { "did:...": amount } entry for each contact |
|
|
// { "did:...": amount } entry for each contact |
|
|
givenToMeUnconfirmed: Record<string, number> = {}; |
|
|
givenToMeUnconfirmed: Record<string, number> = {}; |
|
|
hourDescriptionInput = ""; |
|
|
|
|
|
hourInput = "0"; |
|
|
|
|
|
isRegistered = false; |
|
|
isRegistered = false; |
|
|
showDidCopy = false; |
|
|
showDidCopy = false; |
|
|
showGiveNumbers = false; |
|
|
showGiveNumbers = false; |
|
|
@ -1041,27 +1045,33 @@ export default class ContactsView extends Vue { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private nameForDid(contacts: Array<Contact>, did: string): string { |
|
|
private nameForDid(contacts: Array<Contact>, did: string): string { |
|
|
|
|
|
if (did === this.activeDid) { |
|
|
|
|
|
return "you"; |
|
|
|
|
|
} |
|
|
const contact = R.find((con) => con.did == did, contacts); |
|
|
const contact = R.find((con) => con.did == did, contacts); |
|
|
return this.nameForContact(contact); |
|
|
return this.nameForContact(contact); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private nameForContact(contact?: Contact, capitalize?: boolean): string { |
|
|
private nameForContact(contact?: Contact, capitalize?: boolean): string { |
|
|
return contact?.name || (capitalize ? "T" : "t") + "his unnamed user"; |
|
|
return ( |
|
|
|
|
|
(contact?.name as string) || (capitalize ? "T" : "t") + "his unnamed user" |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
async onClickAddGive(fromDid: string, toDid: string): Promise<void> { |
|
|
private showGiftedDialog(giverDid: string, recipientDid: string) { |
|
|
const identity = await this.getIdentity(this.activeDid); |
|
|
|
|
|
|
|
|
|
|
|
// if they have unconfirmed amounts, ask to confirm those first |
|
|
// if they have unconfirmed amounts, ask to confirm those first |
|
|
if (toDid == identity?.did && this.givenToMeUnconfirmed[fromDid] > 0) { |
|
|
if ( |
|
|
const isare = this.givenToMeUnconfirmed[fromDid] == 1 ? "is" : "are"; |
|
|
recipientDid == this.activeDid && |
|
|
const hours = this.givenToMeUnconfirmed[fromDid] == 1 ? "hour" : "hours"; |
|
|
this.givenToMeUnconfirmed[giverDid] > 0 |
|
|
|
|
|
) { |
|
|
|
|
|
const isAre = this.givenToMeUnconfirmed[giverDid] == 1 ? "is" : "are"; |
|
|
|
|
|
const hours = this.givenToMeUnconfirmed[giverDid] == 1 ? "hour" : "hours"; |
|
|
if ( |
|
|
if ( |
|
|
confirm( |
|
|
confirm( |
|
|
"There " + |
|
|
"There " + |
|
|
isare + |
|
|
isAre + |
|
|
" " + |
|
|
" " + |
|
|
this.givenToMeUnconfirmed[fromDid] + |
|
|
this.givenToMeUnconfirmed[giverDid] + |
|
|
" unconfirmed " + |
|
|
" unconfirmed " + |
|
|
hours + |
|
|
hours + |
|
|
" from them." + |
|
|
" from them." + |
|
|
@ -1070,178 +1080,58 @@ export default class ContactsView extends Vue { |
|
|
) { |
|
|
) { |
|
|
this.$router.push({ |
|
|
this.$router.push({ |
|
|
name: "contact-amounts", |
|
|
name: "contact-amounts", |
|
|
query: { contactDid: fromDid }, |
|
|
query: { contactDid: giverDid }, |
|
|
}); |
|
|
}); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if (!libsUtil.isNumeric(this.hourInput)) { |
|
|
|
|
|
this.$notify( |
|
|
let giver: GiverReceiverInputInfo, receiver: GiverReceiverInputInfo; |
|
|
{ |
|
|
if (giverDid) { |
|
|
group: "alert", |
|
|
giver = { |
|
|
type: "danger", |
|
|
did: giverDid, |
|
|
title: "Input Error", |
|
|
name: this.nameForDid(this.contacts, giverDid), |
|
|
text: "This is not a valid number of hours: " + this.hourInput, |
|
|
}; |
|
|
}, |
|
|
} |
|
|
3000, |
|
|
if (recipientDid) { |
|
|
); |
|
|
receiver = { |
|
|
} else if (parseFloat(this.hourInput) == 0 && !this.hourDescriptionInput) { |
|
|
did: recipientDid, |
|
|
this.$notify( |
|
|
name: this.nameForDid(this.contacts, recipientDid), |
|
|
{ |
|
|
}; |
|
|
group: "alert", |
|
|
} |
|
|
type: "danger", |
|
|
|
|
|
title: "Input Error", |
|
|
let callback: (amount: number) => void; |
|
|
text: "Giving no hours or description does nothing.", |
|
|
let customTitle = "Given"; |
|
|
}, |
|
|
// choose whether to open dialog to user or from user |
|
|
3000, |
|
|
if (giverDid == this.activeDid) { |
|
|
); |
|
|
callback = (amount: number) => { |
|
|
} else if (!identity) { |
|
|
const newList = R.clone(this.givenByMeUnconfirmed); |
|
|
this.$notify( |
|
|
newList[recipientDid] = (newList[recipientDid] || 0) + amount; |
|
|
{ |
|
|
this.givenByMeUnconfirmed = newList; |
|
|
group: "alert", |
|
|
}; |
|
|
type: "danger", |
|
|
customTitle = "To " + receiver.name; |
|
|
title: "Status Error", |
|
|
|
|
|
text: "No identifier is available.", |
|
|
|
|
|
}, |
|
|
|
|
|
3000, |
|
|
|
|
|
); |
|
|
|
|
|
} else { |
|
|
} else { |
|
|
// ask to confirm amount |
|
|
// must be (recipientDid == this.activeDid) |
|
|
let toFrom; |
|
|
callback = (amount: number) => { |
|
|
if (fromDid == identity?.did) { |
|
|
const newList = R.clone(this.givenToMeUnconfirmed); |
|
|
toFrom = "from you to " + this.nameForDid(this.contacts, toDid); |
|
|
newList[giverDid] = (newList[giverDid] || 0) + amount; |
|
|
} else { |
|
|
this.givenToMeUnconfirmed = newList; |
|
|
toFrom = "from " + this.nameForDid(this.contacts, fromDid) + " to you"; |
|
|
}; |
|
|
} |
|
|
customTitle = "From " + giver.name; |
|
|
let description; |
|
|
|
|
|
if (this.hourDescriptionInput) { |
|
|
|
|
|
description = " with description '" + this.hourDescriptionInput + "'"; |
|
|
|
|
|
} else { |
|
|
|
|
|
description = " with no description"; |
|
|
|
|
|
} |
|
|
|
|
|
if ( |
|
|
|
|
|
confirm( |
|
|
|
|
|
"Are you sure you want to record " + |
|
|
|
|
|
this.hourInput + |
|
|
|
|
|
" hour" + |
|
|
|
|
|
(this.hourInput == "1" ? "" : "s") + |
|
|
|
|
|
" " + |
|
|
|
|
|
toFrom + |
|
|
|
|
|
description + |
|
|
|
|
|
"?", |
|
|
|
|
|
) |
|
|
|
|
|
) { |
|
|
|
|
|
this.createAndSubmitContactGive( |
|
|
|
|
|
identity, |
|
|
|
|
|
fromDid, |
|
|
|
|
|
toDid, |
|
|
|
|
|
parseFloat(this.hourInput), |
|
|
|
|
|
this.hourDescriptionInput, |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
(this.$refs.customGivenDialog as GiftedDialog).open( |
|
|
|
|
|
giver, |
|
|
|
|
|
receiver, |
|
|
|
|
|
undefined as string, |
|
|
|
|
|
customTitle, |
|
|
|
|
|
callback, |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
openOfferDialog(recipientDid: string) { |
|
|
openOfferDialog(recipientDid: string) { |
|
|
(this.$refs.customOfferDialog as OfferDialog).open(recipientDid); |
|
|
(this.$refs.customOfferDialog as OfferDialog).open(recipientDid); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// similar function is in endorserServer.ts |
|
|
|
|
|
private async createAndSubmitContactGive( |
|
|
|
|
|
identity: IIdentifier, |
|
|
|
|
|
fromDid: string, |
|
|
|
|
|
toDid: string, |
|
|
|
|
|
amount: number, |
|
|
|
|
|
description: string, |
|
|
|
|
|
): Promise<void> { |
|
|
|
|
|
// Make a claim |
|
|
|
|
|
const vcClaim: GiveVerifiableCredential = { |
|
|
|
|
|
"@context": "https://schema.org", |
|
|
|
|
|
"@type": "GiveAction", |
|
|
|
|
|
agent: { identifier: fromDid }, |
|
|
|
|
|
object: { amountOfThisGood: amount, unitCode: "HUR" }, |
|
|
|
|
|
recipient: { identifier: toDid }, |
|
|
|
|
|
}; |
|
|
|
|
|
if (description) { |
|
|
|
|
|
vcClaim.description = description; |
|
|
|
|
|
} |
|
|
|
|
|
// Make a payload for the claim |
|
|
|
|
|
const vcPayload = { |
|
|
|
|
|
vc: { |
|
|
|
|
|
"@context": ["https://www.w3.org/2018/credentials/v1"], |
|
|
|
|
|
type: ["VerifiableCredential"], |
|
|
|
|
|
credentialSubject: vcClaim, |
|
|
|
|
|
}, |
|
|
|
|
|
}; |
|
|
|
|
|
// Create a signature using private key of identity |
|
|
|
|
|
if (identity.keys[0].privateKeyHex !== null) { |
|
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion |
|
|
|
|
|
const privateKeyHex: string = identity.keys[0].privateKeyHex!; |
|
|
|
|
|
const signer = await SimpleSigner(privateKeyHex); |
|
|
|
|
|
const alg = undefined; |
|
|
|
|
|
// Create a JWT for the request |
|
|
|
|
|
const vcJwt: string = await didJwt.createJWT(vcPayload, { |
|
|
|
|
|
alg: alg, |
|
|
|
|
|
issuer: identity.did, |
|
|
|
|
|
signer: signer, |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
// Make the xhr request payload |
|
|
|
|
|
|
|
|
|
|
|
const payload = JSON.stringify({ jwtEncoded: vcJwt }); |
|
|
|
|
|
const url = this.apiServer + "/api/v2/claim"; |
|
|
|
|
|
const headers = await this.getHeaders(identity); |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
const resp = await this.axios.post(url, payload, { headers }); |
|
|
|
|
|
if (resp.data?.success?.handleId) { |
|
|
|
|
|
this.$notify( |
|
|
|
|
|
{ |
|
|
|
|
|
group: "alert", |
|
|
|
|
|
type: "success", |
|
|
|
|
|
title: "Done", |
|
|
|
|
|
text: "Successfully logged time to the server.", |
|
|
|
|
|
}, |
|
|
|
|
|
5000, |
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
if (fromDid === identity.did) { |
|
|
|
|
|
const newList = R.clone(this.givenByMeUnconfirmed); |
|
|
|
|
|
newList[toDid] = (newList[toDid] || 0) + amount; |
|
|
|
|
|
this.givenByMeUnconfirmed = newList; |
|
|
|
|
|
} else { |
|
|
|
|
|
const newList = R.clone(this.givenToMeConfirmed); |
|
|
|
|
|
newList[fromDid] = (newList[fromDid] || 0) + amount; |
|
|
|
|
|
this.givenToMeConfirmed = newList; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} catch (error) { |
|
|
|
|
|
console.error("Error in createAndSubmitContactGive: ", error); |
|
|
|
|
|
let userMessage = "There was an error. See logs for more info."; |
|
|
|
|
|
const serverError = error as AxiosError; |
|
|
|
|
|
if (serverError) { |
|
|
|
|
|
if (serverError.message) { |
|
|
|
|
|
userMessage = serverError.message; // Info for the user |
|
|
|
|
|
} else { |
|
|
|
|
|
userMessage = JSON.stringify(serverError.toJSON()); |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
userMessage = error as string; |
|
|
|
|
|
} |
|
|
|
|
|
// Now set that error for the user to see. |
|
|
|
|
|
this.$notify( |
|
|
|
|
|
{ |
|
|
|
|
|
group: "alert", |
|
|
|
|
|
type: "danger", |
|
|
|
|
|
title: "Error Sending Give", |
|
|
|
|
|
text: userMessage, |
|
|
|
|
|
}, |
|
|
|
|
|
5000, |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private async onClickCancelName() { |
|
|
private async onClickCancelName() { |
|
|
this.contactEdit = null; |
|
|
this.contactEdit = null; |
|
|
this.contactNewName = ""; |
|
|
this.contactNewName = ""; |
|
|
|
