From ecb088bee2b8d04d2b0041cd67ab9c32bb800bfc Mon Sep 17 00:00:00 2001 From: Jose Olarte III <brownspank@anomalistdesign.com> Date: Mon, 10 Mar 2025 19:08:49 +0800 Subject: [PATCH 1/7] Recolored confirm button to gray ClickUp task 86b3y8f95 --- src/views/ClaimView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index 1bb642b4..4664e4f1 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -204,7 +204,7 @@ <div v-if="libsUtil.isGiveAction(veriClaim)"> <div class="flex 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 mt-2 px-4 py-2 rounded-md" + class="col-span-1 bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-4 py-2 rounded-md" v-if=" libsUtil.isGiveRecordTheUserCanConfirm( isRegistered, From 8858495f7352eb75ec86183b252fc934e69f19f6 Mon Sep 17 00:00:00 2001 From: Jose Olarte III <brownspank@anomalistdesign.com> Date: Mon, 10 Mar 2025 19:55:57 +0800 Subject: [PATCH 2/7] Larger contact image ClickUp task 86b3dgv2f --- src/views/ContactsView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue index 4df8c674..77aace49 100644 --- a/src/views/ContactsView.vue +++ b/src/views/ContactsView.vue @@ -180,8 +180,8 @@ <div class="flex items-center"> <EntityIcon :contact="contact" - :iconSize="24" - class="inline-block align-text-bottom border border-slate-300 rounded cursor-pointer" + :iconSize="48" + class="inline-block align-text-bottom border border-slate-300 rounded cursor-pointer overflow-hidden" @click="showLargeIdenticon = contact" /> From 751df09fe5e2c1aa319360b4da5ebbf37d4df892 Mon Sep 17 00:00:00 2001 From: Jose Olarte III <brownspank@anomalistdesign.com> Date: Wed, 12 Mar 2025 15:51:15 +0800 Subject: [PATCH 3/7] Button style tweaks + consistency --- src/views/ProjectViewView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue index d5726283..28f634ae 100644 --- a/src/views/ProjectViewView.vue +++ b/src/views/ProjectViewView.vue @@ -237,7 +237,7 @@ <button data-testId="offerButton" @click="openOfferDialog()" - class="block w-full 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 rounded-md" + class="block w-full 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 text-sm leading-tight rounded-md" > Offer to this (maybe with conditions)... </button> @@ -318,7 +318,7 @@ <div class="text-center"> <button @click="openGiftDialogToProject()" - class="block w-full 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-1rounded-md" + class="block w-full 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 text-sm leading-tight rounded-md" > Given To This... </button> @@ -470,7 +470,7 @@ <div class="text-center"> <button @click="openGiftDialogFromProject()" - class="block w-full 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 rounded-md" + class="block w-full 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 text-sm leading-tight rounded-md" > Given By This... </button> From d7afb80a07a01848b030d7a68d98983940ec3fb8 Mon Sep 17 00:00:00 2001 From: Jose Olarte III <brownspank@anomalistdesign.com> Date: Wed, 12 Mar 2025 15:51:39 +0800 Subject: [PATCH 4/7] Pointer cursor --- src/views/ProjectsView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ProjectsView.vue b/src/views/ProjectsView.vue index d1e2f2ea..b514db21 100644 --- a/src/views/ProjectsView.vue +++ b/src/views/ProjectsView.vue @@ -233,7 +233,7 @@ > <a @click="onClickLoadProject(project.handleId)" - class="block py-4 flex gap-4" + class="block py-4 flex gap-4 cursor-pointer" > <div class="flex-none"> <ProjectIcon From 3a6a24d9236fc8a4d7d8467e7751de9cfdbb1dbb Mon Sep 17 00:00:00 2001 From: Jose Olarte III <brownspank@anomalistdesign.com> Date: Wed, 12 Mar 2025 16:50:13 +0800 Subject: [PATCH 5/7] Contact list tweaks --- src/views/ContactsView.vue | 154 ++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 79 deletions(-) diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue index 77aace49..12876bb9 100644 --- a/src/views/ContactsView.vue +++ b/src/views/ContactsView.vue @@ -106,7 +106,7 @@ /> <button href="" - class="text-md bg-gradient-to-b shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-2 px-1 py-1 rounded-md" + class="text-md bg-gradient-to-b shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-3 px-3 py-1.5 rounded-md" :style=" contactsSelected.length > 0 ? 'background-image: linear-gradient(to bottom, #3b82f6, #1e40af);' @@ -127,7 +127,7 @@ <div class="w-full text-right"> <button href="" - class="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 py-1 rounded-md" + class="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-3 py-1.5 rounded-md" @click="toggleShowContactAmounts()" > {{ @@ -177,14 +177,7 @@ data-testId="contactListItem" > <div class="grow overflow-hidden"> - <div class="flex items-center"> - <EntityIcon - :contact="contact" - :iconSize="48" - class="inline-block align-text-bottom border border-slate-300 rounded cursor-pointer overflow-hidden" - @click="showLargeIdenticon = contact" - /> - + <div class="flex items-center gap-3"> <input type="checkbox" v-if="!showGiveNumbers" @@ -201,94 +194,97 @@ data-testId="contactCheckOne" /> - <h2 - class="text-base font-semibold ml-2 w-1/3 truncate flex-shrink-0" - > + <EntityIcon + :contact="contact" + :iconSize="48" + class="inline-block align-text-bottom border border-slate-300 rounded cursor-pointer overflow-hidden" + @click="showLargeIdenticon = contact" + /> + + <h2 class="text-base font-semibold w-1/3 truncate flex-shrink-0"> {{ contactNameNonBreakingSpace(contact.name) }} </h2> <span> - <div class="flex items-center"> + <div class="flex gap-2 items-center"> <router-link :to="{ path: '/did/' + encodeURIComponent(contact.did), }" title="See more about this person" > - <fa icon="circle-info" class="text-xl text-blue-500 ml-4" /> + <fa icon="circle-info" class="text-xl text-blue-500" /> </router-link> - <span class="ml-4 text-sm overflow-hidden">{{ + <span class="text-sm overflow-hidden">{{ libsUtil.shortDid(contact.did) }}</span> </div> - <div class="ml-4 text-sm"> + <div class="text-sm"> {{ contact.notes }} </div> </span> </div> - <div id="ContactActions" class="flex gap-1.5 mt-2"> - <div - v-if="showGiveNumbers && contact.did != activeDid" - class="ml-auto flex gap-1.5" + <div + v-if="showGiveNumbers && contact.did != activeDid" + class="ml-auto flex gap-1.5 mt-2" + > + <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" + @click="confirmShowGiftedDialog(contact.did, activeDid)" + :title="givenToMeDescriptions[contact.did] || ''" + > + From: + <br /> + {{ + /* eslint-disable prettier/prettier */ + this.showGiveTotals + ? ((givenToMeConfirmed[contact.did] || 0) + + (givenToMeUnconfirmed[contact.did] || 0)) + : this.showGiveConfirmed + ? (givenToMeConfirmed[contact.did] || 0) + : (givenToMeUnconfirmed[contact.did] || 0) + /* eslint-enable prettier/prettier */ + }} + </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" + @click="confirmShowGiftedDialog(activeDid, contact.did)" + :title="givenByMeDescriptions[contact.did] || ''" + > + To: + <br /> + {{ + /* eslint-disable prettier/prettier */ + this.showGiveTotals + ? ((givenByMeConfirmed[contact.did] || 0) + + (givenByMeUnconfirmed[contact.did] || 0)) + : this.showGiveConfirmed + ? (givenByMeConfirmed[contact.did] || 0) + : (givenByMeUnconfirmed[contact.did] || 0) + /* eslint-enable prettier/prettier */ + }} + </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-md border border-blue-400" + @click="openOfferDialog(contact.did, contact.name)" + data-testId="offerButton" + > + Offer + </button> + + <router-link + :to="{ + name: 'contact-amounts', + 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 border border-slate-400" + title="See more given activity" > - <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" - @click="confirmShowGiftedDialog(contact.did, activeDid)" - :title="givenToMeDescriptions[contact.did] || ''" - > - From: - <br /> - {{ - /* eslint-disable prettier/prettier */ - this.showGiveTotals - ? ((givenToMeConfirmed[contact.did] || 0) - + (givenToMeUnconfirmed[contact.did] || 0)) - : this.showGiveConfirmed - ? (givenToMeConfirmed[contact.did] || 0) - : (givenToMeUnconfirmed[contact.did] || 0) - /* eslint-enable prettier/prettier */ - }} - </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" - @click="confirmShowGiftedDialog(activeDid, contact.did)" - :title="givenByMeDescriptions[contact.did] || ''" - > - To: - <br /> - {{ - /* eslint-disable prettier/prettier */ - this.showGiveTotals - ? ((givenByMeConfirmed[contact.did] || 0) - + (givenByMeUnconfirmed[contact.did] || 0)) - : this.showGiveConfirmed - ? (givenByMeConfirmed[contact.did] || 0) - : (givenByMeUnconfirmed[contact.did] || 0) - /* eslint-enable prettier/prettier */ - }} - </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-md border border-blue-400" - @click="openOfferDialog(contact.did, contact.name)" - data-testId="offerButton" - > - Offer - </button> - - <router-link - :to="{ - name: 'contact-amounts', - 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 border border-slate-400" - title="See more given activity" - > - <fa icon="file-lines" class="fa-fw" /> - </router-link> - </div> + <fa icon="file-lines" class="fa-fw" /> + </router-link> </div> </div> </li> @@ -310,7 +306,7 @@ /> <button href="" - class="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 ml-2 px-1 py-1 rounded-md" + class="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 ml-3 px-3 py-1.5 rounded-md" :style=" contactsSelected.length > 0 ? 'background-image: linear-gradient(to bottom, #3b82f6, #1e40af);' From 312b4aaaa3a9c3e608bf6904a5c9b0798781960f Mon Sep 17 00:00:00 2001 From: Jose Olarte III <brownspank@anomalistdesign.com> Date: Wed, 12 Mar 2025 17:54:18 +0800 Subject: [PATCH 6/7] Padding adjustments --- src/views/AccountViewView.vue | 2 +- src/views/HomeView.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue index c503b55c..93325237 100644 --- a/src/views/AccountViewView.vue +++ b/src/views/AccountViewView.vue @@ -256,7 +256,7 @@ <span class="mb-2 font-bold">Location for Searches</span> <router-link :to="{ name: 'search-area' }" - class="text-m 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" + class="text-m 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 mb-2" > {{ isSearchAreasSet ? "Change" : "Set" }} Search Area… </router-link> diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index b30682ab..b01fb671 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -3,7 +3,7 @@ <TopMessage /> <!-- CONTENT --> - <section id="Content" class="p-2 pb-24 max-w-3xl mx-auto"> + <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto"> <h1 id="ViewHeading" class="text-4xl text-center font-light mb-8"> {{ AppString.APP_NAME }} </h1> From 5dbd66e51bc4bf39f2158f5de89efb124c9bdce8 Mon Sep 17 00:00:00 2001 From: Jose Olarte III <brownspank@anomalistdesign.com> Date: Wed, 12 Mar 2025 23:12:04 +0800 Subject: [PATCH 7/7] Nav tweaks --- src/components/QuickNav.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/QuickNav.vue b/src/components/QuickNav.vue index ade21614..fa48f1c3 100644 --- a/src/components/QuickNav.vue +++ b/src/components/QuickNav.vue @@ -1,7 +1,7 @@ <template> <!-- QUICK NAV --> <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 px-6 py-2 gap-1 max-w-3xl mx-auto"> <!-- Home Feed --> <li :class="{