(chore): cleaning up formatting and relative references

This commit is contained in:
Matthew Raymer
2025-02-06 14:08:54 +00:00
parent 43983bd993
commit d9085ced6d
10 changed files with 98 additions and 93 deletions

View File

@@ -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",
);
}
}

View File

@@ -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" });
},
});
}

View File

@@ -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;

View File

@@ -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: {

View File

@@ -225,16 +225,16 @@
<script lang="ts">
import { Component, Vue } from "vue-facing-decorator";
import QuickNav from "@/components/QuickNav.vue";
import TopMessage from "@/components/TopMessage.vue";
import MembersList from "@/components/MembersList.vue";
import { logConsoleAndDb, retrieveSettingsForActiveAccount } from "@/db/index";
import QuickNav from "../components/QuickNav.vue";
import TopMessage from "../components/TopMessage.vue";
import MembersList from "../components/MembersList.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 ServerMeeting {
groupId: number; // from the server

View File

@@ -30,6 +30,7 @@
{
group: 'alert',
type: 'toast',
title: 'Toast',
text: 'I\'m a toast. Without a timeout, I\'m stuck.',
},
5000,
@@ -114,6 +115,8 @@
{
group: 'modal',
type: 'notification-permission',
title: 'Notification Permission',
text: 'Enable notifications?',
},
-1,
)
@@ -129,6 +132,8 @@
{
group: 'modal',
type: 'notification-mute',
title: 'Notification Settings',
text: 'Notifications muted',
},
-1,
)
@@ -144,6 +149,8 @@
{
group: 'modal',
type: 'notification-off',
title: 'Notifications',
text: 'Notifications turned off',
},
-1,
)
@@ -294,6 +301,7 @@ const TEST_PAYLOAD = {
@Component({ components: { QuickNav } })
export default class Help extends Vue {
$notify!: (notification: NotificationIface, timeout?: number) => void;
$router!: Router;
// for encryption/decryption
encryptionTestResult?: boolean;
@@ -326,7 +334,8 @@ export default class Help extends Vue {
}
async uploadFile(event: Event) {
inputFileNameRef.value = event.target?.["files"][0];
const target = event.target as HTMLInputElement;
inputFileNameRef.value = target.files?.[0];
// https://developer.mozilla.org/en-US/docs/Web/API/File
// ... plus it has a `type` property from my testing
const file = inputFileNameRef.value;
@@ -339,7 +348,7 @@ export default class Help extends Vue {
type: file.type,
});
const blobB64 = await blobToBase64(blob);
this.fileName = file.name as string;
this.fileName = (file as File).name;
const temp = await db.temp.get(SHARED_PHOTO_BASE64_KEY);
if (temp) {
await db.temp.update(SHARED_PHOTO_BASE64_KEY, { blobB64 });