+
- setPassword(e.target.value)} required className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 placeholder-gray-500 text-gray-900 dark:text-white rounded-t-md focus:outline-none focus:ring-brand-primary focus:border-brand-primary sm:text-sm" placeholder="New Password" />
+ setPassword(e.target.value)} required className="appearance-none rounded-none relative block w-full px-3 py-2 pr-10 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 placeholder-gray-500 text-gray-900 dark:text-white rounded-t-md focus:outline-none focus:ring-brand-primary focus:border-brand-primary sm:text-sm" placeholder="New Password" />
+
-
{error &&
{error}
}
diff --git a/src/services/apiClient.ts b/src/services/apiClient.ts
index ae7beb45..ce83f140 100644
--- a/src/services/apiClient.ts
+++ b/src/services/apiClient.ts
@@ -1,4 +1,4 @@
-import { Profile, UserProfile, Flyer, MasterGroceryItem, ShoppingList, ShoppingListItem, FlyerItem, SuggestedCorrection, Category } from '../types';
+import { Profile, UserProfile, Flyer, MasterGroceryItem, ShoppingList, ShoppingListItem, FlyerItem, SuggestedCorrection, Category, UserDataExport } from '../types';
interface AuthResponse {
user: { id: string; email: string };
@@ -286,6 +286,29 @@ export const uploadLogoAndUpdateStore = async (storeId: number, logoImage: File)
return response.json();
};
+/**
+ * Fetches historical price data for a given list of master item IDs.
+ * @param masterItemIds An array of master grocery item IDs.
+ * @returns A promise that resolves to an array of historical price records.
+ */
+export const fetchHistoricalPriceData = async (masterItemIds: number[]): Promise<{ master_item_id: number; summary_date: string; avg_price_in_cents: number | null; }[]> => {
+ if (masterItemIds.length === 0) {
+ return [];
+ }
+
+ const response = await apiFetch(`${API_BASE_URL}/price-history`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ masterItemIds }),
+ });
+
+ if (!response.ok) {
+ const errorData = await response.json().catch(() => ({ message: 'Failed to fetch price history.' }));
+ throw new Error(errorData.message);
+ }
+ return response.json();
+};
+
// --- Watched Items API Functions ---
@@ -523,6 +546,25 @@ export const rejectCorrection = async (correctionId: number): Promise<{ message:
return response.json();
};
+/**
+ * Updates the suggested value of a pending correction. Requires admin privileges.
+ * @param correctionId The ID of the correction to update.
+ * @param newSuggestedValue The new value for the suggestion.
+ * @returns A promise that resolves to the updated SuggestedCorrection object.
+ */
+export const updateSuggestedCorrection = async (correctionId: number, newSuggestedValue: string): Promise
=> {
+ const response = await apiFetch(`${API_BASE_URL}/admin/corrections/${correctionId}`, {
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ suggested_value: newSuggestedValue }),
+ });
+ if (!response.ok) {
+ const errorData = await response.json().catch(() => ({ message: 'Failed to update suggested correction.' }));
+ throw new Error(errorData.message);
+ }
+ return response.json();
+};
+
export async function registerUser(email: string, password: string): Promise {
const response = await fetch(`${API_BASE_URL}/auth/register`, {
method: 'POST',
@@ -608,6 +650,52 @@ export async function updateUserPreferences(preferences: Partial {
+ const token = localStorage.getItem('authToken');
+ if (!token) {
+ throw new Error('No authentication token found.');
+ }
+
+ const response = await apiFetch(`${API_BASE_URL}/users/profile`, {
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(profileData),
+ });
+
+ const data = await response.json();
+
+ if (!response.ok) {
+ throw new Error(data.message || 'Failed to update user profile');
+ }
+ return data;
+}
+
+/**
+ * Fetches a complete export of the user's data from the backend.
+ * @returns A promise that resolves to a JSON object of the user's data.
+ */
+export async function exportUserData(): Promise {
+ const token = localStorage.getItem('authToken');
+ if (!token) {
+ throw new Error('No authentication token found.');
+ }
+
+ const response = await apiFetch(`${API_BASE_URL}/users/data-export`, {
+ method: 'GET',
+ });
+
+ if (!response.ok) {
+ const errorData = await response.json().catch(() => ({ message: 'Failed to export user data.' }));
+ throw new Error(errorData.message);
+ }
+ return response.json();
+}
+
/**
* Sends a new password to the backend to be updated.
* @param newPassword The user's new password.
diff --git a/src/services/db.ts b/src/services/db.ts
index 7aa24c0c..1be78ed5 100644
--- a/src/services/db.ts
+++ b/src/services/db.ts
@@ -98,6 +98,29 @@ export async function findUserProfileById(id: string): Promise {
+ try {
+ const res = await pool.query(
+ `UPDATE public.profiles
+ SET full_name = COALESCE($1, full_name), avatar_url = COALESCE($2, avatar_url), updated_at = now()
+ WHERE id = $3
+ RETURNING id, full_name, avatar_url, preferences, role`,
+ [profileData.full_name, profileData.avatar_url, id]
+ );
+ return res.rows[0];
+ } catch (error) {
+ logger.error('Database error in updateUserProfile:', { error });
+ throw new Error('Failed to update user profile in database.');
+ }
+}
+
+
/**
* Updates the preferences for a given user.
* The `pg` driver automatically handles serializing the JS object to JSONB.
@@ -228,6 +251,58 @@ export async function findUserByRefreshToken(refreshToken: string): Promise<{ id
}
}
+/**
+ * Creates a password reset token for a user.
+ * @param userId The UUID of the user.
+ * @param tokenHash The hashed version of the reset token.
+ * @param expiresAt The timestamp when the token expires.
+ */
+export async function createPasswordResetToken(userId: string, tokenHash: string, expiresAt: Date): Promise {
+ try {
+ // First, delete any existing tokens for this user to ensure only one is active.
+ await pool.query('DELETE FROM public.password_reset_tokens WHERE user_id = $1', [userId]);
+ // Then, insert the new token.
+ await pool.query(
+ 'INSERT INTO public.password_reset_tokens (user_id, token_hash, expires_at) VALUES ($1, $2, $3)',
+ [userId, tokenHash, expiresAt]
+ );
+ } catch (error) {
+ logger.error('Database error in createPasswordResetToken:', { error });
+ throw new Error('Failed to create password reset token.');
+ }
+}
+
+/**
+ * Finds a user and token details by the token hash.
+ * It only returns a result if the token has not expired.
+ * @returns A promise that resolves to an array of valid token records.
+ */
+export async function getValidResetTokens(): Promise<{ user_id: string; token_hash: string; expires_at: Date }[]> {
+ try {
+ const res = await pool.query<{ user_id: string; token_hash: string; expires_at: Date }>(
+ 'SELECT user_id, token_hash, expires_at FROM public.password_reset_tokens WHERE expires_at > NOW()'
+ );
+ return res.rows;
+ } catch (error) {
+ logger.error('Database error in getValidResetTokens:', { error });
+ throw new Error('Failed to retrieve valid reset tokens.');
+ }
+}
+
+/**
+ * Deletes a password reset token by its hash.
+ * This is used after a token has been successfully used to reset a password.
+ * @param tokenHash The hashed token to delete.
+ */
+export async function deleteResetToken(tokenHash: string): Promise {
+ try {
+ await pool.query('DELETE FROM public.password_reset_tokens WHERE token_hash = $1', [tokenHash]);
+ } catch (error) {
+ logger.error('Database error in deleteResetToken:', { error });
+ // We don't throw here, as failing to delete an expired token is not a critical failure for the user flow.
+ }
+}
+
/**
* Retrieves all flyers from the database, joining with store information.
* @returns A promise that resolves to an array of Flyer objects.
@@ -491,6 +566,34 @@ export async function removeShoppingListItem(itemId: number): Promise {
}
}
+/**
+ * Gathers all data associated with a specific user for export.
+ * @param userId The UUID of the user.
+ * @returns A promise that resolves to an object containing all user data.
+ */
+export async function exportUserData(userId: string): Promise<{ profile: Profile; watchedItems: MasterGroceryItem[]; shoppingLists: ShoppingList[] }> {
+ const client = await pool.connect();
+ try {
+ // Run queries in parallel for efficiency
+ const profileQuery = findUserProfileById(userId);
+ const watchedItemsQuery = getWatchedItems(userId);
+ const shoppingListsQuery = getShoppingLists(userId);
+
+ const [profile, watchedItems, shoppingLists] = await Promise.all([profileQuery, watchedItemsQuery, shoppingListsQuery]);
+
+ if (!profile) {
+ throw new Error('User profile not found for data export.');
+ }
+
+ return { profile, watchedItems, shoppingLists };
+ } catch (error) {
+ logger.error('Database error in exportUserData:', { error, userId });
+ throw new Error('Failed to export user data.');
+ } finally {
+ client.release();
+ }
+}
+
// --- Flyer Processing Functions ---
/**
@@ -869,6 +972,31 @@ export async function getApplicationStats(): Promise<{
}
}
+/**
+ * Retrieves historical price data for a given list of master item IDs.
+ * This function queries the pre-aggregated `item_price_history` table for efficiency.
+ * @param masterItemIds An array of master grocery item IDs.
+ * @returns A promise that resolves to an array of historical price records.
+ */
+export async function getHistoricalPriceDataForItems(masterItemIds: number[]): Promise<{ master_item_id: number; summary_date: string; avg_price_in_cents: number | null; }[]> {
+ if (masterItemIds.length === 0) {
+ return [];
+ }
+ try {
+ const query = `
+ SELECT master_item_id, summary_date, avg_price_in_cents
+ FROM public.item_price_history
+ WHERE master_item_id = ANY($1::bigint[])
+ ORDER BY summary_date ASC;
+ `;
+ const res = await pool.query(query, [masterItemIds]);
+ return res.rows;
+ } catch (error) {
+ logger.error('Database error in getHistoricalPriceDataForItems:', { error });
+ throw new Error('Failed to retrieve historical price data.');
+ }
+}
+
/**
* Retrieves daily statistics for user registrations and flyer uploads for the last 30 days.
* @returns A promise that resolves to an array of daily stats.
diff --git a/src/services/notificationService.ts b/src/services/notificationService.ts
new file mode 100644
index 00000000..de8db91f
--- /dev/null
+++ b/src/services/notificationService.ts
@@ -0,0 +1,42 @@
+import toast, { ToastOptions } from 'react-hot-toast';
+
+/**
+ * Common options for all toasts to ensure a consistent look and feel.
+ * These styles are designed to work well in both light and dark modes.
+ */
+const commonToastOptions: ToastOptions = {
+ style: {
+ borderRadius: '8px',
+ background: 'var(--toast-bg, #333)', // Uses CSS variables for theming
+ color: 'var(--toast-color, #fff)',
+ boxShadow: '0 4px 12px rgba(0, 0, 0, 0.15)',
+ },
+ success: {
+ iconTheme: {
+ primary: '#10B981', // Emerald-500
+ secondary: '#fff',
+ },
+ },
+ error: {
+ iconTheme: {
+ primary: '#EF4444', // Red-500
+ secondary: '#fff',
+ },
+ },
+};
+
+/**
+ * Displays a success toast notification.
+ * @param message The message to display.
+ */
+export const notifySuccess = (message: string) => {
+ toast.success(message, commonToastOptions);
+};
+
+/**
+ * Displays an error toast notification.
+ * @param message The message to display.
+ */
+export const notifyError = (message: string) => {
+ toast.error(message, commonToastOptions);
+};
\ No newline at end of file
diff --git a/src/types.ts b/src/types.ts
index 2b98731d..0ca792c9 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -118,6 +118,18 @@ export interface SuggestedCorrection {
flyer_item_price_display?: string;
}
+/**
+ * Represents the complete data package for a user export.
+ */
+export interface UserDataExport {
+ profile: Profile;
+ watchedItems: MasterGroceryItem[];
+ shoppingLists: ShoppingList[];
+ // Add other user-specific data models here as they are implemented
+ // e.g., pantryItems: PantryItem[];
+ // e.g., recipes: Recipe[];
+}
+
export interface UserAlert {
id: number;
user_watched_item_id: number;
diff --git a/tsconfig.json b/tsconfig.json
index 9a02c127..de153f4a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,8 @@
"skipLibCheck": true,
"types": [
"node",
- "vite/client" // Add this line to include Vite's client-side types
+ "vite/client", // Add this line to include Vite's client-side types
+ "vitest/globals" // Add this to include Vitest's global types (e.g., `vi`, `describe`)
],
"moduleResolution": "bundler",
"isolatedModules": true,