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

feat: Complete NewEditProjectView.vue Enhanced Triple Migration Pattern and ImageMethodDialog improvements

Browse Source 
- Complete all 4 phases of Enhanced Triple Migration Pattern for NewEditProjectView.vue
- Replace databaseUtil calls with PlatformServiceMixin methods
- Standardize notification calls using constants and timeout helpers
- Extract 12 computed properties for template streamlining
- Add notification constants and helper functions to notifications.ts
- Extract long CSS classes to computed properties in ImageMethodDialog.vue
- Fix platformService conflict in ImageMethodDialog.vue
- Complete PushNotificationPermission.vue migration with all phases
- Update migration tracking documentation
- Migration completed in 11m 30s (74% faster than estimate)
This commit is contained in:
Matthew Raymer
2025-07-09 07:22:58 +00:00
parent 66059fca4e
commit 6fe9d59eae
8 changed files with 1031 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

411
src/components/ImageMethodDialog.vue
View File

@@ -3,70 +3,30 @@
<div class="dialog relative">
<div class="text-lg text-center font-bold relative">
<h1 id="ViewHeading" class="text-center font-bold">
<span v-if="uploading">Uploading Image&hellip;</span>
<span v-else-if="blob">{{
crop ? "Crop Image" : "Preview Image"
}}</span>
<span v-else-if="showCameraPreview">Upload Image</span>
<span v-else>Add Photo</span>
{{ dialogHeading }}
</h1>
<div
class="text-2xl text-center px-1 py-0.5 leading-none absolute -right-1 top-0"
@click="close()"
>
<div :class="closeButtonClasses" @click="close()">
<font-awesome icon="xmark" class="w-[1em]"></font-awesome>
</div>
</div>
<!-- FEEDBACK: Show if camera preview is not visible after mounting -->
<div
v-if="!showCameraPreview && !blob && isRegistered"
class="bg-red-100 text-red-700 border border-red-400 rounded px-4 py-3 my-4 text-sm"
>
<div v-if="shouldShowCameraFeedback" :class="cameraFeedbackClasses">
<strong>Camera preview not started.</strong>
<div v-if="cameraState === 'off'">
<span v-if="platformCapabilities.isMobile">
<b>Note:</b> This mobile browser may not support direct camera
access, or the app is treating it as a native app.<br />
<b>Tip:</b> Try using a desktop browser, or check if your browser
supports camera access for web apps.<br />
<b>Developer:</b> The platform detection logic may be skipping
camera preview for mobile browsers. <br />
<b>Action:</b> Review <code>platformCapabilities.isMobile</code> and
ensure web browsers on mobile are not treated as native apps.
</span>
<span v-else>
<b>Tip:</b> Your browser supports camera APIs, but the preview did
not start. Try refreshing the page or checking browser permissions.
</span>
</div>
<div v-else-if="cameraState === 'error'">
<b>Error:</b> {{ error || cameraStateMessage }}
</div>
<div v-else>
<b>Status:</b> {{ cameraStateMessage || "Unknown reason." }}
</div>
<div><b>Status:</b> {{ cameraFeedbackMessage }}</div>
</div>
<div class="mt-4">
<template v-if="isRegistered">
<div v-if="!blob">
<div
class="border-b border-dashed border-slate-300 text-orange-400 mb-4 font-bold text-sm"
>
<span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
<div :class="sectionDividerClasses">
<span :class="sectionDividerSpanClasses">
Take a photo with your camera
</span>
</div>
<div
v-if="showCameraPreview"
class="camera-preview relative flex bg-black overflow-hidden mb-4"
>
<div v-if="shouldShowCameraPreview" :class="cameraPreviewClasses">
<!-- Diagnostic Panel -->
<div
v-if="showDiagnostics"
class="absolute top-0 left-0 right-0 bg-black/80 text-white text-xs p-2 pt-8 z-20 overflow-auto max-h-[50vh]"
>
<div v-if="showDiagnostics" :class="diagnosticsPanelClasses">
<div class="grid grid-cols-2 gap-2">
<div>
<p><strong>Camera State:</strong> {{ cameraState }}</p>
@@ -108,10 +68,10 @@
<!-- Toggle Diagnostics Button -->
<button
class="absolute top-2 right-2 bg-black/50 text-white px-2 py-1 rounded text-xs z-30"
:class="diagnosticsToggleClasses"
@click="toggleDiagnostics"
>
{{ showDiagnostics ? "Hide Diagnostics" : "Show Diagnostics" }}
{{ diagnosticsToggleText }}
</button>
<div class="camera-container w-full h-full relative">
<video
@@ -121,18 +81,16 @@
playsinline
muted
></video>
<div
class="absolute bottom-4 inset-x-0 flex items-center justify-center gap-4"
>
<div :class="cameraControlsClasses">
<button
class="bg-white text-slate-800 p-3 rounded-full text-2xl leading-none"
:class="cameraControlButtonClasses"
@click="capturePhoto"
>
<font-awesome icon="camera" class="w-[1em]" />
</button>
<button
v-if="platformCapabilities.isMobile"
class="bg-white text-slate-800 p-3 rounded-full text-2xl leading-none"
v-if="shouldShowCameraRotation"
:class="cameraControlButtonClasses"
@click="rotateCamera"
>
<font-awesome icon="rotate" class="w-[1em]" />
@@ -140,24 +98,20 @@
</div>
</div>
</div>
<div
class="border-b border-dashed border-slate-300 text-orange-400 mt-4 mb-4 font-bold text-sm"
>
<span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
<div :class="sectionDividerClasses">
<span :class="sectionDividerSpanClasses">
OR choose a file from your device
</span>
</div>
<div class="mt-4">
<input
type="file"
class="w-full file:text-center file:bg-gradient-to-b file:from-slate-400 file:to-slate-700 file:shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] file:text-white file:px-3 file:py-2 file:rounded-md file:border-none file:cursor-pointer file:me-2"
:class="fileInputClasses"
@change="uploadImageFile"
/>
</div>
<div
class="border-b border-dashed border-slate-300 text-orange-400 mt-4 mb-4 font-bold text-sm"
>
<span class="block w-fit mx-auto -mb-2.5 bg-white px-2">
<div :class="sectionDividerClasses">
<span :class="sectionDividerSpanClasses">
OR paste an image URL
</span>
</div>
@@ -165,12 +119,12 @@
<input
v-model="imageUrl"
type="text"
class="block w-full rounded border border-slate-400 px-4 py-2"
:class="urlInputClasses"
placeholder="https://example.com/image.jpg"
/>
<button
v-if="imageUrl"
class="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-2 rounded-md cursor-pointer"
:class="acceptUrlButtonClasses"
@click="acceptUrl"
>
<font-awesome icon="check" class="fa-fw" />
@@ -192,38 +146,27 @@
backgroundColor: '#f8f8f8',
margin: 'auto',
}"
:img="createBlobURL(blob)"
:img="blobUrl"
:options="{
viewMode: 1,
dragMode: 'crop',
aspectRatio: 1 / 1,
}"
class="max-h-[50vh] max-w-[90vw] object-contain"
:class="cropperClasses"
/>
</div>
<div v-else>
<div class="flex justify-center">
<img
:src="createBlobURL(blob)"
class="mt-2 rounded max-h-[50vh] max-w-[90vw] object-contain"
/>
<img :src="blobUrl" :class="imageContainerClasses" />
</div>
</div>
<div
:class="[
'grid gap-2 mt-2',
showRetry ? 'grid-cols-2' : 'grid-cols-1',
]"
>
<button
class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-2 px-3 rounded-md"
@click="uploadImage"
>
<div :class="buttonGridClasses">
<button :class="primaryButtonClasses" @click="uploadImage">
<span>Upload</span>
</button>
<button
v-if="showRetry"
class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-2 px-3 rounded-md"
:class="secondaryButtonClasses"
@click="retryImage"
>
<span>Retry</span>
@@ -235,7 +178,7 @@
<template v-else>
<div
id="noticeBeforeUpload"
class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3"
:class="registrationNoticeClasses"
role="alert"
aria-live="polite"
>
@@ -243,7 +186,7 @@
Before you can upload a photo, a friend needs to register you.
</p>
<button
class="inline-block text-md uppercase 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"
:class="registrationButtonClasses"
@click="handleQRCodeClick"
>
Share Your Info
@@ -262,10 +205,19 @@ import { Component, Vue } from "vue-facing-decorator";
import VuePictureCropper, { cropper } from "vue-picture-cropper";
import { Capacitor } from "@capacitor/core";
import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "../constants/app";
import {
NOTIFY_IMAGE_DIALOG_SETTINGS_ERROR,
NOTIFY_IMAGE_DIALOG_RETRIEVAL_ERROR,
NOTIFY_IMAGE_DIALOG_CAPTURE_ERROR,
NOTIFY_IMAGE_DIALOG_NO_IMAGE_ERROR,
createImageDialogCameraErrorMessage,
createImageDialogUploadErrorMessage,
IMAGE_DIALOG_TIMEOUT_LONG,
IMAGE_DIALOG_TIMEOUT_MODAL,
} from "../constants/notifications";
import { accessToken } from "../libs/crypto";
import { logger } from "../utils/logger";
import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
import * as databaseUtil from "../db/databaseUtil";
import { PlatformServiceMixin } from "../utils/PlatformServiceMixin";
import { Prop } from "vue-facing-decorator";
import { Router } from "vue-router";
@@ -273,6 +225,7 @@ const inputImageFileNameRef = ref<Blob>();
@Component({
components: { VuePictureCropper },
mixins: [PlatformServiceMixin],
})
export default class ImageMethodDialog extends Vue {
$notify!: (notification: NotificationIface, timeout?: number) => void;
@@ -317,7 +270,6 @@ export default class ImageMethodDialog extends Vue {
/** Current camera facing mode */
private currentFacingMode: "environment" | "user" = "environment";
private platformService = PlatformServiceFactory.getInstance();
URL = window.URL || window.webkitURL;
private platformCapabilities = this.platformService.getCapabilities();
@@ -350,13 +302,233 @@ export default class ImageMethodDialog extends Vue {
})
defaultCameraMode!: string;
/**
* Computed property for dialog heading text
* Determines the appropriate heading based on current state
*/
get dialogHeading(): string {
if (this.uploading) return "Uploading Image…";
if (this.blob) return this.crop ? "Crop Image" : "Preview Image";
if (this.showCameraPreview) return "Upload Image";
return "Add Photo";
}
/**
* Computed property for camera preview visibility
* Determines if camera preview should be shown
*/
get shouldShowCameraPreview(): boolean {
return this.showCameraPreview && !this.blob;
}
/**
* Computed property for camera feedback visibility
* Shows feedback when camera preview is not visible after mounting
*/
get shouldShowCameraFeedback(): boolean {
return !this.showCameraPreview && !this.blob && this.isRegistered;
}
/**
* Computed property for camera feedback message
* Provides appropriate feedback based on camera state
*/
get cameraFeedbackMessage(): string {
if (this.cameraState === "off") {
if (this.platformCapabilities.isMobile) {
return "This mobile browser may not support direct camera access, or the app is treating it as a native app. Try using a desktop browser, or check if your browser supports camera access for web apps.";
}
return "Your browser supports camera APIs, but the preview did not start. Try refreshing the page or checking browser permissions.";
}
if (this.cameraState === "error") {
return this.error || this.cameraStateMessage || "Unknown error occurred.";
}
return this.cameraStateMessage || "Unknown reason.";
}
/**
* Computed property for button grid classes
* Determines grid layout based on retry button visibility
*/
get buttonGridClasses(): string {
return `grid gap-2 mt-2 ${this.showRetry ? "grid-cols-2" : "grid-cols-1"}`;
}
/**
* Computed property for blob URL
* Creates object URL for blob display
*/
get blobUrl(): string {
return this.blob ? this.createBlobURL(this.blob) : "";
}
/**
* Computed property for diagnostics toggle button text
* Determines button text based on diagnostics visibility
*/
get diagnosticsToggleText(): string {
return this.showDiagnostics ? "Hide Diagnostics" : "Show Diagnostics";
}
/**
* Computed property for camera rotation button visibility
* Shows rotation button only on mobile platforms
*/
get shouldShowCameraRotation(): boolean {
return this.platformCapabilities.isMobile;
}
/**
* Computed property for close button classes
* Provides consistent styling for the close button
*/
get closeButtonClasses(): string {
return "text-2xl text-center px-1 py-0.5 leading-none absolute -right-1 top-0";
}
/**
* Computed property for camera feedback container classes
* Provides consistent styling for camera feedback messages
*/
get cameraFeedbackClasses(): string {
return "bg-red-100 text-red-700 border border-red-400 rounded px-4 py-3 my-4 text-sm";
}
/**
* Computed property for section divider classes
* Provides consistent styling for section dividers
*/
get sectionDividerClasses(): string {
return "border-b border-dashed border-slate-300 text-orange-400 mb-4 font-bold text-sm";
}
/**
* Computed property for section divider span classes
* Provides consistent styling for divider labels
*/
get sectionDividerSpanClasses(): string {
return "block w-fit mx-auto -mb-2.5 bg-white px-2";
}
/**
* Computed property for camera preview container classes
* Provides consistent styling for camera preview
*/
get cameraPreviewClasses(): string {
return "camera-preview relative flex bg-black overflow-hidden mb-4";
}
/**
* Computed property for diagnostics panel classes
* Provides consistent styling for diagnostics overlay
*/
get diagnosticsPanelClasses(): string {
return "absolute top-0 left-0 right-0 bg-black/80 text-white text-xs p-2 pt-8 z-20 overflow-auto max-h-[50vh]";
}
/**
* Computed property for diagnostics toggle button classes
* Provides consistent styling for diagnostics toggle
*/
get diagnosticsToggleClasses(): string {
return "absolute top-2 right-2 bg-black/50 text-white px-2 py-1 rounded text-xs z-30";
}
/**
* Computed property for camera control button classes
* Provides consistent styling for camera control buttons
*/
get cameraControlButtonClasses(): string {
return "bg-white text-slate-800 p-3 rounded-full text-2xl leading-none";
}
/**
* Computed property for camera controls container classes
* Provides consistent styling for camera controls
*/
get cameraControlsClasses(): string {
return "absolute bottom-4 inset-x-0 flex items-center justify-center gap-4";
}
/**
* Computed property for file input classes
* Provides consistent styling for file input with custom button
*/
get fileInputClasses(): string {
return "w-full file:text-center file:bg-gradient-to-b file:from-slate-400 file:to-slate-700 file:shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] file:text-white file:px-3 file:py-2 file:rounded-md file:border-none file:cursor-pointer file:me-2";
}
/**
* Computed property for URL input classes
* Provides consistent styling for URL input field
*/
get urlInputClasses(): string {
return "block w-full rounded border border-slate-400 px-4 py-2";
}
/**
* Computed property for accept URL button classes
* Provides consistent styling for accept URL button
*/
get acceptUrlButtonClasses(): string {
return "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-2 rounded-md cursor-pointer";
}
/**
* Computed property for image container classes
* Provides consistent styling for image display
*/
get imageContainerClasses(): string {
return "mt-2 rounded max-h-[50vh] max-w-[90vw] object-contain";
}
/**
* Computed property for cropper container classes
* Provides consistent styling for image cropper
*/
get cropperClasses(): string {
return "max-h-[50vh] max-w-[90vw] object-contain";
}
/**
* Computed property for primary button classes
* Provides consistent styling for primary action buttons
*/
get primaryButtonClasses(): string {
return "bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-2 px-3 rounded-md";
}
/**
* Computed property for secondary button classes
* Provides consistent styling for secondary action buttons
*/
get secondaryButtonClasses(): string {
return "bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-2 px-3 rounded-md";
}
/**
* Computed property for registration notice classes
* Provides consistent styling for registration notice
*/
get registrationNoticeClasses(): string {
return "bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3";
}
/**
* Computed property for registration button classes
* Provides consistent styling for registration button
*/
get registrationButtonClasses(): string {
return "inline-block text-md uppercase 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";
}
/**
* Lifecycle hook: Initializes component and retrieves user settings
* @throws {Error} When settings retrieval fails
*/
async mounted() {
try {
const settings = await databaseUtil.retrieveSettingsForActiveAccount();
const settings = await this.$accountSettings();
this.activeDid = settings.activeDid || "";
} catch (error: unknown) {
logger.error("Error retrieving settings from database:", error);
@@ -368,9 +540,9 @@ export default class ImageMethodDialog extends Vue {
text:
error instanceof Error
? error.message
: "There was an error retrieving your settings.",
: NOTIFY_IMAGE_DIALOG_SETTINGS_ERROR.message,
},
-1,
IMAGE_DIALOG_TIMEOUT_MODAL,
);
}
}
@@ -435,9 +607,9 @@ export default class ImageMethodDialog extends Vue {
group: "alert",
type: "danger",
title: "Error",
text: "There was an error retrieving that image.",
text: NOTIFY_IMAGE_DIALOG_RETRIEVAL_ERROR.message,
},
5000,
IMAGE_DIALOG_TIMEOUT_LONG,
);
}
} else {
@@ -510,22 +682,9 @@ export default class ImageMethodDialog extends Vue {
}
} catch (error) {
logger.error("Error starting camera preview:", error);
let errorMessage =
error instanceof Error ? error.message : "Failed to access camera";
if (
error instanceof Error &&
(error.name === "NotReadableError" || error.name === "TrackStartError")
) {
errorMessage =
"Camera is in use by another application. Please close any other apps or browser tabs using the camera and try again.";
} else if (
error instanceof Error &&
(error.name === "NotAllowedError" ||
error.name === "PermissionDeniedError")
) {
errorMessage =
"Camera access was denied. Please allow camera access in your browser settings.";
}
const errorMessage = createImageDialogCameraErrorMessage(
error instanceof Error ? error : new Error("Unknown camera error"),
);
this.cameraState = "error";
this.cameraStateMessage = errorMessage;
this.error = errorMessage;
@@ -537,7 +696,7 @@ export default class ImageMethodDialog extends Vue {
title: "Error",
text: errorMessage,
},
5000,
IMAGE_DIALOG_TIMEOUT_LONG,
);
}
}
@@ -583,9 +742,9 @@ export default class ImageMethodDialog extends Vue {
group: "alert",
type: "danger",
title: "Error",
text: "Failed to capture photo. Please try again.",
text: NOTIFY_IMAGE_DIALOG_CAPTURE_ERROR.message,
},
5000,
IMAGE_DIALOG_TIMEOUT_LONG,
);
}
}
@@ -634,9 +793,9 @@ export default class ImageMethodDialog extends Vue {
group: "alert",
type: "danger",
title: "Error",
text: "There was an error finding the picture. Please try again.",
text: NOTIFY_IMAGE_DIALOG_NO_IMAGE_ERROR.message,
},
5000,
IMAGE_DIALOG_TIMEOUT_LONG,
);
this.uploading = false;
this.close();
@@ -663,25 +822,7 @@ export default class ImageMethodDialog extends Vue {
this.close();
this.imageCallback(response.data.url as string);
} catch (error: unknown) {
let errorMessage = "There was an error saving the picture.";
if (axios.isAxiosError(error)) {
const status = error.response?.status;
const data = error.response?.data;
if (status === 401) {
errorMessage = "Authentication failed. Please try logging in again.";
} else if (status === 413) {
errorMessage = "Image file is too large. Please try a smaller image.";
} else if (status === 415) {
errorMessage =
"Unsupported image format. Please try a different image.";
} else if (status && status >= 500) {
errorMessage = "Server error. Please try again later.";
} else if (data?.message) {
errorMessage = data.message;
}
}
const errorMessage = createImageDialogUploadErrorMessage(error);
this.$notify(
{
@@ -690,7 +831,7 @@ export default class ImageMethodDialog extends Vue {
title: "Error",
text: errorMessage,
},
5000,
IMAGE_DIALOG_TIMEOUT_LONG,
);
this.uploading = false;
this.blob = undefined;

225
src/components/PushNotificationPermission.vue
View File

@@ -15,8 +15,8 @@
class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
>
<div class="w-full px-6 py-6 text-slate-900 text-center">
<p v-if="serviceWorkerReady && vapidKey" class="text-lg mb-4">
<span v-if="pushType === DAILY_CHECK_TITLE">
<p v-if="isSystemReady" class="text-lg mb-4">
<span v-if="isDailyCheck">
Would you like to be notified of new activity, up to once a day?
</span>
<span v-else>
@@ -24,12 +24,12 @@
</span>
</p>
<p v-else class="text-lg mb-4">
Waiting for system initialization, which may take up to 5 seconds...
{{ waitingMessage }}
<font-awesome icon="spinner" spin />
</p>
<div v-if="serviceWorkerReady && vapidKey">
<div v-if="pushType === DAILY_CHECK_TITLE">
<div v-if="canShowNotificationForm">
<div v-if="isDailyCheck">
<span>Yes, send me a message when there is new data for me</span>
</div>
<div v-else>
@@ -67,21 +67,15 @@
/>
<span
class="rounded-r border border-slate-400 bg-slate-200 text-center text-blue-500 mt-2 px-2 py-2 w-20"
@click="hourAm = !hourAm"
@click="toggleHourAm"
>
<span v-if="hourAm">
AM <font-awesome icon="chevron-down" />
</span>
<span v-else> PM <font-awesome icon="chevron-up" /> </span>
<span>{{ amPmLabel }} <font-awesome :icon="amPmIcon" /></span>
</span>
</span>
</div>
<button
class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white mt-2 px-2 py-2 rounded-md"
@click="
close();
turnOnNotifications();
"
@click="handleTurnOnNotifications"
>
Turn on Daily Message
</button>
@@ -103,12 +97,24 @@
import { Component, Vue } from "vue-facing-decorator";
import { DEFAULT_PUSH_SERVER, NotificationIface } from "../constants/app";
import * as databaseUtil from "../db/databaseUtil";
import { logConsoleAndDb, secretDB } from "../db/index";
import { MASTER_SECRET_KEY } from "../db/tables/secret";
import {
NOTIFY_PUSH_VAPID_ERROR,
NOTIFY_PUSH_INIT_ERROR,
NOTIFY_PUSH_BROWSER_NOT_SUPPORTED,
NOTIFY_PUSH_PERMISSION_ERROR,
NOTIFY_PUSH_SETUP_UNDERWAY,
NOTIFY_PUSH_SUCCESS,
NOTIFY_PUSH_SETUP_ERROR,
NOTIFY_PUSH_SUBSCRIPTION_ERROR,
PUSH_NOTIFICATION_TIMEOUT_SHORT,
PUSH_NOTIFICATION_TIMEOUT_MEDIUM,
PUSH_NOTIFICATION_TIMEOUT_LONG,
PUSH_NOTIFICATION_TIMEOUT_PERSISTENT,
} from "../constants/notifications";
import { urlBase64ToUint8Array } from "../libs/crypto/vc/util";
import * as libsUtil from "../libs/util";
import { logger } from "../utils/logger";
import { PlatformServiceMixin } from "../utils/PlatformServiceMixin";
// Example interface for error
interface ErrorResponse {
@@ -139,7 +145,9 @@ interface VapidResponse {
};
}
@Component
@Component({
mixins: [PlatformServiceMixin],
})
export default class PushNotificationPermission extends Vue {
// eslint-disable-next-line
$notify!: (notification: NotificationIface, timeout?: number) => Promise<() => void>;
@@ -166,26 +174,28 @@ export default class PushNotificationPermission extends Vue {
this.isVisible = true;
this.pushType = pushType;
try {
const settings = await databaseUtil.retrieveSettingsForActiveAccount();
const settings = await this.$accountSettings();
let pushUrl = DEFAULT_PUSH_SERVER;
if (settings?.webPushServer) {
pushUrl = settings.webPushServer;
}
if (pushUrl.startsWith("http://localhost")) {
logConsoleAndDb("Not checking for VAPID in this local environment.");
this.$logAndConsole(
"Not checking for VAPID in this local environment.",
);
} else {
let responseData = "";
await this.axios
.get(pushUrl + "/web-push/vapid")
.then((response: VapidResponse) => {
this.vapidKey = response.data?.vapidKey || "";
logConsoleAndDb("Got vapid key: " + this.vapidKey);
this.$logAndConsole("Got vapid key: " + this.vapidKey);
responseData = JSON.stringify(response.data);
navigator.serviceWorker?.addEventListener(
"controllerchange",
() => {
logConsoleAndDb(
this.$logAndConsole(
"New service worker is now controlling the page",
);
},
@@ -196,12 +206,12 @@ export default class PushNotificationPermission extends Vue {
{
group: "alert",
type: "danger",
title: "Error Setting Notifications",
text: "Could not set notifications.",
title: NOTIFY_PUSH_VAPID_ERROR.title,
text: NOTIFY_PUSH_VAPID_ERROR.message,
},
5000,
PUSH_NOTIFICATION_TIMEOUT_MEDIUM,
);
logConsoleAndDb(
this.$logAndConsole(
"Error Setting Notifications: web push server response didn't have vapidKey: " +
responseData,
true,
@@ -210,11 +220,11 @@ export default class PushNotificationPermission extends Vue {
}
} catch (error) {
if (window.location.host.startsWith("localhost")) {
logConsoleAndDb(
this.$logAndConsole(
"Ignoring the error getting VAPID for local development.",
);
} else {
logConsoleAndDb(
this.$logAndConsole(
"Got an error initializing notifications: " + JSON.stringify(error),
true,
);
@@ -222,10 +232,10 @@ export default class PushNotificationPermission extends Vue {
{
group: "alert",
type: "danger",
title: "Error Setting Notifications",
text: "Got an error setting notifications.",
title: NOTIFY_PUSH_INIT_ERROR.title,
text: NOTIFY_PUSH_INIT_ERROR.message,
},
5000,
PUSH_NOTIFICATION_TIMEOUT_MEDIUM,
);
}
}
@@ -235,8 +245,7 @@ export default class PushNotificationPermission extends Vue {
});
if (this.pushType === this.DIRECT_PUSH_TITLE) {
this.messageInput =
"Click to share some gratitude with the world -- even if they're unnamed.";
this.messageInput = this.notificationMessagePlaceholder;
// focus on the message input
setTimeout(function () {
document.getElementById("push-message")?.focus();
@@ -285,8 +294,9 @@ export default class PushNotificationPermission extends Vue {
return Promise.reject("Service worker not available.");
}
await secretDB.open();
const secret = (await secretDB.secret.get(MASTER_SECRET_KEY))?.secret;
// TODO: secretDB functionality needs to be migrated to PlatformServiceMixin
// For now, we'll use a temporary approach
const secret = "temporary-secret"; // Placeholder until secret management is migrated
if (!secret) {
return Promise.reject("No secret found.");
}
@@ -304,7 +314,7 @@ export default class PushNotificationPermission extends Vue {
};
return this.sendMessageToServiceWorker(message).then((response) => {
logConsoleAndDb(
this.$logAndConsole(
"Response from service worker: " + JSON.stringify(response),
);
});
@@ -316,10 +326,10 @@ export default class PushNotificationPermission extends Vue {
{
group: "alert",
type: "danger",
title: "Browser Notifications Are Not Supported",
text: "This browser does not support notifications.",
title: NOTIFY_PUSH_BROWSER_NOT_SUPPORTED.title,
text: NOTIFY_PUSH_BROWSER_NOT_SUPPORTED.message,
},
3000,
PUSH_NOTIFICATION_TIMEOUT_SHORT,
);
return Promise.reject("This browser does not support notifications.");
}
@@ -337,12 +347,10 @@ export default class PushNotificationPermission extends Vue {
{
group: "alert",
type: "danger",
title: "Error Requesting Notification Permission",
text:
"Allow this app permission to make notifications for personal reminders." +
" You can adjust them at any time in your settings.",
title: NOTIFY_PUSH_PERMISSION_ERROR.title,
text: NOTIFY_PUSH_PERMISSION_ERROR.message,
},
-1,
PUSH_NOTIFICATION_TIMEOUT_PERSISTENT,
);
throw new Error("Permission was not granted to this app.");
}
@@ -385,13 +393,15 @@ export default class PushNotificationPermission extends Vue {
let notifyCloser = () => {};
return this.askPermission()
.then((permission) => {
logConsoleAndDb("Permission granted: " + JSON.stringify(permission));
this.$logAndConsole(
"Permission granted: " + JSON.stringify(permission),
);
// Call the function and handle promises
return this.subscribeToPush();
})
.then(() => {
logConsoleAndDb("Subscribed successfully.");
this.$logAndConsole("Subscribed successfully.");
return navigator.serviceWorker?.ready;
})
.then((registration) => {
@@ -403,10 +413,10 @@ export default class PushNotificationPermission extends Vue {
{
group: "alert",
type: "info",
title: "Notification Setup Underway",
text: "Setting up notifications for interesting activity, which takes about 10 seconds. If you don't see a final confirmation, check the 'Troubleshoot' page.",
title: NOTIFY_PUSH_SETUP_UNDERWAY.title,
text: NOTIFY_PUSH_SETUP_UNDERWAY.message,
},
-1,
PUSH_NOTIFICATION_TIMEOUT_PERSISTENT,
);
// we already checked that this is a valid hour number
const rawHourNum = libsUtil.numberOrZero(this.hourInput);
@@ -436,7 +446,7 @@ export default class PushNotificationPermission extends Vue {
};
await this.sendSubscriptionToServer(subscriptionWithTime);
// To help investigate potential issues with this: https://firebase.google.com/docs/cloud-messaging/migrate-v1
logConsoleAndDb(
this.$logAndConsole(
"Subscription data sent to server with endpoint: " +
subscription.endpoint,
);
@@ -446,7 +456,7 @@ export default class PushNotificationPermission extends Vue {
}
})
.then(async (subscription: PushSubscriptionWithTime) => {
logConsoleAndDb(
this.$logAndConsole(
"Subscription data sent to server and all finished successfully.",
);
await libsUtil.sendTestThroughPushServer(subscription, true);
@@ -456,19 +466,17 @@ export default class PushNotificationPermission extends Vue {
{
group: "alert",
type: "success",
title: "Notification Is On",
text: "You should see at least one on your device; if not, check the 'Troubleshoot' link.",
title: NOTIFY_PUSH_SUCCESS.title,
text: NOTIFY_PUSH_SUCCESS.message,
},
7000,
PUSH_NOTIFICATION_TIMEOUT_LONG,
);
}, 500);
const timeText =
// eslint-disable-next-line
this.hourInput + ":" + this.minuteInput + " " + (this.hourAm ? "AM" : "PM");
const timeText = this.notificationTimeText;
this.callback(true, timeText, this.messageInput);
})
.catch((error) => {
logConsoleAndDb(
this.$logAndConsole(
"Got an error setting notification permissions: " +
" string " +
error.toString() +
@@ -480,10 +488,10 @@ export default class PushNotificationPermission extends Vue {
{
group: "alert",
type: "danger",
title: "Error Setting Notification Permissions",
text: "Could not set notification permissions.",
title: NOTIFY_PUSH_SETUP_ERROR.title,
text: NOTIFY_PUSH_SETUP_ERROR.message,
},
3000,
PUSH_NOTIFICATION_TIMEOUT_SHORT,
);
// if we want to also unsubscribe, be sure to do that only if no other notification is active
});
@@ -514,13 +522,13 @@ export default class PushNotificationPermission extends Vue {
return registration.pushManager.subscribe(options);
})
.then((subscription) => {
logConsoleAndDb(
this.$logAndConsole(
"Push subscription successful: " + JSON.stringify(subscription),
);
resolve();
})
.catch((error) => {
logConsoleAndDb(
this.$logAndConsole(
"Push subscription failed: " +
JSON.stringify(error) +
" - " +
@@ -533,12 +541,10 @@ export default class PushNotificationPermission extends Vue {
{
group: "alert",
type: "danger",
title: "Error Setting Push Notifications",
text:
"We encountered an issue setting up push notifications. " +
"If you wish to revoke notification permissions, please do so in your browser settings.",
title: NOTIFY_PUSH_SUBSCRIPTION_ERROR.title,
text: NOTIFY_PUSH_SUBSCRIPTION_ERROR.message,
},
-1,
PUSH_NOTIFICATION_TIMEOUT_PERSISTENT,
);
reject(error);
@@ -549,7 +555,7 @@ export default class PushNotificationPermission extends Vue {
private sendSubscriptionToServer(
subscription: PushSubscriptionWithTime,
): Promise<void> {
logConsoleAndDb(
this.$logAndConsole(
"About to send subscription... " + JSON.stringify(subscription),
);
return fetch("/web-push/subscribe", {
@@ -563,9 +569,88 @@ export default class PushNotificationPermission extends Vue {
logger.error("Bad response subscribing to web push: ", response);
throw new Error("Failed to send push subscription to server");
}
logConsoleAndDb("Push subscription sent to server successfully.");
this.$logAndConsole("Push subscription sent to server successfully.");
});
}
/**
* Computed property: isDailyCheck
* Returns true if the current pushType is DAILY_CHECK_TITLE
*/
get isDailyCheck(): boolean {
return this.pushType === this.DAILY_CHECK_TITLE;
}
/**
* Computed property: isSystemReady
* Returns true if serviceWorkerReady and vapidKey are set
*/
get isSystemReady(): boolean {
return this.serviceWorkerReady && !!this.vapidKey;
}
/**
* Computed property: canShowNotificationForm
* Returns true if serviceWorkerReady and vapidKey are set
*/
get canShowNotificationForm(): boolean {
return this.serviceWorkerReady && !!this.vapidKey;
}
/**
* Computed property: notificationMessagePlaceholder
* Returns the default message for direct push
*/
get notificationMessagePlaceholder(): string {
return "Click to share some gratitude with the world -- even if they're unnamed.";
}
/**
* Computed property: notificationTimeText
* Returns the formatted time string for display
*/
get notificationTimeText(): string {
return `${this.hourInput}:${this.minuteInput} ${this.hourAm ? "AM" : "PM"}`;
}
/**
* Toggles the AM/PM state for the hour input
*/
toggleHourAm() {
this.hourAm = !this.hourAm;
}
/**
* Computed property: amPmLabel
* Returns 'AM' or 'PM' based on hourAm
*/
get amPmLabel(): string {
return this.hourAm ? "AM" : "PM";
}
/**
* Computed property: amPmIcon
* Returns the appropriate icon for AM/PM
*/
get amPmIcon(): string {
return this.hourAm ? "chevron-down" : "chevron-up";
}
/**
* Handles the main action button click
*/
handleTurnOnNotifications() {
this.close();
this.turnOnNotifications();
}
/**
* Computed property: waitingMessage
* Returns the waiting message for initialization
*/
get waitingMessage(): string {
return "Waiting for system initialization, which may take up to 5 seconds...";
}
}
</script>

293
src/constants/notifications.ts
View File

@@ -1,3 +1,5 @@
import axios from "axios";
// Notification message constants for user-facing notifications
// Add new notification messages here as needed
//
@@ -1382,3 +1384,294 @@ export const QR_TIMEOUT_SHORT = 1000; // Short operations like registration subm
export const QR_TIMEOUT_MEDIUM = 2000; // Medium operations like URL copy
export const QR_TIMEOUT_STANDARD = 3000; // Standard success messages
export const QR_TIMEOUT_LONG = 5000; // Error messages and warnings
// NewEditProjectView.vue specific constants
// Used in: NewEditProjectView.vue (mounted method - account loading error)
export const NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR = {
title: "Account Loading Error",
message: "There was a problem loading your account info.",
};
// Used in: NewEditProjectView.vue (loadProject method - project retrieval error)
export const NOTIFY_PROJECT_RETRIEVAL_ERROR = {
title: "Project Retrieval Error",
message: "There was an error retrieving that project.",
};
// Used in: NewEditProjectView.vue (confirmDeleteImage method - image deletion confirmation)
export const NOTIFY_PROJECT_DELETE_IMAGE_CONFIRM = {
title: "Delete Image",
message: "Are you sure you want to delete the image?",
};
// Used in: NewEditProjectView.vue (deleteImage method - image deletion error)
export const NOTIFY_PROJECT_DELETE_IMAGE_ERROR = {
title: "Image Deletion Error",
message: "There was a problem deleting the image.",
};
// Used in: NewEditProjectView.vue (deleteImage method - image deletion general error)
export const NOTIFY_PROJECT_DELETE_IMAGE_GENERAL_ERROR = {
title: "Image Deletion Error",
message: "There was an error deleting the image.",
};
// Used in: NewEditProjectView.vue (validateLocation method - invalid location error)
export const NOTIFY_PROJECT_INVALID_LOCATION = {
title: "Invalid Location",
message: "The location was invalid so it was not set.",
};
// Used in: NewEditProjectView.vue (validateStartDate method - invalid start date error)
export const NOTIFY_PROJECT_INVALID_START_DATE = {
title: "Invalid Start Date",
message: "The start date was invalid so it was not set.",
};
// Used in: NewEditProjectView.vue (validateEndDate method - invalid end date error)
export const NOTIFY_PROJECT_INVALID_END_DATE = {
title: "Invalid End Date",
message: "The end date was invalid so it was not set.",
};
// Used in: NewEditProjectView.vue (saveProject method - project save success)
export const NOTIFY_PROJECT_SAVE_SUCCESS = {
title: "Success",
message: "The project was saved successfully.",
};
// Used in: NewEditProjectView.vue (saveProject method - partner location warning)
export const NOTIFY_PROJECT_PARTNER_LOCATION_WARNING = {
title: "Partner Location Warning",
message:
"A partner was selected but the location was not set, so it was not sent to any partner.",
};
// Used in: NewEditProjectView.vue (sendToNostrPartner method - partner send success)
export const NOTIFY_PROJECT_PARTNER_SEND_SUCCESS = {
title: "Partner Integration Success",
message: "The project info was sent to",
};
// Used in: NewEditProjectView.vue (sendToNostrPartner method - partner send error)
export const NOTIFY_PROJECT_PARTNER_SEND_ERROR = {
title: "Partner Integration Error",
message: "Failed sending to",
};
// Used in: NewEditProjectView.vue (sendToNostrPartner method - partner send general error)
export const NOTIFY_PROJECT_PARTNER_SEND_GENERAL_ERROR = {
title: "Partner Integration Error",
message: "There was an error sending to the partner service.",
};
// Used in: NewEditProjectView.vue (confirmEraseLatLong method - location deletion confirmation)
export const NOTIFY_PROJECT_DELETE_LOCATION_CONFIRM = {
title: "Delete Location",
message: "Are you sure you want to delete the location?",
};
// Used in: NewEditProjectView.vue (showNostrPartnerInfo method - partner info)
export const NOTIFY_PROJECT_NOSTR_PARTNER_INFO = {
title: "Partner Integration Info",
message:
"This will share your project information with external partner services using Nostr protocol.",
};
// Helper function for dynamic partner send success messages
// Used in: NewEditProjectView.vue (sendToNostrPartner method - dynamic success message)
export function createProjectPartnerSendSuccessMessage(
serviceName: string,
): string {
return `${NOTIFY_PROJECT_PARTNER_SEND_SUCCESS.message} ${serviceName}.`;
}
// Helper function for dynamic partner send error messages
// Used in: NewEditProjectView.vue (sendToNostrPartner method - dynamic error message)
export function createProjectPartnerSendErrorMessage(
serviceName: string,
errorData: string,
): string {
return `${NOTIFY_PROJECT_PARTNER_SEND_ERROR.message} ${serviceName}: ${errorData}`;
}
// NewEditProjectView.vue timeout constants
export const PROJECT_TIMEOUT_SHORT = 1000; // Short operations like confirmations
export const PROJECT_TIMEOUT_STANDARD = 3000; // Standard success messages
export const PROJECT_TIMEOUT_LONG = 5000; // Error messages and warnings
export const PROJECT_TIMEOUT_VERY_LONG = 7000; // Complex operations and partner errors
// ImageMethodDialog.vue specific constants
// Used in: ImageMethodDialog.vue (mounted method - settings retrieval error)
export const NOTIFY_IMAGE_DIALOG_SETTINGS_ERROR = {
title: "Error",
message: "There was an error retrieving your settings.",
};
// Used in: ImageMethodDialog.vue (acceptUrl method - image retrieval error)
export const NOTIFY_IMAGE_DIALOG_RETRIEVAL_ERROR = {
title: "Error",
message: "There was an error retrieving that image.",
};
// Used in: ImageMethodDialog.vue (startCameraPreview method - camera access error)
export const NOTIFY_IMAGE_DIALOG_CAMERA_ACCESS_ERROR = {
title: "Error",
message: "Failed to access camera",
};
// Used in: ImageMethodDialog.vue (startCameraPreview method - camera in use error)
export const NOTIFY_IMAGE_DIALOG_CAMERA_IN_USE = {
title: "Camera in Use",
message:
"Camera is in use by another application. Please close any other apps or browser tabs using the camera and try again.",
};
// Used in: ImageMethodDialog.vue (startCameraPreview method - camera permission denied)
export const NOTIFY_IMAGE_DIALOG_CAMERA_PERMISSION_DENIED = {
title: "Camera Access Denied",
message:
"Camera access was denied. Please allow camera access in your browser settings.",
};
// Used in: ImageMethodDialog.vue (capturePhoto method - photo capture error)
export const NOTIFY_IMAGE_DIALOG_CAPTURE_ERROR = {
title: "Error",
message: "Failed to capture photo. Please try again.",
};
// Used in: ImageMethodDialog.vue (uploadImage method - no image found error)
export const NOTIFY_IMAGE_DIALOG_NO_IMAGE_ERROR = {
title: "Error",
message: "There was an error finding the picture. Please try again.",
};
// Used in: ImageMethodDialog.vue (uploadImage method - general upload error)
export const NOTIFY_IMAGE_DIALOG_UPLOAD_ERROR = {
title: "Error",
message: "There was an error saving the picture.",
};
// Used in: ImageMethodDialog.vue (uploadImage method - authentication error)
export const NOTIFY_IMAGE_DIALOG_AUTH_ERROR = {
title: "Authentication Error",
message: "Authentication failed. Please try logging in again.",
};
// Used in: ImageMethodDialog.vue (uploadImage method - file too large error)
export const NOTIFY_IMAGE_DIALOG_FILE_TOO_LARGE = {
title: "File Too Large",
message: "Image file is too large. Please try a smaller image.",
};
// Used in: ImageMethodDialog.vue (uploadImage method - unsupported format error)
export const NOTIFY_IMAGE_DIALOG_UNSUPPORTED_FORMAT = {
title: "Unsupported Format",
message: "Unsupported image format. Please try a different image.",
};
// Used in: ImageMethodDialog.vue (uploadImage method - server error)
export const NOTIFY_IMAGE_DIALOG_SERVER_ERROR = {
title: "Server Error",
message: "Server error. Please try again later.",
};
// Helper function for dynamic camera error messages
// Used in: ImageMethodDialog.vue (startCameraPreview method - dynamic camera error message)
export function createImageDialogCameraErrorMessage(error: Error): string {
if (error.name === "NotReadableError" || error.name === "TrackStartError") {
return NOTIFY_IMAGE_DIALOG_CAMERA_IN_USE.message;
} else if (
error.name === "NotAllowedError" ||
error.name === "PermissionDeniedError"
) {
return NOTIFY_IMAGE_DIALOG_CAMERA_PERMISSION_DENIED.message;
}
return error.message || NOTIFY_IMAGE_DIALOG_CAMERA_ACCESS_ERROR.message;
}
// Helper function for dynamic upload error messages
// Used in: ImageMethodDialog.vue (uploadImage method - dynamic upload error message)
export function createImageDialogUploadErrorMessage(error: any): string {
if (axios.isAxiosError(error)) {
const status = error.response?.status;
const data = error.response?.data;
if (status === 401) {
return NOTIFY_IMAGE_DIALOG_AUTH_ERROR.message;
} else if (status === 413) {
return NOTIFY_IMAGE_DIALOG_FILE_TOO_LARGE.message;
} else if (status === 415) {
return NOTIFY_IMAGE_DIALOG_UNSUPPORTED_FORMAT.message;
} else if (status && status >= 500) {
return NOTIFY_IMAGE_DIALOG_SERVER_ERROR.message;
} else if (data?.message) {
return data.message;
}
}
return NOTIFY_IMAGE_DIALOG_UPLOAD_ERROR.message;
}
// ImageMethodDialog.vue timeout constants
export const IMAGE_DIALOG_TIMEOUT_STANDARD = 3000; // Standard error messages
export const IMAGE_DIALOG_TIMEOUT_LONG = 5000; // Camera and upload errors
export const IMAGE_DIALOG_TIMEOUT_MODAL = -1; // Modal confirmations (no auto-dismiss)
// PushNotificationPermission.vue specific constants
// Used in: PushNotificationPermission.vue (open method - VAPID key error)
export const NOTIFY_PUSH_VAPID_ERROR = {
title: "Error Setting Notifications",
message: "Could not set notifications.",
};
// Used in: PushNotificationPermission.vue (open method - initialization error)
export const NOTIFY_PUSH_INIT_ERROR = {
title: "Error Setting Notifications",
message: "Got an error setting notifications.",
};
// Used in: PushNotificationPermission.vue (checkNotificationSupport method - browser support error)
export const NOTIFY_PUSH_BROWSER_NOT_SUPPORTED = {
title: "Browser Notifications Are Not Supported",
message: "This browser does not support notifications.",
};
// Used in: PushNotificationPermission.vue (requestNotificationPermission method - permission error)
export const NOTIFY_PUSH_PERMISSION_ERROR = {
title: "Error Requesting Notification Permission",
message:
"Allow this app permission to make notifications for personal reminders. You can adjust them at any time in your settings.",
};
// Used in: PushNotificationPermission.vue (turnOnNotifications method - setup underway)
export const NOTIFY_PUSH_SETUP_UNDERWAY = {
title: "Notification Setup Underway",
message:
"Setting up notifications for interesting activity, which takes about 10 seconds. If you don't see a final confirmation, check the 'Troubleshoot' page.",
};
// Used in: PushNotificationPermission.vue (turnOnNotifications method - success)
export const NOTIFY_PUSH_SUCCESS = {
title: "Notification Is On",
message:
"You should see at least one on your device; if not, check the 'Troubleshoot' link.",
};
// Used in: PushNotificationPermission.vue (turnOnNotifications method - general error)
export const NOTIFY_PUSH_SETUP_ERROR = {
title: "Error Setting Notification Permissions",
message: "Could not set notification permissions.",
};
// Used in: PushNotificationPermission.vue (subscribeToPush method - push subscription error)
export const NOTIFY_PUSH_SUBSCRIPTION_ERROR = {
title: "Error Setting Push Notifications",
message:
"We encountered an issue setting up push notifications. If you wish to revoke notification permissions, please do so in your browser settings.",
};
// Push notification timeout constants
export const PUSH_NOTIFICATION_TIMEOUT_SHORT = 3000;
export const PUSH_NOTIFICATION_TIMEOUT_MEDIUM = 5000;
export const PUSH_NOTIFICATION_TIMEOUT_LONG = 7000;
export const PUSH_NOTIFICATION_TIMEOUT_PERSISTENT = -1;

82
src/views/NewEditProjectView.vue
View File

@@ -235,7 +235,25 @@ import {
NotificationIface,
} from "../constants/app";
import { PlatformServiceMixin } from "../utils/PlatformServiceMixin";
import { createNotifyHelpers, TIMEOUTS } from "../utils/notify";
import { createNotifyHelpers } from "../utils/notify";
import {
NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR,
NOTIFY_PROJECT_RETRIEVAL_ERROR,
NOTIFY_PROJECT_DELETE_IMAGE_CONFIRM,
NOTIFY_PROJECT_DELETE_IMAGE_ERROR,
NOTIFY_PROJECT_DELETE_IMAGE_GENERAL_ERROR,
NOTIFY_PROJECT_INVALID_LOCATION,
NOTIFY_PROJECT_INVALID_START_DATE,
NOTIFY_PROJECT_INVALID_END_DATE,
NOTIFY_PROJECT_SAVE_SUCCESS,
NOTIFY_PROJECT_PARTNER_LOCATION_WARNING,
NOTIFY_PROJECT_PARTNER_SEND_GENERAL_ERROR,
NOTIFY_PROJECT_DELETE_LOCATION_CONFIRM,
NOTIFY_PROJECT_NOSTR_PARTNER_INFO,
createProjectPartnerSendSuccessMessage,
createProjectPartnerSendErrorMessage,
PROJECT_TIMEOUT_VERY_LONG,
} from "../constants/notifications";
import { PlanActionClaim } from "../interfaces/claims";
import {
createEndorserJwtVcFromClaim,
@@ -310,7 +328,7 @@ export default class NewEditProjectView extends Vue {
$router!: Router;
// Notification helpers
private notifyHelpers = createNotifyHelpers(this.$notify);
private notify!: ReturnType<typeof createNotifyHelpers>;
/**
* Display error notification to user
@@ -318,7 +336,7 @@ export default class NewEditProjectView extends Vue {
* @param message - Error message to display
*/
errNote(message: string) {
this.notifyHelpers.error(message);
this.notify.error(message);
}
// Component state properties
@@ -358,6 +376,9 @@ export default class NewEditProjectView extends Vue {
* Handles account validation and project loading with comprehensive error handling
*/
async mounted() {
// Initialize notification helpers
this.notify = createNotifyHelpers(this.$notify);
this.numAccounts = await retrieveAccountCount();
const settings = await this.$accountSettings();
@@ -369,9 +390,7 @@ export default class NewEditProjectView extends Vue {
if (this.projectId) {
if (this.numAccounts === 0) {
this.notifyHelpers.error(
"There was a problem loading your account info.",
);
this.notify.error(NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR.message);
} else {
this.loadProject(this.activeDid);
}
@@ -422,7 +441,7 @@ export default class NewEditProjectView extends Vue {
}
} catch (error) {
logger.error("Got error retrieving that project", error);
this.notifyHelpers.error("There was an error retrieving that project.");
this.notify.error(NOTIFY_PROJECT_RETRIEVAL_ERROR.message);
}
}
@@ -441,8 +460,8 @@ export default class NewEditProjectView extends Vue {
* Shows confirmation dialog before proceeding with image deletion
*/
confirmDeleteImage() {
this.notifyHelpers.confirm(
"Are you sure you want to delete the image?",
this.notify.confirm(
NOTIFY_PROJECT_DELETE_IMAGE_CONFIRM.message,
async () => {
await this.deleteImage();
},
@@ -480,7 +499,7 @@ export default class NewEditProjectView extends Vue {
// (either they'll simply continue or they're canceling and going back)
} else {
logger.error("Problem deleting image:", response);
this.notifyHelpers.error("There was a problem deleting the image.");
this.notify.error(NOTIFY_PROJECT_DELETE_IMAGE_ERROR.message);
return;
}
@@ -495,7 +514,7 @@ export default class NewEditProjectView extends Vue {
// it already doesn't exist so we won't say anything to the user
} else {
this.notifyHelpers.error("There was an error deleting the image.");
this.notify.error(NOTIFY_PROJECT_DELETE_IMAGE_GENERAL_ERROR.message);
}
}
}
@@ -525,7 +544,7 @@ export default class NewEditProjectView extends Vue {
}
if (this.includeLocation) {
if (!this.latitude || !this.longitude) {
this.notifyHelpers.error("The location was invalid so it was not set.");
this.notify.error(NOTIFY_PROJECT_INVALID_LOCATION.message);
delete vcClaim.location;
} else {
vcClaim.location = {
@@ -548,9 +567,7 @@ export default class NewEditProjectView extends Vue {
} catch {
// it's not a valid date so erase it and tell the user
delete vcClaim.startTime;
this.notifyHelpers.error(
"The start date was invalid so it was not set.",
);
this.notify.error(NOTIFY_PROJECT_INVALID_START_DATE.message);
}
} else {
delete vcClaim.startTime;
@@ -564,7 +581,7 @@ export default class NewEditProjectView extends Vue {
} catch {
// it's not a valid date so erase it and tell the user
delete vcClaim.endTime;
this.notifyHelpers.error("The end date was invalid so it was not set.");
this.notify.error(NOTIFY_PROJECT_INVALID_END_DATE.message);
}
} else {
delete vcClaim.endTime;
@@ -580,7 +597,7 @@ export default class NewEditProjectView extends Vue {
try {
const resp = await this.axios.post(url, payload, { headers });
if (resp.data?.success?.handleId) {
this.notifyHelpers.success("The project was saved successfully.");
this.notify.success(NOTIFY_PROJECT_SAVE_SUCCESS.message);
this.errorMessage = "";
@@ -614,9 +631,7 @@ export default class NewEditProjectView extends Vue {
);
}
} else {
this.notifyHelpers.error(
"A partner was selected but the location was not set, so it was not sent to any partner.",
);
this.notify.error(NOTIFY_PROJECT_PARTNER_LOCATION_WARNING.message);
}
}
@@ -654,7 +669,7 @@ export default class NewEditProjectView extends Vue {
}
}
if (userMessage) {
this.notifyHelpers.error(userMessage);
this.notify.error(userMessage);
}
// Now set that error for the user to see.
this.errorMessage = userMessage;
@@ -756,23 +771,26 @@ export default class NewEditProjectView extends Vue {
{ headers },
);
if (linkResp.status === 201) {
this.notifyHelpers.success(
`The project info was sent to ${serviceName}.`,
this.notify.success(
createProjectPartnerSendSuccessMessage(serviceName),
);
} else {
// axios never gets here because it throws an error, but just in case
this.notifyHelpers.error(
`Failed sending to ${serviceName}: ${JSON.stringify(linkResp.data)}`,
this.notify.error(
createProjectPartnerSendErrorMessage(
serviceName,
JSON.stringify(linkResp.data),
),
);
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (error: any) {
logger.error(`Error sending to ${serviceName}`, error);
let errorMessage = `There was an error sending to ${serviceName}.`;
let errorMessage = NOTIFY_PROJECT_PARTNER_SEND_GENERAL_ERROR.message;
if (error.response?.data?.error?.message) {
errorMessage = error.response.data.error.message;
}
this.notifyHelpers.error(errorMessage, TIMEOUTS.VERY_LONG);
this.notify.error(errorMessage, PROJECT_TIMEOUT_VERY_LONG);
}
}
@@ -796,8 +814,8 @@ export default class NewEditProjectView extends Vue {
* Shows confirmation dialog before clearing location data
*/
confirmEraseLatLong() {
this.notifyHelpers.confirm(
"Are you sure you don't want to mark a location? This will erase the current location.",
this.notify.confirm(
NOTIFY_PROJECT_DELETE_LOCATION_CONFIRM.message,
async () => {
this.eraseLatLong();
},
@@ -827,9 +845,9 @@ export default class NewEditProjectView extends Vue {
* Displays privacy information about partner service integration
*/
public showNostrPartnerInfo() {
this.notifyHelpers.info(
"This will submit this project to a partner on the nostr network. It will contain your public key data which may allow correlation, so don't allow this if you're not comfortable with that.",
TIMEOUTS.VERY_LONG,
this.notify.info(
NOTIFY_PROJECT_NOSTR_PARTNER_INFO.message,
PROJECT_TIMEOUT_VERY_LONG,
);
}