lifei
/
app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

图搜

main
Mac 3 weeks ago
parent
574d32db80
commit
57c45f77e1
14 changed files with 1445 additions and 288 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      app/locales/en/translation.json
  2. 16
      app/navigation/AppNavigator.tsx
  3. 2
      app/navigation/screens.ts
  4. 3
      app/navigation/types.ts
  5. 70
      app/screens/ChatScreen.tsx
  6. 204
      app/screens/HomeScreen.tsx
  7. 1145
      app/screens/ImageSearchResultScreen.tsx
  8. 46
      app/screens/SearchResultScreen.tsx
  9. 11
      app/screens/SearchScreen.tsx
  10. 2
      app/screens/productStatus/Status.tsx
  11. 73
      app/services/api/chat.ts
  12. 12
      app/services/api/productApi.ts
  13. 42
      package-lock.json
  14. 16
      yarn.lock

15
app/locales/en/translation.json
Unescape View File

@ -98,10 +98,10 @@
"cart":"Cart", "cart":"Cart",
"categories": "Categories", "categories": "Categories",
"chat": "Chat", "chat": "Chat",
"customerServiceChat": "Customer Service Chat", "customerServiceChat": "Customer Service",
"productChat": "Product Chat", "productChat": "Product Support",
"notificationChat": "Notification Chat", "notificationChat": "Notifications",
"inputMessage": "Input message", "inputMessage": "Type a message...",
"send": "Send", "send": "Send",
"searchProducts": "Search products", "searchProducts": "Search products",
"recommendations": "Recommendations", "recommendations": "Recommendations",
@ -316,5 +316,10 @@
"address_management": "Address Management", "address_management": "Address Management",
"set_default": "Set Default Address", "set_default": "Set Default Address",
"delete": "Delete" "delete": "Delete"
} },
"typingMessage": "Typing",
"defaultResponse": "Thank you for your message. Our team will get back to you shortly.",
"errorResponse": "Sorry, there was an error processing your request. Please try again later.",
"loginRequired": "Login Required",
"pleaseLoginToChat": "Please login to continue with the chat service."
} }

16
app/navigation/AppNavigator.tsx
Unescape View File

@ -47,12 +47,9 @@ export const AppNavigator = () => {
name="Search" name="Search"
component={Screens.SearchScreen} component={Screens.SearchScreen}
options={{ options={{
presentation: "fullScreenModal", animation: "slide_from_right",
animation: "fade",
animationDuration: 200,
gestureEnabled: true, gestureEnabled: true,
gestureDirection: "vertical", gestureDirection: "horizontal",
contentStyle: { backgroundColor: "#ffffff" },
}} }}
/> />
<Stack.Screen <Stack.Screen
@ -64,6 +61,15 @@ export const AppNavigator = () => {
gestureDirection: "horizontal", gestureDirection: "horizontal",
}} }}
/> />
<Stack.Screen
name="ImageSearchResultScreen"
component={Screens.ImageSearchResultScreen}
options={{
animation: "slide_from_right",
gestureEnabled: true,
gestureDirection: "horizontal",
}}
/>
<Stack.Screen <Stack.Screen
name="ProductDetail" name="ProductDetail"
component={Screens.ProductDetailScreen} component={Screens.ProductDetailScreen}

2
app/navigation/screens.ts
Unescape View File

@ -5,6 +5,7 @@ import { EmailLoginScreen } from "../screens/EmailLoginScreen";
import { TabNavigator } from "./TabNavigator"; import { TabNavigator } from "./TabNavigator";
import { SearchScreen } from "../screens/SearchScreen"; import { SearchScreen } from "../screens/SearchScreen";
import { SearchResultScreen } from "../screens/SearchResultScreen"; import { SearchResultScreen } from "../screens/SearchResultScreen";
import { ImageSearchResultScreen } from "../screens/ImageSearchResultScreen";
import { ProductDetailScreen } from "../screens/ProductDetailScreen"; import { ProductDetailScreen } from "../screens/ProductDetailScreen";
import { BalanceScreen } from "../screens/BalanceScreen"; import { BalanceScreen } from "../screens/BalanceScreen";
import { ShippingDetailsSection } from "../screens/banner/ShippingDetailsSection"; import { ShippingDetailsSection } from "../screens/banner/ShippingDetailsSection";
@ -45,6 +46,7 @@ export {
TabNavigator, TabNavigator,
SearchScreen, SearchScreen,
SearchResultScreen, SearchResultScreen,
ImageSearchResultScreen,
ProductDetailScreen, ProductDetailScreen,
BalanceScreen, BalanceScreen,
ShippingDetailsSection, ShippingDetailsSection,

3
app/navigation/types.ts
Unescape View File

@ -7,7 +7,8 @@ export type RootStackParamList = {
EmailLogin: undefined; EmailLogin: undefined;
MainTabs: undefined; MainTabs: undefined;
Search: undefined; Search: undefined;
SearchResult: { keyword: string }; SearchResult: { keyword: string, formData?: FormData };
ImageSearchResultScreen: { image?: string, type?: number };
ProductDetail: { productId: string; searchKeyword?: string }; ProductDetail: { productId: string; searchKeyword?: string };
Balance: undefined; Balance: undefined;
ShippingDetailsSection: undefined; ShippingDetailsSection: undefined;

70
app/screens/ChatScreen.tsx
Unescape View File

@ -150,9 +150,77 @@ export const ChatScreen = () => {
text: newMessage.text text: newMessage.text
}; };
chatService.sendMessage(chatServiceMessage); // Add user message to the chat UI
setMessages([...messages, newMessage]); setMessages([...messages, newMessage]);
setInputText(""); setInputText("");
// Add simulated response with loading indicator
const simulatedId = `simulated-${Date.now()}`;
const simulatedResponse: Message = {
mimetype: "text/plain",
userWs: "system",
app_id: "system",
country: country,
body: "",
text: `${t('typingMessage')}...`,
type: "chat",
isMe: false,
timestamp: new Date(),
id: simulatedId,
};
// Add simulated message after a short delay to make it feel more natural
setTimeout(() => {
setMessages(prevMessages => [...prevMessages, simulatedResponse]);
}, 800);
// Send actual message to API
chatService.sendMessage(chatServiceMessage)
.then(response => {
// When real response arrives, replace simulated message
setMessages(prevMessages => {
// Filter out the simulated message and add real response
const filtered = prevMessages.filter(msg => msg.id !== simulatedId);
// Create the real response message object
const realResponse: Message = {
mimetype: "text/plain",
userWs: "system",
app_id: "system",
country: country,
body: "",
text: response?.text || t('defaultResponse'),
type: "chat",
isMe: false,
timestamp: new Date(),
id: `real-${Date.now()}`,
};
return [...filtered, realResponse];
});
})
.catch(error => {
// In case of error, replace simulated message with error message
console.error('Chat API error:', error);
setMessages(prevMessages => {
const filtered = prevMessages.filter(msg => msg.id !== simulatedId);
const errorResponse: Message = {
mimetype: "text/plain",
userWs: "system",
app_id: "system",
country: country,
body: "",
text: t('errorResponse'),
type: "chat",
isMe: false,
timestamp: new Date(),
id: `error-${Date.now()}`,
};
return [...filtered, errorResponse];
});
});
}; };
// Generate a unique key for each message // Generate a unique key for each message

204
app/screens/HomeScreen.tsx
Unescape View File

@ -39,8 +39,8 @@ import CloseIcon from "../components/CloseIcon";
import CheckmarkIcon from "../components/CheckmarkIcon"; import CheckmarkIcon from "../components/CheckmarkIcon";
import { getSubjectTransLanguage } from "../utils/languageUtils"; import { getSubjectTransLanguage } from "../utils/languageUtils";
import useUserStore from "../store/user"; import useUserStore from "../store/user";
import * as ImagePicker from 'expo-image-picker'; import * as ImagePicker from "expo-image-picker";
import * as FileSystem from 'expo-file-system'; import * as FileSystem from "expo-file-system";
// 为图标定义类型 // 为图标定义类型
type IconProps = { type IconProps = {
name: string; name: string;
@ -88,16 +88,28 @@ const LazyImage = React.memo(
<View style={[style, { overflow: "hidden" }]}> <View style={[style, { overflow: "hidden" }]}>
{/* Show placeholder while image is loading */} {/* Show placeholder while image is loading */}
{!isLoaded && !hasError && ( {!isLoaded && !hasError && (
<View style={[style, styles.imagePlaceholder, { position: 'absolute', zIndex: 1 }]} /> <View
style={[
style,
styles.imagePlaceholder,
{ position: "absolute", zIndex: 1 },
]}
/>
)} )}
{/* Show error state if image failed to load */} {/* Show error state if image failed to load */}
{hasError && ( {hasError && (
<View <View
style={[style, styles.imagePlaceholder, { position: 'absolute', zIndex: 1 }]} style={[
style,
styles.imagePlaceholder,
{ position: "absolute", zIndex: 1 },
]}
> >
<IconComponent name="image-outline" size={24} color="#999" /> <IconComponent name="image-outline" size={24} color="#999" />
<Text style={{ fontSize: fontSize(12), color: "#999", marginTop: 4 }}> <Text
style={{ fontSize: fontSize(12), color: "#999", marginTop: 4 }}
>
加载失败 加载失败
</Text> </Text>
</View> </View>
@ -167,7 +179,7 @@ const ProductSkeleton = React.memo(() => {
]} ]}
/> />
</View> </View>
<View style={[styles.skeletonTitle, { width: '60%' }]}> <View style={[styles.skeletonTitle, { width: "60%" }]}>
<Animated.View <Animated.View
style={[ style={[
styles.shimmer, styles.shimmer,
@ -538,30 +550,75 @@ export const HomeScreen = () => {
// 清理expo-image-picker临时文件 // 清理expo-image-picker临时文件
const cleanupImagePickerCache = async () => { const cleanupImagePickerCache = async () => {
try { try {
// Skip cache cleanup on web platform
if (Platform.OS === 'web') {
console.log('Cache cleanup skipped on web platform');
setGalleryUsed(false);
return;
}
// 相册选择后清理临时缓存 // 相册选择后清理临时缓存
const cacheDir = `${FileSystem.cacheDirectory}ImagePicker`; const cacheDir = `${FileSystem.cacheDirectory}ImagePicker`;
await FileSystem.deleteAsync(cacheDir, { idempotent: true }); await FileSystem.deleteAsync(cacheDir, { idempotent: true });
console.log('已清理ImagePicker缓存'); console.log("已清理ImagePicker缓存");
// 立即重置状态，无需用户干预 // 立即重置状态，无需用户干预
setGalleryUsed(false); setGalleryUsed(false);
} catch (error) { } catch (error) {
console.log('清理缓存错误', error); console.log("清理缓存错误", error);
// Even if cleanup fails, reset the state
setGalleryUsed(false);
}
};
// 将图片URI转换为FormData
const uriToFormData = async (uri: string) => {
try {
// 创建FormData对象
const formData = new FormData();
// 获取文件名
const filename = uri.split("/").pop() || "image.jpg";
// 判断文件类型（mime type）
const match = /\.(\w+)$/.exec(filename);
const type = match ? `image/${match[1]}` : "image/jpeg";
// 处理iOS路径前缀
const imageUri = Platform.OS === "ios" ? uri.replace("file://", "") : uri;
// 将图片转换为Blob
const imageFetchResponse = await fetch(imageUri);
const imageBlob = await imageFetchResponse.blob();
// 添加图片到FormData
formData.append("image", imageBlob, filename);
console.log("FormData 详情:");
console.log("- 图片URI:", uri);
console.log("- 文件名:", filename);
console.log("- 文件类型:", type);
return formData;
} catch (error) {
console.error("创建FormData错误:", error);
throw error;
} }
}; };
// 处理从相册选择 // 处理从相册选择
const handleChooseFromGallery = useCallback(async () => { const handleChooseFromGallery = useCallback(async () => {
console.log('handleChooseFromGallery'); console.log("handleChooseFromGallery");
setShowImagePickerModal(false); setShowImagePickerModal(false);
// 等待模态窗关闭后再执行 // 等待模态窗关闭后再执行
setTimeout(async () => { setTimeout(async () => {
try { try {
// 请求相册权限 // 请求相册权限
const permissionResult = await ImagePicker.requestMediaLibraryPermissionsAsync(); const permissionResult =
if (permissionResult.status !== 'granted') { await ImagePicker.requestMediaLibraryPermissionsAsync();
console.log('相册权限被拒绝'); if (permissionResult.status !== "granted") {
console.log("相册权限被拒绝");
return; return;
} }
@ -574,31 +631,34 @@ export const HomeScreen = () => {
}); });
if (!result.canceled && result.assets && result.assets.length > 0) { if (!result.canceled && result.assets && result.assets.length > 0) {
console.log('相册选择成功:', result.assets[0].uri); console.log("相册选择成功:", result.assets[0].uri);
// 这里可以添加后续处理代码，如图片上传等
// 相册选择完成后，立即清理缓存并重置状态
await cleanupImagePickerCache(); await cleanupImagePickerCache();
navigation.navigate("ImageSearchResultScreen", {
image: result.assets[0].uri,
type: 1,
});
} }
} catch (error: any) { } catch (error: any) {
console.error('相册错误:', error); console.error("相册错误:", error);
// 出错时也清理缓存 // 出错时也清理缓存
await cleanupImagePickerCache(); await cleanupImagePickerCache();
} }
}, 500); }, 500);
}, []); }, [userStore.user]);
// 处理相机拍照 - 简化版本，不再需要处理galleryUsed // 处理相机拍照 - 简化版本，不再需要处理galleryUsed
const handleTakePhoto = useCallback(async () => { const handleTakePhoto = useCallback(async () => {
console.log('handleTakePhoto'); console.log("handleTakePhoto");
setShowImagePickerModal(false); setShowImagePickerModal(false);
// 等待模态窗关闭后再执行 // 等待模态窗关闭后再执行
setTimeout(async () => { setTimeout(async () => {
try { try {
const permissionResult = await ImagePicker.requestCameraPermissionsAsync(); const permissionResult =
if (permissionResult.status !== 'granted') { await ImagePicker.requestCameraPermissionsAsync();
console.log('相机权限被拒绝'); if (permissionResult.status !== "granted") {
console.log("相机权限被拒绝");
return; return;
} }
@ -609,22 +669,24 @@ export const HomeScreen = () => {
quality: 1, quality: 1,
}); });
console.log(result);
if (!result.canceled && result.assets && result.assets.length > 0) { if (!result.canceled && result.assets && result.assets.length > 0) {
console.log('拍照成功:', result.assets[0].uri); console.log("拍照成功:", result.assets[0].uri);
// 这里可以添加后续处理代码，如图片上传等
}
// 使用后清理缓存 // 使用后清理缓存
await cleanupImagePickerCache(); await cleanupImagePickerCache();
// 将图片URI转换为FormData
navigation.navigate("ImageSearchResultScreen", {
image: result.assets[0].uri,
type: 1,
});
}
} catch (error: any) { } catch (error: any) {
console.error('相机错误:', error); console.error("相机错误:", error);
// 出错时也清理缓存 // 出错时也清理缓存
await cleanupImagePickerCache(); await cleanupImagePickerCache();
} }
}, 500); }, 500);
}, []); }, [userStore.user]);
// 重置应用状态函数 // 重置应用状态函数
const resetAppState = useCallback(() => { const resetAppState = useCallback(() => {
@ -635,7 +697,7 @@ export const HomeScreen = () => {
cleanupImagePickerCache(); cleanupImagePickerCache();
// 提示用户 // 提示用户
Alert.alert('已重置', '现在您可以使用相机功能了'); Alert.alert("已重置", "现在您可以使用相机功能了");
}, []); }, []);
// 渲染列表头部内容 // 渲染列表头部内容
@ -933,7 +995,11 @@ export const HomeScreen = () => {
style={styles.imagePickerOption} style={styles.imagePickerOption}
onPress={handleTakePhoto} onPress={handleTakePhoto}
> >
<IconComponent name="camera-outline" size={24} color="#333" /> <IconComponent
name="camera-outline"
size={24}
color="#333"
/>
<Text style={styles.imagePickerText}>拍照</Text> <Text style={styles.imagePickerText}>拍照</Text>
</TouchableOpacity> </TouchableOpacity>
) : ( ) : (
@ -942,7 +1008,11 @@ export const HomeScreen = () => {
style={styles.imagePickerOption} style={styles.imagePickerOption}
onPress={resetAppState} onPress={resetAppState}
> >
<IconComponent name="refresh-outline" size={24} color="#333" /> <IconComponent
name="refresh-outline"
size={24}
color="#333"
/>
<Text style={styles.imagePickerText}>重置相机功能</Text> <Text style={styles.imagePickerText}>重置相机功能</Text>
</TouchableOpacity> </TouchableOpacity>
)} )}
@ -974,15 +1044,15 @@ export const HomeScreen = () => {
const styles = StyleSheet.create<StylesType>({ const styles = StyleSheet.create<StylesType>({
safeArea: { safeArea: {
flex: 1, flex: 1,
backgroundColor: '#fff', backgroundColor: "#fff",
}, },
safeAreaContent: { safeAreaContent: {
flex: 1, flex: 1,
paddingTop: Platform.OS === 'android' ? 0 : 0, paddingTop: Platform.OS === "android" ? 0 : 0,
}, },
container: { container: {
flex: 1, flex: 1,
backgroundColor: '#fff', backgroundColor: "#fff",
}, },
swpImg: { swpImg: {
width: "100%", width: "100%",
@ -1359,53 +1429,53 @@ const styles = StyleSheet.create<StylesType>({
paddingTop: 0, paddingTop: 0,
}, },
skeletonImage: { skeletonImage: {
width: '100%', width: "100%",
paddingBottom: '100%', paddingBottom: "100%",
borderRadius: 10, borderRadius: 10,
backgroundColor: '#e1e1e1', backgroundColor: "#e1e1e1",
overflow: 'hidden', overflow: "hidden",
position: 'relative', position: "relative",
}, },
skeletonTitle: { skeletonTitle: {
height: 16, height: 16,
borderRadius: 4, borderRadius: 4,
marginTop: 8, marginTop: 8,
marginBottom: 4, marginBottom: 4,
width: '100%', width: "100%",
backgroundColor: '#e1e1e1', backgroundColor: "#e1e1e1",
overflow: 'hidden', overflow: "hidden",
position: 'relative', position: "relative",
}, },
skeletonPrice: { skeletonPrice: {
height: 24, height: 24,
width: 80, width: 80,
borderRadius: 4, borderRadius: 4,
marginTop: 8, marginTop: 8,
backgroundColor: '#e1e1e1', backgroundColor: "#e1e1e1",
overflow: 'hidden', overflow: "hidden",
position: 'relative', position: "relative",
}, },
skeletonSales: { skeletonSales: {
height: 14, height: 14,
width: '40%', width: "40%",
borderRadius: 4, borderRadius: 4,
marginTop: 8, marginTop: 8,
backgroundColor: '#e1e1e1', backgroundColor: "#e1e1e1",
overflow: 'hidden', overflow: "hidden",
position: 'relative', position: "relative",
}, },
shimmer: { shimmer: {
width: '30%', width: "30%",
height: '100%', height: "100%",
backgroundColor: 'rgba(255, 255, 255, 0.3)', backgroundColor: "rgba(255, 255, 255, 0.3)",
position: 'absolute', position: "absolute",
top: 0, top: 0,
left: 0, left: 0,
}, },
imagePlaceholder: { imagePlaceholder: {
backgroundColor: '#EAEAEA', backgroundColor: "#EAEAEA",
justifyContent: 'center', justifyContent: "center",
alignItems: 'center', alignItems: "center",
borderRadius: 8, borderRadius: 8,
}, },
productImage: { productImage: {
@ -1416,40 +1486,40 @@ const styles = StyleSheet.create<StylesType>({
// Image Picker Modal Styles // Image Picker Modal Styles
imagePickerOverlay: { imagePickerOverlay: {
flex: 1, flex: 1,
backgroundColor: 'rgba(0, 0, 0, 0.5)', backgroundColor: "rgba(0, 0, 0, 0.5)",
justifyContent: 'flex-end', justifyContent: "flex-end",
}, },
imagePickerContent: { imagePickerContent: {
backgroundColor: '#fff', backgroundColor: "#fff",
borderTopLeftRadius: 20, borderTopLeftRadius: 20,
borderTopRightRadius: 20, borderTopRightRadius: 20,
paddingTop: 20, paddingTop: 20,
}, },
imagePickerOption: { imagePickerOption: {
flexDirection: 'row', flexDirection: "row",
alignItems: 'center', alignItems: "center",
paddingVertical: 16, paddingVertical: 16,
paddingHorizontal: 20, paddingHorizontal: 20,
}, },
imagePickerText: { imagePickerText: {
fontSize: fontSize(16), fontSize: fontSize(16),
marginLeft: 12, marginLeft: 12,
color: '#333', color: "#333",
}, },
imagePickerDivider: { imagePickerDivider: {
height: 1, height: 1,
backgroundColor: '#f0f0f0', backgroundColor: "#f0f0f0",
marginHorizontal: 20, marginHorizontal: 20,
}, },
imagePickerCancelButton: { imagePickerCancelButton: {
alignItems: 'center', alignItems: "center",
paddingVertical: 16, paddingVertical: 16,
marginTop: 8, marginTop: 8,
borderTopWidth: 1, borderTopWidth: 1,
borderTopColor: '#f0f0f0', borderTopColor: "#f0f0f0",
}, },
imagePickerCancelText: { imagePickerCancelText: {
fontSize: fontSize(16), fontSize: fontSize(16),
color: '#999', color: "#999",
}, },
}); });

1145
app/screens/ImageSearchResultScreen.tsx
View File

File diff suppressed because it is too large Load Diff

46
app/screens/SearchResultScreen.tsx
Unescape View File

@ -31,7 +31,6 @@ import widthUtils from "../utils/widthUtils";
import fontSize from "../utils/fontsizeUtils"; import fontSize from "../utils/fontsizeUtils";
import useUserStore from "../store/user"; import useUserStore from "../store/user";
import { getSubjectTransLanguage } from "../utils/languageUtils"; import { getSubjectTransLanguage } from "../utils/languageUtils";
// 图标组件 - 使用React.memo优化渲染 // 图标组件 - 使用React.memo优化渲染
const IconComponent = React.memo( const IconComponent = React.memo(
({ name, size, color }: { name: string; size: number; color: string }) => { ({ name, size, color }: { name: string; size: number; color: string }) => {
@ -39,18 +38,15 @@ const IconComponent = React.memo(
return <Icon name={name} size={size} color={color} />; return <Icon name={name} size={size} color={color} />;
} }
); );
// 路由参数类型 // 路由参数类型
type SearchResultRouteParams = { type SearchResultRouteParams = {
keyword: string; keyword: string;
}; };
// 组件Props类型 // 组件Props类型
type SearchResultScreenProps = { type SearchResultScreenProps = {
route: RouteProp<Record<string, SearchResultRouteParams>, string>; route: RouteProp<Record<string, SearchResultRouteParams>, string>;
navigation: NativeStackNavigationProp<any>; navigation: NativeStackNavigationProp<any>;
}; };
// 懒加载图片组件 - 改进版本 // 懒加载图片组件 - 改进版本
const LazyImage = React.memo( const LazyImage = React.memo(
({ ({
@ -64,16 +60,13 @@ const LazyImage = React.memo(
}) => { }) => {
const [isLoaded, setIsLoaded] = useState(false); const [isLoaded, setIsLoaded] = useState(false);
const [hasError, setHasError] = useState(false); const [hasError, setHasError] = useState(false);
const onLoad = useCallback(() => { const onLoad = useCallback(() => {
setIsLoaded(true); setIsLoaded(true);
}, []); }, []);
const onError = useCallback(() => { const onError = useCallback(() => {
setHasError(true); setHasError(true);
setIsLoaded(true); // Also mark as loaded on error to remove placeholder setIsLoaded(true); // Also mark as loaded on error to remove placeholder
}, []); }, []);
return ( return (
<View style={[style, { overflow: "hidden" }]}> <View style={[style, { overflow: "hidden" }]}>
{/* Show placeholder while image is loading */} {/* Show placeholder while image is loading */}
@ -92,7 +85,6 @@ const LazyImage = React.memo(
</Text> </Text>
</View> </View>
)} )}
{/* Actual image */} {/* Actual image */}
<Image <Image
source={{ uri }} source={{ uri }}
@ -105,7 +97,6 @@ const LazyImage = React.memo(
); );
} }
); );
// 产品骨架屏组件 - 用于加载状态 // 产品骨架屏组件 - 用于加载状态
const ProductSkeleton = React.memo(() => ( const ProductSkeleton = React.memo(() => (
<View style={styles.productCard}> <View style={styles.productCard}>
@ -118,7 +109,6 @@ const ProductSkeleton = React.memo(() => (
</View> </View>
</View> </View>
)); ));
// 产品项组件 - 使用React.memo优化渲染 // 产品项组件 - 使用React.memo优化渲染
const ProductItem = React.memo( const ProductItem = React.memo(
({ ({
@ -148,7 +138,6 @@ const ProductItem = React.memo(
) : ( ) : (
<Text style={styles.placeholderText}>{t('productPicture')}</Text> <Text style={styles.placeholderText}>{t('productPicture')}</Text>
)} )}
{userStore.user?.user_id && ( {userStore.user?.user_id && (
<TouchableOpacity style={styles.vipIcon}> <TouchableOpacity style={styles.vipIcon}>
<Text style={styles.vipButtonText}>VIP</Text> <Text style={styles.vipButtonText}>VIP</Text>
@ -189,7 +178,6 @@ const ProductItem = React.memo(
</TouchableOpacity> </TouchableOpacity>
) )
); );
export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProps) => { export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const [searchText, setSearchText] = useState(""); const [searchText, setSearchText] = useState("");
@ -208,7 +196,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
); );
const userStore = useUserStore(); const userStore = useUserStore();
const [showSkeleton, setShowSkeleton] = useState(true); const [showSkeleton, setShowSkeleton] = useState(true);
const [searchParams, setSearchParams] = useState<ProductParams>({ const [searchParams, setSearchParams] = useState<ProductParams>({
keyword: route.params?.keyword || "", keyword: route.params?.keyword || "",
page: 1, page: 1,
@ -219,7 +206,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
language: "en", language: "en",
user_id: userStore.user.user_id, user_id: userStore.user.user_id,
}); });
// 初始化搜索关键字 // 初始化搜索关键字
useEffect(() => { useEffect(() => {
if (route.params?.keyword) { if (route.params?.keyword) {
@ -233,7 +219,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
searchProducts(newParams); searchProducts(newParams);
} }
}, [route.params?.keyword]); }, [route.params?.keyword]);
// 搜索产品的API调用 // 搜索产品的API调用
const searchProducts = useCallback( const searchProducts = useCallback(
async (params: ProductParams, isLoadMore = false) => { async (params: ProductParams, isLoadMore = false) => {
@ -277,7 +262,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
}, },
[] []
); );
// 处理搜索提交 // 处理搜索提交
const handleSearch = useCallback(() => { const handleSearch = useCallback(() => {
if (searchText.trim()) { if (searchText.trim()) {
@ -288,7 +272,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
setActiveTab("default"); setActiveTab("default");
// Show skeleton for new search // Show skeleton for new search
setShowSkeleton(true); setShowSkeleton(true);
const newParams = { const newParams = {
...searchParams, ...searchParams,
keyword: searchText.trim(), keyword: searchText.trim(),
@ -298,12 +281,10 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
searchProducts(newParams); searchProducts(newParams);
} }
}, [searchText, searchParams, searchProducts]); }, [searchText, searchParams, searchProducts]);
// 切换筛选器显示状态 // 切换筛选器显示状态
const toggleFilter = useCallback(() => { const toggleFilter = useCallback(() => {
setIsFilterVisible(!isFilterVisible); setIsFilterVisible(!isFilterVisible);
}, [isFilterVisible]); }, [isFilterVisible]);
// 处理点击产品 // 处理点击产品
const handleProductPress = useCallback( const handleProductPress = useCallback(
(product: Product) => { (product: Product) => {
@ -316,12 +297,10 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
}, },
[navigation, searchText] [navigation, searchText]
); );
// 返回上一页 // 返回上一页
const goBack = useCallback(() => { const goBack = useCallback(() => {
navigation.goBack(); navigation.goBack();
}, [navigation]); }, [navigation]);
// 渲染列表为空时的组件 // 渲染列表为空时的组件
const renderEmptyList = useCallback( const renderEmptyList = useCallback(
() => ( () => (
@ -335,7 +314,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
), ),
[searchText, t] [searchText, t]
); );
// 渲染产品项 // 渲染产品项
const renderProductItem = useCallback( const renderProductItem = useCallback(
({ item }: { item: Product }) => ( ({ item }: { item: Product }) => (
@ -348,23 +326,19 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
), ),
[handleProductPress, t, userStore] [handleProductPress, t, userStore]
); );
// 创建产品列表项的key提取器 // 创建产品列表项的key提取器
const keyExtractor = useCallback( const keyExtractor = useCallback(
(item: Product, index: number) => `${item.offer_id}-${index}`, (item: Product, index: number) => `${item.offer_id}-${index}`,
[] []
); );
// 处理排序 // 处理排序
const handleSort = useCallback( const handleSort = useCallback(
(field: "price" | "time", order: "asc" | "desc") => { (field: "price" | "time", order: "asc" | "desc") => {
setSortField(field); setSortField(field);
setSortOrder(order); setSortOrder(order);
// 本地排序，不发送API请求 // 本地排序，不发送API请求
setProducts((prevProducts) => { setProducts((prevProducts) => {
const sortedProducts = [...prevProducts]; const sortedProducts = [...prevProducts];
if (field === "price") { if (field === "price") {
sortedProducts.sort((a, b) => { sortedProducts.sort((a, b) => {
const priceA = a.min_price || 0; const priceA = a.min_price || 0;
@ -379,19 +353,15 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
return order === "asc" ? timeA - timeB : timeB - timeA; return order === "asc" ? timeA - timeB : timeB - timeA;
}); });
} }
return sortedProducts; return sortedProducts;
}); });
}, },
[] []
); );
// 处理加载更多 // 处理加载更多
const handleLoadMore = useCallback(() => { const handleLoadMore = useCallback(() => {
if (loading || !hasMore || loadingMore) return; if (loading || !hasMore || loadingMore) return;
setLoadingMore(true); setLoadingMore(true);
const newParams = { const newParams = {
...searchParams, ...searchParams,
page: searchParams.page + 1, page: searchParams.page + 1,
@ -399,7 +369,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
setSearchParams(newParams); setSearchParams(newParams);
searchProducts(newParams, true); searchProducts(newParams, true);
}, [loading, hasMore, loadingMore, searchParams, searchProducts]); }, [loading, hasMore, loadingMore, searchParams, searchProducts]);
// 渲染底部加载指示器 // 渲染底部加载指示器
const renderFooter = useCallback(() => { const renderFooter = useCallback(() => {
if (!hasMore) if (!hasMore)
@ -408,7 +377,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
<Text style={styles.footerText}>{t("noMoreData")}</Text> <Text style={styles.footerText}>{t("noMoreData")}</Text>
</View> </View>
); );
if (loadingMore) if (loadingMore)
return ( return (
<View style={styles.footerContainer}> <View style={styles.footerContainer}>
@ -416,22 +384,18 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
<Text style={styles.footerText}>{t("loadingMore")}</Text> <Text style={styles.footerText}>{t("loadingMore")}</Text>
</View> </View>
); );
return <View style={styles.footerSpace} />; return <View style={styles.footerSpace} />;
}, [loadingMore, hasMore, t]); }, [loadingMore, hasMore, t]);
// 处理滚动事件 // 处理滚动事件
const handleScroll = useCallback((event: any) => { const handleScroll = useCallback((event: any) => {
const offsetY = event.nativeEvent.contentOffset.y; const offsetY = event.nativeEvent.contentOffset.y;
// 当滚动超过屏幕高度的一半时显示回到顶部按钮 // 当滚动超过屏幕高度的一半时显示回到顶部按钮
setShowBackToTop(offsetY > 300); setShowBackToTop(offsetY > 300);
}, []); }, []);
// 回到顶部 // 回到顶部
const scrollToTop = useCallback(() => { const scrollToTop = useCallback(() => {
flatListRef.current?.scrollToOffset({ offset: 0, animated: true }); flatListRef.current?.scrollToOffset({ offset: 0, animated: true });
}, []); }, []);
// 处理标签切换 // 处理标签切换
const handleTabChange = useCallback( const handleTabChange = useCallback(
(tab: "default" | "volume" | "price") => { (tab: "default" | "volume" | "price") => {
@ -443,7 +407,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
scrollToTop(); scrollToTop();
} else { } else {
setActiveTab(tab); setActiveTab(tab);
// 根据标签类型设置排序规则 // 根据标签类型设置排序规则
if (tab === "price") { if (tab === "price") {
// 默认价格从低到高 // 默认价格从低到高
@ -468,7 +431,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
}, },
[handleSort, activeTab, sortOrder, originalProducts, scrollToTop] [handleSort, activeTab, sortOrder, originalProducts, scrollToTop]
); );
// 渲染骨架屏网格 // 渲染骨架屏网格
const renderSkeletonGrid = useCallback(() => { const renderSkeletonGrid = useCallback(() => {
// Create an array of items for the skeleton grid // Create an array of items for the skeleton grid
@ -487,7 +449,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
</View> </View>
); );
}, []); }, []);
return ( return (
<SafeAreaView style={styles.safeArea}> <SafeAreaView style={styles.safeArea}>
<StatusBar barStyle="dark-content" backgroundColor="#fff" /> <StatusBar barStyle="dark-content" backgroundColor="#fff" />
@ -527,7 +488,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
)} )}
</View> </View>
</View> </View>
{/* 标签筛选 */} {/* 标签筛选 */}
<View style={styles.tabContainer}> <View style={styles.tabContainer}>
<TouchableOpacity <TouchableOpacity
@ -590,7 +550,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
{/* 搜索结果 */} {/* 搜索结果 */}
<View style={styles.resultsContainer}> <View style={styles.resultsContainer}>
{/* 搜索结果标题栏和排序选项 */} {/* 搜索结果标题栏和排序选项 */}
@ -660,9 +619,7 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
<View style={styles.sortDivider} /> <View style={styles.sortDivider} />
<View style={styles.sortGroup}> <View style={styles.sortGroup}>
<Text style={styles.sortLabel}>{t('time')}:</Text> <Text style={styles.sortLabel}>{t('time')}:</Text>
<View style={styles.sortButtons}> <View style={styles.sortButtons}>
@ -725,7 +682,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
</ScrollView> </ScrollView>
</View> </View>
)} )}
{/* 加载指示器或产品列表 */} {/* 加载指示器或产品列表 */}
{loading && showSkeleton ? ( {loading && showSkeleton ? (
renderSkeletonGrid() renderSkeletonGrid()
@ -768,7 +724,6 @@ export const SearchResultScreen = ({ route, navigation }: SearchResultScreenProp
</SafeAreaView> </SafeAreaView>
); );
}; };
const styles = StyleSheet.create({ const styles = StyleSheet.create({
safeArea: { safeArea: {
flex: 1, flex: 1,
@ -1075,7 +1030,6 @@ const styles = StyleSheet.create({
width: widthUtils(30, 66).width, width: widthUtils(30, 66).width,
height: widthUtils(30, 66).height, height: widthUtils(30, 66).height,
}, },
vipButtonText: { vipButtonText: {
fontStyle: "italic", fontStyle: "italic",
fontWeight: "900", fontWeight: "900",

11
app/screens/SearchScreen.tsx
Unescape View File

@ -193,14 +193,13 @@ export const SearchScreen = () => {
}, [searchText, saveSearchHistory, navigation]); }, [searchText, saveSearchHistory, navigation]);
// 点击搜索标签 // 点击搜索标签
const handleTagPress = useCallback((tag: string) => { const handleTagPress = (tag: string) => {
console.log('tag',tag);
setSearchText(tag); setSearchText(tag);
saveSearchHistory(tag); saveSearchHistory(tag);
logSearch(searchText.trim(),navigation.getState().routes[navigation.getState().index - 1]?.name as string); logSearch(tag,navigation.getState().routes[navigation.getState().index - 1]?.name as string);
// 导航到搜索结果页面，并传递搜索关键词 // 导航到搜索结果页面，并传递搜索关键词
navigation.navigate('SearchResult', { keyword: tag }); navigation.navigate('SearchResult', { keyword: tag });
}, [saveSearchHistory, navigation]); }
return ( return (
<SafeAreaView style={styles.safeArea}> <SafeAreaView style={styles.safeArea}>
@ -256,7 +255,7 @@ export const SearchScreen = () => {
<SearchTagItem <SearchTagItem
key={`recent-${index}`} key={`recent-${index}`}
tag={tag} tag={tag}
onPress={handleTagPress} onPress={() => handleTagPress(tag)}
showDeleteButton={true} showDeleteButton={true}
onDelete={removeSearchHistoryItem} onDelete={removeSearchHistoryItem}
/> />
@ -276,7 +275,7 @@ export const SearchScreen = () => {
<SearchTagItem <SearchTagItem
key={`trending-${index}`} key={`trending-${index}`}
tag={tag} tag={tag}
onPress={handleTagPress} onPress={() => handleTagPress(tag)}
/> />
))} ))}
</View> </View>

2
app/screens/productStatus/Status.tsx
Unescape View File

@ -326,8 +326,8 @@ const styles = StyleSheet.create({
width: "100%", width: "100%",
}, },
statusItem: { statusItem: {
width: widthUtils(100, 100).width,
padding: 16, padding: 16,
paddingHorizontal: 20,
backgroundColor: "white", backgroundColor: "white",
}, },
statusItemText: { statusItemText: {

73
app/services/api/chat.ts
Unescape View File

@ -1,67 +1,18 @@
import axios, { AxiosInstance, AxiosError } from 'axios'; import apiService from './apiClient';
export interface ChatMessage {
// Chat API base URL type: string;
const CHAT_API_BASE_URL = 'https://6454c61f-3a39-43f7-afb1-d342c903b84e-00-21kfz12hqvw76.sisko.replit.dev'; mimetype: string;
userWs: string;
// Create axios instance for chat app_id: string;
const chatApi: AxiosInstance = axios.create({ country: string;
baseURL: CHAT_API_BASE_URL, body: string;
timeout: 30000, text: string;
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json'
} }
});
// Request interceptor
chatApi.interceptors.request.use(
async (config) => {
return config;
},
(error) => {
return Promise.reject(error);
}
);
// Response interceptor
chatApi.interceptors.response.use(
(response) => {
return response;
},
(error: AxiosError) => {
return Promise.reject(error);
}
);
// API methods // API methods
export const chatService = { export const chatService = {
// Send message // Send message with retry mechanism
async sendMessage(newMessage: { async sendMessage(newMessage:ChatMessage): Promise<any> {
type: string, return apiService.post('https://api.brainnel.com/app_chat/chat/',newMessage);
mimetype: string,
userWs: string,
app_id: string,
country: string,
body: string,
text: string
}): Promise<any> {
try {
const response = await chatApi.post('/chat', { newMessage });
return response.data;
} catch (error) {
throw error;
}
}, },
// Get chat history
async getChatHistory(sessionId: string): Promise<any> {
try {
const response = await chatApi.get('/history', { params: { sessionId } });
return response.data;
} catch (error) {
throw error;
}
}
}; };
export default chatApi;

12
app/services/api/productApi.ts
Unescape View File

@ -37,7 +37,13 @@ export type Products = Product[]
sort_order?:string; sort_order?:string;
sort_by:string, sort_by:string,
language:string, language:string,
user_id?:number user_id?:number,
type?: number,
image?: string
}
export interface ImageSearchParams {
page_size?: number;
} }
export interface SkuAttribute { export interface SkuAttribute {
@ -193,6 +199,10 @@ export type Products = Product[]
getSimilarProducts: (offer_id: string, user_id?: number) => { getSimilarProducts: (offer_id: string, user_id?: number) => {
const url = user_id ? `/api/products/${offer_id}/similar/?limit=5&user_id=${user_id}` : `/api/products/${offer_id}/similar/?limit=5`; const url = user_id ? `/api/products/${offer_id}/similar/?limit=5&user_id=${user_id}` : `/api/products/${offer_id}/similar/?limit=5`;
return apiService.get<Similars>(url); return apiService.get<Similars>(url);
},
// 图片搜索
searchByImage: (data:{formData: FormData,user_id?:number}) => {
return apiService.upload<Products>('/api/search/image_search/?user_id='+data.user_id,data.formData);
} }
} }

42
package-lock.json generated
Unescape View File

@ -14829,8 +14829,6 @@
}, },
"node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": { "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": {
"version": "5.1.2", "version": "5.1.2",
"resolved": "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz",
"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -15052,8 +15050,6 @@
}, },
"node_modules/npm/node_modules/@npmcli/metavuln-calculator/node_modules/pacote": { "node_modules/npm/node_modules/@npmcli/metavuln-calculator/node_modules/pacote": {
"version": "20.0.0", "version": "20.0.0",
"resolved": "https://registry.npmmirror.com/pacote/-/pacote-20.0.0.tgz",
"integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -15400,8 +15396,6 @@
}, },
"node_modules/npm/node_modules/cacache/node_modules/tar": { "node_modules/npm/node_modules/cacache/node_modules/tar": {
"version": "7.4.3", "version": "7.4.3",
"resolved": "https://registry.npmmirror.com/tar/-/tar-7.4.3.tgz",
"integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -15427,9 +15421,7 @@
} }
}, },
"node_modules/npm/node_modules/chalk": { "node_modules/npm/node_modules/chalk": {
"version": "5.4.1", "version": "5.3.0",
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-5.4.1.tgz",
"integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
@ -15550,8 +15542,6 @@
}, },
"node_modules/npm/node_modules/cross-spawn/node_modules/which": { "node_modules/npm/node_modules/cross-spawn/node_modules/which": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -16165,8 +16155,6 @@
}, },
"node_modules/npm/node_modules/make-fetch-happen/node_modules/negotiator": { "node_modules/npm/node_modules/make-fetch-happen/node_modules/negotiator": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-1.0.0.tgz",
"integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
@ -16255,8 +16243,6 @@
}, },
"node_modules/npm/node_modules/minipass-flush/node_modules/minipass": { "node_modules/npm/node_modules/minipass-flush/node_modules/minipass": {
"version": "3.3.6", "version": "3.3.6",
"resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -16281,8 +16267,6 @@
}, },
"node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": { "node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": {
"version": "3.3.6", "version": "3.3.6",
"resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -16307,8 +16291,6 @@
}, },
"node_modules/npm/node_modules/minipass-sized/node_modules/minipass": { "node_modules/npm/node_modules/minipass-sized/node_modules/minipass": {
"version": "3.3.6", "version": "3.3.6",
"resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -16334,8 +16316,6 @@
}, },
"node_modules/npm/node_modules/minizlib/node_modules/minipass": { "node_modules/npm/node_modules/minizlib/node_modules/minipass": {
"version": "3.3.6", "version": "3.3.6",
"resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -16438,8 +16418,6 @@
}, },
"node_modules/npm/node_modules/node-gyp/node_modules/tar": { "node_modules/npm/node_modules/node-gyp/node_modules/tar": {
"version": "7.4.3", "version": "7.4.3",
"resolved": "https://registry.npmmirror.com/tar/-/tar-7.4.3.tgz",
"integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -17066,8 +17044,6 @@
}, },
"node_modules/npm/node_modules/spdx-correct/node_modules/spdx-expression-parse": { "node_modules/npm/node_modules/spdx-correct/node_modules/spdx-expression-parse": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -17209,8 +17185,6 @@
}, },
"node_modules/npm/node_modules/tar/node_modules/fs-minipass": { "node_modules/npm/node_modules/tar/node_modules/fs-minipass": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz",
"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -17222,8 +17196,6 @@
}, },
"node_modules/npm/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { "node_modules/npm/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
"version": "3.3.6", "version": "3.3.6",
"resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@ -17235,8 +17207,6 @@
}, },
"node_modules/npm/node_modules/tar/node_modules/minipass": { "node_modules/npm/node_modules/tar/node_modules/minipass": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmmirror.com/minipass/-/minipass-5.0.0.tgz",
"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"engines": { "engines": {
@ -17284,8 +17254,6 @@
}, },
"node_modules/npm/node_modules/tuf-js/node_modules/@tufjs/models": { "node_modules/npm/node_modules/tuf-js/node_modules/@tufjs/models": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmmirror.com/@tufjs/models/-/models-3.0.1.tgz",
"integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==",
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -17342,8 +17310,6 @@
}, },
"node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": { "node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -17386,8 +17352,6 @@
}, },
"node_modules/npm/node_modules/which/node_modules/isexe": { "node_modules/npm/node_modules/which/node_modules/isexe": {
"version": "3.1.1", "version": "3.1.1",
"resolved": "https://registry.npmmirror.com/isexe/-/isexe-3.1.1.tgz",
"integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"engines": { "engines": {
@ -17433,8 +17397,6 @@
}, },
"node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
"version": "4.3.0", "version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -17469,8 +17431,6 @@
}, },
"node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": { "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": {
"version": "5.1.2", "version": "5.1.2",
"resolved": "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz",
"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
"inBundle": true, "inBundle": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

16
yarn.lock
Unescape View File

@ -2658,8 +2658,6 @@
"@tufjs/models@3.0.1": "@tufjs/models@3.0.1":
version "3.0.1" version "3.0.1"
resolved "https://registry.npmmirror.com/@tufjs/models/-/models-3.0.1.tgz"
integrity sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==
dependencies: dependencies:
"@tufjs/canonical-json" "2.0.0" "@tufjs/canonical-json" "2.0.0"
minimatch "^9.0.5" minimatch "^9.0.5"
@ -4161,9 +4159,7 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
supports-color "^7.1.0" supports-color "^7.1.0"
chalk@^5.3.0: chalk@^5.3.0:
version "5.4.1" version "5.3.0"
resolved "https://registry.npmmirror.com/chalk/-/chalk-5.4.1.tgz"
integrity sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==
char-regex@^1.0.2: char-regex@^1.0.2:
version "1.0.2" version "1.0.2"
@ -7314,8 +7310,6 @@ isexe@^2.0.0:
isexe@^3.1.1: isexe@^3.1.1:
version "3.1.1" version "3.1.1"
resolved "https://registry.npmmirror.com/isexe/-/isexe-3.1.1.tgz"
integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
isobject@^3.0.1: isobject@^3.0.1:
version "3.0.1" version "3.0.1"
@ -8624,8 +8618,6 @@ natural-compare@^1.4.0:
negotiator@^1.0.0: negotiator@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.npmmirror.com/negotiator/-/negotiator-1.0.0.tgz"
integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==
negotiator@~0.6.4: negotiator@~0.6.4:
version "0.6.4" version "0.6.4"
@ -9196,8 +9188,6 @@ pacote@^19.0.0, pacote@^19.0.1:
pacote@^20.0.0: pacote@^20.0.0:
version "20.0.0" version "20.0.0"
resolved "https://registry.npmmirror.com/pacote/-/pacote-20.0.0.tgz"
integrity sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A==
dependencies: dependencies:
"@npmcli/git" "^6.0.0" "@npmcli/git" "^6.0.0"
"@npmcli/installed-package-contents" "^3.0.0" "@npmcli/installed-package-contents" "^3.0.0"
@ -11069,8 +11059,6 @@ spdx-exceptions@^2.1.0:
spdx-expression-parse@^3.0.0: spdx-expression-parse@^3.0.0:
version "3.0.1" version "3.0.1"
resolved "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
dependencies: dependencies:
spdx-exceptions "^2.1.0" spdx-exceptions "^2.1.0"
spdx-license-ids "^3.0.0" spdx-license-ids "^3.0.0"
@ -11528,8 +11516,6 @@ tar@^6.1.11, tar@^6.2.1:
tar@^7.4.3: tar@^7.4.3:
version "7.4.3" version "7.4.3"
resolved "https://registry.npmmirror.com/tar/-/tar-7.4.3.tgz"
integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==
dependencies: dependencies:
"@isaacs/fs-minipass" "^4.0.0" "@isaacs/fs-minipass" "^4.0.0"
chownr "^3.0.0" chownr "^3.0.0"

Write Preview
Loading…
Cancel
Save