trentlarson/crowd-funder-from-jason
1
0
Fork 0
forked from jsnbuchanan/crowd-funder-for-time-pwa
Code Issues Pull Requests Projects Releases Wiki Activity

fix: standardize FontAwesome usage and improve error handling

Browse Source 
- Change <fa> to <font-awesome> for consistent component naming
- Add structured error logging in QR scanner services
- Fix cacheImage event handling in ActivityListItem
- Improve code formatting and error wrapping
This commit is contained in:
Matthew Raymer
2025-04-24 09:34:01 +00:00
parent 0dfcb17ecc
commit db86114196
5 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/ActivityListItem.vue
View File

@@ -57,7 +57,7 @@
class="w-full h-auto max-w-lg max-h-96 object-contain mx-auto drop-shadow-md"
:src="record.image"
alt="Activity image"
@load="$emit('cacheImage', record.image)"
@load="cacheImage(record.image)"
/>
</a>
</div>
@@ -182,7 +182,7 @@
</template>
<script lang="ts">
import { Component, Prop, Vue } from "vue-facing-decorator";
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
import { GiveRecordWithContactInfo } from "../types";
import EntityIcon from "./EntityIcon.vue";
import { isGiveClaimType, notifyWhyCannotConfirm } from "../libs/util";
@@ -202,6 +202,11 @@ export default class ActivityListItem extends Vue {
@Prop() activeDid!: string;
@Prop() confirmerIdList?: string[];
@Emit()
cacheImage(image: string) {
return image;
}
get fetchAmount(): string {
const claim =
(this.record.fullClaim as unknown).claim || this.record.fullClaim;

46
src/services/QRScanner/CapacitorQRScanner.ts
View File

@@ -19,8 +19,11 @@ export class CapacitorQRScanner implements QRScannerService {
const { camera } = await BarcodeScanner.checkPermissions();
return camera === "granted";
} catch (error) {
const wrappedError = error instanceof Error ? error : new Error(String(error));
logger.error("Error checking camera permissions:", { error: wrappedError.message });
const wrappedError =
error instanceof Error ? error : new Error(String(error));
logger.error("Error checking camera permissions:", {
error: wrappedError.message,
});
return false;
}
}
@@ -39,8 +42,11 @@ export class CapacitorQRScanner implements QRScannerService {
logger.debug(`Camera permissions ${granted ? "granted" : "denied"}`);
return granted;
} catch (error) {
const wrappedError = error instanceof Error ? error : new Error(String(error));
logger.error("Error requesting camera permissions:", { error: wrappedError.message });
const wrappedError =
error instanceof Error ? error : new Error(String(error));
logger.error("Error requesting camera permissions:", {
error: wrappedError.message,
});
return false;
}
}
@@ -52,8 +58,11 @@ export class CapacitorQRScanner implements QRScannerService {
logger.debug(`Scanner support: ${supported}`);
return supported;
} catch (error) {
const wrappedError = error instanceof Error ? error : new Error(String(error));
logger.error("Error checking scanner support:", { error: wrappedError.message });
const wrappedError =
error instanceof Error ? error : new Error(String(error));
logger.error("Error checking scanner support:", {
error: wrappedError.message,
});
return false;
}
}
@@ -89,27 +98,32 @@ export class CapacitorQRScanner implements QRScannerService {
const scanOptions: StartScanOptions = {
formats: [BarcodeFormat.QrCode],
lensFacing: options?.camera === "front" ? LensFacing.Front : LensFacing.Back,
lensFacing:
options?.camera === "front" ? LensFacing.Front : LensFacing.Back,
};
logger.debug("Scanner options:", scanOptions);
// Add listener for barcode scans
const handle = await BarcodeScanner.addListener("barcodeScanned", (result) => {
const handle = await BarcodeScanner.addListener(
"barcodeScanned",
(result) => {
if (this.scanListener && result.barcode?.rawValue) {
this.scanListener.onScan(result.barcode.rawValue);
}
});
},
);
this.listenerHandles.push(handle.remove);
// Start continuous scanning
await BarcodeScanner.startScan(scanOptions);
logger.info("MLKit scanner started successfully");
} catch (error) {
const wrappedError = error instanceof Error ? error : new Error(String(error));
const wrappedError =
error instanceof Error ? error : new Error(String(error));
logger.error("Error during QR scan:", {
error: wrappedError.message,
stack: wrappedError.stack
stack: wrappedError.stack,
});
this.isScanning = false;
await this.cleanup();
@@ -129,10 +143,11 @@ export class CapacitorQRScanner implements QRScannerService {
await BarcodeScanner.stopScan();
logger.info("QR scanner stopped successfully");
} catch (error) {
const wrappedError = error instanceof Error ? error : new Error(String(error));
const wrappedError =
error instanceof Error ? error : new Error(String(error));
logger.error("Error stopping QR scan:", {
error: wrappedError.message,
stack: wrappedError.stack
stack: wrappedError.stack,
});
this.scanListener?.onError?.(wrappedError);
throw wrappedError;
@@ -171,10 +186,11 @@ export class CapacitorQRScanner implements QRScannerService {
logger.info("QR scanner cleanup completed");
} catch (error) {
const wrappedError = error instanceof Error ? error : new Error(String(error));
const wrappedError =
error instanceof Error ? error : new Error(String(error));
logger.error("Error during cleanup:", {
error: wrappedError.message,
stack: wrappedError.stack
stack: wrappedError.stack,
});
throw wrappedError;
} finally {

7
src/services/QRScanner/WebDialogQRScanner.ts
View File

@@ -32,9 +32,10 @@ export class WebDialogQRScanner implements QRScannerService {
stream.getTracks().forEach((track) => track.stop());
return true;
} catch (error) {
const wrappedError =
error instanceof Error ? error : new Error(String(error));
logger.error("Error requesting camera permissions:", wrappedError);
logger.error("Error requesting camera permissions:", {
error: error instanceof Error ? error.message : String(error),
stack: error instanceof Error ? error.stack : undefined,
});
return false;
}
}

18
src/views/ContactQRScanShowView.vue
View File

@@ -114,7 +114,6 @@ import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
import { getContactJwtFromJwtUrl } from "../libs/crypto";
import {
generateEndorserJwtUrlForAccount,
isDid,
register,
setVisibilityUtil,
} from "../libs/endorserServer";
@@ -170,12 +169,15 @@ export default class ContactQRScanShow extends Vue {
this.activeDid = settings.activeDid || "";
this.apiServer = settings.apiServer || "";
this.givenName = settings.firstName || "";
this.hideRegisterPromptOnNewContact = !!settings.hideRegisterPromptOnNewContact;
this.hideRegisterPromptOnNewContact =
!!settings.hideRegisterPromptOnNewContact;
this.isRegistered = !!settings.isRegistered;
const account = await retrieveAccountMetadata(this.activeDid);
if (account) {
const name = (settings.firstName || "") + (settings.lastName ? ` ${settings.lastName}` : "");
const name =
(settings.firstName || "") +
(settings.lastName ? ` ${settings.lastName}` : "");
this.qrValue = await generateEndorserJwtUrlForAccount(
account,
!!settings.isRegistered,
@@ -294,7 +296,10 @@ export default class ContactQRScanShow extends Vue {
async onScanDetect(result: string | QRScanResult) {
try {
// Extract raw value from different possible formats
const rawValue = typeof result === 'string' ? result : (result?.rawValue || result?.barcode);
const rawValue =
typeof result === "string"
? result
: result?.rawValue || result?.barcode;
if (!rawValue) {
logger.warn("Invalid scan result - no value found:", result);
return;
@@ -577,7 +582,9 @@ export default class ContactQRScanShow extends Vue {
// Check if contact already exists
const existingContacts = await db.contacts.toArray();
const existingContact = existingContacts.find(c => c.did === contact.did);
const existingContact = existingContacts.find(
(c) => c.did === contact.did,
);
if (existingContact) {
logger.info("Contact already exists", { did: contact.did });
@@ -676,4 +683,3 @@ export default class ContactQRScanShow extends Vue {
aspect-ratio: 1 / 1;
}
</style>

2
src/views/ContactsView.vue
View File

@@ -289,7 +289,7 @@
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" />
<font-awesome icon="file-lines" class="fa-fw" />
</router-link>
</div>
</div>