Browse Source

fix linting

master
Trent Larson 4 days ago
parent
commit
0b05ca3de8
  1. 46
      src/components/MembersList.vue
  2. 3
      src/views/OnboardMeetingListView.vue
  3. 5
      src/views/OnboardMeetingSetupView.vue

46
src/components/MembersList.vue

@ -7,7 +7,6 @@
<!-- Members List --> <!-- Members List -->
<div v-else class="space-y-4"> <div v-else class="space-y-4">
<div v-if="missingMyself" class="py-4"> <div v-if="missingMyself" class="py-4">
You are not yet admitted. The organizer will admit you. You are not yet admitted. The organizer will admit you.
</div> </div>
@ -30,15 +29,22 @@
<div class="flex"> <div class="flex">
<h3 class="text-lg font-medium">{{ member.name }}</h3> <h3 class="text-lg font-medium">{{ member.name }}</h3>
<span <span
v-if="showOrganizerTools && isOrganizer && member.did !== activeDid" v-if="
showOrganizerTools && isOrganizer && member.did !== activeDid
"
class="flex items-center" class="flex items-center"
> >
<button <button
@click="toggleAdmission(member)" @click="toggleAdmission(member)"
class="ml-2 w-6 h-6 flex items-center justify-center rounded-full bg-blue-100 text-blue-600 hover:bg-blue-200 hover:text-blue-800 transition-colors" class="ml-2 w-6 h-6 flex items-center justify-center rounded-full bg-blue-100 text-blue-600 hover:bg-blue-200 hover:text-blue-800 transition-colors"
:title="member.member.admitted ? 'Remove member' : 'Admit member'" :title="
member.member.admitted ? 'Remove member' : 'Admit member'
"
> >
<fa :icon="member.member.admitted ? 'minus' : 'plus'" class="text-sm" /> <fa
:icon="member.member.admitted ? 'minus' : 'plus'"
class="text-sm"
/>
</button> </button>
<button <button
@click="informAboutAdmission()" @click="informAboutAdmission()"
@ -93,7 +99,6 @@
"Your password failed. Please go back and try again." "Your password failed. Please go back and try again."
}} }}
</p> </p>
</div> </div>
</div> </div>
</template> </template>
@ -101,7 +106,11 @@
<script lang="ts"> <script lang="ts">
import { Component, Vue, Prop } from "vue-facing-decorator"; import { Component, Vue, Prop } from "vue-facing-decorator";
import { logConsoleAndDb, retrieveSettingsForActiveAccount, db } from "@/db/index"; import {
logConsoleAndDb,
retrieveSettingsForActiveAccount,
db,
} from "@/db/index";
import { import {
errorStringForLog, errorStringForLog,
getHeaders, getHeaders,
@ -152,7 +161,7 @@ export default class MembersList extends Vue {
await this.axios.put( await this.axios.put(
`${this.apiServer}/api/partner/groupOnboardMember/${member.member.memberId}`, `${this.apiServer}/api/partner/groupOnboardMember/${member.member.memberId}`,
{ admitted: !member.member.admitted }, { admitted: !member.member.admitted },
{ headers } { headers },
); );
// Update local state // Update local state
member.member.admitted = !member.member.admitted; member.member.admitted = !member.member.admitted;
@ -163,7 +172,12 @@ export default class MembersList extends Vue {
did: member.did, did: member.did,
name: member.name, name: member.name,
}; };
const result = await register(this.activeDid, this.apiServer, this.axios, contact); const result = await register(
this.activeDid,
this.apiServer,
this.axios,
contact,
);
if (result.success) { if (result.success) {
member.member.registered = true; member.member.registered = true;
await db.contacts.update(member.did, { registered: true }); await db.contacts.update(member.did, { registered: true });
@ -192,8 +206,15 @@ export default class MembersList extends Vue {
} }
} }
} catch (error) { } catch (error) {
logConsoleAndDb("Error toggling admission: " + errorStringForLog(error), true); logConsoleAndDb(
this.$emit("error", serverMessageForUser(error) || "Failed to update member admission status."); "Error toggling admission: " + errorStringForLog(error),
true,
);
this.$emit(
"error",
serverMessageForUser(error) ||
"Failed to update member admission status.",
);
} }
} }
@ -240,7 +261,8 @@ export default class MembersList extends Vue {
return; return;
} }
let isFirstEntry = true, foundMyself = false; let isFirstEntry = true,
foundMyself = false;
for (const member of this.members) { for (const member of this.members) {
try { try {
const decryptedContent = await decryptMessage( const decryptedContent = await decryptMessage(
@ -299,7 +321,7 @@ export default class MembersList extends Vue {
} }
isContactAlready(did: string): boolean { isContactAlready(did: string): boolean {
return this.contacts.some(contact => contact.did === did); return this.contacts.some((contact) => contact.did === did);
} }
async addAsContact(member: DecryptedMember) { async addAsContact(member: DecryptedMember) {

3
src/views/OnboardMeetingListView.vue

@ -325,7 +325,8 @@ export default class OnboardMeetingListView extends Vue {
type: "danger", type: "danger",
title: "Error", title: "Error",
text: text:
serverMessageForUser(error) || "You failed to leave the meeting.", serverMessageForUser(error) ||
"You failed to leave the meeting.",
}, },
5000, 5000,
); );

5
src/views/OnboardMeetingSetupView.vue

@ -208,7 +208,7 @@
<MembersList <MembersList
:password="currentMeeting.password || ''" :password="currentMeeting.password || ''"
decrypt-failure-message="Unable to decrypt some member information. Please check your password or have them reset theirs." :decrypt-failure-message="DECRYPT_FAILURE_MESSAGE"
:show-organizer-tools="true" :show-organizer-tools="true"
@error="handleMembersError" @error="handleMembersError"
class="mt-8" class="mt-8"
@ -264,6 +264,9 @@ export default class OnboardMeetingView extends Vue {
timeout?: number, timeout?: number,
) => void; ) => void;
DECRYPT_FAILURE_MESSAGE =
"Unable to decrypt some member information. Check your password, or have them reset theirs.";
currentMeeting: ServerMeeting | null = null; currentMeeting: ServerMeeting | null = null;
newOrUpdatedMeeting: MeetingSetupInfo | null = null; newOrUpdatedMeeting: MeetingSetupInfo | null = null;
activeDid = ""; activeDid = "";

Loading…
Cancel
Save