-
Time period:
+
Time Period
Revenue and Orders tabs use time filtering. Products and Customers show all-time data.
@@ -227,7 +288,7 @@ export default function AnalyticsDashboard({ initialData }: AnalyticsDashboardPr
}>
-
+
diff --git a/components/analytics/RevenueChart.tsx b/components/analytics/RevenueChart.tsx
index bb82f36..de268d4 100644
--- a/components/analytics/RevenueChart.tsx
+++ b/components/analytics/RevenueChart.tsx
@@ -12,6 +12,7 @@ import { ChartSkeleton } from './SkeletonLoaders';
interface RevenueChartProps {
timeRange: string;
+ hideNumbers?: boolean;
}
interface ChartDataPoint {
@@ -21,7 +22,7 @@ interface ChartDataPoint {
formattedDate: string;
}
-export default function RevenueChart({ timeRange }: RevenueChartProps) {
+export default function RevenueChart({ timeRange, hideNumbers = false }: RevenueChartProps) {
const [data, setData] = useState
([]);
const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState(null);
@@ -75,6 +76,19 @@ export default function RevenueChart({ timeRange }: RevenueChartProps) {
const totalOrders = safeData.reduce((sum, item) => sum + (item.orders || 0), 0);
const averageRevenue = safeData.length > 0 ? totalRevenue / safeData.length : 0;
+ // Function to mask sensitive numbers
+ const maskValue = (value: string): string => {
+ if (!hideNumbers) return value;
+
+ // For currency values (£X.XX), show £***
+ if (value.includes('£')) {
+ return '£***';
+ }
+
+ // For regular numbers, replace with asterisks
+ return '***';
+ };
+
// Custom tooltip for the chart
const CustomTooltip = ({ active, payload, label }: any) => {
if (active && payload && payload.length) {
@@ -83,10 +97,10 @@ export default function RevenueChart({ timeRange }: RevenueChartProps) {
{data.formattedDate}
- Revenue: {formatGBP(data.revenue)}
+ Revenue: {hideNumbers ? '£***' : formatGBP(data.revenue)}
- Orders: {data.orders}
+ Orders: {hideNumbers ? '***' : data.orders}
);
@@ -173,7 +187,7 @@ export default function RevenueChart({ timeRange }: RevenueChartProps) {
/>
`£${(value / 1000).toFixed(0)}k`}
+ tickFormatter={(value) => hideNumbers ? '***' : `£${(value / 1000).toFixed(0)}k`}
/>
} />
- {formatGBP(totalRevenue)}
+ {maskValue(formatGBP(totalRevenue))}
Total Revenue
- {totalOrders}
+ {maskValue(totalOrders.toString())}
Total Orders
- {formatGBP(averageRevenue)}
+ {maskValue(formatGBP(averageRevenue))}
Avg Daily Revenue
diff --git a/components/notifications/UnifiedNotifications.tsx b/components/notifications/UnifiedNotifications.tsx
index d4eb1c1..1a8cfe0 100644
--- a/components/notifications/UnifiedNotifications.tsx
+++ b/components/notifications/UnifiedNotifications.tsx
@@ -1,6 +1,6 @@
"use client";
-import React, { useState, useEffect, useRef } from "react";
+import React, { useState } from "react";
import { useRouter } from "next/navigation";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
@@ -13,264 +13,21 @@ import {
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { clientFetch } from "@/lib/api";
-import { toast } from "sonner";
-import { getCookie } from "@/lib/api";
-import axios from "axios";
-import { cacheUtils } from '@/lib/api-client';
-
-interface Order {
- _id: string;
- orderId: string;
- status: string;
- totalPrice: number;
- orderDate: string;
- underpaid?: boolean;
- underpaymentAmount?: number;
-}
-
-interface ChatMessage {
- chatId: string;
- buyerId: string;
- messageCount: number;
-}
-
-interface UnreadCounts {
- totalUnread: number;
- chatCounts: Record;
-}
+import { useNotifications } from "@/lib/notification-context";
export default function UnifiedNotifications() {
const router = useRouter();
-
- // Chat notification state
- const [unreadCounts, setUnreadCounts] = useState({ totalUnread: 0, chatCounts: {} });
- const [previousUnreadTotal, setPreviousUnreadTotal] = useState(0);
- const [chatMetadata, setChatMetadata] = useState>({});
-
- // Order notification state
- const [newOrders, setNewOrders] = useState([]);
- const seenOrderIds = useRef>(new Set());
- const isInitialOrdersFetch = useRef(true);
-
- // Shared state
- const [loading, setLoading] = useState(true);
const [activeTab, setActiveTab] = useState("all");
- const audioRef = useRef(null);
- const vendorIdRef = useRef(null);
-
- // Total notifications count
- const totalNotifications = unreadCounts.totalUnread + newOrders.length;
- // Initialize audio
- useEffect(() => {
- audioRef.current = new Audio('/notification.mp3');
-
- audioRef.current.addEventListener('error', () => {
- audioRef.current = null;
- });
-
- return () => {
- if (audioRef.current) {
- audioRef.current = null;
- }
- };
- }, []);
-
- // Get vendor ID from JWT token
- const getVendorIdFromToken = () => {
- if (vendorIdRef.current) {
- return vendorIdRef.current;
- }
-
- const authToken = getCookie("Authorization") || "";
-
- if (!authToken) {
- throw new Error("No auth token found");
- }
-
- const tokenParts = authToken.split(".");
- if (tokenParts.length !== 3) {
- throw new Error("Invalid token format");
- }
-
- const payload = JSON.parse(atob(tokenParts[1]));
- const vendorId = payload.id;
-
- if (!vendorId) {
- throw new Error("Vendor ID not found in token");
- }
-
- vendorIdRef.current = vendorId;
- return vendorId;
- };
-
- // Function to play notification sound
- const playNotificationSound = () => {
- if (audioRef.current) {
- audioRef.current.currentTime = 0;
- audioRef.current.play().catch(err => {
- console.log('Error playing sound:', err);
- // Fallback beep if audio file fails
- try {
- const context = new (window.AudioContext || (window as any).webkitAudioContext)();
- const oscillator = context.createOscillator();
- oscillator.type = 'sine';
- oscillator.frequency.setValueAtTime(800, context.currentTime);
- oscillator.connect(context.destination);
- oscillator.start();
- oscillator.stop(context.currentTime + 0.2);
- } catch (e) {
- console.error('Could not play fallback audio', e);
- }
- });
- }
- };
-
- // Check for new paid orders
- useEffect(() => {
- // Only run this on dashboard pages
- if (typeof window === 'undefined' || !window.location.pathname.includes("/dashboard")) return;
-
- const checkForNewOrders = async () => {
- try {
- // Get orders from the last 24 hours with a more efficient query
- const yesterday = new Date();
- yesterday.setDate(yesterday.getDate() - 1);
- const timestamp = yesterday.toISOString();
-
- const orderData = await clientFetch(`/orders?status=paid&limit=10&orderDate[gte]=${timestamp}`);
- const orders: Order[] = orderData.orders || [];
-
- // Filter out orders that are still showing as underpaid (cache issue)
- const validPaidOrders = orders.filter(order => {
- // Only include orders that are actually fully paid (not underpaid)
- return order.status === 'paid' &&
- (!order.underpaid || order.underpaymentAmount === 0);
- });
-
- // If this is the first fetch, just store the orders without notifications
- if (isInitialOrdersFetch.current) {
- validPaidOrders.forEach(order => seenOrderIds.current.add(order._id));
- isInitialOrdersFetch.current = false;
- return;
- }
-
- // Check for new paid orders that haven't been seen before
- const latestNewOrders = validPaidOrders.filter(order => !seenOrderIds.current.has(order._id));
-
- // Show notifications for new orders
- if (latestNewOrders.length > 0) {
- // Update the seen orders set
- latestNewOrders.forEach(order => seenOrderIds.current.add(order._id));
-
- // Show a toast notification for each new order
- latestNewOrders.forEach(order => {
- toast.success(
-
-
New Paid Order!
-
Order #{order.orderId}
-
£{order.totalPrice.toFixed(2)}
-
+
New Paid Order!
+
Order #{order.orderId}
+
£{order.totalPrice.toFixed(2)}
+