g/ember-market-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
NotII
2025-03-23 23:27:49 +00:00
parent 631929f1fd
commit 2b40ee668f
4 changed files with 71 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/dashboard/BuyerOrderInfo.tsx
View File

@@ -11,7 +11,7 @@ import {
TooltipTrigger,
} from "@/components/ui/tooltip";
import { getCookie } from "@/lib/client-utils";
import { clientFetch } from "@/lib/client-utils";
import axios from "axios";
import { useRouter } from "next/navigation";
interface Order {
@@ -62,13 +62,27 @@ export default function BuyerOrderInfo({ buyerId, chatId }: BuyerOrderInfoProps)
setLoading(true);
try {
// Use clientFetch instead of direct axios calls
// This ensures the request goes through Next.js API rewrites
const response = await clientFetch(`/chats/${chatId}/orders?limit=10`);
const authToken = getCookie("Authorization");
if (response && response.orders) {
setOrders(response.orders);
setHasOrders(response.orders.length > 0);
if (!authToken) {
isFetchingRef.current = false;
setLoading(false);
return;
}
const authAxios = axios.create({
baseURL: process.env.NEXT_PUBLIC_API_URL,
headers: {
Authorization: `Bearer ${authToken}`
}
});
// Use the new endpoint that works with sub-users
const response = await authAxios.get(`/chats/${chatId}/orders?limit=10`); // Limit to fewer orders for faster response
if (response.data && response.data.orders) {
setOrders(response.data.orders);
setHasOrders(response.data.orders.length > 0);
} else {
setHasOrders(false);
}

130
components/dashboard/NewChatForm.tsx
View File

@@ -12,7 +12,6 @@ import axios from "axios";
import { toast } from "sonner";
import { getCookie } from "@/lib/client-utils";
import debounce from "lodash/debounce";
import { clientFetch } from "@/lib/client-utils";
interface User {
telegramUserId: string;
@@ -33,7 +32,6 @@ export default function NewChatForm() {
const [vendorStores, setVendorStores] = useState<{ _id: string, name: string }[]>([]);
const [selectedStore, setSelectedStore] = useState<string>("");
const [selectedUser, setSelectedUser] = useState<User | null>(null);
const [isSubmitting, setIsSubmitting] = useState(false);
// Create an axios instance with auth
const getAuthAxios = () => {
@@ -83,47 +81,24 @@ export default function NewChatForm() {
}
};
// Check if a chat already exists with this user
const checkExistingChat = async (userId: string) => {
try {
// Use clientFetch instead of direct axios calls
const response = await clientFetch(`/chats/user/${userId}`);
// Debounced search function
const searchUsers = debounce(async (query: string) => {
if (!query.trim() || !vendorStores[0]?._id) return;
// If a chat is found, redirect to it
if (response && Array.isArray(response) && response.length > 0) {
toast.info("Chat already exists, redirecting...");
router.push(`/dashboard/chats/${response[0]._id}`);
return true;
}
return false;
} catch (error) {
console.error("Error checking existing chat:", error);
return false;
}
};
// Search for users by Telegram username or ID
const searchUsers = async (query: string) => {
setSearching(true);
const authAxios = getAuthAxios();
if (!authAxios) return;
try {
if (!query || query.length < 2) {
setSearchResults([]);
return;
}
// Use clientFetch instead of direct axios calls
const response = await clientFetch(`/chats/search/users?query=${encodeURIComponent(query)}&storeId=${vendorStores[0]._id}`);
setSearchResults(response || []);
setSearching(true);
const response = await authAxios.get(`/chats/search/users?query=${encodeURIComponent(query)}&storeId=${vendorStores[0]._id}`);
setSearchResults(response.data);
} catch (error) {
console.error("Error searching users:", error);
toast.error("Failed to search for users");
setSearchResults([]);
toast.error("Failed to search users");
} finally {
setSearching(false);
}
};
}, 300);
// Handle search input change
const handleSearchChange = (value: string) => {
@@ -201,71 +176,54 @@ export default function NewChatForm() {
router.push("/dashboard/chats");
};
// Create a new chat with the selected user
const createChat = async (e?: React.FormEvent) => {
if (e) e.preventDefault();
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
if (!selectedUser) {
toast.error("Please select a user first");
if (!buyerId) {
toast.error("Please select a customer");
return;
}
setIsSubmitting(true);
if (vendorStores.length === 0) {
toast.error("No store available. Please create a store first.");
return;
}
const storeId = vendorStores[0]._id;
setLoading(true);
try {
// Check for existing chat first
const chatExists = await checkExistingChat(selectedUser.telegramUserId);
if (chatExists) {
setIsSubmitting(false);
const authAxios = getAuthAxios();
if (!authAxios) {
toast.error("You need to be logged in");
router.push("/auth/login");
return;
}
// Get current vendor info
// Use clientFetch instead of direct axios calls
const vendorResponse = await clientFetch('/auth/me');
const vendorId = vendorResponse.vendor?._id;
if (!vendorId) {
toast.error("Vendor ID not found");
return;
}
// Get store ID from the current vendor
// Use clientFetch instead of direct axios calls
const storeResponse = await clientFetch(`/storefront`);
const storeId = storeResponse?.store?._id;
if (!storeId) {
toast.error("Store ID not found");
return;
}
// Create chat data object
const chatData = {
buyerId: selectedUser.telegramUserId,
vendorId,
storeId,
initialMessage: initialMessage.trim() || "Hello! How can I help you today?",
};
// Create the chat
// Use clientFetch instead of direct axios calls
const response = await clientFetch('/chats', {
method: 'POST',
body: JSON.stringify(chatData),
const response = await authAxios.post("/chats/create", {
buyerId,
storeId: storeId,
initialMessage: initialMessage.trim() || undefined
});
if (response && response._id) {
toast.success("Chat created successfully");
router.push(`/dashboard/chats/${response._id}`);
if (response.data.chatId) {
toast.success("Chat created successfully!");
router.push(`/dashboard/chats/${response.data.chatId}`);
} else if (response.data.error === "Chat already exists") {
toast.info("Chat already exists, redirecting...");
router.push(`/dashboard/chats/${response.data.chatId}`);
}
} catch (error: any) {
console.error("Error creating chat:", error);
if (error.response?.status === 409) {
toast.info("Chat already exists, redirecting...");
router.push(`/dashboard/chats/${error.response.data.chatId}`);
} else {
toast.error("Failed to create chat");
}
} catch (error) {
console.error("Error creating chat:", error);
toast.error("Failed to create chat");
} finally {
setIsSubmitting(false);
setLoading(false);
}
};
@@ -284,7 +242,7 @@ export default function NewChatForm() {
</CardHeader>
<CardContent>
<form onSubmit={(e) => createChat(e)} className="space-y-6">
<form onSubmit={handleSubmit} className="space-y-6">
<div className="space-y-2">
<Label htmlFor="buyerId">Customer Telegram ID or Username</Label>
<div className="relative">

31
components/dashboard/content.tsx
View File

@@ -10,6 +10,7 @@ import { ShoppingCart, RefreshCcw } from "lucide-react"
import { Button } from "@/components/ui/button"
import { useToast } from "@/components/ui/use-toast"
import { Skeleton } from "@/components/ui/skeleton"
import { clientFetch } from "@/lib/client-utils"
interface ContentProps {
username: string
@@ -90,35 +91,11 @@ export default function Content({ username, orderStats }: ContentProps) {
const [randomQuote, setRandomQuote] = useState(getRandomQuote())
const fetchTopProducts = async () => {
setIsLoading(true)
setError(null)
try {
// Get the auth token from cookies
const authToken = document.cookie
.split("; ")
.find((row) => row.startsWith("Authorization="))
?.split("=")[1];
setIsLoading(true)
if (!authToken) {
throw new Error("Authentication token not found")
}
// Use the API URL from environment variables
const apiUrl = `${process.env.NEXT_PUBLIC_API_URL}/orders/top-products`;
const response = await fetch(apiUrl, {
headers: {
Authorization: `Bearer ${authToken}`,
'Content-Type': 'application/json'
}
});
if (!response.ok) {
throw new Error(`API request failed: ${response.status} ${response.statusText}`)
}
const data = await response.json();
// Use clientFetch to handle URL routing and authentication properly
const data = await clientFetch('/orders/top-products');
setTopProducts(data);
} catch (err) {
console.error("Error fetching top products:", err);

7
lib/client-utils.ts
View File

@@ -16,18 +16,13 @@ export async function clientFetch(url: string, options: RequestInit = {}): Promi
// Ensure the url doesn't start with a slash if it's going to be appended to a URL that ends with one
const cleanUrl = url.startsWith('/') ? url.substring(1) : url;
// IMPORTANT: Always use /api as the base URL for client-side requests
// This ensures all requests go through Next.js API rewrite rules
const baseUrl = '/api';
const baseUrl = process.env.NEXT_PUBLIC_API_URL || '/api';
// Ensure there's only one slash between the base URL and endpoint
const fullUrl = baseUrl.endsWith('/')
? `${baseUrl}${cleanUrl}`
: `${baseUrl}/${cleanUrl}`;
console.log(`[clientFetch] Requesting: ${fullUrl}`);
const res = await fetch(fullUrl, {
...options,
headers,