forked from trent_larson/crowd-funder-for-time-pwa
Merging with corrections
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- 01 add a location for a project via map pin
|
- .2 bug - on contacts view, click on "to" & "from" and nothing happens
|
||||||
|
- 01 add a location for a project via map pin :
|
||||||
|
- add with a "location" field containing this: { "geo":{ "@type":"GeoCoordinates", "latitude":40.883944, "longitude":-111.884787 } }
|
||||||
- 04 search by a bounding box for local projects (see API by clicking on "Nearby")
|
- 04 search by a bounding box for local projects (see API by clicking on "Nearby")
|
||||||
- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:jose
|
- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:jose
|
||||||
- 02 Fix images on projectview - allow choice of image from a pallete of images or a url image.
|
- 02 Fix images on projectview - allow choice of image from a pallete of images or a url image.
|
||||||
@@ -33,6 +35,8 @@ tasks:
|
|||||||
- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist
|
- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist
|
||||||
- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?)
|
- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?)
|
||||||
- .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
|
- .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
|
||||||
|
- .2 move 'switch identity' to the advanced section
|
||||||
|
- .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
|
||||||
|
|
||||||
- Discuss whether the remaining tasks are worthwhile before MVP release.
|
- Discuss whether the remaining tasks are worthwhile before MVP release.
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,11 @@
|
|||||||
<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">
|
||||||
Given with {{ contact?.name }}
|
Given with {{ contact?.name }}
|
||||||
</h1>
|
</h1>
|
||||||
|
<div class="flex justify-around">
|
||||||
|
<span />
|
||||||
|
<span class="justify-around">(Only 50 most recent)</span>
|
||||||
|
<span />
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Results List -->
|
<!-- Results List -->
|
||||||
<div>
|
<div>
|
||||||
@@ -170,7 +175,7 @@ export default class ContactsView extends Vue {
|
|||||||
encodeURIComponent(identity.did) +
|
encodeURIComponent(identity.did) +
|
||||||
"&recipientDid=" +
|
"&recipientDid=" +
|
||||||
encodeURIComponent(contact.did);
|
encodeURIComponent(contact.did);
|
||||||
const headers = this.getHeaders(identity);
|
const headers = await this.getHeaders(identity);
|
||||||
const resp = await this.axios.get(url, { headers });
|
const resp = await this.axios.get(url, { headers });
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
result = resp.data.data;
|
result = resp.data.data;
|
||||||
|
|||||||
@@ -66,6 +66,10 @@
|
|||||||
: "Unconfirmed"
|
: "Unconfirmed"
|
||||||
}}
|
}}
|
||||||
</button>
|
</button>
|
||||||
|
<br />
|
||||||
|
(Only hours shown)
|
||||||
|
<br />
|
||||||
|
(Only recent shown)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -135,7 +139,10 @@
|
|||||||
<fa icon="trash-can" class="fa-fw" />
|
<fa icon="trash-can" class="fa-fw" />
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div v-if="showGiveNumbers" class="ml-auto flex gap-1.5">
|
<div
|
||||||
|
v-if="showGiveNumbers && contact.did != activeDid"
|
||||||
|
class="ml-auto flex gap-1.5"
|
||||||
|
>
|
||||||
<button
|
<button
|
||||||
class="text-sm uppercase bg-blue-600 text-white px-2 py-1.5 rounded-md"
|
class="text-sm uppercase bg-blue-600 text-white px-2 py-1.5 rounded-md"
|
||||||
@click="onClickAddGive(activeDid, contact.did)"
|
@click="onClickAddGive(activeDid, contact.did)"
|
||||||
@@ -294,20 +301,27 @@ export default class ContactsView extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async loadGives() {
|
async loadGives() {
|
||||||
const handleResponse = (resp, descriptions, confirmed, unconfirmed) => {
|
const handleResponse = (
|
||||||
|
resp,
|
||||||
|
descriptions,
|
||||||
|
confirmed,
|
||||||
|
unconfirmed,
|
||||||
|
useRecipient,
|
||||||
|
) => {
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
const allData = resp.data.data;
|
const allData = resp.data.data;
|
||||||
for (const give of allData) {
|
for (const give of allData) {
|
||||||
|
const otherDid = useRecipient ? give.recipientDid : give.agentDid;
|
||||||
if (give.unit === "HUR") {
|
if (give.unit === "HUR") {
|
||||||
if (give.amountConfirmed) {
|
if (give.amountConfirmed) {
|
||||||
const prevAmount = confirmed[give.agentDid] || 0;
|
const prevAmount = confirmed[otherDid] || 0;
|
||||||
confirmed[give.agentDid] = prevAmount + give.amount;
|
confirmed[otherDid] = prevAmount + give.amount;
|
||||||
} else {
|
} else {
|
||||||
const prevAmount = unconfirmed[give.agentDid] || 0;
|
const prevAmount = unconfirmed[otherDid] || 0;
|
||||||
unconfirmed[give.agentDid] = prevAmount + give.amount;
|
unconfirmed[otherDid] = prevAmount + give.amount;
|
||||||
}
|
}
|
||||||
if (!descriptions[give.agentDid] && give.description) {
|
if (!descriptions[otherDid] && give.description) {
|
||||||
descriptions[give.agentDid] = give.description;
|
descriptions[otherDid] = give.description;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -334,17 +348,15 @@ export default class ContactsView extends Vue {
|
|||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { headers, identity } = await this.getHeadersAndIdentity(
|
const { headers } = await this.getHeadersAndIdentity(this.activeDid);
|
||||||
this.activeDid,
|
|
||||||
);
|
|
||||||
const givenByUrl =
|
const givenByUrl =
|
||||||
this.apiServer +
|
this.apiServer +
|
||||||
"/api/v2/report/gives?agentDid=" +
|
"/api/v2/report/gives?agentDid=" +
|
||||||
encodeURIComponent(identity.did);
|
encodeURIComponent(this.activeDid);
|
||||||
const givenToUrl =
|
const givenToUrl =
|
||||||
this.apiServer +
|
this.apiServer +
|
||||||
"/api/v2/report/gives?recipientDid=" +
|
"/api/v2/report/gives?recipientDid=" +
|
||||||
encodeURIComponent(identity.did);
|
encodeURIComponent(this.activeDid);
|
||||||
|
|
||||||
const [givenByMeResp, givenToMeResp] = await Promise.all([
|
const [givenByMeResp, givenToMeResp] = await Promise.all([
|
||||||
this.axios.get(givenByUrl, { headers }),
|
this.axios.get(givenByUrl, { headers }),
|
||||||
@@ -359,6 +371,7 @@ export default class ContactsView extends Vue {
|
|||||||
givenByMeDescriptions,
|
givenByMeDescriptions,
|
||||||
givenByMeConfirmed,
|
givenByMeConfirmed,
|
||||||
givenByMeUnconfirmed,
|
givenByMeUnconfirmed,
|
||||||
|
true,
|
||||||
);
|
);
|
||||||
this.givenByMeDescriptions = givenByMeDescriptions;
|
this.givenByMeDescriptions = givenByMeDescriptions;
|
||||||
this.givenByMeConfirmed = givenByMeConfirmed;
|
this.givenByMeConfirmed = givenByMeConfirmed;
|
||||||
@@ -372,6 +385,7 @@ export default class ContactsView extends Vue {
|
|||||||
givenToMeDescriptions,
|
givenToMeDescriptions,
|
||||||
givenToMeConfirmed,
|
givenToMeConfirmed,
|
||||||
givenToMeUnconfirmed,
|
givenToMeUnconfirmed,
|
||||||
|
false,
|
||||||
);
|
);
|
||||||
this.givenToMeDescriptions = givenToMeDescriptions;
|
this.givenToMeDescriptions = givenToMeDescriptions;
|
||||||
this.givenToMeConfirmed = givenToMeConfirmed;
|
this.givenToMeConfirmed = givenToMeConfirmed;
|
||||||
|
|||||||
@@ -128,6 +128,14 @@
|
|||||||
key.
|
key.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<h2 class="text-xl font-semibold">How do I create another identity?</h2>
|
||||||
|
<p>
|
||||||
|
Go
|
||||||
|
<router-link to="start" class="text-blue-500">
|
||||||
|
create another identity here.
|
||||||
|
</router-link>
|
||||||
|
</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>
|
||||||
@@ -146,14 +154,6 @@
|
|||||||
page.
|
page.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">How do I create another identity?</h2>
|
|
||||||
<p>
|
|
||||||
Go
|
|
||||||
<router-link to="start" class="text-blue-500">
|
|
||||||
create another identity here.
|
|
||||||
</router-link>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold">What is your privacy policy?</h2>
|
<h2 class="text-xl font-semibold">What is your privacy policy?</h2>
|
||||||
<p>
|
<p>
|
||||||
See
|
See
|
||||||
|
|||||||
@@ -348,7 +348,7 @@ export default class HomeView extends Vue {
|
|||||||
}
|
}
|
||||||
// agent.did is for legacy data, before March 2023
|
// agent.did is for legacy data, before March 2023
|
||||||
const giverDid =
|
const giverDid =
|
||||||
claim.agent?.identifier || claim.agent?.did || giveRecord.issuer;
|
claim.agent?.identifier || claim.agent?.did;
|
||||||
const giverInfo = didInfo(
|
const giverInfo = didInfo(
|
||||||
giverDid,
|
giverDid,
|
||||||
this.activeDid,
|
this.activeDid,
|
||||||
|
|||||||
Reference in New Issue
Block a user