From d9d60962751464513db2bad94507377d37dbb6d2 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 9 Jul 2023 08:31:11 -0600 Subject: [PATCH 1/3] consolidate the "gave" actions on a projecct --- src/views/ProjectViewView.vue | 41 ++++++++++++++++------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue index 8e182b84..10fb8ccc 100644 --- a/src/views/ProjectViewView.vue +++ b/src/views/ProjectViewView.vue @@ -65,30 +65,27 @@ - -
-

... or choose a contact who gave:

+ + ... or choose a contact who gave: -
- -  or  - -
+ +  or  +
Date: Sun, 9 Jul 2023 09:38:28 -0600 Subject: [PATCH 2/3] allow viewing of a project without an ID (and other refactors) --- project.task.yaml | 13 ++-- src/views/AccountViewView.vue | 1 + src/views/ContactAmountsView.vue | 1 + src/views/DiscoverView.vue | 39 +++++++++++- src/views/HomeView.vue | 1 + src/views/NewEditProjectView.vue | 1 + src/views/ProjectViewView.vue | 106 +++++++++++++++++-------------- src/views/ProjectsView.vue | 19 +++--- 8 files changed, 114 insertions(+), 67 deletions(-) diff --git a/project.task.yaml b/project.task.yaml index 83529b98..d0473967 100644 --- a/project.task.yaml +++ b/project.task.yaml @@ -1,11 +1,11 @@ tasks: +- .5 audit all console.log calls - 01 design ideas for simple gives on the Home page - 01 add list of 'give' records for a project on ProjectView UI -- 02 Discover page - display results (currently in console.log), spin when searching +- 02 Discover page - display results (currently in console.log) & link, spin when searching - 08 search by location, endpoint, etc assignee:trent -- 01 add a location for a project via map pin : - - give attribute to use assignee:trent +- 01 add a location for a project via map pin (see API by clicking on "Nearby") - 01 remove all the "form" fields (or at least investigate to see if that page refresh is desired) - 08 Scan QR code to import into contacts. @@ -69,9 +69,10 @@ tasks: - pull, w/ scheduled runs - linking between projects or plans : - - terminology: - - 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) + - show total time given to & from a project + - terminology: + - 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) - Stats : - 01 point out user's location on the world diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue index 2bb92278..bce2c861 100644 --- a/src/views/AccountViewView.vue +++ b/src/views/AccountViewView.vue @@ -279,6 +279,7 @@ import { useClipboard } from "@vueuse/core"; import { AppString } from "@/constants/app"; import { db, accountsDB } from "@/db"; +import { AccountsSchema } from "@/db/tables/accounts"; import { MASTER_SETTINGS_KEY } from "@/db/tables/settings"; import { accessToken } from "@/libs/crypto"; import { AxiosError } from "axios/index"; diff --git a/src/views/ContactAmountsView.vue b/src/views/ContactAmountsView.vue index 02a9e220..e45ce847 100644 --- a/src/views/ContactAmountsView.vue +++ b/src/views/ContactAmountsView.vue @@ -121,6 +121,7 @@ import * as R from "ramda"; import { Component, Vue } from "vue-facing-decorator"; import { accountsDB, db } from "@/db"; +import { AccountsSchema } from "@/db/tables/accounts"; import { Contact } from "@/db/tables/contacts"; import { MASTER_SETTINGS_KEY } from "@/db/tables/settings"; import { accessToken, SimpleSigner } from "@/libs/crypto"; diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue index b7606d44..2bc861f6 100644 --- a/src/views/DiscoverView.vue +++ b/src/views/DiscoverView.vue @@ -58,7 +58,14 @@