From 96633d806063ec23a7896cf2a8e6edc5ac6e1bec Mon Sep 17 00:00:00 2001 From: Matthew Raymer Date: Thu, 6 Feb 2025 14:08:54 +0000 Subject: [PATCH] (chore): cleaning up formatting and relative references --- src/components/GiftedDialog.vue | 12 ++-- src/components/MembersList.vue | 80 +++++++++++++------------ src/components/OfferDialog.vue | 5 +- src/libs/util.ts | 2 +- src/views/ContactsView.vue | 14 +++-- src/views/HomeView.vue | 37 ++++-------- src/views/OnboardMeetingListView.vue | 10 ++-- src/views/OnboardMeetingMembersView.vue | 6 +- src/views/OnboardMeetingSetupView.vue | 12 ++-- src/views/TestView.vue | 13 +++- 10 files changed, 98 insertions(+), 93 deletions(-) diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue index d08b3fd..54bacaf 100644 --- a/src/components/GiftedDialog.vue +++ b/src/components/GiftedDialog.vue @@ -90,7 +90,11 @@ import { Vue, Component, Prop } from "vue-facing-decorator"; import { NotificationIface } from "../constants/app"; -import { createAndSubmitGive, didInfo, serverMessageForUser } from "../libs/endorserServer"; +import { + createAndSubmitGive, + didInfo, + serverMessageForUser, +} from "../libs/endorserServer"; import * as libsUtil from "../libs/util"; import { db, retrieveSettingsForActiveAccount } from "../db/index"; import { Contact } from "../db/tables/contacts"; @@ -100,8 +104,8 @@ import { retrieveAccountDids } from "../libs/util"; export default class GiftedDialog extends Vue { $notify!: (notification: NotificationIface, timeout?: number) => void; - @Prop fromProjectId = ""; - @Prop toProjectId = ""; + @Prop() fromProjectId = ""; + @Prop() toProjectId = ""; activeDid = ""; allContacts: Array = []; @@ -128,7 +132,7 @@ export default class GiftedDialog extends Vue { offerId?: string, customTitle?: string, prompt?: string, - callbackOnSuccess?: (amount: number) => void, + callbackOnSuccess: (amount: number) => void = () => {}, ) { this.customTitle = customTitle; this.giver = giver; diff --git a/src/components/MembersList.vue b/src/components/MembersList.vue index 32850aa..20f2c1b 100644 --- a/src/components/MembersList.vue +++ b/src/components/MembersList.vue @@ -155,17 +155,17 @@ import { logConsoleAndDb, retrieveSettingsForActiveAccount, db, -} from "@/db/index"; +} from "../db/index"; import { errorStringForLog, getHeaders, register, serverMessageForUser, -} from "@/libs/endorserServer"; -import { decryptMessage } from "@/libs/crypto"; -import { Contact } from "@/db/tables/contacts"; -import * as libsUtil from "@/libs/util"; -import { NotificationIface } from "@/constants/app"; +} from "../libs/endorserServer"; +import { decryptMessage } from "../libs/crypto"; +import { Contact } from "../db/tables/contacts"; +import * as libsUtil from "../libs/util"; +import { NotificationIface } from "../constants/app"; interface Member { admitted: boolean; @@ -335,39 +335,41 @@ export default class MembersList extends Vue { const contact = this.getContactFor(member.did); if (!member.member.admitted && !contact) { // If not a contact, show confirmation dialog - this.$notify({ - group: "modal", - type: "confirm", - title: "Add as Contact First?", - text: "This person is not in your contacts. Would you like to add them as a contact first?", - yesText: "Add as Contact", - noText: "Skip Adding Contact", - onYes: async () => { - await this.addAsContact(member); - // After adding as contact, proceed with admission - await this.toggleAdmission(member); - }, - onNo: async () => { - // If they choose not to add as contact, show second confirmation - this.$notify({ - group: "modal", - type: "confirm", - title: "Continue Without Adding?", - text: "Are you sure you want to proceed with admission even though they are not a contact?", - yesText: "Continue", - onYes: async () => { - await this.toggleAdmission(member); - }, - onCancel: async () => { - // Do nothing, effectively canceling the operation - }, + this.$notify( + { + group: "modal", + type: "confirm", + title: "Add as Contact First?", + text: "This person is not in your contacts. Would you like to add them as a contact first?", + yesText: "Add as Contact", + noText: "Skip Adding Contact", + onYes: async () => { + await this.addAsContact(member); + // After adding as contact, proceed with admission + await this.toggleAdmission(member); }, - -1, - ); - }, - }, - -1, - ); + onNo: async () => { + // If they choose not to add as contact, show second confirmation + this.$notify( + { + group: "modal", + type: "confirm", + title: "Continue Without Adding?", + text: "Are you sure you want to proceed with admission even though they are not a contact?", + yesText: "Continue", + onYes: async () => { + await this.toggleAdmission(member); + }, + onCancel: async () => { + // Do nothing, effectively canceling the operation + }, + }, + -1, + ); + }, + }, + -1, + ); } else { // If already a contact, proceed directly with admission this.toggleAdmission(member); @@ -391,7 +393,7 @@ export default class MembersList extends Vue { const contactOldOrNew: Contact = oldContact || { did: member.did, name: member.name, - } + }; const result = await register( this.activeDid, this.apiServer, diff --git a/src/components/OfferDialog.vue b/src/components/OfferDialog.vue index 8888de0..54d5d5e 100644 --- a/src/components/OfferDialog.vue +++ b/src/components/OfferDialog.vue @@ -83,7 +83,10 @@ import { Vue, Component, Prop } from "vue-facing-decorator"; import { NotificationIface } from "../constants/app"; -import { createAndSubmitOffer } from "../libs/endorserServer"; +import { + createAndSubmitOffer, + serverMessageForUser, +} from "../libs/endorserServer"; import * as libsUtil from "../libs/util"; import { retrieveSettingsForActiveAccount } from "../db/index"; diff --git a/src/libs/util.ts b/src/libs/util.ts index 4a6581f..67e0079 100644 --- a/src/libs/util.ts +++ b/src/libs/util.ts @@ -125,7 +125,7 @@ export const shortDid = (did: string) => { } else { return did.substring(0, did.indexOf(":", 4) + 7) + "..."; } -} +}; export const nameForDid = ( activeDid: string, diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue index da35265..4280fa8 100644 --- a/src/views/ContactsView.vue +++ b/src/views/ContactsView.vue @@ -1391,14 +1391,14 @@ export default class ContactsView extends Vue { const headers = await getHeaders(this.activeDid); const memberResponse = await this.axios.get( this.apiServer + "/api/partner/groupOnboardMember", - { headers } + { headers }, ); if (memberResponse.data.data) { // They're in a meeting, check if they're the host const hostResponse = await this.axios.get( this.apiServer + "/api/partner/groupOnboard", - { headers } + { headers }, ); if (hostResponse.data.data) { @@ -1423,16 +1423,18 @@ export default class ContactsView extends Vue { onNo: () => { (this.$router as Router).push({ name: "onboard-meeting-list" }); }, - noText: "Join Existing Meeting" + noText: "Join Existing Meeting", }, - -1 + -1, ); } } catch (error) { - logConsoleAndDb("Error checking meeting status:" + errorStringForLog(error)); + logConsoleAndDb( + "Error checking meeting status:" + errorStringForLog(error), + ); this.danger( "There was an error checking your meeting status.", - "Meeting Error" + "Meeting Error", ); } } diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index dc212ce..fa073c0 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -375,8 +375,7 @@ import { UAParser } from "ua-parser-js"; import { Component, Vue } from "vue-facing-decorator"; import { Router } from "vue-router"; -import App from "../App.vue"; -<<<<<<< HEAD +//import App from "../App.vue"; import EntityIcon from "../components/EntityIcon.vue"; import GiftedDialog from "../components/GiftedDialog.vue"; import GiftedPrompts from "../components/GiftedPrompts.vue"; @@ -386,18 +385,7 @@ import OnboardingDialog from "../components/OnboardingDialog.vue"; import QuickNav from "../components/QuickNav.vue"; import TopMessage from "../components/TopMessage.vue"; import UserNameDialog from "../components/UserNameDialog.vue"; -======= -import EntityIcon from "@/components/EntityIcon.vue"; -import GiftedDialog from "@/components/GiftedDialog.vue"; -import GiftedPrompts from "@/components/GiftedPrompts.vue"; -import FeedFilters from "@/components/FeedFilters.vue"; -import InfiniteScroll from "@/components/InfiniteScroll.vue"; -import OnboardingDialog from "@/components/OnboardingDialog.vue"; -import QuickNav from "@/components/QuickNav.vue"; -import TopMessage from "@/components/TopMessage.vue"; -import UserNameDialog from "@/components/UserNameDialog.vue"; -import ChoiceButtonDialog from "@/components/ChoiceButtonDialog.vue"; ->>>>>>> master +import ChoiceButtonDialog from "../components/ChoiceButtonDialog.vue"; import { AppString, NotificationIface, @@ -451,11 +439,6 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord { } @Component({ - computed: { - App() { - return App; - }, - }, components: { EntityIcon, FeedFilters, @@ -471,6 +454,7 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord { }) export default class HomeView extends Vue { $notify!: (notification: NotificationIface, timeout?: number) => void; + $router!: Router; AppString = AppString; PASSKEYS_ENABLED = PASSKEYS_ENABLED; @@ -483,7 +467,7 @@ export default class HomeView extends Vue { feedPreviousOldestId?: string; feedLastViewedClaimId?: string; givenName = ""; - isAnyFeedFilterOn: boolean; + isAnyFeedFilterOn = false; isCreatingIdentifier = false; isFeedFilteredByVisible = false; isFeedFilteredByNearby = false; @@ -555,6 +539,7 @@ export default class HomeView extends Vue { if (resp.status === 200) { await updateAccountSettings(this.activeDid, { isRegistered: true, + apiServer: "", }); this.isRegistered = true; } @@ -668,7 +653,7 @@ export default class HomeView extends Vue { if (results.data.length > 0) { endOfResults = false; // include the descriptions of the giver and receiver - for (const record: GiveSummaryRecord of results.data) { + for (const record of results.data as GiveSummaryRecord[]) { // similar code is in endorser-mobile utility.ts // claim.claim happen for some claims wrapped in a Verifiable Credential // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -897,14 +882,14 @@ export default class HomeView extends Vue { } goToActivityToUserPage() { - (this.$router as Router).push({ name: "new-activity" }); + this.$router.push({ name: "new-activity" }); } onClickLoadClaim(jwtId: string) { const route = { path: "/claim/" + encodeURIComponent(jwtId), }; - (this.$router as Router).push(route); + this.$router.push(route); } displayAmount(code: string, amt: number) { @@ -972,13 +957,13 @@ export default class HomeView extends Vue { option2Text: "We are nearby with cameras", option3Text: "We will share some other way", onOption1: () => { - (this.$router as Router).push({ name: "onboard-meeting-list" }); + this.$router.push({ name: "onboard-meeting-list" }); }, onOption2: () => { - (this.$router as Router).push({ name: "contact-qr" }); + this.$router.push({ name: "contact-qr" }); }, onOption3: () => { - (this.$router as Router).push({ name: "share-my-contact-info" }); + this.$router.push({ name: "share-my-contact-info" }); }, }); } diff --git a/src/views/OnboardMeetingListView.vue b/src/views/OnboardMeetingListView.vue index 35e2805..36a97c9 100644 --- a/src/views/OnboardMeetingListView.vue +++ b/src/views/OnboardMeetingListView.vue @@ -87,15 +87,15 @@ import { Component, Vue } from "vue-facing-decorator"; import { nextTick } from "vue"; import { Router } from "vue-router"; -import QuickNav from "@/components/QuickNav.vue"; -import TopMessage from "@/components/TopMessage.vue"; -import { logConsoleAndDb, retrieveSettingsForActiveAccount } from "@/db/index"; +import QuickNav from "../components/QuickNav.vue"; +import TopMessage from "../components/TopMessage.vue"; +import { logConsoleAndDb, retrieveSettingsForActiveAccount } from "../db/index"; import { errorStringForLog, getHeaders, serverMessageForUser, -} from "@/libs/endorserServer"; -import { encryptMessage } from "@/libs/crypto"; +} from "../libs/endorserServer"; +import { encryptMessage } from "../libs/crypto"; interface Meeting { name: string; diff --git a/src/views/OnboardMeetingMembersView.vue b/src/views/OnboardMeetingMembersView.vue index 6618fc3..9bc588a 100644 --- a/src/views/OnboardMeetingMembersView.vue +++ b/src/views/OnboardMeetingMembersView.vue @@ -32,9 +32,9 @@ import { Component, Vue } from "vue-facing-decorator"; import { RouteLocation } from "vue-router"; -import QuickNav from "@/components/QuickNav.vue"; -import TopMessage from "@/components/TopMessage.vue"; -import MembersList from "@/components/MembersList.vue"; +import QuickNav from "../components/QuickNav.vue"; +import TopMessage from "../components/TopMessage.vue"; +import MembersList from "../components/MembersList.vue"; @Component({ components: { diff --git a/src/views/OnboardMeetingSetupView.vue b/src/views/OnboardMeetingSetupView.vue index 8b1c004..41f87af 100644 --- a/src/views/OnboardMeetingSetupView.vue +++ b/src/views/OnboardMeetingSetupView.vue @@ -225,16 +225,16 @@